diff --git a/Content/Base/Defs/_Extra_Races.xml b/Content/Base/Defs/_Extra_Races.xml
index dbaa345..97fd24a 100644
--- a/Content/Base/Defs/_Extra_Races.xml
+++ b/Content/Base/Defs/_Extra_Races.xml
@@ -440,6 +440,34 @@
 		<hasPregnancy>false</hasPregnancy>
 	</rjw.RaceGroupDef>
 
+	<rjw.RaceGroupDef>
+		<defName>ArthropodOvipositorAnimalSingleGender</defName>
+		<raceNames>
+			<li>BroodLord</li>
+			<li>Bulwark</li>
+			<li>Harvester</li>
+			<li>Prowler</li>
+			<li>Terrorworm</li>
+			<li>Visceral</li>
+		</raceNames>
+		<anuses>
+			<li>InsectAnus</li>
+		</anuses>
+		<femaleBreasts />
+		<femaleGenitals />
+		<maleBreasts />
+		<maleGenitals>
+			<li>OvipositorM</li>
+		</maleGenitals>
+		<tags>
+			<li>Chitin</li>
+		</tags>
+		<oviPregnancy>true</oviPregnancy>
+		<ImplantEggs>true</ImplantEggs>
+		<raceSexDrive>0.5</raceSexDrive>
+		<hasSingleGender>true</hasSingleGender>
+	</rjw.RaceGroupDef>
+
 	<rjw.RaceGroupDef>
 		<defName>CactoidGroup</defName>
 		<raceNames>
