diff --git a/santo_dominion/shops/armour b/santo_dominion/shops/armour
index 381e0f78a..96b689e51 100644
--- a/santo_dominion/shops/armour
+++ b/santo_dominion/shops/armour
@@ -4,590 +4,791 @@ fixed_resettime 1
 difficulty 10
 region santodominion
 shopitems armour:60;shield:60;helmet:50;cloak:50;boots:50;gloves:50;bracers:60;girdle:60;*:-60
-width 16
-height 16
+width 20
+height 20
 enter_x 2
 enter_y 14
 msg
 Created:  1994-10-11
-Modified: 2008-12-01 Rick Tanner
+Modified: 2011-04-16 Rick Tanner
 endmsg
+outdoor 1
 end
-arch flagstone
+arch grass_only
 end
-arch stwall_2_2_2
-end
-arch flagstone
+arch grass_only
 y 1
 end
-arch stwall_2_1_1
-y 1
-end
-arch flagstone
+arch grass_only
 y 2
 end
-arch stwall_2_1_1
-y 2
-end
-arch flagstone
+arch grass_only
 y 3
 end
-arch stwall_2_1_1
-y 3
-end
-arch flagstone
+arch grass_only
 y 4
 end
-arch stwall_2_1_1
-y 4
-end
-arch flagstone
+arch grass_only
 y 5
 end
-arch stwall_2_1_1
-y 5
-end
-arch flagstone
+arch grass_only
 y 6
 end
-arch stwall_2_1_1
-y 6
-end
-arch flagstone
+arch grass_only
 y 7
 end
-arch stwall_2_1_1
-y 7
-end
-arch flagstone
+arch grass_only
 y 8
 end
-arch stwall_2_1_1
-y 8
-end
-arch flagstone
+arch grass_only
 y 9
 end
-arch stwall_2_1_1
-y 9
-end
-arch flagstone
+arch grass_only
 y 10
 end
-arch stwall_2_1_1
-y 10
-end
-arch flagstone
+arch grass_only
 y 11
 end
+arch grass_only
+y 12
+end
+arch grass_only
+y 13
+end
+arch grass_only
+y 14
+end
+arch grass_only
+y 15
+end
+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
+x 1
+end
+arch grass_only
+x 1
+y 1
+end
+arch grass_only
+x 1
+y 2
+end
+arch grass_only
+x 1
+y 3
+end
+arch grass_only
+x 1
+y 4
+end
+arch grass_only
+x 1
+y 5
+end
+arch grass_only
+x 1
+y 6
+end
+arch grass_only
+x 1
+y 7
+end
+arch grass_only
+x 1
+y 8
+end
+arch grass_only
+x 1
+y 9
+end
+arch grass_only
+x 1
+y 10
+end
+arch grass_only
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 12
+end
+arch grass_only
+x 1
+y 13
+end
+arch grass_only
+x 1
+y 14
+end
+arch grass_only
+x 1
+y 15
+end
+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 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch flagstone
+x 2
+y 2
+end
+arch wall_2_2_2
+x 2
+y 2
+end
+arch flagstone
+x 2
+y 3
+end
+arch wall_2_1_1
+x 2
+y 3
+end
+arch flagstone
+x 2
+y 4
+end
+arch wall_2_1_1
+x 2
+y 4
+end
+arch flagstone
+x 2
+y 5
+end
+arch wall_2_1_1
+x 2
+y 5
+end
+arch light2
+x 2
+y 6
+end
+arch flagstone
+x 2
+y 6
+end
+arch window_win1
+x 2
+y 6
+end
+arch flagstone
+x 2
+y 7
+end
+arch wall_2_1_1
+x 2
+y 7
+end
+arch flagstone
+x 2
+y 8
+end
+arch wall_2_1_1
+x 2
+y 8
+end
+arch flagstone
+x 2
+y 9
+end
+arch wall_2_1_1
+x 2
+y 9
+end
+arch flagstone
+x 2
+y 10
+end
+arch wall_2_1_1
+x 2
+y 10
+end
+arch flagstone
+x 2
+y 11
+end
+arch wall_2_1_1
+x 2
+y 11
+end
+arch light2
+x 2
+y 12
+end
+arch flagstone
+x 2
+y 12
+end
+arch window_win1
+x 2
+y 12
+end
+arch flagstone
+x 2
+y 13
+end
 arch swall_1_4_half
