diff --git a/unlinked/kandora/circus/mp_castle b/unlinked/kandora/circus/mp_castle
index 171ccf618..dac14ec19 100644
--- a/unlinked/kandora/circus/mp_castle
+++ b/unlinked/kandora/circus/mp_castle
@@ -4,7 +4,7 @@ width 16
 height 16
 msg
 Created:  1999-02-18 King Zoobus
-Modified: 2008-06-03 Arvid Norlander
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
 arch small_stones
@@ -1335,7 +1335,7 @@ arch small_stones
 x 12
 y 13
 end
-arch altar_jehovah
+arch altar_valriel
 x 12
 y 13
 end
diff --git a/unlinked/kandora/circus/mp_church b/unlinked/kandora/circus/mp_church
index fe149c72d..4e79bcec3 100644
--- a/unlinked/kandora/circus/mp_church
+++ b/unlinked/kandora/circus/mp_church
@@ -5,7 +5,7 @@ height 16
 enter_x 8
 msg
 Created:  1999-02-18 King Zoobus
-Modified: 2008-06-03 Arvid Norlander
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
 arch dungeon_floor
@@ -942,7 +942,7 @@ arch dungeon_floor
 x 8
 y 12
 end
-arch altar_jehovah
+arch altar_valriel
 x 8
 y 12
 end
diff --git a/unlinked/kandora/circus/petshop b/unlinked/kandora/circus/petshop
index 5c796e253..d7fc51688 100644
--- a/unlinked/kandora/circus/petshop
+++ b/unlinked/kandora/circus/petshop
@@ -4,66 +4,113 @@ width 16
 height 16
 msg
 Created:  1999-02-18 King Zoobus
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
-arch wwall_weak_2
+arch woodfloor2
 end
-arch wwall_weak_1
+arch wall_2_2_2
 end
-arch wwall_weak_1
+arch woodfloor2
 y 1
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 1
+end
+arch woodfloor2
 y 2
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 2
+end
+arch woodfloor2
 y 3
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 3
+end
+arch woodfloor2
 y 4
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 4
+end
+arch woodfloor2
 y 5
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 5
+end
+arch woodfloor2
 y 6
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 6
+end
+arch woodfloor2
 y 7
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 7
+end
+arch woodfloor2
 y 8
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 8
+end
+arch woodfloor2
 y 9
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 9
+end
+arch woodfloor2
 y 10
 end
-arch wwall_weak_2
+arch wall_3_2
 y 10
 end
-arch wwall_weak_1
+arch woodfloor2
 y 11
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 11
+end
+arch woodfloor2
 y 12
 end
-arch wwall_weak_1
+arch wall_3_2
+y 12
+end
+arch woodfloor2
 y 13
 end
-arch wwall_weak_1
+arch wall_3_2
+y 13
+end
+arch woodfloor2
 y 14
 end
-arch wwall_weak_1
+arch wall_2_1_1
+y 14
+end
+arch woodfloor2
 y 15
 end
-arch wwall_weak_2
+arch wall_2_2_1
 y 15
 end
-arch wwall_weak_2
+arch woodfloor2
 x 1
 end
+arch wall_2_1_2
+x 1
+end
+arch woodfloor2
+x 1
+y 1
+end
 arch oakdoor
 slaying mp_world
 hp 35
@@ -202,15 +249,14 @@ arch woodfloor2
 x 1
 y 15
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 1
 y 15
 end
-arch wwall_weak_2
-x 1
-y 15
+arch woodfloor2
+x 2
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 2
 end
 arch woodfloor2
@@ -329,15 +375,14 @@ arch woodfloor2
 x 2
 y 15
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 2
 y 15
 end
-arch wwall_weak_2
-x 2
-y 15
+arch woodfloor2
+x 3
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 3
 end
 arch woodfloor2
@@ -464,15 +509,14 @@ arch woodfloor2
 x 3
 y 15
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 3
 y 15
 end
-arch wwall_weak_2
-x 3
-y 15
+arch woodfloor2
+x 4
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 4
 end
 arch woodfloor2
@@ -586,10 +630,6 @@ arch weak_wall_2
 x 4
 y 12
 end
