diff --git a/pup_land/rainbow/red_town/shop b/pup_land/rainbow/red_town/shop
index 6c5c46ddf..b0af198a9 100644
--- a/pup_land/rainbow/red_town/shop
+++ b/pup_land/rainbow/red_town/shop
@@ -5,226 +5,407 @@ region pupland
 shopitems weapon:25;bow:10;armour:10;shield:10;helmet:10;cloak:15;boots:10;gloves:10;bracers:10;girdle:5;food:40;flesh:40;wand:20;rod:15;*:-60
 shopmax 6000
 shoprace dwarf
-width 13
-height 16
-enter_x 6
+width 17
+height 18
+enter_x 8
 enter_y 12
 msg
 Created:  2000-10-22
-Modified: 2008-12-14 Rick Tanner
+Modified: 2020-03-28 Rick Tanner
 endmsg
 end
+arch grass
+end
+arch grass
+y 1
+end
+arch grass
+y 2
+end
+arch grass
+y 3
+end
+arch grass
+y 4
+end
+arch grass
+y 5
+end
+arch grass
+y 6
+end
+arch grass
+y 7
+end
+arch grass
+y 8
+end
+arch grass
+y 9
+end
+arch grass
+y 10
+end
+arch grass
+y 11
+end
+arch grass
+y 12
+end
+arch grass
+y 13
+end
+arch grass
+y 14
+end
+arch grass
+y 15
+end
+arch grass
+y 16
+end
+arch grass
+y 17
+end
+arch grass
+x 1
+end
+arch grass
+x 1
+y 1
+end
+arch grass
+x 1
+y 2
+end
+arch grass
+x 1
+y 3
+end
+arch grass
+x 1
+y 4
+end
+arch grass
+x 1
+y 5
+end
+arch grass
+x 1
+y 6
+end
+arch grass
+x 1
+y 7
+end
+arch grass
+x 1
+y 8
+end
+arch grass
+x 1
+y 9
+end
+arch grass
+x 1
+y 10
+end
+arch grass
+x 1
+y 11
+end
+arch grass
+x 1
+y 12
+end
+arch grass
+x 1
+y 13
+end
+arch grass
+x 1
+y 14
+end
+arch grass
+x 1
+y 15
+end
+arch grass
+x 1
+y 16
+end
+arch grass
+x 1
+y 17
+end
+arch grass
+x 2
+end
+arch grass
+x 2
+y 1
+end
 arch woodfloor
+x 2
+y 2
 end
 arch wwall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch wwall_2_1_1
-y 1
-end
-arch woodfloor
-y 2
-end
-arch wwall_2_1_1
+x 2
 y 2
 end
 arch woodfloor
+x 2
 y 3
 end
 arch wwall_2_1_1
+x 2
 y 3
 end
 arch woodfloor
+x 2
 y 4
 end
 arch wwall_2_1_1
+x 2
 y 4
 end
 arch woodfloor
+x 2
 y 5
 end
 arch wwall_2_1_1
+x 2
 y 5
 end
 arch woodfloor
+x 2
 y 6
 end
 arch wwall_2_1_1
+x 2
 y 6
 end
 arch woodfloor
+x 2
 y 7
 end
 arch wwall_2_1_1
+x 2
 y 7
 end
 arch woodfloor
+x 2
 y 8
 end
 arch wwall_2_1_1
+x 2
 y 8
 end
 arch woodfloor
+x 2
 y 9
 end
+arch wwall_2_1_1
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 10
+end
+arch wwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
 arch swall_1_4_half
-y 9
-end
-arch wwall_2_1_1
-y 9
-end
-arch woodfloor
-y 10
-end
-arch wwall_2_1_1
-y 10
-end
-arch woodfloor
+x 2
 y 11
 end
 arch wwall_2_1_1
+x 2
 y 11
 end
 arch woodfloor
+x 2
 y 12
 end
