diff --git a/About/About.xml b/About/About.xml
index 809d945..a2eca98 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -8,10 +8,6 @@
 	<description>Adds Genes for RJW Content</description>
 	<url>https://steamcommunity.com/id/Vegapnk/myworkshopfiles/?appid=294100</url>
 	<modDependencies>
-		<li>
-			<packageId>Ludeon.RimWorld.Biotech</packageId>
-			<displayName>Biotech</displayName>
-		</li>
 		<li>
 			<packageId>rim.job.world</packageId>
 			<displayName>RimJobWorld</displayName>
@@ -31,16 +27,11 @@
 		</li>
 	</modDependencies>
 	<loadAfter>
-		<li>Ludeon.RimWorld</li>
-		<li>Ludeon.RimWorld.Royalty</li>
-		<li>Ludeon.RimWorld.Ideology</li>
-		<li>Ludeon.RimWorld.Biotech</li>
 		<li>rim.job.world</li>
 		<li>brrainz.harmony</li>
-		<li>OskarPotocki.VanillaFactionsExpanded.Core</li>
-		<li>sarg.alphaanimals</li>
-
-		<li>Sl4vP0weR.DominantGene</li>
+		<!--
+		<li>UnlimitedHugs.HugsLib</li>
+		-->
 	</loadAfter>
 
 </ModMetaData>
\ No newline at end of file
diff --git a/About/Manifest.xml b/About/Manifest.xml
index b1d6c81..b99a84a 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW-Genes</identifier>
-	<version>1.2.0</version>
+	<version>1.1.0</version>
 	<dependencies>
         <li>RimJobWorld</li>
 		<li>HugsLib</li>
 	</dependencies>
-	<incompatibleWith> 
-		<li>Male- and Female- Only Genes</li>
-	</incompatibleWith>
+	<incompatibleWith />
 	<loadAfter>
         <li>RimJobWorld</li>
 		<li>HugsLib</li>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ff0057..82a7e78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,13 +9,11 @@
 - Many new icons 
 - Custom background icons when Vanilla-Expanded-Framework is loaded
 - Sexual Age Drainer & Youth Fountain now change age as configured in XML
-- Draft for a Hive-Start Scenario
 
 **Internal:**
 
 - Renamed abilities to have _ability_ in their name, to not exactly match the gene-defnames.
 - Moved Insect-Incubator & Insect-Breeder to hive category and folders (from breeding)
-- Some exclusion-tags for Alpha Genes
 
 **Fixes:**
 
@@ -43,16 +41,6 @@ In general, the logic is the following:
 I am not sure if I want to have a specific mapping defining that queen can only mate with certain drones, let me know how you feel about it. 
 *Queens can be male*. I just used the female-term, but implementation is gender-neutral. 
 
-**On Alpha Genes** 
-
-Alpha genes might have colliding features, but I need some reports to find out about it. 
-I disabled the specific gender and the oviparious reproduction (when you have rjw-ovipos). 
-I recommend using alpha genes for the Hive-Playthroughs, as otherwise the Halamyr look a bit ... boring? 
-But i don't want to add a bunch of cosmetic genes on top of things. 
-
-*And what the fuck is a halamyr?* Well I had to name my little ants somehow. But I didn't want to call them `myr` as I maybe want to make some TiTs xenotypes separately.
-And I am aware that the TiTs-Myr work different than the things I built now. 
-
 # 1.1.4
 
 Fixes: 
diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index e0c5d0e..7e3fd40 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/Common/Defs/AbilityDefs/Ability_CockEater.xml b/Common/Defs/AbilityDefs/Ability_CockEater.xml
index 4a8f2e3..f74e38c 100644
--- a/Common/Defs/AbilityDefs/Ability_CockEater.xml
+++ b/Common/Defs/AbilityDefs/Ability_CockEater.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
-    <defName>rjw_genes_ability_cockeater</defName>
+    <defName>rjw_genes_cockeater</defName>
     <label>Eat Cock</label>
     <description>Eat the cock of another pawn, restoring fertilin based on the size of the cock.</description>
     <iconPath>Genes/Icons/cockeater</iconPath>
diff --git a/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
index 2a1577a..9e0e691 100644
--- a/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
+++ b/Common/Defs/AbilityDefs/Ability_CocoonWeaver.xml
@@ -4,7 +4,7 @@
     <defName>rjw_genes_ability_cocoonweaver</defName>
     <label>Cocoon</label>
     <description>Weaves the victim into a (self-sustaining) cocoon. The victim cannot move, but can be bred.</description>
-    <iconPath>Genes/Icons/Cocoon</iconPath>
+    <iconPath>Things/Mote/Heart</iconPath>
     <stunTargetWhileCasting>true</stunTargetWhileCasting>
     <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
