diff --git a/navar_city/illusion/illtow3 b/navar_city/illusion/illtow3
index 7a63b9332..5d2a97068 100644
--- a/navar_city/illusion/illtow3
+++ b/navar_city/illusion/illtow3
@@ -8,7 +8,7 @@ enter_x 9
 enter_y 8
 msg
 Created:  1993-11-10
-Modified: 2008-10-26 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch large_stones
@@ -562,10 +562,8 @@ arch large_stones
 x 4
 y 12
 end
-arch oakdoor
-name stones
+arch invis_exit
 slaying illtow4
-face largestone.111
 hp 1
 sp 1
 x 4
diff --git a/navar_city/misc/bowyer b/navar_city/misc/bowyer
index 2db869291..642f7e603 100644
--- a/navar_city/misc/bowyer
+++ b/navar_city/misc/bowyer
@@ -9,7 +9,7 @@ enter_x 6
 enter_y 14
 msg
 Created:  2002-12-28
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch grass
@@ -673,13 +673,17 @@ arch woodfloor2
 x 6
 y 14
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_116
 hp 14
 sp 43
 x 6
 y 14
 end
+arch door_2
+x 6
+y 14
+end
 arch grass
 x 7
 end
diff --git a/navar_city/misc/buildshop b/navar_city/misc/buildshop
index 47aa25d03..8e9069ffc 100644
--- a/navar_city/misc/buildshop
+++ b/navar_city/misc/buildshop
@@ -6,14 +6,13 @@ shopitems building material:95;item builder:95;*:-100
 shopgreed 1.00000
 shopmin 500
 shopmax 20000
-shoprace human
 width 23
 height 13
 enter_x 6
 enter_y 11
 msg
 Created:  2004-01-25 Ryo Saeba
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch tile_white_floor
@@ -482,7 +481,7 @@ arch tile_white_floor
 x 5
 y 12
 end
-arch westcwall_2_1_2
+arch westcwall_1_3
 x 5
 y 12
 end
@@ -548,21 +547,15 @@ arch tile_white_floor
 x 6
 y 11
 end
-arch oakdoor
-slaying /world/world_122_117
-msg
-Thank you for your visit!
-endmsg
-hp 17
-sp 4
-x 6
-y 11
-end
 arch tile_white_floor
 x 6
 y 12
 end
-arch westcwall_2_1_2
+arch invis_exit
+x 6
+y 12
+end
+arch door_2
 x 6
 y 12
 end
@@ -692,7 +685,7 @@ arch tile_white_floor
 x 7
 y 12
 end
-arch westcwall_2_1_2
+arch westcwall_1_4
 x 7
 y 12
 end
diff --git a/navar_city/misc/city1armour b/navar_city/misc/city1armour
index 773be05e1..27a55b8f7 100644
--- a/navar_city/misc/city1armour
+++ b/navar_city/misc/city1armour
@@ -7,14 +7,13 @@ shopitems armour:45;shield:40;helmet:30;bracers:20;boots:15;gloves:6;cloak:10;gi
 shopgreed 1.10000
 shopmin 20
 shopmax 10000
-shoprace dwarf
 width 19
 height 16
 enter_x 1
-enter_y 1
+enter_y 2
 msg
 Created:  1993-10-27
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -28,7 +27,7 @@ name floor
 face shop_empty.111
 y 1
 end
-arch wall_2_1_1
+arch wall_1_2
 y 1
 end
 arch flagstone
@@ -36,7 +35,13 @@ name floor
 face shop_empty.111
 y 2
 end
-arch wall_2_1_1
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 2
+y 2
+end
+arch door_1
 y 2
 end
 arch flagstone
@@ -44,7 +49,7 @@ name floor
 face shop_empty.111
 y 3
 end
-arch wall_3_2
+arch wall_2_2_2
 y 3
 end
 arch shop_empty
@@ -133,13 +138,6 @@ face shop_empty.111
 x 1
 y 1
 end
-arch oakdoor
-slaying /world/world_122_117
-hp 16
-sp 2
-x 1
-y 1
-end
 arch flagstone
 name floor
 face shop_empty.111
diff --git a/navar_city/misc/city1gen b/navar_city/misc/city1gen
index bf71825bf..58e8e930a 100644
--- a/navar_city/misc/city1gen
+++ b/navar_city/misc/city1gen
@@ -12,9 +12,10 @@ shoprace human
 width 14
 height 21
 enter_x 1