-arch wwall_weak_1
-x 4
-y 12
-end
 arch wwall_weak_2
 x 4
 y 12
@@ -614,134 +654,168 @@ arch woodfloor2
 x 4
 y 15
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 4
 y 15
 end
-arch wwall_weak_2
-x 4
-y 15
+arch shop_empty
+x 5
 end
 arch wall_3_3
 x 5
 end
-arch wall_2_1_1
+arch shop_empty
 x 5
 y 1
 end
 arch wall_2_1_1
 x 5
+y 1
+end
+arch shop_empty
+x 5
 y 2
 end
 arch wall_2_1_1
 x 5
+y 2
+end
+arch shop_empty
+x 5
 y 3
 end
 arch wall_2_1_1
 x 5
+y 3
+end
+arch shop_empty
+x 5
 y 4
 end
 arch wall_2_1_1
 x 5
+y 4
+end
+arch shop_empty
+x 5
 y 5
 end
 arch wall_2_1_1
 x 5
+y 5
+end
+arch shop_empty
+x 5
 y 6
 end
 arch wall_2_1_1
 x 5
+y 6
+end
+arch shop_empty
+x 5
+y 7
+end
+arch wall_2_1_1
+x 5
 y 7
 end
-arch wall_2_1_1
+arch shop_empty
 x 5
 y 8
 end
 arch wall_2_1_1
 x 5
+y 8
+end
+arch shop_empty
+x 5
 y 9
 end
+arch wall_2_1_1
+x 5
+y 9
+end
+arch shop_empty
+x 5
+y 10
+end
 arch wall_3_4
 x 5
 y 10
 end
+arch shop_empty
+x 5
+y 11
+end
 arch wall_2_1_1
 x 5
 y 11
 end
-arch wall_3_4
+arch shop_empty
 x 5
 y 12
 end
 arch wall_3_4
 x 5
+y 12
+end
+arch shop_empty
+x 5
 y 13
 end
+arch wall_3_4
+x 5
+y 13
+end
+arch shop_empty
+x 5
+y 14
+end
 arch wall_2_1_1
 x 5
 y 14
 end
+arch shop_empty
+x 5
+y 15
+end
 arch wall_3_1
 x 5
 y 15
 end
+arch shop_empty
+x 6
+end
 arch wall_2_1_2
 x 6
 end
-arch shop_floor
-x 6
-y 1
-end
 arch shop_weapon
 x 6
 y 1
 end
-arch shop_floor
+arch shop_weapon
 x 6
 y 2
 end
 arch shop_weapon
 x 6
-y 2
-end
-arch shop_floor
-x 6
 y 3
 end
 arch shop_weapon
 x 6
-y 3
-end
-arch shop_floor
-x 6
 y 4
 end
 arch shop_weapon
 x 6
-y 4
-end
-arch shop_floor
-x 6
 y 5
 end
 arch shop_weapon
 x 6
-y 5
-end
-arch shop_floor
-x 6
 y 6
 end
 arch shop_weapon
 x 6
-y 6
-end
-arch shop_floor
-x 6
-y 7
-end
-arch shop_weapon
-x 6
 y 7
 end
 arch shop_floor
@@ -772,91 +846,58 @@ arch bird
 x 6
 y 11
 end
-arch shop_floor
-x 6
-y 12
-end
 arch shop_food
 x 6
 y 12
 end
-arch shop_floor
+arch shop_food
 x 6
 y 13
 end
 arch shop_food
 x 6
-y 13
-end
-arch shop_floor
-x 6
 y 14
 end
-arch shop_food
+arch shop_empty
 x 6
-y 14
+y 15
 end
 arch wall_2_1_2
 x 6
 y 15
 end
+arch shop_empty
+x 7
+end
 arch wall_2_1_2
 x 7
 end
-arch shop_floor
-x 7
-y 1
-end
 arch shop_throw
 x 7
 y 1
 end
-arch shop_floor
+arch shop_throw
 x 7
 y 2
 end
 arch shop_throw
 x 7
-y 2
-end
-arch shop_floor
-x 7
 y 3
 end
 arch shop_throw
 x 7
