diff --git a/scorn/shops/light_shop b/scorn/shops/light_shop
index b9cfdcbb6..db918436e 100644
--- a/scorn/shops/light_shop
+++ b/scorn/shops/light_shop
@@ -4,226 +4,248 @@ difficulty 3
 region scorn
 shopitems lamp:95;*:-40
 shopmax 2000
-width 20
-height 15
+width 22
+height 22
 enter_x 16
 enter_y 11
 msg
 Created:  2002-12-28
-Modified: 2010-11-05 Andreas Kirschbaum
+Modified: 2011-09-14 Rick Tanner
 endmsg
+outdoor 1
 end
-arch shop_empty
+arch cobblestones2
 end
-arch dwall_2_2_2
-end
-arch shop_empty
+arch grass_only
 y 1
 end
-arch dwall_2_1_1
-y 1
-end
-arch shop_empty
+arch grass_only
 y 2
 end
-arch dwall_2_1_1
-y 2
-end
-arch shop_empty
+arch grass_only
 y 3
 end
-arch dwall_2_1_1
-y 3
-end
-arch shop_empty
+arch grass_only
 y 4
 end
-arch dwall_2_1_1
-y 4
-end
-arch shop_empty
+arch grass_only
 y 5
 end
-arch dwall_2_1_1
-y 5
-end
-arch shop_empty
+arch grass_only
 y 6
 end
-arch dwall_2_1_1
-y 6
-end
-arch shop_empty
+arch grass_only
 y 7
 end
-arch dwall_2_1_1
-y 7
-end
-arch shop_empty
+arch grass_only
 y 8
 end
-arch dwall_2_1_1
-y 8
-end
-arch shop_empty
+arch grass_only
 y 9
 end
-arch dwall_2_1_1
-y 9
-end
-arch shop_empty
+arch grass_only
 y 10
 end
-arch swall_1_4_half
-y 10
-end
-arch dwall_2_1_1
-y 10
-end
-arch flagstone
+arch grass_only
 y 11
 end
-arch dwall_1_2
-y 11
-end
-arch flagstone
+arch grass_only
 y 12
 end
-arch oakdoor_1
-slaying /world/world_105_115
-hp 17
-sp 39
-y 12
-end
-arch flagstone
+arch grass_only
 y 13
 end
-arch dwall_1_1
-y 13
-end
-arch flagstone
+arch grass_only
 y 14
 end
-arch dwall_2_2_1
-y 14
+arch grass_only
+y 15
 end
-arch shop_empty
+arch grass_only
+y 16
+end
+arch grass_only
+y 17
+end
+arch grass_only
+y 18
+end
+arch grass_only
+y 19
+end
+arch grass_only
+y 20
+end
+arch grass_only
+y 21
+end
+arch cobblestones2
 x 1
 end
-arch dwall_2_1_2
-x 1
-end
-arch shop_light
+arch grass_only
 x 1
 y 1
 end
-arch shop_light
+arch grass_only
 x 1
 y 2
 end
-arch shop_light
+arch grass_only
 x 1
 y 3
 end
-arch shop_light
+arch grass_only
 x 1
 y 4
 end
-arch shop_light
+arch grass_only
 x 1
 y 5
 end
-arch shop_light
+arch grass_only
 x 1
 y 6
 end
-arch shop_light
+arch grass_only
 x 1
 y 7
 end
-arch shop_light
+arch grass_only
 x 1
 y 8
 end
-arch shop_empty
+arch grass_only
 x 1
 y 9
 end
-arch shop_empty
+arch grass_only
 x 1
 y 10
 end
-arch swall_2_1_2
-x 1
-y 10
-end
-arch flagstone
+arch grass_only
 x 1
 y 11
 end
-arch flagstone
+arch grass_only
 x 1
 y 12
 end
-arch flagstone
+arch grass_only
 x 1
 y 13
 end
-arch flagstone
+arch grass_only
 x 1
 y 14
 end
-arch dwall_2_1_2
+arch grass_only
 x 1
-y 14
+y 15
 end
-arch shop_empty
+arch grass_only
+x 1
+y 16
+end
+arch grass_only
+x 1
+y 17
+end
+arch grass_only
+x 1
+y 18
+end
+arch grass_only
+x 1
+y 19
+end
+arch grass_only
+x 1
+y 20
+end
+arch grass_only
+x 1
+y 21
+end
+arch cobblestones2
 x 2
 end
-arch dwall_2_1_2
-x 2
-end
-arch shop_empty
+arch grass_only
 x 2
 y 1
 end
-arch shop_empty
+arch flagstone
 x 2
 y 2
 end
-arch shop_empty
+arch wwall_2_2_2
+x 2
+y 2
+end
+arch wwall_0
+x 2
+y 2
+end
+arch flagstone
 x 2
 y 3
 end
-arch shop_empty
+arch wwall_2_1_1
+x 2
+y 3
+end
+arch flagstone
 x 2
 y 4
 end
-arch shop_empty
+arch wwall_2_1_1
+x 2
+y 4
+end
+arch flagstone
 x 2
 y 5
 end
-arch shop_empty
+arch wwall_2_1_1
+x 2
+y 5
+end
+arch flagstone
 x 2
 y 6
 end
-arch shop_empty
+arch wwall_2_1_1
+x 2
+y 6
+end
+arch flagstone
 x 2
 y 7
 end
-arch shop_empty
+arch wwall_win1
+x 2
+y 7
+end
+arch flagstone
 x 2
 y 8
 end
-arch shop_empty
+arch wwall_2_1_1
+x 2
+y 8
+end
+arch flagstone
 x 2
 y 9
 end
-arch shop_empty
+arch wwall_2_1_1
+x 2
+y 9
+end
+arch flagstone
 x 2
 y 10
 end
-arch swall_2_1_2
+arch wwall_2_1_1
 x 2
 y 10
 end