diff --git a/Common/Defs/AbilityDefs/Ability_Flight.xml b/Common/Defs/AbilityDefs/Ability_Flight.xml
index d643940..82e6537 100644
--- a/Common/Defs/AbilityDefs/Ability_Flight.xml
+++ b/Common/Defs/AbilityDefs/Ability_Flight.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef>
-    <defName>rjw_genes_ability_flight</defName>
+    <defName>rjw_genes_flight</defName>
     <label>fly</label>
     <description>Fly to a short location using your wings.</description>
     <iconPath>Genes/Icons/Succubus_Wings</iconPath>
diff --git a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
index 778f4d9..06e5618 100644
--- a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
+++ b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef>
-    <defName>rjw_genes_ability_naked_prowess</defName>
+    <defName>rjw_genes_naked_prowess</defName>
     <label>naked prowess</label>
     <description>Enhance the strength and resilience of your naked body with fertilin.</description>
     <iconPath>Genes/Icons/rjw_naked_prowess</iconPath>
diff --git a/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml b/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
index 0d8959d..e327973 100644
--- a/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
+++ b/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
-    <defName>rjw_genes_ability_paralysingkiss</defName>
+    <defName>rjw_genes_paralysingkiss</defName>
     <label>paralysing kiss</label>
     <description>Paralyse someone briefly with a kiss.</description>
     <iconPath>Genes/Icons/rjw_genes_lips</iconPath>
diff --git a/Common/Defs/AbilityDefs/Ability_PussyHeal.xml b/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
index 4445bf2..8f97b60 100644
--- a/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
+++ b/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef ParentName="AbilityTouchBase">
-    <defName>rjw_genes_ability_pussyheal</defName>
+    <defName>rjw_genes_pussyheal</defName>
     <label>SexHeal</label>
     <description>Rape another pawn, so you can heal them with your vagina's special healing power.</description>
     <iconPath>Things/Mote/Heart</iconPath>
diff --git a/Common/Defs/AbilityDefs/Ability_Seduce.xml b/Common/Defs/AbilityDefs/Ability_Seduce.xml
index 595c348..65c281a 100644
--- a/Common/Defs/AbilityDefs/Ability_Seduce.xml
+++ b/Common/Defs/AbilityDefs/Ability_Seduce.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
   <AbilityDef>
-    <defName>rjw_genes_ability_seduce</defName>
+    <defName>rjw_genes_seduce</defName>
     <label>seduce</label>
     <description>Seduce the target to approach the caster.</description>
     <iconPath>Genes/Icons/seduce</iconPath>
diff --git a/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml b/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
index 7279149..771b61b 100644
--- a/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
+++ b/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
@@ -4,7 +4,8 @@
     <defName>rjw_genes_ability_spawn_spelopede</defName>
     <label>Insect Ally</label>
     <description>Generates a tame spelopede, ready to serve their master.</description>
-    <iconPath>Genes/Icons/Spelopede_Dispenser</iconPath>
+    <iconPath>World/WorldObjects/Expanding/Insects</iconPath>
+
     <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
     <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
 
diff --git a/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml b/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
index 8723630..82bdbc2 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
@@ -19,10 +19,10 @@
     <iconColor>(0.75, 0.75, 0.75)</iconColor>
     <displayOrderInCategory>1000</displayOrderInCategory>
 	<abilities>
-		 <li>rjw_genes_ability_flight</li>
+		 <li>rjw_genes_flight</li>
 	</abilities>
 	<descriptionHyperlinks>
-		<AbilityDef>rjw_genes_ability_flight</AbilityDef>
+		<AbilityDef>rjw_genes_flight</AbilityDef>
 	</descriptionHyperlinks>
     <biostatCpx>1</biostatCpx>
 	<biostatMet>-1</biostatMet>
diff --git a/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml b/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
index 4c27701..112d5cc 100644
--- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
@@ -77,12 +77,6 @@
     <iconPath>Genes/Icons/Ovipositor_Genitalia</iconPath>
     <geneClass>RJW_Genes.Gene_OvipositorGenitalia</geneClass>
     <displayOrderInCategory>808</displayOrderInCategory>
-
-    <exclusionTags>
-			<li>Egglaying</li>
-			<li>AG_Egglaying</li>
-		</exclusionTags>
-    
   </GeneDef>
 
 
diff --git a/Common/Defs/GeneDefs/GeneDefs_Hive.xml b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
index e4a747d..33c9c74 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Hive.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
@@ -12,12 +12,12 @@
 			</modExtensions>
 	</GeneDef>
 
