diff --git a/pup_land/lone_town/shops/buildshop b/pup_land/lone_town/shops/buildshop
index dea909fc0..8508705f2 100644
--- a/pup_land/lone_town/shops/buildshop
+++ b/pup_land/lone_town/shops/buildshop
@@ -5,12 +5,12 @@ region lonetown
 shopitems building material:95;item builder:95;*:-100
 shopgreed 1.00000
 width 40
-height 26
+height 29
 enter_x 19
 enter_y 21
 msg
 Created:  2005-12-23 Gene Alexander
-Modified: 2011-05-22 Rick Tanner
+Modified: 2011-05-25 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -91,6 +91,15 @@ end
 arch cobblestones
 y 25
 end
+arch cobblestones
+y 26
+end
+arch cobblestones
+y 27
+end
+arch cobblestones
+y 28
+end
 arch grass
 x 1
 end
@@ -190,11 +199,23 @@ arch grass
 x 1
 y 24
 end
-arch cobblestones
+arch grass
 x 1
 y 25
 end
 arch grass
+x 1
+y 26
+end
+arch grass
+x 1
+y 27
+end
+arch cobblestones
+x 1
+y 28
+end
+arch grass
 x 2
 end
 arch grass
@@ -326,11 +347,6 @@ arch grass
 x 2
 y 21
 end
-arch tree3
-name shrubbery
-x 2
-y 21
-end
 arch grass
 x 2
 y 22
@@ -353,11 +369,38 @@ arch grass
 x 2
 y 24
 end
-arch cobblestones
+arch tree3
+name shrubbery
+x 2
+y 24
+end
+arch grass
+x 2
+y 25
+end
+arch tree3
+name shrubbery
 x 2
 y 25
 end
 arch grass
+x 2
+y 26
+end
+arch tree3
+name shrubbery
+x 2
+y 26
+end
+arch grass
+x 2
+y 27
+end
+arch cobblestones
+x 2
+y 28
+end
+arch grass
 x 3
 end
 arch grass
@@ -368,19 +411,19 @@ arch grass
 x 3
 y 2
 end
-arch shop_empty
+arch flagstone
 x 3
 y 3
 end
-arch wall_2_2_2
+arch white_wall_2_2_2
 x 3
 y 3
 end
-arch shop_empty
+arch flagstone
 x 3
 y 4
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 4
 end
@@ -388,19 +431,19 @@ arch light2
 x 3
 y 5
 end
-arch shop_empty
+arch flagstone
 x 3
 y 5
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 5
 end
-arch shop_empty
+arch flagstone
 x 3
 y 6
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 6
 end
@@ -408,19 +451,19 @@ arch light2
 x 3
 y 7
 end
-arch shop_empty
+arch flagstone
 x 3
 y 7
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 7
 end
-arch shop_empty
+arch flagstone
 x 3
 y 8
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 8
 end
@@ -428,19 +471,19 @@ arch light2
 x 3
 y 9
 end
-arch shop_empty
+arch flagstone
 x 3
 y 9
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 9
 end
-arch shop_empty
+arch flagstone
 x 3
 y 10
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 10
 end
@@ -448,19 +491,19 @@ arch light2
 x 3
 y 11
 end
-arch shop_empty
+arch flagstone
 x 3
 y 11
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 11
 end
-arch shop_empty
+arch flagstone
 x 3
 y 12
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 12
 end
@@ -468,19 +511,19 @@ arch light2
 x 3
 y 13
 end
-arch shop_empty
+arch flagstone
 x 3
 y 13
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 13
 end
-arch shop_empty
+arch flagstone
 x 3
 y 14
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 14
 end
@@ -488,19 +531,19 @@ arch light2
 x 3
 y 15
 end
-arch shop_empty
+arch flagstone
 x 3
 y 15
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 15
 end
-arch shop_empty
+arch flagstone
 x 3
 y 16
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 16
 end
@@ -508,19 +551,19 @@ arch light2
 x 3
 y 17
 end
-arch shop_empty
+arch flagstone
 x 3
 y 17
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 17
 end
-arch shop_empty
+arch flagstone
 x 3
 y 18
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 18
 end
@@ -528,54 +571,78 @@ arch light2
 x 3
 y 19
 end
-arch shop_empty
+arch flagstone
 x 3
 y 19
 end
-arch window_win1
+arch white_wall_win1
 x 3
 y 19
 end
-arch shop_empty
+arch flagstone
 x 3
 y 20
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 20
 end
-arch shop_empty
+arch flagstone
 x 3
 y 21
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 3
 y 21
 end
-arch shop_empty
+arch flagstone
 x 3
 y 22
 end
-arch wall_2_2_1
+arch white_wall_3_2
 x 3
 y 22
 end
+arch flagstone
+x 3
+y 23
+end
+arch white_wall_2_1_1
+x 3
+y 23
+end
+arch flagstone
+x 3
+y 24
+end
+arch white_wall_2_1_1
+x 3
+y 24
+end
+arch flagstone
+x 3
+y 25
+end
+arch white_wall_2_2_1
+x 3
+y 25
+end
 arch grass
 x 3
-y 23
+y 26
 end
 arch tree3
 name shrubbery
 x 3
-y 23
+y 26
 end
 arch grass
 x 3
-y 24
+y 27
 end
 arch cobblestones
 x 3
-y 25
+y 28
 end
 arch grass
 x 4
@@ -588,11 +655,11 @@ arch grass
 x 4
 y 2
 end
-arch shop_empty
+arch flagstone
 x 4
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 4
 y 3
 end
@@ -672,26 +739,42 @@ arch shop_empty
 x 4
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 4
 y 22
 end