-y 11
-end
-arch stwall_2_1_1
-y 11
-end
-arch flagstone
-y 12
-end
-arch stwall_2_1_1
-y 12
-end
-arch flagstone
+x 2
 y 13
 end
-arch stwall_2_1_1
+arch wall_2_1_1
+x 2
 y 13
 end
 arch flagstone
+x 2
 y 14
 end
-arch stwall_2_1_1
+arch wall_2_1_1
+x 2
 y 14
 end
 arch flagstone
+x 2
 y 15
 end
-arch stwall_2_2_1
+arch wall_2_1_1
+x 2
 y 15
 end
 arch flagstone
-x 1
+x 2
+y 16
 end
-arch stwall_2_1_2
-x 1
+arch wall_2_1_1
+x 2
+y 16
 end
-arch shop_armour
-x 1
+arch flagstone
+x 2
+y 17
+end
+arch wall_2_2_1
+x 2
+y 17
+end
+arch grass_only
+x 2
+y 18
+end
+arch grass_only
+x 2
+y 19
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
 y 1
 end
-arch shop_armour
-x 1
+arch flagstone
+x 3
+y 2
+end
+arch wall_2_1_2
+x 3
 y 2
 end
 arch shop_armour
-x 1
+x 3
 y 3
 end
 arch shop_armour
-x 1
+x 3
 y 4
 end
 arch shop_armour
-x 1
+x 3
 y 5
 end
 arch shop_armour
-x 1
+x 3
 y 6
 end
 arch shop_armour
-x 1
+x 3
 y 7
 end
 arch shop_armour
-x 1
+x 3
 y 8
 end
 arch shop_armour
-x 1
+x 3
 y 9
 end
 arch shop_armour
-x 1
+x 3
 y 10
 end
-arch flagstone
-x 1
+arch shop_armour
+x 3
 y 11
 end
-arch swall_2_1_2
-x 1
-y 11
-end
-arch flagstone
-x 1
+arch shop_armour
+x 3
 y 12
 end
 arch flagstone
-x 1
+x 3
 y 13
 end
-arch flagstone
-x 1
-y 14
-end
-arch flagstone
-x 1
-y 15
-end
-arch stwall_1_3
-x 1
-y 15
-end
-arch flagstone
-x 2
-end
-arch stwall_2_1_2
-x 2
-end
-arch shop_armour
-x 2
-y 1
-end
-arch shop_empty
-x 2
-y 2
-end
-arch shop_empty
-x 2
-y 3
-end
-arch shop_empty
-x 2
-y 4
-end
-arch shop_empty
-x 2
-y 5
-end
-arch shop_empty
-x 2
-y 6
-end
-arch shop_empty
-x 2
-y 7
-end
-arch shop_empty
-x 2
-y 8
-end
-arch shop_empty
-x 2
-y 9
-end
-arch shop_armour
-x 2
-y 10
-end
-arch flagstone
-x 2
-y 11
-end
 arch swall_2_1_2
-x 2
-y 11
-end
-arch flagstone
-x 2
-y 12
-end
-arch flagstone
-x 2
+x 3
 y 13
 end
 arch flagstone
-x 2
+x 3
 y 14
 end
 arch flagstone
-x 2
+x 3
 y 15
 end
-arch oakdoor_2
+arch button_small
+x 3
+y 16
+connected 1
+end
+arch flagstone
+x 3
+y 16
+end
+arch flagstone
+x 3
+y 17
+end
+arch wall_1_3
+x 3
+y 17
+end
+arch dungeon_magic
+x 3
+y 18
+end
+arch invis_exit
 slaying /world/world_102_108
 hp 18
 sp 6
-x 2
-y 15
-end
-arch flagstone
 x 3
+y 18
 end
-arch stwall_2_1_2
+arch cobblestones
 x 3
+y 18
 end
-arch shop_armour
+arch grass_only
 x 3
+y 19
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch shop_empty
-x 3
+arch flagstone
+x 4
+y 2
+end
+arch wall_2_1_2
+x 4
 y 2
 end
 arch shop_armour
