diff --git a/santo_dominion/crossfire b/santo_dominion/crossfire
index 4e3f651b5..baad391b9 100644
--- a/santo_dominion/crossfire
+++ b/santo_dominion/crossfire
@@ -7,7 +7,7 @@ height 30
 enter_x 1
 enter_y 17
 msg
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch stonefloor2
@@ -351,7 +351,7 @@ name stonefloor
 x 1
 y 17
 end
-arch oakdoor
+arch exit
 slaying /world/world_102_108
 hp 22
 sp 8
diff --git a/santo_dominion/eeur/hut.1 b/santo_dominion/eeur/hut.1
index 9fbce2f6e..654ea2ad9 100644
--- a/santo_dominion/eeur/hut.1
+++ b/santo_dominion/eeur/hut.1
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 20
 msg
 Created:  1994-02-02
-Modified: 2008-10-21 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch dirtfloor
@@ -1005,13 +1005,17 @@ arch dirtfloor
 x 7
 y 20
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 11
 sp 18
 x 7
 y 20
 end
+arch door_2
+x 7
+y 20
+end
 arch dirtfloor
 x 8
 end
diff --git a/santo_dominion/houses/house1 b/santo_dominion/houses/house1
index c9597bcb6..bd573e8c7 100644
--- a/santo_dominion/houses/house1
+++ b/santo_dominion/houses/house1
@@ -8,7 +8,7 @@ enter_x 11
 enter_y 15
 msg
 Created:  1996-04-18
-Modified: 2008-09-24 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -1275,14 +1275,17 @@ arch woodfloor
 x 11
 y 15
 end
-arch oakdoor
-name Back to town
+arch invis_exit
 slaying /world/world_102_108
 hp 11
 sp 19
 x 11
 y 15
 end
+arch door_2
+x 11
+y 15
+end
 arch woodfloor
 x 12
 end
diff --git a/santo_dominion/magara/north_lighthouse/floor_1 b/santo_dominion/magara/north_lighthouse/floor_1
index 4c4add22d..511706b72 100644
--- a/santo_dominion/magara/north_lighthouse/floor_1
+++ b/santo_dominion/magara/north_lighthouse/floor_1
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 4
 msg
 Created:  1994-10-12
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -2917,7 +2917,7 @@ arch dungeon_floor
 x 14
 y 1
 end
-arch oakdoor
+arch exit
 slaying /world/world_102_108
 hp 11
 sp 7
diff --git a/santo_dominion/magara/opera b/santo_dominion/magara/opera
index 7ce60986e..1d3dc0a95 100644
--- a/santo_dominion/magara/opera
+++ b/santo_dominion/magara/opera
@@ -7,7 +7,7 @@ height 33
 enter_x 1
 enter_y 12
 msg
-Modified: 2008-09-25 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch marble
@@ -59,19 +59,25 @@ end
 arch marble
 y 11
 end
-arch dwall_2_2_2
+arch dwall_1_4
 y 11
 end
 arch marble
 y 12
 end
-arch dwall_2_1_1
+arch invis_exit
+slaying /world/world_102_108
+hp 15
+sp 17
+y 12
+end
+arch door_1
 y 12
 end
 arch marble
 y 13
 end
-arch dwall_2_2_1
+arch dwall_1_4
 y 13
 end
 arch blocked
@@ -313,13 +319,6 @@ arch marble
 x 1
 y 12
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 15
-sp 17
-x 1
-y 12
-end
 arch marble
 x 1
 y 13
diff --git a/santo_dominion/magara/south_lighthouse/floor_1 b/santo_dominion/magara/south_lighthouse/floor_1
index 9ac26aa39..6899ece71 100644
--- a/santo_dominion/magara/south_lighthouse/floor_1
+++ b/santo_dominion/magara/south_lighthouse/floor_1
@@ -8,7 +8,7 @@ enter_x 16
 enter_y 1
 msg
 Created:  1994-10-12
-Modified: 2008-10-25 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch afloor_left
@@ -4478,7 +4478,7 @@ name floor
 x 16
 y 1
 end
-arch oakdoor
+arch exit
 slaying /world/world_102_108
 hp 9
 sp 12