-arch grass
+arch flagstone
 x 4
 y 23
 end
+arch flagstone
+x 4
+y 24
+end
+arch flagstone
+x 4
+y 25
+end
+arch white_wall_1_3
+x 4
+y 25
+end
+arch grass
+x 4
+y 26
+end
 arch tree3
 name shrubbery
 x 4
-y 23
+y 26
 end
 arch grass
 x 4
-y 24
+y 27
 end
 arch cobblestones
 x 4
-y 25
+y 28
 end
 arch grass
 x 5
@@ -708,11 +791,11 @@ arch light2
 x 5
 y 3
 end
-arch shop_empty
+arch flagstone
 x 5
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 5
 y 3
 end
@@ -804,23 +887,50 @@ arch shop_empty
 x 5
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 5
 y 22
 end
-arch grass
+arch flagstone
 x 5
 y 23
 end
-arch grass
+arch light4
 x 5
 y 24
 end
-arch cobblestones
+arch flagstone
+x 5
+y 24
+end
+arch dungeon_magic
+x 5
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 5
+y 25
+end
+arch flagstone
 x 5
 y 25
 end
 arch grass
+x 5
+y 26
+end
+arch grass
+x 5
+y 27
+end
+arch cobblestones
+x 5
+y 28
+end
+arch grass
 x 6
 end
 arch grass
@@ -831,11 +941,11 @@ arch grass
 x 6
 y 2
 end
-arch shop_empty
+arch flagstone
 x 6
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 6
 y 3
 end
@@ -935,27 +1045,45 @@ arch shop_empty
 x 6
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 6
 y 22
 end
-arch grass
+arch flagstone
 x 6
 y 23
 end
-arch tree3
-name shrubbery
-x 6
-y 23
-end
-arch grass
+arch flagstone
 x 6
 y 24
 end
-arch cobblestones
+arch dungeon_magic
 x 6
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 6
+y 25
+end
+arch flagstone
+x 6
+y 25
+end
+arch grass
+x 6
+y 26
+end
+arch grass
+x 6
+y 27
+end
+arch cobblestones
+x 6
+y 28
+end
 arch grass
 x 7
 end
@@ -971,11 +1099,11 @@ arch light2
 x 7
 y 3
 end
-arch shop_empty
+arch flagstone
 x 7
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 7
 y 3
 end
@@ -1059,23 +1187,46 @@ arch shop_empty
 x 7
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 7
 y 22
 end
-arch grass
+arch flagstone
 x 7
 y 23
 end
-arch grass
+arch flagstone
 x 7
 y 24
 end
-arch cobblestones
+arch dungeon_magic
+x 7
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 7
+y 25
+end
+arch flagstone
 x 7
 y 25
 end
 arch grass
+x 7
+y 26
+end
+arch grass
+x 7
+y 27
+end
+arch cobblestones
+x 7
+y 28
+end
+arch grass
 x 8
 end
 arch grass
@@ -1086,11 +1237,11 @@ arch grass
 x 8
 y 2
 end
-arch shop_empty
+arch flagstone
 x 8
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 8
 y 3
 end
@@ -1170,27 +1321,49 @@ arch shop_empty
 x 8
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 8
 y 22
 end
-arch grass
+arch flagstone
 x 8
 y 23
 end
-arch tree3
-name shrubbery
-x 8
-y 23
-end
-arch grass
+arch light4
 x 8
 y 24
 end
-arch cobblestones
+arch flagstone
+x 8
+y 24
+end
+arch dungeon_magic
 x 8
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 8
+y 25
+end
+arch flagstone
+x 8
+y 25
+end
+arch grass
+x 8
+y 26
+end
+arch grass
+x 8
+y 27
+end
+arch cobblestones
+x 8
+y 28
+end
 arch grass
 x 9
 end
@@ -1206,11 +1379,11 @@ arch light2
 x 9
 y 3
 end
-arch shop_empty
+arch flagstone
 x 9
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 9
 y 3
 end
@@ -1294,22 +1467,38 @@ arch shop_empty
 x 9
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 9
 y 22
 end
-arch grass
+arch flagstone
 x 9
 y 23
 end
-arch grass
+arch flagstone
 x 9
 y 24
 end
-arch cobblestones
+arch flagstone
 x 9
 y 25
 end
+arch white_wall_1_4
+x 9
+y 25
+end
+arch grass
+x 9
+y 26
+end
+arch grass
+x 9
+y 27
+end
+arch cobblestones
+x 9
+y 28
+end
 arch grass
 x 10
 end
@@ -1321,11 +1510,11 @@ arch grass
 x 10
 y 2
 end
-arch shop_empty
+arch flagstone
 x 10
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 10
 y 3
 end
@@ -1425,27 +1614,38 @@ arch shop_empty
 x 10
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 10
 y 22
 end
-arch grass
+arch flagstone
 x 10
 y 23
 end
-arch tree3
-name shrubbery
-x 10
-y 23
-end
-arch grass
+arch flagstone
 x 10
 y 24
 end
-arch cobblestones
+arch flagstone
 x 10
 y 25
 end
+arch white_wall_2_1_2
+x 10
+y 25
+end
+arch grass
+x 10
+y 26
+end
+arch grass
+x 10
+y 27
+end
+arch cobblestones
+x 10
+y 28
+end
 arch grass
 x 11
 end
@@ -1468,11 +1668,11 @@ arch light2
 x 11
 y 3
 end
-arch shop_empty
+arch flagstone
 x 11
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 11
 y 3
 end
@@ -1556,23 +1756,39 @@ arch shop_empty
 x 11
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 11
 y 22
 end