+arch wwall_2_1_1
+x 2
+y 12
+end
+arch woodfloor
+x 2
+y 13
+end
+arch wwall_2_1_1
+x 2
+y 13
+end
+arch woodfloor
+x 2
+y 14
+end
 arch wwall_2_2_1
-y 12
-end
-arch brush
-y 13
-end
-arch brush
+x 2
 y 14
 end
-arch grass
+arch brush
+x 2
 y 15
 end
-arch woodfloor
-x 1
+arch brush
+x 2
+y 16
 end
-arch wwall_2_1_2
-x 1
+arch grass
+x 2
+y 17
 end
-arch shop_empty
-x 1
+arch grass
+x 3
+end
+arch grass
+x 3
 y 1
 end
-arch shop_food
-x 1
+arch woodfloor
+x 3
 y 2
 end
-arch shop_food
-x 1
+arch wwall_2_1_2
+x 3
+y 2
+end
+arch shop_empty
+x 3
 y 3
 end
 arch shop_food
-x 1
+x 3
 y 4
 end
 arch shop_food
-x 1
+x 3
 y 5
 end
 arch shop_food
-x 1
+x 3
 y 6
 end
 arch shop_food
-x 1
+x 3
 y 7
 end
 arch shop_food
-x 1
+x 3
 y 8
 end
-arch woodfloor
-x 1
+arch shop_food
+x 3
 y 9
 end
-arch swall_2_1_2
-x 1
-y 9
-end
-arch woodfloor
-x 1
+arch shop_food
+x 3
 y 10
 end
 arch woodfloor
-x 1
+x 3
+y 11
+end
+arch swall_2_1_2
+x 3
 y 11
 end
 arch woodfloor
-x 1
+x 3
 y 12
 end
-arch wwall_2_1_2
-x 1
-y 12
-end
-arch brush
-x 1
-y 13
-end
-arch grass
-x 1
-y 14
-end
-arch grass
-x 1
-y 15
-end
 arch woodfloor
-x 2
+x 3
+y 13
+end
+arch woodfloor
+x 3
+y 14
 end
 arch wwall_2_1_2
-x 2
+x 3
+y 14
 end
-arch shop_scrolls
-x 2
+arch brush
+x 3
+y 15
+end
+arch grass
+x 3
+y 16
+end
+arch grass
+x 3
+y 17
+end
+arch grass
+x 4
+end
+arch grass
+x 4
 y 1
 end
-arch shop_empty
-x 2
+arch woodfloor
+x 4
 y 2
 end
-arch shop_empty
-x 2
+arch wwall_2_1_2
+x 4
+y 2
+end
+arch shop_scrolls
+x 4
 y 3
 end
 arch shop_empty
-x 2
+x 4
 y 4
 end
 arch shop_empty
-x 2
+x 4
 y 5
 end
 arch shop_empty
-x 2
+x 4
 y 6
 end
 arch shop_empty
-x 2
+x 4
 y 7
 end
 arch shop_empty
-x 2
+x 4
 y 8
 end
-arch woodfloor
-x 2
+arch shop_empty
+x 4
 y 9
 end
+arch shop_empty
+x 4
+y 10
+end
+arch woodfloor
+x 4
+y 11
+end
 arch swall_2_1_2
-x 2
-y 9
+x 4
+y 11
 end
 arch woodfloor
-x 2
-y 10
+x 4
+y 12
 end
 arch lesser_dwarven_guard
 name Bobo, shopkeeper
@@ -234,8 +415,8 @@ Welcome to my shop!
 endmsg
 sp 0
 maxsp 0
-x 2
-y 10
+x 4
+y 12
 attack_movement 0
 level 10
 randomitems none
@@ -244,902 +425,1145 @@ will_apply 0
 friendly 1
 end
 arch woodfloor
-x 2
-y 11
-end
-arch woodfloor
-x 2
-y 12
-end
-arch wwall_2_1_2
-x 2
-y 12
-end
-arch grass
-x 2
+x 4
 y 13
 end
