diff --git a/.drone.yml b/.drone.yml
index 7bbee55..516b6d9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -230,38 +230,32 @@ steps:
       - move pubspec.yaml pubspec.yaml.orig
       - (Get-Content -path pubspec.yaml.orig -Raw) -replace 'pfx_pass',"$Env:pfx_pass" | Set-Content -path pubspec.yaml 
       - flutter pub get
-        # flwtch-`cat VERSION`-`cat BUILDDATE`
-      - $Env:buildname = 'flwtch-win-'
       - $Env:version += type .\VERSION
-      - $Env:buildname += $Env:version
-      - $Env:buildname += '-'
       - $Env:builddate += type .\BUILDDATE
-      - $Env:buildname += $Env:builddate
-      - $Env:builddir += $Env:buildname
-      - $Env:zip = 'cwtch-'
-      - $Env:zip += $Env:version
-      - $Env:zip += '.zip'
-      - $Env:sha = $Env:zip
-      - $Env:sha += '.sha512'
+      - $Env:buildname = 'flwtch-win-' + $Env:version + '-' + $Env:builddate
+      - $Env:builddir = $Env:buildname
+      - $Env:zip = 'cwtch-' + $Env:version + '.zip'
+      - $Env:zipsha = $Env:zip + '.sha512'
+      - $Env:msix = 'cwtch-install-' + $Env:version + '.msix'
+      - $Env:msixsha = $Env:msix + '.sha512'
+      - $Env:releasedir = "build\\windows\\runner\\Release\\"
       - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate
+      - copy windows\libCwtch.dll $Env:releasedir
+      # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense
+      # https://github.com/google/flutter-desktop-embedding/issues/587
+      # https://github.com/flutter/flutter/issues/53167
+      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140.dll $Env:releasedir
+      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:releasedir
+      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:releasedir
+      - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:releasedir\Tor"
       - echo $Env:pfx > codesign.pfx.b64
       - certutil -decode codesign.pfx.b64 codesign.pfx
       - flutter pub run msix:create
       - mkdir deploy
-      - move build\\windows\\runner\\Release $Env:builddir
-      - copy windows\libCwtch.dll $Env:builddir
-      # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense
-      # https://github.com/google/flutter-desktop-embedding/issues/587
-      # https://github.com/flutter/flutter/issues/53167
-      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140.dll $Env:builddir
-      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:builddir
-      - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:builddir
-      - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:builddir\Tor"
-      - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath $Env:zip"
-      - powershell -command "(Get-FileHash *.zip -Algorithm sha512).Hash" > $Env:sha
       - mkdir deploy\$Env:builddir
-      - move $Env:zip deploy\$Env:builddir
-      - move $Env:sha deploy\$Env:builddir
+      - move "${Env:releasedir}cwtch.msix" "deploy\\${Env:builddir}\\${Env:msix}"
+      - powershell -command "Compress-Archive -Path $Env:releasedir -DestinationPath deploy\$Env:builddir\$Env:zip"
+      - powershell -command "(Get-FileHash deploy\$Env:builddir\$Env:zip -Algorithm sha512).Hash" > deploy\$Env:builddir\$Env:sha
       
   - name: deploy-windows
     image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc
diff --git a/pubspec.lock b/pubspec.lock
index f827e45..c59f48b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -428,15 +428,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
-#  window_size:
-#    dependency: "direct main"
-#    description:
-#      path: "plugins/window_size"
-#      ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81
-#      resolved-ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81
-#      url: "git://github.com/google/flutter-desktop-embedding.git"
-#    source: git
-#    version: "0.1.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8b9ed1a..b4955e3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,13 +45,6 @@ dependencies:
   flutter_driver:
     sdk: flutter
 
-# Deprecated?
-#  window_size:
-#    git:
-#      url: git://github.com/google/flutter-desktop-embedding.git
-#      path: plugins/window_size
-#      ref: e48abe7c3e9ebfe0b81622167c5201d4e783bb81
-
 dev_dependencies:
   msix: ^2.1.3
 # Uncomment to update lokalise translations (see README for list of deps to comment out bc incompatibilities)