diff --git a/vendor/github.com/distatus/battery/.gitignore b/vendor/github.com/cjbassi/battery/.gitignore
similarity index 100%
rename from vendor/github.com/distatus/battery/.gitignore
rename to vendor/github.com/cjbassi/battery/.gitignore
diff --git a/vendor/github.com/distatus/battery/.travis.yml b/vendor/github.com/cjbassi/battery/.travis.yml
similarity index 100%
rename from vendor/github.com/distatus/battery/.travis.yml
rename to vendor/github.com/cjbassi/battery/.travis.yml
diff --git a/vendor/github.com/distatus/battery/LICENSE.md b/vendor/github.com/cjbassi/battery/LICENSE.md
similarity index 100%
rename from vendor/github.com/distatus/battery/LICENSE.md
rename to vendor/github.com/cjbassi/battery/LICENSE.md
diff --git a/vendor/github.com/distatus/battery/README.md b/vendor/github.com/cjbassi/battery/README.md
similarity index 100%
rename from vendor/github.com/distatus/battery/README.md
rename to vendor/github.com/cjbassi/battery/README.md
diff --git a/vendor/github.com/distatus/battery/battery.go b/vendor/github.com/cjbassi/battery/battery.go
similarity index 100%
rename from vendor/github.com/distatus/battery/battery.go
rename to vendor/github.com/cjbassi/battery/battery.go
diff --git a/vendor/github.com/distatus/battery/battery_darwin.go b/vendor/github.com/cjbassi/battery/battery_darwin.go
similarity index 98%
rename from vendor/github.com/distatus/battery/battery_darwin.go
rename to vendor/github.com/cjbassi/battery/battery_darwin.go
index f781702..e6e24b0 100644
--- a/vendor/github.com/distatus/battery/battery_darwin.go
+++ b/vendor/github.com/cjbassi/battery/battery_darwin.go
@@ -25,7 +25,7 @@ import (
 	"math"
 	"os/exec"
 
-	plist "github.com/DHowett/go-plist"
+	plist "howett.net/plist"
 )
 
 type battery struct {
diff --git a/vendor/github.com/distatus/battery/battery_freebsd_dragonfly_.go b/vendor/github.com/cjbassi/battery/battery_freebsd_dragonfly_.go
similarity index 100%
rename from vendor/github.com/distatus/battery/battery_freebsd_dragonfly_.go
rename to vendor/github.com/cjbassi/battery/battery_freebsd_dragonfly_.go
diff --git a/vendor/github.com/distatus/battery/battery_linux.go b/vendor/github.com/cjbassi/battery/battery_linux.go
similarity index 100%
rename from vendor/github.com/distatus/battery/battery_linux.go
rename to vendor/github.com/cjbassi/battery/battery_linux.go
diff --git a/vendor/github.com/distatus/battery/battery_netbsd.go b/vendor/github.com/cjbassi/battery/battery_netbsd.go
similarity index 99%
rename from vendor/github.com/distatus/battery/battery_netbsd.go
rename to vendor/github.com/cjbassi/battery/battery_netbsd.go
index 668e803..91c7fea 100644
--- a/vendor/github.com/distatus/battery/battery_netbsd.go
+++ b/vendor/github.com/cjbassi/battery/battery_netbsd.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"unsafe"
 
-	plist "github.com/DHowett/go-plist"
+	plist "howett.net/plist"
 
 	"golang.org/x/sys/unix"
 )
