diff --git a/1.3/Patches/AnimationPatch_CompBodyAnimator.xml b/1.3/Patches/AnimationPatch_CompBodyAnimator.xml
index 5eb9d96..b36a8ae 100644
--- a/1.3/Patches/AnimationPatch_CompBodyAnimator.xml
+++ b/1.3/Patches/AnimationPatch_CompBodyAnimator.xml
@@ -13,12 +13,29 @@
+
+ /Defs/AlienRace.ThingDef_AlienRace/comps
+ Always
+
+ /Defs/AlienRace.ThingDef_AlienRace
+
+
+
+
+
/Defs/ThingDef[@Name="BasePawn"]/comps
+
+
+ /Defs/AlienRace.ThingDef_AlienRace
+ comps
+
+
+
diff --git a/1.3/Patches/CompAnimator_HarPatches/AOC.xml b/1.3/Patches/CompAnimator_HarPatches/AOC.xml
deleted file mode 100644
index 814bba2..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/AOC.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseAOCPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseAOCPawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/ARimworldOfMagic.xml b/1.3/Patches/CompAnimator_HarPatches/ARimworldOfMagic.xml
deleted file mode 100644
index 739bc5c..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/ARimworldOfMagic.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="TM_Base_Demon"]/comps
- Always
-
- /Defs/ThingDef[@Name="TM_Base_Demon"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="TM_Base_Elemental"]/comps
- Always
-
- /Defs/ThingDef[@Name="TM_Base_Elemental"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="TM_Base_Minion"]/comps
- Always
-
- /Defs/ThingDef[@Name="TM_Base_Minion"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="TM_Base_Sentinel"]/comps
- Always
-
- /Defs/ThingDef[@Name="TM_Base_Sentinel"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="TM_Skeletal_Base"]/comps
- Always
-
- /Defs/ThingDef[@Name="TM_Skeletal_Base"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="TM_Base_SpiritAnimal"]/comps
- Always
-
- /Defs/ThingDef[@Name="TM_Base_SpiritAnimal"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="TM_Base_SummonedPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="TM_Base_SummonedPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/AlienVsPredator.xml b/1.3/Patches/CompAnimator_HarPatches/AlienVsPredator.xml
deleted file mode 100644
index 9ef060b..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/AlienVsPredator.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="AvP_BaseNeomorphPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="AvP_BaseNeomorphPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="AvP_BaseXenomorphPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="AvP_BaseXenomorphPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="AvP_Artificial_Synths"]/comps
- Always
-
- /Defs/ThingDef[@Name="AvP_Artificial_Synths"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="AvP_BaseYautjaPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="AvP_BaseYautjaPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/AndroidMech.xml b/1.3/Patches/CompAnimator_HarPatches/AndroidMech.xml
deleted file mode 100644
index e54659a..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/AndroidMech.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BasePawnMech"]/comps
- Always
-
- /Defs/ThingDef[@Name="BasePawnMech"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Annelitrice.xml b/1.3/Patches/CompAnimator_HarPatches/Annelitrice.xml
deleted file mode 100644
index 2155c14..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Annelitrice.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="Anneli_BasePawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="Anneli_BasePawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/AutoCleaner.xml b/1.3/Patches/CompAnimator_HarPatches/AutoCleaner.xml
deleted file mode 100644
index c2ad860..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/AutoCleaner.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseBaseAutocleaner"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseBaseAutocleaner"]/comps
-
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/AvianRaces.xml b/1.3/Patches/CompAnimator_HarPatches/AvianRaces.xml
deleted file mode 100644
index 3d2ce8e..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/AvianRaces.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="CassowaryPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="CassowaryPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="ChickenPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="ChickenPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="DodoPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="DodoPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="OwlPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="OwlPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="ParrotPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="ParrotPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="PenguinPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="PenguinPawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="VulturePawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="VulturePawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Capra.xml b/1.3/Patches/CompAnimator_HarPatches/Capra.xml
deleted file mode 100644
index 4aacfcc..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Capra.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseCapraPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseCapraPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/CombatExtended.xml b/1.3/Patches/CompAnimator_HarPatches/CombatExtended.xml
deleted file mode 100644
index 7d35127..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/CombatExtended.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BasePawnSimple"]/comps
- Always
-
- /Defs/ThingDef[@Name="BasePawnSimple"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Crystalloid.xml b/1.3/Patches/CompAnimator_HarPatches/Crystalloid.xml
deleted file mode 100644
index 1ec5dde..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Crystalloid.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="CrystalBasePawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="CrystalBasePawn"]/comps
-
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/ElonaImouto.xml b/1.3/Patches/CompAnimator_HarPatches/ElonaImouto.xml
deleted file mode 100644
index 88198bf..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/ElonaImouto.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="Elona_BasePawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="Elona_BasePawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Epona.xml b/1.3/Patches/CompAnimator_HarPatches/Epona.xml
deleted file mode 100644
index 5f93128..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Epona.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/comps
- Always
-
- /Defs/ThingDef[@Name="EponaCentaur_PawnBase"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/EponaRenaissance.xml b/1.3/Patches/CompAnimator_HarPatches/EponaRenaissance.xml
deleted file mode 100644
index 13fb605..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/EponaRenaissance.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseEponaPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseEponaPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Ferian.xml b/1.3/Patches/CompAnimator_HarPatches/Ferian.xml
deleted file mode 100644
index 43d175e..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Ferian.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseFerian"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseFerian"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Giant.xml b/1.3/Patches/CompAnimator_HarPatches/Giant.xml
deleted file mode 100644
index 065f2db..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Giant.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="GI_PawnBase"]/comps
- Always
-
- /Defs/ThingDef[@Name="GI_PawnBase"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Idhale.xml b/1.3/Patches/CompAnimator_HarPatches/Idhale.xml
deleted file mode 100644
index ce750f6..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Idhale.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Idhale_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Lapelli.xml b/1.3/Patches/CompAnimator_HarPatches/Lapelli.xml
deleted file mode 100644
index f6c7e9a..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Lapelli.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseLapelli"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseLapelli"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Littluna.xml b/1.3/Patches/CompAnimator_HarPatches/Littluna.xml
deleted file mode 100644
index 95338c2..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Littluna.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Littluna_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Littluna_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Mantodean.xml b/1.3/Patches/CompAnimator_HarPatches/Mantodean.xml
deleted file mode 100644
index 8f7105c..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Mantodean.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseMantoPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseMantoPawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Moosesian.xml b/1.3/Patches/CompAnimator_HarPatches/Moosesian.xml
deleted file mode 100644
index bf93fd0..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Moosesian.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="MS_PawnBase"]/comps
- Always
-
- /Defs/ThingDef[@Name="MS_PawnBase"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Nearmare.xml b/1.3/Patches/CompAnimator_HarPatches/Nearmare.xml
deleted file mode 100644
index d3e6427..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Nearmare.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Nearmaere_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Nearmaere_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Neclose.xml b/1.3/Patches/CompAnimator_HarPatches/Neclose.xml
deleted file mode 100644
index 7e048a0..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Neclose.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Neclose_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Nexaga.xml b/1.3/Patches/CompAnimator_HarPatches/Nexaga.xml
deleted file mode 100644
index b615f55..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Nexaga.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Nexaga_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Nexaga_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Rabbie.xml b/1.3/Patches/CompAnimator_HarPatches/Rabbie.xml
deleted file mode 100644
index c62930b..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Rabbie.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="RB_PawnBase"]/comps
- Always
-
- /Defs/ThingDef[@Name="RB_PawnBase"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Rakkle.xml b/1.3/Patches/CompAnimator_HarPatches/Rakkle.xml
deleted file mode 100644
index cc99bc2..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Rakkle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="RS_PawnBase"]/comps
- Always
-
- /Defs/ThingDef[@Name="RS_PawnBase"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Saclean.xml b/1.3/Patches/CompAnimator_HarPatches/Saclean.xml
deleted file mode 100644
index c74de7c..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Saclean.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Saclean_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Silkiera.xml b/1.3/Patches/CompAnimator_HarPatches/Silkiera.xml
deleted file mode 100644
index bf123a6..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Silkiera.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Silkiera_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/Solark.xml b/1.3/Patches/CompAnimator_HarPatches/Solark.xml
deleted file mode 100644
index d41f19a..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Solark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Solark_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/TTancon.xml b/1.3/Patches/CompAnimator_HarPatches/TTancon.xml
deleted file mode 100644
index d2ae549..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/TTancon.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseTTanconPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseTTanconPawn"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.3/Patches/CompAnimator_HarPatches/Xenoorca.xml b/1.3/Patches/CompAnimator_HarPatches/Xenoorca.xml
deleted file mode 100644
index 6bcb04d..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/Xenoorca.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/comps
- Always
-
- /Defs/ThingDef[@Name="HAR_Xenoorca_BaseNRPawn"]/comps
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.3/Patches/CompAnimator_HarPatches/ZombieLand.xml b/1.3/Patches/CompAnimator_HarPatches/ZombieLand.xml
deleted file mode 100644
index e950e0e..0000000
--- a/1.3/Patches/CompAnimator_HarPatches/ZombieLand.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseZombie"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseZombie"]/comps
-
-
-
-
-
-
-
-