diff --git a/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml b/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml
index 647b7a2..2604962 100644
--- a/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml
+++ b/Common/Defs/HediffDefs/Hediffs_Extra_PrivateParts.xml
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartPenis">
 		<defName>NeedlePenis</defName>
 		<label>needle penis</label>
 		<labelNoun>a needle penis</labelNoun>
 		<description>A long thin needle penis</description>
-		<descriptionHyperlinks><ThingDef>NeedlePenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>NeedlePenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>NeedlePenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -16,12 +19,15 @@
 			</li>
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartPenis">
 		<defName>PigPenis</defName>
 		<label>screw penis</label>
 		<labelNoun>a screw penis</labelNoun>
 		<description>A large screw penis.</description>
-		<descriptionHyperlinks><ThingDef>PigPenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>PigPenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>PigPenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -33,12 +39,15 @@
 			</li>
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartPenis">
 		<defName>MarinePenis</defName>
 		<label>marine penis</label>
 		<labelNoun>a marine penis</labelNoun>
 		<description>A penis similar to those of marine mammals.</description>
-		<descriptionHyperlinks><ThingDef>MarinePenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>MarinePenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>MarinePenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -49,12 +58,15 @@
 			</li>
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartPenis">
 		<defName>TentaclePenis</defName>
 		<label>alien penis</label>
 		<labelNoun>an alien penis</labelNoun>
 		<description>A alien penis featuring multiples tentacles.</description>
-		<descriptionHyperlinks><ThingDef>TentaclePenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>TentaclePenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>TentaclePenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -71,7 +83,9 @@
 		<label>golem penis</label>
 		<labelNoun>an golem penis</labelNoun>
 		<description>A large rocky golem penis.</description>
-		<descriptionHyperlinks><ThingDef>GolemPenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>GolemPenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>GolemPenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -83,12 +97,15 @@
 			</li>
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartPenis">
 		<defName>OrcPenis</defName>
 		<label>orc penis</label>
 		<labelNoun>an orc penis</labelNoun>
 		<description>A large orc penis.</description>
-		<descriptionHyperlinks><ThingDef>OrcPenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>OrcPenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>OrcPenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -99,12 +116,15 @@
 			</li>
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartPenis">
 		<defName>GhostPenis</defName>
 		<label>ghost penis</label>
 		<labelNoun>an ghost penis</labelNoun>
 		<description>A evanescent ghost penis, you can barely feel it.</description>
-		<descriptionHyperlinks><ThingDef>GhostPenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>GhostPenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>GhostPenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -115,12 +135,15 @@
 			</li>
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartPenis">
 		<defName>NecroPenis</defName>
 		<label>undead penis</label>
 		<labelNoun>an undead penis</labelNoun>
 		<description>A rotten, reanimated penis.</description>
-		<descriptionHyperlinks><ThingDef>NecroPenis</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>NecroPenis</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>NecroPenis</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -131,12 +154,15 @@
 			</li>
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
+
 	<rjw.HediffDef_PartBase ParentName="NaturalPrivatePartVagina">
 		<defName>GhostVagina</defName>
 		<label>ghost vagina</label>
 		<labelNoun>a ghost vagina</labelNoun>
 		<description>A evanescent ghost vagina, you can barely feel it.</description>
-		<descriptionHyperlinks><ThingDef>GhostVagina</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>GhostVagina</ThingDef>
+		</descriptionHyperlinks>
 		<spawnThingOnRemoved>GhostVagina</spawnThingOnRemoved>
 		<modExtensions>
 			<li Class="rjw.PartProps">
@@ -148,5 +174,4 @@
 		</modExtensions>
 	</rjw.HediffDef_PartBase>
 
-	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/ThingDefs/Items_BodyParts_Added.xml b/Common/Defs/ThingDefs/Items_BodyParts_Added.xml
index 9608642..0916c33 100644
--- a/Common/Defs/ThingDefs/Items_BodyParts_Added.xml
+++ b/Common/Defs/ThingDefs/Items_BodyParts_Added.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Defs>
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
@@ -10,7 +10,7 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>PigPenis</defName>
 		<label>screw penis</label>
@@ -20,7 +20,7 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>MarinePenis</defName>
 		<label>marine penis</label>
@@ -30,7 +30,7 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>TentaclePenis</defName>
 		<label>alien penis</label>
@@ -40,7 +40,7 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>GolemPenis</defName>
 		<label>golem penis</label>
@@ -50,7 +50,7 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>OrcPenis</defName>
 		<label>orc penis</label>
@@ -60,7 +60,7 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>GhostPenis</defName>
 		<label>ghost penis</label>
@@ -70,7 +70,7 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>NecroPenis</defName>
 		<label>undead penis</label>