-enter_y 1
+enter_y 2
 msg
 Created:  1993-10-29
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch cobblestones2
@@ -24,19 +25,25 @@ end
 arch cobblestones2
 y 1
 end
-arch westcwall_2_1_1
+arch westcwall_1_2
 y 1
 end
 arch cobblestones2
 y 2
 end
-arch westcwall_2_1_1
+arch invis_exit
+slaying /world/world_122_117
+hp 12
+sp 12
+y 2
+end
+arch door_1
 y 2
 end
 arch cobblestones2
 y 3
 end
-arch westcwall_2_1_1
+arch westcwall_1_1
 y 3
 end
 arch shop_empty
@@ -151,13 +158,6 @@ arch cobblestones2
 x 1
 y 1
 end
-arch oakdoor
-slaying /world/world_122_117
-hp 12
-sp 12
-x 1
-y 1
-end
 arch cobblestones2
 x 1
 y 2
diff --git a/navar_city/misc/city1magic b/navar_city/misc/city1magic
index c66e169f5..8c717e9c5 100644
--- a/navar_city/misc/city1magic
+++ b/navar_city/misc/city1magic
@@ -12,10 +12,10 @@ shoprace human
 width 21
 height 16
 enter_x 1
-enter_y 1
+enter_y 2
 msg
 Created:  1993-11-02
-Modified: 2008-05-23 Arvid Norlander
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -31,7 +31,7 @@ name_pl floor
 face shop_empty.111
 y 1
 end
-arch westcwall_2_1_1
+arch westcwall_1_2
 y 1
 end
 arch flagstone
@@ -40,7 +40,13 @@ name_pl floor
 face shop_empty.111
 y 2
 end
-arch westcwall_2_1_1
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 11
+y 2
+end
+arch door_1
 y 2
 end
 arch flagstone
@@ -52,7 +58,7 @@ end
 arch swall_1_4_half
 y 3
 end
-arch westcwall_2_1_1
+arch westcwall_1_1
 y 3
 end
 arch shop_empty
@@ -149,10 +155,7 @@ face shop_empty.111
 x 1
 y 1
 end
-arch oakdoor
-slaying /world/world_122_117
-hp 16
-sp 11
+arch identify_table
 x 1
 y 1
 end
@@ -163,10 +166,6 @@ face shop_empty.111
 x 1
 y 2
 end
-arch identify_table
-x 1
-y 2
-end
 arch flagstone
 name floor
 name_pl floor
diff --git a/navar_city/misc/city1mermaid b/navar_city/misc/city1mermaid
index d57291b3e..c1133bac0 100644
--- a/navar_city/misc/city1mermaid
+++ b/navar_city/misc/city1mermaid
@@ -8,7 +8,7 @@ enter_x 10
 enter_y 12
 msg
 Created:  1993-10-27
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -1045,13 +1045,17 @@ arch woodfloor
 x 10
 y 12
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_117
 hp 12
 sp 0
 x 10
 y 12
 end
+arch large_hdoor1
+x 10
+y 12
+end
 arch woodfloor
 x 11
 end
@@ -1123,7 +1127,7 @@ arch woodfloor
 x 11
 y 12
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_117
 hp 12
 sp 0
diff --git a/navar_city/misc/city1smith b/navar_city/misc/city1smith
index 4dd385fba..f82549981 100644
--- a/navar_city/misc/city1smith
+++ b/navar_city/misc/city1smith
@@ -14,7 +14,7 @@ enter_x 8
 enter_y 8
 msg
 Created:  1993-10-27
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch stonefloor2
@@ -614,14 +614,17 @@ arch stonefloor2
 x 8
 y 9
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_117
-face odoor_2.111
 hp 11
 sp 7
 x 8
 y 9
 end
+arch door_2
+x 8
+y 9
+end
 arch stonefloor2
 x 9
 end
diff --git a/navar_city/misc/city1weapon b/navar_city/misc/city1weapon
index 67aa071c1..629faaf96 100644
--- a/navar_city/misc/city1weapon
+++ b/navar_city/misc/city1weapon
@@ -7,14 +7,13 @@ shopitems weapon:30;skill tool:0;weapon improver:40;treasure:-20;*:-45
 shopgreed 1.00000
 shopmin 20
 shopmax 10000