-y 3
-end
-arch shop_floor
-x 7
 y 4
 end
 arch shop_throw
 x 7
-y 4
-end
-arch shop_floor
-x 7
 y 5
 end
 arch shop_throw
 x 7
-y 5
-end
-arch shop_floor
-x 7
 y 6
 end
 arch shop_throw
 x 7
-y 6
-end
-arch shop_floor
-x 7
-y 7
-end
-arch shop_throw
-x 7
 y 7
 end
 arch shop_empty
@@ -883,34 +924,29 @@ arch serpent
 x 7
 y 11
 end
-arch shop_floor
-x 7
-y 12
-end
 arch shop_food
 x 7
 y 12
 end
-arch shop_floor
+arch shop_food
 x 7
 y 13
 end
 arch shop_food
 x 7
-y 13
-end
-arch shop_floor
-x 7
 y 14
 end
-arch shop_food
+arch shop_empty
 x 7
-y 14
+y 15
 end
 arch wall_2_1_2
 x 7
 y 15
 end
+arch shop_empty
+x 8
+end
 arch wall_2_1_2
 x 8
 end
@@ -982,34 +1018,29 @@ arch shop_floor
 x 8
 y 11
 end
-arch shop_floor
-x 8
-y 12
-end
 arch shop_food
 x 8
 y 12
 end
-arch shop_floor
+arch shop_food
 x 8
 y 13
 end
 arch shop_food
 x 8
-y 13
-end
-arch shop_floor
-x 8
 y 14
 end
-arch shop_food
+arch shop_empty
 x 8
-y 14
+y 15
 end
 arch wall_2_1_2
 x 8
 y 15
 end
+arch shop_empty
+x 9
+end
 arch wall_2_1_2
 x 9
 end
@@ -1021,26 +1052,14 @@ arch serpent
 x 9
 y 1
 end
-arch shop_floor
-x 9
-y 2
-end
 arch shop_scrolls
 x 9
 y 2
 end
-arch shop_floor
-x 9
-y 3
-end
 arch shop_wands
 x 9
 y 3
 end
-arch shop_floor
-x 9
-y 4
-end
 arch shop_scrolls
 x 9
 y 4
@@ -1049,94 +1068,61 @@ arch shop_gems
 x 9
 y 4
 end
-arch shop_floor
+arch shop_minerals
 x 9
 y 5
 end
 arch shop_minerals
 x 9
-y 5
-end
-arch shop_floor
-x 9
 y 6
 end
-arch shop_minerals
-x 9
-y 6
-end
-arch shop_floor
+arch shop_general
 x 9
 y 7
 end
 arch shop_general
 x 9
-y 7
-end
-arch shop_floor
-x 9
 y 8
 end
 arch shop_general
 x 9
-y 8
-end
-arch shop_floor
-x 9
 y 9
 end
 arch shop_general
 x 9
-y 9
-end
-arch shop_floor
-x 9
 y 10
 end
 arch shop_general
 x 9
-y 10
-end
-arch shop_floor
-x 9
-y 11
-end
-arch shop_general
-x 9
 y 11
 end
-arch shop_floor
+arch shop_food
 x 9
 y 12
 end
 arch shop_food
 x 9
-y 12
-end
-arch shop_floor
-x 9
 y 13
 end
 arch shop_food
 x 9
-y 13
-end
-arch shop_floor
-x 9
-y 14
-end
-arch shop_food
-x 9
 y 14
 end
 arch giant_bat
 x 9
 y 14
 end
+arch shop_empty
+x 9
+y 15
+end
 arch wall_2_1_2
 x 9
 y 15
 end
+arch shop_empty
+x 10
+end
 arch wall_2_1_2
 x 10
 end
@@ -1144,26 +1130,14 @@ arch shop_floor
 x 10
 y 1
 end
-arch shop_floor
-x 10
-y 2
-end
 arch shop_scrolls
 x 10
 y 2
 end
-arch shop_floor
-x 10
-y 3
-end
 arch shop_wands
 x 10
 y 3
 end
-arch shop_floor
-x 10
-y 4
-end
 arch shop_scrolls
 x 10
 y 4