-arch grass
-x 2
+arch woodfloor
+x 4
+y 14
+end
+arch wwall_2_1_2
+x 4
 y 14
 end
 arch grass
-x 2
+x 4
 y 15
 end
-arch woodfloor
-x 3
+arch grass
+x 4
+y 16
 end
-arch wwall_2_1_2
-x 3
+arch grass
+x 4
+y 17
 end
-arch shop_wands
-x 3
+arch grass
+x 5
+end
+arch grass
+x 5
 y 1
 end
-arch shop_empty
-x 3
+arch woodfloor
+x 5
 y 2
 end
-arch shop_weapon
-x 3
+arch wwall_2_1_2
+x 5
+y 2
+end
+arch shop_wands
+x 5
 y 3
 end
-arch shop_armour
-x 3
+arch shop_empty
+x 5
 y 4
 end
 arch shop_weapon
-x 3
+x 5
 y 5
 end
 arch shop_armour
-x 3
+x 5
 y 6
 end
-arch shop_empty
-x 3
+arch shop_weapon
+x 5
 y 7
 end
-arch shop_empty
-x 3
+arch shop_armour
+x 5
 y 8
 end
-arch woodfloor
-x 3
+arch shop_empty
+x 5
 y 9
 end
-arch swall_2_1_2
-x 3
-y 9
-end
-arch woodfloor
-x 3
+arch shop_empty
+x 5
 y 10
 end
 arch woodfloor
-x 3
+x 5
 y 11
 end
+arch swall_2_1_2
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 12
+end
+arch woodfloor
+x 5
+y 13
+end
 arch dungeon_magic
-x 3
-y 12
+x 5
+y 14
 end
 arch woodfloor
-x 3
-y 12
+x 5
+y 14
 end
 arch wwall_win2
-x 3
-y 12
-end
-arch grass
-x 3
-y 13
-end
-arch grass
-x 3
+x 5
 y 14
 end
 arch grass
-x 3
+x 5
 y 15
 end
+arch grass
+x 5
+y 16
+end
+arch grass
+x 5
+y 17
+end
+arch grass
+x 6
+end
+arch grass
+x 6
+y 1
+end
 arch woodfloor
-x 4
+x 6
+y 2
 end
 arch wwall_2_1_2
-x 4
+x 6
+y 2
 end
 arch shop_scrolls
-x 4
-y 1
-end
-arch shop_empty
-x 4
-y 2
-end
-arch shop_armour
-x 4
+x 6
 y 3
 end
 arch shop_empty
-x 4
+x 6
 y 4
 end
-arch swall_1_1
-x 4
-y 4
+arch shop_armour
+x 6
+y 5
 end
 arch shop_empty
-x 4
-y 5
+x 6
+y 6
 end
-arch swall_1_2
-x 4
-y 5
-end
-arch shop_weapon
-x 4
+arch swall_1_1
+x 6
 y 6
 end
 arch shop_empty
-x 4
+x 6
 y 7
 end
-arch shop_empty
-x 4
+arch swall_1_2
+x 6
+y 7
+end
+arch shop_weapon
+x 6
 y 8
 end
-arch woodfloor
-x 4
+arch shop_empty
+x 6
 y 9
 end
-arch swall_2_1_2
-x 4
-y 9
-end
-arch woodfloor
-x 4
+arch shop_empty
+x 6
 y 10
 end
 arch woodfloor
-x 4
+x 6
+y 11
+end
+arch swall_2_1_2
+x 6
 y 11
 end
 arch woodfloor
-x 4
+x 6
 y 12
 end
-arch wwall_2_1_2
-x 4
-y 12
-end
-arch cobblestones2
-x 4
+arch woodfloor
+x 6
 y 13
 end
-arch cobblestones2
-x 4
+arch woodfloor
+x 6
+y 14
+end
+arch wwall_2_1_2
+x 6
 y 14
 end
 arch cobblestones2