-shoprace human
 width 21
 height 11
 enter_x 1
-enter_y 1
+enter_y 2
 msg
 Created:  1993-10-27
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -28,7 +27,7 @@ name floor
 face shop_empty.111
 y 1
 end
-arch wwall_2_1_1
+arch wwall_1_2
 y 1
 end
 arch flagstone
@@ -36,7 +35,13 @@ name floor
 face shop_empty.111
 y 2
 end
-arch wwall_2_1_1
+arch invis_exit
+slaying /world/world_122_117
+hp 16
+sp 8
+y 2
+end
+arch door_1
 y 2
 end
 arch flagstone
@@ -47,7 +52,7 @@ end
 arch swall_1_4_half
 y 3
 end
-arch wwall_2_1_1
+arch wwall_1_1
 y 3
 end
 arch shop_empty
@@ -109,13 +114,6 @@ face shop_empty.111
 x 1
 y 1
 end
-arch oakdoor
-slaying /world/world_122_117
-hp 16
-sp 8
-x 1
-y 1
-end
 arch flagstone
 name floor
 face shop_empty.111
diff --git a/navar_city/misc/dragon_guild b/navar_city/misc/dragon_guild
index 5a7c608d1..b2b1dbdcf 100644
--- a/navar_city/misc/dragon_guild
+++ b/navar_city/misc/dragon_guild
@@ -14,7 +14,7 @@ enter_x 7
 enter_y 15
 msg
 Created:  2002-02-28
-Modified: 2008-09-20 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -904,13 +904,17 @@ arch flagstone
 x 7
 y 15
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_117
 hp 3
 sp 15
 x 7
 y 15
 end
+arch door_2
+x 7
+y 15
+end
 arch flagstone
 x 8
 end
diff --git a/navar_city/misc/jeweler b/navar_city/misc/jeweler
index 9958dac9d..e7f217cce 100644
--- a/navar_city/misc/jeweler
+++ b/navar_city/misc/jeweler
@@ -9,7 +9,7 @@ enter_x 7
 enter_y 13
 msg
 Created:  2004-02-21 Avion
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -660,13 +660,17 @@ arch woodfloor
 x 7
 y 13
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_117
 hp 9
 sp 14
 x 7
 y 13
 end
+arch door_2
+x 7
+y 13
+end
 arch grass
 x 8
 end
diff --git a/navar_city/misc/kitchen b/navar_city/misc/kitchen
index 2adf3704d..cdedab036 100644
--- a/navar_city/misc/kitchen
+++ b/navar_city/misc/kitchen
@@ -8,7 +8,7 @@ enter_x 4
 enter_y 11
 msg
 Created:  2004-02-21 Avion
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch woodfloor2
@@ -363,14 +363,17 @@ y 11
 no_magic 1
 damned 1
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_117
-face odoor_2.111
 hp 0
 sp 7
 x 4
 y 11
 end
+arch door_2
+x 4
+y 11
+end
 arch woodfloor2
 x 5
 end
diff --git a/navar_city/misc/tannery b/navar_city/misc/tannery
index 7b9eccc39..1bb57ff79 100644
--- a/navar_city/misc/tannery
+++ b/navar_city/misc/tannery
@@ -8,7 +8,7 @@ enter_x 5
 enter_y 10
 msg
 Created:  2002-12-29
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -511,14 +511,17 @@ y 10
 no_magic 1
 damned 1
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_122_116
-face odoor_2.111
 hp 10
 sp 41
 x 5
 y 10
 end
+arch door_2
+x 5
+y 10
+end
 arch flagstone
 x 6
 end
diff --git a/navar_city/misc/thamshop b/navar_city/misc/thamshop
index bb0f878b1..d79df65b1 100644
--- a/navar_city/misc/thamshop
+++ b/navar_city/misc/thamshop
@@ -10,7 +10,7 @@ enter_x 4
 enter_y 13
 msg
 Created:  2004-22-02 Avion
-Modified: 2008-11-02 Rick Tanner
+Modified: 2008-11-29 Rick Tanner
 endmsg
 end
 arch tile_white_floor
@@ -468,14 +468,17 @@ arch cobblestones2
 x 4
 y 13
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_121_117
-face odoor_2.111
 hp 48
 sp 8
 x 4
 y 13
 end
+arch door_2
+x 4
+y 13
+end
 arch tile_white_floor
 x 5
 end