diff --git a/Resources/Prototypes/Entities/items/clothing/OuterClothing.yml b/Resources/Prototypes/Entities/items/clothing/OuterClothing.yml
index 9df0e538ef..14fd4cd485 100644
--- a/Resources/Prototypes/Entities/items/clothing/OuterClothing.yml
+++ b/Resources/Prototypes/Entities/items/clothing/OuterClothing.yml
@@ -1843,3 +1843,18 @@
     sprite: Clothing/OuterClothing/xenos.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/xenos.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingHoSTrenchcoat
+  name: Head of Security Trenchcoat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    state: hos_trenchcoat
+  - type: Icon
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    state: hos_trenchcoat
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
diff --git a/Resources/Prototypes/Entities/items/clothing/hats.yml b/Resources/Prototypes/Entities/items/clothing/hats.yml
index 47773fec7b..bb6d288925 100644
--- a/Resources/Prototypes/Entities/items/clothing/hats.yml
+++ b/Resources/Prototypes/Entities/items/clothing/hats.yml
@@ -298,6 +298,21 @@
     type: Clothing
   parent: HatBase
 
+- type: entity
+  id: HatBeretHoS
+  name: Beret HoS
+  description: ''
+  components:
+  - sprite: Clothing/Head/beret_hos.rsi
+    type: Sprite
+    state: beret_hos
+  - sprite: Clothing/Head/beret_hos.rsi
+    type: Icon
+    state: beret_hos
+  - sprite: Clothing/Head/beret_hos.rsi
+    type: Clothing
+  parent: HatBase
+
 - type: entity
   id: HatBeretNavyHos
   name: Beret Navy HoS
diff --git a/Resources/Prototypes/Entities/items/clothing/uniforms.yml b/Resources/Prototypes/Entities/items/clothing/uniforms.yml
index 747ff57d28..883d6e4632 100644
--- a/Resources/Prototypes/Entities/items/clothing/uniforms.yml
+++ b/Resources/Prototypes/Entities/items/clothing/uniforms.yml
@@ -14,15 +14,15 @@
   description: The jumpsuit for the poor sop with a mop
   components:
   - type: Sprite
-    sprite: Clothing/uniform_janitor.rsi
+    sprite: Clothing/Uniforms/uniform_janitor.rsi
     state: janitor
 
   - type: Icon
-    sprite: Clothing/uniform_janitor.rsi
+    sprite: Clothing/Uniforms/uniform_janitor.rsi
     state: janitor
 
   - type: Clothing
-    sprite: Clothing/uniform_janitor.rsi
+    sprite: Clothing/Uniforms/uniform_janitor.rsi
 
 - type: entity
   parent: UniformBase
@@ -31,15 +31,15 @@
   description: Greytide. Worldwide.
   components:
   - type: Sprite
-    sprite: Clothing/uniform_grey.rsi
+    sprite: Clothing/Uniforms/uniform_grey.rsi
     state: grey
 
   - type: Icon
-    sprite: Clothing/uniform_grey.rsi
+    sprite: Clothing/Uniforms/uniform_grey.rsi
     state: grey
 
   - type: Clothing
-    sprite: Clothing/uniform_grey.rsi
+    sprite: Clothing/Uniforms/uniform_grey.rsi
 
 
 - type: entity
@@ -48,15 +48,15 @@
   name: Engineering Jumpsuit
   components:
   - type: Sprite
-    sprite: Clothing/uniform_engineering.rsi
+    sprite: Clothing/Uniforms/uniform_engineering.rsi
     state: engine
 
   - type: Icon
-    sprite: Clothing/uniform_engineering.rsi
+    sprite: Clothing/Uniforms/uniform_engineering.rsi
     state: engine
 
   - type: Clothing
-    sprite: Clothing/uniform_engineering.rsi
+    sprite: Clothing/Uniforms/uniform_engineering.rsi
 
 
 - type: entity
@@ -65,15 +65,15 @@
   name: Assistant Jumpsuit
   components:
   - type: Sprite
-    sprite: Clothing/uniform_assistant.rsi
+    sprite: Clothing/Uniforms/uniform_assistant.rsi
     state: assistant
 
   - type: Icon
-    sprite: Clothing/uniform_assistant.rsi
+    sprite: Clothing/Uniforms/uniform_assistant.rsi
     state: assistant
 
   - type: Clothing
-    sprite: Clothing/uniform_assistant.rsi
+    sprite: Clothing/Uniforms/uniform_assistant.rsi
 
 - type: entity
   parent: UniformBase
@@ -82,15 +82,15 @@
   description: HONK!
   components:
   - type: Sprite