@@ -231,7 +253,7 @@ arch flagstone
 x 2
 y 11
 end
-arch shop_mat
+arch wwall_2_1_1
 x 2
 y 11
 end
@@ -239,33 +261,94 @@ arch flagstone
 x 2
 y 12
 end
+arch wwall_2_1_1
+x 2
+y 12
+end
 arch flagstone
 x 2
 y 13
 end
-arch menu
+arch wwall_2_1_1
 x 2
 y 13
 end
+arch light2
+x 2
+y 14
+end
 arch flagstone
 x 2
 y 14
 end
-arch dwall_2_1_2
+arch wwall_win1
 x 2
 y 14
 end
-arch shop_empty
+arch flagstone
+x 2
+y 15
+end
+arch wwall_2_1_1
+x 2
+y 15
+end
+arch flagstone
+x 2
+y 16
+end
+arch wwall_2_1_1
+x 2
+y 16
+end
+arch flagstone
+x 2
+y 17
+end
+arch wwall_2_1_1
+x 2
+y 17
+end
+arch flagstone
+x 2
+y 18
+end
+arch wwall_2_1_1
+x 2
+y 18
+end
+arch flagstone
+x 2
+y 19
+end
+arch wwall_2_2_1
+x 2
+y 19
+end
+arch wwall_0
+x 2
+y 19
+end
+arch grass_only
+x 2
+y 20
+end
+arch grass_only
+x 2
+y 21
+end
+arch cobblestones2
 x 3
 end
-arch dwall_2_1_2
-x 3
-end
-arch shop_light
+arch grass_only
 x 3
 y 1
 end
-arch shop_light
+arch flagstone
+x 3
+y 2
+end
+arch wwall_2_1_2
 x 3
 y 2
 end
@@ -293,31 +376,19 @@ arch shop_light
 x 3
 y 8
 end
-arch shop_empty
+arch shop_light
 x 3
 y 9
 end
-arch shop_empty
+arch shop_light
 x 3
 y 10
 end
-arch swall_2_2_3
-x 3
-y 10
-end
-arch shop_empty
+arch shop_light
 x 3
 y 11
 end
-arch swall_2_1_1
-x 3
-y 11
-end
-arch shop_empty
-x 3
-y 12
-end
-arch swall_2_1_1
+arch shop_light
 x 3
 y 12
 end
@@ -325,33 +396,61 @@ arch shop_empty
 x 3
 y 13
 end
-arch swall_2_1_1
-x 3
-y 13
-end
 arch shop_empty
 x 3
 y 14
 end
-arch swall_1_2_half
-x 3
-y 14
-end
-arch dwall_2_1_2
-x 3
-y 14
-end
 arch shop_empty
+x 3
+y 15
+end
+arch shop_books
+exp 10
+x 3
+y 16
+end
+arch shop_books
+exp 10
+x 3
+y 17
+end
+arch shop_books
+exp 10
+x 3
+y 18
+end
+arch flagstone
+x 3
+y 19
+end
+arch wwall_2_1_2
+x 3
+y 19
+end
+arch grass_only
+x 3
+y 20
+end
+arch grass_only
+x 3
+y 21
+end
+arch cobblestones2
 x 4
 end
-arch dwall_2_1_2
-x 4
-end
-arch shop_empty
+arch grass_only
 x 4
 y 1
 end
-arch shop_empty
+arch light2
+x 4
+y 2
+end
+arch flagstone
+x 4
+y 2
+end
+arch wwall_win2
 x 4
 y 2
 end
@@ -359,6 +458,10 @@ arch shop_empty
 x 4
 y 3
 end
+arch light4
+x 4
+y 4
+end
 arch shop_empty
 x 4
 y 4
@@ -375,6 +478,10 @@ arch shop_empty
 x 4
 y 7
 end
+arch light4
+x 4
+y 8
+end
 arch shop_empty
 x 4
 y 8
@@ -391,640 +498,1152 @@ arch shop_empty
 x 4
 y 11
 end
+arch light4
+x 4
+y 12
+end
 arch shop_empty
 x 4
 y 12
 end
