diff --git a/.drone.yml b/.drone.yml
index 9a72ab71..2570509f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,11 +18,13 @@ pipeline:
       - export GOPATH=$GOPATH:/media/sf_GOPATH1/
       - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
       - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client 
-      - go get -d
+      - export GO111MODULE=on
+      - go mod download
       - $QT_DIR/$QT_API/gcc_64/bin/lrelease ui.pro
       - git fetch --tags 
       - export VERSION=`git describe --tags`
       - export BUILDDATE=`date +%G-%m-%d-%H-%M`
+      - go mod vendor
       - qtdeploy  -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE"  build linux
       - cp README.md deploy/linux
       - export FILENAME=cwtch-linux-$BUILDDATE.tar.gz
@@ -44,16 +46,18 @@ pipeline:
       - QT_API=5.13.0
       - ANDROID_NDK_DIR=/home/user/android-ndk-r18b
       - ANDROID_SDK_DIR=/home/user/android-sdk-linux
+      - GO111MODULE=on
     commands:
-      - export GOPATH=$GOPATH:/media/sf_GOPATH1/
       - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
       - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
-      - find -iname 'moc*' | xargs rm
-      - find -iname 'rcc*' | xargs rm
-      - go get -d
+      - rm -r vendor/
+      - make clean
+      - go mod download
       - export VERSION=`git describe --tags`
       - export BUILDDATE=`date +%G-%m-%d-%H-%M`
-      - qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android
+      - go mod vendor
+      - qtsetup generate android
+      - qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android 
       - cd deploy
       - export FILENAME=cwtch-android-$BUILDDATE.apk
       - cp android/build-debug.apk $FILENAME
@@ -73,11 +77,14 @@ pipeline:
       - export GOPATH=$GOPATH:/media/sf_GOPATH1/
       - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
       - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git zip
+      - rm -r vendor/github.com/therecipe/qt/
       - find -iname 'moc*' | xargs rm
       - find -iname 'rcc*' | xargs rm
-      - go get -d
+      - export GO111MODULE=on
+      - go mod download
       - export VERSION=`git describe --tags`
       - export BUILDDATE=`date +%G-%m-%d-%H-%M`
+      - go mod vendor
       - qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build windows
       - cp README.md deploy/windows
       - cp -r windows/* deploy/windows
diff --git a/go.mod b/go.mod
index c963c578..984f5c37 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,13 @@ module cwtch.im/ui
 go 1.12
 
 require (
-	cwtch.im/cwtch v0.3.0
+	cwtch.im/cwtch v0.3.1
 	git.openprivacy.ca/openprivacy/libricochet-go v1.0.6
 	github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/stretchr/testify v1.4.0 // indirect
-	github.com/therecipe/qt v0.0.0-20190824160953-615e084bab56
+	github.com/therecipe/qt v0.0.0-20191002095216-73192f6811d0
+	github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20191002095216-73192f6811d0 // indirect
 	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
 	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect
 	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
diff --git a/go.sum b/go.sum
index f9263af6..9d9db4b4 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,7 @@
 cwtch.im/cwtch v0.3.0 h1:RFZyc2m9BowFNdngBs7GcQE41w75jMp3Ku5zEE92v9I=
 cwtch.im/cwtch v0.3.0/go.mod h1:8tmtp3c7fccWw9H7s9u6E8GD2PKI3ar21i0fjN8pzd0=
+cwtch.im/cwtch v0.3.1 h1:C0DLIrOqpNs5aecKTjNJZhpMq4/EvWNmLiKklIS8RTM=
+cwtch.im/cwtch v0.3.1/go.mod h1:8tmtp3c7fccWw9H7s9u6E8GD2PKI3ar21i0fjN8pzd0=
 cwtch.im/tapir v0.1.10 h1:V+TkmwXNd6gySZqlVw468wMYEkmDwMSyvhkkpOfUw7w=
 cwtch.im/tapir v0.1.10/go.mod h1:EuRYdVrwijeaGBQ4OijDDRHf7R2MDSypqHkSl5DxI34=
 git.openprivacy.ca/openprivacy/libricochet-go v1.0.4/go.mod h1:yMSG1gBaP4f1U+RMZXN85d29D39OK5s8aTpyVRoH5FY=
@@ -44,6 +46,10 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/struCoder/pidusage v0.1.2/go.mod h1:pWBlW3YuSwRl6h7R5KbvA4N8oOqe9LjaKW5CwT1SPjI=
 github.com/therecipe/qt v0.0.0-20190824160953-615e084bab56 h1:CAFR/rHptsl8gEP6igtp6VbuQpPALEJ/B+gl9QkyFXU=
 github.com/therecipe/qt v0.0.0-20190824160953-615e084bab56/go.mod h1:SUUR2j3aE1z6/g76SdD6NwACEpvCxb3fvG82eKbD6us=
+github.com/therecipe/qt v0.0.0-20191002095216-73192f6811d0 h1:Y4I5RGVEZubcplYny6zwqg0G7WUC6gw+esy+2cPCruA=
+github.com/therecipe/qt v0.0.0-20191002095216-73192f6811d0/go.mod h1:SUUR2j3aE1z6/g76SdD6NwACEpvCxb3fvG82eKbD6us=
+github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20191002095216-73192f6811d0 h1:SC92QLlGwzwrT3Xi5YzKvtVXFIriPP0Ui1AOIZgDyh8=
+github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20191002095216-73192f6811d0/go.mod h1:mH55Ek7AZcdns5KPp99O0bg+78el64YCYWHiQKrOdt4=
 golang.org/x/crypto v0.0.0-20190128193316-c7b33c32a30b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=