diff --git a/desktop/asset-work/inside-house/safe-screen.png b/desktop/asset-work/inside-house/safe-screen.png
index 99877c81..301d00b0 100644
Binary files a/desktop/asset-work/inside-house/safe-screen.png and b/desktop/asset-work/inside-house/safe-screen.png differ
diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas
index ab9301aa..ad156037 100644
--- a/desktop/resources/packed/pack.atlas
+++ b/desktop/resources/packed/pack.atlas
@@ -27,18 +27,11 @@ behindhouse/fg2
   index: -1
 behindhouse/stick
   rotate: false
-  xy: 1282, 763
+  xy: 2013, 375
   size: 24, 42
   orig: 24, 42
   offset: 0, 0
   index: -1
-black
-  rotate: false
-  xy: 2013, 134
-  size: 32, 24
-  orig: 32, 24
-  offset: 0, 0
-  index: -1
 butterfly
   rotate: false
   xy: 1867, 1471
@@ -62,40 +55,33 @@ castle-gate/coinflip
   index: -1
 castle-gate/frankie-walk-1
   rotate: false
-  xy: 2013, 234
+  xy: 2013, 259
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
 castle-gate/frankie-walk-2
   rotate: false
-  xy: 2013, 197
+  xy: 2013, 222
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
 castle-gate/frankie-walk-3
   rotate: false
-  xy: 2013, 160
+  xy: 2013, 185
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
 castle-gate/frankie-walk-4
   rotate: false
-  xy: 2021, 97
+  xy: 2013, 148
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
 castle-gate/frankie-walk-5
-  rotate: false
-  xy: 2021, 60
-  size: 24, 35
-  orig: 24, 35
-  offset: 0, 0
-  index: -1
-castle-gate/frankie-walk-6
   rotate: false
   xy: 2020, 1665
   size: 24, 35
@@ -111,7 +97,7 @@ castle-gate/goon-1
   index: -1
 castle-gate/goon-2-flip
   rotate: false
-  xy: 1606, 1044
+  xy: 494, 545
   size: 48, 32
   orig: 48, 32
   offset: 0, 0
@@ -179,7 +165,7 @@ cat-tree/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-title/dot
+inside-antique/dot
   rotate: false
   xy: 704, 916
   size: 1, 1
@@ -193,21 +179,7 @@ inside-house/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-inside-antique/dot
-  rotate: false
-  xy: 704, 916
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-wizard/dot
-  rotate: false
-  xy: 704, 916
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-outsidehouse/dot
+dream/dot
   rotate: false
   xy: 704, 916
   size: 1, 1
@@ -221,7 +193,7 @@ ego/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-dream/dot
+outsidehouse/dot
   rotate: false
   xy: 704, 916
   size: 1, 1
@@ -235,6 +207,20 @@ inside-jail/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
+title/dot
+  rotate: false
+  xy: 704, 916
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+wizard/dot
+  rotate: false
+  xy: 704, 916
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
 cat-tree/grandma
   rotate: false
   xy: 1228, 839
@@ -298,6 +284,13 @@ cat-tree/tree-r
   orig: 65, 240
   offset: 0, 0
   index: -1
+close
+  rotate: false
+  xy: 1638, 1024
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 cloud
   rotate: false
   xy: 1679, 2
@@ -312,6 +305,13 @@ space/cloud
   orig: 15, 15
   offset: 0, 0
   index: -1
+cloudy
+  rotate: false
+  xy: 2021, 50
+  size: 20, 20
+  orig: 20, 20
+  offset: 0, 0
+  index: -1
 dbh
   rotate: false
   xy: 2, 1086
@@ -368,6 +368,13 @@ dream/fairy-godfather-magic
   orig: 500, 77
   offset: 0, 0
   index: -1
+dream/island
+  rotate: false
+  xy: 1606, 1021
+  size: 30, 20
+  orig: 30, 20
+  offset: 0, 0
+  index: -1
 dream/plaque1
   rotate: false
   xy: 1787, 76
@@ -377,7 +384,7 @@ dream/plaque1
   index: -1
 dream/plaque2
   rotate: false
-  xy: 1853, 50
+  xy: 1260, 799
   size: 10, 6
   orig: 10, 6
   offset: 0, 0
@@ -398,7 +405,7 @@ dream/shovel
   index: -1
 dream/sword
   rotate: false
-  xy: 2031, 20
+  xy: 1491, 442
   size: 15, 38
   orig: 15, 38
   offset: 0, 0
@@ -419,14 +426,14 @@ ego/axe-wood
   index: -1
 ego/base
   rotate: false
-  xy: 1491, 444
+  xy: 1638, 1080
   size: 16, 36
   orig: 16, 36
   offset: 0, 0
   index: -1
 ego/whistle-1
   rotate: false
-  xy: 1491, 444
+  xy: 1638, 1080
   size: 16, 36
   orig: 16, 36
   offset: 0, 0
@@ -452,9 +459,16 @@ ego/crawl
   orig: 273, 25
   offset: 0, 0
   index: -1
+ego/fire
+  rotate: false
+  xy: 1260, 761
+  size: 216, 36
+  orig: 216, 36
+  offset: 0, 0
+  index: -1
 ego/flying
   rotate: false
-  xy: 1995, 4
+  xy: 2007, 483
   size: 34, 44
   orig: 34, 44
   offset: 0, 0
@@ -482,7 +496,7 @@ ego/glad
   index: -1
 ego/hold-hand
   rotate: false
-  xy: 1491, 406
+  xy: 1638, 1042
   size: 16, 36
   orig: 16, 36
   offset: 0, 0
@@ -536,6 +550,27 @@ ego/swing-shovel
   orig: 630, 70
   offset: 0, 0
   index: -1
+ego/whistle-2
+  rotate: false
+  xy: 1491, 404
+  size: 16, 36
+  orig: 16, 36
+  offset: 0, 0
+  index: -1
+ego/whistle-3
+  rotate: false
+  xy: 2021, 110
+  size: 16, 36
+  orig: 16, 36
+  offset: 0, 0
+  index: -1
+ego/whistle-4
+  rotate: false
+  xy: 2021, 72
+  size: 16, 36
+  orig: 16, 36
+  offset: 0, 0
+  index: -1
 ending-castle/Untitled
   rotate: false
   xy: 1767, 109
@@ -580,14 +615,14 @@ ending-castle/ending-castle2-assets/foreground
   index: -1
 ending-castle/guard-1
   rotate: false
-  xy: 2007, 512
+  xy: 2007, 587
   size: 27, 56
   orig: 27, 56
   offset: 0, 0
   index: -1
 ending-castle/guard-2
   rotate: false
-  xy: 2013, 413
+  xy: 2007, 529
   size: 27, 56
   orig: 27, 56
   offset: 0, 0
