fixes

code/__HELPERS/mobs.dm

@@ -142,7 +142,6 @@
 
 	//For now we will always return none for tail_human and ears. | "For now" he says.
 	return(list(
-		"ethcolor" = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)],
 		"tail_cat" = "None",
 		"tail_lizard" = "Smooth",
 		"wings" = "None",

code/datums/dna.dm

@@ -198,8 +198,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 	. = ""
 	var/list/L = new /list(DNA_FEATURE_BLOCKS)
 
-	if(features["ethcolor"])
-		L[DNA_ETHEREAL_COLOR_BLOCK] = sanitize_hexcolor(features["ethcolor"], include_crunch = FALSE)
 	if(features["body_markings"])
 		L[DNA_LIZARD_MARKINGS_BLOCK] = construct_block(GLOB.body_markings_list.Find(features["body_markings"]), GLOB.body_markings_list.len)
 	if(features["tail_cat"])
@@ -338,8 +336,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 	if(!ishuman(holder))
 		CRASH("Non-human mobs shouldn't have DNA")
 	switch(blocknumber)
-		if(DNA_ETHEREAL_COLOR_BLOCK)
-			set_uni_feature_block(blocknumber, sanitize_hexcolor(features["ethcolor"], include_crunch = FALSE))
 		if(DNA_LIZARD_MARKINGS_BLOCK)
 			set_uni_feature_block(blocknumber, construct_block(GLOB.body_markings_list.Find(features["body_markings"]), GLOB.body_markings_list.len))
 		if(DNA_TAIL_BLOCK)
@@ -618,8 +614,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 	else
 		hairstyle = GLOB.hairstyles_list[deconstruct_block(get_uni_identity_block(structure, DNA_HAIRSTYLE_BLOCK), GLOB.hairstyles_list.len)]
 	var/features = dna.unique_features
-	if(dna.features["ethcolor"])
-		dna.features["ethcolor"] = sanitize_hexcolor(get_uni_feature_block(features, DNA_ETHEREAL_COLOR_BLOCK))
 	if(dna.features["body_markings"])
 		dna.features["body_markings"] = GLOB.body_markings_list[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_MARKINGS_BLOCK), GLOB.body_markings_list.len)]
 	if(dna.features["snout"])

code/modules/antagonists/brother/brother.dm

@@ -111,8 +111,9 @@
 /datum/antagonist/brother/get_base_preview_icon()
 	var/mob/living/carbon/human/dummy/consistent/brother1 = new
 	var/mob/living/carbon/human/dummy/consistent/brother2 = new
+	var/datum/color_palette/generic_colors/located = brother1.dna.color_palettes[/datum/color_palette/generic_colors]
 
-	brother1.dna.features["ethcolor"] = GLOB.color_list_ethereal["Faint Red"]
+	located.ethereal_color = GLOB.color_list_ethereal["Faint Red"]
 	brother1.set_species(/datum/species/ethereal)
 
 	brother2.dna.features["moth_antennae"] = "Plain"

code/modules/client/preferences/species_features/ethereal.dm

@@ -30,4 +30,4 @@
 	return values
 
 /datum/preference/choiced/ethereal_color/apply_to_human(mob/living/carbon/human/target, value)
-	target.dna.features["ethcolor"] = GLOB.color_list_ethereal[value]
+	return

code/modules/mob/living/carbon/human/dummy.dm

@@ -97,7 +97,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	target.dna.initialize_dna(/datum/blood_type/crew/human/o_plus, skip_index = TRUE)
 	target.dna.features["body_markings"] = "None"
 	target.dna.features["ears"] = "None"
-	target.dna.features["ethcolor"] = COLOR_WHITE
 	target.dna.features["frills"] = "None"
 	target.dna.features["horns"] = "None"
 	target.dna.features["moth_antennae"] = "Plain"
@@ -128,6 +127,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	var/datum/color_palette/generic_colors/palette = target.dna.color_palettes[/datum/color_palette/generic_colors]
 	palette.mutant_color = COLOR_VIBRANT_LIME
 	palette.mutant_color_secondary = COLOR_VIBRANT_LIME
+	palette.ethereal_color = COLOR_WHITE
 
 /// Provides a dummy that is consistently bald, white, naked, etc.
 /mob/living/carbon/human/dummy/consistent

code/modules/mob/living/carbon/human/species_types/ethereal.dm

@@ -274,5 +274,6 @@
 
 /datum/species/ethereal/lustrous/on_species_gain(mob/living/carbon/new_lustrous, datum/species/old_species, pref_load)
 	..()
-	default_color = new_lustrous.dna.features["ethcolor"]
-	new_lustrous.dna.features["ethcolor"] = GLOB.color_list_lustrous[pick(GLOB.color_list_lustrous)] //Picks one of 5 lustrous-specific colors.
+	var/datum/color_palette/generic_colors/palette = new_lustrous.dna.color_palettes[/datum/color_palette/generic_colors]
+	default_color = palette.ethereal_color
+	palette.ethereal_color = GLOB.color_list_lustrous[pick(GLOB.color_list_lustrous)] //Picks one of 5 lustrous-specific colors.

code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm

@@ -7,7 +7,7 @@
 	unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
 	unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
 	palette = /datum/color_palette/generic_colors
