diff --git a/core/color_codes.js b/core/color_codes.js
index ff08275e..da6c8f5d 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -126,7 +126,7 @@ function renegadeToAnsi(s, client) {
 
 //
 //  Converts various control codes popular in BBS packages
-//  to ANSI escape sequences. Additionaly supports ENiGMA style
+//  to ANSI escape sequences. Additionally supports ENiGMA style
 //  MCI codes.
 //
 //  Supported control code formats:
@@ -134,16 +134,17 @@ function renegadeToAnsi(s, client) {
 //  * PCBoard       : @X## where the first number/char is BG color, and second is FG
 //  * WildCat!      : @##@ the same as PCBoard without the X prefix, but with a @ suffix
 //  * WWIV          : ^#
-//  * CNET Y-Style  : 0x19## where ## is a specific set of codes -- this is the older format
-//  * CNET Q-style  : 0x11##} where ## is a specific set of codes -- this is the newer format
+//  * CNET Control-Y: AKA Y-Style -- 0x19## where ## is a specific set of codes (older format)
+//  * CNET Control-Q: AKA Q-style -- 0x11##} where ## is a specific set of codes (newer format)
 //
 //  TODO: Add Synchronet and Celerity format support
 //
 //  Resources:
 //  * http://wiki.synchro.net/custom:colors
+//  * https://archive.org/stream/C-Net_Pro_3.0_1994_Perspective_Software/C-Net_Pro_3.0_1994_Perspective_Software_djvu.txt
 //
 function controlCodesToAnsi(s, client) {
-    const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)|(\x19(c[0-9a-f]|z[0-7]|n1|f1)|\x19)|(\x11(c[0-9a-f]|z[0-7]|n1|f1)}|\x11)/g;    //  eslint-disable-line no-control-regex
+    const RE = /(\|([A-Z0-9]{2})|\|)|(@X([0-9A-F]{2}))|(@([0-9A-F]{2})@)|(\x03[0-9]|\x03)|(\x19(c[0-9a-f]|z[0-7]|n1|f1|q1)|\x19)|(\x11(c[0-9a-f]|z[0-7]|n1|f1|q1)}|\x11)/g;    //  eslint-disable-line no-control-regex
 
     let m;
     let result      = '';
diff --git a/core/fse.js b/core/fse.js
index 2096f293..c085ef2c 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -455,11 +455,12 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
                         //
                         if (this.menuConfig.config.quoteStyleLevel1) {
                             //  can be a single style to cover 'XX> TEXT' or an array to cover 'XX', '>', and TEXT
+                            //  Non-standard (as for BBSes) single > TEXT, omitting space before XX, etc. are allowed
                             const styleL1 = styleToArray(this.menuConfig.config.quoteStyleLevel1, 3);
 
-                            const QuoteRegex = /^ ([A-Za-z0-9]{1,2})>([ ]+)([^\r\n]*\r?\n)/gm;
-                            msg = msg.replace(QuoteRegex, (m, initials, spc, text) => {
-                                return ` ${styleL1[0]}${initials}${styleL1[1]}>${spc}${styleL1[2]}${text}${bodyMessageView.styleSGR1}`;
+                            const QuoteRegex = /^([ ]?)([!-~]{0,2})>([ ]*)([^\r\n]*\r?\n)/gm;
+                            msg = msg.replace(QuoteRegex, (m, spc1, initials, spc2, text) => {
+                                return `${spc1}${styleL1[0]}${initials}${styleL1[1]}>${spc2}${styleL1[2]}${text}${bodyMessageView.styleSGR1}`;
                             });
                         }