diff --git a/quests/greyshield/Doors b/quests/greyshield/Doors
index 2cba47693..8a0d5677e 100644
--- a/quests/greyshield/Doors
+++ b/quests/greyshield/Doors
@@ -1,5 +1,5 @@
 arch map
-name <unnamed>
+name Doors
 width 16
 height 9
 enter_y 4
diff --git a/quests/greyshield/Finish b/quests/greyshield/Finish
index b38f0df8d..93673e72c 100644
--- a/quests/greyshield/Finish
+++ b/quests/greyshield/Finish
@@ -11,53 +11,100 @@ Email:
 Date: Sat Oct 26 16:06:45 1996
 endmsg
 end
+arch marble
+end
 arch flagstone_2_2_2
 end
+arch marble
+y 1
+end
 arch flagstone_2_1_1
 y 1
 end
+arch marble
+y 2
+end
 arch flagstone_2_1_1
 y 2
 end
+arch marble
+y 3
+end
 arch flagstone_2_1_1
 y 3
 end
+arch marble
+y 4
+end
 arch flagstone_2_1_1
 y 4
 end
+arch marble
+y 5
+end
 arch flagstone_2_1_1
 y 5
 end
+arch marble
+y 6
+end
 arch flagstone_2_1_1
 y 6
 end
+arch marble
+y 7
+end
 arch flagstone_2_1_1
 y 7
 end
+arch marble
+y 8
+end
 arch flagstone_2_1_1
 y 8
 end
+arch marble
+y 9
+end
 arch flagstone_2_1_1
 y 9
 end
+arch marble
+y 10
+end
 arch flagstone_2_1_1
 y 10
 end
+arch marble
+y 11
+end
 arch flagstone_2_1_1
 y 11
 end
-arch flagstone_2_1_1
+arch marble
 y 12
 end
 arch flagstone_2_1_1
+y 12
+end
+arch marble
 y 13
 end
+arch flagstone_2_1_1
+y 13
+end
+arch marble
+y 14
+end
 arch flagstone_3_2
 y 14
 end
 arch blocked
 y 15
 end
+arch marble
+x 1
+end
 arch flagstone_2_1_2
 x 1
 end
@@ -205,6 +252,10 @@ sp 45
 x 1
 y 13
 end
+arch marble
+x 1
+y 14
+end
 arch flagstone_2_1_2
 x 1
 y 14
@@ -213,6 +264,9 @@ arch blocked
 x 1
 y 15
 end
+arch marble
+x 2
+end
 arch flagstone_2_1_2
 x 2
 end
@@ -351,6 +405,10 @@ arch magic_banned
 x 2
 y 13
 end
+arch marble
+x 2
+y 14
+end
 arch flagstone_2_1_2
 x 2
 y 14
@@ -359,6 +417,9 @@ arch blocked
 x 2
 y 15
 end
+arch marble
+x 3
+end
 arch flagstone_2_1_2
 x 3
 end
@@ -497,6 +558,10 @@ arch marble
 x 3
 y 13
 end
+arch marble
+x 3
+y 14
+end
 arch flagstone_2_1_2
 x 3
 y 14
@@ -505,6 +570,9 @@ arch blocked
 x 3
 y 15
 end
+arch marble
+x 4
+end
 arch flagstone_2_1_2
 x 4
 end
@@ -643,6 +711,10 @@ arch marble
 x 4
 y 13
 end
+arch marble
+x 4
+y 14
+end
 arch flagstone_2_1_2
 x 4
 y 14
@@ -651,6 +723,9 @@ arch blocked
 x 4
 y 15
 end
+arch marble
+x 5
+end
 arch flagstone_2_1_2
 x 5
 end
@@ -777,6 +852,10 @@ arch marble
 x 5
 y 13
 end
+arch marble
+x 5
+y 14
+end
 arch flagstone_2_1_2
 x 5
 y 14
@@ -785,6 +864,9 @@ arch blocked
 x 5
 y 15
 end
+arch marble
+x 6
+end
 arch flagstone_2_1_2
 x 6
 end
@@ -971,6 +1053,10 @@ x 6
 y 13
 connected 1
 end
+arch marble
+x 6
+y 14
+end
 arch flagstone_2_1_2
 x 6
 y 14
@@ -979,6 +1065,9 @@ arch blocked
 x 6
 y 15
 end
+arch marble
+x 7
+end
 arch flagstone_2_1_2
 x 7
 end
@@ -1180,6 +1269,10 @@ x 7
 y 13
 connected 1
 end
+arch marble
+x 7
+y 14
+end
 arch flagstone_2_1_2
 x 7
 y 14
@@ -1188,6 +1281,9 @@ arch blocked
 x 7
 y 15
 end
+arch marble
+x 8
+end
 arch flagstone_2_1_2
 x 8
 end
@@ -1374,6 +1470,10 @@ x 8
 y 13
 connected 1
 end
+arch marble
+x 8
+y 14
+end
 arch flagstone_2_1_2
 x 8
 y 14
@@ -1382,6 +1482,9 @@ arch blocked
 x 8
 y 15
 end
+arch marble
+x 9
+end
 arch flagstone_2_1_2
 x 9
 end
