diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index a5cf712d09..55a0ee45a3 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -12,6 +12,8 @@
     layers:
       - map: [ enum.LightBulbVisualLayers.Base ]
         state: normal
+  - type: Item
+    size: Tiny
   - type: LightBulb
   - type: Damageable
     damageContainer: Inorganic
@@ -75,6 +77,9 @@
   id: BaseLightTube
   abstract: true
   components:
+  - type: Item
+    size: Small
+    storedRotation: -44
   - type: Sprite
     sprite:  Objects/Power/light_tube.rsi
   - type: LightBulb
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
index c749102518..0be2889d18 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -9,19 +9,15 @@
       - state: icon-0
         map: ["enum.StorageFillLayers.Fill"]
   - type: Storage
-    maxItemSize: Normal
+    maxItemSize: Large
     grid:
-    - 0,0,7,5
+    - 0,0,3,8
     quickInsert: true
     areaInsert: true
     storageOpenSound:
       collection: trashBagRustle
     storageInsertSound:
       collection: trashBagRustle
-    whitelist:
-      tags:
-        - Cartridge
-        - Trash
   - type: Tag
     tags:
     - TrashBag
@@ -31,11 +27,8 @@
     maxFillLevels: 4
     fillBaseName: icon
   - type: Dumpable
-  - type: Clothing
-    slots: [belt]
-    sprite: Objects/Specific/Janitorial/trashbag.rsi
   - type: Item
-    size: Normal
+    size: Huge
 
 - type: entity
   name: trash bag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
index 77ba283654..7961c3af43 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -18,6 +18,9 @@
       path: /Audio/Weapons/bladeslice.ogg
   - type: Item
     size: Normal
+    storedRotation: 47 # It just works
+    shape:
+    - 0, 0, 2, 0
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_dagger.rsi
     quickEquip: false
@@ -68,6 +71,9 @@
       path: /Audio/Weapons/bladeslice.ogg
   - type: Item
     size: Huge
+    storedRotation: 44 # It just works
+    shape:
+    - 0, 0, 4, 0
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_blade.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 0407c9781b..f90079001a 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -77,7 +77,7 @@
   - CaptainWintercoat
 
 - type: loadoutGroup
-  id: CaptainOuterClothing
+  id: CaptainGloves
   name: loadout-group-gloves
   minLimit: 0
   loadouts:
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index eb9415617b..1fc85efb52 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -10,6 +10,7 @@
   - CaptainJumpsuit
   - CaptainBackpack
   - CaptainOuterClothing
+  - CaptainGloves # WD
   - CaptainShoes
   - CaptainPDA # WD
   - Trinkets
@@ -584,6 +585,7 @@
   - CommonGlasses # WD
   - ZookeeperJumpsuit # WD
   - CommonBackpack
+  - CommonShoes # WD
   - ZookeeperPDA # WD
   - Trinkets
 
@@ -597,6 +599,7 @@
   - ReporterJumpsuit
   - CommonGloves # WD
   - CommonBackpack
+  - CommonShoes # WD
   - ReporterPDA # WD
   - Trinkets
 
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
index f10d47093b..26d92839ce 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -17,10 +17,6 @@
 
 - type: startingGear
   id: JanitorGear
-  equipment:
-    shoes: ClothingShoesGaloshes
-    id: JanitorPDA
-    ears: ClothingHeadsetService
 
 - type: startingGear
   id: JanitorMaidGear
diff --git a/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml b/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml
index de5bcb675a..c763495388 100644
--- a/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml
+++ b/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml
@@ -36,7 +36,7 @@
   description: Mini cassette player
   suffix: Empty
   components:
-    - type: Jukebox
+    - type: WhiteJukebox
       maxAudioRange: 5
       rolloffFactor: 3.5
     - type: Sprite