-	<GeneDef ParentName="HiveBase">
+	<GeneDef ParentName="GeneGenitalTypeBase">
 		<defName>rjw_genes_queen</defName>
 		<label>Hive Queen</label>
 		<labelShortAdj>queen</labelShortAdj>
 		<description>This gene represents the royal caste amongst its xenotype. Children of a queen are usually born as sterile workers, unless the father was a drone. Having multiple (adult) queens leads to intense rivalry and can throw the whole colony into chaos!</description>
-		<iconPath>Genes/Icons/Queen</iconPath>
+		<iconPath>Genes/Icons/queen</iconPath>
 		<displayOrderInCategory>1</displayOrderInCategory>
 
 		<statOffsets>
@@ -57,7 +57,7 @@
 		<label>Hive Drone</label>
 		<labelShortAdj>drone</labelShortAdj>
 		<description>This gene represents the drone caste amongst its xenotype. Drones are highly specialised experts that ensure the hives functioning. Other than that, drones are the only xenotypes capable of producing fertile offspring with a queen.</description>
-		<iconPath>Genes/Icons/Drone</iconPath>
+		<iconPath>Genes/Icons/drone</iconPath>
 		<displayOrderInCategory>2</displayOrderInCategory>
 
 		<exclusionTags>
@@ -85,7 +85,7 @@
 		<label>Hive Worker</label>
 		<labelShortAdj>worker</labelShortAdj>
 		<description>This gene marks the lowest caste of a hive, the workers. Usually sterile, they are despised by higher castes and only live to serve with labour.</description>
-		<iconPath>Genes/Icons/Worker</iconPath>
+		<iconPath>Genes/Icons/worker</iconPath>
 		<displayOrderInCategory>3</displayOrderInCategory>
 
 		<exclusionTags>
@@ -121,12 +121,13 @@
 		<biostatMet>0</biostatMet>
 	</GeneDef>
 
+
 	<GeneDef ParentName="HiveBase">
 		<defName>rjw_genes_zealous_loyalty</defName>
 		<label>Zealous Loyalty</label>
 		<labelShortAdj>loyalty</labelShortAdj>
 		<description>Carriers of this gene are genetically wired to worship carriers of the 'Queen'-gene. They receive a massive relation-ship bonus towards the queen and a slight mood bonus. Having multiple queens in the colony causes severe distress.</description>
-		<iconPath>Genes/Icons/Loyalty</iconPath>
+		<iconPath>Things/Mote/Heart</iconPath>
 		<displayOrderInCategory>10</displayOrderInCategory>
 		
 		<exclusionTags>
@@ -166,7 +167,7 @@
 		<label>Spelopede Dispenser</label>
 		<labelShortAdj>spelopede</labelShortAdj>
 		<description>Carriers of this gene can generate tame spelopedes. Higher psychic-sensitivity will spawn more spelopedes.</description>
-		<iconPath>Genes/Icons/Spelopede_Dispenser</iconPath>
+		<iconPath>World/WorldObjects/Expanding/Insects</iconPath>
 		<displayOrderInCategory>12</displayOrderInCategory>
 		<abilities>
 			<li>rjw_genes_ability_spawn_spelopede</li>
@@ -198,6 +199,13 @@
     <displayOrderInCategory>53</displayOrderInCategory>
     <biostatCpx>1</biostatCpx>
     <biostatMet>-1</biostatMet>
+
+	<modExtensions>
+		<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+			<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+			<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+		</li>
+	</modExtensions>
   </GeneDef>
   
   <GeneDef>
diff --git a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
index 67f0994..9f5e291 100644
--- a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
@@ -74,10 +74,10 @@
 		<displayOrderInCategory>9</displayOrderInCategory>
 		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_ability_pussyheal</li>
+			<li>rjw_genes_pussyheal</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_pussyheal</AbilityDef>
+			<AbilityDef>rjw_genes_pussyheal</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -107,10 +107,10 @@
 		<displayOrderInCategory>11</displayOrderInCategory>
 		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_ability_cockeater</li>
+			<li>rjw_genes_cockeater</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_cockeater</AbilityDef>
+			<AbilityDef>rjw_genes_cockeater</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -140,10 +140,10 @@
 		<displayOrderInCategory>12</displayOrderInCategory>
 		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_ability_paralysingkiss</li>
+			<li>rjw_genes_paralysingkiss</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_paralysingkiss</AbilityDef>
+			<AbilityDef>rjw_genes_paralysingkiss</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -172,10 +172,10 @@
 		<displayOrderInCategory>13</displayOrderInCategory>
 		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_ability_seduce</li>