-x 3
+x 4
 y 3
 end
-arch shop_armour
-x 3
+arch light4
+x 4
 y 4
 end
 arch shop_empty
-x 3
+x 4
+y 4
+end
+arch shop_empty
+x 4
 y 5
 end
-arch shop_armour
-x 3
+arch shop_empty
+x 4
 y 6
 end
-arch shop_armour
-x 3
+arch light4
+x 4
 y 7
 end
-arch shop_armour
-x 3
+arch shop_empty
+x 4
+y 7
+end
+arch shop_empty
+x 4
 y 8
 end
 arch shop_empty
-x 3
+x 4
 y 9
 end
-arch shop_armour
-x 3
+arch light4
+x 4
 y 10
 end
-arch flagstone
-x 3
+arch shop_empty
+x 4
+y 10
+end
+arch light4
+x 4
 y 11
 end
+arch shop_empty
+x 4
+y 11
+end
+arch shop_empty
+x 4
+y 12
+end
+arch flagstone
+x 4
+y 13
+end
 arch swall_2_1_2
-x 3
-y 11
+x 4
+y 13
 end
 arch flagstone
-x 3
-y 12
+x 4
+y 14
 end
 arch menu
-x 3
-y 12
-end
-arch flagstone
-x 3
-y 13
-end
-arch flagstone
-x 3
+x 4
 y 14
 end
-arch shop_mat
-x 3
-y 14
-end
-arch flagstone
-x 3
-y 15
-end
-arch stwall_1_4
-x 3
+arch light4
+x 4
 y 15
 end
 arch flagstone
 x 4
+y 15
 end
-arch stwall_2_1_2
+arch button_small
 x 4
+y 16
+connected 1
 end
-arch shop_armour
+arch flagstone
 x 4
+y 16
+end
+arch button_small
+x 4
+y 17
+connected 1
+end
+arch flagstone
+x 4
+y 17
+end
+arch odoorn2_closed_1
+x 4
+y 17
+connected 1
+end
+arch dungeon_magic
+x 4
+y 18
+end
+arch invis_exit
+slaying /world/world_102_108
+hp 18
+sp 6
+x 4
+y 18
+end
+arch cobblestones
+x 4
+y 18
+end
+arch cobblestones
+x 4
+y 19
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
-arch shop_empty
-x 4
+arch light2
+x 5
+y 2
+end
+arch flagstone
+x 5
+y 2
+end
+arch window_win2
+x 5
 y 2
 end
 arch shop_armour
-x 4
+x 5
 y 3
 end
-arch shop_armour
-x 4
+arch shop_empty
+x 5
 y 4
 end
-arch shop_empty
-x 4
+arch shop_armour
+x 5
 y 5
 end
 arch shop_armour
-x 4
+x 5
 y 6
 end
-arch shop_armour
-x 4
+arch shop_empty
+x 5
 y 7
 end
 arch shop_armour
-x 4
+x 5
 y 8
 end
-arch shop_empty
-x 4
+arch shop_armour
+x 5
 y 9
 end
 arch shop_armour
-x 4
+x 5
 y 10
 end
-arch flagstone
-x 4
+arch shop_empty
+x 5
 y 11
 end
+arch shop_empty
+x 5
+y 12
+end
+arch shop_mat
+x 5
+y 12
+end
+arch flagstone
+x 5
+y 13
+end
+arch swall_2_1_2
+x 5
+y 13
+end
+arch flagstone
+x 5
+y 14
+end
+arch shop_mat
+x 5
+y 14
+end
+arch flagstone
+x 5
+y 15
+end
+arch button_small
+x 5
+y 16
+connected 1
+end
+arch flagstone
+x 5
+y 16
+end
+arch flagstone
+x 5
+y 17
+end
+arch wall_1_4
+x 5
+y 17
+end
+arch dungeon_magic
+x 5
+y 18
+end
+arch invis_exit
+slaying /world/world_102_108
+hp 18
+sp 6
+x 5
+y 18
+end
+arch cobblestones
+x 5
+y 18
+end
+arch grass_only
+x 5
+y 19
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch flagstone
+x 6
+y 2
+end
+arch wall_2_1_2
+x 6
+y 2
+end
+arch shop_armour
+x 6
+y 3
+end
+arch shop_empty
+x 6
+y 4
+end
+arch shop_armour
+x 6
+y 5
+end
+arch shop_armour
+x 6
+y 6
+end
+arch shop_empty
+x 6
+y 7
+end
+arch shop_armour
+x 6
+y 8
+end
+arch shop_armour
+x 6
+y 9
+end
+arch shop_armour
+x 6
+y 10
+end
+arch shop_empty
+x 6
+y 11
+end
+arch shop_empty
+x 6
+y 12
+end
+arch flagstone
+x 6
+y 13
+end
 arch swall_2_2_3
