diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index 9e83e1eec0..cd5daf6f72 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -31,19 +31,21 @@
   - type: StorageFill
     contents:
         # Normal (10%)
-      - id: ToolboxEmergencyFilled
-        prob: 0.1
-      - id: ClothingMaskBreath
-        prob: 0.1
       - id: OxygenTankFilled
         prob: 0.1
       - id: SheetPlasma
         prob: 0.1
+      - id: IngotGold
+        prob: 0.1
+      - id: IngotSilver
+        prob: 0.1
+      - id: SheetPlasma
+        prob: 0.1
       - id: WelderIndustrialAdvanced
         prob: 0.1
       - id: ResearchDisk
         prob: 0.1
-      - id: ClothingBeltStorageWaistbag
+      - id: SheetUranium
         prob: 0.1
         #  - Service
       - id: CrayonBox
@@ -54,22 +56,15 @@
       - id: BoxSyringe
         prob: 0.1
       - id: BoxBeaker
-        prob: 0.1
-        #  - Scaf
-      - id: ClothingHeadHelmetScaf
-        prob: 0.1
-      - id: ClothingOuterArmorScaf
         prob: 0.1
         #  - Heh
       - id: SalvageHumanCorpse
         prob: 0.1
-      - id: LidSalami
-        prob: 0.1
         # Interesting (1%)
         #  - Ammo
       - id: MagazineBoxMagnum
         prob: 0.01
-      - id: ResearchDisk5000
+      - id: ResearchDisk10000
         prob: 0.01
         # Just no (0.1%)
         #  - Working guns
@@ -82,30 +77,8 @@
         #  - Skub
       - id: Skub
         prob: 0.001
-      - id: ResearchDisk10000
-        prob: 0.001
       - id: ClothingHeadHatCatEars
         prob: 0.01
-        #  - Pins
-      - id: ClothingNeckLGBTPin
-        prob: 0.025
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckAromanticPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckAsexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckBisexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckIntersexPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckLesbianPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckNonBinaryPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckPansexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckTransPin
-        orGroup: LGBTQIAPlusPins
         # TRAITOR EQUIPMENT (0.01%)
       - id: Telecrystal10
         prob: 0.0001
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
index e98004bfc8..a933a7ecbb 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -20,6 +20,19 @@
         - CrateSalvageEquipment
         - CrateMaterialSteel
         - CrateMaterialGlass
+        - CrateServiceJanitorialSupplies
+        - CrateHydroponicsSeedsMedicinal
+        - CrateEmergencyInternals
+        - CrateFoodMRE
+        - CrateMaterialTextiles
+        - CrateMedicalSupplies
+        - CrateEngineeringCableBulk
+        - CrateMaterialCardboard
+        - CrateServiceBooks
+        - CrateServiceSmokeables
+        - CrateTrashCartFilled
+        - ClosetMaintenanceFilledRandom
+        - ClosetEmergencyFilledRandom
       rareChance: 0.4
       prototypes:
         - CrateSalvageAssortedGoodies