+			<li>rjw_genes_seduce</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_seduce</AbilityDef>
+			<AbilityDef>rjw_genes_seduce</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
@@ -204,10 +204,10 @@
 		<displayOrderInCategory>13</displayOrderInCategory>
 		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
-			<li>rjw_genes_ability_naked_prowess</li>
+			<li>rjw_genes_naked_prowess</li>
 		</abilities>
 		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_naked_prowess</AbilityDef>
+			<AbilityDef>rjw_genes_naked_prowess</AbilityDef>
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
diff --git a/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml b/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
index fae1f90..0cd226f 100644
--- a/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
@@ -10,17 +10,12 @@
         <geneClass>RJW_Genes.Gene_FemaleOnly</geneClass>
         <displayOrderInCategory>1</displayOrderInCategory>
 
-        <exclusionTags>
-          <li>AG_Gender</li>
-          <li>Gender</li>
-        </exclusionTags>
-        
         <modExtensions>
-          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-          </li>
-        </modExtensions>
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+			</li>
+		</modExtensions>
     </GeneDef>
 
     <GeneDef>
@@ -33,17 +28,12 @@
         <geneClass>RJW_Genes.Gene_MaleOnly</geneClass>
         <displayOrderInCategory>2</displayOrderInCategory>
         
-        <exclusionTags>
-          <li>AG_Gender</li>
-          <li>Gender</li>          
-        </exclusionTags>
-
         <modExtensions>
-          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-          </li>
-        </modExtensions>
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+			</li>
+		</modExtensions>
     </GeneDef>
     
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/GeneDefs/Xenotype_Hive.xml b/Common/Defs/GeneDefs/Xenotype_Hive.xml
index 91f6023..eebb914 100644
--- a/Common/Defs/GeneDefs/Xenotype_Hive.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Hive.xml
@@ -1,121 +1,44 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-  <!-- Alpha Genes ID: sarg.alphagenes -->
-
   <XenotypeDef>
-    <defName>rjw_genes_halamyr_queen_xenotype</defName>
-    <label>Halamyr Queen</label>
+    <defName>rjw_genes_test_queen_xenotype</defName>
+    <label>Test Queen</label>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Queen</iconPath>
-    <inheritable>false</inheritable>
-    <canGenerateAsCombatant>false</canGenerateAsCombatant>
+    <soundDefOnImplant>PawnBecameSanguophage</soundDefOnImplant>
 
-    <description>The Halamyr are a race of insect-xenotypes living in a caste-system. On top of the caste, the queens are the centerpiece of any hive. They are the only Halamyr that can produce drones, or mass-produce workers. A hive can virtually not live without a queen - without their royalty the drones and workers are irritated and receive sever penalties. Queens are very fragile and need to be kept safe and in best conditions.</description>
-    <descriptionShort>The fragile queens of the Halamyr are the center of the hives reproduction. Multiple queens, or and absence of a queen, can cause to fall the best hive into disarray real quick.</descriptionShort>
-    
     <genes>			
-        <li MayRequire="sarg.alphagenes" >AG_LargerBodySize</li>
-        <li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-        <li MayRequire="sarg.alphagenes" >AG_InsectJellyProduction</li>
-        <li MayRequire="sarg.alphagenes" >AG_SurvivalInstinct_Low</li>
-        <li>WoundHealing_Slow</li>
-        <li>PsychicAbility_Extreme</li>
-        <li>MoveSpeed_Slow</li>
-        <li>FireTerror</li>
-        <li>MeleeDamage_Weak</li>
-        <li>Sleepy</li>
-        <li>Delicate</li>
-        <li>rjw_genes_hypersexual</li>
-        <li>rjw_genes_bisexual</li>
-        <li>Libido_High</li>
-        <li>Beauty_Beautiful</li>
-        <li MayRequire="sarg.alphagenes" >AG_OutwardsAntennas</li>
-        <li>Skin_DeepRed</li>
-        <li>Learning_Fast</li>
-        <li>rjw_genes_fervent_ovipositor</li>
-        <li>AptitudeTerrible_Shooting</li>
-        <li>AptitudeTerrible_Melee</li>
-        <li>AptitudeRemarkable_Social</li>
-        <li>AptitudeRemarkable_Sex</li>
-        <li>rjw_genes_female_only</li>
-        <li>rjw_genes_ovipositor_genitalia</li>
-        <li>rjw_genes_aphrodisiac_pheromones</li>
         <li>rjw_genes_queen</li>
-        <li>rjw_genes_cocoonweaver</li>
-        <li>rjw_genes_spawn_spelopede</li>
+        <li>rjw_genes_hypersexual</li>
+        <li>rjw_genes_female_only</li>
+        <li>Fertile</li>
+        <li>Skin_PaleYellow</li>		
     </genes>
   </XenotypeDef>
   
   <XenotypeDef>