+arch shop_empty
+x 4
+y 13
+end
+arch shop_empty
+x 4
+y 14
+end
+arch shop_empty
+x 4
+y 15
+end
+arch light4
+x 4
+y 16
+end
+arch shop_empty
+x 4
+y 16
+end
+arch shop_empty
+x 4
+y 17
+end
+arch shop_scrolls
+exp 10
+x 4
+y 18
+end
+arch flagstone
+x 4
+y 19
+end
+arch wwall_2_1_2
+x 4
+y 19
+end
+arch grass_only
+x 4
+y 20
+end
+arch grass_only
+x 4
+y 21
+end
+arch cobblestones2
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch flagstone
+x 5
+y 2
+end
+arch wwall_2_1_2
+x 5
+y 2
+end
+arch shop_light
+x 5
+y 3
+end
+arch shop_light
+x 5
+y 4
+end
+arch shop_light
+x 5
+y 5
+end
+arch shop_light
+x 5
+y 6
+end
+arch shop_light
+x 5
+y 7
+end
+arch shop_light
+x 5
+y 8
+end
+arch shop_light
+x 5
+y 9
+end
+arch shop_light
+x 5
+y 10
+end
+arch shop_light
+x 5
+y 11
+end
+arch shop_light
+x 5
+y 12
+end
+arch shop_empty
+x 5
+y 13
+end
+arch shop_empty
+x 5
+y 14
+end
+arch shop_empty
+x 5
+y 15
+end
+arch shop_empty
+x 5
+y 16
+end
+arch shop_empty
+x 5
+y 17
+end
+arch shop_scrolls
+exp 10
+x 5
+y 18
+end
+arch flagstone
+x 5
+y 19
+end
+arch wwall_2_1_2
+x 5
+y 19
+end
+arch grass_only
+x 5
+y 20
+end
+arch grass_only
+x 5
+y 21
+end
+arch cobblestones2
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch flagstone
+x 6
+y 2
+end
+arch wwall_2_1_2
+x 6
+y 2
+end
+arch shop_empty
+x 6
+y 3
+end
+arch shop_empty
+x 6
+y 4
+end
+arch shop_empty
+x 6
+y 5
+end
+arch shop_empty
+x 6
+y 6
+end
+arch shop_empty
+x 6
+y 7
+end
+arch shop_empty
+x 6
+y 8
+end
+arch shop_empty
+x 6
+y 9
+end
+arch shop_empty
+x 6
+y 10
+end
+arch shop_empty
+x 6
+y 11
+end
+arch shop_empty
+x 6
+y 12
+end
+arch shop_empty
+x 6
+y 13
+end
+arch light4
+x 6
+y 14
+end
+arch shop_empty
+x 6
+y 14
+end
+arch shop_empty
+x 6
+y 15
+end
+arch shop_empty
+x 6
+y 15
+end
+arch shop_empty
+x 6
+y 16
+end
+arch shop_empty
+x 6
+y 17
+end
+arch shop_scrolls
+exp 10
+x 6
+y 18
+end
+arch flagstone
+x 6
+y 19
+end
+arch wwall_2_1_2
+x 6
+y 19
+end
+arch grass_only
+x 6
+y 20
+end
+arch grass_only
+x 6
+y 21
+end
+arch cobblestones2
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch flagstone
+x 7
+y 2
+end
+arch wwall_2_1_2
+x 7
+y 2
+end
+arch shop_light
+x 7
+y 3
+end
+arch shop_light
+x 7
+y 4
+end
+arch shop_light
+x 7
+y 5
+end
+arch shop_light
+x 7
+y 6
+end
+arch shop_light
+x 7
+y 7
+end
+arch shop_light
+x 7
+y 8
+end
+arch shop_light
+x 7
+y 9
+end
+arch shop_light
+x 7
+y 10
+end
+arch shop_light
+x 7
+y 11
+end
+arch shop_light
+x 7
+y 12
+end
+arch shop_empty
+x 7
+y 13
+end
+arch shop_empty
+x 7
+y 14
+end
+arch shop_empty
+x 7
+y 15
+end
+arch light4
+x 7
+y 16
+end
+arch shop_empty
+x 7
+y 16
+end
+arch shop_empty
+x 7
+y 17
+end
 arch sign_e
 msg
 Keep the shop tidy...
 Sell your items in Jacob's Pawn!
 endmsg
-x 4
-y 12
+x 7
+y 17
 end
 arch shop_empty
-x 4
-y 13
+x 7
+y 18
 end
-arch shop_mat
-x 4
-y 13
+arch sign_e
+msg
+Keep the shop tidy...
+Sell your items in Jacob's Pawn!
+endmsg
+x 7
+y 18
 end
-arch shop_empty
-x 4
-y 14
+arch flagstone
+x 7
+y 19
 end
-arch dwall_2_1_2
-x 4
-y 14
+arch wwall_2_1_2
+x 7
+y 19
 end
-arch shop_empty
-x 5
+arch grass_only
+x 7
+y 20
 end
-arch dwall_2_1_2
-x 5
+arch grass_only
+x 7
+y 21
 end
-arch shop_light
-x 5
+arch cobblestones2
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
-arch shop_light
-x 5
+arch light2
+x 8
 y 2
 end
-arch shop_light
-x 5
+arch flagstone
+x 8
+y 2
+end
+arch wwall_win2
+x 8
+y 2
+end
+arch shop_empty
+x 8
 y 3
 end
-arch shop_light
-x 5
+arch light4
+x 8
 y 4
 end
-arch shop_light
-x 5
+arch shop_empty
+x 8
+y 4
+end
+arch shop_empty
+x 8
 y 5
 end
-arch shop_light
-x 5
+arch shop_empty
+x 8
 y 6
 end
-arch shop_light
-x 5
+arch shop_empty
+x 8
 y 7
 end
-arch shop_light
-x 5
+arch light4
+x 8
 y 8
 end
 arch shop_empty
-x 5
+x 8
+y 8
+end
+arch shop_empty
+x 8
 y 9
 end
 arch shop_empty
-x 5
+x 8
 y 10
 end
 arch shop_empty
-x 5
+x 8
 y 11
 end
-arch shop_empty
-x 5
-y 12
-end
-arch sign_e
-msg
-Keep the shop tidy...
-Sell your items in Jacob's Pawn!
-endmsg
-x 5
+arch light4
+x 8
 y 12
 end
 arch shop_empty
-x 5
-y 13
+x 8
+y 12
 end
-arch sign_e
-msg
-Keep the shop tidy...
-Sell your items in Jacob's Pawn!
-endmsg
-x 5
+arch shop_empty
+x 8
 y 13
 end
 arch shop_empty
-x 5
-y 14
-end
-arch dwall_2_1_2
-x 5
+x 8
 y 14
 end
 arch shop_empty
-x 6
-end
-arch dwall_2_1_2
-x 6
-end
-arch shop_empty
-x 6
-y 1
-end
-arch shop_empty
-x 6
-y 2
-end
-arch shop_empty
-x 6
-y 3
-end
-arch shop_empty
-x 6
-y 4
-end
-arch shop_empty
-x 6
-y 5
-end
-arch shop_empty
-x 6
-y 6
-end
-arch shop_empty
-x 6
-y 7
-end
-arch shop_empty
-x 6
-y 8
-end
-arch shop_empty
-x 6
-y 9
-end
-arch shop_empty
-x 6
-y 10
+x 8
+y 15
 end
 arch swall_2_2_2
-x 6
-y 10
+x 8
+y 15
+end
+arch wwall_0
+x 8
+y 15
+blocksview 0
 end
 arch shop_empty