@@ -1508,6 +1611,10 @@ arch marble
 x 9
 y 13
 end
+arch marble
+x 9
+y 14
+end
 arch flagstone_2_1_2
 x 9
 y 14
@@ -1516,6 +1623,9 @@ arch blocked
 x 9
 y 15
 end
+arch marble
+x 10
+end
 arch flagstone_2_1_2
 x 10
 end
@@ -1654,6 +1764,10 @@ arch marble
 x 10
 y 13
 end
+arch marble
+x 10
+y 14
+end
 arch flagstone_2_1_2
 x 10
 y 14
@@ -1662,6 +1776,9 @@ arch blocked
 x 10
 y 15
 end
+arch marble
+x 11
+end
 arch flagstone_2_1_2
 x 11
 end
@@ -1800,6 +1917,10 @@ arch marble
 x 11
 y 13
 end
+arch marble
+x 11
+y 14
+end
 arch flagstone_2_1_2
 x 11
 y 14
@@ -1808,6 +1929,9 @@ arch blocked
 x 11
 y 15
 end
+arch marble
+x 12
+end
 arch flagstone_2_1_2
 x 12
 end
@@ -1946,6 +2070,10 @@ arch magic_banned
 x 12
 y 13
 end
+arch marble
+x 12
+y 14
+end
 arch flagstone_2_1_2
 x 12
 y 14
@@ -1954,6 +2082,9 @@ arch blocked
 x 12
 y 15
 end
+arch marble
+x 13
+end
 arch flagstone_2_1_2
 x 13
 end
@@ -2101,6 +2232,10 @@ sp 45
 x 13
 y 13
 end
+arch marble
+x 13
+y 14
+end
 arch flagstone_2_1_2
 x 13
 y 14
@@ -2109,61 +2244,120 @@ arch blocked
 x 13
 y 15
 end
+arch marble
+x 14
+end
 arch flagstone_3_3
 x 14
 end
-arch flagstone_2_1_1
+arch marble
 x 14
 y 1
 end
 arch flagstone_2_1_1
 x 14
+y 1
+end
+arch marble
+x 14
 y 2
 end
 arch flagstone_2_1_1
 x 14
+y 2
+end
+arch marble
+x 14
 y 3
 end
 arch flagstone_2_1_1
 x 14
+y 3
+end
+arch marble
+x 14
 y 4
 end
 arch flagstone_2_1_1
 x 14
+y 4
+end
+arch marble
+x 14
 y 5
 end
 arch flagstone_2_1_1
 x 14
+y 5
+end
+arch marble
+x 14
 y 6
 end
 arch flagstone_2_1_1
 x 14
+y 6
+end
+arch marble
+x 14
 y 7
 end
 arch flagstone_2_1_1
 x 14
+y 7
+end
+arch marble
+x 14
 y 8
 end
 arch flagstone_2_1_1
 x 14
+y 8
+end
+arch marble
+x 14
 y 9
 end
 arch flagstone_2_1_1
 x 14
+y 9
+end
+arch marble
+x 14
 y 10
 end
 arch flagstone_2_1_1
 x 14
+y 10
+end
+arch marble
+x 14
 y 11
 end
 arch flagstone_2_1_1
 x 14
+y 11
+end
+arch marble
+x 14
 y 12
 end
 arch flagstone_2_1_1
 x 14
+y 12
+end
+arch marble
+x 14
 y 13
 end
+arch flagstone_2_1_1
+x 14
+y 13
+end
+arch marble
+x 14
+y 14
+end
 arch flagstone_3_1
 x 14
 y 14
diff --git a/quests/greyshield/Fortress b/quests/greyshield/Fortress
index cb4929a6c..57bd98933 100644
--- a/quests/greyshield/Fortress
+++ b/quests/greyshield/Fortress
@@ -33,6 +33,9 @@ end
 arch cwall_2_1_1
 y 3
 end
+arch cwall_0
+y 3
+end
 arch marble
 y 4
 end
@@ -1201,15 +1204,23 @@ arch marble
 x 6
 y 20
 end
-arch cwall_3_3
+arch cwall_2_1_2
 x 6
 y 20
 end
-arch marble
+arch cwall_0
+x 6
+y 20
+end
+arch swall_1_1_half
+x 6
+y 20
+end
+arch dungeon_magic
 x 6
 y 21
 end
-arch dungeon_magic
+arch marble
 x 6
 y 21
 end
@@ -1217,11 +1228,11 @@ arch swall_2_1_1
 x 6
 y 21
 end
-arch marble
+arch dungeon_magic
 x 6
 y 22
 end
-arch dungeon_magic
+arch marble
 x 6
 y 22
 end
@@ -1233,7 +1244,11 @@ arch marble
 x 6
 y 23
 end
-arch cwall_2_2_1
+arch swall_1_2_half
+x 6
+y 23
+end
+arch cwall_1_4
 x 6
 y 23
 end
@@ -1671,6 +1686,9 @@ end
 arch cwall_2_1_2
 x 9
 end
+arch cwall_0
+x 9
+end
 arch marble
 x 9
 y 1