-    <defName>rjw_genes_halamyr_hiveguard_xenotype</defName>
-    <label>Halamyr Hiveguard</label>
+    <defName>rjw_genes_test_drone_xenotype</defName>
+    <label>Test Drone</label>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Guard</iconPath>
-
-    <combatPowerFactor>1.5</combatPowerFactor>
-    <inheritable>false</inheritable>
-
-    <description>The Halamyr hiveguards are the bastion to protect the hive. Next to the walls, these meele specialists form the ultimate guard for the queen, for which they'd give their lifes. Their tuned bodies come with a price, crippling them for social interactions and increased hunger.</description>
-    <descriptionShort>Frontline of the Halamyr, guards of the hive, specialised in meele combat. Heavily handicapped without a queen.</descriptionShort>
-    
     <genes>			
-        <li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-        <li MayRequire="sarg.alphagenes" >AG_EfficientMandibles</li>
-        <li>Immunity_Strong</li>
-        <li>WoundHealing_Fast</li>
-        <li>MoveSpeed_Quick</li>
-        <li>FireTerror</li>
-        <li>MeleeDamage_Strong</li>
-        <li>KillThirst</li>
-        <li>LowSleep</li>
-        <li MayRequire="sarg.alphagenes" >AG_WaspWings</li>
-        <li>Hair_ShortOnly</li>
-        <li MayRequire="sarg.alphagenes" >AG_DownwardsAntennas</li>
-        <li>Hair_DarkBlack</li>
-        <li>Skin_DeepRed</li>
-        <li MayRequire="sarg.alphagenes" >AG_FeraliskEyes</li>
-        <li>AptitudeTerrible_Shooting</li>
-        <li>AptitudeRemarkable_Melee</li>
-        <li>AptitudePoor_Construction</li>
-        <li>AptitudePoor_Cooking</li>
-        <li>AptitudePoor_Plants</li>
-        <li>AptitudePoor_Crafting</li>
-        <li>AptitudeTerrible_Artistic</li>
-        <li>AptitudeTerrible_Medicine</li>
-        <li>AptitudePoor_Social</li>
-        <li>rjw_genes_male_only</li>
-        <li>rjw_genes_ovipositor_genitalia</li>
         <li>rjw_genes_drone</li>
+        <li>rjw_genes_male_only</li>
         <li>rjw_genes_zealous_loyalty</li>
+        <li>Fertile</li>
+        <li>Skin_DeepRed</li>		
     </genes>
   </XenotypeDef>
   
   <XenotypeDef>
-    <defName>rjw_genes_halamyr_breeder_xenotype</defName>
-    <label>Halamyr Breeder</label>
+    <defName>rjw_genes_test_breeder_xenotype</defName>
+    <label>Test Breeder</label>
     <iconPath>Genes/Icons/Xenotypes/Xenotype-Breeder</iconPath>
-    <inheritable>false</inheritable>
-    <canGenerateAsCombatant>false</canGenerateAsCombatant>
-    <combatPowerFactor>0.8</combatPowerFactor>
-
-    <description>The Halamyr breeders are the last backbone of the hive. Their special genes allow them to carry more eggs and hatch them faster, enabling a steady output of hivelings. To support their position in the hive, breeders spend most of their life in the queens cocoon, a task which they gladly accept.</description>
-    <descriptionShort>Made for incubating Halamyr eggs, breeders spend most of their life in the queens cocoon.</descriptionShort>
-
     <genes>			
-      <li MayRequire="sarg.alphagenes" >AG_Spinnerets</li>
-			<li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-			<li MayRequire="sarg.alphagenes" >AG_InsectJellyProduction</li>
-			<li>FireTerror</li>
-			<li>VerySleepy</li>
-			<li>rjw_genes_bisexual</li>
-			<li MayRequire="sarg.alphagenes" >AG_BeeMandibles</li>
-			<li>Skin_DeepRed</li>
-			<li>AptitudeStrong_Social</li>
-			<li>rjw_genes_ovipositor_genitalia</li>
-			<li>rjw_genes_unbreakable</li>
-			<li>rjw_genes_drone</li>
-      <li>rjw_genes_female_only</li>
-			<li>rjw_genes_zealous_loyalty</li>
-			<li>rjw_genes_insectincubator</li>	
+        <li>rjw_genes_drone</li>
+        <li>rjw_genes_female_only</li>
+        <li>rjw_genes_zealous_loyalty</li>
+        <li>Fertile</li>
+        <li>Skin_DeepRed</li>		
     </genes>
   </XenotypeDef>
   
