diff --git a/code/citadel/races.dm b/code/citadel/races.dm
index 7ce119ee66..9892d3508e 100644
--- a/code/citadel/races.dm
+++ b/code/citadel/races.dm
@@ -242,7 +242,7 @@ datum
 			generic="leporid"
 			adjective="hoppy"
 			tail=1
-			attack_verb = "kick"
+			attack_verb = "kick" */
 		lizard
 			name="lizard"
 			id="lizard"
@@ -250,7 +250,8 @@ datum
 			adjective="scaled"
 			taur="naga"
 			tail=1
-		murid // i have no idea what this is
+			restricted=2
+	/*	murid // i have no idea what this is
 			name="murid"
 			id="murid"
 			say_mod = "squeaks"
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 4a9efad27d..959890e109 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -195,6 +195,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(needs_update == -2)		//fatal, can't load any data
 		return 0
 
+	if(!S["species"] || !config.mutant_races)
+		S["species"]		<< new /datum/species/human()
+
 	//general preferences
 	S["ooccolor"]			>> ooccolor
 	S["lastchangelog"]		>> lastchangelog
@@ -296,17 +299,21 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		return 0
 
 	//Species
-	var/species_id
-	S["species"]			>> species_id
-	if(config.mutant_races && species_id && (species_id in roundstart_species))
-		var/newtype = roundstart_species[species_id]
+	/*var/species_name
+	S["species"]			>> species_name
+	if(config.mutant_races && species_name && (species_name in roundstart_species))
+		var/newtype = roundstart_species[species_name]
 		pref_species = new newtype()
 	else
-		var/rando_race = pick(config.roundstart_races)
-		pref_species = new rando_race()
+		pref_species = new /datum/species/human()
 
 	if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
-		S["features["mcolor"]"]	<< "#FFF"
+		S["features["mcolor"]"]	<< "#FFF"*/
+
+	if(!S["species"] || !config.mutant_races)
+		S["species"]		<< new /datum/species/human()
+	//if(!S["mutant_color"] || S["mutant_color"] == "#000")
+	//	S["mutant_color"]	<< "#FFF"
 
 	//Character
 	S["Flavor_Text"]			>> flavor_text
@@ -344,6 +351,22 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["cyborg_name"]		>> custom_names["cyborg"]
 	S["religion_name"]		>> custom_names["religion"]
 	S["deity_name"]			>> custom_names["deity"]
+	S["species"]			>> pref_species
+
+	//Customs
+	S["mutant_tail"]		>> mutant_tail
+	S["mutant_wing"]		>> mutant_wing
+	S["wingcolor"]			>> wingcolor
+	//S["special_color_one"]	>> special_color_one
+	//S["special_color_two"]	>> special_color_two
+	//S["special_color"]		>> special_color
+	S["be_taur"]			>> be_taur
+	S["vore_ability"]		>> vore_ability
+	S["vore_banned_methods"]>> vore_banned_methods
+	S["vore_extra_bans"]	>> vore_extra_bans
+	S["character_size"]		>> character_size
+	S["p_cock"]				>> p_cock
+	S["p_vagina"]			>> p_vagina
 
 	//Jobs
 	S["userandomjob"]		>> userandomjob
@@ -364,10 +387,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Sanitize
 	flavor_text		= sanitize_text(flavor_text, initial(flavor_text))
 	real_name		= reject_bad_name(real_name)
-	if(!features["mcolor"] || features["mcolor"] == "#000")
-		features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
-	if(!real_name)
-		real_name = random_unique_name(gender)
+	//if(!(pref_species in species_list))
+	if(!(pref_species))
+		pref_species = new /datum/species/human()
+	//if(!mutant_color || mutant_color == "#000")
+	//	mutant_color = "#FFF"
+	if(!real_name)	real_name = random_unique_name(gender)
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
 	be_random_body	= sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
 	gender			= sanitize_gender(gender)
@@ -398,6 +423,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	features["spines"] 	= sanitize_inlist(features["spines"], spines_list)
 	features["body_markings"] 	= sanitize_inlist(features["body_markings"], body_markings_list)
 
+	vore_ability=sanitize_vore_list(vore_ability)
+	if(isnull(vore_banned_methods))vore_banned_methods=0
+	if(isnull(vore_extra_bans))vore_extra_bans=65535
+	if(isnull(p_vagina)) p_vagina=gender==FEMALE
+	if(isnull(p_cock))
+		p_cock=list("has"=gender==MALE,"type"="human","color"="900")
+
 	userandomjob	= sanitize_integer(userandomjob, 0, 1, initial(userandomjob))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
 	job_civilian_med = sanitize_integer(job_civilian_med, 0, 65535, initial(job_civilian_med))
@@ -454,6 +486,19 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["cyborg_name"]		<< custom_names["cyborg"]
 	S["religion_name"]		<< custom_names["religion"]
 	S["deity_name"]			<< custom_names["deity"]
+	S["species"]			<< pref_species
+	//Custom
+	S["mutant_tail"]		<< mutant_tail
+	S["mutant_wing"]		<< mutant_wing
+	S["wingcolor"]			<< wingcolor
+	//S["special_color"]		<< special_color
+	S["be_taur"]			<< be_taur
+	S["vore_ability"]		<< vore_ability
+	S["vore_banned_methods"]<< vore_banned_methods
+	S["vore_extra_bans"]	<< vore_extra_bans
+	S["character_size"]		<< character_size
+	S["p_cock"]				<< p_cock
+	S["p_vagina"]			<< p_vagina
 
 	//Jobs
 	S["userandomjob"]		<< userandomjob
diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi
index 7ca9c8ad60..49970b67ea 100644
Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