@@ -622,21 +657,21 @@ held/bloodclot-head-1
   index: -1
 held/dot
   rotate: false
-  xy: 2007, 468
+  xy: 1228, 900
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 space/dot
   rotate: false
-  xy: 2007, 468
+  xy: 1228, 900
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 outside-jail/dot
   rotate: false
-  xy: 2007, 468
+  xy: 1228, 900
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -678,21 +713,21 @@ inside-antique/bowl-0
   index: -1
 inside-antique/bowl-1
   rotate: false
-  xy: 2031, 5
+  xy: 1696, 4
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
   index: -1
 inside-antique/bowl-2
   rotate: false
-  xy: 1696, 4
+  xy: 1712, 4
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
   index: -1
 inside-antique/bowl-3
   rotate: false
-  xy: 1712, 4
+  xy: 1728, 4
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
@@ -755,7 +790,7 @@ inside-cafeteria/knights-stand
   index: -1
 inside-cafeteria/ladder
   rotate: false
-  xy: 2013, 350
+  xy: 1478, 759
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
@@ -769,7 +804,7 @@ inside-cafeteria/ladder-guard
   index: -1
 inside-cafeteria/ladder-guard-2
   rotate: false
-  xy: 2007, 570
+  xy: 1606, 1043
   size: 30, 73
   orig: 30, 73
   offset: 0, 0
@@ -797,7 +832,7 @@ inside-castle/background
   index: -1
 inside-castle/bookstack
   rotate: false
-  xy: 2013, 313
+  xy: 2013, 296
   size: 27, 35
   orig: 27, 35
   offset: 0, 0
@@ -832,28 +867,14 @@ inside-castle/pull-sword
   index: -1
 inside-castle/sign1
   rotate: false
-  xy: 494, 517
+  xy: 494, 523
   size: 44, 20
   orig: 44, 20
   offset: 0, 0
   index: -1
 inside-castle/sign-1
   rotate: false
-  xy: 494, 517
-  size: 44, 20
-  orig: 44, 20
-  offset: 0, 0
-  index: -1
-inside-castle/sign2
-  rotate: false
-  xy: 1606, 1022
-  size: 44, 20
-  orig: 44, 20
-  offset: 0, 0
-  index: -1
-inside-castle/sign-2
-  rotate: false
-  xy: 1606, 1022
+  xy: 494, 523
   size: 44, 20
   orig: 44, 20
   offset: 0, 0
@@ -867,7 +888,7 @@ inside-castle/trophy
   index: -1
 inside-castle/watch
   rotate: false
-  xy: 2021, 50
+  xy: 1952, 1219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -914,13 +935,6 @@ inside-house/safe-lock
   orig: 243, 8
   offset: 0, 0
   index: -1
-inside-house/safe-screen
-  rotate: false
-  xy: 1308, 762
-  size: 200, 75
-  orig: 200, 75
-  offset: 0, 0
-  index: -1
 inside-jail/background
   rotate: false
   xy: 1656, 876
@@ -958,7 +972,7 @@ inside-stash/background
   index: -1
 inside-stash/candle
   rotate: false
-  xy: 1606, 1231
+  xy: 494, 517
   size: 16, 4
   orig: 16, 4
   offset: 0, 0
@@ -979,7 +993,7 @@ outside-castle/background
   index: -1
 outside-castle/bird
   rotate: false
-  xy: 540, 535
+  xy: 700, 828
   size: 2, 2
   orig: 2, 2
   offset: 0, 0
@@ -991,6 +1005,13 @@ outside-castle/flies
   orig: 45, 15
   offset: 0, 0
   index: -1
+outside-castle/peddler
+  rotate: false
+  xy: 2017, 12
+  size: 18, 36
+  orig: 18, 36
+  offset: 0, 0
+  index: -1
 outside-jail/Untitled
   rotate: false
   xy: 1284, 1582
@@ -1061,6 +1082,13 @@ outsidehouse/background
   orig: 320, 240
   offset: 0, 0
   index: -1
+outsidehouse/cauldron
+  rotate: false
+  xy: 1308, 799
+  size: 200, 38
+  orig: 200, 38
+  offset: 0, 0
+  index: -1
 outsidehouse/charcoal-1
   rotate: false
   xy: 324, 2
@@ -1098,7 +1126,7 @@ outsidehouse/lamb
   index: -1
 outsidehouse/sheep
   rotate: false
-  xy: 2013, 390
+  xy: 2013, 419
   size: 33, 21
   orig: 33, 21
   offset: 0, 0
@@ -1217,7 +1245,7 @@ space/broken-jewel
   index: -1
 talk-bg-2
   rotate: false
-  xy: 2013, 271
+  xy: 2013, 333
   size: 21, 40
   orig: 21, 40
   offset: 0, 0
@@ -1245,39 +1273,25 @@ title/banner-back
   index: -1
 title/quill
   rotate: false
-  xy: 2007, 471
+  xy: 2013, 442
   size: 33, 39
   orig: 33, 39
   offset: 0, 0
   index: -1
 title/save-indicator
   rotate: false
-  xy: 1883, 1471
+  xy: 2039, 410
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 title/save-indicator-active
   rotate: false
-  xy: 1892, 1471
+  xy: 1883, 1471
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
-title/screenshot-backdrop
-  rotate: false
-  xy: 494, 539
-  size: 48, 38
-  orig: 48, 38
-  offset: 0, 0
-  index: -1
-title/screenshot-backdrop-active
-  rotate: false
-  xy: 1606, 1078
-  size: 48, 38
-  orig: 48, 38
-  offset: 0, 0
-  index: -1
 wizard/disappear
   rotate: false
   xy: 634, 759
@@ -1294,14 +1308,14 @@ wizard/flame
   index: -1
 wizard/stand
   rotate: false
-  xy: 1260, 759
+  xy: 1995, 2
   size: 20, 46
   orig: 20, 46
   offset: 0, 0
   index: -1
 wizard
   rotate: false
-  xy: 1260, 759
+  xy: 1995, 2
   size: 20, 46
   orig: 20, 46
   offset: 0, 0
@@ -1342,7 +1356,7 @@ behindhouse/house
   index: -1
 behindhouse/house-cover
   rotate: false
-  xy: 1590, 473
+  xy: 592, 12
   size: 20, 21
   orig: 20, 21
   offset: 0, 0
@@ -1354,41 +1368,41 @@ castle-gate/frankie
   orig: 312, 35
   offset: 0, 0
   index: -1
-castle-gate/frankie-walk-7
+castle-gate/frankie-walk-6
   rotate: false
   xy: 2022, 525
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
-castle-gate/frankie-walk-8
+castle-gate/frankie-walk-7
   rotate: false
   xy: 2022, 488
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
+castle-gate/frankie-walk-8
+  rotate: false
+  xy: 2022, 451
+  size: 24, 35
+  orig: 24, 35
+  offset: 0, 0
+  index: -1
 castle-gate/goon-2
   rotate: false
