diff --git a/LoadFolders.xml b/LoadFolders.xml
index c211b615b9..d7df45ac5d 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -11,6 +11,11 @@
 		<!-- Mod Patches -->
 		<li IfModActive="Torann.ARimworldOfMagic">ModPatches/A Rimworld of Magic</li>
 		<li IfModActive="ADE.AdvancedTurrets.Mod">ModPatches/ADE Advanced Turrets</li>
+		<li IfModActive="Killathon.ArtificialBeings.SynCore.Civil">ModPatches/ABF Civil Synstructs</li>
+		<li IfModActive="Killathon.ArtificialBeings.SynCore.Martial">ModPatches/ABF Martial Synstructs</li>
+		<li IfModActive="Killathon.ArtificialBeings.SynCore.Biomimetics">ModPatches/ABF Synstruct Biomimetics</li>
+		<li IfModActive="Killathon.ArtificialBeings.SynCore">ModPatches/ABF Synstructs Core</li>
+		<li IfModActive="Killathon.ArtificialBeings.SynCore.Utility">ModPatches/ABF Utility Synstructs</li>		
 		<li IfModActive="ADE.AdvancedTurretsA.copy.Mod">ModPatches/ADE Advanced turrets PLUS</li>
 		<li IfModActive="ADE.pulseTurrets.Mod">ModPatches/ADE Pulse Turrets PLUS</li>
 		<li IfModActive="spoonshortage.ADogSaidAnimalProsthetics">ModPatches/ADogSaid</li>
@@ -34,9 +39,7 @@
 		<li IfModActive="zal.easternarmory">ModPatches/Ancient Eastern Armory</li>
 		<li IfModActive="biowreck.ancientfalloutarmory">ModPatches/Ancient Fallout Armory</li>
 		<li IfModActive="bbbbilly.ancienthuman">ModPatches/Ancient Human</li>
-		<li IfModActive="Mlie.AndroidTiersTXSeries">ModPatches/Android Tiers - TX Series</li>
 		<li IfModActive="Killathon.AndroidTiersReforged">ModPatches/Android Tiers Reforged</li>
-		<li IfModActive="Mlie.AndroidTiersSM7Overhaul">ModPatches/Android Tiers SM7 Overhaul</li>
 		<li IfModActive="ChJees.Androids, ChJees.Androids14">ModPatches/Androids</li>
 		<li IfModActive="peptide.androidsexpanded, rielle.androidsexpanded">ModPatches/Androids Expanded</li>
 		<li IfModActive="hh.xrushha.AnimaAnimalsCombined">ModPatches/Anima Animals - Community Temp</li>