@@ -80,17 +80,18 @@
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="rjw_BodyPartNaturalBaseGenMale">
 		<defName>GhostVagina</defName>
 		<label>ghost vagina</label>
-		<descriptionHyperlinks><ThingDef>GhostVagina</ThingDef></descriptionHyperlinks>
+		<descriptionHyperlinks>
+			<ThingDef>GhostVagina</ThingDef>
+		</descriptionHyperlinks>
 		<statBases>
 			<MarketValue>250</MarketValue>
 			<Mass>0.40</Mass>
 		</statBases>
 	</ThingDef>
-	
 
 
-</Defs>
+</Defs>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml
index 52f9333..996279c 100644
--- a/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Android_Quirk_Patch.xml
@@ -1,26 +1,44 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Android</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/VREAndroids.AndroidGeneDef[defName="VREA_SyntheticBody"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>RobotLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>RobotLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Android</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/VREAndroids.AndroidGeneDef[defName="VREA_SyntheticSkin"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>RobotLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>RobotLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-		<Operation Class="PatchOperationReplace">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Android</li>
+		</mods>
+		<match Class="PatchOperationReplace">
 			<xpath>/Defs/GeneCategoryDef[defName="VREA_Subroutine"]/displayPriorityInXenotype</xpath>
 			<value>
 				<displayPriorityInXenotype>10</displayPriorityInXenotype>
 			</value>
+		</match>
 	</Operation>
-</Patch>
 
+</Patch>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml
index 0f7e119..e6446ee 100644
--- a/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Archon_Quirk_Patch.xml
@@ -1,12 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Archon</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_Leatherskin"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>SkinLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>SkinLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-</Patch>
-
+	
+</Patch>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml
index bcb1e72..6d1c323 100644
--- a/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Fungoid_Quirk_Patch.xml
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Fungoid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_FungalCrest"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Fungoid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_HairMushroom"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Fungoid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_FungalFlesh"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-</Patch>
 
+</Patch>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml
index 0f69977..96a8448 100644
--- a/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Highmate_Quirk_Patch.xml
@@ -1,28 +1,45 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Highmate</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_FelineEars"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Highmate</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_FelineTail"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Highmate</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_PerfectBody"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>SkinLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>SkinLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-</Patch>
 
+</Patch>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml
index 475950c..4f029aa 100644
--- a/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Lycanthrope_Quirk_Patch.xml
@@ -1,20 +1,32 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Lycanthrope</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_ChestFur"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Lycanthrope</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_CanineTail"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>FurLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-</Patch>
 
+</Patch>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml
index 78089d4..daeaf09 100644
--- a/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Phytokin_Quirk_Patch.xml
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Phytokin</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_BarkSkin"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Phytokin</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_FoliageHair"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Phytokin</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_SapBlood"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>PlantLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-</Patch>
 
+</Patch>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml
index cf01f46..f225827 100644
--- a/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Sanguophage_Quirk_Patch.xml
@@ -1,44 +1,74 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Sanguophage</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_SanguineHair"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Sanguophage</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_BatEars"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+					<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Sanguophage</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_UpperBatEars"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+					<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Sanguophage</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_Talons"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>DemonLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Sanguophage</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRE_BatNose"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
+					<Satisfiedquirk>TeratophileQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-</Patch>
 
+</Patch>
\ No newline at end of file
diff --git a/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml b/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml
index 37188ff..c948d44 100644
--- a/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml
+++ b/Common/Patches/QuirkPatches/Saurid_Quirk_Patch.xml
@@ -1,44 +1,73 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<Operation Class="PatchOperationAddModExtension">
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Saurid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRESaurids_FrilledEars"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
-			<xpath>/Defs/GeneDef[defName="VRESaurids_CenterFrill"]</xpath>
-			<value>
-				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
-				</li>
-			</value>
-	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Saurid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRESaurids_GeckoTail"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Saurid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
+			<xpath>/Defs/GeneDef[defName="VRESaurids_CenterFrill"]</xpath>
+			<value>
+				<li Class="RJW_Genes.QirkExtension">
+					<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+				</li>
+			</value>
+		</match>
+	</Operation>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Saurid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRESaurids_SauridClaws"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-	<Operation Class="PatchOperationAddModExtension">
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Saurid</li>
+		</mods>
+		<match Class="PatchOperationAddModExtension">
 			<xpath>/Defs/GeneDef[defName="VRESaurids_ScaleSkin"]</xpath>
 			<value>
 				<li Class="RJW_Genes.QirkExtension">
-				<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
+					<Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
 				</li>
 			</value>
+		</match>
 	</Operation>
-</Patch>
 
+</Patch>
\ No newline at end of file