@@ -1172,90 +1146,57 @@ arch shop_gems
 x 10
 y 4
 end
-arch shop_floor
+arch shop_minerals
 x 10
 y 5
 end
 arch shop_minerals
 x 10
-y 5
-end
-arch shop_floor
-x 10
 y 6
 end
-arch shop_minerals
-x 10
-y 6
-end
-arch shop_floor
+arch shop_general
 x 10
 y 7
 end
 arch shop_general
 x 10
-y 7
-end
-arch shop_floor
-x 10
 y 8
 end
 arch shop_general
 x 10
-y 8
-end
-arch shop_floor
-x 10
 y 9
 end
 arch shop_general
 x 10
-y 9
-end
-arch shop_floor
-x 10
 y 10
 end
 arch shop_general
 x 10
-y 10
-end
-arch shop_floor
-x 10
-y 11
-end
-arch shop_general
-x 10
 y 11
 end
-arch shop_floor
-x 10
-y 12
-end
 arch shop_food
 x 10
 y 12
 end
-arch shop_floor
+arch shop_food
 x 10
 y 13
 end
 arch shop_food
 x 10
-y 13
-end
-arch shop_floor
-x 10
 y 14
 end
-arch shop_food
+arch shop_empty
 x 10
-y 14
+y 15
 end
 arch wall_2_1_2
 x 10
 y 15
 end
+arch shop_empty
+x 11
+end
 arch wall_2_1_2
 x 11
 end
@@ -1267,26 +1208,14 @@ arch cobra
 x 11
 y 1
 end
-arch shop_floor
-x 11
-y 2
-end
 arch shop_scrolls
 x 11
 y 2
 end
-arch shop_floor
-x 11
-y 3
-end
 arch shop_wands
 x 11
 y 3
 end
-arch shop_floor
-x 11
-y 4
-end
 arch shop_scrolls
 x 11
 y 4
@@ -1295,90 +1224,57 @@ arch shop_gems
 x 11
 y 4
 end
-arch shop_floor
+arch shop_minerals
 x 11
 y 5
 end
 arch shop_minerals
 x 11
-y 5
-end
-arch shop_floor
-x 11
 y 6
 end
-arch shop_minerals
-x 11
-y 6
-end
-arch shop_floor
+arch shop_general
 x 11
 y 7
 end
 arch shop_general
 x 11
-y 7
-end
-arch shop_floor
-x 11
 y 8
 end
 arch shop_general
 x 11
-y 8
-end
-arch shop_floor
-x 11
 y 9
 end
 arch shop_general
 x 11
-y 9
-end
-arch shop_floor
-x 11
 y 10
 end
 arch shop_general
 x 11
-y 10
-end
-arch shop_floor
-x 11
-y 11
-end
-arch shop_general
-x 11
 y 11
 end
-arch shop_floor
-x 11
-y 12
-end
 arch shop_food
 x 11
 y 12
 end
-arch shop_floor
+arch shop_food
 x 11
 y 13
 end
 arch shop_food
 x 11
-y 13
-end
-arch shop_floor
-x 11
 y 14
 end
-arch shop_food
+arch shop_empty
 x 11
-y 14
+y 15
 end
 arch wall_2_1_2
 x 11
 y 15
 end
+arch shop_empty
+x 12
+end
 arch wall_2_1_2
 x 12
 end
@@ -1390,26 +1286,14 @@ arch bird
 x 12
 y 1
 end
-arch shop_floor
-x 12
-y 2
-end
 arch shop_scrolls
 x 12
 y 2
 end
-arch shop_floor
-x 12
-y 3
-end
 arch shop_wands
 x 12
 y 3
 end
-arch shop_floor
-x 12
-y 4
-end
 arch shop_scrolls
 x 12
 y 4
@@ -1418,70 +1302,38 @@ arch shop_gems
 x 12
 y 4
 end
-arch shop_floor
+arch shop_minerals
 x 12
 y 5
 end
 arch shop_minerals
 x 12
-y 5
-end
-arch shop_floor
-x 12
 y 6
 end
