diff --git a/desktop/resources/inside-cafeteria/background.png b/desktop/resources/inside-cafeteria/background.png
index b9c84234..d0223bf7 100644
Binary files a/desktop/resources/inside-cafeteria/background.png and b/desktop/resources/inside-cafeteria/background.png differ
diff --git a/desktop/resources/inside-cafeteria/background.psd b/desktop/resources/inside-cafeteria/background.psd
index 94618c42..eaa70c43 100644
Binary files a/desktop/resources/inside-cafeteria/background.psd and b/desktop/resources/inside-cafeteria/background.psd differ
diff --git a/desktop/resources/inside-cafeteria/collision.png b/desktop/resources/inside-cafeteria/collision.png
index 858ab7df..789ed0ab 100644
Binary files a/desktop/resources/inside-cafeteria/collision.png and b/desktop/resources/inside-cafeteria/collision.png differ
diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
new file mode 100644
index 00000000..35c28193
--- /dev/null
+++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
@@ -0,0 +1,26 @@
+(ns advent.screens.rooms.inside-cafeteria
+  (:require [advent.screens.rooms :as rooms]
+            [advent.screens.items :as items]
+            [advent.actions :as actions]
+            [advent.utils :as utils]
+            [clojure.zip :as zip]
+            [play-clj.core :refer :all]
+            [play-clj.ui :refer :all]
+            [play-clj.utils :refer :all]
+            [play-clj.g2d :refer :all]))
+
+(defn make [screen]
+  (rooms/make :music :town-1
+              :interactions
+              {:right-dir {:box [300 0 320 120]
+                          :script (actions/get-script
+                                   entities
+                                   (actions/walk-to entities :ego [319 50])
+                                   (actions/transition-background entities :inside-castle [65 150])
+                                   (actions/walk-to entities :ego [126 80]))
+                          :cursor :right} 
+               }
+              :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0)]
+              :entities {}
+              :collision "inside-cafeteria/collision.png"
+              :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50)))
diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj
index fe5ca411..6e0f6ad2 100644
--- a/desktop/src-common/advent/screens/rooms/inside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj
@@ -100,6 +100,12 @@
                                                           (actions/walk-to entities :ego [284 145])
                                                           (actions/transition-background entities :outside-castle [82 180])
                                                           (actions/walk-to entities :ego [129 148]))}
+                 :up-door {:box [50 150 70 170]
+                           :script (actions/get-script entities
+                                                       (actions/walk-to entities :ego [65 155])
+                                                       (actions/transition-background entities :inside-cafeteria [319 55])
+                                                       (actions/walk-to entities :ego [300 55]))
+                           :cursor :up}
                  :antique-door {:box [154 90 189 150]
                                 :cursor :up
                                 :script (actions/get-script entities
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index b701fe74..00995fa2 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -15,6 +15,7 @@
             [advent.screens.rooms.outside-house :as rooms.outside-house]
             [advent.screens.rooms.inside-house :as rooms.inside-house]
             [advent.screens.rooms.inside-castle :as rooms.inside-castle]
+            [advent.screens.rooms.inside-cafeteria :as rooms.inside-cafeteria]
             [advent.screens.rooms.inside-antique :as rooms.inside-antique]
             [advent.screens.rooms.behind-house :as rooms.behind-house]
             [advent.screens.rooms.outside-castle :as rooms.outside-castle]
@@ -185,6 +186,7 @@
                    :behind-house (rooms.behind-house/make screen)
                    :cat-tree (rooms.cat-tree/make screen)
                    :inside-castle (rooms.inside-castle/make screen)
+                   :inside-cafeteria (rooms.inside-cafeteria/make screen)
                    :inside-antique (rooms.inside-antique/make screen)
                    :outside-castle (rooms.outside-castle/make screen)}]
         {:rooms rooms