diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Aerofleet.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Aerofleet.xml
index ced9b3a..5ae93b1 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Aerofleet.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Aerofleet.xml
@@ -9,6 +9,25 @@
 		</raceNames>
 	
 		<genes>
+      <li>
+        <defName>Delicate</defName>
+        <chance>0.4</chance>
+      </li>
+      <li>
+        <defName>AptitudePoor_Melee</defName>
+        <chance>0.3</chance>
+      </li>
+      <li>
+        <defName>AptitudeTerrible_Mining</defName>
+        <chance>0.3</chance>
+      </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_UnsettlingAppearance</defName>
+        <chance>0.15</chance>
+      </li>
       <li>
         <defName>AG_SlimeBlood</defName>
         <chance>0.5</chance>
@@ -33,30 +52,14 @@
         <defName>AG_SmallerBodySize</defName>
         <chance>0.2</chance>
       </li>
-			<li>
-				<defName>AG_Detonation</defName>
-				<chance>0.05</chance>
-			</li>
+      <li>
+        <defName>AG_Detonation</defName>
+        <chance>0.05</chance>
+      </li>
       <li>
         <defName>AG_BlueGelProduction</defName>
         <chance>0.15</chance>
       </li>
-      <li>
-        <defName>Delicate</defName>
-        <chance>0.4</chance>
-      </li>
-      <li>
-        <defName>AptitudePoor_Melee</defName>
-        <chance>0.3</chance>
-      </li>
-      <li>
-        <defName>AptitudeTerrible_Mining</defName>
-        <chance>0.3</chance>
-      </li>
-      <li>
-        <defName>AG_UnsettlingAppearance</defName>
-        <chance>0.15</chance>
-      </li>
 
       <!-- Genitalia -->
       
@@ -75,6 +78,25 @@
     </raceNames>
 
     <genes>
+      <li>
+        <defName>Delicate</defName>
+        <chance>0.3</chance>
+      </li>
+      <li>
+        <defName>AptitudePoor_Melee</defName>
+        <chance>0.3</chance>
+      </li>
+      <li>
+        <defName>AptitudeTerrible_Mining</defName>
+        <chance>0.3</chance>
+      </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_UnsettlingAppearance</defName>
+        <chance>0.15</chance>
+      </li>
       <li>
         <defName>AG_SlimeBlood</defName>
         <chance>0.5</chance>
@@ -107,23 +129,7 @@
         <defName>AG_BlueGelProduction</defName>
         <chance>0.25</chance>
       </li>
-      <li>
-        <defName>Delicate</defName>
-        <chance>0.3</chance>
-      </li>
-      <li>
-        <defName>AptitudePoor_Melee</defName>
-        <chance>0.3</chance>
-      </li>
-      <li>
-        <defName>AptitudeTerrible_Mining</defName>
-        <chance>0.3</chance>
-      </li>
-      <li>
-        <defName>AG_UnsettlingAppearance</defName>
-        <chance>0.15</chance>
-      </li>
-      
+
       <!-- Genitalia -->
 
       <li>
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AngelMoth.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AngelMoth.xml
index e2024b1..9716d16 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AngelMoth.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AngelMoth.xml
@@ -7,23 +7,27 @@
 			<li>AA_AngelMoth</li>
 		</raceNames>
 		<genes>
-			<li>
-				<defName>AG_MothWings</defName>
-				<chance>0.75</chance>
-			</li>
-			<li>
-				<defName>AG_MothAntennae</defName>
-				<chance>0.75</chance>
-			</li>
 			<li>
 				<defName>Skin_PaleYellow</defName>
 				<chance>0.75</chance>
 			</li>
-			<li>
-				<defName>AG_ParasiticStinger</defName>
-				<chance>1</chance>
-			</li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_ParasiticStinger</defName>
+        <chance>1</chance>
+      </li>
+      <li>
+        <defName>AG_MothWings</defName>
+        <chance>0.75</chance>
+      </li>
+      <li>
+        <defName>AG_MothAntennae</defName>
+        <chance>0.75</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcticLion.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcticLion.xml
index d265b4f..5f2a10d 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcticLion.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcticLion.xml
@@ -15,10 +15,6 @@
         <defName>Hair_SnowWhite</defName>
         <chance>0.75</chance>
       </li>
-			<li>
-				<defName>AG_FrostbiteResistance</defName>
-				<chance>0.05</chance>
-			</li>
 			<li>
 				<defName>MinTemp_LargeDecrease</defName>
 				<chance>0.25</chance>
