From fdc01e28d9f45e923bdbc783f957e5b87f108659 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sun, 21 Jan 2024 00:15:20 -0600
Subject: [PATCH] name changes in the gui package

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 .gitignore               |   1 +
 Makefile                 |   7 +-
 args.go                  |  25 +-
 digStatus.go             | 146 +++++----
 dns-https.go             |  10 +-
 dns.go                   |  43 +--
 errorBox.go              |  62 ++--
 fix.go                   |  49 ++-
 gui.go                   |  71 ++---
 hostnameStatus.go        | 196 +++++++-----
 json.go                  |   2 +-
 main.go                  |  70 ++--
 problems.go              |  30 +-
 resolverBox.go           |  66 ++--
 smartwindow/LICENSE      | 674 ---------------------------------------
 smartwindow/args.go      |  24 --
 smartwindow/common.go    |  22 --
 smartwindow/new.go       |  26 --
 smartwindow/postReady.go |  78 -----
 smartwindow/preReady.go  |  72 -----
 smartwindow/structs.go   |  21 --
 structs.go               |  96 +++---
 testSmartWindow.go       |  21 --
 23 files changed, 456 insertions(+), 1356 deletions(-)
 delete mode 100644 smartwindow/LICENSE
 delete mode 100644 smartwindow/args.go
 delete mode 100644 smartwindow/common.go
 delete mode 100644 smartwindow/new.go
 delete mode 100644 smartwindow/postReady.go
 delete mode 100644 smartwindow/preReady.go
 delete mode 100644 smartwindow/structs.go
 delete mode 100644 testSmartWindow.go

diff --git a/.gitignore b/.gitignore
index 7376f1d..a8b36f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@ control-panel-dns
 /*.deb
 *.swp
 /plugins/*
+/resources/*
 
 control-panel-dns
diff --git a/Makefile b/Makefile
index 64b11c0..65e800b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@ run: build
 	# ./control-panel-dns --tmp-log
 	./control-panel-dns
 
+goimports:
+	goimports -w *.go
+
 check-git-clean:
 	@git diff-index --quiet HEAD -- || (echo "Git repository is dirty, please commit your changes first"; exit 1)
 
@@ -28,8 +31,8 @@ goGetUpdate:
 	GO111MODULE="off" go get -v -u .
 
 build:
-	-mkdir -p plugins/
-	-cp ~/go/src/go.wit.com/gui/toolkits/*.so plugins/
+	-mkdir -p resources/
+	-cp ~/go/src/go.wit.com/toolkits/*.so resources/
 	GO111MODULE="off" go build -v
 
 # ./control-panel-dns.v1: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by ./control-panel-dns.v1)
diff --git a/args.go b/args.go
index 8e6bb4d..cf68339 100644
--- a/args.go
+++ b/args.go
@@ -6,17 +6,18 @@ package main
 	this enables command line options from other packages like 'gui' and 'log'
 */
 