diff --git a/santo_dominion/map.and.sale b/santo_dominion/map.and.sale
index 6733bf103..47c087199 100644
--- a/santo_dominion/map.and.sale
+++ b/santo_dominion/map.and.sale
@@ -9,6 +9,7 @@ height 14
 enter_x 5
 msg
 Created:  Andreas Vogl (red.blaze@gmx.net)
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch blocked
@@ -767,12 +768,15 @@ end
 arch flagstone
 x 5
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 15
 sp 14
 x 5
 end
+arch door_2
+x 5
+end
 arch dungeon_magic
 x 5
 y 1
diff --git a/santo_dominion/north_barn b/santo_dominion/north_barn
index bd678a9c7..93c662d77 100644
--- a/santo_dominion/north_barn
+++ b/santo_dominion/north_barn
@@ -5,9 +5,9 @@ region santodominion
 width 45
 height 40
 enter_x 1
-enter_y 1
+enter_y 2
 msg
-Modified: 2008-06-20 Arvid Norlander
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch woodfloor2
@@ -17,19 +17,25 @@ end
 arch woodfloor2
 y 1
 end
-arch woodwall_2_1_1
+arch woodwall_1_2
 y 1
 end
 arch woodfloor2
 y 2
 end
-arch woodwall_2_1_1
+arch invis_exit
+slaying /world/world_102_108
+hp 36
+sp 14
+y 2
+end
+arch door_1
 y 2
 end
 arch woodfloor2
 y 3
 end
-arch woodwall_2_1_1
+arch woodwall_1_1
 y 3
 end
 arch woodfloor2
@@ -258,13 +264,6 @@ arch woodfloor2
 x 1
 y 1
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 36
-sp 14
-x 1
-y 1
-end
 arch woodfloor2
 x 1
 y 2
diff --git a/santo_dominion/north_farm b/santo_dominion/north_farm
index 33d18b8f9..8bad61530 100644
--- a/santo_dominion/north_farm
+++ b/santo_dominion/north_farm
@@ -8,7 +8,7 @@ height 15
 enter_x 16
 enter_y 14
 msg
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -1587,13 +1587,17 @@ arch woodfloor
 x 16
 y 14
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 34
 sp 15
 x 16
 y 14
 end
+arch door_2
+x 16
+y 14
+end
 arch woodfloor
 x 17
 end
diff --git a/santo_dominion/peacock b/santo_dominion/peacock
index 9f036ada4..b8cfe1ea4 100644
--- a/santo_dominion/peacock
+++ b/santo_dominion/peacock
@@ -7,6 +7,9 @@ width 26
 height 24
 enter_x 9
 enter_y 23
+msg
+Modified: 2008-11-30 Rick Tanner
+endmsg
 end
 arch grass
 end
@@ -1461,13 +1464,17 @@ arch woodfloor
 x 9
 y 23
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 23
 sp 18
 x 9
 y 23
 end
+arch door_2
+x 9
+y 23
+end
 arch grass
 x 10
 end
diff --git a/santo_dominion/sdomino_appartment b/santo_dominion/sdomino_appartment
index bcccd627b..1926c82b2 100644
--- a/santo_dominion/sdomino_appartment
+++ b/santo_dominion/sdomino_appartment
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 1
 msg
 Created:  2000-11-15 Andreas Vogl (red.blaze@gmx.net)
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch blocked
@@ -249,7 +249,7 @@ arch woodfloor
 x 4
 unique 1
 end
-arch wwall_2_2_2
+arch wwall_1_1
 x 4
 end
 arch woodfloor
@@ -317,7 +317,13 @@ arch woodfloor
 x 5
 unique 1
 end
-arch wwall_2_1_2
+arch invis_exit
+slaying /world/world_102_108
+hp 18
+sp 15
+x 5
+end
+arch door_2
 x 5
 end
 arch woodfloor
@@ -325,13 +331,6 @@ x 5
 y 1
 unique 1
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 18
-sp 15
-x 5
-y 1
-end
 arch goldfloor
 name apartment costs 300 plat
 slaying money
@@ -389,7 +388,7 @@ arch woodfloor
 x 6
 unique 1
 end