@@ -35,7 +31,15 @@
 				<defName>rjw_genes_big_male_genitalia</defName>
 				<chance>0.8</chance>
 			</li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_FrostbiteResistance</defName>
+        <chance>0.05</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcturanSkyEel.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcturanSkyEel.xml
index d9665cf..c00c7b5 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcturanSkyEel.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_ArcturanSkyEel.xml
@@ -11,22 +11,10 @@
 				<defName>rjw_genes_skin_skysteel</defName>
 				<chance>0.5</chance>
 			</li>
-			<li>
-				<defName>AG_ScalyBody</defName>
-				<chance>0.5</chance>
-			</li>
       <li>
         <defName>Body_Thin</defName>
         <chance>0.5</chance>
       </li>
-			<li>
-				<defName>AG_Zap</defName>
-				<chance>0.25</chance>
-			</li>
-			<li>
-				<defName>AG_FrostbiteResistance</defName>
-				<chance>0.2</chance>
-			</li>
 			<li>
 				<defName>MinTemp_LargeDecrease</defName>
 				<chance>0.33</chance>
@@ -35,7 +23,23 @@
 				<defName>MinTemp_SmallDecrease</defName>
 				<chance>0.6</chance>
 			</li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_FrostbiteResistance</defName>
+        <chance>0.2</chance>
+      </li>
+      <li>
+        <defName>AG_Zap</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AG_ScalyBody</defName>
+        <chance>0.5</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Atispec.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Atispec.xml
index 90e2ae9..17c73fa 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Atispec.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Atispec.xml
@@ -7,10 +7,6 @@
 			<li>AA_LarvalAtispec</li>
 		</raceNames>
 		<genes>
-			<li>
-				<defName>AG_RayHoundTentacles</defName>
-				<chance>0.5</chance>
-			</li>
       <li>
         <defName>Body_Thin</defName>
         <chance>0.5</chance>
@@ -19,18 +15,10 @@
         <defName>Skin_DeepRed</defName>
         <chance>0.75</chance>
       </li>
-			<li>
-				<defName>AG_WaspWings</defName>
-				<chance>0.05</chance>
-			</li>
       <li>
         <defName>Delicate</defName>
         <chance>0.4</chance>
       </li>
-      <li>
-        <defName>AG_BiggerBodySize</defName>
-        <chance>0.1</chance>
-      </li>
       <li>
         <defName>AptitudeGood_Melee</defName>
         <chance>0.05</chance>
@@ -55,7 +43,23 @@
         <defName>Sleepy</defName>
         <chance>0.15</chance>
       </li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_BiggerBodySize</defName>
+        <chance>0.1</chance>
+      </li>
+      <li>
+        <defName>AG_WaspWings</defName>
+        <chance>0.05</chance>
+      </li>
+      <li>
+        <defName>AG_RayHoundTentacles</defName>
+        <chance>0.5</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 
   <RJW_BGS.RaceGeneDef ParentName = "Insect">
@@ -64,10 +68,6 @@
       <li>AA_Atispec</li>
     </raceNames>
     <genes>
-      <li>
-        <defName>AG_RayHoundTentacles</defName>
-        <chance>0.5</chance>
-      </li>
       <li>
         <defName>Body_Hulk</defName>
         <chance>0.5</chance>
@@ -76,18 +76,10 @@
         <defName>Skin_DeepRed</defName>
         <chance>0.75</chance>
       </li>
-      <li>
-        <defName>AG_WaspWings</defName>
-        <chance>0.15</chance>
-      </li>
       <li>
         <defName>Robust</defName>
         <chance>0.2</chance>
       </li>
-      <li>
-        <defName>AG_BiggerBodySize</defName>
-        <chance>0.25</chance>
-      </li>
       <li>
         <defName>AptitudeGood_Melee</defName>
         <chance>0.25</chance>
@@ -112,6 +104,22 @@
         <defName>Sleepy</defName>
         <chance>0.15</chance>
       </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_BiggerBodySize</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AG_WaspWings</defName>
+        <chance>0.15</chance>
+      </li>
+      <li>
+        <defName>AG_RayHoundTentacles</defName>
+        <chance>0.5</chance>
+      </li>
+      
     </genes>
   </RJW_BGS.RaceGeneDef>
 	
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AuroraSlyph.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AuroraSlyph.xml
index 430bc13..6262d3f 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AuroraSlyph.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_AuroraSlyph.xml
@@ -7,18 +7,6 @@
 			<li>AA_AuroraSylph</li>
 		</raceNames>
 		<genes>