-  xy: 2022, 454
+  xy: 2022, 417
   size: 24, 32
   orig: 24, 32
   offset: 0, 0
   index: -1
 castle-gate/goon-2-talk
   rotate: false
-  xy: 2022, 420
+  xy: 2022, 383
   size: 24, 32
   orig: 24, 32
   offset: 0, 0
   index: -1
-cat-tree/brush-l
-  rotate: false
-  xy: 1133, 40
-  size: 152, 70
-  orig: 152, 70
-  offset: 0, 0
-  index: -1
 cat-tree/inventory
   rotate: false
   xy: 1870, 460
@@ -1410,23 +1424,9 @@ cat-tree/tree-and-rock
   orig: 320, 240
   offset: 0, 0
   index: -1
-close
-  rotate: false
-  xy: 2030, 646
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-cloudy
-  rotate: false
-  xy: 1590, 451
-  size: 20, 20
-  orig: 20, 20
-  offset: 0, 0
-  index: -1
 cursorr
   rotate: false
-  xy: 2030, 628
+  xy: 2030, 760
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1466,13 +1466,6 @@ outside-jail/fountain
   orig: 320, 240
   offset: 0, 0
   index: -1
-dream/island
-  rotate: false
-  xy: 284, 7
-  size: 30, 20
-  orig: 30, 20
-  offset: 0, 0
-  index: -1
 dream/pedestals
   rotate: false
   xy: 968, 596
@@ -1487,34 +1480,6 @@ dream/sky
   orig: 320, 240
   offset: 0, 0
   index: -1
-ego/Untitled
-  rotate: false
-  xy: 996, 2
-  size: 144, 36
-  orig: 144, 36
-  offset: 0, 0
-  index: -1
-ego/talk
-  rotate: false
-  xy: 996, 2
-  size: 144, 36
-  orig: 144, 36
-  offset: 0, 0
-  index: -1
-ego/crowbar
-  rotate: false
-  xy: 1142, 2
-  size: 144, 36
-  orig: 144, 36
-  offset: 0, 0
-  index: -1
-ego/fire
-  rotate: false
-  xy: 614, 31
-  size: 216, 36
-  orig: 216, 36
-  offset: 0, 0
-  index: -1
 ego/get-sick
   rotate: false
   xy: 1934, 841
@@ -1550,16 +1515,9 @@ ego/pant
   orig: 62, 36
   offset: 0, 0
   index: -1
-ego/sigh
-  rotate: false
-  xy: 832, 2
-  size: 162, 36
-  orig: 162, 36
-  offset: 0, 0
-  index: -1
 ego/standup
   rotate: false
-  xy: 906, 55
+  xy: 614, 12
   size: 225, 55
   orig: 225, 55
   offset: 0, 0
@@ -1571,27 +1529,6 @@ ego/swing
   orig: 288, 75
   offset: 0, 0
   index: -1
-ego/whistle-2
-  rotate: false
-  xy: 2030, 740
-  size: 16, 36
-  orig: 16, 36
-  offset: 0, 0
-  index: -1
-ego/whistle-3
-  rotate: false
-  xy: 2030, 702
-  size: 16, 36
-  orig: 16, 36
-  offset: 0, 0
-  index: -1
-ego/whistle-4
-  rotate: false
-  xy: 2030, 664
-  size: 16, 36
-  orig: 16, 36
-  offset: 0, 0
-  index: -1
 ending-castle/ending-castle2-assets/collision
   rotate: false
   xy: 324, 1322
@@ -1601,7 +1538,7 @@ ending-castle/ending-castle2-assets/collision
   index: -1
 held/flesh
   rotate: false
-  xy: 592, 13
+  xy: 1590, 474
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
@@ -1664,21 +1601,21 @@ inside-antique/open-blinds
   index: -1
 inside-antique/portrait
   rotate: false
-  xy: 684, 13
+  xy: 2030, 688
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 inside-antique/shopkeep
   rotate: false
-  xy: 2022, 293
+  xy: 284, 6
   size: 18, 21
   orig: 18, 21
   offset: 0, 0
   index: -1
 inside-antique/teddy
   rotate: false
-  xy: 702, 13
+  xy: 2030, 652
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1755,7 +1692,7 @@ inside-cafeteria/glow
   index: -1
 inside-castle/books
   rotate: false
-  xy: 614, 10
+  xy: 1250, 9
   size: 34, 19
   orig: 34, 19
   offset: 0, 0
@@ -1790,7 +1727,7 @@ inside-castle/hands-1
   index: -1
 inside-castle/magic
   rotate: false
-  xy: 878, 47
+  xy: 1590, 452
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
@@ -1802,16 +1739,37 @@ inside-castle/pedestal-overlay
   orig: 320, 240
   offset: 0, 0
   index: -1
+inside-castle/roof
+  rotate: false
+  xy: 841, 10
+  size: 57, 57
+  orig: 57, 57
+  offset: 0, 0
+  index: -1
+inside-castle/sign2
+  rotate: false
+  xy: 1158, 8
+  size: 44, 20
+  orig: 44, 20
+  offset: 0, 0
+  index: -1
+inside-castle/sign-2
+  rotate: false
+  xy: 1158, 8
+  size: 44, 20
+  orig: 44, 20
+  offset: 0, 0
+  index: -1
 inside-castle/sign3
   rotate: false
-  xy: 832, 47
+  xy: 1204, 8
   size: 44, 20
   orig: 44, 20
   offset: 0, 0
   index: -1
 inside-castle/sign-3
   rotate: false
-  xy: 832, 47
+  xy: 1204, 8
   size: 44, 20
   orig: 44, 20
   offset: 0, 0
@@ -1837,6 +1795,13 @@ inside-house/glow
   orig: 320, 240
   offset: 0, 0
   index: -1
+inside-house/safe-screen
+  rotate: false
+  xy: 906, 10
+  size: 250, 100
+  orig: 250, 100
+  offset: 0, 0
+  index: -1
 inside-house/sillhoute
   rotate: false
   xy: 1612, 1080
@@ -1888,7 +1853,7 @@ inside-jail/warden
   index: -1
 inside-jail/window-bent
   rotate: false
-  xy: 2022, 316
+  xy: 2022, 317
   size: 18, 29
   orig: 18, 29
   offset: 0, 0
@@ -1921,18 +1886,18 @@ outside-castle/brush-bl
   orig: 60, 60
   offset: 0, 0
   index: -1
-outside-castle/note
+outside-castle/brush-br
   rotate: false
-  xy: 2030, 610
-  size: 16, 16
-  orig: 16, 16
+  xy: 1158, 30
+  size: 130, 80
+  orig: 130, 80
   offset: 0, 0
   index: -1