-x 4
-y 11
-end
-arch flagstone
-x 4
-y 12
-end
-arch swall_2_1_1
-x 4
-y 12
-end
-arch flagstone
-x 4
-y 13
-end
-arch swall_2_1_1
-x 4
+x 6
 y 13
 end
 arch flagstone
-x 4
+x 6
 y 14
 end
 arch swall_2_1_1
-x 4
+x 6
 y 14
 end
 arch flagstone
-x 4
+x 6
 y 15
 end
+arch swall_2_1_1
+x 6
+y 15
+end
+arch flagstone
+x 6
+y 16
+end
+arch swall_2_1_1
+x 6
+y 16
+end
+arch flagstone
+x 6
+y 17
+end
 arch swall_1_2_half
-x 4
-y 15
+x 6
+y 17
 end
-arch stwall_2_1_2
-x 4
-y 15
+arch wall_2_1_2
+x 6
+y 17
 end
-arch flagstone
-x 5
+arch grass_only
+x 6
+y 18
 end
-arch stwall_2_1_2
-x 5
+arch grass_only
+x 6
+y 19
 end
-arch shop_armour
-x 5
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
-arch shop_empty
-x 5
+arch flagstone
+x 7
 y 2
 end
-arch shop_armour
-x 5
-y 3
-end
-arch shop_armour
-x 5
-y 4
-end
-arch shop_empty
-x 5
-y 5
-end
-arch shop_armour
-x 5
-y 6
-end
-arch shop_armour
-x 5
-y 7
-end
-arch shop_empty
-x 5
-y 8
-end
-arch shop_empty
-x 5
-y 9
-end
-arch shop_empty
-x 5
-y 10
-end
-arch shop_empty
-x 5
-y 11
-end
-arch shop_empty
-x 5
-y 12
-end
-arch shop_empty
-x 5
-y 13
-end
-arch shop_empty
-x 5
-y 14
-end
-arch shop_mat
-x 5
-y 14
-end
-arch flagstone
-x 5
-y 15
-end
-arch stwall_2_1_2
-x 5
-y 15
-end
-arch flagstone
-x 6
-end
-arch stwall_2_1_2
-x 6
-end
-arch shop_armour
-x 6
-y 1
-end
-arch shop_empty
-x 6
-y 2
-end
-arch shop_armour
-x 6
-y 3
-end
-arch shop_armour
-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 shop_empty
-x 6
-y 14
-end
-arch flagstone
-x 6
-y 15
-end
-arch stwall_2_1_2
-x 6
-y 15
-end
-arch flagstone
-x 7
-end
-arch stwall_2_1_2
-x 7
-end
-arch shop_armour
-x 7
-y 1
-end
-arch shop_empty
+arch wall_2_1_2
 x 7
 y 2
 end
@@ -595,11 +796,11 @@ arch shop_armour
 x 7
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 7
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 7
 y 5
 end
@@ -607,11 +808,11 @@ arch shop_armour
 x 7
 y 6
 end
-arch shop_armour
+arch shop_empty
 x 7
 y 7
 end
-arch shop_empty
+arch shop_armour
 x 7
 y 8
 end
@@ -619,19 +820,19 @@ arch shop_armour
 x 7
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 7
 y 10
 end
-arch shop_armour
+arch shop_empty
 x 7
 y 11
 end
-arch shop_armour
+arch shop_empty
 x 7
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 7
 y 13
 end
@@ -639,25 +840,42 @@ arch shop_armour
 x 7
 y 14
 end
-arch flagstone
+arch shop_armour
 x 7
 y 15
 end