-x 6
-y 11
+x 8
+y 16
 end
 arch swall_2_1_1
-x 6
-y 11
+x 8
+y 16
 end
 arch shop_empty
-x 6
-y 12
+x 8
+y 17
 end
 arch swall_1_2_half
-x 6
-y 12
+x 8
+y 17
+end
+arch wwall_0
+x 8
+y 17
+blocksview 0
 end
 arch shop_empty
-x 6
-y 13
+x 8
+y 18
 end
-arch shop_empty
-x 6
-y 14
+arch flagstone
+x 8
+y 19
 end
-arch dwall_2_1_2
-x 6
-y 14
+arch wwall_2_1_2
+x 8
+y 19
 end
-arch shop_empty
-x 7
+arch grass_only
+x 8
+y 20
 end
-arch dwall_2_1_2
-x 7
+arch grass_only
+x 8
+y 21
 end
-arch shop_light
-x 7
+arch cobblestones2
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
-arch shop_light
-x 7
+arch flagstone
+x 9
+y 2
+end
+arch wwall_2_1_2
+x 9
 y 2
 end
 arch shop_light
-x 7
+x 9
 y 3
 end
 arch shop_light
-x 7
+x 9
 y 4
 end
 arch shop_light
-x 7
+x 9
 y 5
 end
 arch shop_light
-x 7
+x 9
 y 6
 end
 arch shop_light
-x 7
+x 9
 y 7
 end
 arch shop_light
-x 7
+x 9
 y 8
 end
-arch shop_empty
-x 7
+arch shop_light
+x 9
 y 9
 end
-arch shop_empty
-x 7
+arch shop_light
+x 9
 y 10
 end
+arch shop_light
+x 9
+y 11
+end
+arch shop_light
+x 9
+y 12
+end
+arch shop_empty
+x 9
+y 13
+end
+arch shop_empty
+x 9
+y 14
+end
+arch shop_empty
+x 9
+y 15
+end
 arch swall_2_1_2
-x 7
-y 10
+x 9
+y 15
 end
 arch cobblestones
-x 7
-y 11
+x 9
+y 16
 type 68
 no_magic 1
 damned 1
 end
 arch silver_converter
 food 11
-x 7
-y 11
+x 9
+y 16
 end
 arch shop_empty
-x 7
+x 9
+y 17
+end
+arch shop_empty
+x 9
+y 18
+end
+arch light2
+x 9
+y 19
+end
+arch flagstone
+x 9
+y 19
+end
+arch wwall_win2
+x 9
+y 19
+end
+arch grass_only
+x 9
+y 20
+end
+arch grass_only
+x 9
+y 21
+end
+arch cobblestones2
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch flagstone
+x 10
+y 2
+end
+arch wwall_2_1_2
+x 10
+y 2
+end
+arch shop_light
+x 10
+y 3
+end
+arch shop_light
+x 10
+y 4
+end
+arch shop_light
+x 10
+y 5
+end
+arch shop_light
+x 10
+y 6
+end
+arch shop_light
+x 10
+y 7
+end
+arch shop_light
+x 10
+y 8
+end
+arch shop_light
+x 10
+y 9
+end
+arch shop_light
+x 10
+y 10
+end
+arch shop_light
+x 10
+y 11
+end
+arch shop_light
+x 10
 y 12
 end
 arch shop_empty
-x 7
+x 10
 y 13
 end
 arch shop_empty
-x 7
-y 14
-end
-arch dwall_2_1_2
-x 7
+x 10
 y 14
 end
 arch shop_empty
-x 8
-end
-arch dwall_2_1_2
-x 8
-end
-arch shop_empty
-x 8
-y 1
-end
-arch shop_empty
-x 8
-y 2
-end
-arch shop_empty
-x 8
-y 3
-end
-arch shop_empty
-x 8
-y 4
-end
-arch shop_empty
-x 8
-y 5
-end
-arch shop_empty
-x 8
-y 6
-end
-arch shop_empty
-x 8
-y 7
-end
-arch shop_empty
-x 8
-y 8
-end
-arch shop_empty
-x 8
-y 9
-end
-arch shop_empty
-x 8
-y 10
+x 10
+y 15
 end
 arch swall_2_1_2
-x 8
-y 10
+x 10
+y 15
 end
 arch cobblestones
-x 8
-y 11
+x 10
+y 16
 type 68
 no_magic 1
 damned 1
 end
 arch gold_converter
 food 6
-x 8
-y 11
+x 10
+y 16
 end
 arch shop_empty
-x 8
-y 12
+x 10
+y 17
 end
 arch shop_empty
-x 8
-y 13
+x 10
+y 18
 end
-arch shop_empty
-x 8
-y 14
+arch flagstone
+x 10
+y 19
 end
-arch dwall_2_1_2
-x 8
-y 14
+arch wwall_2_1_2
+x 10
+y 19
 end
-arch shop_empty
-x 9
+arch grass_only
+x 10
+y 20
 end
-arch dwall_2_1_2
-x 9
+arch grass_only
+x 10
+y 21
 end
-arch shop_light
-x 9
+arch cobblestones2
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
-arch shop_light
-x 9
+arch flagstone
+x 11
 y 2
 end
-arch shop_light
-x 9
+arch wwall_2_1_2
+x 11
+y 2
+end
+arch shop_empty
+x 11
 y 3
 end
-arch shop_light
-x 9
+arch shop_empty
+x 11
 y 4
 end
-arch shop_light
-x 9
+arch shop_empty
+x 11
 y 5
 end
-arch shop_light
-x 9
+arch shop_empty
+x 11
 y 6
 end
-arch shop_light
-x 9
+arch shop_empty
+x 11
 y 7
 end
-arch shop_light
-x 9
+arch shop_empty
+x 11
 y 8
 end
 arch shop_empty