-	palette_key = MUTANT_COLOR
+	palette_key = "ethereal_color"
 
 /obj/item/bodypart/head/ethereal/update_limb(dropping_limb, is_creating)
 	. = ..()
@@ -23,7 +23,7 @@
 	is_dimorphic = FALSE
 	dmg_overlay_type = null
 	palette = /datum/color_palette/generic_colors
-	palette_key = MUTANT_COLOR
+	palette_key = "ethereal_color"
 
 /obj/item/bodypart/chest/ethereal/update_limb(dropping_limb, is_creating)
 	. = ..()
@@ -41,7 +41,7 @@
 	unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
 	unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
 	palette = /datum/color_palette/generic_colors
-	palette_key = MUTANT_COLOR
+	palette_key = "ethereal_color"
 
 /obj/item/bodypart/arm/left/ethereal/update_limb(dropping_limb, is_creating)
 	. = ..()
@@ -59,7 +59,7 @@
 	unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
 	unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
 	palette = /datum/color_palette/generic_colors
-	palette_key = MUTANT_COLOR
+	palette_key = "ethereal_color"
 
 /obj/item/bodypart/arm/right/ethereal/update_limb(dropping_limb, is_creating)
 	. = ..()
@@ -77,7 +77,7 @@
 	unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
 	unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
 	palette = /datum/color_palette/generic_colors
-	palette_key = MUTANT_COLOR
+	palette_key = "ethereal_color"
 
 /obj/item/bodypart/leg/left/ethereal/update_limb(dropping_limb, is_creating)
 	. = ..()
@@ -94,7 +94,7 @@
 	unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
 	unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
 	palette = /datum/color_palette/generic_colors
-	palette_key = MUTANT_COLOR
+	palette_key = "ethereal_color"
 
 /obj/item/bodypart/leg/right/ethereal/update_limb(dropping_limb, is_creating)
 	. = ..()

monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm

@@ -68,7 +68,8 @@
 	if(!ishuman(new_ethereal))
 		return
 	var/mob/living/carbon/human/ethereal = new_ethereal
-	default_color = ethereal.dna.features["ethcolor"]
+	var/datum/color_palette/generic_colors/palette = ethereal.dna.color_palettes[/datum/color_palette/generic_colors]
+	default_color = palette.ethereal_color
 	r1 = GETREDPART(default_color)
 	g1 = GETGREENPART(default_color)
 	b1 = GETBLUEPART(default_color)
@@ -104,14 +105,16 @@
 	return randname
 
 /datum/species/ethereal/randomize_features(mob/living/carbon/human/human_mob)
-	human_mob.dna.features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
+	var/datum/color_palette/generic_colors/palette = human_mob.dna.color_palettes[/datum/color_palette/generic_colors]
+	palette.ethereal_color = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)]
 
 /datum/species/ethereal/spec_updatehealth(mob/living/carbon/human/ethereal)
 	. = ..()
+	var/datum/color_palette/generic_colors/palette = ethereal.dna.color_palettes[/datum/color_palette/generic_colors]
 	if(!ethereal_light)
 		return
-	if(default_color != ethereal.dna.features["ethcolor"])
-		var/new_color = ethereal.dna.features["ethcolor"]
+	if(default_color != palette.ethereal_color)
+		var/new_color = palette.ethereal_color
 		r1 = GETREDPART(new_color)
 		g1 = GETGREENPART(new_color)
 		b1 = GETBLUEPART(new_color)

monkestation/code/modules/surgery/organs/external/ethereal_accessories.dm

@@ -12,8 +12,10 @@
 	bodypart_overlay = /datum/bodypart_overlay/mutant/ethereal_horns
 
 /datum/bodypart_overlay/mutant/ethereal_horns
-	layers = EXTERNAL_FRONT|EXTERNAL_BEHIND
+	layers = EXTERNAL_FRONT|EXTERNAL_ADJACENT
 	feature_key = "ethereal_horns"
+	palette = /datum/color_palette/generic_colors
+	palette_key = "ethereal_color"
 
 /datum/bodypart_overlay/mutant/ethereal_horns/get_global_feature_list()
 	return GLOB.ethereal_horns_list
@@ -38,6 +40,8 @@
 /datum/bodypart_overlay/mutant/tail/ethereal
 	layers = EXTERNAL_FRONT|EXTERNAL_BEHIND
 	feature_key = "ethereal_tail"
+	palette = /datum/color_palette/generic_colors
+	palette_key = "ethereal_color"
 
 /datum/bodypart_overlay/mutant/tail/ethereal/get_global_feature_list()
 	return GLOB.ethereal_tail_list

monkestation/code/modules/the_fabled_dna_changes/species_color_pallettes/generic_palette.dm

@@ -3,9 +3,11 @@
 	var/mutant_color
 	var/mutant_color_secondary
 	var/fur_color
+	var/ethereal_color
 
 /datum/color_palette/generic_colors/apply_prefs(datum/preferences/incoming)
 	hair_color = incoming.read_preference(/datum/preference/color/hair_color)
 	mutant_color = incoming.read_preference(/datum/preference/color/mutant_color)
 	mutant_color_secondary = incoming.read_preference(/datum/preference/color/mutant_color_secondary)
 	fur_color = incoming.read_preference(/datum/preference/color/fur_color)
+	ethereal_color =  GLOB.color_list_ethereal[incoming.read_preference(/datum/preference/choiced/ethereal_color)]