diff --git a/cmd/OrbToXorb/main.go b/cmd/OrbToXorb/main.go
index 128a5ec..673145f 100644
--- a/cmd/OrbToXorb/main.go
+++ b/cmd/OrbToXorb/main.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	"github.com/OrbTools/OrbCommon/devices"
-	xdr "github.com/davecgh/go-xdr/xdr2"
+	xdr "github.com/minizbot2012/minxdr"
 )
 
 func loadOrb(file string, dev *devices.DeviceDef) *devices.KeyMap {
diff --git a/go.mod b/go.mod
index be3f301..36527e0 100644
--- a/go.mod
+++ b/go.mod
@@ -3,11 +3,11 @@ module github.com/OrbTools/OrbMap
 go 1.16
 
 require (
-	github.com/OrbTools/OrbCommon v0.0.0-20210728131206-05d3f456f3f8
+	github.com/OrbTools/OrbCommon v0.0.0-20210801165406-2338bcdd7eea
 	github.com/bendahl/uinput v1.4.1
-	github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892
 	github.com/google/gousb v1.1.1
 	github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb
 	github.com/lxn/win v0.0.0-20210218163916-a377121e959e
+	github.com/minizbot2012/minxdr v0.0.0-20210801163755-568fb466e98d
 	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
 )
diff --git a/go.sum b/go.sum
index 3b48295..5e7a7b2 100644
--- a/go.sum
+++ b/go.sum
@@ -1,15 +1,15 @@
-github.com/OrbTools/OrbCommon v0.0.0-20210728131206-05d3f456f3f8 h1:KWuVPAkREE71HFBRRqReCJMlJVfOmnkcO31/41wm7j4=
-github.com/OrbTools/OrbCommon v0.0.0-20210728131206-05d3f456f3f8/go.mod h1:QpmZXfsa8ixOQkr29N9sD38PJuV9eYw3b1xTazot6PA=
+github.com/OrbTools/OrbCommon v0.0.0-20210801165406-2338bcdd7eea h1:7K2WnZg3l0Zd+57CaXQfWPtotcita7q6BcBNApcO20U=
+github.com/OrbTools/OrbCommon v0.0.0-20210801165406-2338bcdd7eea/go.mod h1:ofspvb+9lC9IZj+gsWkDkOc0nIt2Zv+o0EPZZIUN+RU=
 github.com/bendahl/uinput v1.4.1 h1:ecxSLcVxWk0EFyZBtmCTnOKjK/HCNdsUcWXRTkNt06k=
 github.com/bendahl/uinput v1.4.1/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8=
-github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 h1:qg9VbHo1TlL0KDM0vYvBG9EY0X0Yku5WYIPoFWt8f6o=
-github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVzE5DEzZhPfvhY/9sPFMQIxaJ9VAMs9AagrE=
 github.com/google/gousb v1.1.1 h1:2sjwXlc0PIBgDnXtNxUrHcD/RRFOmAtRq4QgnFBE6xc=
 github.com/google/gousb v1.1.1/go.mod h1:b3uU8itc6dHElt063KJobuVtcKHWEfFOysOqBNzHhLY=
 github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb h1:WHSAxLz3P5t4DKukfJ5wu7+aMyVkuTNSbCiAjVS92sM=
 github.com/gvalkov/golang-evdev v0.0.0-20191114124502-287e62b94bcb/go.mod h1:SAzVFKCRezozJTGavF3GX8MBUruETCqzivVLYiywouA=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
 github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
+github.com/minizbot2012/minxdr v0.0.0-20210801163755-568fb466e98d h1:DU2lr4XDQnWR//L3rDlyqF8hPjy78NAUU/dYIHix1So=
+github.com/minizbot2012/minxdr v0.0.0-20210801163755-568fb466e98d/go.mod h1:/f3HTVitNhL2hl4VdOCar3rLHlLc5pSogj2Yp4OQRY0=
 golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=