-    sprite: Clothing/uniform_clown.rsi
+    sprite: Clothing/Uniforms/uniform_clown.rsi
     state: icon
 
   - type: Icon
-    sprite: Clothing/uniform_clown.rsi
+    sprite: Clothing/Uniforms/uniform_clown.rsi
     state: icon
 
   - type: Clothing
-    sprite: Clothing/uniform_clown.rsi
+    sprite: Clothing/Uniforms/uniform_clown.rsi
     femaleMask: UniformTop
 
 - type: entity
@@ -100,15 +100,32 @@
   description: A jumpsuit made of strong material, providing robust protection.
   components:
   - type: Sprite
-    sprite: Clothing/uniform_sec.rsi
+    sprite: Clothing/Uniforms/uniform_sec.rsi
     state: icon
 
   - type: Icon
-    sprite: Clothing/uniform_sec.rsi
+    sprite: Clothing/Uniforms/uniform_sec.rsi
     state: icon
 
   - type: Clothing
-    sprite: Clothing/uniform_sec.rsi
+    sprite: Clothing/Uniforms/uniform_sec.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformCargoTech
+  name: Cargo Technician Jumpsuit
+  description: Shooooorts! They're comfy and easy to wear!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
+    state: cargotech
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
+    state: cargotech
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
 
 - type: entity
   parent: UniformBase
@@ -117,15 +134,15 @@
   description: Can't cook without this.
   components:
   - type: Sprite
-    sprite: Clothing/chef_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_chef.rsi
     state: chef
 
   - type: Icon
-    sprite: Clothing/chef_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_chef.rsi
     state: chef
 
   - type: Clothing
-    sprite: Clothing/chef_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_chef.rsi
 
 - type: entity
   parent: UniformBase
@@ -134,12 +151,131 @@
   description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
   components:
   - type: Sprite
-    sprite: Clothing/captain_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_captain.rsi
     state: captain
 
   - type: Icon
-    sprite: Clothing/captain_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_captain.rsi
     state: captain
 
   - type: Clothing
-    sprite: Clothing/captain_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_captain.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformHoP
+  name: Head of Personnel Jumpsuit
+  description: It's a jumpsuit worn by someone who works in the position of Head of Personnel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+    state: hop
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+    state: hop
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformChiefEngineer
+  name: Chief Engineer Jumpsuit
+  description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_ce.rsi
+    state: ce
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_ce.rsi
+    state: ce
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_ce.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformCMO
+  name: Chief Medical Officer Jumpsuit
+  description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_cmo.rsi
+    state: cmo
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_cmo.rsi
+    state: cmo
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_cmo.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformMedicalDoctor
+  name: Medical Doctor Jumpsuit
+  description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_md.rsi
+    state: md
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_md.rsi
+    state: md
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_md.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformScientist
+  name: Scientist Jumpsuit
+  description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_scientist.rsi
+    state: scientist
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_scientist.rsi
+    state: scientist
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_scientist.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformResearchDirector
+  name: Research Director Vest Suit
+  description: It's a suit worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_rd.rsi
+    state: rd
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_rd.rsi
+    state: rd
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_rd.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformHoS
+  name: Head of Security Jumpsuit
+  description: A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    state: hos
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    state: hos
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hos.rsi
diff --git a/Resources/Prototypes/Entities/mobs/human.yml b/Resources/Prototypes/Entities/mobs/human.yml
index 8b006c90c1..e8c810591b 100644
--- a/Resources/Prototypes/Entities/mobs/human.yml
+++ b/Resources/Prototypes/Entities/mobs/human.yml
@@ -41,14 +41,6 @@
       color: "#e8b59b"
       sprite: Mob/human.rsi
       state: human_l_arm
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-      color: "#e8b59b"
-      sprite: Mob/human.rsi
-      state: human_l_hand
-    - map: ["enum.HumanoidVisualLayers.RHand"]
-      color: "#e8b59b"
-      sprite: Mob/human.rsi
-      state: human_r_hand
     - map: ["enum.HumanoidVisualLayers.RLeg"]
       color: "#e8b59b"
       sprite: Mob/human.rsi
@@ -70,6 +62,15 @@
     - map: ["enum.Slots.INNERCLOTHING"]
       shader: stencilDraw
 
+    - map: ["enum.HumanoidVisualLayers.LHand"]
+      color: "#e8b59b"
+      sprite: Mob/human.rsi
+      state: human_l_hand
+    - map: ["enum.HumanoidVisualLayers.RHand"]
+      color: "#e8b59b"
+      sprite: Mob/human.rsi
+      state: human_r_hand
+
     - map: ["enum.Slots.IDCARD"]
     - map: ["enum.Slots.GLOVES"]
     - map: ["enum.Slots.SHOES"]