-      <li>
-        <defName>AG_BodyTentacles</defName>
-        <chance>0.5</chance>
-      </li>
-			<li>
-				<defName>AG_LightSustenance</defName>
-				<chance>0.05</chance>
-			</li>
-      <li>
-        <defName>AG_FrostbiteResistance</defName>
-        <chance>0.1</chance>
-      </li>
       <li>
         <defName>MaxTemp_LargeDecrease</defName>
         <chance>0.25</chance>
@@ -43,7 +31,23 @@
         <defName>Delicate</defName>
         <chance>0.3</chance>
       </li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_BodyTentacles</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_LightSustenance</defName>
+        <chance>0.05</chance>
+      </li>
+      <li>
+        <defName>AG_FrostbiteResistance</defName>
+        <chance>0.1</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Barbslinger.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Barbslinger.xml
index 0cb37a3..e27121c 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Barbslinger.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Barbslinger.xml
@@ -7,14 +7,6 @@
 			<li>AA_Barbslinger</li>
 		</raceNames>
 		<genes>
-      <li>
-        <defName>AG_PincerMandibles</defName>
-        <chance>0.75</chance>
-      </li>
-      <li>
-        <defName>AG_LargerBodySize</defName>
-        <chance>0.3</chance>
-      </li>
       <li>
         <defName>AptitudeGood_Melee</defName>
         <chance>0.25</chance>
@@ -23,7 +15,19 @@
         <defName>AptitudeRemarkable_Melee</defName>
         <chance>0.1</chance>
       </li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_PincerMandibles</defName>
+        <chance>0.75</chance>
+      </li>
+      <li>
+        <defName>AG_LargerBodySize</defName>
+        <chance>0.3</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BedBug.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BedBug.xml
index 0d90a95..7bbaf8b 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BedBug.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BedBug.xml
@@ -7,30 +7,10 @@
 			<li>AA_BedBug</li>
 		</raceNames>
 		<genes>
-			<li>
-				<defName>AG_FormicAntennas</defName>
-				<chance>0.5</chance>
-			</li>
-      <li>
-        <defName>AG_PincerMandibles</defName>
-        <chance>0.5</chance>
-      </li>
-      <li>
-        <defName>AG_Proboscis</defName>
-        <chance>0.5</chance>
-      </li>
       <li>
         <defName>Skin_DeepRed</defName>
         <chance>0.5</chance>
       </li>
-      <li>
-        <defName>AG_SmallerBodySize</defName>
-        <chance>0.1</chance>
-      </li>
-      <li>
-        <defName>AG_WaspWings</defName>
-        <chance>0.15</chance>
-      </li>
       <li>
         <defName>Delicate</defName>
         <chance>0.3</chance>
@@ -39,7 +19,31 @@
         <defName>AptitudeTerrible_Melee</defName>
         <chance>0.1</chance>
       </li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_SmallerBodySize</defName>
+        <chance>0.1</chance>
+      </li>
+      <li>
+        <defName>AG_WaspWings</defName>
+        <chance>0.15</chance>
+      </li>
+      <li>
+        <defName>AG_FormicAntennas</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_PincerMandibles</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_Proboscis</defName>
+        <chance>0.5</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BlackHive.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BlackHive.xml
index 43decdd..ada43ce 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BlackHive.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BlackHive.xml
@@ -7,18 +7,10 @@
 			<li>AA_BlackScarab</li>
 		</raceNames>
 		<genes>
-      <li>
-        <defName>AG_Tusks</defName>
-        <chance>0.5</chance>
-      </li>
       <li>
         <defName>Skin_InkBlack</defName>
         <chance>0.5</chance>
       </li>
-      <li>
-        <defName>AG_SmallerBodySize</defName>
-        <chance>0.3</chance>
-      </li>
       <li>
         <defName>Aggression_Aggressive</defName>
         <chance>0.15</chance>
@@ -43,6 +35,18 @@
         <defName>FireWeakness</defName>
         <chance>0.2</chance>
       </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_SmallerBodySize</defName>
+        <chance>0.3</chance>
+      </li>
+      <li>
+        <defName>AG_Tusks</defName>
+        <chance>0.5</chance>
+      </li>
+      
     </genes>
 	</RJW_BGS.RaceGeneDef>
 
@@ -52,10 +56,6 @@
       <li>AA_BlackSpelopede</li>
     </raceNames>
     <genes>
-      <li>
-        <defName>AG_Tusks</defName>
-        <chance>0.5</chance>
-      </li>
       <li>
         <defName>Skin_InkBlack</defName>
         <chance>0.5</chance>