@@ -1736,6 +1754,10 @@ arch cwall_2_1_2
 x 9
 y 8
 end
+arch cwall_0
+x 9
+y 8
+end
 arch marble
 x 9
 y 9
@@ -2160,11 +2182,11 @@ arch marble
 x 11
 y 12
 end
-arch marble
+arch dungeon_magic
 x 11
 y 13
 end
-arch dungeon_magic
+arch marble
 x 11
 y 13
 end
@@ -2172,11 +2194,11 @@ arch swall_2_2_2
 x 11
 y 13
 end
-arch marble
+arch dungeon_magic
 x 11
 y 14
 end
-arch dungeon_magic
+arch marble
 x 11
 y 14
 end
@@ -2184,11 +2206,11 @@ arch swall_2_1_1
 x 11
 y 14
 end
-arch marble
+arch dungeon_magic
 x 11
 y 15
 end
-arch dungeon_magic
+arch marble
 x 11
 y 15
 end
@@ -2196,11 +2218,11 @@ arch swall_2_1_1
 x 11
 y 15
 end
-arch marble
+arch dungeon_magic
 x 11
 y 16
 end
-arch dungeon_magic
+arch marble
 x 11
 y 16
 end
@@ -2208,11 +2230,11 @@ arch swall_2_1_1
 x 11
 y 16
 end
-arch marble
+arch dungeon_magic
 x 11
 y 17
 end
-arch dungeon_magic
+arch marble
 x 11
 y 17
 end
@@ -2386,11 +2408,11 @@ arch marble
 x 12
 y 12
 end
-arch marble
+arch dungeon_magic
 x 12
 y 13
 end
-arch dungeon_magic
+arch marble
 x 12
 y 13
 end
@@ -2398,11 +2420,11 @@ arch swall_2_1_2
 x 12
 y 13
 end
-arch marble
+arch dungeon_magic
 x 12
 y 14
 end
-arch dungeon_magic
+arch marble
 x 12
 y 14
 end
@@ -2414,11 +2436,11 @@ arch random_reading
 x 12
 y 14
 end
-arch marble
+arch dungeon_magic
 x 12
 y 15
 end
-arch dungeon_magic
+arch marble
 x 12
 y 15
 end
@@ -2446,11 +2468,11 @@ arch random_reading
 x 12
 y 16
 end
-arch marble
+arch dungeon_magic
 x 12
 y 17
 end
-arch dungeon_magic
+arch marble
 x 12
 y 17
 end
@@ -2634,11 +2656,11 @@ arch marble
 x 13
 y 12
 end
-arch marble
+arch dungeon_magic
 x 13
 y 13
 end
-arch dungeon_magic
+arch marble
 x 13
 y 13
 end
@@ -2646,11 +2668,11 @@ arch swall_2_1_2
 x 13
 y 13
 end
-arch marble
+arch dungeon_magic
 x 13
 y 14
 end
-arch dungeon_magic
+arch marble
 x 13
 y 14
 end
@@ -2662,11 +2684,11 @@ arch random_potion
 x 13
 y 14
 end
-arch marble
+arch dungeon_magic
 x 13
 y 15
 end
-arch dungeon_magic
+arch marble
 x 13
 y 15
 end
@@ -2678,11 +2700,11 @@ arch random_spells
 x 13
 y 15
 end
-arch marble
+arch dungeon_magic
 x 13
 y 16
 end
-arch dungeon_magic
+arch marble
 x 13
 y 16
 end
@@ -2694,11 +2716,11 @@ arch random_potion
 x 13
 y 16
 end
-arch marble
+arch dungeon_magic
 x 13
 y 17
 end
-arch dungeon_magic
+arch marble
 x 13
 y 17
 end
@@ -2856,11 +2878,11 @@ arch marble
 x 14
 y 11
 end
-arch marble
+arch dungeon_magic
 x 14
 y 12
 end
-arch dungeon_magic
+arch marble
 x 14
 y 12
 end
@@ -2868,11 +2890,11 @@ arch swall_1_1
 x 14
 y 12
 end
-arch marble
+arch dungeon_magic
 x 14
 y 13
 end
-arch dungeon_magic
+arch marble
 x 14
 y 13
 end
@@ -2880,11 +2902,11 @@ arch swall_2_2_4
 x 14
 y 13
 end
-arch marble
+arch dungeon_magic
 x 14
 y 14
 end
-arch dungeon_magic
+arch marble
 x 14
 y 14
 end
@@ -2896,11 +2918,11 @@ arch random_talisman
 x 14
 y 14
 end
-arch marble
+arch dungeon_magic
 x 14
 y 15
 end
-arch dungeon_magic
+arch marble
 x 14
 y 15
 end
@@ -2912,11 +2934,11 @@ arch random_spells
 x 14
 y 15
 end
-arch marble
+arch dungeon_magic
 x 14
 y 16
 end
-arch dungeon_magic
+arch marble
 x 14
 y 16
 end
@@ -2928,11 +2950,11 @@ arch random_potion
 x 14
 y 16
 end
-arch marble
+arch dungeon_magic
 x 14
 y 17
 end
