diff --git a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
index f6efbca453e2..4d17f130e1ae 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
@@ -1090,7 +1090,7 @@
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/clothing/under/color/jumpskirt/darkblue,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
 /obj/effect/turf_decal/corner/opaque/black{
 	icon_state = "siding_line";
 	dir = 10
@@ -1516,7 +1516,7 @@
 	},
 /obj/item/radio,
 /obj/item/radio,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
 /obj/item/clothing/under/color/darkblue,
 /obj/effect/turf_decal/corner/opaque/black{
 	icon_state = "siding_line";
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index d7715e22b561..229134b7eac7 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -4840,7 +4840,7 @@
 "aRr" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
-/obj/item/clothing/under/dress/skirt,
+/obj/item/clothing/under/dress/skirt/color,
 /obj/item/clothing/under/shorts/black,
 /obj/item/clothing/under/pants/track,
 /obj/item/clothing/accessory/armband/deputy,
diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
index 020de62890e7..35b3044df741 100644
--- a/_maps/shuttles/independent/independent_tranquility.dmm
+++ b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -1326,7 +1326,7 @@
 /obj/item/clothing/head/beret,
 /obj/item/clothing/under/color/jumpskirt/random,
 /obj/item/clothing/under/color/random,
-/obj/item/clothing/under/dress/skirt/red,
+/obj/item/clothing/under/dress/skirt/color/red,
 /obj/item/clothing/suit/longcoat,
 /obj/item/clothing/suit/jacket/letterman_red,
 /obj/item/clothing/head/soft/mime,
diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm
index e4f36e8b827d..f9f465bf47ab 100644
--- a/code/game/objects/effects/spawners/bundle.dm
+++ b/code/game/objects/effects/spawners/bundle.dm
@@ -43,7 +43,7 @@
 /obj/effect/spawner/bundle/costume/maid
 	name = "maid costume spawner"
 	items = list(
-		/obj/item/clothing/under/dress/skirt,
+		/obj/item/clothing/under/dress/skirt/color,
 		/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears,
 		/obj/item/clothing/glasses/blindfold)
 
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 413b0238ce5d..c42b87afca72 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -19,7 +19,7 @@
 		/obj/item/clothing/under/costume/schoolgirl/green = 1,
 		/obj/item/clothing/under/costume/schoolgirl/orange = 1,
 		/obj/item/clothing/head/kitty = 1,
-		/obj/item/clothing/under/dress/skirt = 1,
+		/obj/item/clothing/under/dress/skirt/color = 1,
 		/obj/item/clothing/head/beret = 1,
 		/obj/item/clothing/head/cowboy = 1, //WS - Yee Haw
 		/obj/item/clothing/accessory/waistcoat = 1,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 6ca3644c2984..e1d2efe339e9 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -55,7 +55,6 @@
 		/obj/item/clothing/under/dress/skirt/plaid/blue = 2,
 		/obj/item/clothing/under/dress/skirt/plaid/green = 2,
 		/obj/item/clothing/under/dress/skirt/plaid/purple = 2,
-		/obj/item/clothing/under/dress/skirt = 2,
 		/obj/item/clothing/under/dress/skirt/color = 2,
 		/obj/item/clothing/under/dress/skirt/color/blue = 2,
 		/obj/item/clothing/under/dress/skirt/color/red = 2,