-arch stwall_2_1_2
-x 7
-y 15
-end
-arch flagstone
-x 8
-end
-arch stwall_2_1_2
-x 8
-end
 arch shop_armour
+x 7
+y 16
+end
+arch flagstone
+x 7
+y 17
+end
+arch wall_2_1_2
+x 7
+y 17
+end
+arch grass_only
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 19
+end
+arch grass_only
+x 8
+end
+arch grass_only
 x 8
 y 1
 end
-arch shop_empty
+arch flagstone
+x 8
+y 2
+end
+arch wall_2_1_2
 x 8
 y 2
 end
@@ -665,11 +883,11 @@ arch shop_armour
 x 8
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 8
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 8
 y 5
 end
@@ -677,7 +895,7 @@ arch shop_armour
 x 8
 y 6
 end
-arch shop_armour
+arch shop_empty
 x 8
 y 7
 end
@@ -685,19 +903,23 @@ arch shop_empty
 x 8
 y 8
 end
-arch shop_armour
+arch shop_empty
 x 8
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 8
 y 10
 end
-arch shop_armour
+arch light4
 x 8
 y 11
 end
-arch shop_armour
+arch shop_empty
+x 8
+y 11
+end
+arch shop_empty
 x 8
 y 12
 end
@@ -705,29 +927,62 @@ arch shop_empty
 x 8
 y 13
 end
-arch shop_armour
+arch shop_empty
 x 8
 y 14
 end
-arch flagstone
+arch light4
 x 8
 y 15
 end
-arch stwall_2_1_2
+arch shop_empty
 x 8
 y 15
 end
-arch flagstone
-x 9
-end
-arch stwall_2_1_2
-x 9
+arch shop_empty
+x 8
+y 16
 end
 arch shop_armour
+x 8
+y 16
+end
+arch light2
+x 8
+y 17
+end
+arch flagstone
+x 8
+y 17
+end
+arch window_win2
+x 8
+y 17
+end
+arch grass_only
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 19
+end
+arch grass_only
+x 9
+end
+arch grass_only
 x 9
 y 1
 end
-arch shop_empty
+arch light2
+x 9
+y 2
+end
+arch flagstone
+x 9
+y 2
+end
+arch window_win2
 x 9
 y 2
 end
@@ -735,11 +990,11 @@ arch shop_armour
 x 9
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 9
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 9
 y 5
 end
@@ -747,11 +1002,11 @@ arch shop_armour
 x 9
 y 6
 end
-arch shop_armour
+arch shop_empty
 x 9
 y 7
 end
-arch shop_empty
+arch shop_armour
 x 9
 y 8
 end
@@ -759,7 +1014,7 @@ arch shop_armour
 x 9
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 9
 y 10
 end
@@ -771,7 +1026,7 @@ arch shop_armour
 x 9
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 9
 y 13
 end
@@ -779,25 +1034,42 @@ arch shop_armour
 x 9
 y 14
 end
-arch flagstone
+arch shop_empty
 x 9
 y 15
 end
-arch stwall_2_1_2
-x 9
-y 15
-end
-arch flagstone
-x 10
-end
-arch stwall_2_1_2
-x 10
-end
 arch shop_armour
+x 9
+y 16
+end
+arch flagstone
+x 9
+y 17
+end
+arch wall_2_1_2
+x 9
+y 17
+end
+arch grass_only
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 19
+end
+arch grass_only
+x 10
+end
+arch grass_only
 x 10
 y 1
 end
-arch shop_empty
+arch flagstone
+x 10
+y 2
+end
+arch wall_2_1_2
 x 10
 y 2
 end
@@ -805,27 +1077,31 @@ arch shop_armour
 x 10
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 10
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 5
 end
-arch shop_armour
+arch light4
 x 10
 y 6
 end
 arch shop_armour
 x 10
-y 7
+y 6
 end
 arch shop_empty
 x 10
+y 7
+end
+arch shop_armour
+x 10
 y 8
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 9
 end
@@ -833,41 +1109,66 @@ arch shop_empty
 x 10
 y 10
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 11
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 10
 y 13
 end
+arch light4
+x 10
+y 14
+end
 arch shop_armour
 x 10
 y 14
 end
-arch flagstone
+arch shop_empty
 x 10
 y 15
 end