-import 	(
+import (
 	"time"
-	arg "github.com/alexflint/go-arg"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/debugger"
 	"go.wit.com/log"
-	"go.wit.com/gui/debugger"
 )
 
 var args struct {
-	Display string `arg:"env:DISPLAY"`
-	TmpLog bool  `arg:"--tmp-log" help:"automatically send STDOUT to /tmp"`
-	VerboseDNS bool  `arg:"--verbose-dns" help:"debug your dns settings"`
+	Display    string `arg:"env:DISPLAY"`
+	TmpLog     bool   `arg:"--tmp-log" help:"automatically send STDOUT to /tmp"`
+	VerboseDNS bool   `arg:"--verbose-dns" help:"debug your dns settings"`
 }
 
 var NOW *log.LogFlag
@@ -35,15 +36,15 @@ func init() {
 	full := "go.wit.com/control-panels/dns"
 	short := "cpdns"
 
-	NOW = log.NewFlag( "NOW",  true,  full, short, "temp debugging stuff")
+	NOW = log.NewFlag("NOW", true, full, short, "temp debugging stuff")
 	INFO = log.NewFlag("INFO", false, full, short, "normal debugging stuff")
-	NET = log.NewFlag( "NET",  false, full, short, "Network logging")
-	DNS = log.NewFlag( "DNS",  false, full, short, "dnsStatus.update()")
+	NET = log.NewFlag("NET", false, full, short, "Network logging")
+	DNS = log.NewFlag("DNS", false, full, short, "dnsStatus.update()")
 
-	WARN = log.NewFlag("WARN", true,  full, short, "bad things")
+	WARN = log.NewFlag("WARN", true, full, short, "bad things")
 	SPEW = log.NewFlag("SPEW", false, full, short, "spew stuff")
 
-	CHANGE = log.NewFlag("CHANGE", true,  full, short, "when host or dns change")
+	CHANGE = log.NewFlag("CHANGE", true, full, short, "when host or dns change")
 	STATUS = log.NewFlag("STATUS", false, full, short, "updateStatus() polling")
 
 	if debugger.ArgDebug() {
@@ -55,7 +56,7 @@ func init() {
 	me.dnsSleep = 500 * time.Millisecond
 	me.localSleep = 100 * time.Millisecond
 
-	me.artificialSleep = 0.4	// seems to need to exist or GTK crashes. TODO: fix andlabs plugin
+	me.artificialSleep = 0.4 // seems to need to exist or GTK crashes. TODO: fix andlabs plugin
 	me.artificialS = "blah"
 	log.Log(INFO, "init() me.artificialSleep =", me.artificialSleep)
 	log.Log(INFO, "init() me.artificialS =", me.artificialS)
diff --git a/digStatus.go b/digStatus.go
index b7536cf..da37875 100644
--- a/digStatus.go
+++ b/digStatus.go
@@ -1,58 +1,58 @@
-/* 
+/*
 	'dig'
 
 	This is essentially doing what the command 'dig' does
 	It performing DNS queries on TCP and UDP
 	against localhost, cloudflare & google
-	
+
 	IPv4() and IPv6() return true if they are working
-	
+
 	with the 'gui' package, it can also display the results
 */
 
 package main
 
 import (
-	"os"
-	"fmt"
-	"time"
-	"reflect"
 	"errors"
+	"fmt"
+	"os"
+	"reflect"
+	"time"
 
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/gui"
 	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/gadgets"
-	"go.wit.com/shell"
+	"go.wit.com/lib/gui/shell"
 )
 
 type digStatus struct {
-	ready		bool
-	hidden		bool
-	statusIPv4	string
-	statusIPv6	string
+	ready      bool
+	hidden     bool
+	statusIPv4 string
+	statusIPv6 string
 
-	parent	*gui.Node
-	window	*gadgets.BasicWindow
-	group	*gui.Node
-	grid	*gui.Node
+	parent *gui.Node
+	window *gadgets.BasicWindow
+	group  *gui.Node
+	grid   *gui.Node
 
-	summary		*gui.Node
-	status		*gadgets.OneLiner
-	statusAAAA	*gadgets.OneLiner
-	speed		*gadgets.OneLiner
-	speedActual	*gadgets.OneLiner
+	summary     *gui.Node
+	status      *gadgets.OneLiner
+	statusAAAA  *gadgets.OneLiner
+	speed       *gadgets.OneLiner
+	speedActual *gadgets.OneLiner
 
-	detailsGroup	*gui.Node
-	details		*gui.Node
-	dsLocalhost	*resolverStatus
-	dsLocalNetwork	*resolverStatus
-	dsCloudflare	*resolverStatus
-	dsGoogle	*resolverStatus
-	DnsDigUDP	*gui.Node
-	DnsDigTCP	*gui.Node
+	detailsGroup   *gui.Node
+	details        *gui.Node
+	dsLocalhost    *resolverStatus
+	dsLocalNetwork *resolverStatus
+	dsCloudflare   *resolverStatus
+	dsGoogle       *resolverStatus
+	DnsDigUDP      *gui.Node
+	DnsDigTCP      *gui.Node
 
-	httpGoWitCom	*gadgets.OneLiner
-	statusHTTP	*gadgets.OneLiner
+	httpGoWitCom *gadgets.OneLiner
+	statusHTTP   *gadgets.OneLiner
 }
 
 func NewDigStatusWindow(p *gui.Node) *digStatus {
@@ -72,19 +72,19 @@ func NewDigStatusWindow(p *gui.Node) *digStatus {
 	g := ds.summary.NewGrid("LookupStatus", 2, 2)
 	g.Pad()
 
-	ds.status	= gadgets.NewOneLiner(g, "status").Set("unknown")
-	ds.statusAAAA	= gadgets.NewOneLiner(g, "IPv6 status").Set("unknown")
-	ds.statusHTTP	= gadgets.NewOneLiner(g, "IPv6 via HTTP").Set("unknown")
-	ds.speed	= gadgets.NewOneLiner(g, "speed").Set("unknown")
-	ds.speedActual	= gadgets.NewOneLiner(g, "actual").Set("unknown")
+	ds.status = gadgets.NewOneLiner(g, "status").SetValue("unknown")
+	ds.statusAAAA = gadgets.NewOneLiner(g, "IPv6 status").SetValue("unknown")
+	ds.statusHTTP = gadgets.NewOneLiner(g, "IPv6 via HTTP").SetValue("unknown")
+	ds.speed = gadgets.NewOneLiner(g, "speed").SetValue("unknown")
+	ds.speedActual = gadgets.NewOneLiner(g, "actual").SetValue("unknown")
 
 	// make the area to store the raw details
 	ds.detailsGroup = ds.window.Box().NewGroup("Details")
 	ds.details = ds.detailsGroup.NewBox("bw vbox", false)
-	ds.dsLocalhost		= NewResolverStatus(ds.details, "(localhost)", "127.0.0.1:53", "go.wit.com")
-	ds.dsLocalNetwork	= NewResolverStatus(ds.details, "(Local Network)", "192.168.86.1:53", "go.wit.com")
-	ds.dsCloudflare		= NewResolverStatus(ds.details, "(cloudflare)", "1.1.1.1:53", "go.wit.com")
-	ds.dsGoogle		= NewResolverStatus(ds.details, "(google)", "8.8.8.8:53", "go.wit.com")
+	ds.dsLocalhost = NewResolverStatus(ds.details, "(localhost)", "127.0.0.1:53", "go.wit.com")
+	ds.dsLocalNetwork = NewResolverStatus(ds.details, "(Local Network)", "192.168.86.1:53", "go.wit.com")
+	ds.dsCloudflare = NewResolverStatus(ds.details, "(cloudflare)", "1.1.1.1:53", "go.wit.com")
+	ds.dsGoogle = NewResolverStatus(ds.details, "(google)", "8.8.8.8:53", "go.wit.com")
 	ds.makeDnsStatusGrid()
 	ds.makeHttpStatusGrid()
 
@@ -99,16 +99,16 @@ func (ds *digStatus) Update() {
 		log.Error(errors.New("digStatus() Update() ds == nil"))
 		return
 	}
-	duration := timeFunction(func () {
+	duration := timeFunction(func() {
 		ds.updateDnsStatus()
 	})
 	s := fmt.Sprint(duration)
-	// ds.speedActual.Set(s)
+	// ds.speedActual.SetValue(s)
 	me.digStatus.set(ds.speedActual, s)
 
-	if (duration > 500 * time.Millisecond ) {
+	if duration > 500*time.Millisecond {
 		me.digStatus.set(ds.speed, "SLOW")
-	} else if (duration > 100 * time.Millisecond ) {
+	} else if duration > 100*time.Millisecond {
 		me.digStatus.set(ds.speed, "OK")
 	} else {
 		me.digStatus.set(ds.speed, "FAST")
@@ -118,17 +118,21 @@ func (ds *digStatus) Update() {
 
 // Returns true if the status is valid
 func (ds *digStatus) Ready() bool {
-	if ds == nil {return false}
+	if ds == nil {
+		return false
+	}
 	return ds.ready
 }
 
 // Returns true if IPv4 is working
 func (ds *digStatus) IPv4() bool {
-	if ! ds.Ready() {return false}
-	if (ds.statusIPv4 == "OK") {
+	if !ds.Ready() {
+		return false
+	}
+	if ds.statusIPv4 == "OK" {
 		return true
 	}
-	if (ds.statusIPv4 == "GOOD") {
+	if ds.statusIPv4 == "GOOD" {
 		return true
 	}
 	return false
@@ -136,8 +140,10 @@ func (ds *digStatus) IPv4() bool {
 
 // Returns true if IPv6 is working
 func (ds *digStatus) IPv6() bool {
-	if ! ds.Ready() {return false}
-	if (ds.statusIPv6 == "GOOD") {
+	if !ds.Ready() {
+		return false
+	}
+	if ds.statusIPv6 == "GOOD" {
 		return true
 	}
 	return false
@@ -145,13 +151,17 @@ func (ds *digStatus) IPv6() bool {
 
 func (ds *digStatus) setIPv4status(s string) {
 	ds.statusIPv4 = s
-	if ! ds.Ready() {return}
+	if !ds.Ready() {
+		return
+	}
 	me.digStatus.set(ds.status, s)
 }
 
 func (ds *digStatus) setIPv6status(s string) {
 	ds.statusIPv6 = s
-	if ! ds.Ready() {return}
+	if !ds.Ready() {
+		return
+	}
 	me.digStatus.set(ds.statusAAAA, s)
 }
 
@@ -162,13 +172,15 @@ func (ds *digStatus) SetIPv6(s string) {
 	log.Warn("Should SetIPv6() here to", s)
 	log.Warn("Should SetIPv6() here to", s)
 	log.Warn("Should SetIPv6() here to", s)
-	me.DnsAAAA.Set(s)
+	me.DnsAAAA.SetValue(s)
 	// me.digStatus.set(ds.httpGoWitCom, addr)
 }
 */
 
 func (ds *digStatus) set(a any, s string) {
-	if ! ds.Ready() {return}
+	if !ds.Ready() {
+		return
+	}
 	if ds.hidden {
 		return
 	}
@@ -184,7 +196,7 @@ func (ds *digStatus) set(a any, s string) {
 	var ol *gadgets.OneLiner
 	if reflect.TypeOf(a) == reflect.TypeOf(ol) {
 		ol = a.(*gadgets.OneLiner)
-		ol.Set(s)
+		ol.SetValue(s)
 		return
 	}
 	log.Warn("unknown type TypeOf(a) =", reflect.TypeOf(a), "a =", a)
@@ -196,12 +208,12 @@ func (ds *digStatus) updateDnsStatus() {
 	var ipv4, ipv6 bool
 
 	log.Info("updateDnsStatus() START")
-	if (ds == nil) {
+	if ds == nil {
 		log.Error(errors.New("updateDnsStatus() not initialized yet. ds == nil"))
 		return
 	}
 
-	if (! ds.ready) {
+	if !ds.ready {
 		log.Error(errors.New("updateDnsStatus() not ready yet"))
 		return
 	}
@@ -224,14 +236,14 @@ func (ds *digStatus) updateDnsStatus() {
 		me.digStatus.set(ds.statusHTTP, "INVALID HOSTNAME")
 	}
 
-	if (ipv4) {
+	if ipv4 {
 		log.Log(DNS, "updateDnsStatus() IPv4 A lookups working")
 		ds.setIPv4status("OK")
 	} else {
 		log.Log(DNS, "updateDnsStatus() IPv4 A lookups not working. No internet?")
 		ds.setIPv4status("No Internet?")
 	}
-	if (ipv6) {
+	if ipv6 {
 		log.Log(DNS, "updateDnsStatus() IPv6 AAAA lookups working")
 		ds.setIPv4status("GOOD")
 		ds.setIPv6status("GOOD")
@@ -251,11 +263,11 @@ func (ds *digStatus) updateDnsStatus() {
 	me.digStatus.set(ds.DnsDigTCP, out)
 
 	/*
-	g2.NewButton("dig +trace", func () {
-		log.Log(NOW, "TODO: redo this")
-		// o := shell.Run("dig +trace +noadditional DS " + me.hostname + " @8.8.8.8")
-		// log.Println(o)
-	})
+		g2.NewButton("dig +trace", func () {
+			log.Log(NOW, "TODO: redo this")
+			// o := shell.Run("dig +trace +noadditional DS " + me.hostname + " @8.8.8.8")
+			// log.Println(o)
+		})
 	*/
 }
 
@@ -319,7 +331,7 @@ func (ds *digStatus) Show() {
 
 func (ds *digStatus) Hide() {
 	log.Info("digStatus.Hide() window")
-	if ! me.digStatus.hidden {
+	if !me.digStatus.hidden {
 		me.digStatus.window.Hide()
 	}
 	me.digStatus.hidden = true
diff --git a/dns-https.go b/dns-https.go
index d7a5469..50b14aa 100644
--- a/dns-https.go
+++ b/dns-https.go
@@ -1,14 +1,14 @@
 package main
 
 import (
-	"fmt"
-	"strings"
-	"io/ioutil"
 	"encoding/json"
+	"fmt"
+	"io/ioutil"
 	"net/http"
+	"strings"
 
-	"go.wit.com/log"
 	"github.com/miekg/dns"
+	"go.wit.com/log"
 )
 
 // dnsLookupDoH performs a DNS lookup for AAAA records over HTTPS.
@@ -67,7 +67,7 @@ func digAAAA(hostname string) []string {
 	blah, _ = dnsUdpLookup("1.1.1.1:53", hostname, recordType)
 	log.Println("digAAAA() has BLAH =", blah)
 
-	if (len(blah) == 0) {
+	if len(blah) == 0 {
 		log.Println("digAAAA() RUNNING dnsAAAAlookupDoH(domain)")
 		ipv6Addresses = lookupDoH(hostname, "AAAA")
 		log.Println("digAAAA() has ipv6Addresses =", strings.Join(ipv6Addresses, " "))
diff --git a/dns.go b/dns.go
index 6107141..82b452d 100644
--- a/dns.go
+++ b/dns.go
@@ -4,40 +4,41 @@
 
 package main
 
-import 	(
+import (
 	"net"
 	"strings"
 
 	"go.wit.com/log"
-	"go.wit.com/shell"
+	"go.wit.com/lib/gui/shell"
 )
 
 /*
-	Check a bunch of things. If they don't work right, then things are not correctly configured
-	They are things like:
-		/etc/hosts
-		hostname
-		hostname -f
-		domainname
+Check a bunch of things. If they don't work right, then things are not correctly configured
+They are things like:
+
+	/etc/hosts
+	hostname
+	hostname -f
+	domainname
 */
 func (h *Host) verifyETC() bool {
 	return true
 }
 
 func (h *Host) updateIPs(host string) {
-    ips, err := net.LookupIP(host)
-        if err != nil {
-                log.Error(err, "updateIPs failed")
-        }
-        for _, ip := range ips {
-                log.Println(host, ip)
-        }
+	ips, err := net.LookupIP(host)
+	if err != nil {
+		log.Error(err, "updateIPs failed")
+	}
+	for _, ip := range ips {
+		log.Println(host, ip)
+	}
 }
 
 func (h *Host) setIPv4(ipv4s map[string]*IPtype) {
-        for ip, t := range ipv4s {
+	for ip, t := range ipv4s {
 		log.Println("IPv4", ip, t)
-        }
+	}
 }
 
 /*
@@ -70,7 +71,7 @@ func lookupNS(domain string) {
 	// checks to see if the NS records change
 	for _, server := range servers {
 		server = strings.TrimRight(server, ".")
-		if (me.nsmap[server] != domain) {
+		if me.nsmap[server] != domain {
 			log.Log(CHANGE, "lookupNS() domain", domain, "has NS", server)
 			me.nsmap[server] = domain
 			domains += server + "\n"
@@ -81,7 +82,7 @@ func lookupNS(domain string) {
 	// checks to see if the NS records change
 	for s, d := range me.nsmap {
 		log.Log(CHANGE, "lookupNS() domain =", d, "server =", s)
-		if (domain == d) {
+		if domain == d {
 			tmp += s + "\n"
 			// figure out the provider (google, cloudflare, etc)
 			setProvider(s)
@@ -89,10 +90,10 @@ func lookupNS(domain string) {
 	}
 	tmp = shell.Chomp(tmp)
 
-	if (tmp != me.statusDNS.NSrr.Get()) {
+	if tmp != me.statusDNS.NSrr.String() {
 		me.changed = true
 		log.Log(CHANGE, "lookupNS() setting changed to me.NSrr =", tmp)
-		me.statusDNS.NSrr.Set(tmp)
+		me.statusDNS.NSrr.SetValue(tmp)
 	}
 }
 
diff --git a/errorBox.go b/errorBox.go
index c584975..70db592 100644
--- a/errorBox.go
+++ b/errorBox.go
@@ -1,4 +1,4 @@
-/* 
+/*
 	Show a box for a configuration error
 */
 
@@ -7,38 +7,38 @@ package main
 import (
 	"time"
 
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/gui"
 	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/gadgets"
 )
 
 type errorBox struct {
-	ready	bool
-	hidden	bool
+	ready  bool
+	hidden bool
 
-	parent	*gui.Node
-	group	*gui.Node
-	grid	*gui.Node
+	parent *gui.Node
+	group  *gui.Node
+	grid   *gui.Node
 
-	l	*gui.Node
-	b	*gui.Node
+	l *gui.Node
+	b *gui.Node
 
-	fixes	map[string]*anError
+	fixes map[string]*anError
 
 	something *gadgets.OneLiner
 }
 
 type anError struct {
-//	kind ProblemType // what kind of error is it?
-//	action ActionType
-//	aaaa string
-//	status string
+	//	kind ProblemType // what kind of error is it?
+	//	action ActionType
+	//	aaaa string
+	//	status string
 
-	kindLabel *gui.Node
+	kindLabel   *gui.Node
 	actionLabel *gui.Node
-	ipLabel *gui.Node
+	ipLabel     *gui.Node
 	statusLabel *gui.Node
-	button *gui.Node
+	button      *gui.Node
 
 	problem *Problem
 }
@@ -62,19 +62,25 @@ func NewErrorBox(p *gui.Node, name string, ip string) *errorBox {
 }
 
 func (eb *errorBox) Show() {
-	if eb == nil {return}
+	if eb == nil {
+		return
+	}
 	eb.hidden = false
 	eb.group.Show()
 }
 
 func (eb *errorBox) Hide() {
-	if eb == nil {return}
+	if eb == nil {
+		return
+	}
 	eb.hidden = true
 	eb.group.Hide()
 }
 
 func (eb *errorBox) Toggle() {
-	if eb == nil {return}
+	if eb == nil {
+		return
+	}
 	if eb.hidden {
 		eb.Show()
 	} else {
@@ -83,12 +89,16 @@ func (eb *errorBox) Toggle() {
 }
 
 func (eb *errorBox) Ready() bool {
-	if eb == nil {return false}
+	if eb == nil {
+		return false
+	}
 	return eb.ready
 }
 
 func (eb *errorBox) addIPerror(kind ProblemType, action ActionType, ip string) bool {
-	if ! eb.Ready() {return false}
+	if !eb.Ready() {
+		return false
+	}
 	tmp := kind.String() + " " + ip
 	if eb.fixes[tmp] != nil {
 		log.Log(WARN, "Error is already here", kind, ip)
@@ -134,9 +144,9 @@ func (eb *errorBox) fix(key string) bool {
 		log.Log(WARN, "TODO: probably remove this error. key =", key)
 		return true
 	}
-	myErr :=  eb.fixes[key]
+	myErr := eb.fixes[key]
 	log.Log(WARN, "should try to fix", myErr.problem.kind, "here. IP =", myErr.problem.aaaa)
-	if ! me.autofix.GetBool() {
+	if !me.autofix.Checked() {
 		log.Log(WARN, "not autofixing. autofix == false")
 		log.Log(WARN, "problem.kind =", myErr.problem.kind)
 		log.Log(WARN, "problem.action =", myErr.problem.action)
@@ -145,7 +155,7 @@ func (eb *errorBox) fix(key string) bool {
 		log.Log(WARN, "problem.begun =", myErr.problem.begun)
 		log.Log(WARN, "problem.begunResult =", myErr.problem.begunResult)
 		// if  myErr.problem.begunTime != nil {
-			log.Log(WARN, "problem.begunTime =", myErr.problem.begunTime)
+		log.Log(WARN, "problem.begunTime =", myErr.problem.begunTime)
 		// }
 		return false
 	}
diff --git a/fix.go b/fix.go
index efaa4d9..e052ec0 100644
--- a/fix.go
+++ b/fix.go
@@ -1,29 +1,24 @@
 // This creates a simple hello world window
 package main
 
-import 	(
+import (
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/gui/cloudflare"
 	"go.wit.com/log"
-	"go.wit.com/gui/lib/cloudflare"
-	"go.wit.com/apps/control-panel-dns/smartwindow"
 )
 
 func fix() bool {
 	// make and toggle the fixWindow display
 	if me.fixWindow == nil {
-		me.fixWindow = smartwindow.New()
-		me.fixWindow.SetParent(me.myGui)
-		me.fixWindow.Title("fix window")
-		me.fixWindow.SetDraw(drawFixWindow)
-		me.fixWindow.Vertical()
+		me.fixWindow = gadgets.NewBasicWindow(me.myGui, "fix window")
+		me.fixWindow.SetTitle("fix window")
 		me.fixWindow.Make()
 		me.fixWindow.Draw()
-		me.fixWindow.Hide()
-		// me.fixWindow.Draw2()
 		return false
 	}
 	me.fixWindow.Toggle()
 
-	if ! me.statusDNS.Ready() {
+	if !me.statusDNS.Ready() {
 		log.Log(CHANGE, "The IPv6 Control Panel is not Ready() yet")
 		return false
 	}
@@ -46,10 +41,10 @@ func fix() bool {
 		log.Log(CHANGE, "You must first figure out why you can't look up IPv6 addresses")
 		return false
 	}
-	if ! me.statusDNS.IPv4() {
-		log.Log(CHANGE, "OK   You do not have real IPv4 addresses. Nothing to fix here") 
+	if !me.statusDNS.IPv4() {
+		log.Log(CHANGE, "OK   You do not have real IPv4 addresses. Nothing to fix here")
 	}
-	if ! me.statusDNS.IPv6() {
+	if !me.statusDNS.IPv6() {
 		if fixIPv6dns() {
 			log.Log(CHANGE, "IPv6 DNS Repair is underway")
 			return false
@@ -87,11 +82,11 @@ func fixIPv6dns() bool {
 			// addToFixWindow("DELETE", aaaa)
 			me.problems.addIPerror(RR, DELETE, aaaa)
 			/*
-			if deleteFromDNS(aaaa) {
-				log.Log(INFO, "Delete AAAA", aaaa, "Worked")
-			} else {
-				log.Log(INFO, "Delete AAAA", aaaa, "Failed")
-			}
+				if deleteFromDNS(aaaa) {
+					log.Log(INFO, "Delete AAAA", aaaa, "Worked")
+				} else {
+					log.Log(INFO, "Delete AAAA", aaaa, "Failed")
+				}
 			*/
 		}
 	}
@@ -105,11 +100,11 @@ func fixIPv6dns() bool {
 			log.Log(INFO, "OS  AAAA is not in DNS", aaaa)
 			addToFixWindow("CREATE", aaaa)
 			/*
-			if addToDNS(aaaa) {
-				log.Log(INFO, "Add AAAA", aaaa, "Worked")
-			} else {
-				log.Log(INFO, "Add AAAA", aaaa, "Failed")
-			}
+				if addToDNS(aaaa) {
+					log.Log(INFO, "Add AAAA", aaaa, "Worked")
+				} else {
+					log.Log(INFO, "Add AAAA", aaaa, "Failed")
+				}
 			*/
 		}
 	}
@@ -153,12 +148,14 @@ func exists(m map[string]bool, s string) bool {
 
 func addToFixWindow(t string, ip string) {
 	log.Log(INFO, "addToFixWindow() START")
-	if ! me.problems.Ready() { return }
+	if !me.problems.Ready() {
+		return
+	}
 	me.problems.addIPerror(RR, CREATE, ip)
 	log.Log(INFO, "addToFixWindow() END")
 }
 
-func drawFixWindow(sw *smartwindow.SmartWindow) {
+func drawFixWindow(sw *gadgets.BasicWindow) {
 	log.Log(WARN, "drawFixWindow() START")
 	box := sw.Box()
 	box.NewLabel("test")
diff --git a/gui.go b/gui.go
index d6d0357..d0d4f4b 100644
--- a/gui.go
+++ b/gui.go
@@ -1,18 +1,17 @@
 // This creates a simple hello world window
 package main
 
-import 	(
-	"time"
+import (
 	"os"
+	"time"
 
 	"go.wit.com/log"
 
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/gadgets"
-	"go.wit.com/gui/debugger"
-	"go.wit.com/gui/lib/cloudflare"
-	"go.wit.com/gui/lib/logsettings"
-	"go.wit.com/apps/control-panel-dns/smartwindow"
+	"go.wit.com/gui"
+	"go.wit.com/lib/debugger"
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/gui/cloudflare"
+	"go.wit.com/lib/gui/logsettings"
 )
 
 // This setups up the dns control panel window
@@ -34,11 +33,11 @@ func debugTab(title string) {
 
 	g2 = me.debug.Box().NewGroup("Real Stuff")
 
-	g2.NewButton("GO GUI Debug Window", func () {
-		debugger.DebugWindow(me.myGui)
+	g2.NewButton("GO GUI Debug Window", func() {
+		debugger.DebugWindow()
 	})
 
-	g2.NewButton("dig A & AAAA DNS records (updateDNS())", func () {
+	g2.NewButton("dig A & AAAA DNS records (updateDNS())", func() {
 		log.Log(CHANGE, "updateDNS() going to run:")
 	})
 
@@ -46,11 +45,11 @@ func debugTab(title string) {
 	gridP := g2.NewGrid("nuts", 2, 1)
 
 	// makes a slider widget
-	me.ttl = gadgets.NewDurationSlider(gridP, "Loop Timeout", 10 * time.Millisecond, 5 * time.Second)
+	me.ttl = gadgets.NewDurationSlider(gridP, "Loop Timeout", 10*time.Millisecond, 5*time.Second)
 	me.ttl.Set(300 * time.Millisecond)
 
 	// makes a slider widget
-	me.dnsTtl = gadgets.NewDurationSlider(gridP, "DNS Timeout", 800 * time.Millisecond, 300 * time.Second)
+	me.dnsTtl = gadgets.NewDurationSlider(gridP, "DNS Timeout", 800*time.Millisecond, 300*time.Second)
 	me.dnsTtl.Set(60 * time.Second)
 
 	gridP.NewLabel("dns resolution")
@@ -75,7 +74,7 @@ func debugTab(title string) {
 }
 
 func myDefaultExit(n *gui.Node) {
-        log.Println("You can Do exit() things here")
+	log.Println("You can Do exit() things here")
 	os.Exit(0)
 }
 
@@ -93,47 +92,35 @@ func mainWindow(title string) {
 	gr := hbox.NewGroup("Development and Debugging Windows")
 	gr = gr.NewBox("vbox", false)
 
-	gr.NewButton("Debug", func () {
+	gr.NewButton("Debug", func() {
 		me.debug.Toggle()
 	})
 
-	var myLS *logsettings.LogSettings
-	gr.NewButton("Logging Settings", func () {
-		if myLS == nil {
-			// initialize the log settings window (does not display it)
-			myLS = logsettings.New(me.myGui)
-			return
-		}
-		myLS.Toggle()
+	gr.NewButton("Logging Settings", func() {
+		logsettings.LogWindow()
 	})
 
-	gr.NewButton("test smartwindow()", func () {
+	gr.NewButton("test smartwindow()", func() {
 		if me.fixWindow == nil {
-			me.fixWindow = smartwindow.New()
-			me.fixWindow.SetParent(me.myGui)
-			me.fixWindow.Title("smart window test")
-			me.fixWindow.SetDraw(testSmartWindow)
-			me.fixWindow.Vertical()
+			me.fixWindow = gadgets.NewBasicWindow(me.myGui, "smart window test")
 			me.fixWindow.Make()
 			me.fixWindow.Draw()
-			me.fixWindow.Hide()
 			return
 		}
 		me.fixWindow.Toggle()
 	})
 
-	gr.NewButton("Show Errors", func () {
+	gr.NewButton("Show Errors", func() {
 		me.problems.Toggle()
 	})
 	me.autofix = gr.NewCheckbox("Auto-correct Errors")
-	me.autofix.Set(false)
+	me.autofix.SetChecked(false)
 
 	// These are your problems
 	me.problems = NewErrorBox(me.window.Box(), "Errors", "has problems?")
 	me.problems.addIPerror(RR, USER, "1:1:1:1")
 }
 
-
 func statusGrid(n *gui.Node) {
 	problems := n.NewGroup("status")
 	problems.Margin()
@@ -145,27 +132,31 @@ func statusGrid(n *gui.Node) {
 
 	gridP.NewLabel("hostname =")
 	me.hostnameStatus = gridP.NewLabel("invalid")
-	gridP.NewButton("Linux Status", func () {
+	gridP.NewButton("Linux Status", func() {
 		me.statusOS.Toggle()
 	})
 
 	me.statusIPv6 = gadgets.NewOneLiner(gridP, "DNS Lookup")
-	me.statusIPv6.Set("known")
-	gridP.NewButton("resolver status", func () {
-		if ! me.digStatus.Ready() {return}
+	me.statusIPv6.SetValue("known")
+	gridP.NewButton("resolver status", func() {
+		if !me.digStatus.Ready() {
+			return
+		}
 		me.digStatus.window.Toggle()
 	})
 
 	gridP.NewLabel("DNS Status")
 	me.DnsStatus = gridP.NewLabel("unknown")
-	me.statusDNSbutton = gridP.NewButton("hostname status", func () {
-		if ! me.statusDNS.Ready() {return}
+	me.statusDNSbutton = gridP.NewButton("hostname status", func() {
+		if !me.statusDNS.Ready() {
+			return
+		}
 		me.statusDNS.window.Toggle()
 	})
 
 	gridP.NewLabel("DNS API")
 	me.DnsAPIstatus = gridP.NewLabel("unknown")
-	me.apiButton = gridP.NewButton("unknown wit.com", func () {
+	me.apiButton = gridP.NewButton("unknown wit.com", func() {
 		log.Log(CHANGE, "WHAT API ARE YOU USING?")
 		provider := me.statusDNS.GetDNSapi()
 		if provider == "cloudflare" {
diff --git a/hostnameStatus.go b/hostnameStatus.go
index 29caee6..cacca3e 100644
--- a/hostnameStatus.go
+++ b/hostnameStatus.go
@@ -1,4 +1,4 @@
-/* 
+/*
 	figures out if your hostname is valid
 	then checks if your DNS is setup correctly
 */
@@ -6,54 +6,54 @@
 package main
 
 import (
-	"os"
-	"fmt"
-	"time"
-	"reflect"
-	"strings"
-	"sort"
 	"errors"
+	"fmt"
+	"os"
+	"reflect"
+	"sort"
+	"strings"
+	"time"
 
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/gui"
 	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/gadgets"
 )
 
 type hostnameStatus struct {
-	ready		bool
-	hidden		bool
-	changed		bool
+	ready   bool
+	hidden  bool
+	changed bool
 
-	lastname	string // used to watch for changes in the hostname
+	lastname string // used to watch for changes in the hostname
 
-	window		*gadgets.BasicWindow
+	window *gadgets.BasicWindow
 
 	// Primary Directives
-	status		*gadgets.OneLiner
-	summary		*gadgets.OneLiner
-	statusIPv4	*gadgets.OneLiner
-	statusIPv6	*gadgets.OneLiner
+	status     *gadgets.OneLiner
+	summary    *gadgets.OneLiner
+	statusIPv4 *gadgets.OneLiner
+	statusIPv6 *gadgets.OneLiner
 
-	hostname	*gadgets.OneLiner
-	domainname	*gadgets.OneLiner
+	hostname   *gadgets.OneLiner
+	domainname *gadgets.OneLiner
 
 	// what the current IP addresses your network has given you
-	currentIPv4	*gadgets.OneLiner
-	currentIPv6	*gadgets.OneLiner
+	currentIPv4 *gadgets.OneLiner
+	currentIPv6 *gadgets.OneLiner
 
 	// what the DNS servers have
-	NSrr		*gadgets.OneLiner
-	dnsA		*gadgets.OneLiner
-	dnsAAAA		*gadgets.OneLiner
-	dnsAPI		*gadgets.OneLiner
-	APIprovider	string
+	NSrr        *gadgets.OneLiner
+	dnsA        *gadgets.OneLiner
+	dnsAAAA     *gadgets.OneLiner
+	dnsAPI      *gadgets.OneLiner
+	APIprovider string
 
-	speed		*gadgets.OneLiner
-	speedActual	*gadgets.OneLiner
+	speed       *gadgets.OneLiner
+	speedActual *gadgets.OneLiner
 
 	// Actions
-//	dnsValue	*gui.Node
-//	dnsAction	*gui.Node
+	//	dnsValue	*gui.Node
+	//	dnsAction	*gui.Node
 }
 
 func NewHostnameStatusWindow(p *gui.Node) *hostnameStatus {
@@ -64,7 +64,7 @@ func NewHostnameStatusWindow(p *gui.Node) *hostnameStatus {
 	hs.hidden = true
 	// hs.hostname = me.hostname
 
-	hs.window = gadgets.NewBasicWindow(p, "fix hostname here" + " Status")
+	hs.window = gadgets.NewBasicWindow(p, "fix hostname here"+" Status")
 	hs.window.Make()
 	// hs.window.Draw()
 	// hs.window.Hide()
@@ -72,9 +72,9 @@ func NewHostnameStatusWindow(p *gui.Node) *hostnameStatus {
 	group := hs.window.Box().NewGroup("Summary")
 	grid := group.NewGrid("LookupStatus", 2, 2)
 
-	hs.status	= gadgets.NewOneLiner(grid, "status").Set("unknown")
-	hs.statusIPv4	= gadgets.NewOneLiner(grid, "IPv4").Set("unknown")
-	hs.statusIPv6	= gadgets.NewOneLiner(grid, "IPv6").Set("unknown")
+	hs.status = gadgets.NewOneLiner(grid, "status").SetValue("unknown")
+	hs.statusIPv4 = gadgets.NewOneLiner(grid, "IPv4").SetValue("unknown")
+	hs.statusIPv6 = gadgets.NewOneLiner(grid, "IPv6").SetValue("unknown")
 
 	group.Pad()
 	grid.Pad()
@@ -82,18 +82,18 @@ func NewHostnameStatusWindow(p *gui.Node) *hostnameStatus {
 	group = hs.window.Box().NewGroup("Details")
 	grid = group.NewGrid("LookupDetails", 2, 2)
 
-	hs.hostname	= gadgets.NewOneLiner(grid, "hostname")
-	hs.domainname	= gadgets.NewOneLiner(grid, "domain name")
-	hs.currentIPv4	= gadgets.NewOneLiner(grid, "Current IPv4")
-	hs.currentIPv6	= gadgets.NewOneLiner(grid, "Current IPv6")
+	hs.hostname = gadgets.NewOneLiner(grid, "hostname")
+	hs.domainname = gadgets.NewOneLiner(grid, "domain name")
+	hs.currentIPv4 = gadgets.NewOneLiner(grid, "Current IPv4")
+	hs.currentIPv6 = gadgets.NewOneLiner(grid, "Current IPv6")
 
-	hs.NSrr		= gadgets.NewOneLiner(grid, "dns NS records").Set("unknown")
-	hs.dnsAPI	= gadgets.NewOneLiner(grid, "dns API provider").Set("unknown")
-	hs.dnsA		= gadgets.NewOneLiner(grid, "dns IPv4 resource records").Set("unknown")
-	hs.dnsAAAA	= gadgets.NewOneLiner(grid, "dns IPv6 resource records").Set("unknown")
+	hs.NSrr = gadgets.NewOneLiner(grid, "dns NS records").SetValue("unknown")
+	hs.dnsAPI = gadgets.NewOneLiner(grid, "dns API provider").SetValue("unknown")
+	hs.dnsA = gadgets.NewOneLiner(grid, "dns IPv4 resource records").SetValue("unknown")
+	hs.dnsAAAA = gadgets.NewOneLiner(grid, "dns IPv6 resource records").SetValue("unknown")
 
-	hs.speed	= gadgets.NewOneLiner(grid, "speed").Set("unknown")
-	hs.speedActual	= gadgets.NewOneLiner(grid, "actual").Set("unknown")
+	hs.speed = gadgets.NewOneLiner(grid, "speed").SetValue("unknown")
+	hs.speedActual = gadgets.NewOneLiner(grid, "actual").SetValue("unknown")
 
 	group.Pad()
 	grid.Pad()
@@ -104,13 +104,17 @@ func NewHostnameStatusWindow(p *gui.Node) *hostnameStatus {
 }
 
 func (hs *hostnameStatus) Domain() string {
-	if ! hs.Ready() {return ""}
-	return hs.domainname.Get()
+	if !hs.Ready() {
+		return ""
+	}
+	return hs.domainname.String()
 }
 
 func (hs *hostnameStatus) API() string {
-	if ! hs.Ready() {return ""}
-	return hs.dnsAPI.Get()
+	if !hs.Ready() {
+		return ""
+	}
+	return hs.dnsAPI.String()
 }
 
 func (hs *hostnameStatus) Update() {
@@ -119,15 +123,15 @@ func (hs *hostnameStatus) Update() {
 		log.Error(errors.New("hostnameStatus() Update() hs == nil"))
 		return
 	}
-	duration := timeFunction(func () {
+	duration := timeFunction(func() {
 		hs.updateStatus()
 	})
 	s := fmt.Sprint(duration)
 	hs.set(hs.speedActual, s)
 
-	if (duration > 500 * time.Millisecond ) {
+	if duration > 500*time.Millisecond {
 		hs.set(hs.speed, "SLOW")
-	} else if (duration > 100 * time.Millisecond ) {
+	} else if duration > 100*time.Millisecond {
 		hs.set(hs.speed, "OK")
 	} else {
 		hs.set(hs.speed, "FAST")
@@ -137,17 +141,21 @@ func (hs *hostnameStatus) Update() {
 
 // Returns true if the status is valid
 func (hs *hostnameStatus) Ready() bool {
-	if hs == nil {return false}
+	if hs == nil {
+		return false
+	}
 	return hs.ready
 }
 
 // Returns true if IPv4 is working
 func (hs *hostnameStatus) IPv4() bool {
-	if ! hs.Ready() {return false}
-	if (hs.statusIPv4.Get() == "OK") {
+	if !hs.Ready() {
+		return false
+	}
+	if hs.statusIPv4.String() == "OK" {
 		return true
 	}
-	if (hs.statusIPv4.Get() == "GOOD") {
+	if hs.statusIPv4.String() == "GOOD" {
 		return true
 	}
 	return false
@@ -155,25 +163,33 @@ func (hs *hostnameStatus) IPv4() bool {
 
 // Returns true if IPv6 is working
 func (hs *hostnameStatus) IPv6() bool {
-	if ! hs.Ready() {return false}
-	if (hs.statusIPv6.Get() == "GOOD") {
+	if !hs.Ready() {
+		return false
+	}
+	if hs.statusIPv6.String() == "GOOD" {
 		return true
 	}
 	return false
 }
 
 func (hs *hostnameStatus) setIPv4(s string) {
-	if ! hs.Ready() {return}
-	hs.statusIPv4.Set(s)
+	if !hs.Ready() {
+		return
+	}
+	hs.statusIPv4.SetValue(s)
 }
 
 func (hs *hostnameStatus) setIPv6(s string) {
-	if ! hs.Ready() {return}
-	hs.statusIPv6.Set(s)
+	if !hs.Ready() {
+		return
+	}
+	hs.statusIPv6.SetValue(s)
 }
 
 func (hs *hostnameStatus) set(a any, s string) {
-	if ! hs.Ready() {return}
+	if !hs.Ready() {
+		return
+	}
 	if hs.hidden {
 		return
 	}
@@ -194,7 +210,7 @@ func (hs *hostnameStatus) set(a any, s string) {
 			return
 		}
 		// log.Println("SETTING ol:", ol)
-		ol.Set(s)
+		ol.SetValue(s)
 		return
 	}
 	log.Warn("unknown type TypeOf(a) =", reflect.TypeOf(a), "a =", a)
@@ -208,45 +224,49 @@ func (hs *hostnameStatus) existsAAAA(s string) bool {
 }
 
 func (hs *hostnameStatus) GetIPv6() []string {
-	if ! hs.Ready() { return nil}
-	return strings.Split(hs.dnsAAAA.Get(), "\n")
+	if !hs.Ready() {
+		return nil
+	}
+	return strings.Split(hs.dnsAAAA.String(), "\n")
 }
 
 func (hs *hostnameStatus) updateStatus() {
-	if ! hs.Ready() { return }
+	if !hs.Ready() {
+		return
+	}
 	var s string
 	var vals []string
 	log.Log(STATUS, "updateStatus() START")
 
 	// copy the OS status over
-	lasthostname := hs.hostname.Get()
+	lasthostname := hs.hostname.String()
 	hostname := me.statusOS.GetHostname()
 
 	// hostname changed or was setup for the first time. Set the window title, etc
 	if lasthostname != hostname {
 		me.changed = true
-		hs.hostname.Set(hostname)
-		hs.window.Title(hostname + " Status")
-		me.statusDNSbutton.Set(hostname + " status")
+		hs.hostname.SetValue(hostname)
+		hs.window.SetLabel(hostname + " Status")
+		me.statusDNSbutton.SetLabel(hostname + " status")
 	}
-	hs.domainname.Set(me.statusOS.GetDomainName())
+	hs.domainname.SetValue(me.statusOS.GetDomainName())
 
 	var tmp []string
 	tmp = me.statusOS.GetIPv4()
 	sort.Strings(tmp)
 	s = strings.Join(tmp, "\n")
-	if s != hs.currentIPv4.Get() {
+	if s != hs.currentIPv4.String() {
 		log.Log(CHANGE, "DNS IPv4 Addresses changed", tmp)
-		hs.currentIPv4.Set(s)
+		hs.currentIPv4.SetValue(s)
 		hs.changed = true
 	}
 
 	tmp = me.statusOS.GetIPv6()
 	sort.Strings(tmp)
 	s = strings.Join(tmp, "\n")
-	if s != hs.currentIPv6.Get() {
+	if s != hs.currentIPv6.String() {
 		log.Log(CHANGE, "DNS IPv6 Addresses changed", tmp)
-		hs.currentIPv6.Set(s)
+		hs.currentIPv6.SetValue(s)
 		hs.changed = true
 	}
 
@@ -254,12 +274,12 @@ func (hs *hostnameStatus) updateStatus() {
 		vals = lookupDoH(me.statusOS.GetHostname(), "AAAA")
 
 		log.Log(STATUS, "DNS IPv6 Addresses for ", me.statusOS.GetHostname(), "=", vals)
-		hs.dnsAAAA.Set(strings.Join(vals, "\n"))
+		hs.dnsAAAA.SetValue(strings.Join(vals, "\n"))
 
 		vals = lookupDoH(me.statusOS.GetHostname(), "A")
 		log.Log(STATUS, "IPv4 Addresses for ", me.statusOS.GetHostname(), "=", vals)
 		s = strings.Join(vals, "\n")
-		if (s == "") {
+		if s == "" {
 			s = "(none)"
 			hs.setIPv4("NEEDS CNAME")
 		}
@@ -267,8 +287,8 @@ func (hs *hostnameStatus) updateStatus() {
 
 		vals = lookupDoH(me.statusOS.GetHostname(), "CNAME")
 		s = strings.Join(vals, "\n")
-		if (s != "") {
-			hs.set(hs.dnsA, "CNAME " + s)
+		if s != "" {
+			hs.set(hs.dnsA, "CNAME "+s)
 			hs.setIPv4("GOOD")
 		}
 		if hs.changed {
@@ -279,24 +299,24 @@ func (hs *hostnameStatus) updateStatus() {
 	}
 
 	if hs.IPv4() && hs.IPv6() {
-		hs.status.Set("GOOD")
+		hs.status.SetValue("GOOD")
 	} else {
-		hs.status.Set("BROKEN")
+		hs.status.SetValue("BROKEN")
 	}
-	
-	last := hs.statusIPv6.Get()
+
+	last := hs.statusIPv6.String()
 	if hs.verifyIPv6() {
 		if last != "WORKING" {
 			log.Log(CHANGE, "Your DNS IPv6 has started working.", me.statusOS.GetHostname(), "should now work")
 			hs.changed = true
-			hs.statusIPv6.Set("WORKING")
+			hs.statusIPv6.SetValue("WORKING")
 			me.DnsStatus.SetText("WORKING")
 		}
 	} else {
 		if last != "BROKEN" {
 			log.Log(CHANGE, "Your DNS entries for IPv6 have BROKEN")
 			hs.changed = true
-			hs.statusIPv6.Set("BROKEN")
+			hs.statusIPv6.SetValue("BROKEN")
 			me.DnsStatus.SetText("BROKEN")
 		}
 	}
@@ -357,7 +377,7 @@ func (hs *hostnameStatus) Show() {
 
 func (hs *hostnameStatus) Hide() {
 	log.Log(STATUS, "hostnameStatus.Hide() window")
-	if ! hs.hidden {
+	if !hs.hidden {
 		hs.window.Hide()
 	}
 	hs.hidden = true
@@ -372,6 +392,6 @@ func (hs *hostnameStatus) SetDNSapi(api string) {
 		return
 	}
 	hs.APIprovider = api
-	hs.dnsAPI.Set(api)
+	hs.dnsAPI.SetValue(api)
 	hs.changed = true
 }
diff --git a/json.go b/json.go
index 6cb3af5..2078e30 100644
--- a/json.go
+++ b/json.go
@@ -1,7 +1,7 @@
 // This is a simple example
 package main
 
-import 	(
+import (
 	"encoding/json"
 )
 
diff --git a/main.go b/main.go
index b9f039f..e85b2c8 100644
--- a/main.go
+++ b/main.go
@@ -4,22 +4,22 @@
 
 package main
 
-import 	(
+import (
 	"fmt"
 	// "runtime"
-	"time"
 	"embed"
+	"time"
 
+	"go.wit.com/lib/debugger"
+	"go.wit.com/gui"
 	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/debugger"
 
-	"go.wit.com/gui/lib/linuxstatus"
+	"go.wit.com/lib/gui/linuxstatus"
 
 	"github.com/miekg/dns"
 )
 
-//go:embed plugins/*
+//go:embed resources/*
 var resToolkit embed.FS
 
 func main() {
@@ -41,6 +41,9 @@ func main() {
 	}
 
 	me.myGui = gui.New()
+	me.myGui.LoadToolkit("andlabs")
+	log.Sleep(1)
+	panic("test")
 	me.myGui.InitEmbed(resToolkit)
 	me.myGui.Default()
 
@@ -60,27 +63,27 @@ func main() {
 	if debugger.ArgDebug() {
 		go func() {
 			log.Sleep(2)
-			debugger.DebugWindow(me.myGui)
+			debugger.DebugWindow()
 		}()
 	}
 
 	log.Sleep(me.artificialSleep)
 
 	// TCP & UDP port 53 lookups + DNS over HTTP lookups + os.Exec(dig)
-	go myTicker(60 * time.Second, "DNSloop", func() {
+	go myTicker(60*time.Second, "DNSloop", func() {
 		me.digStatus.Update()
 
 		if me.digStatus.Ready() {
-			current := me.statusIPv6.Get()
+			current := me.statusIPv6.String()
 			if me.digStatus.IPv6() {
 				if current != "WORKING" {
 					log.Log(CHANGE, "IPv6 resolution is WORKING")
-					me.statusIPv6.Set("WORKING")
+					me.statusIPv6.SetValue("WORKING")
 				}
 			} else {
 				if current != "Need VPN" {
 					log.Log(CHANGE, "IPv6 resolution seems to have broken")
-					me.statusIPv6.Set("Need VPN")
+					me.statusIPv6.SetValue("Need VPN")
 				}
 			}
 		}
@@ -91,7 +94,7 @@ func main() {
 	// things until the timeout happens
 
 	lastProvider := "unknown"
-	go myTicker(10 * time.Second, "DNSloop", func() {
+	go myTicker(10*time.Second, "DNSloop", func() {
 		log.Log(INFO, "me.statusDNS.Update() START")
 		me.statusDNS.Update()
 
@@ -102,24 +105,24 @@ func main() {
 			me.apiButton.SetText(provider + " wit.com")
 		}
 		if provider == "cloudflare" {
-			me.DnsAPIstatus.Set("WORKING")
+			me.DnsAPIstatus.SetValue("WORKING")
 		}
 	})
 
 	// probes the OS network settings
-	go myTicker(500 * time.Millisecond, "me.statusOS,Update()", func() {
-		duration := timeFunction( func() {
+	go myTicker(500*time.Millisecond, "me.statusOS,Update()", func() {
+		duration := timeFunction(func() {
 			me.statusOS.Update()
 
 			if me.statusOS.ValidHostname() {
-				if me.hostnameStatus.GetText() != "WORKING" {
-					me.hostnameStatus.Set("WORKING")
+				if me.hostnameStatus.String() != "WORKING" {
+					me.hostnameStatus.SetValue("WORKING")
 					me.changed = true
 				}
 			}
 
 			// re-check DNS API provider
-			if (me.statusOS.Changed()) {
+			if me.statusOS.Changed() {
 				// lookup the NS records for your domain
 				// if your host is test.wit.com, find the NS resource records for wit.com
 				lookupNS(me.statusOS.GetDomainName())
@@ -135,22 +138,22 @@ func main() {
 	})
 
 	// check the four known things to see if they are all WORKING
-	myTicker(10 * time.Second, "MAIN LOOP", func() {
+	myTicker(10*time.Second, "MAIN LOOP", func() {
 		var working bool = true
-		if me.hostnameStatus.GetText() != "WORKING" {
-			log.Log(CHANGE, "The hostname is not WORKING yet", me.hostnameStatus.GetText())
+		if me.hostnameStatus.String() != "WORKING" {
+			log.Log(CHANGE, "The hostname is not WORKING yet", me.hostnameStatus.String())
 			working = false
 		}
-		if me.statusIPv6.Get() != "WORKING" {
-			log.Log(CHANGE, "IPv6 DNS lookup has not been confirmed yet", me.statusIPv6.Get())
+		if me.statusIPv6.String() != "WORKING" {
+			log.Log(CHANGE, "IPv6 DNS lookup has not been confirmed yet", me.statusIPv6.String())
 			working = false
 		}
-		if me.DnsStatus.GetText() != "WORKING" {
-			log.Log(CHANGE, "Your IPv6 DNS settings have not been confirmed yet", me.DnsStatus.GetText()) 
+		if me.DnsStatus.String() != "WORKING" {
+			log.Log(CHANGE, "Your IPv6 DNS settings have not been confirmed yet", me.DnsStatus.String())
 			working = false
 		}
-		if me.DnsAPIstatus.GetText() != "WORKING" {
-			log.Log(CHANGE, "The DNS API provider is not yet working", me.DnsAPIstatus.GetText())
+		if me.DnsAPIstatus.String() != "WORKING" {
+			log.Log(CHANGE, "The DNS API provider is not yet working", me.DnsAPIstatus.String())
 			working = false
 		}
 		if working {
@@ -170,8 +173,8 @@ func main() {
 
 // timeFunction takes a function as an argument and returns the execution time.
 func timeFunction(f func()) time.Duration {
-	startTime := time.Now() // Record the start time
-	f()                     // Execute the function
+	startTime := time.Now()      // Record the start time
+	f()                          // Execute the function
 	return time.Since(startTime) // Calculate the elapsed time
 }
 
@@ -181,16 +184,15 @@ func timeStamp() string {
 	return stamp
 }
 
-
 func myTicker(t time.Duration, name string, f func()) {
 	ticker := time.NewTicker(t)
 	defer ticker.Stop()
 	done := make(chan bool)
 	/*
-	go func() {
-		time.Sleep(10 * time.Second)
-		done <- true
-	}()
+		go func() {
+			time.Sleep(10 * time.Second)
+			done <- true
+		}()
 	*/
 	for {
 		select {
diff --git a/problems.go b/problems.go
index 12b2c44..f0c5ebb 100644
--- a/problems.go
+++ b/problems.go
@@ -1,7 +1,7 @@
 // this defines the kinds of problems that can be detected
 package main
 
-import 	(
+import (
 	"time"
 )
 
@@ -9,27 +9,27 @@ type ProblemType int
 type ActionType int
 
 type Problem struct {
-	kind ProblemType
+	kind   ProblemType
 	action ActionType
 
-	id int
-	Name string
-	desc string
-	value string
-	aaaa string
-	fixed bool
+	id       int
+	Name     string
+	desc     string
+	value    string
+	aaaa     string
+	fixed    bool
 	duration time.Duration // how long until you should check to see if it's fixed
-	born time.Time // when first reported
+	born     time.Time     // when first reported
 
-	begun bool // weather or not fixing it has begun
-	begunTime time.Time // when the attempt to fix the problem happened
-	begunResult bool // weather or not the attempt worked
+	begun       bool      // weather or not fixing it has begun
+	begunTime   time.Time // when the attempt to fix the problem happened
+	begunResult bool      // weather or not the attempt worked
 }
 
-var IPcreate = Problem {
-	kind: RR,
+var IPcreate = Problem{
+	kind:   RR,
 	action: CREATE,
-	desc: "This RR entry in the zonefile needs to be removed",
+	desc:   "This RR entry in the zonefile needs to be removed",
 }
 
 /*
diff --git a/resolverBox.go b/resolverBox.go
index e689780..440c359 100644
--- a/resolverBox.go
+++ b/resolverBox.go
@@ -1,4 +1,4 @@
-/* 
+/*
 	Performs DNS queries on TCP and UDP
 */
 
@@ -6,43 +6,43 @@ package main
 
 import (
 	"os"
-	"time"
-	"strconv"
 	"reflect"
+	"strconv"
+	"time"
 
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/gui"
 	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/gadgets"
 
 	"github.com/miekg/dns"
 )
 
 type resolverStatus struct {
-	title		string
-	server		string // The DNS server. Example: "127.0.0.1:53" or "1.1.1.1:53"
-	hostname	string // the hostname to lookup. Example: "www.google.com" or "go.wit.com"
+	title    string
+	server   string // The DNS server. Example: "127.0.0.1:53" or "1.1.1.1:53"
+	hostname string // the hostname to lookup. Example: "www.google.com" or "go.wit.com"
 
-	parent	*gui.Node
-	group	*gui.Node
-	grid	*gui.Node
+	parent *gui.Node
+	group  *gui.Node
+	grid   *gui.Node
 
 	// DNS setup options
-	udpA	*gui.Node
-	tcpA	*gui.Node
-	udpAAAA	*gui.Node
-	tcpAAAA	*gui.Node
+	udpA    *gui.Node
+	tcpA    *gui.Node
+	udpAAAA *gui.Node
+	tcpAAAA *gui.Node
 
 	// show the display
-	aFail		*gui.Node
-	aSuccess	*gui.Node
-	aaaaFail	*gui.Node
-	aaaaSuccess	*gui.Node
+	aFail       *gui.Node
+	aSuccess    *gui.Node
+	aaaaFail    *gui.Node
+	aaaaSuccess *gui.Node
 
 	// interger counters
-	aFailc		int
-	aSuccessc	int
-	aaaaFailc	int
-	aaaaSuccessc	int
+	aFailc       int
+	aSuccessc    int
+	aaaaFailc    int
+	aaaaSuccessc int
 }
 
 func (rs *resolverStatus) set(a any, s string) {
@@ -58,7 +58,7 @@ func (rs *resolverStatus) set(a any, s string) {
 	var ol *gadgets.OneLiner
 	if reflect.TypeOf(a) == reflect.TypeOf(ol) {
 		ol = a.(*gadgets.OneLiner)
-		ol.Set(s)
+		ol.SetValue(s)
 		return
 	}
 	log.Warn("unknown type TypeOf(a) =", reflect.TypeOf(a), "a =", a)
@@ -114,7 +114,7 @@ func (rs *resolverStatus) update() (bool, bool) {
 	results, _ = dnsUdpLookup(rs.server, rs.hostname, dns.TypeA)
 	log.Log(DNS, "resolverStatus.update() UDP type A =", results)
 
-	if (len(results) == 0) {
+	if len(results) == 0 {
 		rs.set(rs.udpA, "BROKEN")
 		rs.aFailc += 1
 	} else {
@@ -126,7 +126,7 @@ func (rs *resolverStatus) update() (bool, bool) {
 	results, _ = dnsTcpLookup(rs.server, rs.hostname, dns.TypeA)
 	log.Log(DNS, "resolverStatus.update() TCP type A =", results)
 
-	if (len(results) == 0) {
+	if len(results) == 0 {
 		rs.set(rs.tcpA, "BROKEN")
 		rs.aFailc += 1
 	} else {
@@ -136,12 +136,12 @@ func (rs *resolverStatus) update() (bool, bool) {
 	}
 
 	me.digStatus.set(rs.aFail, strconv.Itoa(rs.aFailc))
-	me.digStatus.set(rs.aSuccess,strconv.Itoa(rs.aSuccessc))
+	me.digStatus.set(rs.aSuccess, strconv.Itoa(rs.aSuccessc))
 
 	results, _ = dnsUdpLookup(rs.server, rs.hostname, dns.TypeAAAA)
 	log.Log(DNS, "resolverStatus.update() UDP type AAAA =", results)
 
-	if (len(results) == 0) {
+	if len(results) == 0 {
 		me.digStatus.set(rs.udpAAAA, "BROKEN")
 		rs.aaaaFailc += 1
 		me.digStatus.set(rs.aaaaFail, strconv.Itoa(rs.aaaaFailc))
@@ -154,7 +154,7 @@ func (rs *resolverStatus) update() (bool, bool) {
 	results, _ = dnsTcpLookup(rs.server, rs.hostname, dns.TypeAAAA)
 	log.Log(DNS, "resolverStatus.update() UDP type AAAA =", results)
 
-	if (len(results) == 0) {
+	if len(results) == 0 {
 		me.digStatus.set(rs.tcpAAAA, "BROKEN")
 		rs.aaaaFailc += 1
 		me.digStatus.set(rs.aaaaFail, strconv.Itoa(rs.aaaaFailc))
@@ -165,7 +165,7 @@ func (rs *resolverStatus) update() (bool, bool) {
 	}
 
 	me.digStatus.set(rs.aaaaFail, strconv.Itoa(rs.aaaaFailc))
-	me.digStatus.set(rs.aaaaSuccess,strconv.Itoa(rs.aaaaSuccessc))
+	me.digStatus.set(rs.aaaaSuccess, strconv.Itoa(rs.aaaaSuccessc))
 
 	return a, aaaa
 }
@@ -193,11 +193,11 @@ func dnsTcpLookup(server string, domain string, recordType uint16) ([]string, er
 	var records []string
 
 	c := new(dns.Client)
-	c.Net = "tcp" // Specify to use TCP for the query
-	c.Timeout = time.Second * 5  // Set a 5-second timeout
+	c.Net = "tcp"               // Specify to use TCP for the query
+	c.Timeout = time.Second * 5 // Set a 5-second timeout
 	m := new(dns.Msg)
 	m.SetQuestion(dns.Fqdn(domain), recordType)
-	r, _, err := c.Exchange(m, server) // If server = "1.1.1.1:53" then use Cloudflare's DNS server 
+	r, _, err := c.Exchange(m, server) // If server = "1.1.1.1:53" then use Cloudflare's DNS server
 	if err != nil {
 		return nil, err
 	}
diff --git a/smartwindow/LICENSE b/smartwindow/LICENSE
deleted file mode 100644
index f288702..0000000
--- a/smartwindow/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/smartwindow/args.go b/smartwindow/args.go
deleted file mode 100644
index 8722b69..0000000
--- a/smartwindow/args.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package smartwindow
-
-/*
-	this enables command line options from other packages like 'gui' and 'log'
-*/
-
-import 	(
-	"go.wit.com/log"
-)
-
-var NOW *log.LogFlag
-var INFO *log.LogFlag
-var SPEW *log.LogFlag
-var WARN *log.LogFlag
-
-func init() {
-	full := "go.wit.com/gui/gadgets/smartwindow"
-	short := "smartWin"
-
-	NOW = log.NewFlag( "NOW",  true,  full, short, "temp debugging stuff")
-	INFO = log.NewFlag("INFO", false, full, short, "General Info")
-	SPEW = log.NewFlag("SPEW", false, full, short, "spew stuff")
-	WARN = log.NewFlag("WARN", false, full, short, "bad things")
-}
diff --git a/smartwindow/common.go b/smartwindow/common.go
deleted file mode 100644
index 5c55c34..0000000
--- a/smartwindow/common.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// This creates a 'smart window'
-// it should work even when it is hidden
-// from the gui toolkit plugins
-package smartwindow
-
-import 	(
-	"go.wit.com/log"
-)
-
-func (sw *SmartWindow) Ready() bool {
-	log.Log(INFO, "Ready() START")
-	if sw == nil {return false}
-	if sw.window == nil {return false}
-	log.Log(INFO, "Ready() END sw.ready =", sw.ready)
-	return sw.ready
-}
-
-func (sw *SmartWindow) Initialized() bool {
-	log.Log(INFO, "checking Initialized()")
-	if sw == nil {return false}
-	return true
-}
diff --git a/smartwindow/new.go b/smartwindow/new.go
deleted file mode 100644
index 35e9df5..0000000
--- a/smartwindow/new.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package smartwindow
-
-import 	(
-	"go.wit.com/log"
-)
-
-func New() *SmartWindow {
-	sw := SmartWindow {
-		hidden: true,
-		ready: false,
-	}
-	
-	return &sw
-}
-
-func (sw *SmartWindow) InitWindow() {
-	if sw == nil {
-		log.Log(WARN, "not initalized yet (no parent for the window?)")
-		return
-	}
-	if sw.window != nil {
-		log.Log(WARN, "You already have a SmartWindow")
-		sw.ready = true
-		return
-	}
-}
diff --git a/smartwindow/postReady.go b/smartwindow/postReady.go
deleted file mode 100644
index 99349ff..0000000
--- a/smartwindow/postReady.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// This creates a 'smart window'
-// it should work even when it is hidden
-// from the gui toolkit plugins
-package smartwindow
-
-import 	(
-	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-)
-
-/*
-	all these functions run after the window is Ready()
-	so they should all start with that check
-*/
-
-// reports externally if something has changed
-// since the last time it was asked about it
-func (sw *SmartWindow) Changed() bool {
-	if ! sw.Ready() {return false}
-
-	if sw.changed {
-		sw.changed = false
-		return true
-	}
-	return false
-}
-
-func (sw *SmartWindow) Show() {
-	if ! sw.Ready() {return}
-
-	log.Log(WARN, "Show() window ready =", sw.ready)
-	sw.window.Show()
-	sw.hidden = false
-}
-
-func (sw *SmartWindow) Hide() {
-	if ! sw.Ready() {return}
-
-	log.Log(WARN, "Hide() window ready =", sw.ready)
-	sw.window.Hide()
-	sw.hidden = true
-}
-
-func (sw *SmartWindow) Toggle() {
-	if ! sw.Ready() {return}
-
-	log.Log(WARN, "Toggle() window ready =", sw.ready)
-	if sw.hidden {
-		sw.Show()
-	} else {
-		sw.Hide()
-	}
-}
-
-func (sw *SmartWindow) Box() *gui.Node {
-	if ! sw.Ready() {return nil}
-
-	return sw.box
-}
-
-func (sw *SmartWindow) Draw() {
-	if ! sw.Ready() {return}
-
-	log.Log(WARN, "Draw() window ready")
-	sw.window.Draw()
-
-	if sw.vertical {
-		sw.box = sw.window.NewBox("bw vbox", false)
-		log.Log(WARN, "BasicWindow.Custom() made vbox")
-	} else {
-		sw.box = sw.window.NewBox("bw hbox", true)
-		log.Log(WARN, "BasicWindow.Custom() made hbox")
-	}
-	if (sw.populate != nil) {
-		log.Log(WARN, "Make() trying to run Custom sw.populate() here")
-		sw.populate(sw)
-	}
-}
diff --git a/smartwindow/preReady.go b/smartwindow/preReady.go
deleted file mode 100644
index 0fe23fd..0000000
--- a/smartwindow/preReady.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// these are things you can config
-package smartwindow
-
-import 	(
-	"go.wit.com/log"
-	"go.wit.com/gui/gui"
-)
-
-/*	for now, run these before the window is ready
-	That is, they all start with:
-
-	if ! sw.Initialized() {return}
-	if sw.Ready() {return}
-*/
-
-func (sw *SmartWindow) Title(title string) {
-	if ! sw.Initialized() {return}
-	if sw.Ready() {return}
-
-	log.Log(WARN, "Title() =", title)
-	sw.title = title
-}
-
-func (sw *SmartWindow) SetParent(p *gui.Node) {
-	if ! sw.Initialized() {return}
-	if sw.Ready() {return}
-
-	log.Log(WARN, "SetParent")
-	if sw.parent == nil {
-		log.Log(WARN, "SetParent =", p)
-		sw.parent = p
-		return
-	} else {
-		log.Log(WARN, "SetParent was already set. TODO: Move to new parent")
-	}
-}
-
-func (sw *SmartWindow) SetDraw(f func(*SmartWindow)) {
-	log.Log(WARN, "SetDraw() START")
-	if ! sw.Initialized() {
-		log.Log(WARN, "SetDraw() Failed. sw.Initialized == false")
-		return
-	}
-	if sw.Ready() {
-		log.Log(WARN, "SetDraw() Failed. sw.Ready() == true")
-		return
-	}
-
-	sw.populate = f
-	log.Log(WARN, "SetDraw() END sw.populate is set")
-}
-
-func (sw *SmartWindow) Make() {
-	if ! sw.Initialized() {return}
-	if sw.Ready() {return}
-	log.Log(WARN, "Make() START")
-
-	sw.window = sw.parent.RawWindow(sw.title)
-	sw.window.Custom = func() {
-		log.Warn("BasicWindow.Custom() closed. TODO: handle this", sw.title)
-	}
-	log.Log(WARN, "Make() END sw.window = RawWindow() (not sent to toolkits)")
-	sw.ready = true
-}
-
-func (sw *SmartWindow) Vertical() {
-	if ! sw.Initialized() {return}
-	if sw.Ready() {return}
-
-	log.Log(WARN, "Vertical() setting vertical = true")
-	sw.vertical = true
-}
diff --git a/smartwindow/structs.go b/smartwindow/structs.go
deleted file mode 100644
index ac0bea7..0000000
--- a/smartwindow/structs.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package smartwindow
-
-import (
-	"go.wit.com/gui/gui"
-)
-
-type SmartWindow struct {
-	ready	bool	// track if the window is ready
-	hidden	bool	// track if the window is hidden from the toolkits
-	changed	bool	// track if something changed in the window
-	vertical bool
-
-	title	string	// what the user sees as the name
-	name	string	// the programatic name aka: "CALANDAR"
-
-	parent	*gui.Node // where to place the window if you try to draw it
-	window	*gui.Node // the underlying window
-	box	*gui.Node // the box inside the window // get this from BasicWindow() ?
-
-	populate func(*SmartWindow) // the function to generate the widgets
-}
diff --git a/structs.go b/structs.go
index 3ebc201..d34e910 100644
--- a/structs.go
+++ b/structs.go
@@ -1,14 +1,14 @@
 // This creates a simple hello world window
 package main
 
-import 	(
+import (
 	"net"
 	"time"
-	"go.wit.com/gui/gui"
-	"go.wit.com/gui/gadgets"
-	// "go.wit.com/gui/cloudflare"
-	"go.wit.com/gui/lib/linuxstatus"
-	"go.wit.com/apps/control-panel-dns/smartwindow"
+
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/gui"
+
+	"go.wit.com/lib/gui/linuxstatus"
 
 	"github.com/miekg/dns"
 )
@@ -17,70 +17,70 @@ import 	(
 var me Host
 
 type Host struct {
-	myGui		*gui.Node	// the 'gui' binary tree root node
+	myGui *gui.Node // the 'gui' binary tree root node
 
-	window		*gadgets.BasicWindow	// the main window
-	debug		*gadgets.BasicWindow	// the debug window
+	window *gadgets.BasicWindow // the main window
+	debug  *gadgets.BasicWindow // the debug window
 
-	statusDNS	*hostnameStatus		// keeps track of the hostname and it's status
-	statusOS	*linuxstatus.LinuxStatus		// what the Linux OS sees
-	digStatus	*digStatus		// window of the results of DNS lookups
+	statusDNS *hostnameStatus          // keeps track of the hostname and it's status
+	statusOS  *linuxstatus.LinuxStatus // what the Linux OS sees
+	digStatus *digStatus               // window of the results of DNS lookups
 
 	// WHEN THESE ARE ALL "WORKING", then everything is good
-	hostnameStatus	*gui.Node		// a summary for the user of where things are
-	DnsAPIstatus	*gui.Node		// does your DNS API work?
+	hostnameStatus *gui.Node // a summary for the user of where things are
+	DnsAPIstatus   *gui.Node // does your DNS API work?
 	// APIprovider	string
-	apiButton	*gui.Node		// the button you click for the API config page
+	apiButton *gui.Node // the button you click for the API config page
 
-	artificialSleep float64	`default:"0.7"`	// artificial sleep on startup
-	artificialS     string 	`default:"abc"`	// artificial sleep on startup
+	artificialSleep float64 `default:"0.7"` // artificial sleep on startup
+	artificialS     string  `default:"abc"` // artificial sleep on startup
 
-	ttl		*gadgets.Duration
-	dnsTtl		*gadgets.Duration
-	dnsSleep	time.Duration
-	localSleep	time.Duration
+	ttl        *gadgets.Duration
+	dnsTtl     *gadgets.Duration
+	dnsSleep   time.Duration
+	localSleep time.Duration
 
-	changed		bool			// set to true if things changed
+	changed bool // set to true if things changed
 
-	ipmap		map[string]*IPtype	// the current ip addresses
-	dnsmap		map[string]*IPtype	// the current dns addresses
-	ifmap		map[int]*IFtype		// the current interfaces
-	nsmap		map[string]string	// the NS records
+	ipmap  map[string]*IPtype // the current ip addresses
+	dnsmap map[string]*IPtype // the current dns addresses
+	ifmap  map[int]*IFtype    // the current interfaces
+	nsmap  map[string]string  // the NS records
 
 	// DNS A and AAAA results
-	ipv4s		map[string]dns.RR
-	ipv6s		map[string]dns.RR
+	ipv4s map[string]dns.RR
+	ipv6s map[string]dns.RR
 
 	// DNS stuff
-	DnsStatus	*gui.Node		// the current state of DNS
-	DnsSpeed	*gui.Node		// 'FAST', 'OK', 'SLOW', etc
-	DnsSpeedActual	*gui.Node		// the last actual duration
-	DnsSpeedLast	string			// the last state 'FAST', 'OK', etc
+	DnsStatus      *gui.Node // the current state of DNS
+	DnsSpeed       *gui.Node // 'FAST', 'OK', 'SLOW', etc
+	DnsSpeedActual *gui.Node // the last actual duration
+	DnsSpeedLast   string    // the last state 'FAST', 'OK', etc
 
-	statusIPv6	*gadgets.OneLiner
+	statusIPv6      *gadgets.OneLiner
 	digStatusButton *gui.Node
 	statusDNSbutton *gui.Node
-	witcom		*gadgets.BasicWindow
-	fixButton	*gui.Node
-	fixWindow	*smartwindow.SmartWindow
+	witcom          *gadgets.BasicWindow
+	fixButton       *gui.Node
+	fixWindow       *gadgets.BasicWindow
 
-	problems	*errorBox
-	autofix		*gui.Node
+	problems *errorBox
+	autofix  *gui.Node
 }
 
 type IPtype struct {
-	gone		bool		// used to track if the ip exists
-	ipv6		bool		// the future
-	ipv4		bool		// the past
-	LinkLocal	bool
-	iface		*net.Interface
-	ip		net.IP
-	ipnet		*net.IPNet
+	gone      bool // used to track if the ip exists
+	ipv6      bool // the future
+	ipv4      bool // the past
+	LinkLocal bool
+	iface     *net.Interface
+	ip        net.IP
+	ipnet     *net.IPNet
 }
 
 type IFtype struct {
-	gone		bool		// used to track if the interface exists
-	name		string		// just a shortcut to the name. maybe this is dumb
+	gone bool   // used to track if the interface exists
+	name string // just a shortcut to the name. maybe this is dumb
 	// up		bool		// could be used to track ifup/ifdown
-	iface		*net.Interface
+	iface *net.Interface
 }
diff --git a/testSmartWindow.go b/testSmartWindow.go
deleted file mode 100644
index 354cc78..0000000
--- a/testSmartWindow.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// testing the smart window
-package main
-
-import 	(
-	"go.wit.com/log"
-	// "go.wit.com/gui/cloudflare"
-	"go.wit.com/apps/control-panel-dns/smartwindow"
-)
-
-func testSmartWindow(sw *smartwindow.SmartWindow) {
-	log.Log(WARN, "testSmartWindow() START")
-	grid := sw.Box().NewGrid("test", 5, 1)
-	grid.NewLabel("test 1")
-	grid.NewLabel("test 1")
-	grid.NewLabel("test 2")
-	grid.NewLabel("test 2")
-	grid.NewLabel("test 3")
-	grid.NewLabel("test 3")
-	grid.NewLabel("test 3")
-	grid.NewLabel("test 3")
-}