-x 9
+x 11
 y 9
 end
 arch shop_empty
-x 9
+x 11
 y 10
 end
+arch shop_empty
+x 11
+y 11
+end
+arch shop_empty
+x 11
+y 12
+end
+arch shop_empty
+x 11
+y 13
+end
+arch light4
+x 11
+y 14
+end
+arch shop_empty
+x 11
+y 14
+end
+arch shop_empty
+x 11
+y 15
+end
 arch swall_2_1_2
-x 9
-y 10
+x 11
+y 15
 end
 arch shop_empty
-x 9
-y 11
+x 11
+y 16
 end
 arch shop_empty
-x 9
-y 12
+x 11
+y 17
 end
 arch shop_empty
-x 9
-y 13
+x 11
+y 18
 end
-arch shop_empty
-x 9
-y 14
+arch flagstone
+x 11
+y 19
 end
-arch dwall_2_1_2
-x 9
-y 14
+arch wwall_2_1_2
+x 11
+y 19
 end
-arch shop_empty
-x 10
+arch grass_only
+x 11
+y 20
 end
-arch dwall_2_1_2
-x 10
+arch grass_only
+x 11
+y 21
 end
-arch shop_light
-x 10
+arch cobblestones2
+x 12
+end
+arch grass_only
+x 12
 y 1
 end
-arch shop_light
-x 10
+arch flagstone
+x 12
+y 2
+end
+arch wwall_2_1_2
+x 12
 y 2
 end
 arch shop_light
-x 10
+x 12
 y 3
 end
 arch shop_light
-x 10
+x 12
 y 4
 end
 arch shop_light
-x 10
+x 12
 y 5
 end
 arch shop_light
-x 10
+x 12
 y 6
 end
 arch shop_light
-x 10
+x 12
 y 7
 end
 arch shop_light
-x 10
+x 12
 y 8
 end
-arch shop_empty
-x 10
+arch shop_light
+x 12
 y 9
 end
-arch shop_empty
-x 10
+arch shop_light
+x 12
 y 10
 end
+arch shop_light
+x 12
+y 11
+end
+arch shop_light
+x 12
+y 12
+end
+arch shop_empty
+x 12
+y 13
+end
+arch shop_empty
+x 12
+y 14
+end
+arch shop_empty
+x 12
+y 15
+end
 arch swall_2_1_2
-x 10
-y 10
+x 12
+y 15
+end
+arch light4
+x 12
+y 16
 end
 arch shop_empty
-x 10
-y 11
+x 12
+y 16
 end
 arch shop_empty
-x 10
-y 12
+x 12
+y 17
 end
 arch shop_empty
-x 10
-y 13
+x 12
+y 18
 end
-arch shop_empty
-x 10
-y 14
+arch flagstone
+x 12
+y 19
 end
-arch dwall_2_1_2
-x 10
-y 14
+arch wwall_2_1_2
+x 12
+y 19
 end
-arch shop_empty
-x 11
+arch grass_only
+x 12
+y 20
 end
-arch dwall_2_1_2
-x 11
+arch grass_only
+x 12
+y 21
 end
-arch shop_empty
-x 11
+arch cobblestones2
+x 13
+end
+arch grass_only
+x 13
 y 1
 end
-arch shop_empty
-x 11
+arch light2
+x 13
+y 2
+end
+arch flagstone
+x 13
+y 2
+end
+arch wwall_win2
+x 13
 y 2
 end
 arch shop_empty
-x 11
+x 13
 y 3
 end
-arch shop_empty
-x 11
+arch light4
+x 13
 y 4
 end
 arch shop_empty
-x 11
+x 13
+y 4
+end
+arch shop_empty
+x 13
 y 5
 end
 arch shop_empty
-x 11
+x 13
 y 6
 end
 arch shop_empty
-x 11
+x 13
 y 7
 end
-arch shop_empty
-x 11
+arch light4
+x 13
 y 8
 end
 arch shop_empty
-x 11
+x 13
+y 8
+end
+arch shop_empty
+x 13
 y 9
 end
 arch shop_empty
-x 11
+x 13
 y 10
 end
+arch shop_empty
+x 13
+y 11
+end
+arch light4
+x 13
+y 12
+end
+arch shop_empty
+x 13
+y 12
+end
+arch shop_empty
+x 13
+y 13
+end
+arch shop_empty
+x 13
+y 14
+end
+arch shop_empty
+x 13
+y 15
+end
 arch swall_3_3
-x 11
-y 10
+x 13
+y 15
+end
+arch wwall_0
+x 13
+y 15
+blocksview 0
 end
 arch shop_empty
-x 11
-y 11
+x 13
+y 16
 end
 arch swall_2_1_1
-x 11
-y 11
+x 13
+y 16
 end
 arch shop_empty
-x 11
-y 12
+x 13
+y 17
 end
 arch swall_2_1_1
-x 11
-y 12
+x 13
+y 17
 end
 arch shop_empty
-x 11
-y 13
+x 13
+y 18
 end
 arch swall_2_1_1
-x 11
-y 13
+x 13
+y 18
 end
-arch shop_empty
-x 11
-y 14
+arch flagstone
+x 13
+y 19
 end
 arch swall_1_2_half
-x 11
-y 14
+x 13
+y 19
 end
-arch dwall_2_1_2
-x 11
-y 14
+arch wwall_2_1_2
+x 13
+y 19
 end
-arch shop_empty
-x 12
+arch grass_only
+x 13
+y 20
 end
-arch dwall_2_1_2
-x 12
+arch grass_only
+x 13
+y 21
 end
-arch shop_light
-x 12
+arch cobblestones2
+x 14
+end
+arch grass_only
+x 14
 y 1
 end
-arch shop_light
-x 12
+arch flagstone
+x 14
+y 2
+end
+arch wwall_2_1_2
+x 14
 y 2
 end
 arch shop_light
