diff --git a/marksel/shop b/marksel/shop
index e9dcf1290..5f7688b15 100644
--- a/marksel/shop
+++ b/marksel/shop
@@ -5,42 +5,77 @@ Creator: King Zoobus
 Email: gnu@foo.bar
 Date: Wed Jan 27 18:57:19 1999
 endmsg
-difficulty 4
 width 11
 height 11
+difficulty 4
+end
+arch woodfloor
 end
 arch wall_2_2_2
 end
+arch woodfloor
+y 1
+end
 arch wall_2_1_1
 y 1
 end
+arch woodfloor
+y 2
+end
 arch wall_2_1_1
 y 2
 end
+arch woodfloor
+y 3
+end
 arch wall_3_2
 y 3
 end
+arch woodfloor
+y 4
+end
 arch wall_2_1_1
 y 4
 end
+arch woodfloor
+y 5
+end
 arch wall_2_1_1
 y 5
 end
+arch woodfloor
+y 6
+end
 arch wall_2_1_1
 y 6
 end
+arch woodfloor
+y 7
+end
 arch wall_2_1_1
 y 7
 end
+arch woodfloor
+y 8
+end
 arch wall_2_1_1
 y 8
 end
+arch woodfloor
+y 9
+end
 arch wall_2_1_1
 y 9
 end
+arch woodfloor
+y 10
+end
 arch wall_2_2_1
 y 10
 end
+arch woodfloor
+x 1
+end
 arch wall_2_1_2
 x 1
 end
@@ -97,11 +132,18 @@ arch shop_ring
 x 1
 y 9
 end
-arch wall_2_1_2
+arch woodfloor
 x 1
 y 10
 end
 arch wall_2_1_2
+x 1
+y 10
+end
+arch woodfloor
+x 2
+end
+arch wall_1_3
 x 2
 end
 arch woodfloor
@@ -116,30 +158,34 @@ arch wall_2_1_2
 x 2
 y 3
 end
-arch woodfloor
+arch shop_empty
 x 2
 y 4
 end
-arch woodfloor
+arch shop_empty
 x 2
 y 5
 end
-arch woodfloor
+arch shop_empty
 x 2
 y 6
 end
-arch woodfloor
+arch shop_empty
 x 2
 y 7
 end
-arch woodfloor
+arch shop_empty
 x 2
 y 8
 end
-arch woodfloor
+arch shop_empty
 x 2
 y 9
 end
+arch woodfloor
+x 2
+y 10
+end
 arch wall_2_1_2
 x 2
 y 10
@@ -169,7 +215,7 @@ arch shop_food
 x 3
 y 4
 end
-arch woodfloor
+arch shop_empty
 x 3
 y 5
 end
@@ -177,7 +223,7 @@ arch shop_food
 x 3
 y 6
 end
-arch woodfloor
+arch shop_empty
 x 3
 y 7
 end
@@ -189,11 +235,18 @@ arch shop_books
 x 3
 y 9
 end
-arch wall_2_1_2
+arch woodfloor
 x 3
 y 10
 end
 arch wall_2_1_2
+x 3
+y 10
+end
+arch woodfloor
+x 4
+end
+arch wall_1_4
 x 4
 end
 arch woodfloor
@@ -208,11 +261,11 @@ arch wall_2_1_2
 x 4
 y 3
 end
-arch woodfloor
+arch shop_empty
 x 4
 y 4
 end
-arch woodfloor
+arch shop_empty
 x 4
 y 5
 end
@@ -220,22 +273,29 @@ arch shop_food
 x 4
 y 6
 end
-arch woodfloor
+arch shop_empty
 x 4
 y 7
 end
-arch woodfloor
+arch shop_empty
 x 4
 y 8
 end
-arch woodfloor
+arch shop_empty
 x 4
 y 9
 end
+arch woodfloor
+x 4
+y 10
+end
 arch wall_2_1_2
 x 4
 y 10
 end
+arch woodfloor
+x 5
+end
 arch wall_2_1_2
 x 5
 end
@@ -255,7 +315,7 @@ arch wall_2_1_2
 x 5
 y 3
 end
-arch woodfloor
+arch shop_empty
 x 5
 y 4
 end
