diff --git a/desktop/resources/outside-castle/background.psd b/desktop/resources/outside-castle/background.psd
index dfc80b94..1bda5984 100644
Binary files a/desktop/resources/outside-castle/background.psd and b/desktop/resources/outside-castle/background.psd differ
diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj
index aec3a5e3..437b5b4b 100644
--- a/desktop/src-common/advent/screens/rooms/inside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj
@@ -242,7 +242,9 @@
                               :cursor :right
                               :script (actions/get-script entities
                                                           (actions/walk-to entities :ego [284 145])
-                                                          (actions/transition-background entities :outside-castle [82 180])
+                                                          (actions/walk-straight-to entities :ego [295 145])
+                                                          (actions/transition-background entities :outside-castle [61 182])
+                                                          (actions/walk-straight-to entities :ego [82 180])
                                                           (actions/walk-to entities :ego [129 148]))}
                  :up-door {:box [50 150 70 170]
                            :script (actions/get-script entities
diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj
index c5f19d47..a7ee7aa8 100644
--- a/desktop/src-common/advent/screens/rooms/outside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj
@@ -222,10 +222,13 @@
   (actions/update-state entities #(assoc % :seen-frankie? true)))
 
 (defn go-through-gate [entities]
-  (actions/walk-to entities :ego [82 180])
   (if (should-block? entities)
-    (block-entrance entities)
     (do
+      (actions/walk-to entities :ego [82 180])
+      (block-entrance entities))
+    (do
+      (actions/walk-to entities :ego [82 180])
+      (actions/walk-straight-to entities :ego [61 182])
       (actions/transition-background entities :inside-castle [295 145])
       (actions/walk-to entities :ego [245 90]))))
 
@@ -290,9 +293,12 @@
                                        (actions/play-animation entities :ego :squat)
                                        (actions/talk entities :ego "No one will notice one missing.")
                                        (actions/give entities :carrot))))}}
-                :layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]
-                         :night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)]
-                         :sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]}
+                :layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
+                               (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]
+                         :night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)
+                                 (assoc (texture "outside-castle/walk-behind-dark.png") :x 0 :y 0 :baseline 240)]
+                         :sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
+                                   (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]}
                 :entities {:peddler (actions/start-animation screen
                                                              (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
                                                                     :anim-sound-frames {peddler-stand {23 [:scratch 1.0]}
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 340e64d1..86ed62a0 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -18,6 +18,7 @@
             [advent.screens.items :as items]
             [advent.screens.rooms.dream :as rooms.dream]
             [advent.screens.rooms.castle-gate :as rooms.castle-gate]
+            [advent.screens.rooms.common :as common]
             [advent.screens.rooms.outside-house :as rooms.outside-house]
             [advent.screens.rooms.inside-house :as rooms.inside-house]
             [advent.screens.rooms.inside-stash :as rooms.inside-stash]
@@ -161,7 +162,7 @@
         start-squat (animation 0.05 (for [i [0 1 2 3 4]]
                                       (texture  (aget squat-sheet 0 i))))
         start-squat-2 (animation 0.05 (for [i [0 1 2 3]]
-                                      (texture  (aget squat-sheet 0 i))))
+                                      (texture (aget squat-sheet 0 i))))
         end-squat (animation 0.05 (for [i [3 2 1 0]]
                                     (texture  (aget squat-sheet 0 i))))
         squat-anim (animation 0.05 (for [i [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 2 1] ]