diff --git a/Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml b/Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml
index 1ccfebd..42cb052 100644
--- a/Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml
+++ b/Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml
@@ -8,35 +8,20 @@
 		<defName>rjw_genes_default_worker_genes</defName>
         <queenXenotype>default</queenXenotype>
 		<workerGenes>
-			<li>StrongStomach</li>
-			<li MayRequire="sarg.alphagenes" >AG_FasterAging</li>
-			<li>PsychicAbility_Dull</li>
-			<li>FireTerror</li>
-			<li>Sterile</li>
-			<li>AptitudeTerrible_Intellectual</li>
-			<li>rjw_genes_featureless_chest</li>
 			<li>rjw_genes_worker</li>
-			<li>rjw_genes_zealous_loyalty</li>	
+            <li>Sterile</li>
+			<li>rjw_genes_zealous_loyalty</li>
+            <li>Skin_Green</li>			
 		</workerGenes>
 	</RJW_Genes.QueenWorkerMappingDef>
 
 	<RJW_Genes.QueenWorkerMappingDef>
-        <defName>rjw_genes_halamyr_queen_worker_mapping</defName>
-        <queenXenotype>rjw_genes_halamyr_queen_xenotype</queenXenotype>
+        <defName>rjw_genes_test_queen_worker_mapping</defName>
+        <queenXenotype>rjw_genes_test_queen_xenotype</queenXenotype>
 		<workerGenes>
-			<li MayRequire="sarg.alphagenes" >AG_SmallerBodySize</li>
-			<li>StrongStomach</li>
-			<li MayRequire="sarg.alphagenes" >AG_EfficientMandibles</li>
-			<li MayRequire="sarg.alphagenes" >AG_FasterAging</li>
-			<li>PsychicAbility_Dull</li>
-			<li>FireTerror</li>
-			<li>Sterile</li>
-			<li MayRequire="sarg.alphagenes" >AG_FormicAntennas</li>
-			<li>Skin_DeepRed</li>
-			<li>AptitudeTerrible_Intellectual</li>
-			<li>rjw_genes_featureless_chest</li>
 			<li>rjw_genes_worker</li>
 			<li>rjw_genes_zealous_loyalty</li>
+            <li>Skin_InkBlack</li>		
 		</workerGenes>
 	</RJW_Genes.QueenWorkerMappingDef>
 	