@@ -92,6 +92,14 @@
         <defName>AcidSpray</defName>
         <chance>0.1</chance>
       </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_Tusks</defName>
+        <chance>0.5</chance>
+      </li>
+      
     </genes>
   </RJW_BGS.RaceGeneDef>
 
@@ -101,18 +109,10 @@
       <li>AA_MegaLouse</li>
     </raceNames>
     <genes>
-      <li>
-        <defName>AG_Tusks</defName>
-        <chance>0.5</chance>
-      </li>
       <li>
         <defName>Skin_InkBlack</defName>
         <chance>0.5</chance>
       </li>
-      <li>
-        <defName>AG_SmallerBodySize</defName>
-        <chance>0.1</chance>
-      </li>
       <li>
         <defName>Aggression_Aggressive</defName>
         <chance>0.2</chance>
@@ -141,6 +141,18 @@
         <defName>Robust</defName>
         <chance>0.2</chance>
       </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_SmallerBodySize</defName>
+        <chance>0.1</chance>
+      </li>
+      <li>
+        <defName>AG_Tusks</defName>
+        <chance>0.5</chance>
+      </li>
+      
     </genes>
   </RJW_BGS.RaceGeneDef>
 
@@ -150,18 +162,10 @@
       <li>AA_BlackSpider</li>
     </raceNames>
     <genes>
-      <li>
-        <defName>AG_Tusks</defName>
-        <chance>0.5</chance>
-      </li>
       <li>
         <defName>Skin_InkBlack</defName>
         <chance>0.5</chance>
       </li>
-      <li>
-        <defName>AG_LargerBodySize</defName>
-        <chance>0.15</chance>
-      </li>
       <li>
         <defName>Aggression_Aggressive</defName>
         <chance>0.3</chance>
@@ -194,6 +198,18 @@
         <defName>AcidSpray</defName>
         <chance>0.15</chance>
       </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_LargerBodySize</defName>
+        <chance>0.15</chance>
+      </li>
+      <li>
+        <defName>AG_Tusks</defName>
+        <chance>0.5</chance>
+      </li>
+      
     </genes>
   </RJW_BGS.RaceGeneDef>
 
@@ -203,18 +219,10 @@
       <li>AA_MammothWorm</li>
     </raceNames>
     <genes>
-      <li>
-        <defName>AG_Tusks</defName>
-        <chance>0.5</chance>
-      </li>
       <li>
         <defName>Skin_InkBlack</defName>
         <chance>0.5</chance>
       </li>
-      <li>
-        <defName>AG_LargerBodySize</defName>
-        <chance>0.4</chance>
-      </li>
       <li>
         <defName>Aggression_DeadCalm</defName>
         <chance>0.15</chance>
@@ -239,6 +247,18 @@
         <defName>MoveSpeed_Slow</defName>
         <chance>0.15</chance>
       </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_LargerBodySize</defName>
+        <chance>0.4</chance>
+      </li>
+      <li>
+        <defName>AG_Tusks</defName>
+        <chance>0.5</chance>
+      </li>
+      
     </genes>
   </RJW_BGS.RaceGeneDef>
 
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Bouldermite.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BoulderMit.xml
similarity index 79%
rename from Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Bouldermite.xml
rename to Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BoulderMit.xml
index a3c0b34..40114ed 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Bouldermite.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_BoulderMit.xml
@@ -2,9 +2,9 @@
 <Defs>
 
 	<RJW_BGS.RaceGeneDef>
-		<defName>Bouldermite</defName>
+		<defName>BoulderMit</defName>
 		<raceNames>
-			<li>AA_Bouldermite</li>
+			<li>AA_BoulderMit</li>
 		</raceNames>
 		<genes>
       <li>
@@ -15,50 +15,18 @@
         <defName>Eyes_Red</defName>
         <chance>0.5</chance>
       </li>
-      <li>
-        <defName>AG_HivelingVoice</defName>
-        <chance>0.5</chance>
-      </li>
-			<li>
-				<defName>AG_RockyBody</defName>
-				<chance>0.5</chance>
-			</li>
-      <li>
-        <defName>AG_BeeMandibles</defName>
-        <chance>0.5</chance>
-      </li>
-      <li>
-        <defName>AG_CrabClaw</defName>
-        <chance>0.2</chance>
-      </li>
-      <li>
-        <defName>AptitudeGood_Melee</defName>
-        <chance>0.15</chance>
-      </li>
       <li>
         <defName>Robust</defName>
         <chance>0.15</chance>
       </li>