-arch wwall_2_2_3
+arch wwall_1_1
 x 6
 end
 arch woodfloor
diff --git a/santo_dominion/shops/armour b/santo_dominion/shops/armour
index d22f38975..d44161395 100644
--- a/santo_dominion/shops/armour
+++ b/santo_dominion/shops/armour
@@ -6,11 +6,11 @@ region santodominion
 shopitems armour:60;shield:60;helmet:50;cloak:50;boots:50;gloves:50;bracers:60;girdle:60;*:-60
 width 16
 height 16
-enter_x 1
+enter_x 2
 enter_y 14
 msg
 Created:  1994-10-11
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -173,18 +173,11 @@ arch flagstone
 x 1
 y 14
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 18
-sp 6
-x 1
-y 14
-end
 arch flagstone
 x 1
 y 15
 end
-arch stwall_2_1_2
+arch stwall_1_3
 x 1
 y 15
 end
@@ -258,7 +251,14 @@ arch flagstone
 x 2
 y 15
 end
-arch stwall_2_1_2
+arch invis_exit
+slaying /world/world_102_108
+hp 18
+sp 6
+x 2
+y 15
+end
+arch door_2
 x 2
 y 15
 end
@@ -340,7 +340,7 @@ arch flagstone
 x 3
 y 15
 end
-arch stwall_2_1_2
+arch stwall_1_4
 x 3
 y 15
 end
diff --git a/santo_dominion/shops/eliks b/santo_dominion/shops/eliks
index a32eb4855..ac7de843a 100644
--- a/santo_dominion/shops/eliks
+++ b/santo_dominion/shops/eliks
@@ -7,10 +7,10 @@ shopitems food:80;flesh:50;weapon:10;armour:10;*:-60
 width 20
 height 13
 enter_x 1
-enter_y 1
+enter_y 2
 msg
 Created:  1994-05-12
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -20,19 +20,25 @@ end
 arch flagstone
 y 1
 end
-arch stwall_2_1_1
+arch stwall_1_2
 y 1
 end
 arch flagstone
 y 2
 end
-arch stwall_2_1_1
+arch invis_exit
+slaying /world/world_102_108
+hp 21
+sp 13
+y 2
+end
+arch door_1
 y 2
 end
 arch flagstone
 y 3
 end
-arch stwall_2_1_1
+arch stwall_1_1
 y 3
 end
 arch flagstone
@@ -99,13 +105,6 @@ arch flagstone
 x 1
 y 1
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 21
-sp 13
-x 1
-y 1
-end
 arch flagstone
 x 1
 y 2
diff --git a/santo_dominion/shops/erash b/santo_dominion/shops/erash
index 77a497e6b..995200687 100644
--- a/santo_dominion/shops/erash
+++ b/santo_dominion/shops/erash
@@ -7,7 +7,10 @@ shopitems weapon:95;bow:15;*:-90
 width 12
 height 20
 enter_x 10
-enter_y 1
+enter_y 2
+msg
+Modified: 2008-11-30 Rick Tanner
+endmsg
 end
 arch flagstone
 end
@@ -1068,13 +1071,6 @@ arch flagstone
 x 10
 y 1
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 25
-sp 17
-x 10
-y 1
-end
 arch flagstone
 x 10
 y 2
@@ -1173,7 +1169,7 @@ arch flagstone
 x 11
 y 1
 end
-arch stwall_2_1_1
+arch stwall_1_2
 x 11
 y 1
 end
@@ -1181,7 +1177,14 @@ arch flagstone
 x 11
 y 2
 end
-arch stwall_2_1_1
+arch invis_exit
+slaying /world/world_102_108
+hp 25
+sp 17
+x 11
+y 2
+end
+arch door_1
 x 11
 y 2
 end
@@ -1189,7 +1192,7 @@ arch flagstone
 x 11
 y 3
 end
-arch stwall_2_1_1
+arch stwall_1_1
 x 11
 y 3
 end
diff --git a/santo_dominion/shops/nosferatu b/santo_dominion/shops/nosferatu
index 38136ef4f..70954925d 100644
--- a/santo_dominion/shops/nosferatu
+++ b/santo_dominion/shops/nosferatu
@@ -7,10 +7,10 @@ shopitems amulet:40;ring:40;potion:40;book:40;scroll:40;spellbook:40;skillscroll
 width 20
 height 21
 enter_x 1