@@ -168,14 +169,6 @@
         color: "#e8b59b"
         sprite: Mob/human.rsi
         state: human_l_arm
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-        color: "#e8b59b"
-        sprite: Mob/human.rsi
-        state: human_l_hand
-      - map: ["enum.HumanoidVisualLayers.RHand"]
-        color: "#e8b59b"
-        sprite: Mob/human.rsi
-        state: human_r_hand
       - map: ["enum.HumanoidVisualLayers.RLeg"]
         color: "#e8b59b"
         sprite: Mob/human.rsi
@@ -195,6 +188,15 @@
       - map: ["enum.Slots.INNERCLOTHING"]
         shader: stencilDraw
 
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+        color: "#e8b59b"
+        sprite: Mob/human.rsi
+        state: human_l_hand
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+        color: "#e8b59b"
+        sprite: Mob/human.rsi
+        state: human_r_hand
+
       - map: ["enum.Slots.IDCARD"]
       - map: ["enum.Slots.GLOVES"]
       - map: ["enum.Slots.SHOES"]
diff --git a/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml b/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml
index a9eedf9e31..d1467d9ecb 100644
--- a/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml
+++ b/Resources/Prototypes/Jobs/Cargo/CargoTechnician.yml
@@ -3,9 +3,15 @@
   name: "Cargo Technician"
   positions: 2
   spawnPositions: 1
-  startingGear: AssistantGear
+  startingGear: CargoTechGear
   department:
   - Cargo
 
   icon: "CargoTechnician"
 
+- type: startingGear
+  id: CargoTechGear
+  equipment:
+    innerclothing: UniformCargoTech
+    backpack: BackpackClothing
+    shoes: ShoesBlack
diff --git a/Resources/Prototypes/Jobs/Command/Captain.yml b/Resources/Prototypes/Jobs/Command/Captain.yml
index 6cd2fbcbc6..c7194f97ea 100644
--- a/Resources/Prototypes/Jobs/Command/Captain.yml
+++ b/Resources/Prototypes/Jobs/Command/Captain.yml
@@ -31,3 +31,5 @@
     shoes: ShoesBlack
     head: HatCaptain
     eyes: SunGlasses
+    gloves: GlovesCaptain
+    outerclothing: OuterclothingCaparmor
diff --git a/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml b/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml
index 64bbe2ab38..09144e3b89 100644
--- a/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml
+++ b/Resources/Prototypes/Jobs/Command/HeadOfPersonnel.yml
@@ -3,7 +3,7 @@
   name: "Head Of Personnel"
   head: true
   positions: 1
-  startingGear: AssistantGear
+  startingGear: HoPGear
   department:
   - Command
   - Civilian
@@ -18,3 +18,11 @@
   - cargo
   - maintenance
   # I mean they'll give themselves the rest of the access levels *anyways*.
+
+- type: startingGear
+  id: HoPGear
+  equipment:
+    innerclothing: UniformHoP
+    backpack: BackpackClothing
+    shoes: ShoesBrown
+    head: HatHopcap
diff --git a/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml b/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml
index de15305e53..c9c8ac9682 100644
--- a/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/ChiefEngineer.yml
@@ -3,7 +3,7 @@
   name: "Chief Engineer"
   head: true
   positions: 1
-  startingGear: StationEngineerGear
+  startingGear: ChiefEngineerGear
   department:
   - Command
   - Engineering
@@ -14,3 +14,11 @@
   - maintenance
   - engineering
   - command
+
+- type: startingGear
+  id: ChiefEngineerGear
+  equipment:
+    head: HatHardhatWhite
+    innerclothing: UniformChiefEngineer
+    backpack: BackpackEngineering
+    shoes: ShoesBrown
diff --git a/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml b/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml
index 409d972851..6c8cfa54d4 100644
--- a/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml
+++ b/Resources/Prototypes/Jobs/Engineering/StationEngineer.yml
@@ -19,3 +19,4 @@
     innerclothing: UniformEngineering
     backpack: BackpackEngineering
     shoes: ShoesWorkboots
+    outerclothing: OuterclothingHazard
diff --git a/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml b/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml
index 839a27d3bf..195cf6c1c3 100644
--- a/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml
+++ b/Resources/Prototypes/Jobs/Medical/ChiefMedicalOfficer.yml
@@ -5,7 +5,7 @@
   name: "Chief Medical Officer"
   head: true
   positions: 1
-  startingGear: AssistantGear
+  startingGear: CMOGear
   department:
   - Command
   - Medical