-arch grass
+arch flagstone
 x 11
 y 23
 end
-arch grass
+arch flagstone
 x 11
 y 24
 end
-arch cobblestones
+arch flagstone
+x 11
+y 25
+end
+arch white_wall_2_1_2
 x 11
 y 25
 end
 arch grass
+x 11
+y 26
+end
+arch grass
+x 11
+y 27
+end
+arch cobblestones
+x 11
+y 28
+end
+arch grass
 x 12
 end
 arch evergreens2
@@ -1594,11 +1810,11 @@ arch evergreens2
 x 12
 y 2
 end
-arch shop_empty
+arch flagstone
 x 12
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 12
 y 3
 end
@@ -1678,27 +1894,42 @@ arch shop_empty
 x 12
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 12
 y 22
 end
-arch grass
+arch flagstone
 x 12
 y 23
 end
-arch tree3
-name shrubbery
-x 12
-y 23
-end
-arch grass
+arch light4
 x 12
 y 24
 end
-arch cobblestones
+arch flagstone
+x 12
+y 24
+end
+arch flagstone
 x 12
 y 25
 end
+arch white_wall_1_3
+x 12
+y 25
+end
+arch grass
+x 12
+y 26
+end
+arch grass
+x 12
+y 27
+end
+arch cobblestones
+x 12
+y 28
+end
 arch grass
 x 13
 end
@@ -1725,11 +1956,11 @@ arch light2
 x 13
 y 3
 end
-arch shop_empty
+arch flagstone
 x 13
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 13
 y 3
 end
@@ -1813,23 +2044,46 @@ arch shop_empty
 x 13
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 13
 y 22
 end
-arch grass
+arch flagstone
 x 13
 y 23
 end
-arch grass
+arch flagstone
 x 13
 y 24
 end
-arch cobblestones
+arch dungeon_magic
+x 13
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 13
+y 25
+end
+arch flagstone
 x 13
 y 25
 end
 arch grass
+x 13
+y 26
+end
+arch grass
+x 13
+y 27
+end
+arch cobblestones
+x 13
+y 28
+end
+arch grass
 x 14
 end
 arch evergreens2
@@ -1851,11 +2105,11 @@ arch evergreens2
 x 14
 y 2
 end
-arch shop_empty
+arch flagstone
 x 14
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 14
 y 3
 end
@@ -1955,27 +2209,45 @@ arch shop_empty
 x 14
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 14
 y 22
 end
-arch grass
+arch flagstone
 x 14
 y 23
 end
-arch tree3
-name shrubbery
-x 14
-y 23
-end
-arch grass
+arch flagstone
 x 14
 y 24
 end
-arch cobblestones
+arch dungeon_magic
 x 14
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 14
+y 25
+end
+arch flagstone
+x 14
+y 25
+end
+arch grass
+x 14
+y 26
+end
+arch grass
+x 14
+y 27
+end
+arch cobblestones
+x 14
+y 28
+end
 arch grass
 x 15
 end
@@ -1998,11 +2270,11 @@ arch light2
 x 15
 y 3
 end
-arch shop_empty
+arch flagstone
 x 15
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 15
 y 3
 end
@@ -2090,23 +2362,50 @@ arch shop_empty
 x 15
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 15
 y 22
 end
-arch grass
+arch flagstone
 x 15
 y 23
 end
-arch grass
+arch light4
 x 15
 y 24
 end
-arch cobblestones
+arch flagstone
+x 15
+y 24
+end
+arch dungeon_magic
+x 15
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 15
+y 25
+end
+arch flagstone
 x 15
 y 25
 end
 arch grass
+x 15
+y 26
+end
+arch grass
+x 15
+y 27
+end
+arch cobblestones
+x 15
+y 28
+end
+arch grass
 x 16
 end
 arch evergreens2
@@ -2128,11 +2427,11 @@ arch evergreens2
 x 16
 y 2
 end
-arch shop_empty
+arch flagstone
 x 16
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 16
 y 3
 end
@@ -2228,28 +2527,46 @@ arch shop_empty
 x 16
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 16
 y 22
 end
-arch grass
+arch flagstone
 x 16
 y 23
 end
-arch tree3
-name shrubbery
-x 16
-y 23
-end
-arch grass
+arch flagstone
 x 16
 y 24
 end
-arch cobblestones
+arch dungeon_magic
+x 16
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 16
+y 25
+end
+arch flagstone
 x 16
 y 25
 end
 arch grass
+x 16
+y 26
+end
+arch grass
+x 16
+y 27
+end
+arch cobblestones
+x 16
+y 28
+end
+arch grass
 x 17
 end
 arch evergreens2
@@ -2271,11 +2588,11 @@ arch evergreens2
 x 17
 y 2
 end
-arch shop_empty
+arch flagstone
 x 17
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 17
 y 3
 end
@@ -2327,7 +2644,7 @@ arch shop_empty
 x 17
 y 15
 end
-arch wall_2_2_2
+arch white_wall_2_2_2
 x 17
 y 15
 end
@@ -2335,7 +2652,7 @@ arch shop_empty
 x 17
 y 16
 end
-arch window_win1
+arch white_wall_win1
 x 17
 y 16
 end
@@ -2343,7 +2660,7 @@ arch shop_empty
 x 17
 y 17
 end
-arch window_win1
+arch white_wall_win1
 x 17
 y 17
 end
@@ -2351,7 +2668,7 @@ arch shop_empty
 x 17
 y 18
 end
-arch window_win1
+arch white_wall_win1
 x 17
 y 18
 end
@@ -2359,7 +2676,7 @@ arch shop_empty
 x 17
 y 19
 end
