diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index fe9df92fef..73675257e4 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -440,8 +440,9 @@
 
 /obj/item/clothing/head/kepi
 	name = "kepi"
-	desc = "A white cap with visor. Too bad that Solar Foreign Legion isn't created."
+	desc = "A white cap with visor. Oui oui, mon capitane!"
 	icon_state = "kepi"
 
 /obj/item/clothing/head/kepi/old
 	icon_state = "kepi_old"
+	desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 6e4b814e5a..167332b630 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index eeb44af5af..b349161f8e 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index d136c4eb21..a02c98a9f0 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -99,20 +99,45 @@
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
 // orvilike "original" kepi
-/datum/gear/orvkepi
+/datum/gear/orvkepicom
+	name = "Federation Kepi, command"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/command
+	restricted_desc = "Heads of Staff"
+	restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
+
+/datum/gear/orvkepiops
+	name = "Federation Kepi, ops/sec"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/engsec
+	restricted_desc = "Engineering, Security and Cargo"
+	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
+
+/datum/gear/orvkepimedsci
+	name = "Federation Kepi, medsci"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/medsci
+	restricted_desc = "Medical and Science"
+	restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
+
+/datum/gear/orvkepisrv
+	name = "Federation Kepi, service"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/service
+	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
+	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
+
+/datum/gear/orvkepiass
 	name = "Federation Kepi, assistant"
 	description = "A visored cap. Intended to be used with ORV uniform."
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/kepi/orvi
 	restricted_roles = list("Assistant")
 
-/datum/gear/orvkepi/srv
-	name = "Federation Kepi, service"
-	category = SLOT_HEAD
-	path = /obj/item/clothing/head/kepi/orvi/service
-	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
-	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
-
 /*Commenting out Until next Christmas or made automatic
 /datum/gear/santahatr
 	name = "Red Santa Hat"
diff --git a/modular_citadel/code/modules/clothing/trek.dm b/modular_citadel/code/modules/clothing/trek.dm
index e04959f0d5..f7e8b6778e 100644
--- a/modular_citadel/code/modules/clothing/trek.dm
+++ b/modular_citadel/code/modules/clothing/trek.dm
@@ -169,5 +169,14 @@
 	desc = "A visored cap worn by all officers since 2550s."
 	icon_state = "kepi_ass"
 
+/obj/item/clothing/head/kepi/orvi/command
+	icon_state = "kepi_com"
+
+/obj/item/clothing/head/kepi/orvi/engsec
+	icon_state = "kepi_ops"
+
+/obj/item/clothing/head/kepi/orvi/medsci
+	icon_state = "kepi_medsci"
+
 /obj/item/clothing/head/kepi/orvi/service
 	icon_state = "kepi_srv"