diff --git a/vendor/github.com/distatus/battery/battery_openbsd.go b/vendor/github.com/cjbassi/battery/battery_openbsd.go
similarity index 100%
rename from vendor/github.com/distatus/battery/battery_openbsd.go
rename to vendor/github.com/cjbassi/battery/battery_openbsd.go
diff --git a/vendor/github.com/distatus/battery/battery_solaris.go b/vendor/github.com/cjbassi/battery/battery_solaris.go
similarity index 100%
rename from vendor/github.com/distatus/battery/battery_solaris.go
rename to vendor/github.com/cjbassi/battery/battery_solaris.go
diff --git a/vendor/github.com/distatus/battery/battery_windows.go b/vendor/github.com/cjbassi/battery/battery_windows.go
similarity index 100%
rename from vendor/github.com/distatus/battery/battery_windows.go
rename to vendor/github.com/cjbassi/battery/battery_windows.go
diff --git a/vendor/github.com/distatus/battery/errors.go b/vendor/github.com/cjbassi/battery/errors.go
similarity index 100%
rename from vendor/github.com/distatus/battery/errors.go
rename to vendor/github.com/cjbassi/battery/errors.go
diff --git a/vendor/github.com/distatus/battery/ioctl.go b/vendor/github.com/cjbassi/battery/ioctl.go
similarity index 100%
rename from vendor/github.com/distatus/battery/ioctl.go
rename to vendor/github.com/cjbassi/battery/ioctl.go
diff --git a/vendor/github.com/DHowett/go-plist/.gitlab-ci.yml b/vendor/howett.net/plist/.gitlab-ci.yml
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/.gitlab-ci.yml
rename to vendor/howett.net/plist/.gitlab-ci.yml
diff --git a/vendor/github.com/DHowett/go-plist/LICENSE b/vendor/howett.net/plist/LICENSE
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/LICENSE
rename to vendor/howett.net/plist/LICENSE
diff --git a/vendor/github.com/DHowett/go-plist/README.md b/vendor/howett.net/plist/README.md
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/README.md
rename to vendor/howett.net/plist/README.md
diff --git a/vendor/github.com/DHowett/go-plist/bplist.go b/vendor/howett.net/plist/bplist.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/bplist.go
rename to vendor/howett.net/plist/bplist.go
diff --git a/vendor/github.com/DHowett/go-plist/bplist_generator.go b/vendor/howett.net/plist/bplist_generator.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/bplist_generator.go
rename to vendor/howett.net/plist/bplist_generator.go
diff --git a/vendor/github.com/DHowett/go-plist/bplist_parser.go b/vendor/howett.net/plist/bplist_parser.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/bplist_parser.go
rename to vendor/howett.net/plist/bplist_parser.go
diff --git a/vendor/github.com/DHowett/go-plist/decode.go b/vendor/howett.net/plist/decode.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/decode.go
rename to vendor/howett.net/plist/decode.go
diff --git a/vendor/github.com/DHowett/go-plist/doc.go b/vendor/howett.net/plist/doc.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/doc.go
rename to vendor/howett.net/plist/doc.go
diff --git a/vendor/github.com/DHowett/go-plist/encode.go b/vendor/howett.net/plist/encode.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/encode.go
rename to vendor/howett.net/plist/encode.go
diff --git a/vendor/github.com/DHowett/go-plist/fuzz.go b/vendor/howett.net/plist/fuzz.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/fuzz.go
rename to vendor/howett.net/plist/fuzz.go
diff --git a/vendor/howett.net/plist/go.mod b/vendor/howett.net/plist/go.mod
new file mode 100644
index 0000000..ec83441
--- /dev/null
+++ b/vendor/howett.net/plist/go.mod
@@ -0,0 +1,9 @@
+module howett.net/plist
+
+require (
+	// for cmd/ply
+	github.com/jessevdk/go-flags v1.4.0
+	github.com/kr/pretty v0.1.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/yaml.v2 v2.2.1
+)
diff --git a/vendor/github.com/DHowett/go-plist/marshal.go b/vendor/howett.net/plist/marshal.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/marshal.go
rename to vendor/howett.net/plist/marshal.go
diff --git a/vendor/github.com/DHowett/go-plist/must.go b/vendor/howett.net/plist/must.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/must.go
rename to vendor/howett.net/plist/must.go
diff --git a/vendor/github.com/DHowett/go-plist/plist.go b/vendor/howett.net/plist/plist.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/plist.go
rename to vendor/howett.net/plist/plist.go
diff --git a/vendor/github.com/DHowett/go-plist/plist_types.go b/vendor/howett.net/plist/plist_types.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/plist_types.go
rename to vendor/howett.net/plist/plist_types.go
diff --git a/vendor/github.com/DHowett/go-plist/text_generator.go b/vendor/howett.net/plist/text_generator.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/text_generator.go
rename to vendor/howett.net/plist/text_generator.go
diff --git a/vendor/github.com/DHowett/go-plist/text_parser.go b/vendor/howett.net/plist/text_parser.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/text_parser.go
rename to vendor/howett.net/plist/text_parser.go
diff --git a/vendor/github.com/DHowett/go-plist/text_tables.go b/vendor/howett.net/plist/text_tables.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/text_tables.go
rename to vendor/howett.net/plist/text_tables.go
diff --git a/vendor/github.com/DHowett/go-plist/typeinfo.go b/vendor/howett.net/plist/typeinfo.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/typeinfo.go
rename to vendor/howett.net/plist/typeinfo.go
diff --git a/vendor/github.com/DHowett/go-plist/unmarshal.go b/vendor/howett.net/plist/unmarshal.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/unmarshal.go
rename to vendor/howett.net/plist/unmarshal.go
diff --git a/vendor/github.com/DHowett/go-plist/util.go b/vendor/howett.net/plist/util.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/util.go
rename to vendor/howett.net/plist/util.go
diff --git a/vendor/github.com/DHowett/go-plist/xml_generator.go b/vendor/howett.net/plist/xml_generator.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/xml_generator.go
rename to vendor/howett.net/plist/xml_generator.go
diff --git a/vendor/github.com/DHowett/go-plist/xml_parser.go b/vendor/howett.net/plist/xml_parser.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/xml_parser.go
rename to vendor/howett.net/plist/xml_parser.go
diff --git a/vendor/github.com/DHowett/go-plist/zerocopy.go b/vendor/howett.net/plist/zerocopy.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/zerocopy.go
rename to vendor/howett.net/plist/zerocopy.go
diff --git a/vendor/github.com/DHowett/go-plist/zerocopy_appengine.go b/vendor/howett.net/plist/zerocopy_appengine.go
similarity index 100%
rename from vendor/github.com/DHowett/go-plist/zerocopy_appengine.go
rename to vendor/howett.net/plist/zerocopy_appengine.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1f13cc8..4621aa6 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,13 +1,11 @@
-# github.com/DHowett/go-plist v0.0.0-20181124034731-591f970eefbb => github.com/DHowett/go-plist v0.0.0-20180729002649-fed556ad7290
-github.com/DHowett/go-plist
 # github.com/ProtonMail/go-appdir v0.0.0-20180220133335-7c788d1b45c6
 github.com/ProtonMail/go-appdir
 # github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6
 github.com/StackExchange/wmi
+# github.com/cjbassi/battery v0.0.0-20190206091651-451cd0de3f6f
+github.com/cjbassi/battery
 # github.com/cjbassi/drawille-go v0.0.0-20180329221028-ad535d0f92cd
 github.com/cjbassi/drawille-go
-# github.com/distatus/battery v0.0.0-20170521010419-916919eb43bd
-github.com/distatus/battery
 # github.com/docopt/docopt.go v0.0.0-20180111231733-ee0de3bc6815
 github.com/docopt/docopt.go
 # github.com/gizak/termui v0.0.0-20190124041613-958a28575d74
@@ -34,3 +32,5 @@ github.com/shirou/w32
 # golang.org/x/sys v0.0.0-20190116161447-11f53e031339
 golang.org/x/sys/unix
 golang.org/x/sys/windows
+# howett.net/plist v0.0.0-20181124034731-591f970eefbb
+howett.net/plist