-arch dungeon_magic
+arch marble
 x 14
 y 17
 end
@@ -2940,11 +2962,11 @@ arch swall_2_2_3
 x 14
 y 17
 end
-arch marble
+arch dungeon_magic
 x 14
 y 18
 end
-arch dungeon_magic
+arch marble
 x 14
 y 18
 end
@@ -3075,11 +3097,11 @@ arch marble
 x 15
 y 11
 end
-arch marble
+arch dungeon_magic
 x 15
 y 12
 end
-arch dungeon_magic
+arch marble
 x 15
 y 12
 end
@@ -3088,11 +3110,11 @@ x 15
 y 12
 connected 110
 end
-arch marble
+arch dungeon_magic
 x 15
 y 13
 end
-arch dungeon_magic
+arch marble
 x 15
 y 13
 end
@@ -3100,11 +3122,11 @@ arch random_wealth
 x 15
 y 13
 end
-arch marble
+arch dungeon_magic
 x 15
 y 14
 end
-arch dungeon_magic
+arch marble
 x 15
 y 14
 end
@@ -3112,11 +3134,11 @@ arch random_wealth
 x 15
 y 14
 end
-arch marble
+arch dungeon_magic
 x 15
 y 15
 end
-arch dungeon_magic
+arch marble
 x 15
 y 15
 end
@@ -3128,11 +3150,11 @@ sp 7
 x 15
 y 15
 end
-arch marble
+arch dungeon_magic
 x 15
 y 16
 end
-arch dungeon_magic
+arch marble
 x 15
 y 16
 end
@@ -3144,11 +3166,11 @@ arch random_potion
 x 15
 y 16
 end
-arch marble
+arch dungeon_magic
 x 15
 y 17
 end
-arch dungeon_magic
+arch marble
 x 15
 y 17
 end
@@ -3160,11 +3182,11 @@ arch random_spells
 x 15
 y 17
 end
-arch marble
+arch dungeon_magic
 x 15
 y 18
 end
-arch dungeon_magic
+arch marble
 x 15
 y 18
 end
@@ -3411,11 +3433,11 @@ arch marble
 x 16
 y 11
 end
-arch marble
+arch dungeon_magic
 x 16
 y 12
 end
-arch dungeon_magic
+arch marble
 x 16
 y 12
 end
@@ -3424,11 +3446,11 @@ x 16
 y 12
 connected 110
 end
-arch marble
+arch dungeon_magic
 x 16
 y 13
 end
-arch dungeon_magic
+arch marble
 x 16
 y 13
 end
@@ -3436,11 +3458,11 @@ arch random_wealth
 x 16
 y 13
 end
-arch marble
+arch dungeon_magic
 x 16
 y 14
 end
-arch dungeon_magic
+arch marble
 x 16
 y 14
 end
@@ -3464,11 +3486,11 @@ arch random_artifact
 x 16
 y 15
 end
-arch marble
+arch dungeon_magic
 x 16
 y 16
 end
-arch dungeon_magic
+arch marble
 x 16
 y 16
 end
@@ -3480,11 +3502,11 @@ arch random_potion
 x 16
 y 16
 end
-arch marble
+arch dungeon_magic
 x 16
 y 17
 end
-arch dungeon_magic
+arch marble
 x 16
 y 17
 end
@@ -3496,11 +3518,11 @@ arch random_spells
 x 16
 y 17
 end
-arch marble
+arch dungeon_magic
 x 16
 y 18
 end
-arch dungeon_magic
+arch marble
 x 16
 y 18
 end
@@ -3635,11 +3657,11 @@ arch marble
 x 17
 y 11
 end
-arch marble
+arch dungeon_magic
 x 17
 y 12
 end
-arch dungeon_magic
+arch marble
 x 17
 y 12
 end
@@ -3647,11 +3669,11 @@ arch swall_1_1
 x 17
 y 12
 end
-arch marble
+arch dungeon_magic
 x 17
 y 13
 end
-arch dungeon_magic
+arch marble
 x 17
 y 13
 end
@@ -3659,11 +3681,11 @@ arch swall_2_2_1
 x 17
 y 13
 end
-arch marble
+arch dungeon_magic
 x 17
 y 14
 end
-arch dungeon_magic
+arch marble
 x 17
 y 14
 end
@@ -3675,11 +3697,11 @@ arch random_talisman
 x 17
 y 14
 end
-arch marble
+arch dungeon_magic
 x 17
 y 15
 end
-arch dungeon_magic
+arch marble
 x 17
 y 15
 end
@@ -3691,11 +3713,11 @@ arch random_spells
 x 17
 y 15
 end
-arch marble
+arch dungeon_magic
 x 17
 y 16
 end
-arch dungeon_magic
+arch marble
 x 17
 y 16
 end
@@ -3707,11 +3729,11 @@ arch random_potion
 x 17
 y 16
 end
-arch marble
+arch dungeon_magic
 x 17
 y 17
 end
-arch dungeon_magic
+arch marble
 x 17
 y 17
 end
@@ -3719,11 +3741,11 @@ arch swall_2_2_2
 x 17
 y 17
 end
-arch marble
+arch dungeon_magic
 x 17
 y 18
 end
