diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm
index ef8dbc39253..161713c1ef5 100644
--- a/code/modules/client/preference_setup/loadout/items/uniform.dm
+++ b/code/modules/client/preference_setup/loadout/items/uniform.dm
@@ -166,11 +166,12 @@
 /datum/gear/uniform/pants/New()
 	..()
 	var/list/pants = list()
+
+	// Pants
 	pants["jeans"] = /obj/item/clothing/under/pants/jeans
 	pants["classic jeans"] = /obj/item/clothing/under/pants/classic
-	pants["must hang jeans"] = /obj/item/clothing/under/pants/mustang
+	pants["mustang jeans"] = /obj/item/clothing/under/pants/mustang
 	pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack
-	pants["young folks jeans"] = /obj/item/clothing/under/pants/youngfolksjeans
 	pants["white pants"] = /obj/item/clothing/under/pants/white
 	pants["black pants"] = /obj/item/clothing/under/pants/black
 	pants["red pants"] = /obj/item/clothing/under/pants/red
@@ -187,13 +188,6 @@
 	pants["ripped jeans"] = /obj/item/clothing/under/pants/ripped
 	pants["black ripped jeans"] = /obj/item/clothing/under/pants/blackripped
 
-	// Athletic Shorts
-	pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black
-	pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red
-	pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green
-	pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey
-	pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc
-
 	// Shorts
 	pants["black shorts"] = /obj/item/clothing/under/shorts/black
 	pants["black short shorts"] = /obj/item/clothing/under/shorts/black/short