@@ -263,7 +323,7 @@ arch shop_mat
 x 5
 y 4
 end
-arch woodfloor
+arch shop_empty
 x 5
 y 5
 end
@@ -271,7 +331,7 @@ arch shop_food
 x 5
 y 6
 end
-arch woodfloor
+arch shop_empty
 x 5
 y 7
 end
@@ -283,10 +343,17 @@ arch shop_amulets
 x 5
 y 9
 end
+arch woodfloor
+x 5
+y 10
+end
 arch wall_2_1_2
 x 5
 y 10
 end
+arch woodfloor
+x 6
+end
 arch wall_2_1_2
 x 6
 end
@@ -302,11 +369,11 @@ arch wall_2_1_2
 x 6
 y 3
 end
-arch woodfloor
+arch shop_empty
 x 6
 y 4
 end
-arch woodfloor
+arch shop_empty
 x 6
 y 5
 end
@@ -314,7 +381,7 @@ arch shop_food
 x 6
 y 6
 end
-arch woodfloor
+arch shop_empty
 x 6
 y 7
 end
@@ -326,10 +393,17 @@ arch shop_amulets
 x 6
 y 9
 end
+arch woodfloor
+x 6
+y 10
+end
 arch wall_2_1_2
 x 6
 y 10
 end
+arch woodfloor
+x 7
+end
 arch wall_2_1_2
 x 7
 end
@@ -349,7 +423,7 @@ arch shop_food
 x 7
 y 4
 end
-arch woodfloor
+arch shop_empty
 x 7
 y 5
 end
@@ -357,22 +431,29 @@ arch shop_food
 x 7
 y 6
 end
-arch woodfloor
+arch shop_empty
 x 7
 y 7
 end
-arch woodfloor
+arch shop_empty
 x 7
 y 8
 end
-arch woodfloor
+arch shop_empty
 x 7
 y 9
 end
+arch woodfloor
+x 7
+y 10
+end
 arch wall_2_1_2
 x 7
 y 10
 end
+arch woodfloor
+x 8
+end
 arch wall_2_1_2
 x 8
 end
@@ -396,19 +477,19 @@ arch wall_2_1_2
 x 8
 y 3
 end
-arch woodfloor
+arch shop_empty
 x 8
 y 4
 end
-arch woodfloor
+arch shop_empty
 x 8
 y 5
 end
-arch woodfloor
+arch shop_empty
 x 8
 y 6
 end
-arch woodfloor
+arch shop_empty
 x 8
 y 7
 end
@@ -420,10 +501,17 @@ arch shop_armour
 x 8
 y 9
 end
+arch woodfloor
+x 8
+y 10
+end
 arch wall_2_1_2
 x 8
 y 10
 end
+arch woodfloor
+x 9
+end
 arch wall_2_1_2
 x 9
 end
@@ -482,49 +570,96 @@ arch shop_weapon
 x 9
 y 9
 end
+arch woodfloor
+x 9
+y 10
+end
 arch wall_2_1_2
 x 9
 y 10
 end
+arch woodfloor
+x 10
+end
 arch wall_2_2_3
 x 10
 end
-arch wall_2_1_1
+arch woodfloor
 x 10
 y 1
 end
 arch wall_2_1_1
 x 10
+y 1
+end
+arch woodfloor
+x 10
 y 2
 end
+arch wall_2_1_1
+x 10
+y 2
+end
+arch woodfloor
+x 10
+y 3
+end
 arch wall_3_4
 x 10
 y 3
 end
-arch wall_2_1_1
+arch woodfloor
 x 10
 y 4
 end
 arch wall_2_1_1
 x 10
+y 4
+end
+arch woodfloor
+x 10
 y 5
 end
 arch wall_2_1_1
 x 10
+y 5
+end
+arch woodfloor
+x 10
 y 6
 end
 arch wall_2_1_1
 x 10
+y 6
+end
+arch woodfloor
+x 10
 y 7
 end
 arch wall_2_1_1
 x 10
+y 7
+end
+arch woodfloor
+x 10
 y 8
 end
 arch wall_2_1_1
 x 10
+y 8
+end
+arch woodfloor
+x 10
 y 9
 end
+arch wall_2_1_1
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 10
+end
 arch wall_2_2_4
 x 10
 y 10