diff --git a/mlab/citydeclouds/shops/cwdcgenshop1 b/mlab/citydeclouds/shops/cwdcgenshop1
index ee3ac5eee..e43c0c941 100644
--- a/mlab/citydeclouds/shops/cwdcgenshop1
+++ b/mlab/citydeclouds/shops/cwdcgenshop1
@@ -3398,13 +3398,10 @@ face shop_empty.111
 x 12
 y 15
 end
-arch swall_2_2_2
-x 12
-y 15
-end
 arch longtable_2_2_2
 x 12
 y 15
+move_block all
 end
 arch dungeon_magic
 x 12
@@ -3416,13 +3413,10 @@ face shop_empty.111
 x 12
 y 16
 end
-arch swall_2_1_1
-x 12
-y 16
-end
 arch longtable_2_1_1
 x 12
 y 16
+move_block all
 end
 arch dungeon_magic
 x 12
@@ -3434,13 +3428,14 @@ face shop_empty.111
 x 12
 y 17
 end
-arch swall_3_2
+arch swall_1_1_half
 x 12
 y 17
 end
 arch longtable_2_2_1
 x 12
 y 17
+move_block all
 end
 arch dungeon_magic
 x 12
@@ -3695,13 +3690,10 @@ face shop_empty.111
 x 13
 y 15
 end
-arch swall_2_1_2
-x 13
-y 15
-end
 arch longtable_2_1_2
 x 13
 y 15
+move_block all
 end
 arch dungeon_magic
 x 13
@@ -3723,13 +3715,10 @@ face shop_empty.111
 x 13
 y 17
 end
-arch swall_2_1_2
-x 13
-y 17
-end
 arch longtable_2_1_2
 x 13
 y 17
+move_block all
 end
 arch dungeon_magic
 x 13
@@ -3960,13 +3949,10 @@ face shop_empty.111
 x 14
 y 15
 end
-arch swall_2_1_2
-x 14
-y 15
-end
 arch longtable_2_1_2
 x 14
 y 15
+move_block all
 end
 arch dungeon_magic
 x 14
@@ -3992,13 +3978,10 @@ face shop_empty.111
 x 14
 y 17
 end
-arch swall_2_1_2
-x 14
-y 17
-end
 arch longtable_2_1_2
 x 14
 y 17
+move_block all
 end
 arch dungeon_magic
 x 14
@@ -4249,13 +4232,10 @@ face shop_empty.111
 x 15
 y 15
 end
-arch swall_2_2_3
-x 15
-y 15
-end
 arch longtable_2_2_3
 x 15
 y 15
+move_block all
 end
 arch dungeon_magic
 x 15
@@ -4267,13 +4247,10 @@ face shop_empty.111
 x 15
 y 16
 end
-arch swall_2_1_1
-x 15
-y 16
-end
 arch longtable_2_1_1
 x 15
 y 16
+move_block all
 end
 arch dungeon_magic
 x 15
@@ -4285,13 +4262,14 @@ face shop_empty.111
 x 15
 y 17
 end
-arch swall_3_4
+arch swall_1_1_half
 x 15
 y 17
 end
 arch longtable_2_2_4
 x 15
 y 17
+move_block all
 end
 arch dungeon_magic
 x 15