diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index f0103cc219..18e70d5d66 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -39,6 +39,9 @@
       types:
         Blunt: 0
   - type: DnaSubstanceTrace
+  - type: Tag
+    tags:
+    - DrinkCup
 
 - type: entity
   parent: DrinkBaseCup
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
index 793e7211a5..ef501b843e 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -70,7 +70,7 @@
       map: ["enum.StorageVisualLayers.Base"]
     - state: unlocked
       shader: unshaded
-      # used to keep the unlocked light visible while open. 
+      # used to keep the unlocked light visible while open.
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
     - state: locked
@@ -342,7 +342,7 @@
 - type: entity
   id: ShelfKitchen
   parent: ShelfBase
-  name: cooking shelf
+  name: kitchen shelf
   description: Holds knifes, spice, and everything nice!
   components:
   - type: Sprite
@@ -385,6 +385,9 @@
     maxItemSize: Normal
     whitelist:
       tags:
+        - DrinkBottle
+        - DrinkCan
+        - DrinkCup
         - DrinkGlass
         - BoxCardboard
         - MonkeyCube
@@ -397,6 +400,7 @@
         - RollingPin
         - Ingredient
         - Trash
+        - Plastic
   - type: Construction
     graph: Shelf
     node: ShelfKitchen
diff --git a/Resources/Prototypes/Recipes/Construction/storage.yml b/Resources/Prototypes/Recipes/Construction/storage.yml
index 7128c79eee..48f6dd4d03 100644
--- a/Resources/Prototypes/Recipes/Construction/storage.yml
+++ b/Resources/Prototypes/Recipes/Construction/storage.yml
@@ -186,7 +186,7 @@
 
 - type: construction
   id: ShelfKitchen
-  name: cooking shelf
+  name: kitchen shelf
   description: Holds your knifes, spice, and everything nice!
   graph: Shelf
   startNode: start
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index adf25cc71d..5e1b5cbe4d 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -545,13 +545,16 @@
 - type: Tag
   id: DrinkCan
 
+- type: Tag
+  id: DrinkCup
+
 - type: Tag
   id: DrinkGlass
 
 - type: Tag
   id: DrinkSpaceGlue
 
-- type: Tag 
+- type: Tag
   id: Dropper
 
 - type: Tag