diff --git a/.github/workflows/create-dmg.yml b/.github/workflows/create-dmg.yml
index 5f7e37a4..7db141a6 100644
--- a/.github/workflows/create-dmg.yml
+++ b/.github/workflows/create-dmg.yml
@@ -33,9 +33,9 @@ jobs:
           sdk use sbt 1.3.8
           java -version
           echo $JAVA_HOME
-          JAVA_OPTS="-Xmx4G -Denable-tika=1 -Denable-javacv=1" sbt "set packageName in desktopApp in Universal := \"shadowcloud-full-\" + version.value" desktopApp/universal:packageOsxDmg
-          JAVA_OPTS="-Xmx4G -Denable-tika=0 -Denable-javacv=0" sbt "set packageName in desktopApp in Universal := \"shadowcloud-light-\" + version.value" desktopApp/universal:packageOsxDmg
+          JAVA_OPTS="-Xmx4G -Denable-tika=1 -Denable-javacv=1" sbt "set name in desktopApp in Universal := \"shadowcloud-full\"" "set jdkPackagerType in desktopApp :=\"pkg\"" desktopApp/jdkPackager:packageBin
+          JAVA_OPTS="-Xmx4G -Denable-tika=0 -Denable-javacv=0" sbt "set name in desktopApp in Universal := \"shadowcloud-light\"" "set jdkPackagerType in desktopApp :=\"pkg\"" desktopApp/jdkPackager:packageBin
       - uses: actions/upload-artifact@v2-preview
         with:
           name: shadowcloud-macos
-          path: ${{github.workspace}}/desktop-app/target/universal/*.dmg
+          path: ${{github.workspace}}/desktop-app/target/universal/jdkpackager/bundles
diff --git a/build-package.bat b/build-package.bat
deleted file mode 100644
index 54608304..00000000
--- a/build-package.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-SET "VERSION=1.1.0"
-
-SET "SBT_OPTS=-Xmx8G -Denable-tika=0 -Denable-javacv=0" && sbt desktopApp/universal:packageBin && move /y "%~dp0desktop-app\target\universal\shadowcloud-desktop-%VERSION%.zip" "%~dp0desktop-app\target\universal\shadowcloud-%VERSION%-light.zip" && move /y "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%.exe" "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%-light.exe" && SET "SBT_OPTS=-Xmx8G -Denable-tika=1 -Denable-javacv=1" && sbt desktopApp/jdkPackager:packageBin && SET "SBT_OPTS=-Xmx8G -Denable-tika=1 -Denable-javacv-all=1" && sbt desktopApp/universal:packageBin && move /y "%~dp0desktop-app\target\universal\shadowcloud-desktop-%VERSION%.zip" "%~dp0desktop-app\target\universal\shadowcloud-%VERSION%-full.zip" && move /y "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%.exe" "%~dp0desktop-app\target\universal\jdkpackager\bundles\shadowcloud-%VERSION%-full.exe"
diff --git a/build-package.ps1 b/build-package.ps1
new file mode 100644
index 00000000..622b0a29
--- /dev/null
+++ b/build-package.ps1
@@ -0,0 +1,4 @@
+$env:JAVA_OPTS="-Xmx4G -Denable-tika=1 -Denable-javacv=1"
+sbt 'set packageName in desktopApp in Universal := \"shadowcloud-full-\" + version.value' desktopApp/jdkPackager:packageBin
+$env:JAVA_OPTS="-Xmx4G -Denable-tika=0 -Denable-javacv=0"
+sbt 'set name in Universal in desktopApp := \"shadowcloud-light-\" + version.value' desktopApp/jdkPackager:packageBin
diff --git a/build-package.sh b/build-package.sh
index 4fc0cf3b..e4ac1a2d 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -1,7 +1,2 @@
-export VERSION=1.1.0
-
-sbt -J-Xmx4G -J-Denable-tika=1 -J-Denable-javacv=1 desktopApp/jdkPackager:packageBin && \
-  sbt -J-Xmx4G -J-Denable-tika=0 -J-Denable-javacv=0 desktopApp/universal:packageBin && \
-  mv -f "./desktop-app/target/universal/shadowcloud-desktop-$VERSION.zip" "./desktop-app/target/universal/shadowcloud-$VERSION-light.zip" && \
-  sbt -J-Xmx4G -J-Denable-tika=1 -J-Denable-javacv-all=1 desktopApp/universal:packageBin && \
-  mv -f "./desktop-app/target/universal/shadowcloud-desktop-$VERSION.zip" "./desktop-app/target/universal/shadowcloud-$VERSION-full.zip"
+JAVA_OPTS="-Xmx4G -Denable-tika=1 -Denable-javacv=1" sbt "set packageName in desktopApp in Universal := \"shadowcloud-full-\" + version.value" desktopApp/jdkPackager:packageBin
+JAVA_OPTS="-Xmx4G -Denable-tika=0 -Denable-javacv=0" sbt "set packageName in desktopApp in Universal := \"shadowcloud-light-\" + version.value" desktopApp/jdkPackager:packageBin
diff --git a/server/webapp/src/main/scala/com/karasiq/shadowcloud/webapp/components/folder/UploadForm.scala b/server/webapp/src/main/scala/com/karasiq/shadowcloud/webapp/components/folder/UploadForm.scala
index 5b510771..79ab4f84 100644
--- a/server/webapp/src/main/scala/com/karasiq/shadowcloud/webapp/components/folder/UploadForm.scala
+++ b/server/webapp/src/main/scala/com/karasiq/shadowcloud/webapp/components/folder/UploadForm.scala
@@ -53,11 +53,15 @@ class UploadForm(implicit appContext: AppContext, folderContext: FolderContext,
   private[this] val uploadQueue        = Var(List.empty[UploadRequest])
   private[this] val uploading          = Var(List.empty[UploadRequest])
 
-  private[this] lazy val renderedForm = Form(
-    action := "/",
-    `class` := "dropzone",
-    Dropzone(folderContext.regionId, () => folderContext.selected.now, _ => folderContext.update(folderContext.selected.now))
-  ).render
+  private[this] val formMap = collection.mutable.Map.empty[Path, ElementT]
+
+  private[this] def createForm(regionId: RegionId, path: Path) = {
+    formMap.getOrElseUpdate(path, Form(
+      action := "/",
+      `class` := "dropzone",
+      Dropzone(folderContext.regionId, () => path, _ => folderContext.update(path))
+    ).render)
+  }
 
   def renderTag(md: ModifierT*): TagT = {
     val editor = TextEditor.memoized("sc-text-upload") { editor ⇒
@@ -77,7 +81,7 @@ class UploadForm(implicit appContext: AppContext, folderContext: FolderContext,
         appContext.locale.uploadFiles,
         "upload-files",
         NoIcon,
-        renderedForm
+        Rx(createForm(folderContext.regionId, folderContext.selected()))
       ),
       NavigationTab(appContext.locale.pasteText, "paste-text", NoIcon, editor)
     )