-arch stwall_2_1_2
-x 10
-y 15
-end
-arch flagstone
-x 11
-end
-arch stwall_2_1_2
-x 11
-end
 arch shop_armour
+x 10
+y 16
+end
+arch flagstone
+x 10
+y 17
+end
+arch wall_2_1_2
+x 10
+y 17
+end
+arch grass_only
+x 10
+y 18
+end
+arch grass_only
+x 10
+y 19
+end
+arch grass_only
+x 11
+end
+arch grass_only
 x 11
 y 1
 end
-arch shop_empty
+arch light1
+x 11
+y 2
+end
+arch flagstone
+x 11
+y 2
+end
+arch wall_2_1_2
 x 11
 y 2
 end
@@ -875,11 +1176,11 @@ arch shop_armour
 x 11
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 11
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 11
 y 5
 end
@@ -887,11 +1188,11 @@ arch shop_armour
 x 11
 y 6
 end
-arch shop_armour
+arch shop_empty
 x 11
 y 7
 end
-arch shop_empty
+arch shop_armour
 x 11
 y 8
 end
@@ -899,7 +1200,7 @@ arch shop_armour
 x 11
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 11
 y 10
 end
@@ -911,7 +1212,7 @@ arch shop_armour
 x 11
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 11
 y 13
 end
@@ -919,25 +1220,42 @@ arch shop_armour
 x 11
 y 14
 end
-arch flagstone
+arch shop_empty
 x 11
 y 15
 end
-arch stwall_2_1_2
-x 11
-y 15
-end
-arch flagstone
-x 12
-end
-arch stwall_2_1_2
-x 12
-end
 arch shop_armour
+x 11
+y 16
+end
+arch flagstone
+x 11
+y 17
+end
+arch wall_2_1_2
+x 11
+y 17
+end
+arch grass_only
+x 11
+y 18
+end
+arch grass_only
+x 11
+y 19
+end
+arch grass_only
+x 12
+end
+arch grass_only
 x 12
 y 1
 end
-arch shop_empty
+arch flagstone
+x 12
+y 2
+end
+arch wall_2_1_2
 x 12
 y 2
 end
@@ -945,11 +1263,11 @@ arch shop_armour
 x 12
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 12
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 12
 y 5
 end
@@ -957,11 +1275,11 @@ arch shop_armour
 x 12
 y 6
 end
-arch shop_armour
+arch shop_empty
 x 12
 y 7
 end
-arch shop_empty
+arch shop_armour
 x 12
 y 8
 end
@@ -969,15 +1287,19 @@ arch shop_armour
 x 12
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 12
 y 10
 end
-arch shop_armour
+arch light4
 x 12
 y 11
 end
-arch shop_armour
+arch shop_empty
+x 12
+y 11
+end
+arch shop_empty
 x 12
 y 12
 end
@@ -985,33 +1307,54 @@ arch shop_empty
 x 12
 y 13
 end
-arch shop_armour
+arch shop_empty
 x 12
 y 14
 end
-arch flagstone
+arch shop_empty
 x 12
 y 15
 end
-arch stwall_2_1_2
-x 12
-y 15
-end
-arch flagstone
-x 13
-end
-arch stwall_2_1_2
-x 13
-end
 arch shop_armour
+x 12
+y 16
+end
+arch flagstone
+x 12
+y 17
+end
+arch wall_2_1_2
+x 12
+y 17
+end
+arch grass_only
+x 12
+y 18
+end
+arch grass_only
+x 12
+y 19
+end
+arch grass_only
+x 13
+end
+arch grass_only
 x 13
 y 1
 end
-arch shop_empty
+arch light2
 x 13
 y 2
 end
-arch shop_empty
+arch flagstone
+x 13
+y 2
+end
+arch window_win2
+x 13
+y 2
+end
+arch shop_armour
 x 13
 y 3
 end
@@ -1019,11 +1362,11 @@ arch shop_empty
 x 13
 y 4
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 5
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 6
 end
@@ -1031,11 +1374,11 @@ arch shop_empty
 x 13
 y 7
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 8
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 9
 end
@@ -1043,41 +1386,62 @@ arch shop_empty
 x 13
 y 10
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 11
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 12
 end
-arch shop_empty
+arch shop_armour
 x 13
 y 13
 end
