diff --git a/wolfsburg/dungeons/church.4a b/wolfsburg/dungeons/church.4a
index 1affcc68f..f7486f732 100644
--- a/wolfsburg/dungeons/church.4a
+++ b/wolfsburg/dungeons/church.4a
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 16
 msg
 Created:  1994-11-15
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-12-03 Rick Tanner
 endmsg
 end
 arch blocked
@@ -833,7 +833,11 @@ arch dungeon_floor
 x 6
 y 22
 end
-arch dun6
+arch dungeon_floor
+x 6
+y 22
+end
+arch dun5
 x 6
 y 22
 end
@@ -934,18 +938,14 @@ arch dungeon_floor
 x 7
 y 21
 end
-arch oakdoor
-slaying church.4c
-hp 18
-sp 20
-x 7
-y 21
-end
 arch dungeon_floor
 x 7
 y 22
 end
-arch dun2
+arch oakdoor_2
+slaying church.4c
+hp 18
+sp 20
 x 7
 y 22
 end
@@ -1100,7 +1100,11 @@ arch dungeon_floor
 x 8
 y 22
 end
-arch dun12
+arch dungeon_floor
+x 8
+y 22
+end
+arch dun5
 x 8
 y 22
 end
@@ -4138,24 +4142,10 @@ arch dungeon_floor
 x 33
 y 16
 end
-arch oakdoor
-slaying church.4b
-hp 1
-sp 16
-x 33
-y 16
-end
 arch dungeon_floor
 x 33
 y 17
 end
-arch oakdoor
-slaying church.4b
-hp 1
-sp 17
-x 33
-y 17
-end
 arch dungeon_floor
 x 33
 y 18
@@ -4178,13 +4168,6 @@ arch dungeon_floor
 x 34
 y 1
 end
-arch oakdoor
-slaying church.4b
-hp 1
-sp 1
-x 34
-y 1
-end
 arch dungeon_floor
 x 34
 y 2
@@ -4293,7 +4276,11 @@ arch dungeon_floor
 x 34
 y 15
 end
-arch dun14
+arch dungeon_floor
+x 34
+y 15
+end
+arch dun12
 x 34
 y 15
 end
@@ -4301,7 +4288,10 @@ arch dungeon_floor
 x 34
 y 16
 end
-arch dun3
+arch oakdoor_1
+slaying church.4b
+hp 1
+sp 16
 x 34
 y 16
 end
@@ -4309,7 +4299,10 @@ arch dungeon_floor
 x 34
 y 17
 end
-arch dun3
+arch oakdoor_1
+slaying church.4b
+hp 1
+sp 17
 x 34
 y 17
 end
@@ -4328,14 +4321,20 @@ end
 arch dungeon_floor
 x 35
 end
-arch dun9
+arch dungeon_floor
+x 35
+end
+arch dun7
 x 35
 end
 arch dungeon_floor
 x 35
 y 1
 end
-arch dun11
+arch oakdoor_1
+slaying church.4b
+hp 1
+sp 1
 x 35
 y 1
 end
diff --git a/wolfsburg/dungeons/church.4b b/wolfsburg/dungeons/church.4b
index d74351b6b..fb3a66aed 100644
--- a/wolfsburg/dungeons/church.4b
+++ b/wolfsburg/dungeons/church.4b
@@ -8,17 +8,22 @@ enter_x 1
 enter_y 1
 msg
 Created:  1994-11-15
-Modified: 2008-12-01 Rick Tanner
+Modified: 2008-12-03 Rick Tanner
 endmsg
 end
 arch dungeon_floor
 end
-arch dun11
+arch dungeon_floor
+end
+arch dun6
 end
 arch dungeon_floor
 y 1
 end
-arch dun3
+arch oakdoor_1
+slaying church.4a
+hp 34
+sp 1
 y 1
 end
 arch dungeon_floor
@@ -96,7 +101,7 @@ end
 arch dungeon_floor
 y 16
 end
-arch oakdoor
+arch oakdoor_1
 slaying church.4a
 hp 33
 sp 16
@@ -108,7 +113,7 @@ end
 arch dungeon_floor
 y 17
 end
-arch oakdoor
+arch oakdoor_1
 slaying church.4a
 hp 33
 sp 17
@@ -160,13 +165,6 @@ arch dungeon_floor
 x 1
 y 1
 end