-x 12
+x 14
 y 3
 end
 arch shop_light
-x 12
+x 14
 y 4
 end
 arch shop_light
-x 12
+x 14
 y 5
 end
 arch shop_light
-x 12
+x 14
 y 6
 end
 arch shop_light
-x 12
+x 14
 y 7
 end
 arch shop_light
-x 12
+x 14
 y 8
 end
-arch shop_empty
-x 12
+arch shop_light
+x 14
 y 9
 end
-arch shop_empty
-x 12
+arch shop_light
+x 14
 y 10
 end
+arch shop_light
+x 14
+y 11
+end
+arch shop_light
+x 14
+y 12
+end
+arch shop_empty
+x 14
+y 13
+end
+arch shop_empty
+x 14
+y 14
+end
+arch shop_empty
+x 14
+y 15
+end
 arch swall_2_1_2
-x 12
-y 10
+x 14
+y 15
 end
 arch shop_empty
-x 12
-y 11
+x 14
+y 16
 end
 arch serp_skin
 title Jacob
-x 12
-y 11
+x 14
+y 16
 value 1
 unpaid 1
 end
 arch shop_empty
-x 12
-y 12
+x 14
+y 17
 end
 arch fatman
 name Jacob
@@ -1034,8 +1653,8 @@ Feel free to look around my small shop...
 All goods are little used.  Need cash?
 I buy almost anything.
 endmsg
-x 12
-y 12
+x 14
+y 17
 randomitems snake
 arch bonecrusher
 end
@@ -1043,256 +1662,161 @@ arch pipe
 end
 end
 arch shop_empty
-x 12
-y 13
+x 14
+y 18
 end
-arch shop_general
-exp 25
-x 12
-y 13
+arch flagstone
+x 14
+y 19
 end
-arch shop_empty
-x 12
-y 14
+arch wwall_2_1_2
+x 14
+y 19
 end
-arch dwall_2_1_2
-x 12
-y 14
+arch grass_only
+x 14
+y 20
 end
-arch shop_empty
-x 13
+arch grass_only
+x 14
+y 21
 end
-arch dwall_2_1_2
-x 13
+arch cobblestones2
+x 15
 end
-arch shop_empty
-x 13
+arch grass_only
+x 15
 y 1
 end
-arch shop_empty
-x 13
+arch flagstone
+x 15
+y 2
+end
+arch wwall_2_1_2
+x 15
 y 2
 end
 arch shop_empty
-x 13
+x 15
 y 3
 end
 arch shop_empty
-x 13
+x 15
 y 4
 end
 arch shop_empty
-x 13
+x 15
 y 5
 end
 arch shop_empty
-x 13
+x 15
 y 6
 end
 arch shop_empty
-x 13
+x 15
 y 7
 end
 arch shop_empty
-x 13
+x 15
 y 8
 end
 arch shop_empty
-x 13
+x 15
 y 9
 end
 arch shop_empty
-x 13
-y 10
-end
-arch swall_2_2_3
-x 13
+x 15
 y 10
 end
 arch shop_empty
-x 13
-y 11
-end
-arch swall_2_1_1
-x 13
+x 15
 y 11
 end
 arch shop_empty
-x 13
-y 12
-end
-arch swall_2_1_1
-x 13
+x 15
 y 12
 end
 arch shop_empty
-x 13
+x 15
 y 13
 end
-arch swall_2_1_1
-x 13
-y 13
-end
-arch shop_empty
-x 13
+arch light4
+x 15
 y 14
 end
+arch shop_empty
+x 15
+y 14
+end
+arch shop_empty
+x 15
+y 15
+end
+arch swall_3_3
+x 15
+y 15
+end
+arch wwall_0
+x 15
+y 15
+blocksview 0
+end
+arch shop_empty
+x 15
+y 16
+end
+arch swall_2_1_1
+x 15
+y 16
+end
+arch shop_empty
+x 15
+y 17
+end
+arch swall_2_1_1
+x 15
+y 17
+end
+arch shop_empty
+x 15
+y 18
+end
+arch swall_2_1_1
+x 15
+y 18
+end
+arch flagstone
+x 15
+y 19
+end
 arch swall_1_2_half
-x 13
-y 14
+x 15
+y 19
 end
-arch dwall_2_1_2
-x 13
-y 14
+arch wwall_2_1_2
+x 15
+y 19
 end
-arch shop_empty
-x 14
+arch grass_only
+x 15
+y 20
 end
-arch dwall_2_1_2
-x 14
+arch grass_only
+x 15
+y 21
 end
-arch shop_light
-x 14
+arch cobblestones2
+x 16
+end
+arch grass_only
+x 16
 y 1
 end
-arch shop_light
-x 14
+arch flagstone
+x 16
 y 2
 end
-arch shop_light
-x 14
-y 3
-end
-arch shop_light
-x 14
-y 4
-end
-arch shop_light
-x 14
-y 5
-end
-arch shop_light
-x 14
-y 6
-end
-arch shop_light
-x 14
-y 7
-end
-arch shop_light
-x 14
-y 8
-end
-arch shop_empty
-x 14
-y 9
-end
-arch shop_books
-exp 10
-x 14
-y 10
-end
-arch shop_books
-exp 10
-x 14
-y 11
-end
-arch shop_books
-exp 10
-x 14
-y 12
-end
-arch shop_general
-exp 10
-x 14
-y 13
-end
-arch shop_empty
-x 14
-y 14
-end
-arch dwall_2_1_2
-x 14
-y 14
-end
-arch shop_empty
-x 15
-end
-arch dwall_2_1_2
-x 15
-end
-arch shop_empty
-x 15
-y 1
-end
-arch shop_empty
-x 15
-y 2
-end
-arch shop_empty
-x 15
-y 3
-end
-arch shop_empty
-x 15
-y 4
-end
-arch shop_empty
-x 15
-y 5
-end
-arch shop_empty
-x 15
-y 6
-end
-arch shop_empty
-x 15
-y 7
-end
-arch shop_empty
-x 15
-y 8
-end
-arch shop_empty
-x 15
-y 9
-end
-arch shop_empty
-x 15
-y 10
-end
-arch shop_empty
-x 15
-y 11
-end
-arch shop_empty
-x 15
-y 12
-end
-arch shop_general
-exp 10
-x 15
-y 13
-end
-arch shop_empty
-x 15
-y 14
-end
-arch dwall_2_1_2
-x 15
-y 14
-end
-arch shop_empty
-x 16
-end
-arch dwall_2_1_2
-x 16
-end
-arch shop_light
-x 16
-y 1
-end
-arch shop_light
+arch wwall_2_1_2
 x 16
 y 2
 end