-x 4
+x 6
 y 15
 end
-arch woodfloor
-x 5
+arch cobblestones2
+x 6
+y 16
 end
-arch wwall_2_1_2
-x 5
+arch cobblestones2
+x 6
+y 17
 end
-arch shop_wands
-x 5
+arch grass
+x 7
+end
+arch grass
+x 7
 y 1
 end
-arch shop_empty
-x 5
+arch woodfloor
+x 7
 y 2
 end
-arch shop_weapon
-x 5
+arch wwall_2_1_2
+x 7
+y 2
+end
+arch shop_wands
+x 7
 y 3
 end
-arch shop_armour
-x 5
+arch shop_empty
+x 7
 y 4
 end
 arch shop_weapon
-x 5
+x 7
 y 5
 end
 arch shop_armour
-x 5
+x 7
 y 6
 end
-arch shop_empty
-x 5
+arch shop_weapon
+x 7
 y 7
 end
-arch shop_empty
-x 5
+arch shop_armour
+x 7
 y 8
 end
-arch woodfloor
-x 5
+arch shop_empty
+x 7
 y 9
 end
+arch shop_empty
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
 arch swall_2_1_2
-x 5
-y 9
-end
-arch woodfloor
-x 5
-y 10
-end
-arch menu
-x 5
-y 10
-end
-arch woodfloor
-x 5
+x 7
 y 11
 end
 arch woodfloor
-x 5
+x 7
 y 12
 end
+arch button_small
+x 7
+y 13
+connected 1
+end
+arch woodfloor
+x 7
+y 13
+end
+arch woodfloor
+x 7
+y 14
+end
 arch wwall_1_3
-x 5
-y 12
+x 7
+y 14
 end
 arch dungeon_magic
-x 5
-y 13
+x 7
+y 15
 end
 arch invis_exit
 slaying town
 hp 2
 sp 7
-x 5
-y 13
-end
-arch cobblestones2
-x 5
-y 13
-end
-arch cobblestones2
-x 5
-y 14
-end
-arch cobblestones2
-x 5
+x 7
 y 15
 end
+arch cobblestones2
+x 7
+y 15
+end
+arch cobblestones2
+x 7
+y 16
+end
+arch cobblestones2
+x 7
+y 17
+end
+arch grass
+x 8
+end
+arch grass
+x 8
+y 1
+end
 arch woodfloor
-x 6
+x 8
+y 2
 end
 arch wwall_2_1_2
-x 6
+x 8
+y 2
 end
 arch shop_scrolls
-x 6
-y 1
-end
-arch shop_empty
-x 6
-y 2
-end
-arch shop_empty
-x 6
+x 8
 y 3
 end
 arch shop_empty
-x 6
+x 8
 y 4
 end
 arch shop_empty
-x 6
+x 8
 y 5
 end
 arch shop_empty
-x 6
+x 8
 y 6
 end
 arch shop_empty
-x 6
+x 8
 y 7
 end
 arch shop_empty
-x 6
+x 8
 y 8
 end
-arch shop_mat
-x 6
-y 8
+arch shop_empty
+x 8
+y 9
+end
+arch shop_empty
+x 8
+y 10
 end
 arch woodfloor
-x 6
-y 9
+x 8
+y 11
 end
 arch swall_2_1_2
-x 6
-y 9
-end
-arch woodfloor
-x 6
-y 10
-end
-arch shop_mat
-x 6
-y 10
-end
-arch woodfloor
-x 6
+x 8
 y 11
 end
 arch woodfloor
-x 6
+x 8
 y 12
 end
-arch door_look_1
-hp 0
-exp 0
-ac 0
-x 6
-y 12
-level 0
-type 0
-material 0
-randomitems none
-move_block 0
-alive 0
-pass_thru 0
+arch button_small
+x 8
+y 13
+connected 1
+end
+arch woodfloor
+x 8
+y 13
+end
+arch button_small
+x 8
+y 14
+connected 1
+end
+arch woodfloor
+x 8
+y 14
+end
+arch odoorn2_closed_1
+x 8
+y 14
+connected 1
 end
 arch dungeon_magic