-enter_y 14
+enter_y 15
 msg
 Created:  1994-02-12
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -98,19 +98,25 @@ end
 arch flagstone
 y 14
 end
-arch stwall_2_1_1
+arch stwall_1_2
 y 14
 end
 arch flagstone
 y 15
 end
-arch stwall_2_1_1
+arch invis_exit
+slaying /world/world_102_108
+hp 25
+sp 21
+y 15
+end
+arch door_1
 y 15
 end
 arch flagstone
 y 16
 end
-arch stwall_2_1_1
+arch stwall_1_1
 y 16
 end
 arch flagstone
@@ -203,13 +209,6 @@ arch flagstone
 x 1
 y 14
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 25
-sp 21
-x 1
-y 14
-end
 arch flagstone
 x 1
 y 15
diff --git a/santo_dominion/shops/rings b/santo_dominion/shops/rings
index 0ec41f79b..b9dd87801 100644
--- a/santo_dominion/shops/rings
+++ b/santo_dominion/shops/rings
@@ -10,7 +10,7 @@ height 10
 enter_y 4
 msg
 Created:  1994-05-12
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch marble
@@ -38,21 +38,27 @@ end
 arch marble
 y 4
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 17
 sp 20
 y 4
 end
+arch door_1
+y 4
+end
 arch marble
 y 5
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 17
 sp 20
 y 5
 end
+arch door_1
+y 5
+end
 arch marble
 y 6
 end
diff --git a/santo_dominion/south_barn b/santo_dominion/south_barn
index c8c79e357..a966a9394 100644
--- a/santo_dominion/south_barn
+++ b/santo_dominion/south_barn
@@ -5,9 +5,9 @@ region santodominion
 width 40
 height 40
 enter_x 1
-enter_y 1
+enter_y 2
 msg
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch dirtfloor
@@ -17,19 +17,25 @@ end
 arch dirtfloor
 y 1
 end
-arch awall_2_1_1
+arch awall_1_2
 y 1
 end
 arch dirtfloor
 y 2
 end
-arch awall_2_1_1
+arch invis_exit
+slaying /world/world_102_108
+hp 38
+sp 22
+y 2
+end
+arch door_1
 y 2
 end
 arch dirtfloor
 y 3
 end
-arch awall_2_1_1
+arch awall_1_1
 y 3
 end
 arch dirtfloor
@@ -258,13 +264,6 @@ arch dirtfloor
 x 1
 y 1
 end
-arch oakdoor
-slaying /world/world_102_108
-hp 38
-sp 22
-x 1
-y 1
-end
 arch dirtfloor
 x 1
 y 2
diff --git a/santo_dominion/temple_naive/templenaive.1 b/santo_dominion/temple_naive/templenaive.1
index 299025466..fcbf30640 100755
--- a/santo_dominion/temple_naive/templenaive.1
+++ b/santo_dominion/temple_naive/templenaive.1
@@ -8,7 +8,7 @@ enter_x 30
 enter_y 15
 msg
 Created:  2006-05-28 Bort
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch marble
@@ -6832,46 +6832,18 @@ arch marble
 x 30
 y 14
 end
-arch oakdoor
-slaying /world/world_101_107
-hp 25
-sp 7
-x 30
-y 14
-end
 arch marble
 x 30
 y 15
 end
-arch oakdoor
-slaying /world/world_101_107
-hp 25
-sp 7
-x 30
-y 15
-end
 arch marble
 x 30
 y 16
 end
-arch oakdoor
-slaying /world/world_101_107
-hp 25
-sp 7
-x 30
-y 16
-end
 arch marble
 x 30
 y 17
 end
-arch oakdoor
-slaying /world/world_101_107
-hp 25
-sp 7
-x 30
-y 17
-end
 arch marble
 x 30
 y 18
@@ -7105,7 +7077,7 @@ arch marble
 x 31
 y 13
 end
-arch stwall_3_4
+arch stwall_2_2_4
 x 31
 y 13
 end