@@ -207,30 +201,43 @@
 	pants["classic jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/classic/short
 	pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang
 	pants["mustang jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/short
-	pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks
-	pants["young folks jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/short
 	pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black
 	pants["black jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/black/short
 	pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey
 	pants["grey jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/grey/short
+
+	// Athletic Shorts
+	pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black
+	pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red
+	pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green
+	pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey
+	pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc
+
 	gear_tweaks += new /datum/gear_tweak/path(pants)
 
 /datum/gear/uniform/colorpants
-	display_name = "pants and shorts selection (recolourable)"
-	description = "A selection of recolourable pants and shorts."
+	display_name = "pants and shorts selection (colourable)"
+	description = "A selection of colourable pants and shorts."
 	path = /obj/item/clothing/under/pants/dress
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
 /datum/gear/uniform/colorpants/New()
 	..()
 	var/list/colorpants = list()
+
+	// Pants
 	colorpants["dress pants"] = /obj/item/clothing/under/pants/dress
 	colorpants["dress pants, with belt"] = /obj/item/clothing/under/pants/dress/belt
 	colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
-	colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
-	colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable
-	colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable
 	colorpants["flared pants"] = /obj/item/clothing/under/pants/flared
+	colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable
+	colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
+
+	// Shorts
+	colorpants["shorts"] = /obj/item/clothing/under/shorts/colourable
+	colorpants["short shorts"] = /obj/item/clothing/under/shorts/colourable/short
+	colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable
+
 	gear_tweaks += new /datum/gear_tweak/path(colorpants)
 
 /datum/gear/uniform/turtleneck
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index b2e502a4b26..3d90cf98ce9 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -114,12 +114,6 @@
 	icon_state = "jeansblack"
 	item_state = "jeansblack"
 
-/obj/item/clothing/under/pants/youngfolksjeans
-	name = "young folks jeans"
-	desc = "For those tired of boring old jeans."
-	icon_state = "jeansyoungfolks"
-	item_state = "jeansyoungfolks"
-
 /obj/item/clothing/under/pants/designer
 	name = "designer jeans"
 	desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look."
@@ -177,4 +171,4 @@
 	name = "red track pants"
 	icon_state = "trackpantsred"
 	item_state = "trackpantsred"
-/********** Track Pants End **********/
\ No newline at end of file
+/********** Track Pants End **********/
diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm
index 9001f59b5e3..73d93addf5c 100644
--- a/code/modules/clothing/under/shorts.dm
+++ b/code/modules/clothing/under/shorts.dm
@@ -12,6 +12,16 @@
 
 /********** Shorts Start **********/
 // Shorts
+/obj/item/clothing/under/shorts/colourable
+	name = "shorts"
+	desc = "A pair of cotton shorts."
+	icon_state = "shorts_recolourable"
+	item_state = "shorts_recolourable"
+
+/obj/item/clothing/under/shorts/colourable/short
+	name = "short shorts"
+	desc = "A pair of cotton short shorts."
+
 /obj/item/clothing/under/shorts/black
 	name = "black shorts"
 	desc = "For that island getaway. It's five o'clock somewhere, right?"
@@ -68,16 +78,6 @@
 	icon_state = "shorts_s_jeans_mustang"
 	item_state = "shorts_s_jeans_mustang"
 
-/obj/item/clothing/under/shorts/jeans/youngfolks
-	name = "young folks jeans shorts"
-	icon_state = "shorts_jeans_youngfolk"
-	item_state = "shorts_jeans_youngfolk"
-
-/obj/item/clothing/under/shorts/jeans/youngfolks/short
-	name = "young folks jeans short shorts"
-	icon_state = "shorts_s_jeans_youngfolk"
-	item_state = "shorts_s_jeans_youngfolk"
-
 /obj/item/clothing/under/shorts/jeans/black
 	name = "black jeans shorts"
 	icon_state = "shorts_jeans_black"
@@ -147,4 +147,4 @@
 	desc_extended = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
 	icon_state = "shorts_athletic_scc"
 	item_state = "shorts_athletic_scc"
-/********** Athletic Shorts End **********/
\ No newline at end of file
+/********** Athletic Shorts End **********/
diff --git a/html/changelogs/SleepyGemmy-recolourable_shorts.yml b/html/changelogs/SleepyGemmy-recolourable_shorts.yml
new file mode 100644
index 00000000000..dced7af41b1
--- /dev/null
+++ b/html/changelogs/SleepyGemmy-recolourable_shorts.yml
@@ -0,0 +1,7 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a pair of colourable shorts and short shorts."
+  - rscdel: "Removed the young folks jeans and jeans shorts, as they had the same sprite as the classic jeans and jeans shorts."
diff --git a/icons/obj/item/clothing/under/pants.dmi b/icons/obj/item/clothing/under/pants.dmi
index c2966118390..6aa8dc1c5e1 100644
Binary files a/icons/obj/item/clothing/under/pants.dmi and b/icons/obj/item/clothing/under/pants.dmi differ
diff --git a/icons/obj/item/clothing/under/shorts.dmi b/icons/obj/item/clothing/under/shorts.dmi
index cf1f4fb8a84..b739110b9ec 100644
Binary files a/icons/obj/item/clothing/under/shorts.dmi and b/icons/obj/item/clothing/under/shorts.dmi differ
diff --git a/maps/away/ships/freebooter/freebooter_ship.dmm b/maps/away/ships/freebooter/freebooter_ship.dmm
index c30c3d489ed..cd7dc132722 100644
--- a/maps/away/ships/freebooter/freebooter_ship.dmm
+++ b/maps/away/ships/freebooter/freebooter_ship.dmm
@@ -8912,7 +8912,6 @@
 /obj/item/clothing/head/dominia/fleet,
 /obj/item/clothing/head/dominia/fleet/armsman,
 /obj/item/clothing/under/pants/jeans,
-/obj/item/clothing/under/pants/youngfolksjeans,
 /obj/item/clothing/under/pants/jeansblack,
 /obj/item/clothing/head/beanie/random,
 /obj/item/clothing/head/beanie/random,
diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm
index f5a4d1b6456..fc47096cb0d 100644
--- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm
+++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm
@@ -709,10 +709,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/ship/tramp_freighter)
-"eoK" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/shuttle/space_ship,
-/area/ship/tramp_freighter)
 "etL" = (
 /turf/space/transit/north,
 /area/space)
@@ -1694,9 +1690,6 @@
 	},
 /turf/simulated/floor,
 /area/ship/tramp_freighter)
-"phz" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/freighter_shuttle)
 "pmv" = (
 /obj/structure/plasticflaps,
 /obj/machinery/conveyor{
@@ -2012,7 +2005,6 @@
 /obj/item/clothing/suit/storage/toggle/bomber,
 /obj/item/clothing/suit/storage/toggle/flannel/red,
 /obj/item/clothing/under/pants/jeansblack,
-/obj/item/clothing/under/pants/youngfolksjeans,
 /obj/item/clothing/head/cowboy,
 /obj/item/clothing/shoes/cowboy/classic,
 /obj/item/clothing/shoes/jackboots,
@@ -2132,9 +2124,6 @@
 	},
 /turf/simulated/floor,
 /area/ship/tramp_freighter)