-x 6
-y 13
+x 8
+y 15
 end
 arch invis_exit
 slaying town
 hp 2
 sp 7
-x 6
-y 13
-end
-arch cobblestones2
-x 6
-y 13
-end
-arch cobblestones2
-x 6
-y 14
-end
-arch cobblestones2
-x 6
+x 8
 y 15
 end
-arch woodfloor
-x 7
+arch cobblestones2
+x 8
+y 15
 end
-arch wwall_2_1_2
-x 7
+arch cobblestones2
+x 8
+y 16
 end
-arch shop_wands
-x 7
+arch cobblestones2
+x 8
+y 17
+end
+arch grass
+x 9
+end
+arch grass
+x 9
 y 1
 end
-arch shop_empty
-x 7
+arch woodfloor
+x 9
 y 2
 end
-arch shop_armour
-x 7
+arch wwall_2_1_2
+x 9
+y 2
+end
+arch shop_wands
+x 9
 y 3
 end
-arch shop_weapon
-x 7
+arch shop_empty
+x 9
 y 4
 end
 arch shop_armour
-x 7
+x 9
 y 5
 end
 arch shop_weapon
-x 7
+x 9
 y 6
 end
-arch shop_empty
-x 7
+arch shop_armour
+x 9
 y 7
 end
-arch shop_empty
-x 7
+arch shop_weapon
+x 9
 y 8
 end
-arch woodfloor
-x 7
+arch shop_empty
+x 9
 y 9
 end
-arch swall_2_1_2
-x 7
-y 9
-end
-arch woodfloor
-x 7
+arch shop_empty
+x 9
 y 10
 end
 arch woodfloor
-x 7
+x 9
+y 11
+end
+arch swall_2_1_2
+x 9
 y 11
 end
 arch woodfloor
-x 7
+x 9
 y 12
 end
+arch button_small
+x 9
+y 13
+connected 1
+end
+arch woodfloor
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
 arch wwall_1_4
-x 7
-y 12
+x 9
+y 14
 end
 arch dungeon_magic
-x 7
-y 13
+x 9
+y 15
 end
 arch invis_exit
 slaying town
 hp 2
 sp 7
-x 7
-y 13
-end
-arch cobblestones2
-x 7
-y 13
-end
-arch cobblestones2
-x 7
-y 14
-end
-arch cobblestones2
-x 7
+x 9
 y 15
 end
-arch woodfloor
-x 8
+arch cobblestones2
+x 9
+y 15
 end
-arch wwall_2_1_2
-x 8
+arch cobblestones2
+x 9
+y 16
 end
-arch shop_scrolls
-x 8
+arch cobblestones2
+x 9
+y 17
+end
+arch grass
+x 10
+end
+arch grass
+x 10
 y 1
 end
-arch shop_empty
-x 8
+arch woodfloor
+x 10
 y 2
 end
-arch shop_weapon
-x 8
+arch wwall_2_1_2
+x 10
+y 2
+end
+arch shop_scrolls
+x 10
 y 3
 end
 arch shop_empty
-x 8
+x 10
 y 4
 end
+arch shop_weapon
+x 10
+y 5
+end
+arch shop_empty
+x 10
+y 6
+end
 arch swall_1_1
-x 8
-y 4
+x 10
+y 6
 end
 arch shop_empty
-x 8
-y 5
+x 10
+y 7
 end
 arch swall_1_2
-x 8
-y 5
-end
-arch shop_armour
-x 8
-y 6
-end
-arch shop_empty
-x 8
+x 10
 y 7
 end
-arch shop_empty
-x 8
+arch shop_armour
+x 10
 y 8
 end