-arch window_win1
+arch white_wall_win1
 x 17
 y 19
 end
@@ -2367,7 +2684,7 @@ arch shop_empty
 x 17
 y 20
 end
-arch window_win1
+arch white_wall_win1
 x 17
 y 20
 end
@@ -2375,7 +2692,7 @@ arch shop_empty
 x 17
 y 21
 end
-arch window_win1
+arch white_wall_win1
 x 17
 y 21
 end
@@ -2383,27 +2700,49 @@ arch shop_empty
 x 17
 y 22
 end
-arch wall_3_1
+arch white_wall_3_1
 x 17
 y 22
 end
-arch grass
+arch flagstone
 x 17
 y 23
 end
-arch tree3
-name shrubbery
-x 17
-y 23
-end
-arch grass
+arch light4
 x 17
 y 24
 end
-arch cobblestones
+arch flagstone
+x 17
+y 24
+end
+arch dungeon_magic
 x 17
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 6
+sp 16
+x 17
+y 25
+end
+arch flagstone
+x 17
+y 25
+end
+arch grass
+x 17
+y 26
+end
+arch grass
+x 17
+y 27
+end
+arch cobblestones
+x 17
+y 28
+end
 arch grass
 x 18
 end
@@ -2430,11 +2769,11 @@ arch light2
 x 18
 y 3
 end
-arch shop_empty
+arch flagstone
 x 18
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 18
 y 3
 end
@@ -2486,7 +2825,7 @@ arch shop_empty
 x 18
 y 15
 end
-arch window_win2
+arch white_wall_win2
 x 18
 y 15
 end
@@ -2494,15 +2833,15 @@ arch light4
 x 18
 y 16
 end
-arch cobblestones
+arch flagstone
 x 18
 y 16
 end
-arch cobblestones
+arch flagstone
 x 18
 y 17
 end
-arch cobblestones
+arch flagstone
 x 18
 y 18
 end
@@ -2519,7 +2858,7 @@ material 0
 no_pick 1
 identified 1
 end
-arch cobblestones
+arch flagstone
 x 18
 y 19
 end
@@ -2553,7 +2892,7 @@ arch light4
 x 18
 y 20
 end
-arch cobblestones
+arch flagstone
 x 18
 y 20
 end
@@ -2572,7 +2911,7 @@ material 0
 no_pick 1
 identified 1
 end
-arch cobblestones
+arch flagstone
 x 18
 y 21
 end
@@ -2581,7 +2920,7 @@ name Basic building instructions
 msg
 To build your own home, you can use different items:
 * generic builder: this tool lets you build anything. You need one to build.
-* generic destroyer: this tool lets you destroy a built item. This will remove any built item, except floors and walls.
+* generic destroyer: this tool lets you destroy a built item. This will remove any built item, except floors and white_walls.
 * materials: you need those to build items. For instance, a 'Wood floor material' enables you to build a woodfloor.
 To build an item:
 * apply the builder
@@ -2595,30 +2934,46 @@ material 0
 no_pick 1
 identified 1
 end
-arch cobblestones
+arch flagstone
 x 18
 y 22
 end
-arch wall_1_3
+arch white_wall_1_3
 x 18
 y 22
 end
-arch dungeon_magic
+arch flagstone
 x 18
 y 23
 end
-arch cobblestones
-x 18
-y 23
-end
-arch cobblestones
+arch flagstone
 x 18
 y 24
 end
-arch cobblestones
+arch flagstone
 x 18
 y 25
 end
+arch white_wall_1_4
+x 18
+y 25
+end
+arch dungeon_magic
+x 18
+y 26
+end
+arch cobblestones
+x 18
+y 26
+end
+arch cobblestones
+x 18
+y 27
+end
+arch cobblestones
+x 18
+y 28
+end
 arch grass
 x 19
 end
@@ -2645,11 +3000,11 @@ arch light2
 x 19
 y 3
 end
-arch shop_empty
+arch flagstone
 x 19
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 19
 y 3
 end
@@ -2709,11 +3064,11 @@ arch shop_empty
 x 19
 y 15
 end
-arch window_win2
+arch white_wall_win2
 x 19
 y 15
 end
-arch cobblestones
+arch flagstone
 x 19
 y 16
 end
@@ -2721,38 +3076,27 @@ arch shop_mat
 x 19
 y 16
 end
-arch cobblestones
+arch flagstone
 x 19
 y 17
 end
-arch cobblestones
+arch flagstone
 x 19
 y 18
 end
-arch cobblestones
+arch flagstone
 x 19
 y 19
 end
-arch cobblestones
+arch flagstone
 x 19
 y 20
 end
-arch cobblestones
+arch flagstone
 x 19
 y 21
 end
-arch invis_exit
-slaying /pup_land/lone_town/town
-hp 6
-sp 16
-x 19
-y 22
-end
-arch dungeon_magic
-x 19
-y 22
-end
-arch cobblestones
+arch flagstone
 x 19
 y 22
 end
@@ -2761,22 +3105,38 @@ x 19
 y 22
 move_block 0
 end
-arch dungeon_magic
+arch flagstone
 x 19
 y 23
 end
-arch cobblestones
-x 19
-y 23
-end
-arch cobblestones
+arch flagstone
 x 19
 y 24
 end
-arch cobblestones
+arch flagstone
 x 19
 y 25
 end
+arch white_wall_2_1_2
+x 19
+y 25
+end
+arch dungeon_magic
+x 19
+y 26
+end
+arch cobblestones
+x 19
+y 26
+end
+arch cobblestones
+x 19
+y 27
+end
+arch cobblestones
+x 19
+y 28
+end
 arch grass
 x 20
 end