-      <li>
-        <defName>AG_PackMule</defName>
-        <chance>0.25</chance>
-      </li>
       <li>
         <defName>AptitudeRemarkable_Mining</defName>
         <chance>0.2</chance>
       </li>
-      <li>
-        <defName>AG_Filthy</defName>
-        <chance>0.25</chance>
-      </li>
       <li>
         <defName>MoveSpeed_Slow</defName>
         <chance>0.45</chance>
       </li>
-      <li>
-        <defName>AG_UnsettlingAppearance</defName>
-        <chance>0.2</chance>
-      </li>
       <li>
         <defName>Aggression_DeadCalm</defName>
         <chance>0.15</chance>
@@ -67,6 +35,45 @@
         <defName>AptitudePoor_Intellectual</defName>
         <chance>0.2</chance>
       </li>
+      <li>
+        <defName>AptitudePoor_Social</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AptitudePoor_Plants</defName>
+        <chance>0.25</chance>
+      </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_UnsettlingAppearance</defName>
+        <chance>0.2</chance>
+      </li>
+      <li>
+        <defName>AG_Filthy</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AG_PackMule</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AG_HivelingVoice</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_RockyBody</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_BeeMandibles</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_CrabClaw</defName>
+        <chance>0.2</chance>
+      </li>
 
       <!-- Genitalia -->
       
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Bumbledrone.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Bumbledrone.xml
index 132eb2c..2d38520 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Bumbledrone.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Bumbledrone.xml
@@ -10,27 +10,11 @@
       <li>
         <defName>Skin_PaleYellow</defName>
         <chance>0.75</chance>
-      </li>
-			<li>
-				<defName>AG_DownwardsAntennas</defName>
-				<chance>0.5</chance>
-			</li>
-      <li>
-        <defName>AG_BeeMandibles</defName>
-        <chance>0.5</chance>
       </li>
       <li>
         <defName>Head_Gaunt</defName>
         <chance>0.5</chance>
       </li>
-      <li>
-        <defName>AG_SmallerBodySize</defName>
-        <chance>0.08</chance>
-      </li>
-      <li>
-        <defName>AG_WaspWings</defName>
-        <chance>0.3</chance>
-      </li>
       <li>
         <defName>Delicate</defName>
         <chance>0.3</chance>
@@ -51,7 +35,27 @@
         <defName>Libido_High</defName>
         <chance>0.15</chance>
       </li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_SmallerBodySize</defName>
+        <chance>0.08</chance>
+      </li>
+      <li>
+        <defName>AG_WaspWings</defName>
+        <chance>0.3</chance>
+      </li>
+      <li>
+        <defName>AG_DownwardsAntennas</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_BeeMandibles</defName>
+        <chance>0.5</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Cactipine.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Cactipine.xml
index ab03fb7..e582c93 100644
--- a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Cactipine.xml
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_Cactipine.xml
@@ -18,10 +18,6 @@
       <li>
         <defName>Tail_Furry</defName>
         <chance>0.5</chance>
-      </li>
-      <li>
-        <defName>AG_SmallerBodySize</defName>
-        <chance>0.1</chance>
       </li>
 			<li>
 				<defName>MaxTemp_LargeIncrease</defName>
@@ -43,7 +39,15 @@
         <defName>AptitudePoor_Melee</defName>
         <chance>0.1</chance>
       </li>
-		</genes>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_SmallerBodySize</defName>
+        <chance>0.1</chance>
+      </li>
+      
+    </genes>
 	</RJW_BGS.RaceGeneDef>
 	
 </Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_CrystalMit.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_CrystalMit.xml