-arch woodfloor
-x 8
+arch shop_empty
+x 10
 y 9
 end
-arch swall_2_1_2
-x 8
-y 9
-end
-arch woodfloor
-x 8
+arch shop_empty
+x 10
 y 10
 end
 arch woodfloor
-x 8
+x 10
+y 11
+end
+arch swall_2_1_2
+x 10
 y 11
 end
 arch woodfloor
-x 8
+x 10
 y 12
 end
-arch wwall_2_1_2
-x 8
+arch menu
+x 10
 y 12
 end
-arch cobblestones2
-x 8
+arch woodfloor
+x 10
 y 13
 end
-arch cobblestones2
-x 8
+arch woodfloor
+x 10
+y 14
+end
+arch wwall_2_1_2
+x 10
 y 14
 end
 arch cobblestones2
-x 8
+x 10
 y 15
 end
+arch cobblestones2
+x 10
+y 16
+end
+arch cobblestones2
+x 10
+y 17
+end
+arch grass
+x 11
+end
+arch grass
+x 11
+y 1
+end
 arch woodfloor
-x 9
+x 11
+y 2
 end
 arch wwall_2_1_2
-x 9
+x 11
+y 2
 end
 arch shop_wands
-x 9
-y 1
-end
-arch shop_empty
-x 9
-y 2
-end
-arch shop_armour
-x 9
+x 11
 y 3
 end
-arch shop_weapon
-x 9
+arch shop_empty
+x 11
 y 4
 end
 arch shop_armour
-x 9
+x 11
 y 5
 end
 arch shop_weapon
-x 9
+x 11
 y 6
 end
-arch shop_empty
-x 9
+arch shop_armour
+x 11
 y 7
 end
-arch shop_empty
-x 9
+arch shop_weapon
+x 11
 y 8
 end
-arch woodfloor
-x 9
+arch shop_empty
+x 11
 y 9
 end
-arch swall_2_1_2
-x 9
-y 9
+arch shop_empty
+x 11
+y 10
 end
-arch woodfloor
-x 9
+arch shop_mat
+x 11
 y 10
 end
 arch woodfloor
-x 9
+x 11
 y 11
 end
+arch swall_2_1_2
+x 11
+y 11
+end
+arch woodfloor
+x 11
+y 12
+end
+arch shop_mat
+x 11
+y 12
+end
+arch woodfloor
+x 11
+y 13
+end
 arch dungeon_magic
-x 9
-y 12
+x 11
+y 14
 end
 arch woodfloor
-x 9
-y 12
+x 11
+y 14
 end
 arch wwall_win2
-x 9
-y 12
-end
-arch cobblestones2
-x 9
-y 13
-end
-arch cobblestones2
-x 9
+x 11
 y 14
 end
 arch cobblestones2
-x 9
+x 11
 y 15
 end
+arch cobblestones2
+x 11
+y 16
+end
+arch cobblestones2
+x 11
+y 17
+end
+arch grass
+x 12
+end
+arch grass
+x 12
+y 1
+end
 arch woodfloor
-x 10
+x 12
+y 2
 end
 arch wwall_2_1_2
-x 10
+x 12
+y 2
 end
 arch shop_scrolls
-x 10
-y 1
-end
-arch shop_empty
-x 10
-y 2
-end
-arch shop_empty
-x 10
+x 12
 y 3
 end
 arch shop_empty
-x 10
+x 12
 y 4
 end
 arch shop_empty
-x 10
+x 12
 y 5
 end
 arch shop_empty
-x 10
+x 12
 y 6
 end
 arch shop_empty
-x 10
+x 12
 y 7
 end
 arch shop_empty
-x 10
+x 12
 y 8
 end
-arch woodfloor
-x 10
+arch shop_empty
+x 12
 y 9
 end
-arch swall_2_1_2
-x 10
-y 9
-end
-arch woodfloor
-x 10
+arch shop_empty
+x 12
 y 10
 end
 arch woodfloor