-arch shop_minerals
-x 12
-y 6
-end
-arch shop_floor
+arch shop_general
 x 12
 y 7
 end
 arch shop_general
 x 12
-y 7
-end
-arch shop_floor
-x 12
 y 8
 end
 arch shop_general
 x 12
-y 8
-end
-arch shop_floor
-x 12
 y 9
 end
 arch shop_general
 x 12
-y 9
-end
-arch shop_floor
-x 12
-y 10
-end
-arch shop_general
-x 12
 y 10
 end
 arch cobra
 x 12
 y 10
 end
-arch shop_floor
-x 12
-y 11
-end
 arch shop_general
 x 12
 y 11
 end
-arch shop_floor
-x 12
-y 12
-end
 arch shop_food
 x 12
 y 12
@@ -1490,57 +1342,40 @@ arch giant_bat
 x 12
 y 12
 end
-arch shop_floor
+arch shop_food
 x 12
 y 13
 end
 arch shop_food
 x 12
-y 13
-end
-arch shop_floor
-x 12
 y 14
 end
-arch shop_food
+arch shop_empty
 x 12
-y 14
+y 15
 end
 arch wall_2_1_2
 x 12
 y 15
 end
-arch wall_2_1_2
+arch shop_empty
 x 13
 end
-arch shop_floor
+arch wall_2_1_2
 x 13
-y 1
 end
 arch shop_potions
 x 13
 y 1
 end
-arch shop_floor
-x 13
-y 2
-end
 arch shop_scrolls
 x 13
 y 2
 end
-arch shop_floor
-x 13
-y 3
-end
 arch shop_wands
 x 13
 y 3
 end
-arch shop_floor
-x 13
-y 4
-end
 arch shop_scrolls
 x 13
 y 4
@@ -1549,121 +1384,72 @@ arch shop_gems
 x 13
 y 4
 end
-arch shop_floor
+arch shop_minerals
 x 13
 y 5
 end
 arch shop_minerals
 x 13
-y 5
-end
-arch shop_floor
-x 13
 y 6
 end
-arch shop_minerals
-x 13
-y 6
-end
-arch shop_floor
+arch shop_general
 x 13
 y 7
 end
 arch shop_general
 x 13
-y 7
-end
-arch shop_floor
-x 13
 y 8
 end
 arch shop_general
 x 13
-y 8
-end
-arch shop_floor
-x 13
 y 9
 end
 arch shop_general
 x 13
-y 9
-end
-arch shop_floor
-x 13
 y 10
 end
 arch shop_general
 x 13
-y 10
-end
-arch shop_floor
-x 13
-y 11
-end
-arch shop_general
-x 13
 y 11
 end
-arch shop_floor
-x 13
-y 12
-end
 arch shop_food
 x 13
 y 12
 end
-arch shop_floor
+arch shop_food
 x 13
 y 13
 end
 arch shop_food
 x 13
-y 13
-end
-arch shop_floor
-x 13
 y 14
 end
-arch shop_food
+arch shop_empty
 x 13
-y 14
+y 15
 end
 arch wall_2_1_2
 x 13
 y 15
 end
-arch wall_2_1_2
+arch shop_empty
 x 14
 end
-arch shop_floor
+arch wall_2_1_2
 x 14
-y 1
 end
 arch shop_ring
 x 14
 y 1
 end
-arch shop_floor
-x 14
-y 2
-end
 arch shop_scrolls
 x 14
 y 2
 end
-arch shop_floor
-x 14
-y 3
-end
 arch shop_wands
 x 14
 y 3
 end
-arch shop_floor
-x 14
-y 4
-end
 arch shop_scrolls
 x 14
 y 4
@@ -1672,153 +1458,180 @@ arch shop_gems
 x 14
 y 4
 end
-arch shop_floor
+arch shop_minerals
 x 14
 y 5
 end
 arch shop_minerals
 x 14
-y 5
-end
-arch shop_floor
-x 14
 y 6
 end
-arch shop_minerals
-x 14
-y 6
-end
-arch shop_floor
+arch shop_general
 x 14
 y 7
 end
 arch shop_general
 x 14
