diff --git a/desktop/resources/behindhouse/abc.png b/desktop/resources/behindhouse/abc.png
new file mode 100644
index 00000000..aee350fb
Binary files /dev/null and b/desktop/resources/behindhouse/abc.png differ
diff --git a/desktop/resources/behindhouse/house-cover copy.png b/desktop/resources/behindhouse/house-cover copy.png
new file mode 100644
index 00000000..ec4b5812
Binary files /dev/null and b/desktop/resources/behindhouse/house-cover copy.png differ
diff --git a/desktop/resources/inside-cafeteria/background.psd b/desktop/resources/inside-cafeteria/background.psd
index eaa70c43..f13908fe 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-castle/background-dark.png b/desktop/resources/inside-castle/background-dark.png
index 22af1d12..168627b9 100644
Binary files a/desktop/resources/inside-castle/background-dark.png and b/desktop/resources/inside-castle/background-dark.png differ
diff --git a/desktop/resources/inside-castle/background.png b/desktop/resources/inside-castle/background.png
index c1e03bff..21dbbe24 100644
Binary files a/desktop/resources/inside-castle/background.png and b/desktop/resources/inside-castle/background.png differ
diff --git a/desktop/resources/inside-castle/collision.png b/desktop/resources/inside-castle/collision.png
index 851cc97b..123e69f2 100644
Binary files a/desktop/resources/inside-castle/collision.png and b/desktop/resources/inside-castle/collision.png differ
diff --git a/desktop/resources/outside-castle/background-dark.png b/desktop/resources/outside-castle/background-dark.png
index bd279546..1c62749e 100644
Binary files a/desktop/resources/outside-castle/background-dark.png and b/desktop/resources/outside-castle/background-dark.png differ
diff --git a/desktop/resources/outside-castle/background.png b/desktop/resources/outside-castle/background.png
index 247c7c70..4a002de1 100644
Binary files a/desktop/resources/outside-castle/background.png and b/desktop/resources/outside-castle/background.png differ
diff --git a/desktop/resources/outside-castle/scale-map.png b/desktop/resources/outside-castle/scale-map.png
new file mode 100644
index 00000000..a9e9806a
Binary files /dev/null and b/desktop/resources/outside-castle/scale-map.png differ
diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj
index 447bd573..d70f6003 100644
--- a/desktop/src-common/advent/screens/rooms/inside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj
@@ -253,7 +253,7 @@
                                                      (if (actions/has-item? entities :sword)
                                                        (actions/talk entities :ego "I already have the Sword of Blergh!")
                                                        (do (actions/talk entities :ego "That's the coolest sword I've ever seen!!")
-                                                           (actions/walk-to entities :ego [52 97] :face :left)
+                                                           (actions/walk-to entities :ego [45 97] :face :left)
                                                            (actions/talk entities :ego "If I pull it out I can become a great knight!")
                                                            (let [missing-items (set/difference #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))
                                                                  obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))]
@@ -303,8 +303,8 @@
                            :bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p
                                                                   (concat p (reverse p)))) 
                            :sword (assoc (texture "inside-castle/sword.png")
-                                    :x 29
-                                    :y 108
+                                    :x 22
+                                    :y 110
                                     :baseline 95)
                            :trophy (assoc (animation->texture screen trophy)
                                      :x 253 :y 69 :baseline 191
diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj
index 09f57637..a66af65e 100644
--- a/desktop/src-common/advent/screens/rooms/outside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj
@@ -381,7 +381,7 @@
                                                                              (actions/remove-entity entities :note)
                                                                              (common/read-note-2 entities))))
                 :collision "outside-castle/collision.png"
-                :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)
+                :scale-fn (utils/scaler-fn-from-image "outside-castle/scale-map.png" 0.20 1.00)
                 :start-pos [310 80]
                 :apply-state (fn [entities]
                                (if (#{:night :sunrise} (get-in entities [:state :time]))