@@ -2800,11 +3160,11 @@ arch light2
 x 20
 y 3
 end
-arch shop_empty
+arch flagstone
 x 20
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 20
 y 3
 end
@@ -2860,46 +3220,35 @@ arch shop_empty
 x 20
 y 15
 end
-arch window_win2
+arch white_wall_win2
 x 20
 y 15
 end
-arch cobblestones
+arch flagstone
 x 20
 y 16
 end
-arch cobblestones
+arch flagstone
 x 20
 y 17
 end
-arch cobblestones
+arch flagstone
 x 20
 y 18
 end
-arch cobblestones
+arch flagstone
 x 20
 y 19
 end
-arch cobblestones
+arch flagstone
 x 20
 y 20
 end
-arch cobblestones
+arch flagstone
 x 20
 y 21
 end
-arch invis_exit
-slaying /pup_land/lone_town/town
-hp 7
-sp 16
-x 20
-y 22
-end
-arch dungeon_magic
-x 20
-y 22
-end
-arch cobblestones
+arch flagstone
 x 20
 y 22
 end
@@ -2908,22 +3257,38 @@ x 20
 y 22
 move_block 0
 end
-arch dungeon_magic
+arch flagstone
 x 20
 y 23
 end
-arch cobblestones
-x 20
-y 23
-end
-arch cobblestones
+arch flagstone
 x 20
 y 24
 end
-arch cobblestones
+arch flagstone
 x 20
 y 25
 end
+arch white_wall_2_1_2
+x 20
+y 25
+end
+arch dungeon_magic
+x 20
+y 26
+end
+arch cobblestones
+x 20
+y 26
+end
+arch cobblestones
+x 20
+y 27
+end
+arch cobblestones
+x 20
+y 28
+end
 arch grass
 x 21
 end
@@ -2950,11 +3315,11 @@ arch light2
 x 21
 y 3
 end
-arch shop_empty
+arch flagstone
 x 21
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 21
 y 3
 end
@@ -3006,7 +3371,7 @@ arch shop_empty
 x 21
 y 15
 end
-arch window_win2
+arch white_wall_win2
 x 21
 y 15
 end
@@ -3014,15 +3379,15 @@ arch light4
 x 21
 y 16
 end
-arch cobblestones
+arch flagstone
 x 21
 y 16
 end
-arch cobblestones
+arch flagstone
 x 21
 y 17
 end
-arch cobblestones
+arch flagstone
 x 21
 y 18
 end
@@ -3043,7 +3408,7 @@ material 0
 no_pick 1
 identified 1
 end
-arch cobblestones
+arch flagstone
 x 21
 y 19
 end
@@ -3064,7 +3429,7 @@ arch light4
 x 21
 y 20
 end
-arch cobblestones
+arch flagstone
 x 21
 y 20
 end
@@ -3082,7 +3447,7 @@ material 0
 no_pick 1
 identified 1
 end
-arch cobblestones
+arch flagstone
 x 21
 y 21
 end
@@ -3090,29 +3455,49 @@ arch menu
 x 21
 y 21
 end
-arch cobblestones
+arch flagstone
 x 21
 y 22
 end
-arch wall_1_4
+arch white_wall_1_4
 x 21
 y 22
 end
+arch flagstone
+x 21
+y 23
+end
+arch light4
+x 21
+y 24
+end
+arch flagstone
+x 21
+y 24
+end
+arch flagstone
+x 21
+y 25
+end
+arch white_wall_1_3
+x 21
+y 25
+end
 arch dungeon_magic
 x 21
-y 23
+y 26
 end
 arch cobblestones
 x 21
-y 23
+y 26
 end
 arch cobblestones
 x 21
-y 24
+y 27
 end
 arch cobblestones
 x 21
-y 25
+y 28
 end
 arch grass
 x 22
@@ -3136,11 +3521,11 @@ arch evergreens2
 x 22
 y 2
 end
-arch shop_empty
+arch flagstone
 x 22
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 22
 y 3
 end
@@ -3192,7 +3577,7 @@ arch shop_empty
 x 22
 y 15
 end
-arch wall_2_2_3
+arch white_wall_2_2_3
 x 22
 y 15
 end
@@ -3200,7 +3585,7 @@ arch shop_empty
 x 22
 y 16
 end
-arch window_win1
+arch white_wall_win1
 x 22
 y 16
 end
@@ -3208,7 +3593,7 @@ arch shop_empty
 x 22
 y 17
 end
-arch window_win1
+arch white_wall_win1
 x 22
 y 17
 end
@@ -3216,7 +3601,7 @@ arch shop_empty
 x 22
 y 18
 end
-arch window_win1
+arch white_wall_win1
 x 22
 y 18
 end
@@ -3224,7 +3609,7 @@ arch shop_empty
 x 22
 y 19
 end
-arch window_win1
+arch white_wall_win1
 x 22
 y 19
 end
@@ -3232,7 +3617,7 @@ arch shop_empty
 x 22
 y 20
 end
-arch window_win1
+arch white_wall_win1
 x 22
 y 20
 end
@@ -3240,7 +3625,7 @@ arch shop_empty
 x 22
 y 21
 end
-arch window_win1
+arch white_wall_win1
 x 22
 y 21
 end
@@ -3248,28 +3633,46 @@ arch shop_empty
 x 22
 y 22
 end
-arch wall_3_1
+arch white_wall_3_1
 x 22
 y 22
 end
-arch grass
+arch flagstone
 x 22
 y 23
 end
-arch tree3
-name shrubbery
-x 22
-y 23
-end
-arch grass
+arch flagstone
 x 22
 y 24
 end
