diff --git a/core/theme.js b/core/theme.js
index c5b90233..0796b8ab 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -580,7 +580,11 @@ function displayThemedPrompt(name, client, options, cb) {
 					client,
 					dispOptions,
 					(err, artInfo) => {
-						return callback(err, promptConfig, artInfo);
+						if(err) {
+							return callback(err);
+						}
+
+						return callback(null, promptConfig, artInfo);
 					}
 				);
 			},
diff --git a/mods/menu.hjson b/mods/menu.hjson
index dbe99d85..08202ca6 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -598,7 +598,17 @@
 		fullLoginSequenceOnelinerz: {
 			desc: Viewing Onelinerz
 			module: onelinerz
-			next: fullLoginSequenceNewScanConfirm
+			next: [
+				{
+					//	calls >= 2
+					acs: NC2
+					next: fullLoginSequenceNewScanConfirm
+				}
+				{
+					// new users - skip new scan
+					next: fullLoginSequenceUserStats
+				}
+			]
 			options: {
 				cls: true
 			}
@@ -1006,28 +1016,33 @@
 				}
 			]
 		}
+
 		mainMenuLastCallers: {
 			desc: Last Callers
 			module: last_callers
 			art: LASTCALL
 			options: { pause: true }
 		}
+
 		mainMenuWhosOnline: {
 			desc: Who's Online
 			module: whos_online
 			art: WHOSON
 			options: { pause: true }
 		}
+
 		mainMenuUserStats: {
 			desc: User Stats
 			art: STATUS
 			options: { pause: true }
 		}
+
 		mainMenuSystemStats: {
 			desc: System Stats
 			art: SYSSTAT
 			options: { pause: true }
 		}
+
 		mainMenuUserList: {
 			desc: User Listing
 			module: user_list
@@ -1615,15 +1630,11 @@
 					action: @systemMethod:prevMenu
 				}
 				{
-					value: { command: "1" }
+					value: { command: "PW" }
 					action: @menu:doorPimpWars
 				}
 				{
-					value: { command: "2" }
-					action: @menu:doorLORD
-				}
-				{
-					value: { command: "4" }
+					value: { command: "TW" }
 					action: @menu:doorTradeWars2002BBSLink
 				}
 				{
@@ -1635,19 +1646,22 @@
 					action: @menu:doorParty
 				}
 				{
-					value: { command: "HL" }
-					action: @menu:telnetBridgeHappyLand
+					value: { command: "AGENT" }
+					action: @menu:telnetBridgeAgency
 				}
 			]
 		}
 
+		//
+		//	Example using the abracadabra module for a retro DOS door
+		//
 		doorPimpWars: {
 			desc: Playing PimpWars
 			module: abracadabra
 			config: {
 				name: PimpWars
 				dropFileType: DORINFO
-				cmd: /home/nuskooler/DOS/scripts/pimpwars.sh
+				cmd: /home/enigma/DOS/scripts/pimpwars.sh
 				args: [
 					"{node}",
 					"{dropFile}",
@@ -1659,37 +1673,6 @@
 			}
 		}
 
-		doorDarkLands: {
-			desc: Playing Dark Lands
-			module: abracadabra
-			config: {
-				name: DARKLANDS
-				dropFileType: DOOR
-				cmd: /home/nuskooler/dev/enigma-bbs/doors/darklands/start.sh
-				args: [
-					"{node}",
-					"{dropFile}",
-					"{srvPort}",
-				],
-				nodeMax: 1
-				tooManyArt: DOORMANY
-				io: socket
-			}
-		}
-
-		doorLORD: {
-			desc: Playing L.O.R.D.
-			module: abracadabra
-			config: {
-				name: LORD
-				dropFileType: DOOR
-				cmd: /usr/bin/dosemu
-				args: [
-					"-quiet", "-f", "/home/nuskooler/DOS/X/LORD/dosemu.conf", "X:\\LORD\\START.BAT {node}"
-				]
-			}
-		}
-
 		//
 		//	TradeWars 2000 example via BBSLink
 		//
@@ -1706,6 +1689,7 @@
 			}
 		}
 
+		//	DoorParty! support. You'll need to registger to obtain credentials
 		doorParty: {
 			desc: Using DoorParty!
 			module: @systemModule:door_party
@@ -1716,14 +1700,11 @@
 			}
 		}
 
-		telnetBridgeHappyLand: {
+		telnetBridgeAgency: {
 			desc: Connected to HappyLand BBS
 			module: telnet_bridge
 			config: {
-				host: andrew.homeunix.org
-				port: 2023
-				//host: agency.bbs.geek.nz
-				//port: 23
+				host: agency.bbs.geek.nz
 			}
 		}
 
@@ -2069,12 +2050,11 @@
 				}
 
 				3: {
-					HM: {
-						mci: {
-							HM1: {
-								items: [ "save", "discard", "quote", "help" ]
-							}
+					mci: {
+						HM1: {
+							items: [ "save", "discard", "quote", "help" ]
 						}
+					}
 
 					submit: {
 						*: [