diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
index 4db9203a63e..0a961fecb66 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
@@ -1,17 +1,20 @@
 - type: entity
   parent: BaseItem
-  id: DrinkKegWood
+  id: DrinkKegSteel
   name: keg
-  suffix: Wood
+  suffix: Steel
   description: I don't have a drinking problem - the keg solved it.
   components:
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
-    layers:
-    - state: icon
+    sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
+    state: icon
   - type: Item
-    sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
     size: 100
+  - type: Clothing
+    sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
+    quickEquip: false
+    slots:
+    - Back
   - type: StaticPrice
     price: 30
   - type: SolutionContainerManager
@@ -26,32 +29,64 @@
   - type: DrainableSolution
     solution: drink
   - type: SolutionTransfer
+    transferAmount: 50
+    maxTransferAmount: 100
+    minTransferAmount: 10
     canChangeTransferAmount: true
-  - type: Spillable
-    solution: drink
+#  - type: Spillable
+#    solution: drink
   - type: UserInterface
     interfaces:
     - key: enum.TransferAmountUiKey.Key
       type: TransferAmountBoundUserInterface
   - type: PhysicalComposition
     materialComposition:
-      Wood: 50
-
+      Steel: 50
+  - type: ItemSlots
+    slots:
+      label_slot:
+        insertVerbText: Attach Label
+        ejectVerbText: Remove Label
+        name: Keg Label
+        startingItem: null
+        whitelist:
+          tags:
+          - Document
+        insertOnInteract: true
+        priority: 5
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      label_slot: !type:ContainerSlot {}
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      label:
+        whitelist:
+          tags:
+          - Document
+    sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
+    
 - type: entity
-  parent: DrinkKegWood
-  id: DrinkKegSteel
+  parent: DrinkKegSteel
+  id: DrinkKegWood
   name: keg
-  suffix: Steel
-  description: I don't have a drinking problem - the keg solved it.
+  suffix: Wood
   components:
   - type: Sprite
-    sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
+    sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
     state: icon
+  - type: Clothing
+    sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
   - type: PhysicalComposition
     materialComposition:
-      Steel: 50
-  - type: Clothing
+      Wood: 50
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      label:
+        whitelist:
+          tags:
+          - Document
     sprite: _NF/Objects/Consumable/Drinks/keg_wood.rsi
-    quickEquip: false
-    slots:
-    - Back
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/base.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/base.png
new file mode 100644
index 00000000000..aa1db87fd2e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/base.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json
index dea1d25a96d..3501f96f5b3 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json
@@ -6,24 +6,27 @@
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "label",
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "label"
+        }
+    ]
 }
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/base.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/base.png
new file mode 100644
index 00000000000..1feb2f18d3e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/base.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json
index dea1d25a96d..3501f96f5b3 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json
@@ -6,24 +6,27 @@
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "label",
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "label"
+        }
+    ]
 }