@@ -15,3 +15,11 @@
   access:
   - medical
   - command
+
+- type: startingGear
+  id: CMOGear
+  equipment:
+    innerclothing: UniformCMO
+    backpack: BackpackMedical
+    shoes: ShoesBrown
+    outerclothing: OuterclothingLabcoatcmo
diff --git a/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml b/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml
index 201330bccd..b73abe7531 100644
--- a/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml
+++ b/Resources/Prototypes/Jobs/Medical/MedicalDoctor.yml
@@ -3,7 +3,7 @@
   name: "Medical Doctor"
   positions: 3
   spawnPositions: 2
-  startingGear: AssistantGear
+  startingGear: DoctorGear
   department:
   - Medical
 
@@ -11,3 +11,11 @@
 
   access:
   - medical
+
+- type: startingGear
+  id: DoctorGear
+  equipment:
+    innerclothing: UniformMedicalDoctor
+    backpack: BackpackMedical
+    shoes: ShoesWhite
+    outerclothing: OuterclothingLabcoatmedspecopen
diff --git a/Resources/Prototypes/Jobs/Science/ResearchDirector.yml b/Resources/Prototypes/Jobs/Science/ResearchDirector.yml
index 4e5ab0f04e..845d431301 100644
--- a/Resources/Prototypes/Jobs/Science/ResearchDirector.yml
+++ b/Resources/Prototypes/Jobs/Science/ResearchDirector.yml
@@ -3,7 +3,7 @@
   name: "Research Director"
   head: true
   positions: 1
-  startingGear: AssistantGear
+  startingGear: ResearchDirectorGear
   department:
   - Command
   - Science
@@ -13,3 +13,11 @@
   access:
   - research
   - command
+
+- type: startingGear
+  id: ResearchDirectorGear
+  equipment:
+    innerclothing: UniformResearchDirector
+    backpack: BackpackClothing
+    shoes: ShoesBrown
+    outerclothing: OuterclothingLabcoatgenopen
diff --git a/Resources/Prototypes/Jobs/Science/Scientist.yml b/Resources/Prototypes/Jobs/Science/Scientist.yml
index 480083fe53..3852534ddf 100644
--- a/Resources/Prototypes/Jobs/Science/Scientist.yml
+++ b/Resources/Prototypes/Jobs/Science/Scientist.yml
@@ -3,7 +3,7 @@
   name: "Scientist"
   positions: 3
   spawnPositions: 2
-  startingGear: AssistantGear
+  startingGear: ScientistGear
   department:
   - Science
 
@@ -11,3 +11,11 @@
 
   access:
   - research
+
+- type: startingGear
+  id: ScientistGear
+  equipment:
+    innerclothing: UniformScientist
+    backpack: BackpackClothing
+    shoes: ShoesWhite
+    outerclothing: OuterclothingLabcoattoxopen
diff --git a/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml b/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml
index 4f71f0d2db..18ef7951ff 100644
--- a/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml
+++ b/Resources/Prototypes/Jobs/Security/HeadOfSecurity.yml
@@ -3,7 +3,7 @@
   name: "Head Of Security"
   head: true
   positions: 1
-  startingGear: AssistantGear
+  startingGear: HoSGear
   department:
   - Command
   - Security
@@ -14,3 +14,13 @@
   - command
   - security
   - maintenance
