diff --git a/Resources/Prototypes/Catalog/Fills/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
similarity index 100%
rename from Resources/Prototypes/Catalog/Fills/firstaidkits.yml
rename to Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/donkpocketbox.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/donkpocketbox.yml
new file mode 100644
index 0000000000..eb71be8603
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/donkpocketbox.yml
@@ -0,0 +1,21 @@
+- type: entity
+  name: Donkpocket Box Spawner
+  id: DonkpocketBoxSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - texture: Objects/Consumable/Food/Baked/donkpocket.rsi/box.png
+    - type: RandomSpawner
+      prototypes:
+        - FoodBoxDonkpocket
+        - FoodBoxDonkpocketSpicy
+        - FoodBoxDonkpocketTeriyaki
+        - FoodBoxDonkpocketPizza
+        - FoodBoxDonkpocketGondola
+        - FoodBoxDonkpocketBerry
+        - FoodBoxDonkpocketHonk
+        - FoodBoxDonkpocketDink
+      chance: 0.5
+      offset: 0.2
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
new file mode 100644
index 0000000000..9dd0c1fddf
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -0,0 +1,106 @@
+- type: entity
+  name: Maint Loot Spawner
+  suffix: Fluff+Clothes
+  id: MaintenanceFluffSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - texture: Clothing/Eyes/Glasses/gar.rsi/icon-super.png
+    - type: RandomSpawner
+      rarePrototypes:
+        - CigarGold
+        - ClothingNeckCloakHerald
+        - ClothingHeadHelmetTemplar
+        - ToySkeleton
+        - Basketball
+        - Football
+        - BalloonCorgi
+        - SingularityToy
+        - PonderingOrb
+        - Skub
+      rareChance: 0.01
+      prototypes:
+        - Lighter
+        - CigCartonBlue
+        - ClothingEyesGlassesGarGiga
+        - ClothingEyesGlassesGarOrange
+        - ClothingEyesGlassesGar
+        - ClothingHeadHatCake
+        - ClothingHeadHatSkub
+        - ClothingHeadHatCone
+        - ClothingNeckBling
+        - ClothingHeadHelmetCosmonaut
+        - ClothingHeadHelmetScaf
+        - ClothingShoeSlippersDuck
+        - ClothingUnderSocksBee
+        - ClothingUnderSocksCoder
+      chance: 0.6
+      offset: 0.0
+      
+      
+- type: entity
+  name: Maint Loot Spawner
+  suffix: Tools+Cells+Mats
+  id: MaintenanceToolSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - texture: Clothing/Eyes/Glasses/gar.rsi/icon-super.png
+    - type: RandomSpawner
+      rarePrototypes:
+        - lanternextrabright
+        - PowerCellMediumSuper
+        - PowerCellSmallSuper
+        - PowerCellLargeSuper
+        - PowerCellSmallAutorecharge
+      rareChance: 0.08
+      prototypes:
+        - FlashlightLantern
+        - YellowOxygenTankFilled
+        - DoubleEmergencyOxygenTankFilled
+        - ToolboxEmergencyFilled
+        - ToolboxElectricalFilled
+        - ToolboxMechanicalFilled
+        - ClothingBeltUtilityFilled
+        - Shovel
+        - Welder
+        - FlareGun
+        - IngotIron
+        - SheetSteel
+        - SheetPlastic
+      chance: 0.6
+      offset: 0.0
+      
+- type: entity
+  name: Maint Loot Spawner
+  suffix: Scrap+Weapons
+  id: MaintenanceWeaponSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - texture: Clothing/Eyes/Glasses/gar.rsi/icon-super.png
+    - type: RandomSpawner
+      rarePrototypes:
+        - Machete
+        - BaseBallBat
+        - CombatKnife
+      rareChance: 0.05
+      prototypes:
+        - FlashlightLantern
+        - YellowOxygenTankFilled
+        - DoubleEmergencyOxygenTankFilled
+        - Lighter
+        - Matchbox
+        - Crowbar
+        - Shovel
+        - Welder
+        - FlareGun
+        - Spear
+      chance: 0.6
+      offset: 0.0
\ No newline at end of file