+arch light4
+x 13
+y 14
+end
 arch shop_armour
 x 13
 y 14
 end
-arch flagstone
+arch shop_empty
 x 13
 y 15
 end
-arch stwall_2_1_2
-x 13
-y 15
-end
-arch flagstone
-x 14
-end
-arch stwall_2_1_2
-x 14
-end
 arch shop_armour
+x 13
+y 16
+end
+arch flagstone
+x 13
+y 17
+end
+arch wall_2_1_2
+x 13
+y 17
+end
+arch grass_only
+x 13
+y 18
+end
+arch grass_only
+x 13
+y 19
+end
+arch grass_only
+x 14
+end
+arch grass_only
 x 14
 y 1
 end
-arch shop_armour
+arch flagstone
+x 14
+y 2
+end
+arch wall_2_1_2
 x 14
 y 2
 end
@@ -1085,7 +1449,7 @@ arch shop_armour
 x 14
 y 3
 end
-arch shop_armour
+arch shop_empty
 x 14
 y 4
 end
@@ -1097,7 +1461,7 @@ arch shop_armour
 x 14
 y 6
 end
-arch shop_armour
+arch shop_empty
 x 14
 y 7
 end
@@ -1109,7 +1473,7 @@ arch shop_armour
 x 14
 y 9
 end
-arch shop_armour
+arch shop_empty
 x 14
 y 10
 end
@@ -1129,25 +1493,38 @@ arch shop_armour
 x 14
 y 14
 end
-arch flagstone
+arch shop_empty
 x 14
 y 15
 end
-arch stwall_2_1_2
+arch shop_armour
 x 14
-y 15
+y 16
+end
+arch light2
+x 14
+y 17
 end
 arch flagstone
+x 14
+y 17
+end
+arch window_win2
+x 14
+y 17
+end
+arch grass_only
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch grass_only
 x 15
 end
-arch stwall_2_2_3
-x 15
-end
-arch flagstone
-x 15
-y 1
-end
-arch stwall_2_1_1
+arch grass_only
 x 15
 y 1
 end
@@ -1155,111 +1532,491 @@ arch flagstone
 x 15
 y 2
 end
-arch stwall_2_1_1
+arch wall_2_1_2
 x 15
 y 2
 end
-arch flagstone
+arch shop_armour
 x 15
 y 3
 end
-arch stwall_2_1_1
+arch light4
 x 15
+y 4
+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 light4
+x 15
+y 7
+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 light4
+x 15
+y 10
+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_empty
+x 15
+y 13
+end
+arch shop_empty
+x 15
+y 14
+end
+arch light4
+x 15
+y 15
+end
+arch shop_empty
+x 15
+y 15
+end
+arch shop_armour
+x 15
+y 16
+end
+arch flagstone
+x 15
+y 17
+end
+arch wall_2_1_2
+x 15
+y 17
+end
+arch grass_only
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch flagstone
+x 16
+y 2
+end
+arch wall_2_1_2
+x 16
+y 2
+end
+arch shop_armour
+x 16
+y 3
+end
+arch shop_armour
+x 16
+y 4
+end
+arch shop_armour
+x 16
+y 5
+end
+arch shop_armour
+x 16
+y 6
+end
+arch shop_armour
+x 16
+y 7
+end
+arch shop_armour
+x 16
+y 8
+end
+arch shop_armour
+x 16
+y 9
+end
+arch shop_armour
+x 16
+y 10
+end
+arch shop_armour
+x 16
+y 11
+end
+arch shop_armour
+x 16
+y 12
+end
+arch shop_armour
+x 16
+y 13
+end
+arch shop_armour
+x 16
+y 14
+end
+arch shop_armour
+x 16
+y 15
+end
+arch shop_armour
+x 16
+y 16
+end
+arch flagstone
+x 16
+y 17
+end
+arch wall_2_1_2
+x 16
+y 17
+end
+arch grass_only
+x 16
+y 18
+end
+arch grass_only
+x 16
+y 19
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch flagstone
+x 17
+y 2
+end
+arch wall_2_2_3
+x 17
+y 2
+end
+arch flagstone
+x 17
+y 3
+end
+arch wall_2_1_1
+x 17
 y 3
 end
 arch flagstone