@@ -1320,27 +1844,23 @@ arch shop_light
 x 16
 y 8
 end
-arch shop_empty
+arch shop_light
 x 16
 y 9
 end
-arch shop_scrolls
-exp 10
+arch shop_light
 x 16
 y 10
 end
-arch shop_scrolls
-exp 10
+arch shop_light
 x 16
 y 11
 end
-arch shop_scrolls
-exp 10
+arch shop_light
 x 16
 y 12
 end
-arch shop_general
-exp 10
+arch shop_empty
 x 16
 y 13
 end
@@ -1348,21 +1868,78 @@ arch shop_empty
 x 16
 y 14
 end
-arch dwall_2_1_2
+arch shop_mat
 x 16
 y 14
 end
 arch shop_empty
+x 16
+y 15
+end
+arch swall_2_1_2
+x 16
+y 15
+end
+arch flagstone
+x 16
+y 16
+end
+arch shop_mat
+x 16
+y 16
+end
+arch flagstone
+x 16
+y 17
+end
+arch button_small
+x 16
+y 18
+connected 1
+end
+arch flagstone
+x 16
+y 18
+end
+arch flagstone
+x 16
+y 19
+end
+arch wwall_1_3
+x 16
+y 19
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 17
+sp 39
+x 16
+y 20
+end
+arch grass_only
+x 16
+y 20
+end
+arch grass_only
+x 16
+y 21
+end
+arch cobblestones2
 x 17
 end
-arch dwall_2_1_2
-x 17
-end
-arch shop_empty
+arch grass_only
 x 17
 y 1
 end
-arch shop_empty
+arch light2
+x 17
+y 2
+end
+arch flagstone
+x 17
+y 2
+end
+arch wwall_win2
 x 17
 y 2
 end
@@ -1370,6 +1947,10 @@ arch shop_empty
 x 17
 y 3
 end
+arch light4
+x 17
+y 4
+end
 arch shop_empty
 x 17
 y 4
@@ -1386,6 +1967,10 @@ arch shop_empty
 x 17
 y 7
 end
+arch light4
+x 17
+y 8
+end
 arch shop_empty
 x 17
 y 8
@@ -1402,12 +1987,15 @@ arch shop_empty
 x 17
 y 11
 end
+arch light4
+x 17
+y 12
+end
 arch shop_empty
 x 17
 y 12
 end
-arch shop_general
-exp 10
+arch shop_empty
 x 17
 y 13
 end
@@ -1415,21 +2003,80 @@ arch shop_empty
 x 17
 y 14
 end
-arch dwall_2_1_2
-x 17
-y 14
-end
 arch shop_empty
+x 17
+y 15
+end
+arch swall_2_1_2
+x 17
+y 15
+end
+arch flagstone
+x 17
+y 16
+end
+arch menu
+x 17
+y 16
+end
+arch light4
+x 17
+y 17
+end
+arch flagstone
+x 17
+y 17
+end
+arch button_small
+x 17
+y 18
+connected 1
+end
+arch flagstone
+x 17
+y 18
+end
+arch button_small
+x 17
+y 19
+connected 1
+end
+arch flagstone
+x 17
+y 19
+end
+arch odoorn2_closed_1
+x 17
+y 19
+connected 1
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 17
+sp 39
+x 17
+y 20
+end
+arch grass_only
+x 17
+y 20
+end
+arch grass_only
+x 17
+y 21
+end
+arch cobblestones2
 x 18
 end
-arch dwall_2_1_2
-x 18
-end
-arch shop_light
+arch grass_only
 x 18
 y 1
 end
-arch shop_light
+arch flagstone
+x 18
+y 2
+end
+arch wwall_2_1_2
 x 18
 y 2
 end
@@ -1457,27 +2104,23 @@ arch shop_light
 x 18
 y 8
 end
-arch shop_empty
+arch shop_light
 x 18
 y 9
 end
-arch shop_gems
-exp 200000
+arch shop_light
 x 18
 y 10
 end
-arch shop_gems
-exp 200000
+arch shop_light
 x 18
 y 11
 end
-arch shop_gems
-exp 200000
+arch shop_light
 x 18
 y 12
 end
-arch shop_general
-exp 10
+arch shop_empty
 x 18
 y 13
 end
@@ -1485,125 +2128,404 @@ arch shop_empty
 x 18
 y 14
 end
-arch dwall_2_1_2
+arch shop_empty
 x 18
-y 14
+y 15
 end
-arch shop_empty
+arch swall_2_1_2
+x 18
+y 15
+end
+arch flagstone
+x 18
+y 16
+end
+arch flagstone
+x 18
+y 17
+end
+arch button_small
+x 18
+y 18
+connected 1
+end
+arch flagstone
+x 18
+y 18
+end
+arch flagstone
+x 18
+y 19
+end
+arch wwall_1_4
+x 18
+y 19
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 17
+sp 39
+x 18
+y 20
+end
+arch grass_only
+x 18
+y 20
+end
+arch grass_only
+x 18
+y 21
+end
+arch cobblestones2
 x 19
 end