-outside-castle/peddler
+outside-castle/note
   rotate: false
-  xy: 2022, 347
-  size: 18, 36
-  orig: 18, 36
+  xy: 2030, 742
+  size: 16, 16
+  orig: 16, 16
   offset: 0, 0
   index: -1
 outside-castle/walk-behind
@@ -1944,7 +1909,7 @@ outside-castle/walk-behind
   index: -1
 outside-jail/axe
   rotate: false
-  xy: 2022, 385
+  xy: 2022, 348
   size: 22, 33
   orig: 22, 33
   offset: 0, 0
@@ -2000,7 +1965,7 @@ outsidehouse/house
   index: -1
 outsidehouse/note
   rotate: false
-  xy: 2030, 592
+  xy: 2030, 724
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2014,14 +1979,14 @@ outsidehouse/sheep-walk
   index: -1
 pathfind-test
   rotate: false
-  xy: 2030, 574
+  xy: 2030, 706
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 save
   rotate: false
-  xy: 2022, 275
+  xy: 2030, 670
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2159,13 +2124,6 @@ title/logo
   orig: 320, 240
   offset: 0, 0
   index: -1
-white
-  rotate: false
-  xy: 650, 5
-  size: 32, 24
-  orig: 32, 24
-  offset: 0, 0
-  index: -1
 
 pack3.png
 size: 2048,1024
@@ -2174,21 +2132,28 @@ filter: Nearest,Nearest
 repeat: none
 behindhouse/fgleft
   rotate: false
-  xy: 218, 33
+  xy: 209, 141
   size: 161, 50
   orig: 161, 50
   offset: 0, 0
   index: -1
+black
+  rotate: false
+  xy: 1833, 738
+  size: 32, 24
+  orig: 32, 24
+  offset: 0, 0
+  index: -1
 castle-gate/Untitled
   rotate: false
-  xy: 209, 119
+  xy: 798, 721
   size: 192, 35
   orig: 192, 35
   offset: 0, 0
   index: -1
 castle-gate/goon-2-search
   rotate: false
-  xy: 218, 85
+  xy: 798, 687
   size: 192, 32
   orig: 192, 32
   offset: 0, 0
@@ -2256,6 +2221,13 @@ castle-gate/throw-walkie-9
   orig: 205, 136
   offset: 0, 0
   index: -1
+cat-tree/brush-l
+  rotate: false
+  xy: 798, 615
+  size: 152, 70
+  orig: 152, 70
+  offset: 0, 0
+  index: -1
 cat-tree/eye-1
   rotate: false
   xy: 209, 198
@@ -2272,154 +2244,154 @@ cat-tree/eye-6
   index: -1
 cat-tree/eye-10
   rotate: false
-  xy: 1897, 448
+  xy: 1630, 200
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-11
   rotate: false
-  xy: 1903, 398
+  xy: 1676, 189
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-12
   rotate: false
-  xy: 1903, 348
+  xy: 1722, 189
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-13
   rotate: false
-  xy: 1903, 298
+  xy: 1820, 411
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-2
   rotate: false
-  xy: 725, 723
+  xy: 1196, 529
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-3
   rotate: false
-  xy: 631, 7
+  xy: 1672, 455
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-4
   rotate: false
-  xy: 1122, 37
+  xy: 1402, 236
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-5
   rotate: false
-  xy: 1893, 535
+  xy: 1492, 217
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-7
   rotate: false
-  xy: 1893, 535
+  xy: 1492, 217
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-8
   rotate: false
-  xy: 1939, 527
+  xy: 1538, 217
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/eye-9
   rotate: false
-  xy: 1985, 508
+  xy: 1584, 212
   size: 44, 48
   orig: 44, 48
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-10
   rotate: false
-  xy: 412, 79
+  xy: 1559, 664
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-11
   rotate: false
-  xy: 1374, 449
+  xy: 1935, 677
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-12
   rotate: false
-  xy: 571, 15
+  xy: 886, 2
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-13
   rotate: false
-  xy: 1374, 407
+  xy: 946, 2
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-14
   rotate: false
-  xy: 1374, 365
+  xy: 1219, 428
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-15
   rotate: false
-  xy: 737, 55
+  xy: 1279, 428
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-16
   rotate: false
-  xy: 724, 13
+  xy: 1339, 424
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-17
   rotate: false
-  xy: 797, 43
+  xy: 1718, 410
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-18
   rotate: false
-  xy: 381, 37
+  xy: 1219, 386
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-19
   rotate: false
-  xy: 1572, 510
+  xy: 1279, 386
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-20
   rotate: false
-  xy: 1773, 494
+  xy: 1339, 382
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
@@ -2447,32 +2419,46 @@ cat-tree/grandma-cry-9
   index: -1
 cat-tree/owl
   rotate: false
-  xy: 1415, 854
+  xy: 1199, 818
   size: 168, 30
   orig: 168, 30
   offset: 0, 0
   index: -1
 dream/corner-l
   rotate: false
-  xy: 791, 325
+  xy: 791, 324
   size: 112, 59
   orig: 112, 59
   offset: 0, 0
   index: -1
 dream/corner-r
   rotate: false
-  xy: 693, 97
+  xy: 693, 100
   size: 112, 59
   orig: 112, 59
   offset: 0, 0
   index: -1
 dream/sign
   rotate: false
-  xy: 1939, 669
+  xy: 905, 101
   size: 41, 58
   orig: 41, 58
   offset: 0, 0
   index: -1
+ego/Untitled
+  rotate: false
+  xy: 1199, 780
+  size: 144, 36
+  orig: 144, 36
+  offset: 0, 0
+  index: -1
+ego/talk
+  rotate: false
+  xy: 1199, 780
+  size: 144, 36
+  orig: 144, 36
+  offset: 0, 0
+  index: -1
 ego/cat-toy
   rotate: false
   xy: 518, 640
@@ -2480,296 +2466,310 @@ ego/cat-toy
   orig: 205, 50
   offset: 0, 0
   index: -1
+ego/crowbar
+  rotate: false
+  xy: 1533, 848
+  size: 144, 36
+  orig: 144, 36
+  offset: 0, 0
+  index: -1
 ego/frustrated-talk
   rotate: false
-  xy: 801, 162
+  xy: 801, 161
   size: 96, 36
   orig: 96, 36
   offset: 0, 0
   index: -1
 ego/grow
   rotate: false
-  xy: 907, 374
+  xy: 1344, 466
   size: 90, 36
   orig: 90, 36
   offset: 0, 0
   index: -1
 ego/grow-talk
   rotate: false
-  xy: 1833, 498
+  xy: 1473, 772
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 ego/hand-hold
   rotate: false
-  xy: 1855, 536
+  xy: 952, 649
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 ending-castle/hand-hold
   rotate: false
-  xy: 1855, 536
+  xy: 952, 649
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 ego/hold-up-to-window
   rotate: false