-arch cobblestones
+arch dungeon_magic
+x 22
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 22
+y 25
+end
+arch flagstone
 x 22
 y 25
 end
 arch grass
+x 22
+y 26
+end
+arch grass
+x 22
+y 27
+end
+arch cobblestones
+x 22
+y 28
+end
+arch grass
 x 23
 end
 arch evergreens2
@@ -3291,11 +3694,11 @@ arch evergreens2
 x 23
 y 2
 end
-arch shop_empty
+arch flagstone
 x 23
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 23
 y 3
 end
@@ -3391,28 +3794,50 @@ arch shop_empty
 x 23
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 23
 y 22
 end
-arch grass
+arch flagstone
 x 23
 y 23
 end
-arch tree3
-name shrubbery
-x 23
-y 23
-end
-arch grass
+arch light4
 x 23
 y 24
 end
-arch cobblestones
+arch flagstone
+x 23
+y 24
+end
+arch dungeon_magic
+x 23
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 23
+y 25
+end
+arch flagstone
 x 23
 y 25
 end
 arch grass
+x 23
+y 26
+end
+arch grass
+x 23
+y 27
+end
+arch cobblestones
+x 23
+y 28
+end
+arch grass
 x 24
 end
 arch evergreens2
@@ -3438,11 +3863,11 @@ arch light2
 x 24
 y 3
 end
-arch shop_empty
+arch flagstone
 x 24
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 24
 y 3
 end
@@ -3530,22 +3955,45 @@ arch shop_empty
 x 24
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 24
 y 22
 end
-arch grass
+arch flagstone
 x 24
 y 23
 end
-arch grass
+arch flagstone
 x 24
 y 24
 end
-arch cobblestones
+arch dungeon_magic
 x 24
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 24
+y 25
+end
+arch flagstone
+x 24
+y 25
+end
+arch grass
+x 24
+y 26
+end
+arch grass
+x 24
+y 27
+end
+arch cobblestones
+x 24
+y 28
+end
 arch grass
 x 25
 end
@@ -3564,11 +4012,11 @@ arch evergreens2
 x 25
 y 2
 end
-arch shop_empty
+arch flagstone
 x 25
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 25
 y 3
 end
@@ -3668,27 +4116,45 @@ arch shop_empty
 x 25
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 25
 y 22
 end
-arch grass
+arch flagstone
 x 25
 y 23
 end
-arch tree3
-name shrubbery
-x 25
-y 23
-end
-arch grass
+arch flagstone
 x 25
 y 24
 end
-arch cobblestones
+arch dungeon_magic
 x 25
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 25
+y 25
+end
+arch flagstone
+x 25
+y 25
+end
+arch grass
+x 25
+y 26
+end
+arch grass
+x 25
+y 27
+end
+arch cobblestones
+x 25
+y 28
+end
 arch grass
 x 26
 end
@@ -3715,11 +4181,11 @@ arch light2
 x 26
 y 3
 end
-arch shop_empty
+arch flagstone
 x 26
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 26
 y 3
 end
@@ -3803,23 +4269,50 @@ arch shop_empty
 x 26
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 26
 y 22
 end
-arch grass
+arch flagstone
 x 26
 y 23
 end
-arch grass
+arch light4
 x 26
 y 24
 end
-arch cobblestones
+arch flagstone
+x 26
+y 24
+end
+arch dungeon_magic
+x 26
+y 25
+end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 26
+y 25
+end
+arch flagstone
 x 26
 y 25
 end
 arch grass
+x 26
+y 26
+end
+arch grass
+x 26
+y 27
+end
+arch cobblestones
+x 26
+y 28
+end
+arch grass
 x 27
 end
 arch evergreens2
@@ -3841,11 +4334,11 @@ arch evergreens2
 x 27
 y 2
 end
-arch shop_empty
+arch flagstone
 x 27
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 27
 y 3
 end
@@ -3925,27 +4418,38 @@ arch shop_empty
 x 27
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 27
 y 22
 end
-arch grass
+arch flagstone
 x 27
 y 23
 end
-arch tree3
-name shrubbery
-x 27
-y 23
-end
-arch grass
+arch flagstone
 x 27
 y 24
 end
-arch cobblestones
+arch flagstone
 x 27
 y 25
 end
+arch white_wall_1_4
+x 27
+y 25
+end
+arch grass
+x 27
+y 26
+end
+arch grass
+x 27
+y 27
+end
+arch cobblestones
+x 27
+y 28
+end
 arch grass
 x 28
 end
@@ -3969,11 +4473,11 @@ arch light2
 x 28
 y 3
 end
-arch shop_empty
+arch flagstone
 x 28
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 28
 y 3
 end
@@ -4065,23 +4569,43 @@ arch shop_empty
 x 28
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 28
 y 22
 end
-arch grass
+arch flagstone
 x 28
 y 23
 end
-arch grass
+arch light4
 x 28
 y 24
 end
-arch cobblestones
+arch flagstone
+x 28
+y 24
+end
+arch flagstone
+x 28
+y 25
+end
+arch white_wall_2_1_2
 x 28
 y 25
 end
 arch grass
+x 28
+y 26
+end
+arch grass
+x 28
+y 27
+end
+arch cobblestones
+x 28
+y 28
+end
+arch grass
 x 29
 end
 arch grass
@@ -4092,11 +4616,11 @@ arch grass
 x 29
 y 2
 end
-arch shop_empty
+arch flagstone
 x 29
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 29
 y 3
 end
@@ -4196,27 +4720,38 @@ arch shop_empty
 x 29
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 29
 y 22
 end