new file mode 100644
index 0000000..72dc243
--- /dev/null
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_CrystalMit.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<RJW_BGS.RaceGeneDef>
+		<defName>CrystalMit</defName>
+		<raceNames>
+			<li>AA_CrystalMit</li>
+		</raceNames>
+		<genes>
+      <li>
+        <defName>Skin_Purple</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>Skin_Blue</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>Robust</defName>
+        <chance>0.15</chance>
+      </li>
+      <li>
+        <defName>AptitudeRemarkable_Mining</defName>
+        <chance>0.2</chance>
+      </li>
+      <li>
+        <defName>AptitudeGood_Crafting</defName>
+        <chance>0.2</chance>
+      </li>
+      <li>
+        <defName>MoveSpeed_Slow</defName>
+        <chance>0.45</chance>
+      </li>
+      <li>
+        <defName>Aggression_DeadCalm</defName>
+        <chance>0.15</chance>
+      </li>
+      <li>
+        <defName>AptitudePoor_Intellectual</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AptitudePoor_Social</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AptitudePoor_Plants</defName>
+        <chance>0.25</chance>
+      </li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_MetalEater</defName>
+        <chance>0.35</chance>
+      </li>
+      <li>
+        <defName>AG_UnsettlingAppearance</defName>
+        <chance>0.2</chance>
+      </li>
+      <li>
+        <defName>AG_Filthy</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AG_PackMule</defName>
+        <chance>0.25</chance>
+      </li>
+      <li>
+        <defName>AG_RockVoice</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_RockyBody</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_RockSpurs</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_BeeMandibles</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AG_CrabClaw</defName>
+        <chance>0.2</chance>
+      </li>
+
+      <!-- Genitalia -->
+      
+      <!-- Needs custom crab like or stone penis -->
+      
+		</genes>
+	</RJW_BGS.RaceGeneDef>
+	
+</Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_CrystallineCaracal.xml b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_CrystallineCaracal.xml
new file mode 100644
index 0000000..f3fc1bd
--- /dev/null
+++ b/Common/Defs/RaceGeneDefs/Mod_AlphaAnimals/AA_RaceGeneDefs_CrystallineCaracal.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+	
+	<RJW_BGS.RaceGeneDef Name ="ArcticLion" ParentName = "Feline">
+		<defName>CrystallineCaracal</defName>
+		<raceNames>
+			<li>AA_CrystallineCaracal</li>
+		</raceNames>
+		<genes>
+			<li>
+				<defName>Skin_PaleRed</defName>
+				<chance>0.5</chance>
+			</li>
+      <li>
+        <defName>Hair_Pink</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>Hair_Blue</defName>
+        <chance>0.5</chance>
+      </li>
+      <li>
+        <defName>AptitudeTerrible_Social</defName>
+        <chance>0.3</chance>
+      </li>
+      <li>
+        <defName>MaxTemp_SmallIncrease</defName>
+        <chance>0.1</chance>
+      </li>
+
+      <!-- With BE-Core / BE-Mammalia / BE-Mythic installed -->
+
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_UVPowered_Mild</defName>
+        <chance>0.2</chance>
+      </li>
+      
+      <!-- ToDo -->
+      
+      <!--
+            - UV Laser Ranged Attack 
+            - Needs to eat meat and plants to survive
+            - High market value
+       -->
+      
+		</genes>
+	</RJW_BGS.RaceGeneDef>
+	
+</Defs>
\ No newline at end of file
diff --git a/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml b/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml
index dbc05f0..ae064cb 100644
--- a/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml
+++ b/Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml
@@ -77,7 +77,7 @@
 				<chance>0.3</chance>
 			</li>
 
-			<!-- With AlphaAnimals/AlphaGenes installed -->
+			<!-- With AlphaAnimals / AlphaGenes installed -->
 
       <li>
         <defName>AG_InsectJellyProduction</defName>
@@ -135,17 +135,25 @@
 				<defName>DarkVision</defName>
 				<chance>0.25</chance>
 			</li>
+      <li>
+        <defName>FastRunner</defName>
+        <chance>0.1</chance>
+      </li>
 			<li>
 				<defName>rjw_genes_feline_genitalia</defName>
 				<chance>0.25</chance>
 			</li>
 
-      <!-- With AlphaAnimals/AlphaGenes installed -->
+      <!-- With AlphaAnimals / AlphaGenes installed -->
 
       <li>
         <defName>AG_Clean</defName>
         <chance>0.2</chance>
       </li>
+      <li>
+        <defName>AG_Thalassophobia</defName>
+        <chance>0.2</chance>
+      </li>
       
 		</genes>
 	</RJW_BGS.RaceGeneDef>
@@ -263,8 +271,20 @@
 			<li>
 				<defName>Body_Thin</defName>
 				<chance>0.45</chance>
-			</li>			
-		</genes> 
+			</li>
+
+      <!-- With AlphaAnimals / AlphaGenes installed -->
+
+      <li>
+        <defName>AG_RatAffinity</defName>
+        <chance>0.1</chance>
+      </li>
+      <li>
+        <defName>AG_EfficientMandibles</defName>
+        <chance>0.3</chance>
+      </li>
+      
+    </genes> 
 	</RJW_BGS.RaceGeneDef>
 
 	<RJW_BGS.RaceGeneDef Name = "Racoon">