-  xy: 966, 580
+  xy: 1120, 656
   size: 108, 36
   orig: 108, 36
   offset: 0, 0
   index: -1
 ego/jump-straight
   rotate: false
-  xy: 905, 324
+  xy: 372, 143
   size: 90, 48
   orig: 90, 48
   offset: 0, 0
   index: -1
 ego/love-10
   rotate: false
-  xy: 571, 57
+  xy: 1512, 513
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-11
   rotate: false
-  xy: 623, 57
+  xy: 1546, 585
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-12
   rotate: false
-  xy: 1070, 55
+  xy: 1564, 513
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-13
   rotate: false
-  xy: 1166, 489
+  xy: 907, 397
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-14
   rotate: false
-  xy: 1166, 417
+  xy: 1820, 499
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-15
   rotate: false
-  xy: 1218, 489
+  xy: 1872, 499
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-16
   rotate: false
-  xy: 1218, 417
+  xy: 1620, 433
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-17
   rotate: false
-  xy: 1270, 489
+  xy: 885, 204
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-18
   rotate: false
-  xy: 1270, 417
+  xy: 1924, 500
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-19
   rotate: false
-  xy: 1322, 514
+  xy: 959, 409
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-20
   rotate: false
-  xy: 1322, 442
+  xy: 1011, 436
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-21
   rotate: false
-  xy: 1374, 491
+  xy: 1063, 433
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-22
   rotate: false
-  xy: 1426, 491
+  xy: 1115, 433
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-23
   rotate: false
-  xy: 1322, 370
+  xy: 1167, 423
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-24
   rotate: false
-  xy: 1434, 362
+  xy: 1011, 364
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-25
   rotate: false
-  xy: 1887, 657
+  xy: 1063, 361
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-26
   rotate: false
-  xy: 1887, 585
+  xy: 1115, 361
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-4
   rotate: false
-  xy: 914, 566
+  xy: 410, 71
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-5
   rotate: false
-  xy: 1961, 731
+  xy: 630, 60
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-6
   rotate: false
-  xy: 1783, 612
+  xy: 1989, 826
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-7
   rotate: false
-  xy: 1835, 612
+  xy: 1989, 754
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-8
   rotate: false
-  xy: 411, 121
+  xy: 725, 644
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-9
   rotate: false
-  xy: 472, 63
+  xy: 1494, 585
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/poke
   rotate: false
-  xy: 899, 161
+  xy: 543, 3
   size: 80, 50
   orig: 80, 50
   offset: 0, 0
   index: -1
 ego/reach
   rotate: false
-  xy: 1779, 684
+  xy: 1926, 639
   size: 72, 36
   orig: 72, 36
   offset: 0, 0
   index: -1
 ego/scared
   rotate: false
-  xy: 1783, 574
+  xy: 1718, 452
   size: 72, 36
   orig: 72, 36
   offset: 0, 0
   index: -1
 ego/scared-walk
   rotate: false
-  xy: 1681, 662
+  xy: 1518, 475
   size: 96, 36
   orig: 96, 36
   offset: 0, 0
   index: -1
 ego/shoot
   rotate: false
-  xy: 1585, 848
+  xy: 1679, 848
   size: 144, 36
   orig: 144, 36
   offset: 0, 0
   index: -1
+ego/sigh
+  rotate: false
+  xy: 1369, 848
+  size: 162, 36
+  orig: 162, 36
+  offset: 0, 0
+  index: -1
 ego/squat
   rotate: false
-  xy: 1111, 740
+  xy: 992, 656
   size: 126, 36
   orig: 126, 36
   offset: 0, 0
   index: -1
 ego/squat-talk
   rotate: false
-  xy: 1781, 536
+  xy: 1820, 461
   size: 72, 36
   orig: 72, 36
   offset: 0, 0
   index: -1
 ego/stand
   rotate: false
-  xy: 1239, 740
+  xy: 1230, 658
   size: 126, 36
   orig: 126, 36
   offset: 0, 0
   index: -1
 ego/suspended
   rotate: false
-  xy: 1731, 848
+  xy: 1369, 810
   size: 140, 36
   orig: 140, 36
   offset: 0, 0
   index: -1
 ego/thorw
   rotate: false
-  xy: 1101, 618
+  xy: 1340, 734
   size: 126, 36
   orig: 126, 36
   offset: 0, 0
   index: -1
 ego/throw
   rotate: false
-  xy: 1415, 751
+  xy: 1340, 696
   size: 126, 36
   orig: 126, 36
   offset: 0, 0
   index: -1
 ego/warden
   rotate: false
-  xy: 1718, 245
+  xy: 899, 161
   size: 42, 41
   orig: 42, 41
   offset: 0, 0
@@ -2783,301 +2783,301 @@ ending-castle/crowd-right
   index: -1
 ending-castle/frankie-fall-1
   rotate: false
-  xy: 1089, 201
+  xy: 959, 372
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-10
   rotate: false
-  xy: 1898, 171
+  xy: 1195, 198
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-11
   rotate: false
-  xy: 1940, 171
+  xy: 1237, 198
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-12
   rotate: false
-  xy: 1165, 380
+  xy: 1195, 161
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-2
   rotate: false
-  xy: 1871, 498
+  xy: 989, 327
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-3
   rotate: false
-  xy: 838, 6
+  xy: 947, 290
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-4
   rotate: false
-  xy: 1580, 301
+  xy: 989, 290
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-5
   rotate: false
-  xy: 1622, 301
+  xy: 1069, 189
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-6
   rotate: false
-  xy: 1169, 55
+  xy: 1111, 182
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-7
   rotate: false
-  xy: 1168, 18
+  xy: 1153, 182
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-8
   rotate: false
-  xy: 1131, 202
+  xy: 1195, 235
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-9
   rotate: false
-  xy: 1856, 176
+  xy: 1237, 235
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/warden-2
   rotate: false
-  xy: 1985, 465
+  xy: 896, 276
   size: 42, 41
   orig: 42, 41
   offset: 0, 0
   index: -1
 georgia/kick-1
   rotate: false
-  xy: 1903, 253
+  xy: 1995, 677
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-10
   rotate: false
-  xy: 1081, 381
+  xy: 1027, 200
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-11
   rotate: false
-  xy: 1123, 382
+  xy: 1031, 316
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-12
   rotate: false
-  xy: 1207, 372
+  xy: 1073, 316
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-13
   rotate: false
-  xy: 1249, 372
+  xy: 1115, 316
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-14
   rotate: false
-  xy: 1123, 337
+  xy: 1065, 271
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-15
   rotate: false
-  xy: 1165, 335
+  xy: 1107, 271
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-16
   rotate: false
-  xy: 1207, 327
+  xy: 1149, 264
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-17
   rotate: false