-arch grass
+arch flagstone
 x 29
 y 23
 end
-arch tree3
-name shrubbery
-x 29
-y 23
-end
-arch grass
+arch flagstone
 x 29
 y 24
 end
-arch cobblestones
+arch flagstone
 x 29
 y 25
 end
+arch white_wall_2_1_2
+x 29
+y 25
+end
+arch grass
+x 29
+y 26
+end
+arch grass
+x 29
+y 27
+end
+arch cobblestones
+x 29
+y 28
+end
 arch grass
 x 30
 end
@@ -4232,11 +4767,11 @@ arch light2
 x 30
 y 3
 end
-arch shop_empty
+arch flagstone
 x 30
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 30
 y 3
 end
@@ -4320,22 +4855,38 @@ arch shop_empty
 x 30
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 30
 y 22
 end
-arch grass
+arch flagstone
 x 30
 y 23
 end
-arch grass
+arch flagstone
 x 30
 y 24
 end
-arch cobblestones
+arch flagstone
 x 30
 y 25
 end
+arch white_wall_1_3
+x 30
+y 25
+end
+arch grass
+x 30
+y 26
+end
+arch grass
+x 30
+y 27
+end
+arch cobblestones
+x 30
+y 28
+end
 arch grass
 x 31
 end
@@ -4347,11 +4898,11 @@ arch grass
 x 31
 y 2
 end
-arch shop_empty
+arch flagstone
 x 31
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 31
 y 3
 end
@@ -4431,27 +4982,49 @@ arch shop_empty
 x 31
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 31
 y 22
 end
-arch grass
+arch flagstone
 x 31
 y 23
 end
-arch tree3
-name shrubbery
-x 31
-y 23
-end
-arch grass
+arch light4
 x 31
 y 24
 end
-arch cobblestones
+arch flagstone
+x 31
+y 24
+end
+arch dungeon_magic
 x 31
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 31
+y 25
+end
+arch flagstone
+x 31
+y 25
+end
+arch grass
+x 31
+y 26
+end
+arch grass
+x 31
+y 27
+end
+arch cobblestones
+x 31
+y 28
+end
 arch grass
 x 32
 end
@@ -4467,11 +5040,11 @@ arch light2
 x 32
 y 3
 end
-arch shop_empty
+arch flagstone
 x 32
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 32
 y 3
 end
@@ -4563,22 +5136,45 @@ arch shop_empty
 x 32
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 32
 y 22
 end
-arch grass
+arch flagstone
 x 32
 y 23
 end
-arch grass
+arch flagstone
 x 32
 y 24
 end
-arch cobblestones
+arch dungeon_magic
 x 32
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 32
+y 25
+end
+arch flagstone
+x 32
+y 25
+end
+arch grass
+x 32
+y 26
+end
+arch grass
+x 32
+y 27
+end
+arch cobblestones
+x 32
+y 28
+end
 arch grass
 x 33
 end
@@ -4590,11 +5186,11 @@ arch grass
 x 33
 y 2
 end
-arch shop_empty
+arch flagstone
 x 33
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 33
 y 3
 end
@@ -4694,27 +5290,45 @@ arch shop_empty
 x 33
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 33
 y 22
 end
-arch grass
+arch flagstone
 x 33
 y 23
 end
-arch tree3
-name shrubbery
-x 33
-y 23
-end
-arch grass
+arch flagstone
 x 33
 y 24
 end
-arch cobblestones
+arch dungeon_magic
 x 33
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 33
+y 25
+end
+arch flagstone
+x 33
+y 25
+end
+arch grass
+x 33
+y 26
+end
+arch grass
+x 33
+y 27
+end
+arch cobblestones
+x 33
+y 28
+end
 arch grass
 x 34
 end
@@ -4730,11 +5344,11 @@ arch light2
 x 34
 y 3
 end
-arch shop_empty
+arch flagstone
 x 34
 y 3
 end
-arch window_win2
+arch white_wall_win2
 x 34
 y 3
 end
@@ -4826,22 +5440,49 @@ arch shop_empty
 x 34
 y 22
 end
-arch window_win2
+arch white_wall_win2
 x 34
 y 22
 end
-arch grass
+arch flagstone
 x 34
 y 23
 end
-arch grass
+arch light4
 x 34
 y 24
 end
-arch cobblestones
+arch flagstone
+x 34
+y 24
+end
+arch dungeon_magic
 x 34
 y 25
 end
+arch invis_exit
+slaying /pup_land/lone_town/town
+hp 7
+sp 16
+x 34
+y 25
+end
+arch flagstone
+x 34
+y 25
+end
+arch grass
+x 34
+y 26
+end
+arch grass
+x 34
+y 27
+end
+arch cobblestones
+x 34
+y 28
+end
 arch grass
 x 35
 end
@@ -4853,11 +5494,11 @@ arch grass
 x 35
 y 2
 end
-arch shop_empty
+arch flagstone
 x 35
 y 3
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 35
 y 3
 end
@@ -4937,26 +5578,42 @@ arch shop_empty
 x 35
 y 22
 end
-arch wall_2_1_2
+arch white_wall_2_1_2
 x 35
 y 22
 end
-arch grass
+arch flagstone
 x 35
 y 23
 end
+arch flagstone
+x 35
+y 24
+end
+arch flagstone
+x 35
+y 25
+end
+arch white_wall_1_4
+x 35
+y 25
+end
+arch grass
+x 35
+y 26
+end
 arch tree3
 name shrubbery
 x 35
-y 23
+y 26
 end
 arch grass
 x 35
-y 24
+y 27
 end
 arch cobblestones
 x 35
