diff --git a/go.mod b/go.mod
index 015eba1..9c4eb24 100755
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	fyne.io/fyne/v2 v2.1.2
-	github.com/OrbTools/OrbCommon v0.0.0-20220202055136-5d11e7ec765c
+	github.com/OrbTools/OrbCommon v0.0.0-20220202061304-a7fbba49e063
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec // indirect
 	github.com/kr/text v0.2.0 // indirect
diff --git a/go.sum b/go.sum
index 6b085be..19a6991 100755
--- a/go.sum
+++ b/go.sum
@@ -3,16 +3,11 @@ fyne.io/fyne/v2 v2.1.2/go.mod h1:p+E/Dh+wPW8JwR2DVcsZ9iXgR9ZKde80+Y+40Is54AQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
-github.com/Minizbot2012/minxdr v0.0.0-20211128051657-16f8bd94f749 h1:x7qoX7Lh5AFaYDsbQZKNFHpixY6ek2X1ud+j4qK7R6c=
 github.com/Minizbot2012/minxdr v0.0.0-20211128051657-16f8bd94f749/go.mod h1:Qtnd0s9q5lVY7qtAGJPYVsRsfNLsIMVhxYqm01ohZJk=
 github.com/Minizbot2012/minxdr v0.0.0-20220202052052-41040d8d2a6a h1:JHts7vzHcrHjoJ/OLh+QORXlOazmxjjWVknBTWVtPdI=
 github.com/Minizbot2012/minxdr v0.0.0-20220202052052-41040d8d2a6a/go.mod h1:Qtnd0s9q5lVY7qtAGJPYVsRsfNLsIMVhxYqm01ohZJk=
-github.com/OrbTools/OrbCommon v0.0.0-20220130194133-693719e66a79 h1:ym1scZvOCY63vCRBDcrL3k7e0X6N+BQLLRtCYvFlp/A=
-github.com/OrbTools/OrbCommon v0.0.0-20220130194133-693719e66a79/go.mod h1:1xiX9uHXOkx2JBwzZ4sR3mkPLpblWqWwOtppTqbWUO8=
-github.com/OrbTools/OrbCommon v0.0.0-20220202052713-32db943392d7 h1:c6Sl/fExgVFdFQFTdeLR2HuIALWKIBKsLXm2aqeAXAw=
-github.com/OrbTools/OrbCommon v0.0.0-20220202052713-32db943392d7/go.mod h1:ZN/0kkPoCthJetQBrFvrVgt42HnrN8RRZ2U2wrptcio=
-github.com/OrbTools/OrbCommon v0.0.0-20220202055136-5d11e7ec765c h1:SgEftC8Tiqb6pwmA/v4cVtA6+mg4vLTV2pxbI9fIbmE=
-github.com/OrbTools/OrbCommon v0.0.0-20220202055136-5d11e7ec765c/go.mod h1:ZN/0kkPoCthJetQBrFvrVgt42HnrN8RRZ2U2wrptcio=
+github.com/OrbTools/OrbCommon v0.0.0-20220202061304-a7fbba49e063 h1:yeaisxmunKWM9ungs6IaXeZwBPz3k8hfnZCt3jXTxwY=
+github.com/OrbTools/OrbCommon v0.0.0-20220202061304-a7fbba49e063/go.mod h1:ZN/0kkPoCthJetQBrFvrVgt42HnrN8RRZ2U2wrptcio=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -46,7 +41,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lucor/goinfo v0.0.0-20210802170112-c078a2b0f08b/go.mod h1:PRq09yoB+Q2OJReAmwzKivcYyremnibWGbK7WfftHzc=
-github.com/minizbot2012/minxdr v0.0.0-20210801163755-568fb466e98d/go.mod h1:/f3HTVitNhL2hl4VdOCar3rLHlLc5pSogj2Yp4OQRY0=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
diff --git a/orbbind.go b/orbbind.go
index a8cd1a0..75cee62 100755
--- a/orbbind.go
+++ b/orbbind.go
@@ -16,19 +16,18 @@ func main() {
 	ap := app.NewWithID("com.minizbot2012.orbbind")
 	window := ap.NewWindow("Generic Rebinding Utilities")
 	window.SetMaster()
-
 	omap := new(structs.KeyMap)
-	//omap.Keymap = make([]uint16, devices.DeviceTypes["orbweaver"].NumKeys)
-	//tabs, setter, getter := mui.Generate(devices.DeviceTypes["orbweaver"], window, reflect.ValueOf(omap))
 	main, setter, getter := container.NewAppTabs(), func(reflect.Value) {}, func() reflect.Value { return reflect.ValueOf(0) }
 	window.Resize(fyne.NewSize(640, 500))
 	devs := fyne.NewMenu("Devices")
 	SetDevice := func(dev string) {
 		omap = new(structs.KeyMap)
+		omap.Device = dev
 		omap.Keymap = make([]uint16, devices.DeviceTypes[dev].NumKeys)
 		main, setter, getter = mui.Generate(devices.DeviceTypes[dev], window, reflect.ValueOf(omap))
 		window.SetContent(main)
 	}
+	SetDevice("orbweaver")
 	for k := range devices.DeviceTypes {
 		devs.Items = append(devs.Items, fyne.NewMenuItem(k, func() {
 			SetDevice(k)
@@ -52,12 +51,16 @@ func main() {
 			}
 			if reader != nil {
 				omap := devices.LoadKeymap(reader)
+				if omap.Device != "" {
+					SetDevice(omap.Device)
+				} else {
+					SetDevice("orbweaver")
+				}
 				setter(reflect.ValueOf(omap))
 			}
 		}, window)
 	})), devs)
 	window.SetMainMenu(mainMenu)
-
 	window.SetContent(main)
 	window.ShowAndRun()
 }