-arch dungeon_magic
+arch marble
 x 17
 y 18
 end
@@ -3858,11 +3880,11 @@ arch marble
 x 18
 y 12
 end
-arch marble
+arch dungeon_magic
 x 18
 y 13
 end
-arch dungeon_magic
+arch marble
 x 18
 y 13
 end
@@ -3870,11 +3892,11 @@ arch swall_2_1_2
 x 18
 y 13
 end
-arch marble
+arch dungeon_magic
 x 18
 y 14
 end
-arch dungeon_magic
+arch marble
 x 18
 y 14
 end
@@ -3886,11 +3908,11 @@ arch random_potion
 x 18
 y 14
 end
-arch marble
+arch dungeon_magic
 x 18
 y 15
 end
-arch dungeon_magic
+arch marble
 x 18
 y 15
 end
@@ -3902,11 +3924,11 @@ arch random_spells
 x 18
 y 15
 end
-arch marble
+arch dungeon_magic
 x 18
 y 16
 end
-arch dungeon_magic
+arch marble
 x 18
 y 16
 end
@@ -3918,11 +3940,11 @@ arch random_potion
 x 18
 y 16
 end
-arch marble
+arch dungeon_magic
 x 18
 y 17
 end
-arch dungeon_magic
+arch marble
 x 18
 y 17
 end
@@ -4085,11 +4107,11 @@ arch marble
 x 19
 y 12
 end
-arch marble
+arch dungeon_magic
 x 19
 y 13
 end
-arch dungeon_magic
+arch marble
 x 19
 y 13
 end
@@ -4097,11 +4119,11 @@ arch swall_2_1_2
 x 19
 y 13
 end
-arch marble
+arch dungeon_magic
 x 19
 y 14
 end
-arch dungeon_magic
+arch marble
 x 19
 y 14
 end
@@ -4129,11 +4151,11 @@ arch random_artifact
 x 19
 y 15
 end
-arch marble
+arch dungeon_magic
 x 19
 y 16
 end
-arch dungeon_magic
+arch marble
 x 19
 y 16
 end
@@ -4145,11 +4167,11 @@ arch random_reading
 x 19
 y 16
 end
-arch marble
+arch dungeon_magic
 x 19
 y 17
 end
-arch dungeon_magic
+arch marble
 x 19
 y 17
 end
@@ -4345,11 +4367,11 @@ arch marble
 x 20
 y 12
 end
-arch marble
+arch dungeon_magic
 x 20
 y 13
 end
-arch dungeon_magic
+arch marble
 x 20
 y 13
 end
@@ -4357,11 +4379,11 @@ arch swall_2_2_3
 x 20
 y 13
 end
-arch marble
+arch dungeon_magic
 x 20
 y 14
 end
-arch dungeon_magic
+arch marble
 x 20
 y 14
 end
@@ -4369,11 +4391,11 @@ arch swall_2_1_1
 x 20
 y 14
 end
-arch marble
+arch dungeon_magic
 x 20
 y 15
 end
-arch dungeon_magic
+arch marble
 x 20
 y 15
 end
@@ -4381,11 +4403,11 @@ arch swall_2_1_1
 x 20
 y 15
 end
-arch marble
+arch dungeon_magic
 x 20
 y 16
 end
-arch dungeon_magic
+arch marble
 x 20
 y 16
 end
@@ -4393,11 +4415,11 @@ arch swall_2_1_1
 x 20
 y 16
 end
-arch marble
+arch dungeon_magic
 x 20
 y 17
 end
-arch dungeon_magic
+arch marble
 x 20
 y 17
 end
@@ -4805,15 +4827,19 @@ arch marble
 x 22
 y 25
 end
-arch cwall_2_1_1
+arch swall_1_1_half
 x 22
 y 25
 end
-arch marble
+arch cwall_1_2
+x 22
+y 25
+end
+arch dungeon_magic
 x 22
 y 26
 end
-arch dungeon_magic
+arch marble
 x 22
 y 26
 end
@@ -4821,11 +4847,11 @@ arch swall_2_1_1
 x 22
 y 26
 end
-arch marble
+arch dungeon_magic
 x 22
 y 27
 end
-arch dungeon_magic
+arch marble
 x 22
 y 27
 end
@@ -4833,11 +4859,11 @@ arch swall_2_1_1
 x 22
 y 27
 end
-arch marble
+arch dungeon_magic
 x 22
 y 28
 end
-arch dungeon_magic
+arch marble
 x 22
 y 28
 end
@@ -4849,7 +4875,11 @@ arch marble
 x 22
 y 29
 end
-arch cwall_2_2_1
+arch swall_1_2_half
+x 22
+y 29
+end
+arch cwall_1_4
 x 22
 y 29
 end
@@ -4994,7 +5024,11 @@ arch marble
 x 23
 y 24
 end
-arch cwall_2_1_2
+arch swall_1_4_half
+x 23
+y 24
+end
+arch cwall_1_3
 x 23
 y 24
 end
@@ -5068,6 +5102,9 @@ end
 arch cwall_2_1_2
 x 24
 end