-"wYA" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/ship/tramp_freighter)
 "wZf" = (
 /turf/simulated/floor,
 /area/ship/tramp_freighter)
@@ -31367,7 +31356,7 @@ ehI
 lfq
 ylV
 ylV
-wYA
+ylV
 xRX
 xRX
 xRX
@@ -31624,8 +31613,8 @@ lfq
 tvU
 ylV
 qXU
-wYA
-wYA
+ylV
+ylV
 xRX
 xRX
 xRX
@@ -31879,10 +31868,10 @@ aSJ
 aHt
 ylV
 ylV
-wYA
+ylV
 gdk
 fUQ
-wYA
+ylV
 xRX
 xRX
 xRX
@@ -32395,8 +32384,8 @@ gdk
 rWz
 ckN
 bXv
-wYA
-wYA
+ylV
+ylV
 xRX
 xRX
 xRX
@@ -32652,7 +32641,7 @@ gdk
 jgW
 udB
 pDO
-wYA
+ylV
 xRX
 xRX
 xRX
@@ -32905,10 +32894,10 @@ cVA
 cBb
 aSJ
 ylV
-wYA
-wYA
-wYA
-wYA
+ylV
+ylV
+ylV
+ylV
 xRX
 xRX
 xRX
@@ -33160,8 +33149,8 @@ eiL
 aSJ
 bfg
 aSJ
-wYA
-wYA
+ylV
+ylV
 aap
 xRX
 xRX
@@ -33417,9 +33406,9 @@ nyj
 ylV
 ylV
 ylV
-wYA
-wYA
-wYA
+ylV
+ylV
+ylV
 xRX
 xRX
 xRX
@@ -33676,7 +33665,7 @@ eEk
 onP
 ozs
 qFX
-wYA
+ylV
 jMF
 xRX
 xRX
@@ -33930,11 +33919,11 @@ elQ
 euz
 eEk
 rgA
-eoK
+aHt
 fMy
 hDn
-wYA
-wYA
+ylV
+ylV
 xRX
 xRX
 xRX
@@ -34166,17 +34155,17 @@ xRX
 rtf
 wZf
 gQH
-phz
-phz
-phz
-phz
+aBb
+aBb
+aBb
+aBb
 hZq
 ePO
-phz
-phz
-phz
-phz
-phz
+aBb
+aBb
+aBb
+aBb
+aBb
 lRa
 jCz
 ylV
@@ -34187,11 +34176,11 @@ ivo
 eEk
 eCb
 hqX
-wYA
-wYA
-wYA
+ylV
+ylV
+ylV
 aHt
-wYA
+ylV
 xRX
 xRX
 xRX
@@ -34444,7 +34433,7 @@ emn
 eEk
 eCb
 kon
-wYA
+ylV
 uCl
 rNF
 fhJ
@@ -34701,11 +34690,11 @@ enr
 euz
 eCb
 eIb
-wYA
+ylV
 hQi
 eyx
-eoK
-wYA
+aHt
+ylV
 xRX
 xRX
 xRX
@@ -34958,11 +34947,11 @@ ylV
 euz
 eEk
 exg
-eoK
+aHt
 fQG
 eCV
 fhJ
-wYA
+ylV
 xRX
 xRX
 xRX
@@ -35195,16 +35184,16 @@ rtf
 wZf
 axB
 aBb
-phz
-phz
-phz
-phz
+aBb
+aBb
+aBb
+aBb
 xeK
 bgD
-phz
-phz
-phz
-phz
+aBb
+aBb
+aBb
+aBb
 lRa
 mpg
 ylV
@@ -35218,8 +35207,8 @@ gcq
 iHx
 eyx
 vFx
-wYA
-wYA
+ylV
+ylV
 xRX
 xRX
 xRX
@@ -35476,7 +35465,7 @@ ylV
 fRD
 rMI
 mut
-wYA
+ylV
 xRX
 xRX
 xRX
@@ -35733,7 +35722,7 @@ ylV
 ylV
 ylV
 ylV
-wYA
+ylV
 lXE
 lXE
 lXE