diff --git a/LoadFolders.xml b/LoadFolders.xml
index b6958f1e03..2f405c1b67 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -328,7 +328,6 @@
 		<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="zerithos.NiHal">ModPatches/Nihal</li>
 		<li IfModActive="Aoba.Cannon, Mlie.NotOnlyJustACannon">ModPatches/Not Only Just A Cannon</li>
 		<li IfModActive="PrivateGER.Nukes.Shells">ModPatches/Nukes</li>
diff --git a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml b/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml
deleted file mode 100644
index e8cb087180..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/Flechette.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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
deleted file mode 100644
index 8e36eb4aeb..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKBallistaBolt.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?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
deleted file mode 100644
index 77d5bd216b..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/Ammo/RKCannonShell.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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
deleted file mode 100644
index e8ba24ecaa..0000000000
--- a/ModPatches/NewRatkinPlus/Defs/NewRatkinPlus/ThingDef_Misc/AmmoCategories.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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
deleted file mode 100644
index c5a485a574..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Bodies/Bodies_Ratkin.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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
deleted file mode 100644
index 5ac1f5d944..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/PawnKindDefs/PawnKinds_Ratkin.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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
deleted file mode 100644
index 6758df3203..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/Scenarios/Scenarios.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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
deleted file mode 100644
index d98aa3f12b..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Apparel.xml
+++ /dev/null
@@ -1,555 +0,0 @@
-<?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
deleted file mode 100644
index c6f100f216..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_Buildings_Security.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?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
deleted file mode 100644
index 38340817aa..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_MeleeWeapons.xml
+++ /dev/null
@@ -1,730 +0,0 @@
-<?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
deleted file mode 100644
index 8edf4c8cdc..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDef_Misc/Ratkin_RangedWeapons.xml
+++ /dev/null
@@ -1,501 +0,0 @@
-<?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
deleted file mode 100644
index 9f23fd0352..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_KingHamster.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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
deleted file mode 100644
index 5834ba5d3a..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rakinlike.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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
deleted file mode 100644
index 8bdc822600..0000000000
--- a/ModPatches/NewRatkinPlus/Patches/NewRatkinPlus/ThingDefs_Races/Race_Rotti.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 54c0a111cf..ab3c5a7928 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -351,7 +351,6 @@ Nanosuit    |
 Nearmare Race	|
 Neclose Race	|
 New Mech: Mini-Miner    |
-NewRatkinPlus |
 Ni'Hal	|
 Nukes   |
 Nyaron Race |
diff --git a/Textures/ThirdParty/Ratkin/FLCH/FLCH_a.png b/Textures/ThirdParty/Ratkin/FLCH/FLCH_a.png
deleted file mode 100644
index 974a1ea172..0000000000
Binary files a/Textures/ThirdParty/Ratkin/FLCH/FLCH_a.png and /dev/null differ
diff --git a/Textures/ThirdParty/Ratkin/FLCH/FLCH_b.png b/Textures/ThirdParty/Ratkin/FLCH/FLCH_b.png
deleted file mode 100644
index a5818a26a3..0000000000
Binary files a/Textures/ThirdParty/Ratkin/FLCH/FLCH_b.png and /dev/null differ
diff --git a/Textures/ThirdParty/Ratkin/FLCH/FLCH_c.png b/Textures/ThirdParty/Ratkin/FLCH/FLCH_c.png
deleted file mode 100644
index 31eebc0143..0000000000
Binary files a/Textures/ThirdParty/Ratkin/FLCH/FLCH_c.png and /dev/null differ