-arch oakdoor
-slaying church.4a
-hp 34
-sp 1
-x 1
-y 1
-end
 arch dungeon_floor
 x 1
 y 2
@@ -5578,7 +5576,11 @@ arch dungeon_floor
 x 26
 y 29
 end
-arch dun13
+arch dungeon_floor
+x 26
+y 29
+end
+arch dun12
 x 26
 y 29
 end
@@ -5700,18 +5702,14 @@ arch dungeon_floor
 x 27
 y 28
 end
-arch oakdoor
-slaying church.4d
-hp 60
-sp 12
-x 27
-y 28
-end
 arch dungeon_floor
 x 27
 y 29
 end
-arch dun2
+arch oakdoor_2
+slaying church.4d
+hp 60
+sp 12
 x 27
 y 29
 end
@@ -5833,18 +5831,14 @@ arch dungeon_floor
 x 28
 y 28
 end
-arch oakdoor
-slaying church.4d
-hp 61
-sp 12
-x 28
-y 28
-end
 arch dungeon_floor
 x 28
 y 29
 end
-arch dun2
+arch oakdoor_2
+slaying church.4d
+hp 61
+sp 12
 x 28
 y 29
 end
@@ -6082,7 +6076,15 @@ arch dungeon_floor
 x 29
 y 29
 end
-arch dun2
+arch dungeon_magic
+x 29
+y 29
+end
+arch dungeon_floor
+x 29
+y 29
+end
+arch dun5
 x 29
 y 29
 end
diff --git a/wolfsburg/dungeons/church.4c b/wolfsburg/dungeons/church.4c
index 82bec3727..71d7a9319 100644
--- a/wolfsburg/dungeons/church.4c
+++ b/wolfsburg/dungeons/church.4c
@@ -8,7 +8,7 @@ enter_x 18
 enter_y 20
 msg
 Created:  1994-11-15
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-12-03 Rick Tanner
 endmsg
 end
 arch medium_stones
@@ -3801,7 +3801,10 @@ arch small_stones
 x 18
 y 19
 end
-arch dun2
+arch oakdoor_2
+slaying church.4a
+hp 7
+sp 21
 x 18
 y 19
 end
@@ -3809,13 +3812,6 @@ arch small_stones
 x 18
 y 20
 end
-arch oakdoor
-slaying church.4a
-hp 7
-sp 21
-x 18
-y 20
-end
 arch small_stones
 x 18
 y 21
@@ -3896,7 +3892,11 @@ arch small_stones
 x 19
 y 19
 end
-arch dun14
+arch small_stones
+x 19
+y 19
+end
+arch dun3
 x 19
 y 19
 end
diff --git a/wolfsburg/dungeons/church.4d b/wolfsburg/dungeons/church.4d
index e9875d6e2..4d02c00c1 100644
--- a/wolfsburg/dungeons/church.4d
+++ b/wolfsburg/dungeons/church.4d
@@ -8,7 +8,7 @@ enter_x 60
 enter_y 12
 msg
 Created:  1994-11-15
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-12-03 Rick Tanner
 endmsg
 end
 arch blocked
@@ -8200,7 +8200,11 @@ arch flagstone
 x 59
 y 11
 end
-arch dun11
+arch flagstone
+x 59
+y 11
+end
+arch dun8
 x 59
 y 11
 end
@@ -8368,19 +8372,15 @@ arch flagstone
 x 60
 y 11
 end
-arch dun2
-x 60
-y 11
-end
-arch flagstone
-x 60
-y 12
-end
-arch oakdoor
+arch oakdoor_2
 slaying church.4b
 hp 27
 sp 28
 x 60
+y 11
+end
+arch flagstone
+x 60
 y 12
 end
 arch flagstone
@@ -8475,19 +8475,15 @@ arch flagstone
 x 61
 y 11
 end
-arch dun2
-x 61
-y 11
-end
-arch flagstone
-x 61
-y 12
-end
-arch oakdoor
+arch oakdoor_2
 slaying church.4b
 hp 28
 sp 28
 x 61
+y 11
+end
+arch flagstone
+x 61
 y 12
 end
 arch flagstone
@@ -8582,7 +8578,11 @@ arch flagstone
 x 62
 y 11
 end
-arch dun16
+arch flagstone
+x 62
+y 11
+end
+arch dun8
 x 62
 y 11
 end