-  xy: 1249, 327
+  xy: 1069, 226
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-18
   rotate: false
-  xy: 1291, 325
+  xy: 990, 155
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-19
   rotate: false
-  xy: 1070, 10
+  xy: 1111, 219
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-2
   rotate: false
-  xy: 1903, 208
+  xy: 905, 319
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-4
   rotate: false
-  xy: 1903, 208
+  xy: 905, 319
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-20
   rotate: false
-  xy: 1142, 241
+  xy: 1153, 219
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-3
   rotate: false
-  xy: 1943, 482
+  xy: 948, 121
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-5
   rotate: false
-  xy: 1945, 253
+  xy: 956, 76
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-6
   rotate: false
-  xy: 1945, 208
+  xy: 947, 327
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-7
   rotate: false
-  xy: 1079, 329
+  xy: 981, 245
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-8
   rotate: false
-  xy: 1084, 284
+  xy: 985, 200
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-9
   rotate: false
-  xy: 1100, 239
+  xy: 1023, 245
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 goon-2-walk
   rotate: false
-  xy: 798, 722
+  xy: 1199, 850
   size: 168, 34
   orig: 168, 34
   offset: 0, 0
   index: -1
 castle-gate/goon-2-walk
   rotate: false
-  xy: 798, 722
+  xy: 1199, 850
   size: 168, 34
   orig: 168, 34
   offset: 0, 0
   index: -1
 held/bloodclot-head-2
   rotate: false
-  xy: 857, 638
+  xy: 992, 694
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-3
   rotate: false
-  xy: 1873, 803
+  xy: 1108, 694
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-4
   rotate: false
-  xy: 973, 656
+  xy: 1224, 696
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-5
   rotate: false
-  xy: 1089, 656
+  xy: 1641, 764
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-6
   rotate: false
-  xy: 1205, 656
+  xy: 1757, 764
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-7
   rotate: false
-  xy: 798, 554
+  xy: 1873, 803
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-8
   rotate: false
-  xy: 798, 470
+  xy: 1873, 719
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
   index: -1
 held/bloodclot-head-9
   rotate: false
-  xy: 791, 386
+  xy: 791, 385
   size: 114, 82
   orig: 114, 82
   offset: 0, 0
@@ -3147,35 +3147,35 @@ inside-cafeteria/hands-fight-2
   index: -1
 inside-cafeteria/hands-fight-3
   rotate: false
-  xy: 693, 158
+  xy: 693, 161
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-4
   rotate: false
-  xy: 983, 778
+  xy: 798, 507
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-5
   rotate: false
-  xy: 1091, 778
+  xy: 218, 33
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-6
   rotate: false
-  xy: 1199, 778
+  xy: 983, 778
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
   index: -1
 inside-cafeteria/hands-fight-7
   rotate: false
-  xy: 1307, 778
+  xy: 1091, 778
   size: 106, 106
   orig: 106, 106
   offset: 0, 0
@@ -3189,217 +3189,196 @@ inside-cafeteria/warriors-stand
   index: -1
 inside-castle/door
   rotate: false
-  xy: 998, 275
+  xy: 457, 7
   size: 84, 49
   orig: 84, 49
   offset: 0, 0
   index: -1
-inside-castle/roof
-  rotate: false
-  xy: 1989, 839
-  size: 57, 57
-  orig: 57, 57
-  offset: 0, 0
-  index: -1
 inside-castle/walkie-talkie
   rotate: false
-  xy: 1989, 803
+  xy: 1460, 659
   size: 35, 34
   orig: 35, 34
   offset: 0, 0
   index: -1
 inside-house/candle
   rotate: false
-  xy: 1411, 563
+  xy: 990, 508
   size: 102, 32
   orig: 102, 32
   offset: 0, 0
   index: -1
 inside-jail/chest-top
   rotate: false
-  xy: 1939, 577
+  xy: 1196, 495
   size: 44, 32
   orig: 44, 32
   offset: 0, 0
   index: -1
 inside-jail/chest-top-open
   rotate: false
-  xy: 1664, 460
+  xy: 1672, 421
   size: 44, 32
   orig: 44, 32
   offset: 0, 0
   index: -1
 inside-jail/crowbar
   rotate: false
-  xy: 1225, 561
+  xy: 1904, 604
   size: 64, 33
   orig: 64, 33
   offset: 0, 0
   index: -1
 open-inventory-11
   rotate: false
-  xy: 1718, 346
+  xy: 1768, 178
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-12
   rotate: false
-  xy: 1718, 288
+  xy: 1812, 178
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-13
   rotate: false
-  xy: 1674, 286
+  xy: 937, 218
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-2
   rotate: false
-  xy: 1939, 611
+  xy: 630, 2
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-3
   rotate: false
-  xy: 1982, 673
+  xy: 1941, 442
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-4
   rotate: false
-  xy: 1983, 615
+  xy: 1355, 324
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-5
   rotate: false
-  xy: 1580, 395
+  xy: 1449, 285
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-6
   rotate: false
-  xy: 1624, 395
+  xy: 1448, 227
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-7
   rotate: false
-  xy: 1668, 402
+  xy: 1775, 352
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-8
   rotate: false
-  xy: 1674, 344
+  xy: 1775, 294
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-10
   rotate: false
-  xy: 1674, 344
+  xy: 1775, 294
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 open-inventory-9
   rotate: false
-  xy: 1712, 404
+  xy: 1775, 236
   size: 42, 56
   orig: 42, 56
   offset: 0, 0
   index: -1
 outside-castle/Untitled
   rotate: false
-  xy: 983, 740
+  xy: 798, 469
   size: 126, 36
   orig: 126, 36
   offset: 0, 0
   index: -1
 outside-castle/peddler-talk
   rotate: false
-  xy: 983, 740
+  xy: 798, 469
   size: 126, 36
   orig: 126, 36
   offset: 0, 0
   index: -1
 outside-castle/balloons
   rotate: false
-  xy: 1515, 559
+  xy: 1497, 657
   size: 60, 36
   orig: 60, 36
   offset: 0, 0
   index: -1
 outside-castle/blanket
   rotate: false
-  xy: 791, 277
+  xy: 791, 276
   size: 103, 46
   orig: 103, 46
   offset: 0, 0
   index: -1
-outside-castle/brush-br
-  rotate: false
-  xy: 725, 640
-  size: 130, 80
-  orig: 130, 80
-  offset: 0, 0
-  index: -1
 outside-castle/crowd-right
   rotate: false
-  xy: 575, 129
+  xy: 575, 132
   size: 116, 135
   orig: 116, 135
   offset: 0, 0
   index: -1
 outside-castle/steer
   rotate: false
-  xy: 209, 156
+  xy: 582, 436
   size: 200, 35
   orig: 200, 35
   offset: 0, 0
   index: -1
 outside-jail/closed-stash
   rotate: false
