diff --git a/1.6/Defs/ThingDefs_Races/Bases.xml b/1.6/Defs/ThingDefs_Races/Bases.xml
index 4be5eb4b..0ff2fe15 100644
--- a/1.6/Defs/ThingDefs_Races/Bases.xml
+++ b/1.6/Defs/ThingDefs_Races/Bases.xml
@@ -5,7 +5,7 @@
 			<ToxicResistance>1</ToxicResistance>
 			<ComfyTemperatureMax>75</ComfyTemperatureMax>
 			 <VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">1</VacuumResistance>
-			<ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">0.8</ToxicEnvironmentResistance>
+			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
 		</statBases>
 		<race>
 			<fleshType>Insectoid</fleshType>
@@ -29,7 +29,7 @@
 			<ToxicResistance>1</ToxicResistance>
 			<ComfyTemperatureMax>60</ComfyTemperatureMax>
 			 <VacuumResistance MayRequire="Ludeon.RimWorld.Odyssey">1</VacuumResistance>
-			<ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">0.8</ToxicEnvironmentResistance>
+			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
 		</statBases>
 		<race>
 			<fleshType>Insectoid</fleshType>
diff --git a/1.6/Defs/ThingDefs_Races/Races_BlackHive.xml b/1.6/Defs/ThingDefs_Races/Races_BlackHive.xml
index 79426c87..0632ed25 100644
--- a/1.6/Defs/ThingDefs_Races/Races_BlackHive.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_BlackHive.xml
@@ -88,12 +88,13 @@
 			</li>
 		</modExtensions>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_BlackScarab</defName>
 		<label>black scarab</label>
 		<race>AA_BlackScarab</race>
 		<combatPower>50</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionDef IsNull="True" />
 		<alternateGraphicChance>1</alternateGraphicChance>
 		<alternateGraphics>
 			<li>
@@ -250,12 +251,13 @@
 			</li>
 		</modExtensions>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_BlackSpelopede</defName>
 		<label>black spelopede</label>
 		<race>AA_BlackSpelopede</race>
 		<combatPower>85</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionDef IsNull="False" />
 		<alternateGraphicChance>1</alternateGraphicChance>
 		<alternateGraphics>
 			<li>
@@ -412,12 +414,13 @@
 			</li>
 		</modExtensions>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_BlackSpider</defName>
 		<label>blackspider</label>
 		<race>AA_BlackSpider</race>
 		<combatPower>175</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionDef IsNull="False" />
 		<alternateGraphicChance>1</alternateGraphicChance>
 		<alternateGraphics>
 			<li>
diff --git a/1.6/Defs/ThingDefs_Races/Races_Helixien.xml b/1.6/Defs/ThingDefs_Races/Races_Helixien.xml
index 665fe8fd..8aeab6b7 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Helixien.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Helixien.xml
@@ -11,7 +11,7 @@
 			<MarketValue>750</MarketValue>
 			<LeatherAmount>0</LeatherAmount>
 			<FilthRate>8</FilthRate>
-			<ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">1</ToxicEnvironmentResistance>
+			<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
 			<Wildness>0.4</Wildness>
 		</statBases>
 		<tools>
diff --git a/1.6/Defs/ThingDefs_Races/Races_MammothWorm.xml b/1.6/Defs/ThingDefs_Races/Races_MammothWorm.xml
index 76635763..3b71cc1b 100644
--- a/1.6/Defs/ThingDefs_Races/Races_MammothWorm.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_MammothWorm.xml
@@ -121,12 +121,14 @@
 			</li>
 		</modExtensions>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_MammothWorm</defName>
 		<race>AA_MammothWorm</race>
 		<label>mammoth worm</label>
 		<combatPower>200</combatPower>
+		<canArriveManhunter>true</canArriveManhunter>
 		<ecoSystemWeight>0.2</ecoSystemWeight>
+		<defaultFactionDef IsNull="True" />
 		<wildGroupSize>
 			<min>3</min>
 			<max>5</max>
diff --git a/1.6/Defs/ThingDefs_Races/Races_MegaLouse.xml b/1.6/Defs/ThingDefs_Races/Races_MegaLouse.xml
index a8af6bbc..56f738a1 100644
--- a/1.6/Defs/ThingDefs_Races/Races_MegaLouse.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_MegaLouse.xml
@@ -126,13 +126,15 @@
 			</li>
 		</modExtensions>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_MegaLouse</defName>
 		<label>megalouse</label>
 		<labelPlural>megalice</labelPlural>
 		<race>AA_MegaLouse</race>
 		<combatPower>150</combatPower>
+		<canArriveManhunter>true</canArriveManhunter>
 		<ecoSystemWeight>0.2</ecoSystemWeight>