@@ -7113,7 +7085,14 @@ arch marble
 x 31
 y 14
 end
-arch stwall_2_1_1
+arch invis_exit
+slaying /world/world_101_107
+hp 25
+sp 7
+x 31
+y 14
+end
+arch door_1
 x 31
 y 14
 end
@@ -7121,7 +7100,14 @@ arch marble
 x 31
 y 15
 end
-arch stwall_2_1_1
+arch invis_exit
+slaying /world/world_101_107
+hp 25
+sp 7
+x 31
+y 15
+end
+arch door_1
 x 31
 y 15
 end
@@ -7129,7 +7115,14 @@ arch marble
 x 31
 y 16
 end
-arch stwall_2_1_1
+arch invis_exit
+slaying /world/world_101_107
+hp 25
+sp 7
+x 31
+y 16
+end
+arch door_1
 x 31
 y 16
 end
@@ -7137,7 +7130,14 @@ arch marble
 x 31
 y 17
 end
-arch stwall_2_1_1
+arch invis_exit
+slaying /world/world_101_107
+hp 25
+sp 7
+x 31
+y 17
+end
+arch door_1
 x 31
 y 17
 end
@@ -7145,7 +7145,7 @@ arch marble
 x 31
 y 18
 end
-arch stwall_3_4
+arch stwall_2_2_3
 x 31
 y 18
 end
diff --git a/santo_dominion/tobias b/santo_dominion/tobias
index 65b7087e7..aa569518e 100644
--- a/santo_dominion/tobias
+++ b/santo_dominion/tobias
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 22
 msg
 Created:  Andreas Vogl (red.blaze@gmx.net)
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch blocked
@@ -1226,13 +1226,17 @@ arch flagstone
 x 5
 y 22
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 18
 sp 13
 x 5
 y 22
 end
+arch door_2
+x 5
+y 22
+end
 arch woodfloor
 x 6
 end
diff --git a/santo_dominion/tollpost b/santo_dominion/tollpost
index acf32054f..516519679 100644
--- a/santo_dominion/tollpost
+++ b/santo_dominion/tollpost
@@ -7,7 +7,7 @@ height 22
 enter_x 10
 enter_y 21
 msg
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch dirtfloor
@@ -1484,13 +1484,17 @@ arch dirtfloor
 x 10
 y 21
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 16
 sp 14
 x 10
 y 21
 end
+arch large_hdoor1
+x 10
+y 21
+end
 arch dirtfloor
 x 11
 end
@@ -1627,7 +1631,7 @@ arch dirtfloor
 x 11
 y 21
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_102_108
 hp 16
 sp 14
diff --git a/world/world_102_108 b/world/world_102_108
index 0b6a621a6..03a2eef6e 100644
--- a/world/world_102_108
+++ b/world/world_102_108
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-02-19
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 Modified: 2008-08-01 Raphaël Quinet
 endmsg
 outdoor 1
@@ -4308,7 +4308,7 @@ end
 arch store_armour
 name Hanz und Franz Panzer
 slaying /santo_dominion/shops/armour
-hp 1
+hp 2
 sp 14
 x 18
 y 5
@@ -5148,7 +5148,7 @@ arch store_general
 name Eliks General Store
 slaying /santo_dominion/shops/eliks
 hp 1
-sp 1
+sp 2
 x 21
 y 12
 end
@@ -6148,7 +6148,7 @@ arch store_weapons
 name Erash Sharp Blades
 slaying /santo_dominion/shops/erash
 hp 10
-sp 1
+sp 2
 x 25
 y 16
 end
@@ -6172,7 +6172,7 @@ arch store_magic
 name Nosferatu - Specialist
 slaying /santo_dominion/shops/nosferatu
 hp 1
-sp 14
+sp 15
 x 25
 y 20
 end
@@ -8593,7 +8593,7 @@ arch barn
 name North Barn
 slaying /santo_dominion/north_barn
 hp 1
-sp 1
+sp 2
 x 35
 y 13
 end
@@ -9414,7 +9414,7 @@ arch barn
 name South Barn
 slaying /santo_dominion/south_barn
 hp 1
-sp 1
+sp 2
 x 38
 y 21
 end