diff --git a/ReadMe.md b/ReadMe.md
index 3e63c57..e8d41a0 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -24,7 +24,7 @@ This mod requires RJW and must be placed somewhere below it.
 * Arachne Race (Continued) https://steamcommunity.com/workshop/filedetails/?id=2571931604
 * Archotech Race https://steamcommunity.com/sharedfiles/filedetails/?id=2500371387
 * Argonians of Blackmarsh (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263851875
-* +Astoriel https://steamcommunity.com/sharedfiles/filedetails/?id=1342510409
+* -Astoriel https://steamcommunity.com/sharedfiles/filedetails/?id=1342510409
 * Barky's Lupaios Race Pack https://steamcommunity.com/sharedfiles/filedetails/?id=1718452287
 * Beast Man Tribes https://steamcommunity.com/sharedfiles/filedetails/?id=1119191638
 * Beetle People (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2568676996
@@ -32,9 +32,9 @@ This mod requires RJW and must be placed somewhere below it.
 * +Borderlands: The Rim https://steamcommunity.com/sharedfiles/filedetails/?id=1911170462
 * Cactaceae (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2025692982
 * -Call of Cthulhu - Elder Things (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2305644684
-* -Call of Cthulhu - Cosmic Horrors https://steamcommunity.com/sharedfiles/filedetails/?id=765890823--
+* Call of Cthulhu - Cosmic Horrors https://steamcommunity.com/sharedfiles/filedetails/?id=765890823--
 * Call of Cthulhu - Cults https://steamcommunity.com/sharedfiles/filedetails/?id=815039373
-* +Callistans (Legacy) https://steamcommunity.com/sharedfiles/filedetails/?id=1545178908
+* -Callistans (Legacy) https://steamcommunity.com/sharedfiles/filedetails/?id=1545178908
 * +Callistan Robotics https://steamcommunity.com/sharedfiles/filedetails/?id=1661171313
 * Dinosauria https://steamcommunity.com/workshop/filedetails/?id=1136958577
 * -Dragon's Descent https://steamcommunity.com/workshop/filedetails/?id=2026992161
@@ -45,27 +45,27 @@ This mod requires RJW and must be placed somewhere below it.
 * Erin's Palamutes https://steamcommunity.com/sharedfiles/filedetails/?id=2485624026
 * [FCP] Stupid Sexy Deathclaws https://steamcommunity.com/sharedfiles/filedetails/?id=2635389101
 * Fantasy Goblins Updated https://steamcommunity.com/sharedfiles/filedetails/?id=2011680079
-* +Feles - Felines of the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=2690125435
+* -Feles - Felines of the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=2690125435
 * Filthy Orc Invasion (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2178698397
 * -Forgotten Realms https://steamcommunity.com/sharedfiles/filedetails/?id=2184183669
 * Gods of Elona https://steamcommunity.com/sharedfiles/filedetails/?id=1505332648
-* [Dead?]Half Dragons https://steamcommunity.com/sharedfiles/filedetails/?id=2556121262
+* +Half Dragons https://steamcommunity.com/sharedfiles/filedetails/?id=2556121262
 * Hisa Faction https://steamcommunity.com/sharedfiles/filedetails/?id=1617772184
-* -Horrors (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2036315072
+* Horrors (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2036315072
 * House Maid Nukos https://steamcommunity.com/sharedfiles/filedetails/?id=1418683071
 * +Ikquan Race https://steamcommunity.com/sharedfiles/filedetails/?id=2489566052
 * +Jello People https://steamcommunity.com/sharedfiles/filedetails/?id=1741456572
 * kemomimihouse https://steamcommunity.com/sharedfiles/filedetails/?id=2075974335
 * +Kenshi Hiver Race https://steamcommunity.com/sharedfiles/filedetails/?id=1840737944
 * +Kenshi Skeleton Race https://steamcommunity.com/sharedfiles/filedetails/?id=1841876651
-* -Kijin Race 2.0 https://steamcommunity.com/sharedfiles/filedetails/?id=1918120749
+* Kijin Race 3.0 https://steamcommunity.com/sharedfiles/filedetails/?id=2884551646
 * -Kilhn Race https://steamcommunity.com/sharedfiles/filedetails/?id=2025689796
-* [Dead?]Klickmala Race https://steamcommunity.com/sharedfiles/filedetails/?id=2489566199
+* Klickmala Race [Continued] https://steamcommunity.com/sharedfiles/filedetails/?id=2806331695
 * Kolra's Oni Race Mod (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2411504950
 * Kurin HAR Edition https://steamcommunity.com/workshop/filedetails/?id=2326430787
 * Lapelli Race https://steamcommunity.com/sharedfiles/filedetails/?id=2025057326
 * Lizardmen (Continued) https://steamcommunity.com/workshop/filedetails/?id=2777768013
-* +Lighter Than Fast https://steamcommunity.com/sharedfiles/filedetails/?id=1240656304
+* -Lighter Than Fast https://steamcommunity.com/sharedfiles/filedetails/?id=1240656304
 * +Lliscean https://steamcommunity.com/sharedfiles/filedetails/?id=2124019366
 * Megafauna https://steamcommunity.com/workshop/filedetails/?id=1055485938
 * Mincho, The Mint Choco Slime ~ HAR ver. https://steamcommunity.com/sharedfiles/filedetails/?id=2477501851
@@ -76,11 +76,11 @@ This mod requires RJW and must be placed somewhere below it.
 * Nexomon https://steamcommunity.com/sharedfiles/filedetails/?id=2764736074
 * -Ni'Hal https://steamcommunity.com/sharedfiles/filedetails/?id=1541567184
 * -Nyaron Race https://steamcommunity.com/sharedfiles/filedetails/?id=1854376306
-* +Oni of the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=1632244750
+* -Oni of the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=1632244750
 * Ooka Miko https://steamcommunity.com/sharedfiles/filedetails/?id=1536817379
 * Orassans https://steamcommunity.com/sharedfiles/filedetails/?id=1541519487
 * Pawnbold Race https://steamcommunity.com/sharedfiles/filedetails/?id=2104039874
-* +Poleepkwa Race https://steamcommunity.com/sharedfiles/filedetails/?id=2557294864
+* Poleepkwa Race [1.3] https://steamcommunity.com/sharedfiles/filedetails/?id=2557294864
 * -Protogen! Marley Race Mod https://steamcommunity.com/sharedfiles/filedetails/?id=1716136868
 * -Rabbie The Moonrabbit race https://steamcommunity.com/sharedfiles/filedetails/?id=1837246563
 * Race to the Rim https://steamcommunity.com/sharedfiles/filedetails/?id=2325478123
@@ -89,7 +89,7 @@ This mod requires RJW and must be placed somewhere below it.
 * -Rimcraft https://steamcommunity.com/workshop/filedetails/?id=1686288212
 * RimWorld - Witcher Monster Hunt https://steamcommunity.com/sharedfiles/filedetails/?id=2008529522
 * Royal Thrumbos (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2846919540
-* -Save Our Ship 2 https://steamcommunity.com/workshop/filedetails/?id=1909914131
+* Save Our Ship 2 https://steamcommunity.com/workshop/filedetails/?id=1909914131
 * -ShadowRimRaces https://steamcommunity.com/sharedfiles/filedetails/?id=2444008208
 * [Dead?]Simple Ogre Race https://steamcommunity.com/sharedfiles/filedetails/?id=1873766929
 * Skrix - An Insect-like Race https://steamcommunity.com/sharedfiles/filedetails/?id=2267078474
@@ -99,7 +99,7 @@ This mod requires RJW and must be placed somewhere below it.
 * SYR Thrumkin https://steamcommunity.com/sharedfiles/filedetails/?id=2017359567
 * -The GiantRace https://steamcommunity.com/sharedfiles/filedetails/?id=2270904535
 * Tree People (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2568676212
-* Twi'lek Race (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263363126&searchtext=race
+* Twi'lek Race (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263363126
 * +Tyrannosaur Race https://steamcommunity.com/sharedfiles/filedetails/?id=2567384337
 * Vanilla Animals Expanded https://steamcommunity.com/workshop/filedetails/?id=1884025115
 * Vanilla Genetics Expanded https://steamcommunity.com/sharedfiles/filedetails/?id=2801160906
@@ -113,20 +113,14 @@ This mod requires RJW and must be placed somewhere below it.
 * +[WH40K]Adeptus Xenobiologis: Orkoids https://steamcommunity.com/workshop/filedetails/?id=1541518264/
 * Xenohumans - Anthromorphs https://steamcommunity.com/sharedfiles/filedetails/?id=2349467636
 * -Yokai? https://steamcommunity.com/sharedfiles/filedetails/?id=1532938687
-* Zabrak Race (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263389593&searchtext=race
+* Zabrak Race (Continued) https://steamcommunity.com/sharedfiles/filedetails/?id=2263389593
 
 ## Plans
 * Maintain
-* Rock skin type for golems
-* Eldritch and/or undead skin type? Or Necrophilia?
-* Improve marsupial parts
 * Animal breeding balancing and testing
 * Egg and milk fixes and improvements
 ### Mod support
-* Kenshi shek race
 * VFE insects
-* Android tiers
-* RimEffect
 * Update milk mod support
 * Keep an eye out for Fallout Ghoul
 * FCP vertibirds, dogmeat
diff --git a/generator/src/racegroups.rs b/generator/src/racegroups.rs
index 11ee249..94f418e 100644
--- a/generator/src/racegroups.rs
+++ b/generator/src/racegroups.rs
@@ -637,12 +637,6 @@ pub fn racegroup_data_animals() -> Vec<RaceGroup> {
 				"Archospider",
 				"Arthropleura",
 				"Pulmonoscorpius",
-				"Visceral",
-				"Prowler",
-				"Harvester",
-				"BroodLord",
-				"Terrorworm",
-				"Bulwark",
 			],
 			"Arthropod",
 			"Chitin", "0.7", Some(false),