+
+- type: startingGear
+  id: HoSGear
+  equipment:
+    innerclothing: UniformHoS
+    backpack: SecPack
+    shoes: ShoesJackboots
+    outerclothing: OuterclothingHoSTrenchcoat
+    eyes: SecGlasses
+    head: HatBeretHoS
diff --git a/Resources/Textures/Clothing/Head/beret_hos.rsi/beret_hos.png b/Resources/Textures/Clothing/Head/beret_hos.rsi/beret_hos.png
new file mode 100644
index 0000000000..ec9182bc87
Binary files /dev/null and b/Resources/Textures/Clothing/Head/beret_hos.rsi/beret_hos.png differ
diff --git a/Resources/Textures/Clothing/Head/beret_hos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/beret_hos.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..327c772433
Binary files /dev/null and b/Resources/Textures/Clothing/Head/beret_hos.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/beret_hos.rsi/meta.json b/Resources/Textures/Clothing/Head/beret_hos.rsi/meta.json
new file mode 100644
index 0000000000..236bb9f17a
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/beret_hos.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "beret_hos", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-HELMET", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Head/hopcap.rsi/hopcap.png b/Resources/Textures/Clothing/Head/hopcap.rsi/hopcap.png
new file mode 100644
index 0000000000..8b984bc048
Binary files /dev/null and b/Resources/Textures/Clothing/Head/hopcap.rsi/hopcap.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..087f0ff367
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/hos_trenchcoat.png b/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/hos_trenchcoat.png
new file mode 100644
index 0000000000..1590fe5ea3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/hos_trenchcoat.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/meta.json
new file mode 100644
index 0000000000..54edcce48a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/hos_trenchcoat.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hos_trenchcoat", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/uniform_assistant.rsi/assistant.png b/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/assistant.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_assistant.rsi/assistant.png
rename to Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/assistant.png
diff --git a/Resources/Textures/Clothing/uniform_assistant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_assistant.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/uniform_assistant.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/uniform_assistant.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_assistant.rsi/meta.json
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/captain.png b/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/captain.png
similarity index 100%
rename from Resources/Textures/Clothing/captain_uniform.rsi/captain.png
rename to Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/captain.png
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/captain_uniform.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/captain_uniform.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/captain_uniform.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/captain_uniform.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/captain_uniform.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_captain.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargotech.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargotech.png
new file mode 100644
index 0000000000..d4e48f65e4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargotech.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..f2fa55b9d0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-left.png
new file mode 100644
index 0000000000..72b63752d1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-right.png
new file mode 100644
index 0000000000..0cc45fa47a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json
new file mode 100644
index 0000000000..340c5aa220
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "cargotech", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/ce.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/ce.png
new file mode 100644
index 0000000000..e2c37a0c2c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/ce.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..0c7e8142bf
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_grey.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_grey.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json
new file mode 100644
index 0000000000..0d1d9076dd
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "ce", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/chef.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef.png
similarity index 100%
rename from Resources/Textures/Clothing/chef_uniform.rsi/chef.png
rename to Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef.png
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/chef_uniform.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/chef_uniform.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/chef_uniform.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/chef_uniform.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/chef_uniform.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json
diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_clown.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_clown.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_clown.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_clown.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/uniform_clown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/uniform_clown.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_clown.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo.png
new file mode 100644
index 0000000000..5b695db74e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..3467eaabbb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json
new file mode 100644
index 0000000000..c2e6055487
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "cmo", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/engine.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_engineering.rsi/engine.png
rename to Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine.png
diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_engineering.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_engineering.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_engineering.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/uniform_engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/uniform_engineering.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json
diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_grey.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/grey.png b/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/grey.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_grey.rsi/grey.png
rename to Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/grey.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/inhand-left.png
new file mode 100644
index 0000000000..6fa516dbc5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/inhand-right.png
new file mode 100644
index 0000000000..f985a97ca6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/uniform_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/uniform_grey.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_grey.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..807f99fc7d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop.png
new file mode 100644
index 0000000000..f65a93f00d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-left.png
new file mode 100644
index 0000000000..30d9857df4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-right.png
new file mode 100644
index 0000000000..3e674560d9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json
new file mode 100644
index 0000000000..d76243d007
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hop", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..b3c4071233
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos.png
new file mode 100644
index 0000000000..7678371aa9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left.png
new file mode 100644
index 0000000000..30f0be7f75
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_sec.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json
new file mode 100644
index 0000000000..2afb00249f
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hos", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_janitor.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_janitor.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_janitor.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/janitor.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/janitor.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_janitor.rsi/janitor.png
rename to Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/janitor.png
diff --git a/Resources/Textures/Clothing/uniform_janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/uniform_janitor.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..2fa90b99bb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/md.png b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/md.png
new file mode 100644
index 0000000000..c36a4c0f4c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/md.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/meta.json
new file mode 100644
index 0000000000..0d5dff48cc
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_md.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "md", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..f79a26ee35
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-left.png
new file mode 100644
index 0000000000..72b63752d1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-right.png
new file mode 100644
index 0000000000..0cc45fa47a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/meta.json
new file mode 100644
index 0000000000..8b00954d33
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "rd", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/rd.png b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/rd.png
new file mode 100644
index 0000000000..f9e01cbda0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rd.rsi/rd.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..15347cfddb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-left.png
new file mode 100644
index 0000000000..5fca30bad4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-right.png
new file mode 100644
index 0000000000..5d4a08b433
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json
new file mode 100644
index 0000000000..09a94e8f35
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "scientist", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/scientist.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/scientist.png
new file mode 100644
index 0000000000..56b47c78d7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/scientist.png differ
diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_sec.rsi/equipped-INNERCLOTHING.png
rename to Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_sec.rsi/icon.png
rename to Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png
diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/uniform_sec.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right.png
new file mode 100644
index 0000000000..8a3b1671ac
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/uniform_sec.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/uniform_sec.rsi/meta.json
rename to Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json