-y 25
+y 28
 end
 arch grass
 x 36
@@ -4969,19 +5626,19 @@ arch grass
 x 36
 y 2
 end
-arch shop_empty
+arch flagstone
 x 36
 y 3
 end
-arch wall_2_2_3
+arch white_wall_2_2_3
 x 36
 y 3
 end
-arch shop_empty
+arch flagstone
 x 36
 y 4
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 4
 end
@@ -4989,19 +5646,19 @@ arch light2
 x 36
 y 5
 end
-arch shop_empty
+arch flagstone
 x 36
 y 5
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 5
 end
-arch shop_empty
+arch flagstone
 x 36
 y 6
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 6
 end
@@ -5009,19 +5666,19 @@ arch light2
 x 36
 y 7
 end
-arch shop_empty
+arch flagstone
 x 36
 y 7
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 7
 end
-arch shop_empty
+arch flagstone
 x 36
 y 8
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 8
 end
@@ -5029,19 +5686,19 @@ arch light2
 x 36
 y 9
 end
-arch shop_empty
+arch flagstone
 x 36
 y 9
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 9
 end
-arch shop_empty
+arch flagstone
 x 36
 y 10
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 10
 end
@@ -5049,19 +5706,19 @@ arch light2
 x 36
 y 11
 end
-arch shop_empty
+arch flagstone
 x 36
 y 11
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 11
 end
-arch shop_empty
+arch flagstone
 x 36
 y 12
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 12
 end
@@ -5069,19 +5726,19 @@ arch light2
 x 36
 y 13
 end
-arch shop_empty
+arch flagstone
 x 36
 y 13
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 13
 end
-arch shop_empty
+arch flagstone
 x 36
 y 14
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 14
 end
@@ -5089,19 +5746,19 @@ arch light2
 x 36
 y 15
 end
-arch shop_empty
+arch flagstone
 x 36
 y 15
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 15
 end
-arch shop_empty
+arch flagstone
 x 36
 y 16
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 16
 end
@@ -5109,19 +5766,19 @@ arch light2
 x 36
 y 17
 end
-arch shop_empty
+arch flagstone
 x 36
 y 17
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 17
 end
-arch shop_empty
+arch flagstone
 x 36
 y 18
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 18
 end
@@ -5129,54 +5786,78 @@ arch light2
 x 36
 y 19
 end
-arch shop_empty
+arch flagstone
 x 36
 y 19
 end
-arch window_win1
+arch white_wall_win1
 x 36
 y 19
 end
-arch shop_empty
+arch flagstone
 x 36
 y 20
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 20
 end
-arch shop_empty
+arch flagstone
 x 36
 y 21
 end
-arch wall_2_1_1
+arch white_wall_2_1_1
 x 36
 y 21
 end
-arch shop_empty
+arch flagstone
 x 36
 y 22
 end
-arch wall_2_2_4
+arch white_wall_3_4
 x 36
 y 22
 end
+arch flagstone
+x 36
+y 23
+end
+arch white_wall_2_1_1
+x 36
+y 23
+end
+arch flagstone
+x 36
+y 24
+end
+arch white_wall_2_1_1
+x 36
+y 24
+end
+arch flagstone
+x 36
+y 25
+end
+arch white_wall_2_2_4
+x 36
+y 25
+end
 arch grass
 x 36
-y 23
+y 26
 end
 arch tree3
 name shrubbery
 x 36
-y 23
+y 26
 end
 arch grass
 x 36
-y 24
+y 27
 end
 arch cobblestones
 x 36
-y 25
+y 28
 end
 arch grass
 x 37
@@ -5310,11 +5991,6 @@ arch grass
 x 37
 y 21
 end
-arch tree3
-name shrubbery
-x 37
-y 21
-end
 arch grass
 x 37
 y 22
@@ -5337,10 +6013,37 @@ arch grass
 x 37
 y 24
 end
-arch cobblestones
+arch tree3
+name shrubbery
+x 37
+y 24
+end
+arch grass
 x 37
 y 25
 end
+arch tree3
+name shrubbery
+x 37
+y 25
+end
+arch grass
+x 37
+y 26
+end
+arch tree3
+name shrubbery
+x 37
+y 26
+end
+arch grass
+x 37
+y 27
+end
+arch cobblestones
+x 37
+y 28
+end
 arch grass
 x 38
 end
@@ -5440,11 +6143,23 @@ arch grass
 x 38
 y 24
 end
-arch cobblestones
+arch grass
 x 38
 y 25
 end
 arch grass
+x 38
+y 26
+end
+arch grass
+x 38
+y 27
+end
+arch cobblestones
+x 38
+y 28
+end
+arch grass
 x 39
 end
 arch grass
@@ -5543,7 +6258,19 @@ arch grass
 x 39
 y 24
 end
-arch cobblestones
+arch grass
 x 39
 y 25
 end
+arch grass
+x 39
+y 26
+end
+arch grass
+x 39
+y 27
+end
+arch cobblestones
+x 39
+y 28
+end
diff --git a/pup_land/lone_town/town b/pup_land/lone_town/town
index c7e590d74..f5212bd90 100644
--- a/pup_land/lone_town/town
+++ b/pup_land/lone_town/town
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 18
 msg
 Created:  1996-02-25
-Modified: 2011-05-24 Rick Tanner
+Modified: 2011-05-25 Rick Tanner
 endmsg
 end
 arch grass
@@ -935,7 +935,7 @@ end
 arch market3
 name Acme Building Supply
 slaying /pup_land/lone_town/shops/buildshop
-hp 20
+hp 19
 sp 21
 x 7
 y 15