+arch cwall_0
+x 24
+end
 arch marble
 x 24
 y 1
@@ -5172,15 +5209,19 @@ arch marble
 x 24
 y 18
 end
-arch cwall_2_2_2
+arch cwall_1_4
 x 24
 y 18
 end
-arch marble
+arch swall_1_1_half
+x 24
+y 18
+end
+arch dungeon_magic
 x 24
 y 19
 end
-arch dungeon_magic
+arch marble
 x 24
 y 19
 end
@@ -5188,11 +5229,11 @@ arch swall_2_1_1
 x 24
 y 19
 end
-arch marble
+arch dungeon_magic
 x 24
 y 20
 end
-arch dungeon_magic
+arch marble
 x 24
 y 20
 end
@@ -5200,11 +5241,11 @@ arch swall_2_1_1
 x 24
 y 20
 end
-arch marble
+arch dungeon_magic
 x 24
 y 21
 end
-arch dungeon_magic
+arch marble
 x 24
 y 21
 end
@@ -5216,7 +5257,11 @@ arch marble
 x 24
 y 22
 end
-arch cwall_2_2_1
+arch swall_1_2_half
+x 24
+y 22
+end
+arch cwall_1_4
 x 24
 y 22
 end
@@ -5224,11 +5269,11 @@ arch marble
 x 24
 y 23
 end
-arch marble
+arch dungeon_magic
 x 24
 y 24
 end
-arch dungeon_magic
+arch marble
 x 24
 y 24
 end
@@ -5280,7 +5325,11 @@ arch marble
 x 24
 y 29
 end
-arch cwall_2_1_2
+arch swall_1_4_half
+x 24
+y 29
+end
+arch cwall_1_3
 x 24
 y 29
 end
@@ -5447,11 +5496,11 @@ arch marble
 x 25
 y 23
 end
-arch marble
+arch dungeon_magic
 x 25
 y 24
 end
-arch dungeon_magic
+arch marble
 x 25
 y 24
 end
@@ -5499,11 +5548,11 @@ arch evergreen
 x 25
 y 28
 end
-arch marble
+arch dungeon_magic
 x 25
 y 29
 end
-arch dungeon_magic
+arch marble
 x 25
 y 29
 end
@@ -5622,11 +5671,11 @@ arch shop_empty
 x 26
 y 15
 end
-arch marble
+arch dungeon_magic
 x 26
 y 16
 end
-arch dungeon_magic
+arch marble
 x 26
 y 16
 end
@@ -5634,11 +5683,11 @@ arch swall_3_3
 x 26
 y 16
 end
-arch marble
+arch dungeon_magic
 x 26
 y 17
 end
-arch dungeon_magic
+arch marble
 x 26
 y 17
 end
@@ -5646,15 +5695,19 @@ arch swall_2_1_1
 x 26
 y 17
 end
-arch marble
-x 26
-y 18
-end
 arch dungeon_magic
 x 26
 y 18
 end
-arch swall_2_2_4
+arch marble
+x 26
+y 18
+end
+arch swall_1_2_half
+x 26
+y 18
+end
+arch cwall_1_3
 x 26
 y 18
 end
@@ -5686,7 +5739,11 @@ arch marble
 x 26
 y 22
 end
-arch cwall_2_1_2
+arch swall_1_4_half
+x 26
+y 22
+end
+arch cwall_1_3
 x 26
 y 22
 end
@@ -5694,11 +5751,11 @@ arch marble
 x 26
 y 23
 end
-arch marble
+arch dungeon_magic
 x 26
 y 24
 end
-arch dungeon_magic
+arch marble
 x 26
 y 24
 end
@@ -5738,11 +5795,11 @@ arch grass
 x 26
 y 28
 end
-arch marble
+arch dungeon_magic
 x 26
 y 29
 end
-arch dungeon_magic
+arch marble
 x 26
 y 29
 end
@@ -5768,6 +5825,9 @@ end
 arch cwall_2_1_2
 x 27
 end
+arch cwall_0
+x 27
+end
 arch marble
 x 27
 y 1
@@ -5848,6 +5908,10 @@ arch cwall_2_1_2
 x 27
 y 10
 end
+arch cwall_0
+x 27
+y 10
+end
 arch marble
 x 27
 y 11
@@ -5944,11 +6008,11 @@ arch shop_potions
 x 27
 y 21
 end
-arch marble
+arch dungeon_magic
 x 27
 y 22
 end
-arch dungeon_magic
+arch marble
 x 27
 y 22
 end
@@ -5964,7 +6028,11 @@ arch marble
 x 27
 y 24
 end
-arch cwall_2_1_2
+arch swall_1_3_half
+x 27
+y 24
+end
+arch cwall_1_4
 x 27
 y 24
 end
@@ -6001,11 +6069,11 @@ x 27
 y 27
 speed_left -0.200000
 end
-arch marble
+arch dungeon_magic
 x 27
 y 28
 end
-arch dungeon_magic
+arch marble
 x 27
 y 28
 end
@@ -6013,11 +6081,11 @@ arch swall_2_2_2
 x 27
 y 28
 end
-arch marble
+arch dungeon_magic
 x 27
 y 29
 end