-x 15
+x 17
 y 4
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 4
 end
 arch flagstone
-x 15
+x 17
 y 5
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 5
 end
-arch flagstone
-x 15
-y 6
-end
-arch stwall_2_1_1
-x 15
+arch light2
+x 17
 y 6
 end
 arch flagstone
-x 15
+x 17
+y 6
+end
+arch window_win1
+x 17
+y 6
+end
+arch flagstone
+x 17
 y 7
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 7
 end
 arch flagstone
-x 15
+x 17
 y 8
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 8
 end
 arch flagstone
-x 15
+x 17
 y 9
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 9
 end
 arch flagstone
-x 15
+x 17
 y 10
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 10
 end
 arch flagstone
-x 15
+x 17
 y 11
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 11
 end
-arch flagstone
-x 15
-y 12
-end
-arch stwall_2_1_1
-x 15
+arch light2
+x 17
 y 12
 end
 arch flagstone
-x 15
+x 17
+y 12
+end
+arch window_win1
+x 17
+y 12
+end
+arch flagstone
+x 17
 y 13
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 13
 end
 arch flagstone
-x 15
+x 17
 y 14
 end
-arch stwall_2_1_1
-x 15
+arch wall_2_1_1
+x 17
 y 14
 end
 arch flagstone
-x 15
+x 17
 y 15
 end
-arch stwall_2_2_4
-x 15
+arch wall_2_1_1
+x 17
 y 15
 end
+arch flagstone
+x 17
+y 16
+end
+arch wall_2_1_1
+x 17
+y 16
+end
+arch flagstone
+x 17
+y 17
+end
+arch wall_2_2_4
+x 17
+y 17
+end
+arch grass_only
+x 17
+y 18
+end
+arch grass_only
+x 17
+y 19
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch grass_only
+x 18
+y 2
+end
+arch grass_only
+x 18
+y 3
+end
+arch grass_only
+x 18
+y 4
+end
+arch grass_only
+x 18
+y 5
+end
+arch grass_only
+x 18
+y 6
+end
+arch grass_only
+x 18
+y 7
+end
+arch grass_only
+x 18
+y 8
+end
+arch grass_only
+x 18
+y 9
+end
+arch grass_only
+x 18
+y 10
+end
+arch grass_only
+x 18
+y 11
+end
+arch grass_only
+x 18
+y 12
+end
+arch grass_only
+x 18
+y 13
+end
+arch grass_only
+x 18
+y 14
+end
+arch grass_only
+x 18
+y 15
+end
+arch grass_only
+x 18
+y 16
+end
+arch grass_only
+x 18
+y 17
+end
+arch grass_only
+x 18
+y 18
+end
+arch grass_only
+x 18
+y 19
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch grass_only
+x 19
+y 2
+end
+arch grass_only
+x 19
+y 3
+end
+arch grass_only
+x 19
+y 4
+end
+arch grass_only
+x 19
+y 5
+end
+arch grass_only
+x 19
+y 6
+end
+arch grass_only
+x 19
+y 7
+end
+arch grass_only
+x 19
+y 8
+end
+arch grass_only
+x 19
+y 9
+end
+arch grass_only
+x 19
+y 10
+end
+arch grass_only
+x 19
+y 11
+end
+arch grass_only
+x 19
+y 12
+end
+arch grass_only
+x 19
+y 13
+end
+arch grass_only
+x 19
+y 14
+end
+arch grass_only
+x 19
+y 15
+end
+arch grass_only
+x 19
+y 16
+end
+arch grass_only
+x 19
+y 17
+end
+arch grass_only
+x 19
+y 18
+end
+arch grass_only
+x 19
+y 19
+end
diff --git a/world/world_102_108 b/world/world_102_108
index bec7a0f2a..17173fcc3 100644
--- a/world/world_102_108
+++ b/world/world_102_108
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-02-19
-Modified: 2008-12-08 Rick Tanner
+Modified: 2011-04-16 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_102_107
@@ -4307,8 +4307,8 @@ end
 arch store_armour
 name Hanz und Franz Panzer
 slaying /santo_dominion/shops/armour
-hp 2
-sp 14
+hp 4
+sp 15
 x 18
 y 5
 end