+		<defaultFactionDef IsNull="True" />
 		<wildGroupSize>
 			<min>5</min>
 			<max>15</max>
diff --git a/1.6/Defs/ThingDefs_Races/Races_Murkling.xml b/1.6/Defs/ThingDefs_Races/Races_Murkling.xml
index 1e5b53a8..4f694be1 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Murkling.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Murkling.xml
@@ -9,7 +9,7 @@
 			<MarketValue>35</MarketValue>
 			<ComfyTemperatureMin>-35</ComfyTemperatureMin>
 			<FilthRate>2</FilthRate>
-			<ToxicEnvironmentResistance MayRequire="Ludeon.RimWorld.Biotech">1</ToxicEnvironmentResistance>
+			<ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
 			<Wildness>0.6</Wildness>
 		</statBases>
 		<tools>
diff --git a/1.6/Defs/ThingDefs_Races/Races_Ravager.xml b/1.6/Defs/ThingDefs_Races/Races_Ravager.xml
index ac7f927e..5c9ca71e 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Ravager.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Ravager.xml
@@ -106,13 +106,13 @@
 			</li>
 		</modExtensions>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_Ravager</defName>
 		<label>ravager</label>
 		<race>AA_Ravager</race>
 		<combatPower>220</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
-		<defaultFactionType>Insect</defaultFactionType>
+		<defaultFactionDef>Insect</defaultFactionDef>
 		<ecoSystemWeight>0.25</ecoSystemWeight>
 		<lifeStages>
 			<li>
diff --git a/1.6/Defs/ThingDefs_Races/Races_Thermadon.xml b/1.6/Defs/ThingDefs_Races/Races_Thermadon.xml
index 2d919925..f07152b2 100644
--- a/1.6/Defs/ThingDefs_Races/Races_Thermadon.xml
+++ b/1.6/Defs/ThingDefs_Races/Races_Thermadon.xml
@@ -107,12 +107,13 @@
 			</li>
 		</modExtensions>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_Thermadon</defName>
 		<label>thermadon</label>
 		<race>AA_Thermadon</race>
 		<combatPower>175</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionType>Insect</defaultFactionType>
 		<lifeStages>
 			<li>
 				<bodyGraphicData>
diff --git a/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackEmpress.xml b/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackEmpress.xml
index bce0cb63..5c3abd23 100644
--- a/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackEmpress.xml
+++ b/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackEmpress.xml
@@ -4,7 +4,7 @@
 	<ThingDef ParentName="VFEI2_BaseInsect">
 		<defName>VFEI2_BlackEmpress</defName>
 		<label>black empress</label>
-		<description>An incredibly rare and monstrously large insectoid of the Black Hive geneline. Unlike its Sorne counterpart, the black empress is not worried about creating offspring, feeling more concerned about acting as an absolute nightmare in close quarters combat. She can tore through heavy armor as if it wasn't there, but what makes her particularly dangerous is her ability to absolutely melt any mechanoids it encounters with a ranged spit attack. Upon death, it’s possible to extract a Black Hive pherocore from her body.</description>
+		<description>An incredibly rare and monstrously large insectoid of the Black Hive geneline. Unlike its Sorne counterpart, the black empress is not worried about creating offspring, feeling more concerned about acting as an absolute nightmare in close quarters combat. She can tear through heavy armor as if it wasn't there, but what makes her particularly dangerous is her ability to absolutely melt any mechanoids it encounters with a ranged spit attack. Upon death, it’s possible to extract a Black Hive pherocore from her body.</description>
 		<statBases>
 			<MoveSpeed>5.6</MoveSpeed>
 			<Flammability>0.2</Flammability>
@@ -109,14 +109,14 @@
       
     </killedLeavings>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>VFEI2_BlackEmpress</defName>
 		<label>black empress</label>
 		<race>VFEI2_BlackEmpress</race>
 		<combatPower>800</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
 		<ecoSystemWeight>0.50</ecoSystemWeight>
-		<defaultFactionType>Insect</defaultFactionType>
+		<defaultFactionDef>Insect</defaultFactionDef>
 		<aiAvoidCover>false</aiAvoidCover>
 		<defendPointRadius>0</defendPointRadius>
 		<lifeStages>
diff --git a/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackQueen.xml b/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackQueen.xml
index 38ce16ab..b330e6cb 100644
--- a/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackQueen.xml
+++ b/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackQueen.xml
@@ -93,14 +93,14 @@
 			<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
 		</race>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>VFEI2_BlackQueen</defName>
 		<label>black insectoid queen</label>
 		<race>VFEI2_BlackQueen</race>
 		<combatPower>450</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
 		<ecoSystemWeight>0.50</ecoSystemWeight>
