rename spartan mode to plain mode

11 files changed, 100 insertions, 100 deletions

diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index 8ac5eda..3f8bd5a 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -29,7 +29,7 @@ func main() {
 
 	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
-	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+	flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU,
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index 8657fa9..6924cf3 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -30,7 +30,7 @@ func main() {
 	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
 	flag.BoolVar(&args.RegexInvert, "invert", false, "Invert regex")
-	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+	flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU,
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index 79a53ba..a40da88 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -32,7 +32,7 @@ func main() {
 
 	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
-	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+	flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU,
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index 2b46141..af22779 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -38,7 +38,7 @@ func main() {
 	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
 	flag.BoolVar(&args.RegexInvert, "invert", false, "Invert regex")
-	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+	flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
 	flag.BoolVar(&checkHealth, "checkHealth", false, "Deprecated, flag will be removed soon")
 	flag.BoolVar(&displayColorTable, "colorTable", false, "Show color table")
@@ -74,7 +74,7 @@ func main() {
 	if displayVersion {
 		version.PrintAndExit()
 	}
-	if !args.Spartan {
+	if !args.Plain {
 		if displayWideColorTable {
 			color.TablePrintAndExit(true)
 		}
diff --git a/integrationtests/dcat_test.go b/integrationtests/dcat_test.go
index 6928afa..124cb62 100644
--- a/integrationtests/dcat_test.go
+++ b/integrationtests/dcat_test.go
@@ -17,7 +17,7 @@ func TestDCat(t *testing.T) {
 	stdoutFile := "dcat.out"
 
 	_, err := runCommand(context.TODO(), t, stdoutFile,
-		"../dcat", "--spartan", "--cfg", "none", testdataFile)
+		"../dcat", "--plain", "--cfg", "none", testdataFile)
 
 	if err != nil {
 		t.Error(err)
@@ -40,7 +40,7 @@ func TestDCat2(t *testing.T) {
 	expectedFile := "dcat2.txt.expected"
 	stdoutFile := "dcat2.out"
 
-	args := []string{"--spartan", "--logLevel", "error", "--cfg", "none"}
+	args := []string{"--plain", "--logLevel", "error", "--cfg", "none"}
 
 	// Cat file 100 times in one session.
 	for i := 0; i < 100; i++ {
diff --git a/integrationtests/dcatcolors.expected b/integrationtests/dcatcolors.expected
index fcd8dbf..4f27e64 100644
--- a/integrationtests/dcatcolors.expected
+++ b/integrationtests/dcatcolors.expected
@@ -246,10 +246,10 @@
 REMOTE|integrationtest|100|246|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:33724|Invoking request handler
 REMOTE|integrationtest|100|247|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Creating new server handler
 REMOTE|integrationtest|100|248|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|protocol 4 base64 Y2F0OnNwYXJ0YW49dHJ1ZTpxdWlldD10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-REMOTE|integrationtest|100|249|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:33724|Base64 decoded received command|cat:spartan=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|249|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:33724|Base64 decoded received command|cat:plain=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|250|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling quiet mode
-REMOTE|integrationtest|100|251|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling spartan mode
-REMOTE|integrationtest|100|252|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Handling user command|58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|251|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling plain mode
+REMOTE|integrationtest|100|252|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Handling user command|58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|253|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 REMOTE|integrationtest|100|254|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:33724|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|255|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:33724|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -518,10 +518,10 @@
 REMOTE|integrationtest|100|518|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:34278|Invoking request handler
 REMOTE|integrationtest|100|519|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Creating new server handler
 REMOTE|integrationtest|100|520|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-REMOTE|integrationtest|100|521|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:34278|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|521|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:34278|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|522|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling quiet mode
-REMOTE|integrationtest|100|523|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling spartan mode
-REMOTE|integrationtest|100|524|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|523|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling plain mode
+REMOTE|integrationtest|100|524|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|525|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 REMOTE|integrationtest|100|526|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:34278|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|527|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:34278|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -800,10 +800,10 @@
 REMOTE|integrationtest|100|800|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:36830|Invoking request handler
 REMOTE|integrationtest|100|801|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Creating new server handler
 REMOTE|integrationtest|100|802|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-REMOTE|integrationtest|100|803|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:36830|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|803|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:36830|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|804|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling quiet mode
-REMOTE|integrationtest|100|805|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling spartan mode
-REMOTE|integrationtest|100|806|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|805|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling plain mode
+REMOTE|integrationtest|100|806|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|807|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 REMOTE|integrationtest|100|808|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:36830|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|809|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:36830|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -2101,7 +2101,7 @@
 REMOTE|integrationtest|100|2101|dcatcolors.txt|INFO|20211015-055021|1|stats.go:53|8|11|7|0.45|781h38m58s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 REMOTE|integrationtest|100|2102|dcatcolors.txt|INFO|20211015-055059|paul@172.17.0.1:55200|Incoming authorization
 REMOTE|integrationtest|100|2103|dcatcolors.txt|DEBUG|20211015-055059|paul@172.17.0.1:53194|protocol 4 base64 dGFpbDogL3Zhci9sb2cvZHNlcnZlci8qIHJlZ2V4Om5vb3Ag
-REMOTE|integrationtest|100|2104|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:56120|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2104|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:56120|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2105|dcatcolors.txt|INFO|20211015-054958|1|stats.go:53|8|11|7|0.45|781h38m36s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 REMOTE|integrationtest|100|2106|dcatcolors.txt|INFO|20211015-055047|1|stats.go:53|8|11|7|0.51|781h39m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 REMOTE|integrationtest|100|2107|dcatcolors.txt|DEBUG|20211015-055059|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:true,canSkipLines:true,seekEOF:true)
@@ -2115,14 +2115,14 @@
 REMOTE|integrationtest|100|2115|dcatcolors.txt|INFO|20211015-055041|1|stats.go:53|8|11|7|0.61|781h39m18s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 REMOTE|integrationtest|100|2116|dcatcolors.txt|INFO|20211015-055059|1|stats.go:53|8|15|7|0.58|781h39m37s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=5
 REMOTE|integrationtest|100|2117|dcatcolors.txt|DEBUG|20211015-055059|paul@172.17.0.1:53194|Handling user command|36|[tail: /var/log/dserver/* regex:noop ]
-REMOTE|integrationtest|100|2118|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Enabling spartan mode
+REMOTE|integrationtest|100|2118|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Enabling plain mode
 REMOTE|integrationtest|100|2119|dcatcolors.txt|INFO|20211015-055018|1|stats.go:53|8|11|7|0.45|781h38m56s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 REMOTE|integrationtest|100|2120|dcatcolors.txt|INFO|20211015-055059|Handling connection
 REMOTE|integrationtest|100|2121|dcatcolors.txt|DEBUG|20211015-055105|/var/log/dserver/dserver.log|File truncation check
 REMOTE|integrationtest|100|2122|dcatcolors.txt|INFO|20211015-055051|1|stats.go:53|8|11|7|0.51|781h39m28s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 REMOTE|integrationtest|100|2123|dcatcolors.txt|INFO|20211015-055059|paul@172.17.0.1:55200|Invoking channel handler
 REMOTE|integrationtest|100|2124|dcatcolors.txt|DEBUG|20211015-055059|paul@172.17.0.1:53194|/var/log/dserver/dserver.log|readfiles|Checking config permissions
-REMOTE|integrationtest|100|2125|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2125|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2126|dcatcolors.txt|INFO|20211015-055028|1|stats.go:53|8|11|7|0.53|781h39m6s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 REMOTE|integrationtest|100|2127|dcatcolors.txt|INFO|20211015-055059|paul@172.17.0.1:55050|Incoming authorization
 REMOTE|integrationtest|100|2128|dcatcolors.txt|INFO|20211015-055107|1|stats.go:53|8|26|7|0.57|781h39m44s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=5
@@ -2276,7 +2276,7 @@
 REMOTE|integrationtest|100|2276|dcatcolors.txt|TRACE|20211015-055108|paul@172.17.0.1:46956|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 REMOTE|integrationtest|100|2277|dcatcolors.txt|INFO|20211015-055147|1|stats.go:53|8|11|7|0.41|781h40m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 REMOTE|integrationtest|100|2278|dcatcolors.txt|INFO|20211015-055148|paul@172.17.0.1:53198|Invoking request handler
-REMOTE|integrationtest|100|2279|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:56122|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2279|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:56122|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2280|dcatcolors.txt|INFO|20211015-055108|1|stats.go:53|8|16|7|0.57|781h39m46s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 REMOTE|integrationtest|100|2281|dcatcolors.txt|INFO|20211015-055117|1|stats.go:53|8|11|7|0.56|781h39m55s|MAPREDUCE:STATS|lifetimeConnections=5|currentConnections=0
 REMOTE|integrationtest|100|2282|dcatcolors.txt|FATAL|20211015-055149|paul@172.17.0.1:58312|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
@@ -2290,14 +2290,14 @@
 REMOTE|integrationtest|100|2290|dcatcolors.txt|INFO|20211015-055111|1|stats.go:53|8|11|7|0.57|781h39m48s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 REMOTE|integrationtest|100|2291|dcatcolors.txt|INFO|20211015-055148|paul@172.17.0.1:55202|Incoming authorization
 REMOTE|integrationtest|100|2292|dcatcolors.txt|DEBUG|20211015-055148|paul@172.17.0.1:53198|protocol 4 base64 Y2F0OiAvdmFyL2xvZy9kc2VydmVyLyogcmVnZXg6bm9vcCA=
-REMOTE|integrationtest|100|2293|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Enabling spartan mode
+REMOTE|integrationtest|100|2293|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Enabling plain mode
 REMOTE|integrationtest|100|2294|dcatcolors.txt|DEBUG|20211015-055108|paul@172.17.0.1:33004|shutdown()
 REMOTE|integrationtest|100|2295|dcatcolors.txt|INFO|20211015-055137|1|stats.go:53|8|11|7|0.40|781h40m15s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 REMOTE|integrationtest|100|2296|dcatcolors.txt|DEBUG|20211015-055149|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 REMOTE|integrationtest|100|2297|dcatcolors.txt|INFO|20211015-055121|1|stats.go:53|8|11|7|0.56|781h39m58s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 REMOTE|integrationtest|100|2298|dcatcolors.txt|FATAL|20211015-055148|paul@172.17.0.1:55202|Granting permissions via relaxed-auth
 REMOTE|integrationtest|100|2299|dcatcolors.txt|TRACE|20211015-055148|paul@172.17.0.1:53198|Base64 decoded received command|cat: /var/log/dserver/* regex:noop |35|[cat: /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
-REMOTE|integrationtest|100|2300|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2300|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2301|dcatcolors.txt|TRACE|20211015-055108|paul@172.17.0.1:33004|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 REMOTE|integrationtest|100|2302|dcatcolors.txt|INFO|20211015-055147|1|stats.go:53|8|11|7|0.41|781h40m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 REMOTE|integrationtest|100|2303|dcatcolors.txt|INFO|20211015-055149|/var/log/dserver/dserver.log|End of file reached
@@ -2523,7 +2523,7 @@
 REMOTE|integrationtest|100|2523|dcatcolors.txt|INFO|20211015-055201|Handling connection
 REMOTE|integrationtest|100|2524|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:33008|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 REMOTE|integrationtest|100|2525|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:55054|shutdown()
-REMOTE|integrationtest|100|2526|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:58316|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2526|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:58316|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2527|dcatcolors.txt|DEBUG|20211015-055154|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 REMOTE|integrationtest|100|2528|dcatcolors.txt|INFO|20211015-055154|1|stats.go:53|8|13|7|0.54|781h40m32s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=7
 REMOTE|integrationtest|100|2529|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:53208|Incoming authorization
@@ -2535,13 +2535,13 @@
 REMOTE|integrationtest|100|2535|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:53208|Granting permissions via relaxed-auth
 REMOTE|integrationtest|100|2536|dcatcolors.txt|INFO|20211015-055154|paul@172.17.0.1:33008|Start reading file|/var/log/dserver/dserver.log|dserver.log
 REMOTE|integrationtest|100|2537|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:55054|Still lines to be sent
-REMOTE|integrationtest|100|2538|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|Enabling spartan mode
+REMOTE|integrationtest|100|2538|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|Enabling plain mode
 REMOTE|integrationtest|100|2539|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:46960|shutdown()
 REMOTE|integrationtest|100|2540|dcatcolors.txt|INFO|20211015-055157|1|stats.go:53|8|11|7|0.58|781h40m35s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=7
 REMOTE|integrationtest|100|2541|dcatcolors.txt|INFO|20211015-055201|1|stats.go:53|8|15|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=8
 REMOTE|integrationtest|100|2542|dcatcolors.txt|DEBUG|20211015-055154|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 REMOTE|integrationtest|100|2543|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:55054|ALL lines sent|0xc0000c6000
-REMOTE|integrationtest|100|2544|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2544|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2545|dcatcolors.txt|TRACE|20211015-055154|paul@172.17.0.1:46960|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 REMOTE|integrationtest|100|2546|dcatcolors.txt|INFO|20211015-055201|Handling connection
 REMOTE|integrationtest|100|2547|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:53208|Invoking channel handler
@@ -2568,7 +2568,7 @@
 REMOTE|integrationtest|100|2568|dcatcolors.txt|DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 REMOTE|integrationtest|100|2569|dcatcolors.txt|INFO|20211015-055154|paul@172.17.0.1:46960|Good bye Mister!
 REMOTE|integrationtest|100|2570|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:55206|Invoking channel handler
-REMOTE|integrationtest|100|2571|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:53208|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2571|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:53208|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2572|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:33008|ALL lines sent|0xc0002a4000
 REMOTE|integrationtest|100|2573|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:55056|Incoming authorization
 REMOTE|integrationtest|100|2574|dcatcolors.txt|INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
@@ -2580,18 +2580,18 @@
 REMOTE|integrationtest|100|2580|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|shutdown()
 REMOTE|integrationtest|100|2581|dcatcolors.txt|INFO|20211015-055201|Handling connection
 REMOTE|integrationtest|100|2582|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|Creating new server handler
-REMOTE|integrationtest|100|2583|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:53208|Enabling spartan mode
+REMOTE|integrationtest|100|2583|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:53208|Enabling plain mode
 REMOTE|integrationtest|100|2584|dcatcolors.txt|INFO|20211015-055154|paul@172.17.0.1:33008|Good bye Mister!
 REMOTE|integrationtest|100|2585|dcatcolors.txt|INFO|20211015-055201|1|stats.go:53|8|15|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=8
 REMOTE|integrationtest|100|2586|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:58316|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 REMOTE|integrationtest|100|2587|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:46964|Incoming authorization
 REMOTE|integrationtest|100|2588|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-REMOTE|integrationtest|100|2589|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:53208|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2589|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:53208|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2590|dcatcolors.txt|INFO|20211015-055158|1|stats.go:53|8|11|7|0.58|781h40m36s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=7
 REMOTE|integrationtest|100|2591|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:55056|Invoking channel handler
 REMOTE|integrationtest|100|2592|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|Still lines to be sent
 REMOTE|integrationtest|100|2593|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:46964|Granting permissions via relaxed-auth
-REMOTE|integrationtest|100|2594|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:55206|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2594|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:55206|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2595|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:53208|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 REMOTE|integrationtest|100|2596|dcatcolors.txt|INFO|20211015-055201|Handling connection
 REMOTE|integrationtest|100|2597|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:55056|Invoking request handler
@@ -2603,16 +2603,16 @@
 REMOTE|integrationtest|100|2603|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55056|Creating new server handler
 REMOTE|integrationtest|100|2604|dcatcolors.txt|INFO|20211015-055201|1|stats.go:53|8|13|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 REMOTE|integrationtest|100|2605|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:46964|Invoking channel handler
-REMOTE|integrationtest|100|2606|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|Enabling spartan mode
+REMOTE|integrationtest|100|2606|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|Enabling plain mode
 REMOTE|integrationtest|100|2607|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:53208|Start reading file|/var/log/dserver/dserver.log|dserver.log
 REMOTE|integrationtest|100|2608|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:33010|Granting permissions via relaxed-auth
 REMOTE|integrationtest|100|2609|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55056|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 REMOTE|integrationtest|100|2610|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:58316|Good bye Mister!
 REMOTE|integrationtest|100|2611|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:46964|Invoking request handler
-REMOTE|integrationtest|100|2612|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2612|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2613|dcatcolors.txt|DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 REMOTE|integrationtest|100|2614|dcatcolors.txt|INFO|20211015-055201|1|stats.go:53|8|15|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=8
-REMOTE|integrationtest|100|2615|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:55056|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2615|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:55056|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2616|dcatcolors.txt|INFO|20211015-055207|1|stats.go:53|8|11|7|0.49|781h40m44s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 REMOTE|integrationtest|100|2617|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:46964|Creating new server handler
 REMOTE|integrationtest|100|2618|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|/var/log/dserver/dserver.log|readfiles|Checking config permissions
@@ -2624,13 +2624,13 @@
 REMOTE|integrationtest|100|2624|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:55206|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|2625|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:53208|shutdown()
 REMOTE|integrationtest|100|2626|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:33010|Invoking request handler
-REMOTE|integrationtest|100|2627|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55056|Enabling spartan mode
+REMOTE|integrationtest|100|2627|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55056|Enabling plain mode
 REMOTE|integrationtest|100|2628|dcatcolors.txt|INFO|20211015-055223|Handling connection
-REMOTE|integrationtest|100|2629|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:46964|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2629|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:46964|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2630|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:55206|Start reading file|/var/log/dserver/dserver.log|dserver.log
 REMOTE|integrationtest|100|2631|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:53208|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 REMOTE|integrationtest|100|2632|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33010|Creating new server handler
-REMOTE|integrationtest|100|2633|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55056|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2633|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55056|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2634|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:58318|Incoming authorization
 REMOTE|integrationtest|100|2635|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:46964|Enabling quiet mode
 REMOTE|integrationtest|100|2636|dcatcolors.txt|DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
@@ -2638,13 +2638,13 @@
 REMOTE|integrationtest|100|2638|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33010|protocol 4 base64 Y2F0OnNwYXJ0YW49dHJ1ZTpxdWlldD10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 REMOTE|integrationtest|100|2639|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55056|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 REMOTE|integrationtest|100|2640|dcatcolors.txt|FATAL|20211015-055223|paul@172.17.0.1:58318|Granting permissions via relaxed-auth
-REMOTE|integrationtest|100|2641|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:46964|Enabling spartan mode
+REMOTE|integrationtest|100|2641|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:46964|Enabling plain mode
 REMOTE|integrationtest|100|2642|dcatcolors.txt|INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
 REMOTE|integrationtest|100|2643|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:53208|ALL lines sent|0xc0000d2000
-REMOTE|integrationtest|100|2644|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:33010|Base64 decoded received command|cat:spartan=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2644|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:33010|Base64 decoded received command|cat:plain=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2645|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:55056|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|2646|dcatcolors.txt|INFO|20211015-055223|1|stats.go:53|8|15|7|0.45|781h41m1s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=9
-REMOTE|integrationtest|100|2647|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:46964|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2647|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:46964|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2648|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|shutdown()
 REMOTE|integrationtest|100|2649|dcatcolors.txt|INFO|20211015-055201|1|stats.go:53|8|13|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 REMOTE|integrationtest|100|2650|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33010|Enabling quiet mode
@@ -2653,13 +2653,13 @@
 REMOTE|integrationtest|100|2653|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:46964|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 REMOTE|integrationtest|100|2654|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:55206|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 REMOTE|integrationtest|100|2655|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:53208|Good bye Mister!
-REMOTE|integrationtest|100|2656|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33010|Enabling spartan mode
+REMOTE|integrationtest|100|2656|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33010|Enabling plain mode
 REMOTE|integrationtest|100|2657|dcatcolors.txt|DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 REMOTE|integrationtest|100|2658|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:58318|Invoking request handler
 REMOTE|integrationtest|100|2659|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:46964|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|2660|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:55206|Still lines to be sent
 REMOTE|integrationtest|100|2661|dcatcolors.txt|INFO|20211015-055210|1|stats.go:53|8|11|7|0.49|781h40m48s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
-REMOTE|integrationtest|100|2662|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33010|Handling user command|58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2662|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33010|Handling user command|58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2663|dcatcolors.txt|INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
 REMOTE|integrationtest|100|2664|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:58318|Creating new server handler
 REMOTE|integrationtest|100|2665|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:46964|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -2673,7 +2673,7 @@
 REMOTE|integrationtest|100|2673|dcatcolors.txt|INFO|20211015-055223|Handling connection
 REMOTE|integrationtest|100|2674|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:33010|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|2675|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:55056|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
-REMOTE|integrationtest|100|2676|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:58318|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2676|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:58318|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2677|dcatcolors.txt|INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
 REMOTE|integrationtest|100|2678|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:55206|Good bye Mister!
 REMOTE|integrationtest|100|2679|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:53212|Incoming authorization
@@ -2726,7 +2726,7 @@
 REMOTE|integrationtest|100|2726|dcatcolors.txt|INFO|20211015-055218|1|stats.go:53|8|11|7|0.49|781h40m56s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 REMOTE|integrationtest|100|2727|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:55058|Invoking channel handler
 REMOTE|integrationtest|100|2728|dcatcolors.txt|FATAL|20211015-055223|paul@172.17.0.1:46966|Granting permissions via relaxed-auth
-REMOTE|integrationtest|100|2729|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:55208|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2729|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:55208|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2730|dcatcolors.txt|INFO|20211015-055223|Handling connection
 REMOTE|integrationtest|100|2731|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:55058|Invoking request handler
 REMOTE|integrationtest|100|2732|dcatcolors.txt|INFO|20211015-055223|1|stats.go:53|8|15|7|0.45|781h41m1s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=9
@@ -2738,17 +2738,17 @@
 REMOTE|integrationtest|100|2738|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:55058|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 REMOTE|integrationtest|100|2739|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:46966|Invoking request handler
 REMOTE|integrationtest|100|2740|dcatcolors.txt|INFO|20211015-055223|1|stats.go:53|8|15|7|0.45|781h41m1s|MAPREDUCE:STATS|lifetimeConnections=9|currentConnections=1
-REMOTE|integrationtest|100|2741|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:55058|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2741|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:55058|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2742|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:46966|Creating new server handler
 REMOTE|integrationtest|100|2743|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:33012|Invoking channel handler
 REMOTE|integrationtest|100|2744|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:55058|Enabling quiet mode
 REMOTE|integrationtest|100|2745|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:46966|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 REMOTE|integrationtest|100|2746|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:33012|Invoking request handler
-REMOTE|integrationtest|100|2747|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:55058|Enabling spartan mode
+REMOTE|integrationtest|100|2747|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:55058|Enabling plain mode
 REMOTE|integrationtest|100|2748|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:33012|Creating new server handler
-REMOTE|integrationtest|100|2749|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:55058|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2749|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:55058|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 REMOTE|integrationtest|100|2750|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:33012|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 REMOTE|integrationtest|100|2751|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:55058|/var/log/dserver/dserver.log|readfiles|Checking config permissions
-REMOTE|integrationtest|100|2752|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:33012|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2752|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:33012|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 REMOTE|integrationtest|100|2753|dcatcolors.txt|FATAL|20211015-055223|paul@172.17.0.1:55058|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 REMOTE|integrationtest|100|2754|dcatcolors.txt|INFO|20211015-055223|paul@172.17.0.1:55058|Start reading file|/var/log/dserver/dserver.log|dserver.log
diff --git a/integrationtests/dcatcolors.txt b/integrationtests/dcatcolors.txt
index bb3f89b..ec0447b 100644
--- a/integrationtests/dcatcolors.txt
+++ b/integrationtests/dcatcolors.txt
@@ -246,10 +246,10 @@ INFO|20211015-055201|paul@172.17.0.1:33724|Invoking channel handler
 INFO|20211015-055201|paul@172.17.0.1:33724|Invoking request handler
 DEBUG|20211015-055201|paul@172.17.0.1:33724|Creating new server handler
 DEBUG|20211015-055201|paul@172.17.0.1:33724|protocol 4 base64 Y2F0OnNwYXJ0YW49dHJ1ZTpxdWlldD10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-TRACE|20211015-055201|paul@172.17.0.1:33724|Base64 decoded received command|cat:spartan=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:33724|Base64 decoded received command|cat:plain=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling quiet mode
-DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling spartan mode
-DEBUG|20211015-055201|paul@172.17.0.1:33724|Handling user command|58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling plain mode
+DEBUG|20211015-055201|paul@172.17.0.1:33724|Handling user command|58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]
 DEBUG|20211015-055201|paul@172.17.0.1:33724|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 FATAL|20211015-055201|paul@172.17.0.1:33724|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 INFO|20211015-055201|paul@172.17.0.1:33724|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -518,10 +518,10 @@ INFO|20211015-055201|paul@172.17.0.1:34278|Invoking channel handler
 INFO|20211015-055201|paul@172.17.0.1:34278|Invoking request handler
 DEBUG|20211015-055201|paul@172.17.0.1:34278|Creating new server handler
 DEBUG|20211015-055201|paul@172.17.0.1:34278|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-TRACE|20211015-055201|paul@172.17.0.1:34278|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:34278|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling quiet mode
-DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling spartan mode
-DEBUG|20211015-055201|paul@172.17.0.1:34278|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling plain mode
+DEBUG|20211015-055201|paul@172.17.0.1:34278|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 DEBUG|20211015-055201|paul@172.17.0.1:34278|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 FATAL|20211015-055201|paul@172.17.0.1:34278|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 INFO|20211015-055201|paul@172.17.0.1:34278|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -800,10 +800,10 @@ INFO|20211015-055201|paul@172.17.0.1:36830|Invoking channel handler
 INFO|20211015-055201|paul@172.17.0.1:36830|Invoking request handler
 DEBUG|20211015-055201|paul@172.17.0.1:36830|Creating new server handler
 DEBUG|20211015-055201|paul@172.17.0.1:36830|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-TRACE|20211015-055201|paul@172.17.0.1:36830|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:36830|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling quiet mode
-DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling spartan mode
-DEBUG|20211015-055201|paul@172.17.0.1:36830|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling plain mode
+DEBUG|20211015-055201|paul@172.17.0.1:36830|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 DEBUG|20211015-055201|paul@172.17.0.1:36830|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 FATAL|20211015-055201|paul@172.17.0.1:36830|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 INFO|20211015-055201|paul@172.17.0.1:36830|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -2101,7 +2101,7 @@ INFO|20211015-055059|paul@172.17.0.1:58310|Start reading file|/var/log/dserver/d
 INFO|20211015-055021|1|stats.go:53|8|11|7|0.45|781h38m58s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 INFO|20211015-055059|paul@172.17.0.1:55200|Incoming authorization
 DEBUG|20211015-055059|paul@172.17.0.1:53194|protocol 4 base64 dGFpbDogL3Zhci9sb2cvZHNlcnZlci8qIHJlZ2V4Om5vb3Ag
-TRACE|20211015-055201|paul@172.17.0.1:56120|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:56120|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 INFO|20211015-054958|1|stats.go:53|8|11|7|0.45|781h38m36s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 INFO|20211015-055047|1|stats.go:53|8|11|7|0.51|781h39m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 DEBUG|20211015-055059|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:true,canSkipLines:true,seekEOF:true)
@@ -2115,14 +2115,14 @@ DEBUG|20211015-055102|/var/log/dserver/dserver.log|File truncation check
 INFO|20211015-055041|1|stats.go:53|8|11|7|0.61|781h39m18s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 INFO|20211015-055059|1|stats.go:53|8|15|7|0.58|781h39m37s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=5
 DEBUG|20211015-055059|paul@172.17.0.1:53194|Handling user command|36|[tail: /var/log/dserver/* regex:noop ]
-DEBUG|20211015-055201|paul@172.17.0.1:56120|Enabling spartan mode
+DEBUG|20211015-055201|paul@172.17.0.1:56120|Enabling plain mode
 INFO|20211015-055018|1|stats.go:53|8|11|7|0.45|781h38m56s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 INFO|20211015-055059|Handling connection
 DEBUG|20211015-055105|/var/log/dserver/dserver.log|File truncation check
 INFO|20211015-055051|1|stats.go:53|8|11|7|0.51|781h39m28s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 INFO|20211015-055059|paul@172.17.0.1:55200|Invoking channel handler
 DEBUG|20211015-055059|paul@172.17.0.1:53194|/var/log/dserver/dserver.log|readfiles|Checking config permissions
-DEBUG|20211015-055201|paul@172.17.0.1:56120|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:56120|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 INFO|20211015-055028|1|stats.go:53|8|11|7|0.53|781h39m6s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
 INFO|20211015-055059|paul@172.17.0.1:55050|Incoming authorization
 INFO|20211015-055107|1|stats.go:53|8|26|7|0.57|781h39m44s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=5
@@ -2276,7 +2276,7 @@ DEBUG|20211015-055149|paul@172.17.0.1:58312|/var/log/dserver/dserver.log|readfil
 TRACE|20211015-055108|paul@172.17.0.1:46956|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 INFO|20211015-055147|1|stats.go:53|8|11|7|0.41|781h40m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 INFO|20211015-055148|paul@172.17.0.1:53198|Invoking request handler
-TRACE|20211015-055223|paul@172.17.0.1:56122|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055223|paul@172.17.0.1:56122|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 INFO|20211015-055108|1|stats.go:53|8|16|7|0.57|781h39m46s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 INFO|20211015-055117|1|stats.go:53|8|11|7|0.56|781h39m55s|MAPREDUCE:STATS|lifetimeConnections=5|currentConnections=0
 FATAL|20211015-055149|paul@172.17.0.1:58312|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
@@ -2290,14 +2290,14 @@ INFO|20211015-055149|paul@172.17.0.1:58312|Start reading file|/var/log/dserver/d
 INFO|20211015-055111|1|stats.go:53|8|11|7|0.57|781h39m48s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 INFO|20211015-055148|paul@172.17.0.1:55202|Incoming authorization
 DEBUG|20211015-055148|paul@172.17.0.1:53198|protocol 4 base64 Y2F0OiAvdmFyL2xvZy9kc2VydmVyLyogcmVnZXg6bm9vcCA=
-DEBUG|20211015-055223|paul@172.17.0.1:56122|Enabling spartan mode
+DEBUG|20211015-055223|paul@172.17.0.1:56122|Enabling plain mode
 DEBUG|20211015-055108|paul@172.17.0.1:33004|shutdown()
 INFO|20211015-055137|1|stats.go:53|8|11|7|0.40|781h40m15s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 DEBUG|20211015-055149|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 INFO|20211015-055121|1|stats.go:53|8|11|7|0.56|781h39m58s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 FATAL|20211015-055148|paul@172.17.0.1:55202|Granting permissions via relaxed-auth
 TRACE|20211015-055148|paul@172.17.0.1:53198|Base64 decoded received command|cat: /var/log/dserver/* regex:noop |35|[cat: /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
-DEBUG|20211015-055223|paul@172.17.0.1:56122|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055223|paul@172.17.0.1:56122|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 TRACE|20211015-055108|paul@172.17.0.1:33004|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 INFO|20211015-055147|1|stats.go:53|8|11|7|0.41|781h40m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
 INFO|20211015-055149|/var/log/dserver/dserver.log|End of file reached
@@ -2523,7 +2523,7 @@ DEBUG|20211015-055154|paul@172.17.0.1:55204|ALL lines sent|0xc00032a0e0
 INFO|20211015-055201|Handling connection
 DEBUG|20211015-055154|paul@172.17.0.1:33008|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 DEBUG|20211015-055154|paul@172.17.0.1:55054|shutdown()
-TRACE|20211015-055201|paul@172.17.0.1:58316|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:58316|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 DEBUG|20211015-055154|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 INFO|20211015-055154|1|stats.go:53|8|13|7|0.54|781h40m32s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=7
 INFO|20211015-055201|paul@172.17.0.1:53208|Incoming authorization
@@ -2535,13 +2535,13 @@ INFO|20211015-055154|paul@172.17.0.1:55204|Good bye Mister!
 FATAL|20211015-055201|paul@172.17.0.1:53208|Granting permissions via relaxed-auth
 INFO|20211015-055154|paul@172.17.0.1:33008|Start reading file|/var/log/dserver/dserver.log|dserver.log
 DEBUG|20211015-055154|paul@172.17.0.1:55054|Still lines to be sent
-DEBUG|20211015-055201|paul@172.17.0.1:58316|Enabling spartan mode
+DEBUG|20211015-055201|paul@172.17.0.1:58316|Enabling plain mode
 DEBUG|20211015-055154|paul@172.17.0.1:46960|shutdown()
 INFO|20211015-055157|1|stats.go:53|8|11|7|0.58|781h40m35s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=7
 INFO|20211015-055201|1|stats.go:53|8|15|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=8
 DEBUG|20211015-055154|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 DEBUG|20211015-055154|paul@172.17.0.1:55054|ALL lines sent|0xc0000c6000
-DEBUG|20211015-055201|paul@172.17.0.1:58316|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:58316|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 TRACE|20211015-055154|paul@172.17.0.1:46960|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 INFO|20211015-055201|Handling connection
 INFO|20211015-055201|paul@172.17.0.1:53208|Invoking channel handler
@@ -2568,7 +2568,7 @@ INFO|20211015-055201|Handling connection
 DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 INFO|20211015-055154|paul@172.17.0.1:46960|Good bye Mister!
 INFO|20211015-055201|paul@172.17.0.1:55206|Invoking channel handler
-TRACE|20211015-055201|paul@172.17.0.1:53208|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:53208|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 DEBUG|20211015-055154|paul@172.17.0.1:33008|ALL lines sent|0xc0002a4000
 INFO|20211015-055201|paul@172.17.0.1:55056|Incoming authorization
 INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
@@ -2580,18 +2580,18 @@ FATAL|20211015-055201|paul@172.17.0.1:55056|Granting permissions via relaxed-aut
 DEBUG|20211015-055201|paul@172.17.0.1:58316|shutdown()
 INFO|20211015-055201|Handling connection
 DEBUG|20211015-055201|paul@172.17.0.1:55206|Creating new server handler
-DEBUG|20211015-055201|paul@172.17.0.1:53208|Enabling spartan mode
+DEBUG|20211015-055201|paul@172.17.0.1:53208|Enabling plain mode
 INFO|20211015-055154|paul@172.17.0.1:33008|Good bye Mister!
 INFO|20211015-055201|1|stats.go:53|8|15|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=8
 TRACE|20211015-055201|paul@172.17.0.1:58316|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 INFO|20211015-055201|paul@172.17.0.1:46964|Incoming authorization
 DEBUG|20211015-055201|paul@172.17.0.1:55206|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-DEBUG|20211015-055201|paul@172.17.0.1:53208|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:53208|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 INFO|20211015-055158|1|stats.go:53|8|11|7|0.58|781h40m36s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=7
 INFO|20211015-055201|paul@172.17.0.1:55056|Invoking channel handler
 DEBUG|20211015-055201|paul@172.17.0.1:58316|Still lines to be sent
 FATAL|20211015-055201|paul@172.17.0.1:46964|Granting permissions via relaxed-auth
-TRACE|20211015-055201|paul@172.17.0.1:55206|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:55206|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 DEBUG|20211015-055201|paul@172.17.0.1:53208|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 INFO|20211015-055201|Handling connection
 INFO|20211015-055201|paul@172.17.0.1:55056|Invoking request handler
@@ -2603,16 +2603,16 @@ INFO|20211015-055201|paul@172.17.0.1:33010|Incoming authorization
 DEBUG|20211015-055201|paul@172.17.0.1:55056|Creating new server handler
 INFO|20211015-055201|1|stats.go:53|8|13|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 INFO|20211015-055201|paul@172.17.0.1:46964|Invoking channel handler
-DEBUG|20211015-055201|paul@172.17.0.1:55206|Enabling spartan mode
+DEBUG|20211015-055201|paul@172.17.0.1:55206|Enabling plain mode
 INFO|20211015-055201|paul@172.17.0.1:53208|Start reading file|/var/log/dserver/dserver.log|dserver.log
 FATAL|20211015-055201|paul@172.17.0.1:33010|Granting permissions via relaxed-auth
 DEBUG|20211015-055201|paul@172.17.0.1:55056|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 INFO|20211015-055201|paul@172.17.0.1:58316|Good bye Mister!
 INFO|20211015-055201|paul@172.17.0.1:46964|Invoking request handler
-DEBUG|20211015-055201|paul@172.17.0.1:55206|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:55206|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 INFO|20211015-055201|1|stats.go:53|8|15|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=8
-TRACE|20211015-055201|paul@172.17.0.1:55056|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:55056|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 INFO|20211015-055207|1|stats.go:53|8|11|7|0.49|781h40m44s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 DEBUG|20211015-055201|paul@172.17.0.1:46964|Creating new server handler
 DEBUG|20211015-055201|paul@172.17.0.1:55206|/var/log/dserver/dserver.log|readfiles|Checking config permissions
@@ -2624,13 +2624,13 @@ DEBUG|20211015-055201|paul@172.17.0.1:46964|protocol 4 base64 Y2F0OnF1aWV0PXRydW
 FATAL|20211015-055201|paul@172.17.0.1:55206|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 DEBUG|20211015-055201|paul@172.17.0.1:53208|shutdown()
 INFO|20211015-055201|paul@172.17.0.1:33010|Invoking request handler
-DEBUG|20211015-055201|paul@172.17.0.1:55056|Enabling spartan mode
+DEBUG|20211015-055201|paul@172.17.0.1:55056|Enabling plain mode
 INFO|20211015-055223|Handling connection
-TRACE|20211015-055201|paul@172.17.0.1:46964|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:46964|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 INFO|20211015-055201|paul@172.17.0.1:55206|Start reading file|/var/log/dserver/dserver.log|dserver.log
 TRACE|20211015-055201|paul@172.17.0.1:53208|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 DEBUG|20211015-055201|paul@172.17.0.1:33010|Creating new server handler
-DEBUG|20211015-055201|paul@172.17.0.1:55056|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:55056|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 INFO|20211015-055223|paul@172.17.0.1:58318|Incoming authorization
 DEBUG|20211015-055201|paul@172.17.0.1:46964|Enabling quiet mode
 DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
@@ -2638,13 +2638,13 @@ DEBUG|20211015-055201|paul@172.17.0.1:53208|Still lines to be sent
 DEBUG|20211015-055201|paul@172.17.0.1:33010|protocol 4 base64 Y2F0OnNwYXJ0YW49dHJ1ZTpxdWlldD10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 DEBUG|20211015-055201|paul@172.17.0.1:55056|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 FATAL|20211015-055223|paul@172.17.0.1:58318|Granting permissions via relaxed-auth
-DEBUG|20211015-055201|paul@172.17.0.1:46964|Enabling spartan mode
+DEBUG|20211015-055201|paul@172.17.0.1:46964|Enabling plain mode
 INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
 DEBUG|20211015-055201|paul@172.17.0.1:53208|ALL lines sent|0xc0000d2000
-TRACE|20211015-055201|paul@172.17.0.1:33010|Base64 decoded received command|cat:spartan=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055201|paul@172.17.0.1:33010|Base64 decoded received command|cat:plain=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 FATAL|20211015-055201|paul@172.17.0.1:55056|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 INFO|20211015-055223|1|stats.go:53|8|15|7|0.45|781h41m1s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=9
-DEBUG|20211015-055201|paul@172.17.0.1:46964|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:46964|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 DEBUG|20211015-055201|paul@172.17.0.1:55206|shutdown()
 INFO|20211015-055201|1|stats.go:53|8|13|7|0.53|781h40m39s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 DEBUG|20211015-055201|paul@172.17.0.1:33010|Enabling quiet mode
@@ -2653,13 +2653,13 @@ INFO|20211015-055223|paul@172.17.0.1:58318|Invoking channel handler
 DEBUG|20211015-055201|paul@172.17.0.1:46964|/var/log/dserver/dserver.log|readfiles|Checking config permissions
 TRACE|20211015-055201|paul@172.17.0.1:55206|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
 INFO|20211015-055201|paul@172.17.0.1:53208|Good bye Mister!
-DEBUG|20211015-055201|paul@172.17.0.1:33010|Enabling spartan mode
+DEBUG|20211015-055201|paul@172.17.0.1:33010|Enabling plain mode
 DEBUG|20211015-055201|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
 INFO|20211015-055223|paul@172.17.0.1:58318|Invoking request handler
 FATAL|20211015-055201|paul@172.17.0.1:46964|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 DEBUG|20211015-055201|paul@172.17.0.1:55206|Still lines to be sent
 INFO|20211015-055210|1|stats.go:53|8|11|7|0.49|781h40m48s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
-DEBUG|20211015-055201|paul@172.17.0.1:33010|Handling user command|58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055201|paul@172.17.0.1:33010|Handling user command|58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]
 INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
 DEBUG|20211015-055223|paul@172.17.0.1:58318|Creating new server handler
 INFO|20211015-055201|paul@172.17.0.1:46964|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -2673,7 +2673,7 @@ INFO|20211015-055201|1|stats.go:53|8|13|7|0.53|781h40m39s|MAPREDUCE:STATS|curren
 INFO|20211015-055223|Handling connection
 FATAL|20211015-055201|paul@172.17.0.1:33010|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 TRACE|20211015-055201|paul@172.17.0.1:55056|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
-TRACE|20211015-055223|paul@172.17.0.1:58318|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055223|paul@172.17.0.1:58318|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 INFO|20211015-055201|/var/log/dserver/dserver.log|End of file reached
 INFO|20211015-055201|paul@172.17.0.1:55206|Good bye Mister!
 INFO|20211015-055223|paul@172.17.0.1:53212|Incoming authorization
@@ -2726,7 +2726,7 @@ DEBUG|20211015-055223|paul@172.17.0.1:55208|protocol 4 base64 Y2F0OnF1aWV0PXRydW
 INFO|20211015-055218|1|stats.go:53|8|11|7|0.49|781h40m56s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=8
 INFO|20211015-055223|paul@172.17.0.1:55058|Invoking channel handler
 FATAL|20211015-055223|paul@172.17.0.1:46966|Granting permissions via relaxed-auth
-TRACE|20211015-055223|paul@172.17.0.1:55208|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055223|paul@172.17.0.1:55208|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 INFO|20211015-055223|Handling connection
 INFO|20211015-055223|paul@172.17.0.1:55058|Invoking request handler
 INFO|20211015-055223|1|stats.go:53|8|15|7|0.45|781h41m1s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=9
@@ -2738,17 +2738,17 @@ FATAL|20211015-055223|paul@172.17.0.1:33012|Granting permissions via relaxed-aut
 DEBUG|20211015-055223|paul@172.17.0.1:55058|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 INFO|20211015-055223|paul@172.17.0.1:46966|Invoking request handler
 INFO|20211015-055223|1|stats.go:53|8|15|7|0.45|781h41m1s|MAPREDUCE:STATS|lifetimeConnections=9|currentConnections=1
-TRACE|20211015-055223|paul@172.17.0.1:55058|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055223|paul@172.17.0.1:55058|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 DEBUG|20211015-055223|paul@172.17.0.1:46966|Creating new server handler
 INFO|20211015-055223|paul@172.17.0.1:33012|Invoking channel handler
 DEBUG|20211015-055223|paul@172.17.0.1:55058|Enabling quiet mode
 DEBUG|20211015-055223|paul@172.17.0.1:46966|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 INFO|20211015-055223|paul@172.17.0.1:33012|Invoking request handler
-DEBUG|20211015-055223|paul@172.17.0.1:55058|Enabling spartan mode
+DEBUG|20211015-055223|paul@172.17.0.1:55058|Enabling plain mode
 DEBUG|20211015-055223|paul@172.17.0.1:33012|Creating new server handler
-DEBUG|20211015-055223|paul@172.17.0.1:55058|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+DEBUG|20211015-055223|paul@172.17.0.1:55058|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
 DEBUG|20211015-055223|paul@172.17.0.1:33012|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
 DEBUG|20211015-055223|paul@172.17.0.1:55058|/var/log/dserver/dserver.log|readfiles|Checking config permissions
-TRACE|20211015-055223|paul@172.17.0.1:33012|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+TRACE|20211015-055223|paul@172.17.0.1:33012|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
 FATAL|20211015-055223|paul@172.17.0.1:55058|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
 INFO|20211015-055223|paul@172.17.0.1:55058|Start reading file|/var/log/dserver/dserver.log|dserver.log
diff --git a/integrationtests/dgrep_test.go b/integrationtests/dgrep_test.go
index 35c3ff5..5d68ca9 100644
--- a/integrationtests/dgrep_test.go
+++ b/integrationtests/dgrep_test.go
@@ -19,7 +19,7 @@ func TestDGrep(t *testing.T) {
 
 	_, err := runCommand(context.TODO(), t, stdoutFile,
 		"../dgrep",
-		"--spartan",
+		"--plain",
 		"--cfg", "none",
 		"--grep", "20211002-071947",
 		inFile)
@@ -48,7 +48,7 @@ func TestDGrep2(t *testing.T) {
 
 	_, err := runCommand(context.TODO(), t, stdoutFile,
 		"../dgrep",
-		"--spartan",
+		"--plain",
 		"--cfg", "none",
 		"--grep", "20211002-071947",
 		"--invert",
@@ -78,7 +78,7 @@ func TestDGrepContext(t *testing.T) {
 
 	_, err := runCommand(context.TODO(), t, stdoutFile,
 		"../dgrep",
-		"--spartan",
+		"--plain",
 		"--cfg", "none",
 		"--grep", "20211002-071947",
 		"--after", "3",
@@ -108,7 +108,7 @@ func TestDGrepContext2(t *testing.T) {
 
 	_, err := runCommand(context.TODO(), t, stdoutFile,
 		"../dgrep",
-		"--spartan",
+		"--plain",
 		"--cfg", "none",
 		"--grep", "20211002",
 		"--max", "3",
diff --git a/internal/config/args.go b/internal/config/args.go
index 859166d..5b1fc1e 100644
--- a/internal/config/args.go
+++ b/internal/config/args.go
@@ -35,7 +35,7 @@ type Args struct {
 	SSHPrivateKeyPathFile string
 	Serverless            bool
 	ServersStr            string
-	Spartan               bool
+	Plain               bool
 	Timeout               int
 	TrustAllHosts         bool
 	UserName              string
@@ -67,7 +67,7 @@ func (a *Args) String() string {
 	sb.WriteString(fmt.Sprintf("%s:%v,", "SSHPort", a.SSHPort))
 	sb.WriteString(fmt.Sprintf("%s:%v,", "Serverless", a.Serverless))
 	sb.WriteString(fmt.Sprintf("%s:%v,", "ServersStr", a.ServersStr))
-	sb.WriteString(fmt.Sprintf("%s:%v,", "Spartan", a.Spartan))
+	sb.WriteString(fmt.Sprintf("%s:%v,", "Plain", a.Plain))
 	sb.WriteString(fmt.Sprintf("%s:%v,", "Timeout", a.Timeout))
 	sb.WriteString(fmt.Sprintf("%s:%v,", "TrustAllHosts", a.TrustAllHosts))
 	sb.WriteString(fmt.Sprintf("%s:%v,", "UserName", a.UserName))
@@ -84,8 +84,8 @@ func (a *Args) SerializeOptions() string {
 	if a.Quiet {
 		options["quiet"] = fmt.Sprintf("%v", a.Quiet)
 	}
-	if a.Spartan {
-		options["spartan"] = fmt.Sprintf("%v", a.Spartan)
+	if a.Plain {
+		options["plain"] = fmt.Sprintf("%v", a.Plain)
 	}
 	if a.Serverless {
 		options["serverless"] = fmt.Sprintf("%v", a.Serverless)
diff --git a/internal/config/initializer.go b/internal/config/initializer.go
index 2f4e7cc..f8af8bc 100644
--- a/internal/config/initializer.go
+++ b/internal/config/initializer.go
@@ -123,8 +123,8 @@ func (in *initializer) optimusPrime(sourceCb transformCb, args *Args,
 	// Source type specific transormations.
 	sourceCb(in, args, additionalArgs)
 
-	// Spartan mode.
-	if args.Spartan {
+	// Plain mode.
+	if args.Plain {
 		args.Quiet = true
 		args.NoColor = true
 		in.Client.TermColorsEnable = false
diff --git a/internal/server/handlers/basehandler.go b/internal/server/handlers/basehandler.go
index 53bf375..897ff81 100644
--- a/internal/server/handlers/basehandler.go
+++ b/internal/server/handlers/basehandler.go
@@ -44,7 +44,7 @@ type baseHandler struct {
 	once       sync.Once
 	mutex      sync.Mutex
 	quiet      bool
-	spartan    bool
+	plain    bool
 	serverless bool
 }
 
@@ -96,7 +96,7 @@ func (h *baseHandler) Read(p []byte) (n int, err error) {
 		n = copy(p, h.readBuf.Bytes())
 
 	case line := <-h.lines:
-		if !h.spartan {
+		if !h.plain {
 			h.readBuf.WriteString("REMOTE")
 			h.readBuf.WriteString(protocol.FieldDelimiter)
 			h.readBuf.WriteString(h.hostname)
@@ -255,9 +255,9 @@ func (h *baseHandler) handleOptions(options map[string]string) {
 			dlog.Server.Debug(h.user, "Enabling quiet mode")
 			h.quiet = true
 		}
-		if spartan, _ := options["spartan"]; spartan == "true" {
-			dlog.Server.Debug(h.user, "Enabling spartan mode")
-			h.spartan = true
+		if plain, _ := options["plain"]; plain == "true" {
+			dlog.Server.Debug(h.user, "Enabling plain mode")
+			h.plain = true
 		}
 		if serverless, _ := options["serverless"]; serverless == "true" {
 			dlog.Server.Debug(h.user, "Enabling serverless mode")