-  xy: 784, 11
+  xy: 1989, 722
   size: 52, 30
   orig: 52, 30
   offset: 0, 0
   index: -1
-outsidehouse/cauldron
-  rotate: false
-  xy: 582, 433
-  size: 200, 38
-  orig: 200, 38
-  offset: 0, 0
-  index: -1
 outsidehouse/door
   rotate: false
-  xy: 1229, 596
+  xy: 807, 101
   size: 96, 58
   orig: 96, 58
   offset: 0, 0
   index: -1
 outsidehouse/fg1
   rotate: false
-  xy: 1415, 789
+  xy: 1511, 783
   size: 128, 63
   orig: 128, 63
   offset: 0, 0
   index: -1
 outsidehouse/fgtest
   rotate: false
-  xy: 891, 84
+  xy: 1552, 706
   size: 75, 75
   orig: 75, 75
   offset: 0, 0
@@ -3413,210 +3392,210 @@ outsidehouse/lamb-walk
   index: -1
 safe-song/safe-song-1
   rotate: false
-  xy: 1076, 581
+  xy: 1358, 659
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-10
   rotate: false
-  xy: 968, 53
+  xy: 1629, 690
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-11
   rotate: false
-  xy: 1545, 811
+  xy: 1731, 690
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-12
   rotate: false
-  xy: 1647, 811
+  xy: 807, 64
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-13
   rotate: false
-  xy: 1749, 811
+  xy: 784, 27
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-14
   rotate: false
-  xy: 1545, 774
+  xy: 1242, 507
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-15
   rotate: false
-  xy: 1647, 774
+  xy: 1242, 470
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-16
   rotate: false
-  xy: 1749, 774
+  xy: 1518, 438
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-17
   rotate: false
-  xy: 1573, 737
+  xy: 1620, 653
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-18
   rotate: false
-  xy: 1573, 700
+  xy: 1722, 653
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-19
   rotate: false
-  xy: 1675, 737
+  xy: 1598, 616
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-2
   rotate: false
-  xy: 896, 287
+  xy: 682, 63
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-20
   rotate: false
-  xy: 1675, 700
+  xy: 1700, 616
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-21
   rotate: false
-  xy: 1579, 663
+  xy: 1616, 579
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-22
   rotate: false
-  xy: 1579, 626
+  xy: 1616, 542
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-23
   rotate: false
-  xy: 1681, 625
+  xy: 1616, 505
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-24
   rotate: false
-  xy: 1579, 589
+  xy: 1718, 527
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-25
   rotate: false
-  xy: 1681, 588
+  xy: 1718, 490
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-26
   rotate: false
-  xy: 1577, 552
+  xy: 1833, 682
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-27
   rotate: false
-  xy: 1679, 551
+  xy: 1824, 645
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-28
   rotate: false
-  xy: 1859, 766
+  xy: 1802, 608
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-29
   rotate: false
-  xy: 1859, 729
+  xy: 1800, 571
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-3
   rotate: false
-  xy: 896, 250
+  xy: 990, 542
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-4
   rotate: false
-  xy: 885, 213
+  xy: 1092, 542
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-5
   rotate: false
-  xy: 998, 238
+  xy: 1094, 505
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-6
   rotate: false
-  xy: 987, 201
+  xy: 682, 26
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-7
   rotate: false
-  xy: 981, 164
+  xy: 1242, 544
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-8
   rotate: false
-  xy: 981, 127
+  xy: 1629, 727
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 safe-song/safe-song-9
   rotate: false
-  xy: 968, 90
+  xy: 1731, 727
   size: 100, 35
   orig: 100, 35
   offset: 0, 0
   index: -1
 space/Untitled
   rotate: false
-  xy: 1367, 740
+  xy: 1825, 848
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
@@ -3658,112 +3637,112 @@ space/bloodclot-explode-21
   index: -1
 space/bloodclot-explode-22
   rotate: false
-  xy: 575, 266
+  xy: 575, 269
   size: 106, 165
   orig: 106, 165
   offset: 0, 0
   index: -1
 space/bloodclot-explode-23
   rotate: false
-  xy: 683, 266
+  xy: 683, 269
   size: 106, 165
   orig: 106, 165
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-1
   rotate: false
-  xy: 801, 200
+  xy: 801, 199
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-10
   rotate: false
-  xy: 1495, 597
+  xy: 1326, 581
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-11
   rotate: false
-  xy: 807, 85
+  xy: 1410, 582
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-12
   rotate: false
-  xy: 914, 412
+  xy: 1344, 504
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-13
   rotate: false
-  xy: 998, 426
+  xy: 1428, 505
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-14
   rotate: false
-  xy: 1082, 427
+  xy: 1468, 695
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-2
   rotate: false
-  xy: 914, 489
+  xy: 906, 538
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-3
   rotate: false
-  xy: 998, 503
+  xy: 326, 64
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-4
   rotate: false
-  xy: 1082, 504
+  xy: 462, 58
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-5
   rotate: false
-  xy: 1321, 663
+  xy: 546, 55
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-6
   rotate: false
-  xy: 1405, 674
+  xy: 990, 579
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-7
   rotate: false
-  xy: 1327, 586
+  xy: 1074, 579
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-8
   rotate: false
-  xy: 1411, 597
+  xy: 1158, 579
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-9
   rotate: false
-  xy: 1489, 674
+  xy: 1242, 581
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
@@ -3777,35 +3756,42 @@ space/bloodclot-stand
   index: -1
 space/susp
   rotate: false
-  xy: 973, 618
+  xy: 1345, 772
   size: 126, 36
   orig: 126, 36
   offset: 0, 0
   index: -1
 talk-bg
   rotate: false
-  xy: 1622, 453
+  xy: 1778, 410
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 title/balloon
   rotate: false
-  xy: 675, 65
+  xy: 1902, 572
   size: 60, 30
   orig: 60, 30
   offset: 0, 0
   index: -1
+white
+  rotate: false
+  xy: 952, 623
+  size: 32, 24
+  orig: 32, 24
+  offset: 0, 0
+  index: -1
 wizard/Untitled
   rotate: false
-  xy: 999, 374
+  xy: 328, 12
   size: 80, 50
   orig: 80, 50
   offset: 0, 0
   index: -1
 wizard/cloud
   rotate: false
-  xy: 1710, 462
+  xy: 956, 44
   size: 40, 30
   orig: 40, 30
   offset: 0, 0
@@ -3819,287 +3805,287 @@ wizard/experiment-1
   index: -1
 wizard/experiment-10
   rotate: false
-  xy: 1481, 445
+  xy: 1446, 400
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-11
   rotate: false
-  xy: 1528, 445
+  xy: 1399, 343
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-12
   rotate: false
-  xy: 1575, 453
+  xy: 1446, 343
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-13
   rotate: false