-arch dungeon_magic
+arch marble
 x 27
 y 29
 end
@@ -6191,11 +6259,11 @@ arch shop_potions
 x 28
 y 21
 end
-arch marble
+arch dungeon_magic
 x 28
 y 22
 end
-arch dungeon_magic
+arch marble
 x 28
 y 22
 end
@@ -6215,23 +6283,27 @@ arch cwall_2_2_3
 x 28
 y 24
 end
-arch marble
-x 28
-y 25
-end
 arch dungeon_magic
 x 28
 y 25
 end
-arch swall_2_1_1
+arch marble
 x 28
 y 25
 end
-arch marble
+arch swall_1_1_half
+x 28
+y 25
+end
+arch cwall_1_2
+x 28
+y 25
+end
+arch dungeon_magic
 x 28
 y 26
 end
-arch dungeon_magic
+arch marble
 x 28
 y 26
 end
@@ -6239,11 +6311,11 @@ arch swall_2_1_1
 x 28
 y 26
 end
-arch marble
+arch dungeon_magic
 x 28
 y 27
 end
-arch dungeon_magic
+arch marble
 x 28
 y 27
 end
@@ -6251,11 +6323,11 @@ arch swall_2_1_1
 x 28
 y 27
 end
-arch marble
+arch dungeon_magic
 x 28
 y 28
 end
-arch dungeon_magic
+arch marble
 x 28
 y 28
 end
@@ -6445,11 +6517,11 @@ arch shop_potions
 x 29
 y 21
 end
-arch marble
+arch dungeon_magic
 x 29
 y 22
 end
-arch dungeon_magic
+arch marble
 x 29
 y 22
 end
@@ -6693,7 +6765,11 @@ arch marble
 x 30
 y 22
 end
-arch cwall_2_1_2
+arch swall_1_3_half
+x 30
+y 22
+end
+arch cwall_1_4
 x 30
 y 22
 end
diff --git a/quests/greyshield/GreyMaster b/quests/greyshield/GreyMaster
index 7a40a948b..e5438f7c1 100644
--- a/quests/greyshield/GreyMaster
+++ b/quests/greyshield/GreyMaster
@@ -3561,6 +3561,10 @@ arch flagstone
 x 22
 y 21
 end
+arch swall_1_4_half
+x 22
+y 21
+end
 arch cave_13
 x 22
 y 21
@@ -3817,15 +3821,15 @@ arch marble
 x 23
 y 20
 end
-arch flagstone
-x 23
-y 21
-end
 arch dungeon_magic
 x 23
 y 21
 end
-arch swall_1_4
+arch flagstone
+x 23
+y 21
+end
+arch swall_2_1_2
 x 23
 y 21
 end
@@ -4004,15 +4008,15 @@ arch marble
 x 24
 y 20
 end
-arch flagstone
-x 24
-y 21
-end
 arch dungeon_magic
 x 24
 y 21
 end
-arch swall_1_3
+arch flagstone
+x 24
+y 21
+end
+arch swall_2_1_2
 x 24
 y 21
 end
@@ -4195,6 +4199,10 @@ arch flagstone
 x 25
 y 21
 end
+arch swall_1_3_half
+x 25
+y 21
+end
 arch cave_12
 x 25
 y 21
diff --git a/quests/greyshield/Greysword b/quests/greyshield/Greysword
index 922064af4..33d08699b 100644
--- a/quests/greyshield/Greysword
+++ b/quests/greyshield/Greysword
@@ -937,19 +937,19 @@ face blocked.111
 x 6
 y 5
 end
-arch marble
-x 6
-y 6
-end
 arch dungeon_magic
 x 6
 y 6
 end
 arch marble
 x 6
+y 6
+end
+arch dungeon_magic
+x 6
 y 7
 end
-arch dungeon_magic
+arch marble
 x 6
 y 7
 end
@@ -958,11 +958,11 @@ x 6
 y 7
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 6
 y 8
 end
-arch dungeon_magic
+arch marble
 x 6
 y 8
 end
@@ -971,11 +971,11 @@ x 6
 y 8
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 6
 y 9
 end
-arch dungeon_magic
+arch marble
 x 6
 y 9
 end
@@ -1096,11 +1096,11 @@ face blocked.111
 x 7
 y 5
 end
-arch marble
+arch dungeon_magic
 x 7
 y 6
 end
-arch dungeon_magic
+arch marble
 x 7
 y 6
 end
@@ -1109,11 +1109,11 @@ x 7
 y 6
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 7
 y 7
 end
-arch dungeon_magic
+arch marble
 x 7
 y 7
 end
@@ -1124,11 +1124,11 @@ sp 14
 x 7
 y 7
 end
-arch marble
+arch dungeon_magic
 x 7
 y 8
 end
-arch dungeon_magic
+arch marble
 x 7
 y 8
 end
@@ -1143,11 +1143,11 @@ endmsg
 x 7
 y 8
 end
-arch marble
+arch dungeon_magic
 x 7
 y 9
 end
-arch dungeon_magic
+arch marble
 x 7
 y 9
 end