-		<defaultFactionType>Insect</defaultFactionType>
+		<defaultFactionDef>Insect</defaultFactionDef>
 		<aiAvoidCover>false</aiAvoidCover>
 		<defendPointRadius>0</defendPointRadius>
 		<lifeStages>
diff --git a/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackSwarmling.xml b/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackSwarmling.xml
index 1e15fcaa..1454f6a2 100644
--- a/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackSwarmling.xml
+++ b/1.6/Mods/VFEInsectoids2/Defs/ThingDefs_Races/Races_BlackSwarmling.xml
@@ -80,14 +80,14 @@
 			</li>
 		</comps>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 			<defName>VFEI2_BlackSwarmling</defName>
 		<label>black swarmlings</label>
 		<race>VFEI2_BlackSwarmling</race>
 		<combatPower>10</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
 		<ecoSystemWeight>0.50</ecoSystemWeight>
-		<defaultFactionType>Insect</defaultFactionType>
+		<defaultFactionDef>Insect</defaultFactionDef>
 		<aiAvoidCover>false</aiAvoidCover>
 		<defendPointRadius>0</defendPointRadius>
 		<lifeStages>
diff --git a/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackHive_Psycasts.xml b/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackHive_Psycasts.xml
index 316f1809..7d73bb99 100644
--- a/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackHive_Psycasts.xml
+++ b/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackHive_Psycasts.xml
@@ -98,12 +98,13 @@
 		</modExtensions>
 	</ThingDef>
 	
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_BlackScarab_Temporary</defName>
 		<label>summoned black scarab</label>
 		<race>AA_BlackScarab_Temporary</race>
 		<combatPower>50</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionDef IsNull="True" />
 		<alternateGraphicChance>1</alternateGraphicChance>
 		<alternateGraphics>
 			<li>
@@ -251,12 +252,13 @@
 		</modExtensions>
 	</ThingDef>
 
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_BlackSpelopede_Temporary</defName>
 		<label>summoned black spelopede</label>
 		<race>AA_BlackSpelopede_Temporary</race>
 		<combatPower>85</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionDef IsNull="True" />
 		
 		<alternateGraphicChance>1</alternateGraphicChance>
 		<alternateGraphics>
@@ -409,12 +411,13 @@
 		</modExtensions>
 	</ThingDef>
 
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_BlackSpider_Temporary</defName>
 		<label>summoned blackspider</label>
 		<race>AA_BlackSpider_Temporary</race>
 		<combatPower>175</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionDef IsNull="True" />
 		
 		<alternateGraphicChance>1</alternateGraphicChance>
 		<alternateGraphics>
@@ -581,13 +584,14 @@
 		</modExtensions>
 	</ThingDef>
 
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_MammothWorm_Temporary</defName>
 		<race>AA_MammothWorm_Temporary</race>
 		<label>summoned mammoth worm</label>
 		<combatPower>200</combatPower>
 		<ecoSystemWeight>0.2</ecoSystemWeight>
 <canArriveManhunter>false</canArriveManhunter>
+		<defaultFactionDef IsNull="True" />
 		<lifeStages>
 			
 			<li>
diff --git a/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackLarva.xml b/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackLarva.xml
index 71bd960e..b6032dce 100644
--- a/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackLarva.xml
+++ b/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackLarva.xml
@@ -48,13 +48,14 @@
 			<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
 		</race>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AA_BlackLarvae</defName>
 		<label>black larvae</label>
 		<race>AA_BlackLarvae</race>
 		<combatPower>10</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
 		<ecoSystemWeight>0.50</ecoSystemWeight>
+		<defaultFactionDef IsNull="True" />
 		<lifeStages>
 			<li>
 				<bodyGraphicData>
diff --git a/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackQueen_Psycasts.xml b/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackQueen_Psycasts.xml
index 50e994a2..92b4924c 100644
--- a/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackQueen_Psycasts.xml
+++ b/1.6/Mods/VanillaPsycastsExpanded/Defs/ThingDefs_Races/Races_BlackQueen_Psycasts.xml
@@ -87,13 +87,14 @@
 			<soundMeleeMiss>Pawn_Melee_BigBash_Miss</soundMeleeMiss>
 		</race>
 	</ThingDef>
-	<PawnKindDef ParentName="AnimalKindBase">
+	<PawnKindDef ParentName="InsectKindBase">
 		<defName>AAVPE_BlackQueen</defName>
 		<label>summoned black queen</label>
 		<race>AAVPE_BlackQueen</race>
 		<combatPower>300</combatPower>
 		<canArriveManhunter>false</canArriveManhunter>
 		<ecoSystemWeight>0.50</ecoSystemWeight>
+		<defaultFactionDef IsNull="True" />
 		<lifeStages>
 			<li>
 				<bodyGraphicData>