-x 10
+x 12
+y 11
+end
+arch swall_2_1_2
+x 12
 y 11
 end
 arch woodfloor
-x 10
+x 12
 y 12
 end
-arch wwall_2_1_2
-x 10
-y 12
-end
-arch cobblestones2
-x 10
+arch woodfloor
+x 12
 y 13
 end
-arch cobblestones2
-x 10
+arch woodfloor
+x 12
+y 14
+end
+arch wwall_2_1_2
+x 12
 y 14
 end
 arch cobblestones2
-x 10
+x 12
 y 15
 end
-arch woodfloor
-x 11
+arch cobblestones2
+x 12
+y 16
 end
-arch wwall_2_1_2
-x 11
+arch cobblestones2
+x 12
+y 17
 end
-arch shop_empty
-x 11
+arch grass
+x 13
+end
+arch grass
+x 13
 y 1
 end
-arch shop_food
-x 11
+arch woodfloor
+x 13
 y 2
 end
-arch shop_food
-x 11
+arch wwall_2_1_2
+x 13
+y 2
+end
+arch shop_empty
+x 13
 y 3
 end
 arch shop_food
-x 11
+x 13
 y 4
 end
 arch shop_food
-x 11
+x 13
 y 5
 end
 arch shop_food
-x 11
+x 13
 y 6
 end
 arch shop_food
-x 11
+x 13
 y 7
 end
 arch shop_food
-x 11
+x 13
 y 8
 end
-arch woodfloor
-x 11
+arch shop_food
+x 13
 y 9
 end
+arch shop_food
+x 13
+y 10
+end
+arch woodfloor
+x 13
+y 11
+end
 arch swall_2_1_2
-x 11
-y 9
+x 13
+y 11
 end
 arch woodfloor
-x 11
-y 10
+x 13
+y 12
 end
 arch identify_table
-x 11
-y 10
+x 13
+y 12
 end
 arch woodfloor
-x 11
-y 11
+x 13
+y 13
 end
 arch altar
 name altar of detect curse (25 sp)
 slaying money
 food 25
-x 11
-y 11
+x 13
+y 13
 arch spell_detect_curse
 end
 end
 arch woodfloor
-x 11
-y 12
+x 13
+y 14
 end
 arch wwall_2_1_2
-x 11
-y 12
-end
-arch cobblestones2
-x 11
-y 13
-end
-arch cobblestones2
-x 11
+x 13
 y 14
 end
 arch cobblestones2
-x 11
+x 13
 y 15
 end
+arch cobblestones2
+x 13
+y 16
+end
+arch cobblestones2
+x 13
+y 17
+end
+arch grass
+x 14
+end
+arch grass
+x 14
+y 1
+end
 arch woodfloor
-x 12
+x 14
+y 2
 end
 arch wwall_2_2_3
-x 12
-end
-arch woodfloor
-x 12
-y 1
-end
-arch wwall_2_1_1
-x 12
-y 1
-end
-arch woodfloor
-x 12
-y 2
-end
-arch wwall_2_1_1
-x 12
+x 14
 y 2
 end
 arch woodfloor
-x 12
+x 14
 y 3
 end
 arch wwall_2_1_1
-x 12
+x 14
 y 3
 end
 arch woodfloor
-x 12
+x 14
 y 4
 end
 arch wwall_2_1_1
-x 12
+x 14
 y 4
 end
 arch woodfloor
-x 12
+x 14
 y 5
 end
 arch wwall_2_1_1
-x 12
+x 14
 y 5
 end
 arch woodfloor
-x 12
+x 14
 y 6
 end
 arch wwall_2_1_1
-x 12
+x 14
 y 6
 end
 arch woodfloor
-x 12
+x 14
 y 7
 end
 arch wwall_2_1_1
-x 12
+x 14
 y 7
 end
 arch woodfloor