diff --git a/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/AlienRace_Synstructs.xml b/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/AlienRace_Synstructs.xml
new file mode 100644
index 0000000000..98141e00b1
--- /dev/null
+++ b/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/AlienRace_Synstructs.xml	
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Body Shape -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Simpleton" or
+			defName="ABF_Thing_Synstruct_Commoner" or
+			defName="ABF_Thing_Synstruct_Socialite" or
+			defName="ABF_Thing_Synstruct_Stoic"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Simpleton" or		
+			defName="ABF_Thing_Synstruct_Commoner" or
+			defName="ABF_Thing_Synstruct_Socialite" or
+			defName="ABF_Thing_Synstruct_Stoic"]/comps</xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct><!-- The default minimal armor percentage for all armor kinds. Will be overriden by any below -->
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable" />
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Melee Tools  -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Simpleton"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>1</power>
+					<cooldownTime>2.14</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.245</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>5.61</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.40</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Commoner" or
+			defName="ABF_Thing_Synstruct_Socialite" or
+			defName="ABF_Thing_Synstruct_Stoic"
+		]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.67</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>4.49</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Stats -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Simpleton" or
+			defName="ABF_Thing_Synstruct_Commoner" or
+			defName="ABF_Thing_Synstruct_Socialite" or
+			defName="ABF_Thing_Synstruct_Stoic"
+			]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/Bodies_Civil.xml b/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/Bodies_Civil.xml
new file mode 100644
index 0000000000..51f9b8a1cf
--- /dev/null
+++ b/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/Bodies_Civil.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Vocalizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/parts/li[def="ABF_BodyPart_Synstruct_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Civil"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/Scenarios_Crashlanded.xml b/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/Scenarios_Crashlanded.xml
new file mode 100644
index 0000000000..95d850af50
--- /dev/null
+++ b/ModPatches/ABF Civil Synstructs/Patches/ABF Civil Synstructs/Scenarios_Crashlanded.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- === Add ammo to scenario === -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ScenarioDef[defName="ABF_Scenario_Synstruct_Crashlanded"]/scenario/parts</xpath>
+		<value>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_303British_FMJ</thingDef>
+				<count>100</count>
+			</li>
+			<li Class="ScenPart_StartingThing_Defined">
+				<def>StartingThing_Defined</def>
+				<thingDef>Ammo_44Magnum_FMJ</thingDef>
+				<count>60</count>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Martial Synstructs/Defs/ABF Martial Synstructs/Ammo/RotaryShrapnelcannonShell.xml b/ModPatches/ABF Martial Synstructs/Defs/ABF Martial Synstructs/Ammo/RotaryShrapnelcannonShell.xml
new file mode 100644
index 0000000000..7af54f655d
--- /dev/null
+++ b/ModPatches/ABF Martial Synstructs/Defs/ABF Martial Synstructs/Ammo/RotaryShrapnelcannonShell.xml	
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>AmmoRotaryShrapnelcannonShell</defName>
+		<label>Rotary Shrapnelcannon shell</label>
+		<parent>AmmoShotguns</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberShotgun</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_RotaryShrapnelcannonShell</defName>
+		<label>Rotary Shrapnelcannon shell</label>
+		<ammoTypes>
+			<Ammo_RotaryShrapnelcannonShell>Bullet_RotaryShrapnelcannonShell</Ammo_RotaryShrapnelcannonShell>
+		</ammoTypes>
+		<similarTo>AmmoSet_Shotgun</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="RotaryShrapnelcannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Very large caliber buckshot shell designed specifically for the mech-operated Rotary Shrapnelcannon.</description>
+		<statBases>
+			<Mass>1.072</Mass>
+			<Bulk>5.9</Bulk>
+		</statBases>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<thingCategories>
+			<li>AmmoRotaryShrapnelcannonShell</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="RotaryShrapnelcannonShellBase">
+		<defName>Ammo_RotaryShrapnelcannonShell</defName>
+		<label>Shrapnelcannon shell (Buck)</label>
+		<graphicData>
+			<texPath>ThirdParty/Android Tiers/ShrapnelcannonShell</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>4.37</MarketValue>
+		</statBases>
+		<ammoClass>BuckShot</ammoClass>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef ParentName="Base12GaugeBullet">
+		<defName>Bullet_RotaryShrapnelcannonShell</defName>
+		<label>Shrapnelcannon buckshot pellet</label>
+		<graphicData>
+			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>117</speed>
+			<damageAmountBase>57</damageAmountBase>
+			<damageDef>Fragment</damageDef>
+			<pelletCount>6</pelletCount>
+			<armorPenetrationSharp>12</armorPenetrationSharp>
+			<armorPenetrationBlunt>526.34</armorPenetrationBlunt>
+			<spreadMult>7.9</spreadMult>
+		</projectile>
+	</ThingDef>
+
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeAmmo_RotaryShrapnelcannonShell</defName>
+		<label>make Shrapnelcannon (Buck) shell x10</label>
+		<description>Craft 10 Shrapnelcannon (Buck) shells.</description>
+		<jobString>Making Shrapnelcannon (Buck) shells.</jobString>
+		<workAmount>2200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>22</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_RotaryShrapnelcannonShell>10</Ammo_RotaryShrapnelcannonShell>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Bishop.xml b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Bishop.xml
new file mode 100644
index 0000000000..7bbdd69a1f
--- /dev/null
+++ b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Bishop.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Bishop"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Bishop"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Bishop"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Bishop"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Vocalizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Bishop"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Bishop"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Limb"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Bishop"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Limb"]/parts/li[def="ABF_BodyPart_Synstruct_Gripper"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Jellyman.xml b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Jellyman.xml
new file mode 100644
index 0000000000..11a3ee6aca
--- /dev/null
+++ b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Jellyman.xml	
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Jellyman"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Jellyman"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_MechaniteTorso"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Jellyman"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_MechaniteTorso"]/parts/li[def="ABF_BodyPart_Synstruct_MechaniteHead"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+	
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Paladin.xml b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Paladin.xml
new file mode 100644
index 0000000000..7d1e0bd3bb
--- /dev/null
+++ b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Paladin.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Vocalizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/parts/li[def="ABF_BodyPart_Synstruct_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Limb"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Paladin"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Limb"]/parts/li[def="ABF_BodyPart_Synstruct_Gripper"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Warrior.xml b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Warrior.xml
new file mode 100644
index 0000000000..fff2786308
--- /dev/null
+++ b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/Bodies/Bodies_Warrior.xml	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[customLabel="left shoulder"]/groups</xpath>
+		<value>
+			<li>LeftShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[customLabel="right shoulder"]/groups</xpath>
+		<value>
+			<li>RightShoulder</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[customLabel="left arm"]/groups</xpath>
+		<value>
+			<li>LeftArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[customLabel="right arm"]/groups</xpath>
+		<value>
+			<li>RightArm</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Vocalizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/parts/li[def="ABF_BodyPart_Synstruct_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Warrior"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Torso"]/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/ThingDef_Misc/Weapons_Mech.xml b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/ThingDef_Misc/Weapons_Mech.xml
new file mode 100644
index 0000000000..856760296b
--- /dev/null
+++ b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/ThingDef_Misc/Weapons_Mech.xml	
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ==========  Melee Tools  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[
+			defName="ABF_Thing_Synstruct_Juggernaut_RotaryAutocannon" or
+			defName="ABF_Thing_Synstruct_Juggernaut_ShrapnelCannon" or
+			defName="ABF_Thing_Synstruct_Juggernaut_HeadhunterCannon"
+			]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>stock</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.65</cooldownTime>
+					<chanceFactor>1.5</chanceFactor>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>barrel</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>47</power>
+					<cooldownTime>3.65</cooldownTime>
+					<armorPenetrationBlunt>21</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>muzzle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>65</power>
+					<cooldownTime>2.81</cooldownTime>
+					<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
+					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- ==========  Rotary Autocannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ABF_Thing_Synstruct_Juggernaut_RotaryAutocannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.09</ShotSpread>
+			<SwayFactor>1.8</SwayFactor>
+			<Bulk>35</Bulk>
+			<Mass>42</Mass>
+			<RangedWeapon_Cooldown>0.45</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.88</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<warmupTime>1.45</warmupTime>
+			<range>64</range>
+			<ticksBetweenBurstShots>4</ticksBetweenBurstShots>
+			<burstShotCount>5</burstShotCount>			
+			<soundCast>ABF_Sound_Synstruct_Juggernaut_AutocannonBlast</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>18</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>30</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>AimedShot</aiAimMode>
+			<aimedBurstShotCount>3</aimedBurstShotCount>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Juggernaut_RotaryAutocannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Rotary Shrapnelcannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ABF_Thing_Synstruct_Juggernaut_ShrapnelCannon</defName>
+		<statBases>
+			<SightsEfficiency>1.0</SightsEfficiency>
+			<ShotSpread>0.15</ShotSpread>
+			<SwayFactor>1.37</SwayFactor>
+			<Bulk>30</Bulk>
+			<Mass>42</Mass>
+			<RangedWeapon_Cooldown>0.37</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<recoilAmount>1.72</recoilAmount>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_RotaryShrapnelcannonShell</defaultProjectile>
+			<warmupTime>0.6</warmupTime>
+			<range>32</range>
+			<soundCast>ABF_Sound_Synstruct_Juggernaut_ShrapnelBlast</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>12</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>7</magazineSize>
+			<reloadOneAtATime>true</reloadOneAtATime>
+			<reloadTime>1.7</reloadTime>
+			<ammoSet>AmmoSet_RotaryShrapnelcannonShell</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Juggernaut_ShrapnelCannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Headhunter Cannon  =========== -->
+
+	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
+		<defName>ABF_Thing_Synstruct_Juggernaut_HeadhunterCannon</defName>
+		<statBases>
+			<SightsEfficiency>2.0</SightsEfficiency>
+			<ShotSpread>0.02</ShotSpread>
+			<SwayFactor>1.17</SwayFactor>
+			<Bulk>20</Bulk>
+			<Mass>30</Mass>
+			<RangedWeapon_Cooldown>0.63</RangedWeapon_Cooldown>
+		</statBases>
+		<Properties>
+			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+			<hasStandardCommand>true</hasStandardCommand>
+			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
+			<warmupTime>3.8</warmupTime>
+			<range>84</range>
+			<soundCast>ABF_Sound_Synstruct_Juggernaut_AutocannonBlast</soundCast>
+			<soundCastTail>GunTail_Heavy</soundCastTail>
+			<muzzleFlashScale>20</muzzleFlashScale>
+		</Properties>
+		<AmmoUser>
+			<magazineSize>10</magazineSize>
+			<reloadTime>4</reloadTime>
+			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
+		</AmmoUser>
+		<FireModes>
+			<aiAimMode>Snapshot</aiAimMode>
+		</FireModes>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Juggernaut_HeadhunterCannon"]</xpath>
+		<value>
+			<li Class="CombatExtended.GunDrawExtension">
+				<DrawOffset>0.0,0.0</DrawOffset>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- ==========  Juggernaut Poleaxe  =========== -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Juggernaut_Poleaxe"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>spike</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>125</power>
+					<cooldownTime>1.92</cooldownTime>
+					<armorPenetrationBlunt>38.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>47.86</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>axe</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>182</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>63</armorPenetrationBlunt>
+					<armorPenetrationSharp>14.00</armorPenetrationSharp>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>hammer</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>182</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>150</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Juggernaut_Poleaxe"]/statBases</xpath>
+		<value>
+			<Bulk>35</Bulk>
+			<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Juggernaut_Poleaxe"]</xpath>
+		<value>
+			<equippedStatOffsets>
+				<MeleeCritChance>1.0</MeleeCritChance>
+				<MeleeParryChance>1.0</MeleeParryChance>
+			</equippedStatOffsets>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/ThingDef_Races/AlienRace_Synstruct_HumanlikeBase.xml b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/ThingDef_Races/AlienRace_Synstruct_HumanlikeBase.xml
new file mode 100644
index 0000000000..bdccd496f4
--- /dev/null
+++ b/ModPatches/ABF Martial Synstructs/Patches/ABF Martial Synstructs/ThingDef_Races/AlienRace_Synstruct_HumanlikeBase.xml	
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!--Test for comps-->
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Bishop"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Bishop"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Paladin"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Paladin"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Jellyman"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Jellyman"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Juggernaut"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Juggernaut"]</xpath>
+			<value>
+				<comps/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Warrior" or
+			defName="ABF_Thing_Synstruct_Bishop" or
+			defName="ABF_Thing_Synstruct_Paladin" or
+			defName="ABF_Thing_Synstruct_Jellyman" or
+			defName="ABF_Thing_Synstruct_Juggernaut"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior" or
+			defName="ABF_Thing_Synstruct_Bishop" or
+			defName="ABF_Thing_Synstruct_Paladin" or
+			defName="ABF_Thing_Synstruct_Jellyman" or
+			defName="ABF_Thing_Synstruct_Juggernaut"
+			]/comps </xpath>
+		<value>
+			<li>
+				<compClass>CombatExtended.CompPawnGizmo</compClass>
+			</li>
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Paladin" or
+			defName="ABF_Thing_Synstruct_Jellyman"
+			]/comps </xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_Suppressable"/>
+		</value>
+	</Operation>
+
+	<!-- MK1 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.8</MeleeDodgeChance>
+			<MeleeCritChance>0.8</MeleeCritChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
+			<SmokeSensitivity>0.5</SmokeSensitivity>
+			<AimingAccuracy>1.0</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior"]/race/baseBodySize</xpath>
+		<value>
+			<baseBodySize>0.85</baseBodySize>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Warrior"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.14</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.14</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>body</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>2.0</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK2 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Bishop"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.9</MeleeDodgeChance>
+			<MeleeCritChance>0.9</MeleeCritChance>
+			<MeleeParryChance>0.9</MeleeParryChance>
+			<AimingAccuracy>1.0</AimingAccuracy>
+			<SmokeSensitivity>0.25</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Bishop"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Bishop"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>7.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Bishop"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>3</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<chanceFactor>0.75</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bodyslam</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK3 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Paladin"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.25</NightVisionEfficiency>
+			<MeleeDodgeChance>1</MeleeDodgeChance>
+			<MeleeCritChance>1</MeleeCritChance>
+			<MeleeParryChance>1</MeleeParryChance>
+			<Suppressability>0.2</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<ArmorRating_Blunt>1</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Paladin"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>8</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Paladin"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right hand</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>0.75</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>1.0</armorPenetrationBlunt>
+					<chanceFactor>0.75</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>manipulator</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>4</power>
+					<cooldownTime>1.0</cooldownTime>
+					<linkedBodyPartsGroup>Hands</linkedBodyPartsGroup>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<chanceFactor>0.75</chanceFactor>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>bodyslam</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>3</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK4 -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Jellyman"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<AimingAccuracy>1.1</AimingAccuracy>
+			<MeleeDodgeChance>1.2</MeleeDodgeChance>
+			<MeleeCritChance>1.2</MeleeCritChance>
+			<MeleeParryChance>1.2</MeleeParryChance>
+			<Suppressability>0.33</Suppressability>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>50</CarryWeight>
+			<CarryBulk>25</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Jellyman"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>10</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Jellyman"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Jellyman"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>bodyslam</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<linkedBodyPartsGroup>Torso</linkedBodyPartsGroup>
+					<ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- MK5 -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Juggernaut"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>30</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Juggernaut"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>67.5</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Juggernaut"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Juggernaut"]/statBases</xpath>
+		<value>
+			<NightVisionEfficiency>0.4</NightVisionEfficiency>
+			<MeleeDodgeChance>1.0</MeleeDodgeChance>
+			<MeleeCritChance>1.0</MeleeCritChance>
+			<MeleeParryChance>1.0</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>200</CarryWeight>
+			<CarryBulk>100</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ABF_Thing_Synstruct_Juggernaut"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>3.07</cooldownTime>
+					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>48.25</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right fist</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>80</power>
+					<cooldownTime>3.07</cooldownTime>
+					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>48.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/PawnKindDef[defName="ABF_PawnKind_Synstruct_Juggernaut_Calldown"]</xpath>
+		<value>
+			<li Class="CombatExtended.LoadoutPropertiesExtension">
+				<primaryMagazineCount>
+					<min>8</min>
+					<max>10</max>
+				</primaryMagazineCount>
+				<forcedSidearm>
+					<sidearmMoney>
+						<min>0</min>
+						<max>10000</max>
+					</sidearmMoney>
+					<weaponTags>
+						<li>CE_Sidearm_M7Mech</li>
+					</weaponTags>
+					<magazineCount>
+						<min>4</min>
+						<max>5</max>
+					</magazineCount>
+				</forcedSidearm>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Juggernaut_DescentTargeter"]</xpath>
+		<value>
+			<statBases>
+				<Bulk>1</Bulk>
+			</statBases>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstruct Biomimetics/Defs/ABF Synstruct Biomimetics/Ammo_SwarmShell.xml b/ModPatches/ABF Synstruct Biomimetics/Defs/ABF Synstruct Biomimetics/Ammo_SwarmShell.xml
new file mode 100644
index 0000000000..0b6376cdfa
--- /dev/null
+++ b/ModPatches/ABF Synstruct Biomimetics/Defs/ABF Synstruct Biomimetics/Ammo_SwarmShell.xml	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- Ammo Category -->
+	<CombatExtended.AmmoCategoryDef>
+		<defName>SwarmShell</defName>
+		<label>swarm shell</label>
+		<description>Releases several pre-programmed microscythers on impact.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
+	<!-- Ammo -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Swarm_shell_81mm</defName>
+		<label>81mm mortar shell (Swarm)</label>
+		<graphicData>
+            <texPath>Things/Items/Shells/Razorstruct_shell</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>60</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>11.34</Bulk>
+		</statBases>
+		<ammoClass>SwarmShell</ammoClass>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>2</explosiveRadius>
+				<explosiveDamageType>Smoke</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.4</explosiveExpandPerStackcount>
+				<startWickHitPointsPercent>0.333</startWickHitPointsPercent>
+				<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+				<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explosionEffect>ExtinguisherExplosion</explosionEffect>
+				<wickTicks>
+					<min>10</min>
+					<max>30</max>
+				</wickTicks>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<!-- Projectile -->
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Swarm</defName>
+		<label>81mm mortar shell (Swarm)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<damageAmountBase>0</damageAmountBase>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>39.493</armorPenetrationBlunt>
+			<explosionRadius>1.9</explosionRadius>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<postExplosionSpawnThingDef>ABF_Thing_Synstruct_RazorstructGenerator</postExplosionSpawnThingDef>
+			<postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<!-- Recipe -->
+	<RecipeDef ParentName="AmmoRecipeBase">
+		<defName>MakeSwarm_shell_81mm</defName>
+		<label>make 81mm Swarm mortar shell x1</label>
+		<description>Craft 1 81mm Swarm shell.</description>
+		<jobString>Making 81mm Swarm shells.</jobString>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>50</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Swarm_shell_81mm>1</Swarm_shell_81mm>
+		</products>
+		<workAmount>3000</workAmount>
+		<recipeUsers Inherit="False">
+			<li>ABF_Thing_Synstruct_Cradle</li>
+		</recipeUsers>
+		<researchPrerequisite>ABF_ResearchProject_Synstruct_Biomimetics</researchPrerequisite>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Ammo/81mmMortar_SwarmShell.xml b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Ammo/81mmMortar_SwarmShell.xml
new file mode 100644
index 0000000000..212a846f52
--- /dev/null
+++ b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Ammo/81mmMortar_SwarmShell.xml	
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/ammoTypes</xpath>
+		<value>
+			<Swarm_shell_81mm>Bullet_81mmMortarShell_Swarm</Swarm_shell_81mm>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_RazorstructShell"]</xpath>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_RazorstructTrap"]/costList</xpath>
+		<value>
+			<costList>
+				<Swarm_shell_81mm>2</Swarm_shell_81mm>
+			</costList>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Airborne.xml b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Airborne.xml
new file mode 100644
index 0000000000..ed4f25d2e2
--- /dev/null
+++ b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Airborne.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Razorstruct"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Razorstruct"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Razorstruct"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Razorstruct"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Wing"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Razorstruct"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Propeller"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Razorstruct"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Propeller"]/parts/li[def="ABF_BodyPart_Synstruct_Counterweight"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Bipedal.xml b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Bipedal.xml
new file mode 100644
index 0000000000..dbc0b27672
--- /dev/null
+++ b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Bipedal.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_BipedalBiomimetic"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_BipedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_BipedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_BipedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_BipedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_BipedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_BipedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml
new file mode 100644
index 0000000000..475c694d21
--- /dev/null
+++ b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/Bodies/Bodies_Animal_Quadrupedal.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]</xpath>
+			<value>
+				<groups/>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Counterweight"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Jaw"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_QuadrupedalBiomimetic"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/ThingDef_Races/Races_Animals.xml b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/ThingDef_Races/Races_Animals.xml
new file mode 100644
index 0000000000..a8d83061eb
--- /dev/null
+++ b/ModPatches/ABF Synstruct Biomimetics/Patches/ABF Synstruct Biomimetics/ThingDef_Races/Races_Animals.xml	
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Bodytype -->
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Razorstruct"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>QuadrupedLow</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[
+			defName="ABF_Thing_Synstruct_Convoystruct" or
+			defName="ABF_Thing_Synstruct_Steelstruct" or
+			defName="ABF_Thing_Synstruct_Nutristruct" or
+			defName="ABF_Thing_Synstruct_Guardstruct"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Quadruped</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Chemstruct"]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Birdlike</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<!-- Razorstruct -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Razorstruct"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.26</MeleeDodgeChance>
+			<MeleeCritChance>0.03</MeleeCritChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Razorstruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left wing</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.54</cooldownTime>
+					<linkedBodyPartsGroup>ABF_BodyPartGroup_Synstruct_LeftWing</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>right wing</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>0.54</cooldownTime>
+					<linkedBodyPartsGroup>ABF_BodyPartGroup_Synstruct_RightWing</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.303</armorPenetrationBlunt>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+				</li>
+
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.05</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>0.36</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Chemical Processing Unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Chemstruct"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.15</MeleeDodgeChance>
+			<MeleeCritChance>0.0</MeleeCritChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Chemstruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.65</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Mineral Unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Steelstruct"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.08</MeleeDodgeChance>
+			<MeleeCritChance>0.13</MeleeCritChance>
+			<MeleeParryChance>0.18</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Steelstruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- Nutrition unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Nutristruct"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.23</MeleeDodgeChance>
+			<MeleeCritChance>0.28</MeleeCritChance>
+			<MeleeParryChance>0.09</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Nutristruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>6</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<!-- TORT unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Convoystruct"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.17</MeleeDodgeChance>
+			<MeleeCritChance>0.23</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0.05</SmokeSensitivity>
+			<CarryWeight>100</CarryWeight>
+			<CarryBulk>50</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Convoystruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>2.12</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>6</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Convoystruct"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>12</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Convoystruct"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>36</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Convoystruct"]/statBases/ArmorRating_Heat</xpath>
+		<value>
+			<ArmorRating_Heat>0</ArmorRating_Heat>
+		</value>
+	</Operation>
+
+	<!-- Watchdog unit -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Guardstruct"]/statBases</xpath>
+		<value>
+			<MeleeDodgeChance>0.16</MeleeDodgeChance>
+			<MeleeCritChance>0.21</MeleeCritChance>
+			<MeleeParryChance>0.1</MeleeParryChance>
+			<SmokeSensitivity>0</SmokeSensitivity>
+			<CarryWeight>60</CarryWeight>
+			<CarryBulk>30</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Guardstruct"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Guardstruct"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="ABF_Thing_Synstruct_Guardstruct"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>left claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>26</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>right claw</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.5</cooldownTime>
+					<linkedBodyPartsGroup>FrontLeftPaw</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>26</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>1</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.475</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<capacities>
+						<li>Bite</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>Teeth</linkedBodyPartsGroup>
+					<surpriseAttack>
+						<extraMeleeDamages>
+							<li>
+								<def>Stun</def>
+								<amount>32</amount>
+							</li>
+						</extraMeleeDamages>
+					</surpriseAttack>
+					<armorPenetrationSharp>3</armorPenetrationSharp>
+					<armorPenetrationBlunt>12.8</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>10</power>
+					<cooldownTime>2.5</cooldownTime>
+					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+					<chanceFactor>0.2</chanceFactor>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstructs Core/Patches/ABF Synstructs Core/Hediffs/BodyParts_ABFExternals.xml b/ModPatches/ABF Synstructs Core/Patches/ABF Synstructs Core/Hediffs/BodyParts_ABFExternals.xml
new file mode 100644
index 0000000000..84771487bb
--- /dev/null
+++ b/ModPatches/ABF Synstructs Core/Patches/ABF Synstructs Core/Hediffs/BodyParts_ABFExternals.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyPartDef[
+			defName="ABF_BodyPart_Synstruct_Vocalizer" or
+			defName="ABF_BodyPart_Synstruct_AudialSensor" or
+			defName="ABF_BodyPart_Synstruct_VisualSensor"]/tags</xpath>
+		<value>
+			<li>OutsideSquishy</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Synstructs Core/Patches/ABF Synstructs Core/Hediffs/Hediffs_ABF.xml b/ModPatches/ABF Synstructs Core/Patches/ABF Synstructs Core/Hediffs/Hediffs_ABF.xml
new file mode 100644
index 0000000000..adba4ed126
--- /dev/null
+++ b/ModPatches/ABF Synstructs Core/Patches/ABF Synstructs Core/Hediffs/Hediffs_ABF.xml	
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Assistant_Combat"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>-0.25</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Assistant_Combat"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
+		<value>
+			<ShootingAccuracyPawn>1.0</ShootingAccuracyPawn>
+			<AimingAccuracy>0.4</AimingAccuracy>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Assistant_Combat"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.2</MeleeDodgeChance>
+			<MeleeCritChance>0.2</MeleeCritChance>
+			<MeleeParryChance>0.2</MeleeParryChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Frame_Plasteel"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Frame_Plasteel"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Chassis_Hydraulic"]/stages/li/statOffsets</xpath>
+		<value>
+			<CarryWeight>10</CarryWeight>
+			<CarryBulk>20</CarryBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Chassis_Mobility"]/stages/li/statOffsets/MeleeDodgeChance</xpath>
+		<value>
+			<MeleeDodgeChance>0.5</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Chassis_Repression"]/stages/li/statOffsets</xpath>
+		<value>
+			<Suppressability>1</Suppressability>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Utility_MiningArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>drill</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Utility_AgricultureArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scythe</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>8</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>0.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Utility_PacificationArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>charged fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>5</power>
+					<cooldownTime>1.0</cooldownTime>
+					<extraMeleeDamages>
+						<li>
+							<def>Flame</def>
+							<amount>10</amount>
+						</li>
+						<li>
+							<def>EMP</def>
+							<amount>5</amount>
+						</li>
+					</extraMeleeDamages>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Utility_ScalpelArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>scalpel</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>18</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationSharp>1.0</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>scalpel</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>12</power>
+					<cooldownTime>1.0</cooldownTime>
+					<armorPenetrationSharp>8</armorPenetrationSharp>
+					<armorPenetrationBlunt>4</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Utility_RendingArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Scratch</li>
+					</capacities>
+					<power>25</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>3.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>20</power>
+					<cooldownTime>0.75</cooldownTime>
+					<armorPenetrationSharp>20</armorPenetrationSharp>
+					<armorPenetrationBlunt>10</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>carver</label>
+					<capacities>
+						<li>Demolish</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>2.0</cooldownTime>
+					<armorPenetrationBlunt>5</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Utility_MakeshiftArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>2</cooldownTime>
+					<armorPenetrationBlunt>0.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="ABF_Hediff_Synstruct_Ultrapart_Arm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>fist</label>
+					<capacities>
+						<li>Blunt</li>
+					</capacities>
+					<power>7</power>
+					<cooldownTime>1.25</cooldownTime>
+					<armorPenetrationBlunt>2.25</armorPenetrationBlunt>
+				</li>
+			</tools>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Envoy.xml b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Envoy.xml
new file mode 100644
index 0000000000..321f5683c2
--- /dev/null
+++ b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Envoy.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Vocalizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/parts/li[def="ABF_BodyPart_Synstruct_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Envoy"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Grunt.xml b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Grunt.xml
new file mode 100644
index 0000000000..3654d3fa2e
--- /dev/null
+++ b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Grunt.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Vocalizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/parts/li[def="ABF_BodyPart_Synstruct_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Grunt"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Overseer.xml b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Overseer.xml
new file mode 100644
index 0000000000..79afdaedf9
--- /dev/null
+++ b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Bodies_Overseer.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_Vocalizer"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Neck"]/parts/li[def="ABF_BodyPart_Synstruct_Head"]/parts/li[def="ABF_BodyPart_Synstruct_AudialSensor"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Shoulder"]/parts/li[def="ABF_BodyPart_Synstruct_Arm"]/parts/li[def="ABF_BodyPart_Synstruct_Hand"]/parts/li[def="ABF_BodyPart_Synstruct_Finger"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/BodyDef[defName="ABF_Body_Synstruct_Overseer"]/corePart/parts/li[def="ABF_BodyPart_Synstruct_Leg"]/parts/li[def="ABF_BodyPart_Synstruct_Foot"]/groups</xpath>
+		<value>
+			<li>CoveredByNaturalArmor</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Races_Synstructs.xml b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Races_Synstructs.xml
new file mode 100644
index 0000000000..40783431f8
--- /dev/null
+++ b/ModPatches/ABF Utility Synstructs/Patches/ABF Utility Synstructs/Races_Synstructs.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Body Shape -->
+
+	<Operation Class="PatchOperationAddModExtension">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Envoy" or
+			defName="ABF_Thing_Synstruct_Grunt" or
+			defName="ABF_Thing_Synstruct_Overseer"
+			]</xpath>
+		<value>
+			<li Class="CombatExtended.RacePropertiesExtensionCE">
+				<bodyShape>Humanoid</bodyShape>
+			</li>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/AlienRace.ThingDef_AlienRace[
+			defName="ABF_Thing_Synstruct_Envoy" or
+			defName="ABF_Thing_Synstruct_Grunt" or
+			defName="ABF_Thing_Synstruct_Overseer"
+            ]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_ArmorDurability">
+				<Durability>500</Durability>
+				<Regenerates>true</Regenerates>
+				<RegenInterval>600</RegenInterval>
+				<RegenValue>5</RegenValue>
+				<MinArmorPct>0.5</MinArmorPct><!-- The default minimal armor percentage for all armor kinds. Will be overriden by any below -->
+			</li>
+			<li Class="CombatExtended.CompProperties_Suppressable" />
+			<li>
+				<compClass>CombatExtended.CompAmmoGiver</compClass>
+			</li>
+		</value>
+	</Operation>
+
+</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml b/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml
deleted file mode 100644
index 301c679ea9..0000000000
--- a/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/PawnkindDefs/PawnKinds_Android.xml	
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/PawnKindDef[
-			@Name="ATPP_AndroidTX2RaiderBase" or
-			@Name="ATPP_AndroidTX2KRaiderBase" or
-			@Name="ATPP_AndroidTX3RaiderBase" or
-			@Name="ATPP_AndroidTX4RaiderBase" or
-			@Name="ATPP_AndroidTX2CollectiveBase" or
-			@Name="ATPP_AndroidTX2KCollectiveBase" or
-			@Name="ATPP_AndroidTX3CollectiveBase" or
-			@Name="ATPP_AndroidTX4CollectiveBase"
-			] </xpath>
-		<value>
-			<li Class="CombatExtended.LoadoutPropertiesExtension">
-				<primaryMagazineCount>
-					<min>4</min>
-					<max>6</max>
-				</primaryMagazineCount>
-				<sidearms>
-					<li>
-						<generateChance>0.5</generateChance>
-						<sidearmMoney>
-							<min>20</min>
-							<max>120</max>
-						</sidearmMoney>
-						<weaponTags>
-							<li>CE_Sidearm_Melee</li>
-						</weaponTags>
-					</li>
-				</sidearms>
-			</li>
-		</value>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml b/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml
deleted file mode 100644
index 9b89a71d15..0000000000
--- a/ModPatches/Android Tiers - TX Series/Patches/Android Tiers - TX Series/ThingDef_Races/AlienRace_Androids.xml	
+++ /dev/null
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!--Test for comps-->
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2ITX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2ITX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3ITX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3ITX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4ITX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4ITX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KITX"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KITX"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<!--Multiple-->
-
-	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[
-			defName="ATPP_Android2TX" or
-			defName="ATPP_Android3TX" or
-			defName="ATPP_Android4TX" or
-			defName="ATPP_Android2ITX" or
-			defName="ATPP_Android3ITX" or
-			defName="ATPP_Android4ITX" or
-			defName="ATPP_Android2KTX" or
-			defName="ATPP_Android2KITX"
-			] </xpath>
-		<value>
-			<li Class="CombatExtended.RacePropertiesExtensionCE">
-				<bodyShape>Humanoid</bodyShape>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[
-			defName="ATPP_Android2TX" or
-			defName="ATPP_Android3TX" or
-			defName="ATPP_Android4TX" or
-			defName="ATPP_Android2ITX" or
-			defName="ATPP_Android3ITX" or
-			defName="ATPP_Android4ITX" or
-			defName="ATPP_Android2KTX" or
-			defName="ATPP_Android2KITX"
-			]/comps </xpath>
-		<value>
-			<li>
-				<compClass>CombatExtended.CompPawnGizmo</compClass>
-			</li>
-		</value>
-	</Operation>
-
-	<!--2/3/4 are all complex enough to have at least some intrinsic self presevation. 
-2KXT Are purpose built combat units and as such do not.-->
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[
-			defName="ATPP_Android2TX" or
-			defName="ATPP_Android3TX" or
-			defName="ATPP_Android4TX" or
-			defName="ATPP_Android2ITX" or
-			defName="ATPP_Android3ITX" or
-			defName="ATPP_Android4ITX"
-			]/comps </xpath>
-		<value>
-			<li Class="CombatExtended.CompProperties_Suppressable"/>
-		</value>
-	</Operation>
-
-	<!--T2-->
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases</xpath>
-		<value>
-			<MeleeDodgeChance>0.95</MeleeDodgeChance>
-			<MeleeCritChance>0.95</MeleeCritChance>
-			<MeleeParryChance>0.95</MeleeParryChance>
-			<Suppressability>0.10</Suppressability>
-			<SmokeSensitivity>0.05</SmokeSensitivity>
-		</value>
-	</Operation>
-	<!--1mm Steel-->
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases/ArmorRating_Sharp</xpath>
-		<value>
-			<ArmorRating_Sharp>1</ArmorRating_Sharp>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/statBases/ArmorRating_Blunt</xpath>
-		<value>
-			<ArmorRating_Blunt>1.5</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2TX" or defName="ATPP_Android2ITX"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>left fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>2</power>
-					<cooldownTime>1.67</cooldownTime>
-					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>0.405</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>right fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>2</power>
-					<cooldownTime>1.67</cooldownTime>
-					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>0.405</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>2</power>
-					<cooldownTime>4.49</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-
-	<!--T3-->
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases</xpath>
-		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1.1</MeleeCritChance>
-			<MeleeParryChance>1.1</MeleeParryChance>
-			<Suppressability>0.10</Suppressability>
-			<SmokeSensitivity>0</SmokeSensitivity>
-		</value>
-	</Operation>
-	<!--1mm plasteel/1.5mm steel-->
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases/ArmorRating_Sharp</xpath>
-		<value>
-			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/statBases/ArmorRating_Blunt</xpath>
-		<value>
-			<ArmorRating_Blunt>4.75</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android3TX" or defName="ATPP_Android3ITX"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>left fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>1.67</cooldownTime>
-					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>right fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>1.67</cooldownTime>
-					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>1.44</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>2.8</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>1.6</armorPenetrationBlunt>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-
-	<!--T4-->
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases</xpath>
-		<value>
-			<MeleeDodgeChance>1.2</MeleeDodgeChance>
-			<MeleeCritChance>1.2</MeleeCritChance>
-			<MeleeParryChance>1.2</MeleeParryChance>
-			<Suppressability>0.25</Suppressability>
-			<SmokeSensitivity>0</SmokeSensitivity>
-		</value>
-	</Operation>
-	<!--2mm plasteel-->
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases/ArmorRating_Sharp</xpath>
-		<value>
-			<ArmorRating_Sharp>4</ArmorRating_Sharp>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/statBases/ArmorRating_Blunt</xpath>
-		<value>
-			<ArmorRating_Blunt>6</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android4TX" or defName="ATPP_Android4ITX"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>left fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>1.11</cooldownTime>
-					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>right fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>1.11</cooldownTime>
-					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>1.68</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>6</power>
-					<cooldownTime>2.49</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>2.025</armorPenetrationBlunt>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-
-	<!--T2K-->
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases</xpath>
-		<value>
-			<MeleeDodgeChance>0.75</MeleeDodgeChance>
-			<MeleeCritChance>1.0</MeleeCritChance>
-			<MeleeParryChance>1.2</MeleeParryChance>
-			<Suppressability>0</Suppressability>
-			<SmokeSensitivity>0</SmokeSensitivity>
-		</value>
-	</Operation>
-	<!--4mm Steel-->
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases/ArmorRating_Sharp</xpath>
-		<value>
-			<ArmorRating_Sharp>4</ArmorRating_Sharp>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/statBases/ArmorRating_Blunt</xpath>
-		<value>
-			<ArmorRating_Blunt>6</ArmorRating_Blunt>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/AlienRace.ThingDef_AlienRace[defName="ATPP_Android2KTX" or defName="ATPP_Android2KITX"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>left fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>2.05</cooldownTime>
-					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>right fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>5</power>
-					<cooldownTime>2.05</cooldownTime>
-					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>1.75</armorPenetrationBlunt>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>10</power>
-					<cooldownTime>5.29</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>3.6</armorPenetrationBlunt>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/ModPatches/Android Tiers SM7 Overhaul/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml b/ModPatches/Android Tiers SM7 Overhaul/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml
deleted file mode 100644
index 90e58c6535..0000000000
--- a/ModPatches/Android Tiers SM7 Overhaul/Patches/Android Tiers SM7 Overhaul/AndroidTiersSM7Overhaul_CEPatch.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<!-- ==========  20mm Rotary Cannon  =========== -->
-	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
-		<defName>MechRotaryCannon</defName>
-		<statBases>
-			<SightsEfficiency>1.5</SightsEfficiency>
-			<ShotSpread>0.25</ShotSpread>
-			<SwayFactor>1.32</SwayFactor>
-			<Bulk>35</Bulk>
-			<Mass>42</Mass>
-			<RangedWeapon_Cooldown>0</RangedWeapon_Cooldown>
-		</statBases>
-		<Properties>
-			<recoilAmount>2</recoilAmount>
-			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-			<hasStandardCommand>true</hasStandardCommand>
-			<defaultProjectile>Bullet_20x102mmNATO_AP</defaultProjectile>
-			<warmupTime>3</warmupTime>
-			<burstShotCount>250</burstShotCount>
-			<ticksBetweenBurstShots>2</ticksBetweenBurstShots>
-			<range>64</range>
-			<soundCast>RotaryCannon</soundCast>
-			<soundCastTail>RotaryCannonSpin</soundCastTail>
-			<muzzleFlashScale>12</muzzleFlashScale>
-			<targetParams>
-				<canTargetLocations>true</canTargetLocations>
-			</targetParams>
-		</Properties>
-		<AmmoUser>
-			<magazineSize>1000</magazineSize>
-			<reloadTime>8</reloadTime>
-			<ammoSet>AmmoSet_20x102mmNATO</ammoSet>
-		</AmmoUser>
-		<FireModes>
-			<aiAimMode>SuppressFire</aiAimMode>
-			<noSingleShot>true</noSingleShot>
-		</FireModes>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="MechRotaryCannon"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>stock</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>40</power>
-					<cooldownTime>2.1</cooldownTime>
-					<chanceFactor>1.5</chanceFactor>
-					<armorPenetrationBlunt>21</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>barrel</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>45</power>
-					<cooldownTime>2.2</cooldownTime>
-					<armorPenetrationBlunt>21</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>muzzle</label>
-					<capacities>
-						<li>Poke</li>
-					</capacities>
-					<power>25</power>
-					<cooldownTime>2.5</cooldownTime>
-					<armorPenetrationBlunt>30.24</armorPenetrationBlunt>
-					<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index bfbcb26473..eb10b03540 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -69,6 +69,11 @@ Mod |
 ↁ House Sanguin |
 A Dog Said...	|
 A Dog Said... Animal Prosthetics 2	|
+ABF: Civil Synstructs   |
+ABF: Martial Synstructs   |
+ABF: Synstructs Biomimetics   |
+ABF: Synstructs Core   |
+ABF: Utility Synstructs   |
 ADE Advanced Turrets    |
 ADE Advanced Turrets +  |
 Advanced Mortar (Continued) |
@@ -89,8 +94,6 @@ Ancient Eastern Armory  |
 Ancient Fallout Armory  |
 Ancient Humans   |
 Android Tiers Reforged	|
-Android Tiers SM7 Overhaul (Continued)  |
-Android - TX Series (Continued)  |
 Androids	|
 Androids Expanded	|
 Anima Animals Combined  |