diff --git a/mods/menu.hjson b/mods/menu.hjson
index 2356a937..1ed12a98 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -76,7 +76,6 @@
 		login: {
 			art: USERLOG
 			next: fullLoginSequenceLoginArt
-			//next: loginOnelinerz
 			config: {
 				tooNodeMenu: loginAttemptTooNode
 			}
@@ -113,91 +112,6 @@
 			}
 		}
 
-		loginOnelinerz: {
-			desc: Viewing Onelinerz
-			module: onelinerz
-			next: fullLoginSequenceLoginArt
-			options: {
-				cls: true
-			}
-			config: {
-				art: {
-					entries: ONELINER
-					add: ONEADD
-				}
-			}
-			form: {
-				0: {
-					mci: {
-						VM1: {
-							focus: false
-							height: 10
-						}
-						TM2: {
-							argName: addOrExit
-							items: [ "yeah!", "nah" ]
-							submit: true
-							focus: true
-						}
-					}
-					submit: {
-						*: [
-							{
-								value: { addOrExit: 0 }
-								action: @method:viewAddScreen
-							}
-							{
-								value: { addOrExit: null }
-								action: @systemMethod:nextMenu
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @systemMethod:nextMenu
-						}
-					]
-				},
-				1: {
-					mci: {
-						ET1: {
-							focus: true
-							maxLength: 70
-							argName: oneliner
-						}
-						TL2: {
-							width: 60
-						}
-						TM3: {
-							argName: addOrCancel
-							items: [ "add", "cancel" ]
-							submit: true
-						}
-					}
-
-					submit: {
-						*: [
-							{
-								value: { addOrCancel: 0 }
-								action: @method:addEntry
-							}
-							{
-								value: { addOrCancel: 1 }
-								action: @method:cancelAdd
-							}
-						]
-					}
-					actionKeys: [
-						{
-							keys: [ "escape" ]
-							action: @method:cancelAdd
-						}
-					]
-				}
-			}
-		}
-
 		loginAttemptTooNode: {
 			art: TOONODE
 			options: {
@@ -603,9 +517,96 @@
 			module: whos_online
 			art: WHOSON
 			options: { pause: true }
-			next: fullLoginSequenceNewScanConfirm
+			next: fullLoginSequenceOnelinerz
 		}
 
+		fullLoginSequenceOnelinerz: {
+			desc: Viewing Onelinerz
+			module: onelinerz
+			next: fullLoginSequenceNewScanConfirm
+			options: {
+				cls: true
+			}
+			config: {
+				art: {
+					entries: ONELINER
+					add: ONEADD
+				}
+			}
+			form: {
+				0: {
+					mci: {
+						VM1: {
+							focus: false
+							height: 10
+						}
+						TM2: {
+							argName: addOrExit
+							items: [ "yeah!", "nah" ]
+							"hotKeys"	: { "Y" : 0, "N" : 1, "Q" : 1 }
+							submit: true
+							focus: true
+						}
+					}
+					submit: {
+						*: [
+							{
+								value: { addOrExit: 0 }
+								action: @method:viewAddScreen
+							}
+							{
+								value: { addOrExit: null }
+								action: @systemMethod:nextMenu
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape" ]
+							action: @systemMethod:nextMenu
+						}
+					]
+				},
+				1: {
+					mci: {
+						ET1: {
+							focus: true
+							maxLength: 70
+							argName: oneliner
+						}
+						TL2: {
+							width: 60
+						}
+						TM3: {
+							argName: addOrCancel
+							items: [ "add", "cancel" ]
+							"hotKeys"	: { "A" : 0, "C" : 1, "Q" : 1 }
+							submit: true
+						}
+					}
+
+					submit: {
+						*: [
+							{
+								value: { addOrCancel: 0 }
+								action: @method:addEntry
+							}
+							{
+								value: { addOrCancel: 1 }
+								action: @method:cancelAdd
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape" ]
+							action: @method:cancelAdd
+						}
+					]
+				}
+			}
+		}	
+
 		fullLoginSequenceNewScanConfirm: {
 			desc: Logging In
 			prompt: loginGlobalNewScan
@@ -730,6 +731,10 @@
 					value: { command: "K" }
 					action: @menu:mainMenuFeedbackToSysOp
 				}
+				{
+					value: { command: "O" }
+					action: @menu:mainMenuOnelinerz
+				}
 				{
 					value: { command: "CHAT"}
 					action: @menu:ercClient
@@ -997,6 +1002,92 @@
 			}
 		}
 
+		mainMenuOnelinerz: {
+			desc: Viewing Onelinerz
+			module: onelinerz
+			options: {
+				cls: true
+			}
+			config: {
+				art: {
+					entries: ONELINER
+					add: ONEADD
+				}
+			}
+			form: {
+				0: {
+					mci: {
+						VM1: {
+							focus: false
+							height: 10
+						}
+						TM2: {
+							argName: addOrExit
+							items: [ "yeah!", "nah" ]
+							"hotKeys"	: { "Y" : 0, "N" : 1, "Q" : 1 }
+							submit: true
+							focus: true
+						}
+					}
+					submit: {
+						*: [
+							{
+								value: { addOrExit: 0 }
+								action: @method:viewAddScreen
+							}
+							{
+								value: { addOrExit: null }
+								action: @systemMethod:nextMenu
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape" ]
+							action: @systemMethod:nextMenu
+						}
+					]
+				},
+				1: {
+					mci: {
+						ET1: {
+							focus: true
+							maxLength: 70
+							argName: oneliner
+						}
+						TL2: {
+							width: 60
+						}
+						TM3: {
+							argName: addOrCancel
+							items: [ "add", "cancel" ]
+							"hotKeys"	: { "A" : 0, "C" : 1, "Q" : 1 }
+							submit: true
+						}
+					}
+
+					submit: {
+						*: [
+							{
+								value: { addOrCancel: 0 }
+								action: @method:addEntry
+							}
+							{
+								value: { addOrCancel: 1 }
+								action: @method:cancelAdd
+							}
+						]
+					}
+					actionKeys: [
+						{
+							keys: [ "escape" ]
+							action: @method:cancelAdd
+						}
+					]
+				}
+			}
+		}
+
 		ercClient: {
 			art: erc
 			module: erc_client
diff --git a/mods/onelinerz.js b/mods/onelinerz.js
index 74d912cf..80bd301e 100644
--- a/mods/onelinerz.js
+++ b/mods/onelinerz.js
@@ -209,7 +209,11 @@ function OnelinerzModule(options) {
 		const previewView	= self.viewControllers.add.getView(MciCodeIds.AddForm.EntryPreview);
 
 		newEntryView.setText('');
-		previewView.setText('');
+		
+		//	preview is optional
+		if(previewView) {
+			previewView.setText('');
+		}
 	};
 
 	this.menuMethods = {
diff --git a/mods/themes/luciano_blocktronics/theme.hjson b/mods/themes/luciano_blocktronics/theme.hjson
index 98f16cb4..ac359ac8 100644
--- a/mods/themes/luciano_blocktronics/theme.hjson
+++ b/mods/themes/luciano_blocktronics/theme.hjson
@@ -84,7 +84,7 @@
 				}
 			}
 
-			loginOnelinerz: {
+			fullLoginSequenceOnelinerz: {
 				config: {
 					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.58}"
 				}
@@ -180,6 +180,30 @@
 				}
 			}
 
+			mainMenuOnelinerz: {
+				//	:TODO: Need way to just duplicate entry here & in menu.hjson, e.g. use: someName + must supply next/etc. in menu
+				config: {
+					listFormat: "|00|11{username:<12}|08: |03{oneliner:<59.58}"
+				}
+				0: {
+					mci: {
+						VM1: { height: 10 }
+						TM2: {
+							focusTextStyle: first lower
+						}						
+					}
+				}
+				1: {
+					mci: {
+						ET1: { width: 60 }
+						TL2: { width: 60 }
+						TM3: {
+							focusTextStyle: first lower
+						}
+					}
+				}
+			}
+
 			messageAreaMessageList: {
 				config: {
 					listFormat: "|00|15{msgNum:>4}  |03{subj:<29.29} |11{from:<20.20} |03{ts} |01|31{newIndicator}"