-arch dwall_2_2_3
-x 19
-end
-arch shop_empty
+arch grass_only
 x 19
 y 1
 end
-arch dwall_2_1_1
+arch flagstone
 x 19
+y 2
+end
+arch wwall_2_2_3
+x 19
+y 2
+end
+arch wwall_0
+x 19
+y 2
+end
+arch flagstone
+x 19
+y 3
+end
+arch wwall_2_1_1
+x 19
+y 3
+end
+arch flagstone
+x 19
+y 4
+end
+arch wwall_2_1_1
+x 19
+y 4
+end
+arch flagstone
+x 19
+y 5
+end
+arch wwall_2_1_1
+x 19
+y 5
+end
+arch flagstone
+x 19
+y 6
+end
+arch wwall_2_1_1
+x 19
+y 6
+end
+arch light2
+x 19
+y 7
+end
+arch flagstone
+x 19
+y 7
+end
+arch wwall_win1
+x 19
+y 7
+end
+arch flagstone
+x 19
+y 8
+end
+arch wwall_2_1_1
+x 19
+y 8
+end
+arch flagstone
+x 19
+y 9
+end
+arch wwall_2_1_1
+x 19
+y 9
+end
+arch flagstone
+x 19
+y 10
+end
+arch wwall_2_1_1
+x 19
+y 10
+end
+arch flagstone
+x 19
+y 11
+end
+arch wwall_2_1_1
+x 19
+y 11
+end
+arch flagstone
+x 19
+y 12
+end
+arch wwall_2_1_1
+x 19
+y 12
+end
+arch flagstone
+x 19
+y 13
+end
+arch wwall_2_1_1
+x 19
+y 13
+end
+arch light2
+x 19
+y 14
+end
+arch flagstone
+x 19
+y 14
+end
+arch wwall_win1
+x 19
+y 14
+end
+arch flagstone
+x 19
+y 15
+end
+arch wwall_2_1_1
+x 19
+y 15
+end
+arch swall_1_3_half
+x 19
+y 15
+end
+arch flagstone
+x 19
+y 16
+end
+arch wwall_2_1_1
+x 19
+y 16
+end
+arch flagstone
+x 19
+y 17
+end
+arch wwall_2_1_1
+x 19
+y 17
+end
+arch flagstone
+x 19
+y 18
+end
+arch wwall_2_1_1
+x 19
+y 18
+end
+arch flagstone
+x 19
+y 19
+end
+arch wwall_2_2_4
+x 19
+y 19
+end
+arch wwall_0
+x 19
+y 19
+end
+arch grass_only
+x 19
+y 20
+end
+arch grass_only
+x 19
+y 21
+end
+arch cobblestones2
+x 20
+end
+arch grass_only
+x 20
 y 1
 end
-arch shop_empty
-x 19
+arch grass_only
+x 20
 y 2
 end
-arch dwall_2_1_1
-x 19
+arch grass_only
+x 20
+y 3
+end
+arch grass_only
+x 20
+y 4
+end
+arch grass_only
+x 20
+y 5
+end
+arch grass_only
+x 20
+y 6
+end
+arch grass_only
+x 20
+y 7
+end
+arch grass_only
+x 20
+y 8
+end
+arch grass_only
+x 20
+y 9
+end
+arch grass_only
+x 20
+y 10
+end
+arch grass_only
+x 20
+y 11
+end
+arch grass_only
+x 20
+y 12
+end
+arch grass_only
+x 20
+y 13
+end
+arch grass_only
+x 20
+y 14
+end
+arch grass_only
+x 20
+y 15
+end
+arch grass_only
+x 20
+y 16
+end
+arch grass_only
+x 20
+y 17
+end
+arch grass_only
+x 20
+y 18
+end
+arch grass_only
+x 20
+y 19
+end
+arch grass_only
+x 20
+y 20
+end
+arch grass_only
+x 20
+y 21
+end
+arch cobblestones2
+x 21
+end
+arch grass_only
+x 21
+y 1
+end
+arch grass_only
+x 21
 y 2
 end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 3
 end
-arch dwall_2_1_1
-x 19
-y 3
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 4
 end
-arch dwall_2_1_1
-x 19
-y 4
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 5
 end
-arch dwall_2_1_1
-x 19
-y 5
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 6
 end
-arch dwall_2_1_1
-x 19
-y 6
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 7
 end
-arch dwall_2_1_1
-x 19
-y 7
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 8
 end
-arch dwall_2_1_1
-x 19
-y 8
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 9
 end
-arch dwall_2_1_1
-x 19
-y 9
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 10
 end
-arch dwall_2_1_1
-x 19
-y 10
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 11
 end
-arch dwall_2_1_1
-x 19
-y 11
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 12
 end
-arch dwall_2_1_1
-x 19
-y 12
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 13
 end
-arch dwall_2_1_1
-x 19
-y 13
-end
-arch shop_empty
-x 19
+arch grass_only
+x 21
 y 14
 end
-arch dwall_2_2_4
-x 19
-y 14
+arch grass_only
+x 21
+y 15
+end
+arch grass_only
+x 21
+y 16
+end
+arch grass_only
+x 21
+y 17
+end
+arch grass_only
+x 21
+y 18
+end
+arch grass_only
+x 21
+y 19
+end
+arch grass_only
+x 21
+y 20
+end
+arch grass_only
+x 21
+y 21
 end
diff --git a/world/world_105_115 b/world/world_105_115
index f656331d2..b6a68746e 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2011-09-12 Rick Tanner
+Modified: 2011-09-14 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_105_114
@@ -7857,7 +7857,8 @@ end
 arch minihouse
 name Jacob's Lighting Emporium
 slaying /scorn/shops/light_shop
-sp 12
+hp 17
+sp 17
 x 17
 y 39
 end