-x 12
+x 14
 y 8
 end
 arch wwall_2_1_1
-x 12
+x 14
 y 8
 end
 arch woodfloor
-x 12
+x 14
 y 9
 end
 arch wwall_2_1_1
-x 12
+x 14
 y 9
 end
+arch woodfloor
+x 14
+y 10
+end
+arch wwall_2_1_1
+x 14
+y 10
+end
+arch woodfloor
+x 14
+y 11
+end
+arch wwall_2_1_1
+x 14
+y 11
+end
 arch swall_1_3_half
-x 12
-y 9
-end
-arch woodfloor
-x 12
-y 10
-end
-arch wwall_2_1_1
-x 12
-y 10
-end
-arch woodfloor
-x 12
-y 11
-end
-arch wwall_2_1_1
-x 12
+x 14
 y 11
 end
 arch woodfloor
-x 12
+x 14
 y 12
 end
-arch wwall_2_2_4
-x 12
+arch wwall_2_1_1
+x 14
 y 12
 end
-arch cobblestones2
-x 12
+arch woodfloor
+x 14
 y 13
 end
-arch cobblestones2
-x 12
+arch wwall_2_1_1
+x 14
+y 13
+end
+arch woodfloor
+x 14
+y 14
+end
+arch wwall_2_2_4
+x 14
 y 14
 end
 arch cobblestones2
-x 12
+x 14
 y 15
 end
+arch cobblestones2
+x 14
+y 16
+end
+arch cobblestones2
+x 14
+y 17
+end
+arch grass
+x 15
+end
+arch grass
+x 15
+y 1
+end
+arch grass
+x 15
+y 2
+end
+arch grass
+x 15
+y 3
+end
+arch grass
+x 15
+y 4
+end
+arch grass
+x 15
+y 5
+end
+arch grass
+x 15
+y 6
+end
+arch grass
+x 15
+y 7
+end
+arch grass
+x 15
+y 8
+end
+arch grass
+x 15
+y 9
+end
+arch grass
+x 15
+y 10
+end
+arch grass
+x 15
+y 11
+end
+arch grass
+x 15
+y 12
+end
+arch grass
+x 15
+y 13
+end
+arch grass
+x 15
+y 14
+end
+arch cobblestones2
+x 15
+y 15
+end
+arch cobblestones2
+x 15
+y 16
+end
+arch cobblestones2
+x 15
+y 17
+end
+arch grass
+x 16
+end
+arch grass
+x 16
+y 1
+end
+arch grass
+x 16
+y 2
+end
+arch grass
+x 16
+y 3
+end
+arch grass
+x 16
+y 4
+end
+arch grass
+x 16
+y 5
+end
+arch grass
+x 16
+y 6
+end
+arch grass
+x 16
+y 7
+end
+arch grass
+x 16
+y 8
+end
+arch grass
+x 16
+y 9
+end
+arch grass
+x 16
+y 10
+end
+arch grass
+x 16
+y 11
+end
+arch grass
+x 16
+y 12
+end
+arch grass
+x 16
+y 13
+end
+arch grass
+x 16
+y 14
+end
+arch cobblestones2
+x 16
+y 15
+end
+arch cobblestones2
+x 16
+y 16
+end
+arch cobblestones2
+x 16
+y 17
+end
diff --git a/pup_land/rainbow/red_town/town b/pup_land/rainbow/red_town/town
index 09406f9fc..278762c1b 100644
--- a/pup_land/rainbow/red_town/town
+++ b/pup_land/rainbow/red_town/town
@@ -6,7 +6,7 @@ width 15
 height 15
 msg
 Created:  1997-02-11
-Modified: 2011-12-22 Rick Tanner
+Modified: 2020-03-31 Rick Tanner
 endmsg
 end
 arch woods
@@ -131,7 +131,7 @@ end
 arch store_general
 name Bobo's Shop
 slaying shop
-hp 6
+hp 8
 sp 12
 x 1
 y 5