-  xy: 1486, 388
+  xy: 1493, 381
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-14
   rotate: false
-  xy: 1533, 388
+  xy: 1540, 381
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-15
   rotate: false
-  xy: 1632, 495
+  xy: 1493, 324
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-16
   rotate: false
-  xy: 1679, 494
+  xy: 1540, 324
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-17
   rotate: false
-  xy: 1726, 494
+  xy: 1587, 376
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-18
   rotate: false
-  xy: 1486, 331
+  xy: 1587, 319
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-19
   rotate: false
-  xy: 1533, 331
+  xy: 1634, 364
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-2
   rotate: false
-  xy: 524, 78
+  xy: 725, 716
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-20
   rotate: false
-  xy: 1580, 338
+  xy: 1634, 307
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-21
   rotate: false
-  xy: 1627, 338
+  xy: 1681, 353
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-22
   rotate: false
-  xy: 1756, 437
+  xy: 1728, 353
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-23
   rotate: false
-  xy: 1803, 437
+  xy: 1681, 296
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-24
   rotate: false
-  xy: 1762, 380
+  xy: 1728, 296
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-25
   rotate: false
-  xy: 1809, 380
+  xy: 1214, 329
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-26
   rotate: false
-  xy: 1762, 323
+  xy: 1261, 329
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-27
   rotate: false
-  xy: 1809, 323
+  xy: 1167, 309
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-28
   rotate: false
-  xy: 1762, 266
+  xy: 1308, 325
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-29
   rotate: false
-  xy: 1809, 266
+  xy: 1214, 272
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-3
   rotate: false
-  xy: 1178, 561
+  xy: 410, 14
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-30
   rotate: false
-  xy: 1762, 209
+  xy: 1261, 272
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-31
   rotate: false
-  xy: 1809, 209
+  xy: 1308, 268
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-32
   rotate: false
-  xy: 1083, 144
+  xy: 1355, 267
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-33
   rotate: false
-  xy: 1850, 441
+  xy: 1402, 286
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-34
   rotate: false
-  xy: 1856, 384
+  xy: 1493, 267
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-35
   rotate: false
-  xy: 1856, 327
+  xy: 1540, 267
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-36
   rotate: false
-  xy: 1856, 270
+  xy: 1587, 262
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-37
   rotate: false
-  xy: 1856, 213
+  xy: 1634, 250
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-38
   rotate: false
-  xy: 1130, 144
+  xy: 1681, 239
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-39
   rotate: false
-  xy: 1122, 87
+  xy: 1728, 239
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-4
   rotate: false
-  xy: 1434, 434
+  xy: 909, 44
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-5
   rotate: false
-  xy: 524, 21
+  xy: 2000, 620
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-6
   rotate: false
-  xy: 677, 8
+  xy: 926, 481
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-7
   rotate: false
-  xy: 1985, 558
+  xy: 1167, 366
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-8
   rotate: false
-  xy: 1478, 502
+  xy: 1894, 442
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-9
   rotate: false
-  xy: 1525, 502
+  xy: 1399, 400
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/magic-hands
   rotate: false
-  xy: 1169, 92
+  xy: 943, 166
   size: 40, 50
   orig: 40, 50
   offset: 0, 0
   index: -1
 wizard/talk
   rotate: false
-  xy: 997, 326
+  xy: 1436, 457
   size: 80, 46
   orig: 80, 46
   offset: 0, 0
   index: -1
 wizard/talk-angry
   rotate: false
-  xy: 1777, 722
+  xy: 1718, 564
   size: 80, 50
   orig: 80, 50
   offset: 0, 0
diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png
index 6f9eb06c..0fb88bf6 100644
Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ
diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png
index 84e9246b..a912bbec 100644
Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ
diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png
index db2c5a7a..022b6a5f 100644
Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ
diff --git a/desktop/src-common/advent/screens/safe.clj b/desktop/src-common/advent/screens/safe.clj
index b653275f..2245921a 100644
--- a/desktop/src-common/advent/screens/safe.clj
+++ b/desktop/src-common/advent/screens/safe.clj
@@ -15,7 +15,7 @@
             InputMultiplexer InputProcessor Net Preferences Screen]))
 
 
-(def start-x 60)
+(def start-x 35)
 (def start-y 83)
 
 (defn close [entities]
@@ -27,17 +27,17 @@
       (assoc :start-showing? false)))
 
 (defn button-box [x y]
-  (zone/box (+ start-x x) (+ start-y y) (+ start-x x 16) (+ start-y y 20)))
+  (zone/box (+ start-x x) (+ start-y y) (+ start-x x 30) (+ start-y y 36)))
 
 (defn get-button [[x y]]
   (first (filter (fn [{:keys [in?] :as button}] 
                    (when (in? x y)
                      button))
-                 [{:in? (button-box 9 13) :sound (utils/load-sound "inside-house/safe-1.ogg") :id 1 }
-                  {:in? (button-box 29 13) :sound (utils/load-sound "inside-house/safe-2.ogg") :id 2}
-                  {:in? (button-box 49 13) :sound (utils/load-sound "inside-house/safe-3.ogg") :id 3}
-                  {:in? (button-box 70 13) :sound (utils/load-sound "inside-house/safe-4.ogg") :id 4}
-                  {:in? (button-box 91 13) :sound (utils/load-sound "inside-house/safe-5.ogg") :id 5}])))
+                 [{:in? (button-box 6 16) :sound (utils/load-sound "inside-house/safe-1.ogg") :id 1 }
+                  {:in? (button-box 43 16) :sound (utils/load-sound "inside-house/safe-2.ogg") :id 2}
+                  {:in? (button-box 76 16) :sound (utils/load-sound "inside-house/safe-3.ogg") :id 3}
+                  {:in? (button-box 118 16) :sound (utils/load-sound "inside-house/safe-4.ogg") :id 4}
+                  {:in? (button-box 155 16) :sound (utils/load-sound "inside-house/safe-5.ogg") :id 5}])))
 
 (defscreen safe-screen
   :on-show
@@ -54,8 +54,8 @@
        :safe (assoc (utils/get-texture "inside-house/safe-screen.png") :x start-x :y start-y)
        :entered-keys (doall (for [i (range 5)]
                               (assoc inputed-key
-                                    :x (+ start-x 10 (* i 12))
-                                    :y (+ start-y 56))))
+                                    :x (+ start-x 12 (* i 12))
+                                    :y (+ start-y 68))))
        :shown? false}))
 
   
@@ -98,9 +98,9 @@
                                      :else
                                      new-state)))
                          (if (or (< x start-x)
-                                 (> x (+ start-x 200))
+                                 (> x (+ start-x 250))
                                  (< y start-y)
-                                 (> y (+ start-y 75)))
+                                 (> y (+ start-y 100)))
                            (do
                              (sound! (utils/load-sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume 0.3))
                              (close entities)))))))