diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm
index a042ab353070..ae3d9b7f9ede 100644
--- a/code/modules/client/loadout/loadout_uniform.dm
+++ b/code/modules/client/loadout/loadout_uniform.dm
@@ -19,39 +19,12 @@
 //Colored jumpsuits
 
 /datum/gear/uniform/color
-	subtype_path = /datum/gear/uniform/color
+	display_name = "jumpsuit, recolorable"
+	path = /obj/item/clothing/under/color
 
-/datum/gear/uniform/color/red
-	display_name = "jumpsuit, red"
-	path = /obj/item/clothing/under/color/red
-
-/datum/gear/uniform/color/green
-	display_name = "jumpsuit, green"
-	path = /obj/item/clothing/under/color/green
-
-/datum/gear/uniform/color/blue
-	display_name = "jumpsuit, blue"
-	path = /obj/item/clothing/under/color/blue
-
-/datum/gear/uniform/color/yellow
-	display_name = "jumpsuit, yellow"
-	path = /obj/item/clothing/under/color/yellow
-
-/datum/gear/uniform/color/pink
-	display_name = "jumpsuit, pink"
-	path = /obj/item/clothing/under/color/pink
-
-/datum/gear/uniform/color/black
-	display_name = "jumpsuit, black"
-	path = /obj/item/clothing/under/color/black
-
-/datum/gear/uniform/color/white
-	display_name = "jumpsuit, white"
-	path = /obj/item/clothing/under/color/white
-
-/datum/gear/uniform/color/random
-	display_name = "jumpsuit, random"
-	path = /obj/item/clothing/under/color/random //literally useless if grey assistants is off
+/datum/gear/uniform/color_skirt
+	display_name = "jumpskirt, recolorable"
+	path = /obj/item/clothing/under/color/jumpskirt
 
 //Shorts
 
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 7ac32c9c1295..b104fe0d60b8 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -1,13 +1,52 @@
 /obj/item/clothing/under/color
+	name = "jumpsuit"
 	desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
 	dying_key = DYE_REGISTRY_UNDER
 	icon = 'icons/obj/clothing/under/color.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/under/color.dmi'
 	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
+	icon_state = "black"
+	item_state = "bl_suit"
+	unique_reskin = list("black jumpsuit" = "black",
+						"grey jumpsuit" = "grey",
+						"blue jumpsuit" = "blue",
+						"green jumpsuit" = "green",
+						"orange jumpsuit" = "orange",
+						"pink jumpsuit" = "pink",
+						"red jumpsuit" = "red",
+						"white jumpsuit" = "white",
+						"yellow jumpsuit" = "yellow",
+						"dark blue jumpsuit" = "darkblue",
+						"teal jumpsuit" = "teal",
+						"light purple jumpsuit" = "lightpurple",
+						"dark green jumpsuit" = "darkgreen",
+						"light brown jumpsuit" = "lightbrown",
+						"brown jumpsuit" = "brown",
+						"maroon jumpsuit" = "maroon"
+						)
 
 /obj/item/clothing/under/color/jumpskirt
+	name = "jumpskirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = TRUE
+	icon_state = "black_skirt"
+	unique_reskin = list("black jumpskirt" = "black_skirt",
+						"grey jumpskirt" = "grey_skirt",
+						"blue jumpskirt" = "blue_skirt",
+						"green jumpskirt" = "green_skirt",
+						"orange jumpskirt" = "orange_skirt",
+						"pink jumpskirt" = "pink_skirt",
+						"red jumpskirt" = "red_skirt",
+						"white jumpskirt" = "white_skirt",
+						"yellow jumpskirt" = "yellow_skirt",
+						"dark blue jumpskirt" = "darkblue_skirt",
+						"teal jumpskirt" = "teal_skirt",
+						"light purple jumpskirt" = "lightpurple_skirt",
+						"dark green jumpskirt" = "darkgreen_skirt",
+						"light brown jumpskirt" = "lightbrown_skirt",
+						"brown jumpskirt" = "brown_skirt",
+						"maroon jumpskirt" = "maroon_skirt"
+						)
 
 /obj/item/clothing/under/color/random
 	icon_state = "random_jumpsuit"