-y 7
-end
-arch shop_floor
-x 14
 y 8
 end
 arch shop_general
 x 14
-y 8
-end
-arch shop_floor
-x 14
 y 9
 end
 arch shop_general
 x 14
-y 9
-end
-arch shop_floor
-x 14
 y 10
 end
 arch shop_general
 x 14
-y 10
-end
-arch shop_floor
-x 14
-y 11
-end
-arch shop_general
-x 14
 y 11
 end
-arch shop_floor
+arch shop_food
 x 14
 y 12
 end
 arch shop_food
 x 14
-y 12
-end
-arch shop_floor
-x 14
 y 13
 end
 arch shop_food
 x 14
-y 13
-end
-arch shop_floor
-x 14
-y 14
-end
-arch shop_food
-x 14
 y 14
 end
 arch shop_special
 x 14
 y 14
 end
+arch shop_empty
+x 14
+y 15
+end
 arch wall_2_1_2
 x 14
 y 15
 end
+arch shop_empty
+x 15
+end
 arch wall_2_2_3
 x 15
 end
-arch wall_2_1_1
+arch shop_empty
 x 15
 y 1
 end
 arch wall_2_1_1
 x 15
+y 1
+end
+arch shop_empty
+x 15
 y 2
 end
 arch wall_2_1_1
 x 15
+y 2
+end
+arch shop_empty
+x 15
 y 3
 end
 arch wall_2_1_1
 x 15
+y 3
+end
+arch shop_empty
+x 15
 y 4
 end
 arch wall_2_1_1
 x 15
+y 4
+end
+arch shop_empty
+x 15
 y 5
 end
 arch wall_2_1_1
 x 15
+y 5
+end
+arch shop_empty
+x 15
 y 6
 end
 arch wall_2_1_1
 x 15
+y 6
+end
+arch shop_empty
+x 15
 y 7
 end
 arch wall_2_1_1
 x 15
+y 7
+end
+arch shop_empty
+x 15
 y 8
 end
 arch wall_2_1_1
 x 15
+y 8
+end
+arch shop_empty
+x 15
 y 9
 end
 arch wall_2_1_1
 x 15
+y 9
+end
+arch shop_empty
+x 15
 y 10
 end
 arch wall_2_1_1
 x 15
+y 10
+end
+arch shop_empty
+x 15
 y 11
 end
 arch wall_2_1_1
 x 15
+y 11
+end
+arch shop_empty
+x 15
 y 12
 end
 arch wall_2_1_1
 x 15
+y 12
+end
+arch shop_empty
+x 15
 y 13
 end
 arch wall_2_1_1
 x 15
+y 13
+end
+arch shop_empty
+x 15
 y 14
 end
+arch wall_2_1_1
+x 15
+y 14
+end
+arch shop_empty
+x 15
+y 15
+end
 arch wall_2_2_4
 x 15
 y 15
diff --git a/unlinked/kandora/dd_church b/unlinked/kandora/dd_church
index fa02a9f6b..6e3c5bc46 100644
--- a/unlinked/kandora/dd_church
+++ b/unlinked/kandora/dd_church
@@ -6,6 +6,7 @@ enter_x 3
 enter_y 10
 msg
 Created:  1999-02-03 King Zoobus
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
 arch cobblestones2
@@ -240,11 +241,11 @@ arch cobblestones2
 x 3
 y 1
 end
-arch altar_jehovah
+arch dungeon_magic
 x 3
 y 1
 end
-arch dungeon_magic
+arch altar_valriel
 x 3
 y 1
 end
diff --git a/unlinked/kandora/dm_church b/unlinked/kandora/dm_church
index e94394ede..05264ba9d 100644
--- a/unlinked/kandora/dm_church
+++ b/unlinked/kandora/dm_church
@@ -6,7 +6,7 @@ enter_x 3
 enter_y 10
 msg
 Created:  1999-02-03 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
 arch cobblestones2
@@ -225,11 +225,11 @@ arch cobblestones2
 x 3
 y 1
 end
-arch altar_jehovah
+arch dungeon_magic
 x 3
 y 1
 end
-arch dungeon_magic
+arch altar_valriel
 x 3
 y 1
 end