@@ -1269,11 +1269,11 @@ face blocked.111
 x 8
 y 5
 end
-arch marble
+arch dungeon_magic
 x 8
 y 6
 end
-arch dungeon_magic
+arch marble
 x 8
 y 6
 end
@@ -1282,19 +1282,19 @@ x 8
 y 6
 connected 1
 end
-arch marble
-x 8
-y 7
-end
 arch dungeon_magic
 x 8
 y 7
 end
 arch marble
 x 8
+y 7
+end
+arch dungeon_magic
+x 8
 y 8
 end
-arch dungeon_magic
+arch marble
 x 8
 y 8
 end
@@ -1305,11 +1305,11 @@ sp 14
 x 8
 y 8
 end
-arch marble
+arch dungeon_magic
 x 8
 y 9
 end
-arch dungeon_magic
+arch marble
 x 8
 y 9
 end
@@ -1435,19 +1435,19 @@ face blocked.111
 x 9
 y 5
 end
-arch marble
-x 9
-y 6
-end
 arch dungeon_magic
 x 9
 y 6
 end
 arch marble
 x 9
+y 6
+end
+arch dungeon_magic
+x 9
 y 7
 end
-arch dungeon_magic
+arch marble
 x 9
 y 7
 end
@@ -1456,11 +1456,11 @@ x 9
 y 7
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 9
 y 8
 end
-arch dungeon_magic
+arch marble
 x 9
 y 8
 end
@@ -1469,11 +1469,11 @@ x 9
 y 8
 connected 1
 end
-arch marble
+arch dungeon_magic
 x 9
 y 9
 end
-arch dungeon_magic
+arch marble
 x 9
 y 9
 end
diff --git a/quests/greyshield/Sphinx b/quests/greyshield/Sphinx
index 54fbd6499..99297f299 100644
--- a/quests/greyshield/Sphinx
+++ b/quests/greyshield/Sphinx
@@ -391,6 +391,10 @@ arch marble
 x 3
 y 13
 end
+arch swall_1_4_half
+x 3
+y 13
+end
 arch cwall_1_2
 x 3
 y 13
@@ -470,15 +474,15 @@ arch marble
 x 4
 y 12
 end
-arch marble
-x 4
-y 13
-end
 arch dungeon_magic
 x 4
 y 13
 end
-arch swall_1_4
+arch marble
+x 4
+y 13
+end
+arch swall_2_1_2
 x 4
 y 13
 end
@@ -573,11 +577,11 @@ arch marble
 x 5
 y 12
 end
-arch marble
+arch dungeon_magic
 x 5
 y 13
 end
-arch dungeon_magic
+arch marble
 x 5
 y 13
 end
@@ -620,6 +624,10 @@ arch cwall_0
 x 6
 y 2
 end
+arch swall_1_1_half
+x 6
+y 2
+end
 arch marble
 x 6
 y 3
@@ -632,6 +640,10 @@ arch marble
 x 6
 y 4
 end
+arch swall_1_2_half
+x 6
+y 4
+end
 arch cwall_0
 x 6
 y 4
@@ -688,11 +700,11 @@ arch marble
 x 6
 y 12
 end
-arch marble
+arch dungeon_magic
 x 6
 y 13
 end
-arch dungeon_magic
+arch marble
 x 6
 y 13
 end
@@ -802,11 +814,11 @@ arch marble
 x 7
 y 12
 end
-arch marble
+arch dungeon_magic
 x 7
 y 13
 end
-arch dungeon_magic
+arch marble
 x 7
 y 13
 end
@@ -920,11 +932,11 @@ arch marble
 x 8
 y 12
 end
-arch marble
+arch dungeon_magic
 x 8
 y 13
 end
-arch dungeon_magic
+arch marble
 x 8
 y 13
 end
@@ -967,6 +979,10 @@ arch cwall_0
 x 9
 y 2
 end
+arch swall_1_1_half
+x 9
+y 2
+end
 arch marble
 x 9
 y 3
@@ -979,6 +995,10 @@ arch marble
 x 9
 y 4
 end
+arch swall_1_2_half
+x 9
+y 4
+end
 arch cwall_0
 x 9
 y 4
@@ -1035,11 +1055,11 @@ arch marble
 x 9
 y 12
 end
-arch marble
+arch dungeon_magic
 x 9
 y 13
 end
-arch dungeon_magic
+arch marble
 x 9
 y 13
 end
@@ -1138,11 +1158,11 @@ arch marble
 x 10
 y 12
 end
-arch marble
+arch dungeon_magic
 x 10
 y 13
 end
-arch dungeon_magic
+arch marble
 x 10
 y 13
 end
@@ -1225,15 +1245,15 @@ arch marble
 x 11
 y 12
 end
-arch marble
-x 11
-y 13
-end
 arch dungeon_magic
 x 11
 y 13
 end
-arch swall_1_3
+arch marble
+x 11
+y 13
+end
+arch swall_2_1_2
 x 11
 y 13
 end
@@ -1340,6 +1360,10 @@ arch marble
 x 12
 y 13
 end
+arch swall_1_3_half
+x 12
+y 13
+end
 arch cwall_1_2
 x 12
 y 13