diff --git a/Common/Defs/Scenarios/Halamyr_Hive.xml b/Common/Defs/Scenarios/Halamyr_Hive.xml
deleted file mode 100644
index 338a611..0000000
--- a/Common/Defs/Scenarios/Halamyr_Hive.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <ScenarioDef>
-    <defName>rjw_genes_scenario_halamyr_hive</defName>
-    <label>Halamyr Hive</label>
-    <description>A young queen set out to build a new hive. After a long path, a suitable place is found to generate new offspring. DEVNOTE: Try to choose a high-food biome to keep up with the Hive!</description>
-    <scenario>
-      <summary>A Halamyr queen set out to build a new hive.</summary>
-      <playerFaction>
-        <def>PlayerFaction</def>
-        <factionDef>PlayerTribe</factionDef>
-      </playerFaction>
-      <parts>
-
-
-        <!-- Config pages -->
-        <li Class="ScenPart_ConfigPage_ConfigureStartingPawns_Xenotypes">
-          <def>ConfigurePawnsXenotypes</def>
-          <pawnChoiceCount>4</pawnChoiceCount>
-          <customSummary>Start with a set of Halamyr Xenotypes and one other colonist of any age.</customSummary>
-
-          <xenotypeCounts>
-            <li>
-              <xenotype>rjw_genes_halamyr_queen_xenotype</xenotype>
-              <count>1</count>
-              <description>non-baby halamyr queen</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>rjw_genes_halamyr_hiveguard_xenotype</xenotype>
-              <count>1</count>
-              <description>non-baby halamyr hiveguard</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>rjw_genes_halamyr_breeder_xenotype</xenotype>
-              <count>1</count>
-              <description>adulthalamyr breeder</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>Baseliner</xenotype>
-              <count>1</count>
-            </li>
-          </xenotypeCounts>
-        </li>
-
-        <!-- Player starting stuff spawn method-->
-        <li Class="ScenPart_PlayerPawnsArriveMethod">
-          <def>PlayerPawnsArriveMethod</def>
-          <method>Standing</method>
-        </li>
-
-        <!-- Player pawns modifiers -->
-        <li Class="ScenPart_ForcedHediff">
-          <def>ForcedHediff</def>
-          <visible>false</visible>
-          <context>PlayerStarter</context>
-          <chance>0.5</chance>
-          <hediff>Malnutrition</hediff>
-          <severityRange>0.2~0.4</severityRange>
-        </li>
-        <li Class="ScenPart_SetNeedLevel">
-          <def>SetNeedLevel</def>
-          <visible>false</visible>
-          <context>PlayerStarter</context>
-          <chance>1.0</chance>
-          <need>Food</need>
-          <levelRange>0~0.1</levelRange>
-        </li>
-
-        <!-- Player starting things -->
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>Silver</thingDef>
-          <count>200</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>Pemmican</thingDef>
-          <count>150</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>InsectJelly</thingDef>
-          <count>300</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>MedicineHerbal</thingDef>
-          <count>20</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>MeleeWeapon_Club</thingDef>
-          <stuff>WoodLog</stuff>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>MeleeWeapon_Knife</thingDef>
-          <stuff>Jade</stuff>
-        </li>
-
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>Pila</thingDef>
-        </li>
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Spelopede</animalKind>
-          <count>2</count>
-        </li>
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Megascarab</animalKind>
-          <count>3</count>
-          <bondToRandomPlayerPawnChance>1.0</bondToRandomPlayerPawnChance>
-        </li>
-
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Megaspider</animalKind>
-          <count>1</count>
-        </li>
-
-        <!-- Scatter some things near player start -->
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>WoodLog</thingDef>
-          <count>500</count>
-        </li>
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>Jade</thingDef>
-          <count>100</count>
-        </li>
-
-        <!-- Game start dialog -->
-        <li Class="ScenPart_GameStartDialog">
-          <def>GameStartDialog</def>
-          <text>After a long journey, this is it: \n\nThis is the right place to start the new hive. Spin in your breeders, build your defenses and start mating.\n\nMake this a place worthy for a queen.</text>
-          <closeSound>GameStartSting</closeSound>
-        </li>
-
-      </parts>
-    </scenario>
-  </ScenarioDef>
-
-</Defs>
\ No newline at end of file
diff --git a/Common/Textures/Genes/Icons/Cocoon.png b/Common/Textures/Genes/Icons/Cocoon.png
index 4e62420..5e9b0bc 100644
Binary files a/Common/Textures/Genes/Icons/Cocoon.png and b/Common/Textures/Genes/Icons/Cocoon.png differ
diff --git a/Common/Textures/Genes/Icons/Cum-Base.png b/Common/Textures/Genes/Icons/Cum-Base.png
deleted file mode 100644
index 05ec22a..0000000
Binary files a/Common/Textures/Genes/Icons/Cum-Base.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Egg.png b/Common/Textures/Genes/Icons/Egg.png
index 81b16bd..a635f14 100644
Binary files a/Common/Textures/Genes/Icons/Egg.png and b/Common/Textures/Genes/Icons/Egg.png differ
diff --git a/Common/Textures/Genes/Icons/Extra_Vagina.png b/Common/Textures/Genes/Icons/Extra_Vagina.png
index 12bb91a..4c93501 100644
Binary files a/Common/Textures/Genes/Icons/Extra_Vagina.png and b/Common/Textures/Genes/Icons/Extra_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Fervent_Ovipositor.png b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png
index b9cc33e..daa1704 100644
Binary files a/Common/Textures/Genes/Icons/Fervent_Ovipositor.png and b/Common/Textures/Genes/Icons/Fervent_Ovipositor.png differ
diff --git a/Common/Textures/Genes/Icons/Insect_Breeder.png b/Common/Textures/Genes/Icons/Insect_Breeder.png
index 5315179..4898614 100644
Binary files a/Common/Textures/Genes/Icons/Insect_Breeder.png and b/Common/Textures/Genes/Icons/Insect_Breeder.png differ
diff --git a/Common/Textures/Genes/Icons/Loose_Vagina.png b/Common/Textures/Genes/Icons/Loose_Vagina.png
index 57a4706..c1b5808 100644
Binary files a/Common/Textures/Genes/Icons/Loose_Vagina.png and b/Common/Textures/Genes/Icons/Loose_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Loyalty.png b/Common/Textures/Genes/Icons/Loyalty.png
index 8ac3c4c..f7cbe57 100644
Binary files a/Common/Textures/Genes/Icons/Loyalty.png and b/Common/Textures/Genes/Icons/Loyalty.png differ
diff --git a/Common/Textures/Genes/Icons/No_Cum.png b/Common/Textures/Genes/Icons/No_Cum.png
index a7964f0..8bcdc81 100644
Binary files a/Common/Textures/Genes/Icons/No_Cum.png and b/Common/Textures/Genes/Icons/No_Cum.png differ
diff --git a/Common/Textures/Genes/Icons/No_Vagina.png b/Common/Textures/Genes/Icons/No_Vagina.png
index a4f47ee..ec99f03 100644
Binary files a/Common/Textures/Genes/Icons/No_Vagina.png and b/Common/Textures/Genes/Icons/No_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png
index 97421e1..a2b5806 100644
Binary files a/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png and b/Common/Textures/Genes/Icons/Ovipositor_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Pheromone.png b/Common/Textures/Genes/Icons/Pheromone.png
deleted file mode 100644
index 342f695..0000000
Binary files a/Common/Textures/Genes/Icons/Pheromone.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Slime_Genitalia.png b/Common/Textures/Genes/Icons/Slime_Genitalia.png
index 91e6cd0..09bbd61 100644
Binary files a/Common/Textures/Genes/Icons/Slime_Genitalia.png and b/Common/Textures/Genes/Icons/Slime_Genitalia.png differ
diff --git a/Common/Textures/Genes/Icons/Spelopede_Dispenser.png b/Common/Textures/Genes/Icons/Spelopede_Dispenser.png
deleted file mode 100644
index 4308892..0000000
Binary files a/Common/Textures/Genes/Icons/Spelopede_Dispenser.png and /dev/null differ
diff --git a/Common/Textures/Genes/Icons/Tight_Vagina.png b/Common/Textures/Genes/Icons/Tight_Vagina.png
index eab0606..cd8be97 100644
Binary files a/Common/Textures/Genes/Icons/Tight_Vagina.png and b/Common/Textures/Genes/Icons/Tight_Vagina.png differ
diff --git a/Common/Textures/Genes/Icons/Vitality_Drainer.png b/Common/Textures/Genes/Icons/Vitality_Drainer.png
index 1de65a9..eb310c1 100644
Binary files a/Common/Textures/Genes/Icons/Vitality_Drainer.png and b/Common/Textures/Genes/Icons/Vitality_Drainer.png differ
diff --git a/Common/Textures/Genes/Icons/drone.png b/Common/Textures/Genes/Icons/drone.png
index a631565..e600639 100644
Binary files a/Common/Textures/Genes/Icons/drone.png and b/Common/Textures/Genes/Icons/drone.png differ
diff --git a/Common/Textures/Genes/Icons/much_cum.png b/Common/Textures/Genes/Icons/much_cum.png
index 21a9a17..412030f 100644
Binary files a/Common/Textures/Genes/Icons/much_cum.png and b/Common/Textures/Genes/Icons/much_cum.png differ
diff --git a/Common/Textures/Genes/Icons/queen.png b/Common/Textures/Genes/Icons/queen.png
index b087f03..8ef515f 100644
Binary files a/Common/Textures/Genes/Icons/queen.png and b/Common/Textures/Genes/Icons/queen.png differ
diff --git a/Common/Textures/Genes/Icons/very_much_cum.png b/Common/Textures/Genes/Icons/very_much_cum.png
index f2fedc1..0e692ff 100644
Binary files a/Common/Textures/Genes/Icons/very_much_cum.png and b/Common/Textures/Genes/Icons/very_much_cum.png differ
diff --git a/Common/Textures/Genes/Icons/worker.png b/Common/Textures/Genes/Icons/worker.png
index 1f4e0c8..743caa0 100644
Binary files a/Common/Textures/Genes/Icons/worker.png and b/Common/Textures/Genes/Icons/worker.png differ
diff --git a/README.md b/README.md
index cbffc9d..f0a12ac 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@ This mod adds genes related and based on RJW to Rimworld.
 - Mech Breeding / Insect Breeding Additions 
 - Human-Animal Gene Inheritance merged from [Shabakur](https://github.com/Shabakur/RJW_Animal_Gene_Inheritance)
 - Succubi, Incubi & Cumazones that utilize Fertilin, similar to Hemogen
-- Insect-Caste Mechanics, with Queens, Drones and Workers and a conditional reproduction
 
 See [planned things](TODOS.md) and feel free to contribute. 
 With the Human-Animal-Gene Inheritance we have a lot of XML that you can contribute! 
@@ -39,5 +38,4 @@ Please load this after any mod adding genes, and after the used RJW-Mods (Licent
 **Conflicts:**
 1. Should not be used with the original RJW_Animal_Gene_Inheritance anymore. 
 2. There was an issue with other "Male-Only / Female-Only" Mods --- for which we provide our own Genes now. 
-3. CAI5000 will not crash, but will make *Seduce*-Ability fail. I think same goes for Combat Extended.
-4. Alpha Genes "Female / Male Only" Genes might overwrite later Genitalia-Changes and should be avoided in combination with RJW-Genes Features.
\ No newline at end of file
+3. CAI5000 will not crash, but will make *Seduce*-Ability fail. I think same goes for Combat Extended.
\ No newline at end of file