Merge branch 'develop' into feature/exe-cache-msis

cache also cryptomator and winfsp msi
2026-09-21 07:24:37 +00:00 · 2024-02-28 13:25:25 +01:00 · 2024-02-28 12:51:30 +01:00
196 changed files with 2190 additions and 6896 deletions
@@ -3,7 +3,7 @@
 ## Did you find a bug?

 - Ensure you're running the latest version of Cryptomator.
- Ensure the bug is related to the desktop version of Cryptomator. Bugs concerning the Cryptomator iOS and Android app can be reported on the [Cryptomator for iOS issues list](https://github.com/cryptomator/ios/issues) and [Cryptomator for Android issues list](https://github.com/cryptomator/android/issues) respectively.
+- Ensure the bug is related to the desktop version of Cryptomator. Bugs concerning the Cryptomator iOS and Android app can be reported on the [Cryptomator for iOS issues list](https://github.com/cryptomator/cryptomator-ios/issues) and [Cryptomator for Android issues list](https://github.com/cryptomator/cryptomator-android/issues) respectively.
 - Ensure the bug was not [already reported](https://github.com/cryptomator/cryptomator/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/kb/faq).
 - If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptomator/issues/new/choose).

@@ -7,13 +7,6 @@ updates:
      day: "monday"
      time: "06:00"
      timezone: "Etc/UTC"
-    ignore:
-      - dependency-name: "org.cryptomator:integrations-api"
-        versions: ["2.0.0-alpha1"]
-      - dependency-name: "jakarta.inject:jakarta.inject-api"
-        versions: ["2.0.1.MR"]
-      - dependency-name: "org.openjfx:*"
-        update-types: ["version-update:semver-major"]
    groups:
      java-test-dependencies:
        patterns:
@@ -10,8 +10,8 @@ on:
        required: false

 env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: '23.0.1+11'
+  JAVA_DIST: 'zulu'
+  JAVA_VERSION: '21.0.2+13'

 jobs:
  get-version:
@@ -29,12 +29,12 @@ jobs:
        include:
          - os: ubuntu-latest
            appimage-suffix: x86_64
-            openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-x64_bin-jmods.zip'
-            openjfx-sha: '2164bca470bf70a5e2764645e2078ba7f787b274e5be3d7df30d87c5bb62bba6'
-          - os: ubuntu-24.04-arm
+            openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-x64_bin-jmods.zip'
+            openjfx-sha: '7baed11ca56d5fee85995fa6612d4299f1e8b7337287228f7f12fd50407c56f8'
+          - os: [self-hosted, Linux, ARM64]
            appimage-suffix: aarch64
-            openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-aarch64_bin-jmods.zip'
-            openjfx-sha: '09c92fa9fa0b82adefd88640a14ebb2a49e5f3f733a57d1542f5590d060ffe1b'
+            openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-aarch64_bin-jmods.zip'
+            openjfx-sha: '871e7b9d7af16aef2e55c1b7830d0e0b2503b13dd8641374ba7e55ecb81d2ef9'
    steps:
      - uses: actions/checkout@v4
      - name: Setup Java
@@ -68,7 +68,7 @@ jobs:
      - name: Set version
        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
      - name: Run maven
-        run: mvn -B clean package -Plinux -DskipTests -Djavafx.platform=linux
+        run: mvn -B clean package -Plinux -DskipTests
      - name: Patch target dir
        run: |
          cp LICENSE.txt target
@@ -80,7 +80,7 @@ jobs:
          --verbose
          --output runtime
          --module-path "${JAVA_HOME}/jmods:openjfx-jmods"
-          --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler
+          --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.crypto.ec,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net
          --strip-native-commands
          --no-header-files
          --no-man-pages
@@ -98,7 +98,7 @@ jobs:
          --dest appdir
          --name Cryptomator
          --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2025 Skymatic GmbH"
+          --copyright "(C) 2016 - 2024 Skymatic GmbH"
          --app-version "${{  needs.get-version.outputs.semVerNum }}.${{  needs.get-version.outputs.revNum }}"
          --java-options "--enable-preview"
          --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator"
@@ -116,7 +116,7 @@ jobs:
          --java-options "-Dcryptomator.showTrayIcon=true"
          --java-options "-Dcryptomator.integrationsLinux.trayIconsDir=\"@{appdir}/usr/share/icons/hicolor/symbolic/apps\""
          --java-options "-Dcryptomator.buildNumber=\"appimage-${{  needs.get-version.outputs.revNum }}\""
-          --java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\""
+          --add-launcher Cryptomator-gtk2=launcher-gtk2.properties
          --resource-dir dist/linux/resources
      - name: Patch Cryptomator.AppDir
        run: |
@@ -133,13 +133,13 @@ jobs:
          cp dist/linux/common/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop
          cp dist/linux/common/application-vnd.cryptomator.vault.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.vault.xml
          ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg
+          ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/Cryptomator.svg
          ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon
-          ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/org.cryptomator.Cryptomator.desktop
-          ln -s org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml
+          ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/Cryptomator.desktop
          ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun
      - name: Download AppImageKit
        run: |
-          curl -L https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${{ matrix.appimage-suffix }}.AppImage -o appimagetool.AppImage
+          curl -L https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-${{ matrix.appimage-suffix }}.AppImage -o appimagetool.AppImage
          chmod +x appimagetool.AppImage
          ./appimagetool.AppImage --appimage-extract
      - name: Prepare GPG-Agent for signing with key 615D449FE6E6A235
@@ -153,7 +153,7 @@ jobs:
        run: >
          ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{  needs.get-version.outputs.semVerStr }}-${{ matrix.appimage-suffix }}.AppImage
          -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${{ matrix.appimage-suffix }}.AppImage.zsync'
-          --sign --sign-key=615D449FE6E6A235
+          --sign --sign-key=615D449FE6E6A235 --sign-args="--batch --pinentry-mode loopback"
      - name: Create detached GPG signatures
        run: |
          gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a cryptomator-*.AppImage
@@ -169,11 +169,11 @@ jobs:
          if-no-files-found: error
      - name: Publish AppImage on GitHub Releases
        if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        with:
          fail_on_unmatched_files: true
          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
          files: |
            cryptomator-*.AppImage
            cryptomator-*.zsync
-            cryptomator-*.asc
+            cryptomator-*.asc
@@ -23,7 +23,7 @@ jobs:
        run: |
          curl --remote-name ${{ inputs.url }} -L
      - name: Upload to Kaspersky
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.4
        with:
          protocol: ftps
          server: allowlist.kaspersky-labs.com
@@ -31,7 +31,7 @@ jobs:
          username: ${{ secrets.ALLOWLIST_KASPERSKY_USERNAME }}
          password: ${{ secrets.ALLOWLIST_KASPERSKY_PASSWORD }}
      - name: Upload to Avast
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.4
        with:
          protocol: ftp
          server: whitelisting.avast.com
@@ -6,8 +6,8 @@ on:
    types: [labeled]

 env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: 23
+  JAVA_DIST: 'zulu'
+  JAVA_VERSION: 21

 defaults:
  run:
@@ -33,7 +33,7 @@ jobs:
      - name: Build and Test
        run: >
          xvfb-run
-          mvn -B verify -Djavafx.platform=linux
+          mvn -B verify
          jacoco:report
          org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
          -Pcoverage
@@ -45,7 +45,7 @@ jobs:
          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
      - name: Draft a release
        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        with:
          draft: true
          discussion_category_name: releases
@@ -53,25 +53,10 @@ jobs:
          generate_release_notes: true
          body: |-
            :construction: Work in Progress
-            ### What's New 🎉
            
-            ### Bugfixes 🐛
-            
-            ### Other Changes 📎
-            
-            ---
-            
-            TODO FULL CHANGELOG
-            
-            📜 List of closed issues is available [here](TODO)
-            
-            ---
            ⏳ Please be patient, the builds are still [running](https://github.com/cryptomator/cryptomator/actions). New versions of Cryptomator can be found here in a few moments. ⏳
            
-            <!-- Don't forget to include the
-            💾 SHA-256 checksums of release artifacts:
-            ```
-            ```
-            -->
-            
            As usual, the GPG signatures can be checked using [our public key `5811 7AFA 1F85 B3EE C154  677D 615D 449F E6E6 A235`](https://gist.github.com/cryptobot/211111cf092037490275f39d408f461a).
+            
+            ---
+            <!-- Don't forget to include the 💾 SHA-256 checksums of release artifacts: -->
@@ -1,75 +1,56 @@
-name: Check JDK for non-major updates
+name: Checks JDK version for minor updates

 on:
  schedule:
    - cron: '0 0 1 * *' # run once a month at the first day of month
-  workflow_dispatch:

 env:
-  JDK_VERSION: '23.0.1+11'
-  JDK_VENDOR: temurin
-  RUNTIME_VERSION_HELPER: >
-    public class Test {
-      public static void main(String[]  args) {
-          System.out.println(Runtime.version());
-      }
-    }
+  JDK_VERSION: '21.0.1+12'
+  JDK_VENDOR: zulu

 jobs:
-  check-version:
+  jdk-current:
+    name: Check out current version
+    runs-on: ubuntu-latest
+    outputs:
+      jdk-date: ${{ steps.get-data.outputs.jdk-date}}
+    steps:
+      - uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.JDK_VERSION }}
+          distribution: ${{ env.JDK_VENDOR }}
+          check-latest: false
+      - name: Read JAVA_VERSION_DATE and store in env variable
+        id: get-data
+        run: |
+          date=$(cat ${JAVA_HOME}/release | grep "JAVA_VERSION_DATE=\"" | awk -F'=' '{print $2}' | tr -d '"')
+          echo "jdk-date=${date}" >> "$GITHUB_OUTPUT"
+  jdk-latest:
    name: Checkout latest jdk version
    runs-on: ubuntu-latest
-    env:
-        JDK_MAJOR_VERSION: 'toBeFilled'
+    outputs:
+      jdk-date: ${{ steps.get-data.outputs.jdk-date}}
+      jdk-version: ${{ steps.get-data.outputs.jdk-version}}
    steps:
-      - name: Determine current major version
-        run: echo 'JDK_MAJOR_VERSION=${{ env.JDK_VERSION }}'.substring(0,20) >> "$env:GITHUB_ENV"
-        shell: pwsh
-      - name: Checkout latest JDK ${{ env.JDK_MAJOR_VERSION }}
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
        with:
-          java-version: ${{ env.JDK_MAJOR_VERSION}}
+          java-version: 21
          distribution: ${{ env.JDK_VENDOR }}
          check-latest: true
-      - name: Determine if update is available
-        id: determine
-        shell: pwsh
+      - name: Read JAVA_VERSION_DATE and store in env variable
+        id: get-data
        run: |
-          $latestVersion = 0,0,0,0 #INTERIM, UPDATE, PATCH and BUILD
-          $currentVersion = 0,0,0,0
-
-          # Get the latest JDK runtime version
-          "${env:RUNTIME_VERSION_HELPER}" | Set-Content -Path "GetRuntimeVersion.java"
-          $latestVersionString = & java GetRuntimeVersion.java
-          $runtimeVersionAndBuild = $latestVersionString.Split('+')
-          if($runtimeVersionAndBuild.Length -eq 2) {
-            $latestVersion[3]=$runtimeVersionAndBuild[1];
-          }
-          $tmp=$runtimeVersionAndBuild[0].Split('.')
-          for($i=0;$i -lt $latestVersion.Length; $i++) {
-            $latestVersion[$i]=$tmp[$i+1];
-          }
-
-          # Get the current JDK version
-          $runtimeVersionAndBuild = '${{ env.JDK_VERSION}}'.Split('+')
-          if($runtimeVersionAndBuild.Length -eq 2) {
-            $currentVersion[3]=$runtimeVersionAndBuild[1];
-          }
-          $tmp=$runtimeVersionAndBuild[0].Split('.')
-          for($i=0;$i -lt $currentVersion.Length; $i++) {
-            $currentVersion[$i]=$tmp[$i+1];
-          }
-
-          # compare
-          for($i=0; $i -lt $currentVersion.Length ; $i++) {
-            if($latestVersion[$i] -gt  $currentVersion[$i]){
-              echo 'UPDATE_AVAILABLE=true' >> "$env:GITHUB_OUTPUT"
-              echo "LATEST_JDK_VERSION='${latestVersionString}'" >> "$env:GITHUB_OUTPUT"
-              return 0;
-            }
-          }
-      - name: Notify
-        if: steps.determine.outputs.UPDATE_AVAILABLE == 'true'
+          date=$(cat ${JAVA_HOME}/release | grep "JAVA_VERSION_DATE=\"" | awk -F'=' '{print $2}' | tr -d '"')
+          echo "jdk-date=${date}" >> "$GITHUB_OUTPUT"
+          version=$(cat ${JAVA_HOME}/release | grep "JAVA_RUNTIME_VERSION=\"" | awk -F'=' '{print $2}' | tr -d '"')
+          echo "jdk-version=${version}" >> "$GITHUB_OUTPUT"
+  notify:
+    name: Notifies for jdk update
+    runs-on: ubuntu-latest
+    needs: [jdk-current, jdk-latest]
+    if: ${{ needs.jdk-latest.outputs.jdk-date }} > ${{ needs.jdk-current.outputs.jdk-date }}
+    steps:
+      - name: Slack Notification
        uses: rtCamp/action-slack-notify@v2
        env:
          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
@@ -78,6 +59,6 @@ jobs:
          SLACK_ICON_EMOJI: ':bot:'
          SLACK_CHANNEL: 'cryptomator-desktop'
          SLACK_TITLE: "JDK update available"
-          SLACK_MESSAGE: "Cryptomator-CI JDK can be upgraded to ${{ steps.determine.outputs.LATEST_JDK_VERSION }}. Check the Nextcloud collective for instructions."
+          SLACK_MESSAGE: "Cryptomator-CI JDK can be upgraded to ${{ needs.jdk-latest.outputs.jdk-version }}. See https://github.com/cryptomator/cryptomator/wiki/How-to-update-the-build-JDK for instructions."
          SLACK_FOOTER: false
-          MSG_MINIMAL: true
+          MSG_MINIMAL: true
@@ -16,14 +16,14 @@ on:
        type: boolean

 env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: '23.0.1+11'
-  COFFEELIBS_JDK: 23
-  COFFEELIBS_JDK_VERSION: '23.0.1+11-0ppa1'
-  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-x64_bin-jmods.zip'
-  OPENJFX_JMODS_AMD64_HASH: '2164bca470bf70a5e2764645e2078ba7f787b274e5be3d7df30d87c5bb62bba6'
-  OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-aarch64_bin-jmods.zip'
-  OPENJFX_JMODS_AARCH64_HASH: '09c92fa9fa0b82adefd88640a14ebb2a49e5f3f733a57d1542f5590d060ffe1b'
+  JAVA_DIST: 'zulu'
+  JAVA_VERSION: '21.0.2+13'
+  COFFEELIBS_JDK: 21
+  COFFEELIBS_JDK_VERSION: '21.0.2+13-0ppa1'
+  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-x64_bin-jmods.zip'
+  OPENJFX_JMODS_AMD64_HASH: '7baed11ca56d5fee85995fa6612d4299f1e8b7337287228f7f12fd50407c56f8'
+  OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-aarch64_bin-jmods.zip'
+  OPENJFX_JMODS_AARCH64_HASH: '871e7b9d7af16aef2e55c1b7830d0e0b2503b13dd8641374ba7e55ecb81d2ef9'

 jobs:
  build:
@@ -53,7 +53,7 @@ jobs:
          check-latest: true
          cache: 'maven'
      - name: Run maven
-        run: mvn -B clean package -Plinux -Djavafx.platform=linux -DskipTests
+        run: mvn -B clean package -Plinux -DskipTests
      - name: Download OpenJFX jmods
        id: download-jmods
        run: |
@@ -11,8 +11,7 @@ jobs:
    with:
      runner-os: 'ubuntu-latest'
      java-distribution: 'temurin'
-      java-version: 23
-      check-command: 'mvn -B validate -Pdependency-check -Djavafx.platform=linux'
+      java-version: 21
    secrets:
      nvd-api-key: ${{ secrets.NVD_API_KEY }}
      slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
@@ -68,7 +68,7 @@ jobs:
          git push
      - name: Create pull request
        run: |
-          printf "> [!IMPORTANT]\n> Todos:\n> - [ ] Update maven dependencies\n> - [ ] Check for JDK update\n> - [ ] Check for JFX update" > pr_body.md
+          echo "> [!IMPORTANT]\n> Todos:\n> - [ ] Update maven dependencies\n> - [ ] Check for JDK update\n> - [ ] Check for JFX update" > pr_body.md
          PR_URL=$(gh pr create --title "Release ${{ needs.get-version.outputs.semVerStr }}" --body-file pr_body.md)
          echo "FLATHUB_PR_URL=$PR_URL" >> "$GITHUB_ENV"
        env:
@@ -22,8 +22,8 @@ on:
        value: ${{ jobs.determine-version.outputs.type }}

 env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: 23
+  JAVA_DIST: 'zulu'
+  JAVA_VERSION: 21

 jobs:
  determine-version:
@@ -71,6 +71,6 @@ jobs:
          echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT
          echo "type=${TYPE}" >> $GITHUB_OUTPUT
      - name: Validate Version
-        uses: skymatic/semver-validation-action@v3
+        uses: skymatic/semver-validation-action@v2
        with:
          version: ${{ steps.versions.outputs.semVerStr }}
@@ -1,264 +0,0 @@
-name: Build macOS .dmg for x64
-
-#######################################
-# STOP! DO NOT EDIT THIS FILE!
-# 
-# It is a copy of mac-dmg.yml with tiny adjustements (mainly lines 42 to 47)
-# It was made necessary, since Github does not offer free macos intel runners for macos 15 and above.
-# This workflow can only be triggered by a release.
-# 
-#######################################
-
-on:
-  release:
-    types: [published]
-
-env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: '23.0.1+11'
-
-jobs:
-  get-version:
-    uses: ./.github/workflows/get-version.yml
-    with:
-      version: ${{ inputs.version }}
-
-  build-arm:
-    name: Build Cryptomator.app for ${{ matrix.output-suffix }}
-    runs-on: ${{ matrix.os }}
-    needs: [get-version]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - os: macos-15-large
-          architecture: x64
-          output-suffix: x64
-          fuse-lib: macFUSE
-          openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_osx-x64_bin-jmods.zip'
-          openjfx-sha: '8857965975c464a0e5d57709292ce357d0ebb39f6168c41d5ca38301e42c3c8e'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: ${{ env.JAVA_DIST }}
-          java-version: ${{ env.JAVA_VERSION }}
-          architecture: ${{ matrix.architecture }}
-          check-latest: true
-          cache: 'maven'
-      - name: Download OpenJFX jmods
-        id: download-jmods
-        run: |
-          curl -L ${{ matrix.openjfx-url }} -o openjfx-jmods.zip
-          echo "${{ matrix.openjfx-sha }} *openjfx-jmods.zip" | shasum -a256 --check
-          mkdir -p openjfx-jmods/
-          unzip -jo openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
-      - name: Ensure major jfx version in pom and in jmods is the same
-        run: |
-          JMOD_VERSION=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
-          JMOD_VERSION=${JMOD_VERSION#*@}
-          JMOD_VERSION=${JMOD_VERSION%%.*}
-          POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
-          POM_JFX_VERSION=${POM_JFX_VERSION#*@}
-          POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
-
-          if [ "${POM_JFX_VERSION}" -ne "${JMOD_VERSION}" ]; then
-            >&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != jmod version (${JMOD_VERSION})"
-            exit 1
-          fi
-      - name: Set version
-        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
-      - name: Run maven
-        run: mvn -B -Djavafx.platform=mac clean package -Pmac -DskipTests
-      - name: Patch target dir
-        run: |
-          cp LICENSE.txt target
-          cp target/cryptomator-*.jar target/mods
-      - name: Run jlink
-        #Remark: no compression is applied for improved build compression later (here dmg)
-        run: >
-          ${JAVA_HOME}/bin/jlink
-          --verbose
-          --output runtime
-          --module-path "${JAVA_HOME}/jmods:openjfx-jmods"
-          --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
-          --strip-native-commands
-          --no-header-files
-          --no-man-pages
-          --strip-debug
-          --compress zip-0
-      - name: Run jpackage
-        run: >
-          ${JAVA_HOME}/bin/jpackage
-          --verbose
-          --type app-image
-          --runtime-image runtime
-          --input target/libs
-          --module-path target/mods
-          --module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
-          --dest appdir
-          --name Cryptomator
-          --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2025 Skymatic GmbH"
-          --app-version "${{ needs.get-version.outputs.semVerNum }}"
-          --java-options "--enable-preview"
-          --java-options "--enable-native-access=org.cryptomator.jfuse.mac"
-          --java-options "-Xss5m"
-          --java-options "-Xmx256m"
-          --java-options "-Dfile.encoding=\"utf-8\""
-          --java-options "-Djava.net.useSystemProxies=true"
-          --java-options "-Dapple.awt.enableTemplateImages=true"
-          --java-options "-Dsun.java2d.metal=true"
-          --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
-          --java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/Cryptomator\""
-          --java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/Cryptomator/Plugins\""
-          --java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/Cryptomator/key.p12\""
-          --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/Cryptomator/ipc.socket\""
-          --java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"Cryptomator\""
-          --java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Library/Application Support/Cryptomator/mnt\""
-          --java-options "-Dcryptomator.showTrayIcon=true"
-          --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\""
-          --mac-package-identifier org.cryptomator
-          --resource-dir dist/mac/resources
-      - name: Patch Cryptomator.app
-        run: |
-          mv appdir/Cryptomator.app Cryptomator.app
-          mv dist/mac/resources/Cryptomator-Vault.icns Cryptomator.app/Contents/Resources/
-          sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist
-          sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist
-          echo -n "$PROVISIONING_PROFILE_BASE64" | base64 --decode --output Cryptomator.app/Contents/embedded.provisionprofile
-        env:
-          VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
-          REVISION_NO: ${{ needs.get-version.outputs.revNum }}
-          PROVISIONING_PROFILE_BASE64: ${{ secrets.MACOS_PROVISIONING_PROFILE_BASE64 }}
-      - name: Generate license for dmg
-        run: >
-          mvn -B -Djavafx.platform=mac license:add-third-party
-          -Dlicense.thirdPartyFilename=license.rtf
-          -Dlicense.outputDirectory=dist/mac/dmg/resources
-          -Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl
-          -Dlicense.includedScopes=compile
-          -Dlicense.excludedGroups=^org\.cryptomator
-          -Dlicense.failOnMissing=true
-          -Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
-      - name: Install codesign certificate
-        run: |
-          # create variables
-          CERTIFICATE_PATH=$RUNNER_TEMP/codesign.p12
-          KEYCHAIN_PATH=$RUNNER_TEMP/codesign.keychain-db
-
-          # import certificate and provisioning profile from secrets
-          echo -n "$CODESIGN_P12_BASE64" | base64 --decode --output $CERTIFICATE_PATH
-
-          # create temporary keychain
-          security create-keychain -p "$CODESIGN_TMP_KEYCHAIN_PW" $KEYCHAIN_PATH
-          security set-keychain-settings -lut 900 $KEYCHAIN_PATH
-          security unlock-keychain -p "$CODESIGN_TMP_KEYCHAIN_PW" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import $CERTIFICATE_PATH -P "$CODESIGN_P12_PW" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-        env:
-          CODESIGN_P12_BASE64: ${{ secrets.MACOS_CODESIGN_P12_BASE64 }}
-          CODESIGN_P12_PW: ${{ secrets.MACOS_CODESIGN_P12_PW }}
-          CODESIGN_TMP_KEYCHAIN_PW: ${{ secrets.MACOS_CODESIGN_TMP_KEYCHAIN_PW }}
-      - name: Codesign
-        run: |
-          echo "Codesigning jdk files..."
-          find Cryptomator.app/Contents/runtime/Contents/Home/lib/ -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
-          find Cryptomator.app/Contents/runtime/Contents/Home/lib/ \( -name 'jspawnhelper' -o -name 'pauseengine' -o -name 'simengine' \) -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \;
-          echo "Codesigning jar contents..."
-          find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
-          for JAR_PATH in `find Cryptomator.app -name "*.jar"`; do
-            if [[ `unzip -l ${JAR_PATH} | grep '.dylib\|.jnilib'` ]]; then
-              JAR_FILENAME=$(basename ${JAR_PATH})
-              OUTPUT_PATH=${JAR_PATH%.*}
-              echo "Codesigning libs in ${JAR_FILENAME}..."
-              unzip -q ${JAR_PATH} -d ${OUTPUT_PATH}
-              find ${OUTPUT_PATH} -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
-              find ${OUTPUT_PATH} -name '*.jnilib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
-              rm ${JAR_PATH}
-              pushd ${OUTPUT_PATH} > /dev/null
-              zip -qr ../${JAR_FILENAME} *
-              popd > /dev/null
-              rm -r ${OUTPUT_PATH}
-            fi
-          done
-          echo "Codesigning Cryptomator.app..."
-          sed -i '' "s|###APP_IDENTIFIER_PREFIX###|${TEAM_IDENTIFIER}.|g" dist/mac/Cryptomator.entitlements
-          sed -i '' "s|###TEAM_IDENTIFIER###|${TEAM_IDENTIFIER}|g" dist/mac/Cryptomator.entitlements
-          codesign --force --deep --entitlements dist/mac/Cryptomator.entitlements -o runtime -s ${CODESIGN_IDENTITY} Cryptomator.app
-        env:
-          CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
-          TEAM_IDENTIFIER: ${{ secrets.MACOS_TEAM_IDENTIFIER }}
-      - name: Prepare .dmg contents
-        run: |
-          mkdir dmg
-          mv Cryptomator.app dmg
-          cp dist/mac/dmg/resources/${{ matrix.fuse-lib }}.webloc dmg
-          ls -l dmg
-      - name: Install create-dmg
-        run: |
-          brew install create-dmg
-          create-dmg --help
-      - name: Create .dmg
-        run: >
-          create-dmg
-          --volname Cryptomator
-          --volicon "dist/mac/dmg/resources/Cryptomator-Volume.icns"
-          --background "dist/mac/dmg/resources/Cryptomator-${{ matrix.fuse-lib }}-background.tiff"
-          --window-pos 400 100
-          --window-size 640 694
-          --icon-size 128
-          --icon "Cryptomator.app" 128 245
-          --hide-extension "Cryptomator.app"
-          --icon "${{ matrix.fuse-lib }}.webloc" 320 501
-          --hide-extension "${{ matrix.fuse-lib }}.webloc"
-          --app-drop-link 512 245
-          --eula "dist/mac/dmg/resources/license.rtf"
-          --icon ".background" 128 758
-          --icon ".VolumeIcon.icns" 512 758
-          Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg
-        env:
-          VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
-      - name: Notarize .dmg
-        if: startsWith(github.ref, 'refs/tags/') || inputs.notarize
-        uses: cocoalibs/xcode-notarization-action@v1
-        with:
-          app-path: 'Cryptomator-*.dmg'
-          apple-id: ${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}
-          password: ${{ secrets.MACOS_NOTARIZATION_PW }}
-          team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
-          xcode-path: '/Applications/Xcode_16.app'
-      - name: Add possible alpha/beta tags to installer name
-        run: mv Cryptomator-*.dmg Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg
-      - name: Create detached GPG signature with key 615D449FE6E6A235
-        run: |
-          echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
-          echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a Cryptomator-*.dmg
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
-          GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
-      - name: Clean up codesign certificate
-        if: ${{ always() }}
-        run: security delete-keychain $RUNNER_TEMP/codesign.keychain-db
-        continue-on-error: true
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: dmg-${{ matrix.output-suffix }}
-          path: |
-            Cryptomator-*.dmg
-            Cryptomator-*.asc
-          if-no-files-found: error
-      - name: Publish dmg on GitHub Releases
-        if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
-        uses: softprops/action-gh-release@v2
-        with:
-          fail_on_unmatched_files: true
-          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
-          files: |
-            Cryptomator-*.dmg
-            Cryptomator-*.asc
@@ -1,4 +1,4 @@
-name: Build macOS .dmg for arm64
+name: Build macOS .dmg

 on:
  release:
@@ -15,8 +15,8 @@ on:
        type: boolean

 env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: '23.0.1+11'
+  JAVA_DIST: 'zulu'
+  JAVA_VERSION: '21.0.2+13'

 jobs:
  get-version:
@@ -32,12 +32,20 @@ jobs:
      fail-fast: false
      matrix:
        include:
-        - os: macos-15
+        - os: macos-11
+          architecture: x64
+          output-suffix: x64
+          xcode-path: '/Applications/Xcode_13.2.1.app'
+          fuse-lib: macFUSE
+          openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_osx-x64_bin-jmods.zip'
+          openjfx-sha: 'bd6abab20da73d5a968dcf2fd915d81b5fb919340e3bb84979ee9a888a829939'
+        - os: [self-hosted, macOS, ARM64]
          architecture: aarch64
          output-suffix: arm64
+          xcode-path: '/Applications/Xcode_13.2.1.app'
          fuse-lib: FUSE-T
-          openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_osx-aarch64_bin-jmods.zip'
-          openjfx-sha: 'a800724a1f3e6757ecfa0bd5bf7ed64d2e6a7a3f5b3522650a70b8cfc7782fb6'
+          openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_osx-aarch64_bin-jmods.zip'
+          openjfx-sha: '7afaa1c57a6cc3c384d636e597b9a5364693e2db4aaec0a6e63d2fa964400b58'
    steps:
      - uses: actions/checkout@v4
      - name: Setup Java
@@ -71,7 +79,7 @@ jobs:
      - name: Set version
        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
      - name: Run maven
-        run: mvn -B -Djavafx.platform=mac clean package -Pmac -DskipTests
+        run: mvn -B clean package -Pmac -DskipTests
      - name: Patch target dir
        run: |
          cp LICENSE.txt target
@@ -83,7 +91,7 @@ jobs:
          --verbose
          --output runtime
          --module-path "${JAVA_HOME}/jmods:openjfx-jmods"
-          --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
+          --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
          --strip-native-commands
          --no-header-files
          --no-man-pages
@@ -101,7 +109,7 @@ jobs:
          --dest appdir
          --name Cryptomator
          --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2025 Skymatic GmbH"
+          --copyright "(C) 2016 - 2024 Skymatic GmbH"
          --app-version "${{ needs.get-version.outputs.semVerNum }}"
          --java-options "--enable-preview"
          --java-options "--enable-native-access=org.cryptomator.jfuse.mac"
@@ -129,14 +137,12 @@ jobs:
          mv dist/mac/resources/Cryptomator-Vault.icns Cryptomator.app/Contents/Resources/
          sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist
          sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist
-          echo -n "$PROVISIONING_PROFILE_BASE64" | base64 --decode --output Cryptomator.app/Contents/embedded.provisionprofile
        env:
          VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
          REVISION_NO: ${{ needs.get-version.outputs.revNum }}
-          PROVISIONING_PROFILE_BASE64: ${{ secrets.MACOS_PROVISIONING_PROFILE_BASE64 }}
      - name: Generate license for dmg
        run: >
-          mvn -B -Djavafx.platform=mac license:add-third-party
+          mvn -B license:add-third-party
          -Dlicense.thirdPartyFilename=license.rtf
          -Dlicense.outputDirectory=dist/mac/dmg/resources
          -Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl
@@ -169,7 +175,7 @@ jobs:
        run: |
          echo "Codesigning jdk files..."
          find Cryptomator.app/Contents/runtime/Contents/Home/lib/ -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
-          find Cryptomator.app/Contents/runtime/Contents/Home/lib/ \( -name 'jspawnhelper' -o -name 'pauseengine' -o -name 'simengine' \) -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \;
+          find Cryptomator.app/Contents/runtime/Contents/Home/lib/ -name 'jspawnhelper' -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \;
          echo "Codesigning jar contents..."
          find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
          for JAR_PATH in `find Cryptomator.app -name "*.jar"`; do
@@ -188,12 +194,9 @@ jobs:
            fi
          done
          echo "Codesigning Cryptomator.app..."
-          sed -i '' "s|###APP_IDENTIFIER_PREFIX###|${TEAM_IDENTIFIER}.|g" dist/mac/Cryptomator.entitlements
-          sed -i '' "s|###TEAM_IDENTIFIER###|${TEAM_IDENTIFIER}|g" dist/mac/Cryptomator.entitlements
          codesign --force --deep --entitlements dist/mac/Cryptomator.entitlements -o runtime -s ${CODESIGN_IDENTITY} Cryptomator.app
        env:
          CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
-          TEAM_IDENTIFIER: ${{ secrets.MACOS_TEAM_IDENTIFIER }}
      - name: Prepare .dmg contents
        run: |
          mkdir dmg
@@ -232,7 +235,7 @@ jobs:
          apple-id: ${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}
          password: ${{ secrets.MACOS_NOTARIZATION_PW }}
          team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
-          xcode-path: '/Applications/Xcode_16.app'
+          xcode-path: ${{ matrix.xcode-path }}
      - name: Add possible alpha/beta tags to installer name
        run: mv Cryptomator-*.dmg Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg
      - name: Create detached GPG signature with key 615D449FE6E6A235
@@ -256,7 +259,7 @@ jobs:
          if-no-files-found: error
      - name: Publish dmg on GitHub Releases
        if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        with:
          fail_on_unmatched_files: true
          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
          GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
          GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
      - name: Publish asc on GitHub Releases
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        with:
          fail_on_unmatched_files: true
          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
@@ -4,8 +4,8 @@ on:
  pull_request:

 env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: 23
+  JAVA_DIST: 'zulu'
+  JAVA_VERSION: 21

 defaults:
  run:
@@ -24,4 +24,4 @@ jobs:
          java-version: ${{ env.JAVA_VERSION }}
          cache: 'maven'
      - name: Build and Test
-        run: xvfb-run mvn -B clean install jacoco:report -Pcoverage -Djavafx.platform=linux
+        run: xvfb-run mvn -B clean install jacoco:report -Pcoverage
@@ -11,8 +11,8 @@ defaults:
    shell: bash

 env:
-  JAVA_DIST: 'temurin'
-  JAVA_VERSION: 23
+  JAVA_DIST: 'zulu'
+  JAVA_VERSION: 21

 jobs:
  check-preconditions:
@@ -57,14 +57,9 @@ jobs:
            dependency-check
        env:
          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
-      - name: Validate urls used in app
-        uses:  urlstechie/urlchecker-action@0.0.34
-        with:
-          file_types: .md,.json
-          include_files: README.md,src/main/resources/hyperlinks.json
      - name: Run org.owasp:dependency-check plugin
        id: dependency-check
        continue-on-error: true
-        run: mvn -B verify -Pdependency-check -DskipTests -Djavafx.platform=linux
+        run: mvn -B verify -Pdependency-check -DskipTests
        env:
          NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
@@ -16,9 +16,9 @@ on:

 env:
  JAVA_DIST: 'zulu'
-  JAVA_VERSION: '23.0.1+11'
-  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_windows-x64_bin-jmods.zip'
-  OPENJFX_JMODS_AMD64_HASH: 'ee176dcee3bd78bde7910735bd67f67c792882f5b89626796ae06f7a1c0119d3'
+  JAVA_VERSION: '21.0.2+13'
+  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_windows-x64_bin-jmods.zip'
+  OPENJFX_JMODS_AMD64_HASH: 'daf8acae631c016c24cfe23f88469400274d3441dd890615a42dfb501f3eb94a'
  WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi'
  WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/latest/download/winfsp-uninstaller.exe'

@@ -40,9 +40,6 @@ jobs:
      LOOPBACK_ALIAS: 'cryptomator-vault'
      WIN_CONSOLE_FLAG: ''
    steps:
-      - name: Upgrade WIX to latest version
-        run: choco install wixtoolset --version 3.14.1
-        shell: pwsh
      - uses: actions/checkout@v4
      - name: Setup Java
        uses: actions/setup-java@v4
@@ -77,7 +74,7 @@ jobs:
      - name: Set version
        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
      - name: Run maven
-        run: mvn -B clean package -Pwin -DskipTests -Djavafx.platform=win
+        run: mvn -B clean package -Pwin -DskipTests
      - name: Patch target dir
        run: |
          cp LICENSE.txt target
@@ -89,7 +86,7 @@ jobs:
          --verbose
          --output runtime
          --module-path "jfxjmods;${JAVA_HOME}/jmods"
-          --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.mscapi,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
+          --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
          --strip-native-commands
          --no-header-files
          --no-man-pages
@@ -110,10 +107,10 @@ jobs:
          --dest appdir
          --name Cryptomator
          --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2025 Skymatic GmbH"
+          --copyright "(C) 2016 - 2024 Skymatic GmbH"
          --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
          --java-options "--enable-preview"
-          --java-options "--enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win"
+          --java-options "--enable-native-access=org.cryptomator.jfuse.win"
          --java-options "-Xss5m"
          --java-options "-Xmx256m"
          --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
@@ -199,7 +196,7 @@ jobs:
          }
      - name: Generate license for MSI
        run: >
-          mvn -B license:add-third-party "-Djavafx.platform=win"
+          mvn -B license:add-third-party
          "-Dlicense.thirdPartyFilename=license.rtf"
          "-Dlicense.outputDirectory=dist/win/resources"
          "-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl"
@@ -218,7 +215,7 @@ jobs:
          --dest installer
          --name Cryptomator
          --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2025 Skymatic GmbH"
+          --copyright "(C) 2016 - 2024 Skymatic GmbH"
          --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum}}"
          --win-menu
          --win-dir-chooser
@@ -279,7 +276,7 @@ jobs:
          cache: 'maven'
      - name: Generate license for exe
        run: >
-          mvn -B license:add-third-party "-Djavafx.platform=win"
+          mvn -B license:add-third-party
          "-Dlicense.thirdPartyFilename=license.rtf"
          "-Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl"
          "-Dlicense.outputDirectory=dist/win/bundle/resources"
@@ -304,7 +301,7 @@ jobs:
          -out dist/win/bundle/
          -dBundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
          -dBundleVendor="Skymatic GmbH"
-          -dBundleCopyright="(C) 2016 - 2025 Skymatic GmbH"
+          -dBundleCopyright="(C) 2016 - 2024 Skymatic GmbH"
          -dAboutUrl="https://cryptomator.org"
          -dHelpUrl="https://cryptomator.org/contact"
          -dUpdateUrl="https://cryptomator.org/downloads/"
@@ -375,7 +372,7 @@ jobs:
          merge-multiple: true
      - name: Publish .msi on GitHub Releases
        id: publish
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        with:
          fail_on_unmatched_files: true
          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
@@ -390,14 +387,12 @@ jobs:
    needs: [publish]
    with:
      url: ${{ needs.publish.outputs.download-url-msi }}
-    secrets: inherit

  allowlist-exe:
    uses: ./.github/workflows/av-whitelist.yml
    needs: [publish]
    with:
      url: ${{ needs.publish.outputs.download-url-exe }}
-    secrets: inherit

  notify-winget:
    name: Notify for winget-release
@@ -18,7 +18,7 @@ jobs:
        env:
          GH_TOKEN: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }}
      - name: Submit package
-        uses: vedantmgoyal2009/winget-releaser@main
+        uses: vedantmgoyal2009/winget-releaser@v2
        with:
          identifier: Cryptomator.Cryptomator
          version: ${{ inputs.tag }}
@@ -14,22 +14,23 @@
        <option name="dagger.fastInit" value="enabled" />
        <option name="dagger.formatGeneratedSource" value="enabled" />
        <processorPath useClasspath="false">
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.55/dagger-compiler-2.55.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.55/dagger-2.55.jar" />
-          <entry name="$MAVEN_REPOSITORY$/jakarta/inject/jakarta.inject-api/2.0.1/jakarta.inject-api-2.0.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.48.1/dagger-compiler-2.48.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.48.1/dagger-2.48.1.jar" />
          <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.55/dagger-spi-2.55.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/devtools/ksp/symbol-processing-api/2.0.21-1.0.28/symbol-processing-api-2.0.21-1.0.28.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.0.21/kotlin-stdlib-2.0.21.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/33.0.0-jre/guava-33.0.0-jre.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.48.1/dagger-producers-2.48.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar" />
          <entry name="$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.48.1/dagger-spi-2.48.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/devtools/ksp/symbol-processing-api/1.9.0-1.0.12/symbol-processing-api-1.9.0-1.0.12.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
          <entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.13.0/javapoet-1.13.0.jar" />
          <entry name="$MAVEN_REPOSITORY$/com/google/googlejavaformat/google-java-format/1.5/google-java-format-1.5.jar" />
          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
@@ -38,32 +39,6 @@
          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.jar" />
          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.jar" />
          <entry name="$MAVEN_REPOSITORY$/net/ltgt/gradle/incap/incap/0.2/incap-0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.55/dagger-compiler-2.55.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.55/dagger-2.55.jar" />
-          <entry name="$MAVEN_REPOSITORY$/jakarta/inject/jakarta.inject-api/2.0.1/jakarta.inject-api-2.0.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.55/dagger-spi-2.55.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/devtools/ksp/symbol-processing-api/2.0.21-1.0.28/symbol-processing-api-2.0.21-1.0.28.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.0.21/kotlin-stdlib-2.0.21.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/33.0.0-jre/guava-33.0.0-jre.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.13.0/javapoet-1.13.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/googlejavaformat/google-java-format/1.5/google-java-format-1.5.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/squareup/kotlinpoet/1.11.0/kotlinpoet-1.11.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.jar" />
-          <entry name="$MAVEN_REPOSITORY$/net/ltgt/gradle/incap/incap/0.2/incap-0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar" />
        </processorPath>
        <module name="cryptomator" />
      </profile>
@@ -71,7 +46,7 @@
  </component>
  <component name="JavacSettings">
    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="cryptomator" options="-Adagger.fastInit=enabled -Adagger.formatGeneratedSource=enabled" />
+      <module name="cryptomator" options="-Adagger.fastInit=enabled -Adagger.formatGeneratedSource=enabled --enable-preview" />
    </option>
  </component>
 </project>
@@ -8,7 +8,7 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" project-jdk-name="23" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21_PREVIEW" project-jdk-name="21" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Windows Dev" type="Application" factoryName="Application">
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12;@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12;@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -3,7 +3,7 @@
 [![Build](https://github.com/cryptomator/cryptomator/workflows/Build/badge.svg)](https://github.com/cryptomator/cryptomator/actions?query=workflow%3ABuild)
 [![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/cryptomator/badge.svg)](https://snyk.io/test/github/cryptomator/cryptomator)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=cryptomator_cryptomator&metric=alert_status)](https://sonarcloud.io/dashboard?id=cryptomator_cryptomator)
-[![Mastodon](https://img.shields.io/mastodon/follow/176112?domain=mastodon.online&style=flat)](https://mastodon.online/@cryptomator)
+[![Twitter](https://img.shields.io/badge/twitter-@Cryptomator-blue.svg?style=flat)](http://twitter.com/Cryptomator)
 [![Crowdin](https://badges.crowdin.net/cryptomator/localized.svg)](https://translate.cryptomator.org/)
 [![Latest Release](https://img.shields.io/github/release/cryptomator/cryptomator.svg)](https://github.com/cryptomator/cryptomator/releases/latest)
 [![Community](https://img.shields.io/badge/help-Community-orange.svg)](https://community.cryptomator.org)
@@ -17,24 +17,32 @@ Cryptomator is provided free of charge as an open-source project despite the hig

 ### Gold Sponsors

-Become our Gold Sponsor and showcase your brand to a targeted audience! Please contact us if you are interested.
+<table>
+  <tbody>
+    <tr>
+      <td><a href="https://www.gee-whiz.de/"><img src="https://cryptomator.org/img/sponsors/geewhiz.svg" alt="gee-whiz" height="80"></a></td>
+    </tr>
+  </tbody>
+</table>

 ### Silver Sponsors

 <table>
  <tbody>
    <tr>
-      <td><a href="https://www.gee-whiz.de/"><img src="https://cryptomator.org/img/sponsors/geewhiz.svg" alt="gee-whiz" height="56"></a></td>
-      <td><a href="https://www.route4me.com/"><img src="https://cryptomator.org/img/sponsors/route4me.svg" alt="Route4Me" height="56"></a></td>
+      <td><a href="https://mowcapital.com/"><img src="https://cryptomator.org/img/sponsors/mowcapital.svg" alt="Mow Capital" height="28"></a></td>
+      <td><a href="https://www.easeus.com/"><img src="https://cryptomator.org/img/sponsors/easeus.png" alt="EaseUS" height="40"></a></td>
+      <td><a href="https://www.hassmann-it-forensik.de/"><img src="https://cryptomator.org/img/sponsors/hassmannitforensik.png" alt="Hassmann IT-Forensik" height="40"></a></td>
+      <td><a href="https://ente.io/"><img src="https://cryptomator.org/img/sponsors/ente.svg" alt="Ente" height="58"></a></td>
    </tr>
  </tbody>
 </table>

 ### Special Shoutout

-Continuous integration hosting for ARM64 builds is provided by [MacStadium](https://www.macstadium.com/company/opensource).
+Continuous integration hosting for ARM64 builds is provided by [MacStadium](https://www.macstadium.com/opensource).

-<a href="https://www.macstadium.com/company/opensource"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="MacStadium" height="100"></a>
+<a href="https://www.macstadium.com/opensource"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="MacStadium" height="100"></a>

 ---

@@ -54,7 +62,7 @@ Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator
 - File names get encrypted
 - Folder structure gets obfuscated
 - Use as many vaults in your Dropbox as you want, each having individual passwords
- More than Five thousand commits for the security of your data!! :tada:
+- Four thousand commits for the security of your data!! :tada:

 ### Privacy

@@ -72,13 +80,13 @@ Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator

 ### Security Architecture

-For more information on the security details visit [cryptomator.org](https://docs.cryptomator.org/security/architecture/).
+For more information on the security details visit [cryptomator.org](https://docs.cryptomator.org/en/latest/security/architecture/).

 ## Building

 ### Dependencies

-* JDK 23 (e.g. temurin, zulu)
+* JDK 21 (e.g. temurin, zulu)
 * Maven 3

 ### Run Maven
@@ -1,6 +1,4 @@
-# downloaded/created during build
-openjfx-jmods.zip
-*.jmod
+# created during build
 Cryptomator.AppDir
 *.AppImage
 *.AppImage.zsync
@@ -12,31 +12,31 @@ command -v unzip >/dev/null 2>&1 || { echo >&2 "unzip not found."; exit 1; }

 VERSION=$(mvn -f ../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)
 SEMVER_STR=${VERSION}
-CPU_ARCH=$(uname -p)
+MACHINE_TYPE=$(uname -m)

-if [[ ! "${CPU_ARCH}" =~ x86_64|aarch64 ]]; then echo "Platform ${CPU_ARCH} not supported"; exit 1; fi
+if [[ ! "${MACHINE_TYPE}" =~ x86_64|aarch64 ]]; then echo "Platform ${MACHINE_TYPE} not supported"; exit 1; fi

 mvn -f ../../../pom.xml versions:set -DnewVersion=${SEMVER_STR}

 # compile
-mvn -B -f ../../../pom.xml clean package -Plinux -DskipTests -Djavafx.platform=linux
+mvn -B -f ../../../pom.xml clean package -Plinux -DskipTests
 cp ../../../LICENSE.txt ../../../target
 cp ../../../target/cryptomator-*.jar ../../../target/mods

-JAVAFX_VERSION=22.0.2
-JAVAFX_ARCH="x64"
-JAVAFX_JMODS_SHA256='2164bca470bf70a5e2764645e2078ba7f787b274e5be3d7df30d87c5bb62bba6'
-if [ "${CPU_ARCH}" = "aarch64" ]; then
-    JAVAFX_ARCH="aarch64"
-    JAVAFX_JMODS_SHA256='09c92fa9fa0b82adefd88640a14ebb2a49e5f3f733a57d1542f5590d060ffe1b'
-fi

 # download javaFX jmods
-JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_linux-${JAVAFX_ARCH}_bin-jmods.zip"
+OPENJFX_URL='https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-x64_bin-jmods.zip'
+OPENJFX_SHA='7baed11ca56d5fee85995fa6612d4299f1e8b7337287228f7f12fd50407c56f8'
+OPENJFX_URL_aarch64='https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-aarch64_bin-jmods.zip'
+OPENJFX_SHA_aarch64='871e7b9d7af16aef2e55c1b7830d0e0b2503b13dd8641374ba7e55ecb81d2ef9'

+if [[ "${MACHINE_TYPE}" = "aarch64" ]]; then
+	OPENJFX_URL="${OPENJFX_URL_aarch64}";
+	OPENJFX_SHA="${OPENJFX_SHA_aarch64}";
+fi

-curl -L ${JAVAFX_JMODS_URL} -o openjfx-jmods.zip
-echo "${JAVAFX_JMODS_SHA256}  openjfx-jmods.zip" | shasum -a256 --check
+curl -L ${OPENJFX_URL} -o openjfx-jmods.zip
+echo "${OPENJFX_SHA}  openjfx-jmods.zip" | shasum -a256 --check
 mkdir -p openjfx-jmods
 unzip -o -j openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
 JMOD_VERSION=$(jmod describe ./openjfx-jmods/javafx.base.jmod | head -1)
@@ -56,7 +56,7 @@ ${JAVA_HOME}/bin/jlink \
    --verbose \
    --output runtime \
    --module-path "${JAVA_HOME}/jmods:openjfx-jmods" \
-    --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler \
+    --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.crypto.ec,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net \
    --strip-native-commands \
    --no-header-files \
    --no-man-pages \
@@ -76,7 +76,7 @@ ${JAVA_HOME}/bin/jpackage \
    --vendor "Skymatic GmbH" \
    --java-options "--enable-preview" \
    --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
-    --copyright "(C) 2016 - 2025 Skymatic GmbH" \
+    --copyright "(C) 2016 - 2024 Skymatic GmbH" \
    --java-options "-Xss5m" \
    --java-options "-Xmx256m" \
    --app-version "${VERSION}.${REVISION_NO}" \
@@ -91,7 +91,6 @@ ${JAVA_HOME}/bin/jpackage \
    --java-options "-Dcryptomator.showTrayIcon=true" \
    --java-options "-Dcryptomator.integrationsLinux.trayIconsDir=\"@{appdir}/usr/share/icons/hicolor/symbolic/apps\"" \
    --java-options "-Dcryptomator.buildNumber=\"appimage-${REVISION_NO}\"" \
-    --java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\"" \
    --resource-dir ../resources

 # transform AppDir
@@ -109,23 +108,23 @@ cp ../common/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/usr/share/ap
 cp ../common/org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml
 cp ../common/application-vnd.cryptomator.vault.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.vault.xml
 ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg
+ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/Cryptomator.svg
 ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon
-ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/org.cryptomator.Cryptomator.desktop
-ln -s org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml
+ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/Cryptomator.desktop
 ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun

 # load AppImageTool
-curl -L https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${CPU_ARCH}.AppImage -o /tmp/appimagetool.AppImage
+curl -L https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-${MACHINE_TYPE}.AppImage -o /tmp/appimagetool.AppImage
 chmod +x /tmp/appimagetool.AppImage

 # create AppImage
 /tmp/appimagetool.AppImage \
    Cryptomator.AppDir \
-    cryptomator-${SEMVER_STR}-${CPU_ARCH}.AppImage  \
-    -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${CPU_ARCH}.AppImage.zsync'
+    cryptomator-${SEMVER_STR}-${MACHINE_TYPE}.AppImage  \
+    -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${MACHINE_TYPE}.AppImage.zsync'

 echo ""
-echo "Done. AppImage successfully created: cryptomator-${SEMVER_STR}-${CPU_ARCH}.AppImage"
+echo "Done. AppImage successfully created: cryptomator-${SEMVER_STR}-${MACHINE_TYPE}.AppImage"
 echo ""
 echo >&2 "To clean up, run: rm -rf Cryptomator.AppDir appdir runtime squashfs-root openjfx-jmods; rm /tmp/appimagetool.AppImage openjfx-jmods.zip"
 echo ""
@@ -53,11 +53,6 @@
 		</screenshot>
 	</screenshots>

-	<branding>
-		<color type="primary" scheme_preference="light">#EBF5EB</color>
-		<color type="primary" scheme_preference="dark">#2F4858</color>
-	</branding>
-
 	<url type="homepage">https://cryptomator.org/</url>
 	<url type="bugtracker">https://github.com/cryptomator/cryptomator/issues/</url>
 	<url type="donation">https://cryptomator.org/donate</url>
@@ -68,27 +63,13 @@
 	<developer id="de.skymatic">
 		<name>Skymatic GmbH</name>
 	</developer>
+		

 	<content_rating type="oars-1.1">
 		<content_attribute id="social-info">mild</content_attribute> <!-- update checker connects to https://api.cryptomator.org/updates/latestVersion.json -->
 	</content_rating>

 	<releases>
-		<release date="2025-02-03" version="1.15.0">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.0</url>
-		</release>
-		<release date="2024-11-19" version="1.14.2">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.14.2</url>
-		</release>
-		<release date="2024-09-17" version="1.14.0">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.14.0</url>
-		</release>
-		<release date="2024-06-26" version="1.13.0">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.13.0</url>
-		</release>
-		<release date="2024-03-27" version="1.12.4">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.12.4</url>
-		</release>
 		<release date="2024-02-27" version="1.12.3">
 			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.12.3</url>
 		</release>
@@ -2,7 +2,7 @@ Source: cryptomator
 Maintainer: Cryptobot <releases@cryptomator.org>
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>=10), coffeelibs-jdk-23 (>= 23.0.1+11-0ppa1), libgtk-3-0,  libxxf86vm1, libgl1
+Build-Depends: debhelper (>=10), coffeelibs-jdk-21 (>= 21.0.2+12-0ppa1), libgtk-3-0,  libxxf86vm1, libgl1
 Standards-Version: 4.5.0
 Homepage: https://cryptomator.org
 Vcs-Git: https://github.com/cryptomator/cryptomator.git
@@ -4,11 +4,11 @@ Upstream-Contact: Cryptomator <info@cryptomator.org>
 Source: https://cryptomator.org

 Files: *
-Copyright: 2016-2025 Skymatic GmbH
+Copyright: 2016-2024 Skymatic GmbH
 License: GPL-3+

 Files: debian/org.cryptomator.Cryptomator.appdata.xml
-Copyright: 2016-2025 Skymatic GmbH
+Copyright: 2016-2024 Skymatic GmbH
 License: FSFAP

 License: GPL-3+
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

-JAVA_HOME = /usr/lib/jvm/java-23-coffeelibs
+JAVA_HOME = /usr/lib/jvm/java-21-coffeelibs
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(DEB_BUILD_ARCH),amd64)
 JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods
@@ -28,7 +28,7 @@ override_dh_auto_build:
 	$(JAVA_HOME)/bin/jlink \
 		--output runtime \
 		--module-path "${JMODS_PATH}" \
-		--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler \
+		--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.crypto.ec,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net \
 		--strip-native-commands \
 		--no-header-files \
 		--no-man-pages \
@@ -45,7 +45,7 @@ override_dh_auto_build:
 		--vendor "Skymatic GmbH" \
 		--java-options "--enable-preview" \
 		--java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
-		--copyright "(C) 2016 - 2025 Skymatic GmbH" \
+		--copyright "(C) 2016 - 2024 Skymatic GmbH" \
 		--java-options "-Xss5m" \
 		--java-options "-Xmx256m" \
 		--java-options "-Dfile.encoding=\"utf-8\"" \
@@ -61,8 +61,6 @@ override_dh_auto_build:
 		--java-options "-Dcryptomator.buildNumber=\"deb-${REVISION_NUM}\"" \
 		--java-options "-Dcryptomator.appVersion=\"${SEMVER_STR}\"" \
 		--java-options "-Dcryptomator.disableUpdateCheck=\"${DISABLE_UPDATE_CHECK}\"" \
-		--java-options "-Dcryptomator.integrationsLinux.autoStartCmd=\"cryptomator\"" \
-		--java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\"" \
 		--app-version "${VERSION_NUM}.${REVISION_NUM}" \
 		--resource-dir resources \
 		--verbose
@@ -1 +0,0 @@
-embedded.provisionprofile
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.application-identifier</key>
-	<string>###APP_IDENTIFIER_PREFIX###org.cryptomator</string>
-	<key>com.apple.developer.team-identifier</key>
-	<string>###TEAM_IDENTIFIER###</string>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
@@ -14,9 +10,5 @@
 	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
-	<key>keychain-access-groups</key>
-	<array>
-		<string>###APP_IDENTIFIER_PREFIX###org.cryptomator</string>
-	</array>
 </dict>
 </plist>
@@ -1,9 +1,6 @@
-# downloaded/created during build
+# created during build
 Cryptomator.app/
 runtime/
 dmg/
 *.dmg
-license.rtf
-openjfx-jmods.zip
-*.jmod
-Cryptomator.entitlements
+license.rtf
@@ -1,15 +1,12 @@
 #!/bin/bash

 # parse options
-usage() { echo "Usage: $0 [-s <codesign-identity>] [-t <team-identifier>]" 1>&2; exit 1; }
-while getopts ":s:t:" o; do
+usage() { echo "Usage: $0 [-s <codesign-identity>]" 1>&2; exit 1; }
+while getopts ":s:" o; do
    case "${o}" in
        s)
            CODESIGN_IDENTITY=${OPTARG}
            ;;
-        t)
-            TEAM_IDENTIFIER=${OPTARG}
-            ;;
        *)
            usage
            ;;
@@ -24,7 +21,7 @@ rm -rf runtime dmg *.app *.dmg
 # set variables
 APP_NAME="Cryptomator"
 VENDOR="Skymatic GmbH"
-COPYRIGHT_YEARS="2016 - 2025"
+COPYRIGHT_YEARS="2016 - 2024"
 PACKAGE_IDENTIFIER="org.cryptomator"
 MAIN_JAR_GLOB="cryptomator-*.jar"
 MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator"
@@ -32,17 +29,13 @@ REVISION_NO=`git rev-list --count HEAD`
 VERSION_NO=`mvn -f../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout | sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'`
 FUSE_LIB="FUSE-T"

-JAVAFX_VERSION=23.0.1
-JAVAFX_ARCH="undefined"
-JAVAFX_JMODS_SHA256="undefined"
+ARCH="undefined"
 if [ "$(machine)" = "arm64e" ]; then
-    JAVAFX_ARCH="aarch64"
-    JAVAFX_JMODS_SHA256="a800724a1f3e6757ecfa0bd5bf7ed64d2e6a7a3f5b3522650a70b8cfc7782fb6"
+    ARCH="aarch64"
 else
-    JAVAFX_ARCH="x64"
-    JAVAFX_JMODS_SHA256="8857965975c464a0e5d57709292ce357d0ebb39f6168c41d5ca38301e42c3c8e"
+    ARCH="x64"
 fi
-JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_osx-${JAVAFX_ARCH}_bin-jmods.zip"
+OPENJFX_JMODS="https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_osx-${ARCH}_bin-jmods.zip"

 # check preconditions
 if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/path/to/jdk ./build.sh"; exit 1; fi
@@ -54,8 +47,7 @@ if [ -n "${CODESIGN_IDENTITY}" ]; then
 fi

 # download and check jmods
-curl -L ${JAVAFX_JMODS_URL} -o openjfx-jmods.zip
-echo "${JAVAFX_JMODS_SHA256}  openjfx-jmods.zip" | shasum -a256 --check
+curl -L ${OPENJFX_JMODS} -o openjfx-jmods.zip
 mkdir -p openjfx-jmods/
 unzip -jo openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
 JMOD_VERSION=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
@@ -71,7 +63,7 @@ if [ "${POM_JFX_VERSION}" -ne "${JMOD_VERSION}" ]; then
 fi

 # compile
-mvn -B -Djavafx.platform=mac -f../../../pom.xml clean package -DskipTests -Pmac
+mvn -B -f../../../pom.xml clean package -DskipTests -Pmac
 cp ../../../LICENSE.txt ../../../target
 cp ../../../target/${MAIN_JAR_GLOB} ../../../target/mods

@@ -79,7 +71,7 @@ cp ../../../target/${MAIN_JAR_GLOB} ../../../target/mods
 ${JAVA_HOME}/bin/jlink \
    --output runtime \
    --module-path "${JAVA_HOME}/jmods:openjfx-jmods" \
-    --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,java.compiler \
+    --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.crypto.ec,jdk.security.auth,jdk.accessibility,jdk.management.jfr \
    --strip-native-commands \
    --no-header-files \
    --no-man-pages \
@@ -124,10 +116,9 @@ ${JAVA_HOME}/bin/jpackage \
 cp ../resources/${APP_NAME}-Vault.icns ${APP_NAME}.app/Contents/Resources/
 sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" ${APP_NAME}.app/Contents/Info.plist
 sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" ${APP_NAME}.app/Contents/Info.plist
-cp ../embedded.provisionprofile ${APP_NAME}.app/Contents/

 # generate license
-mvn -B -Djavafx.platform=mac -f../../../pom.xml license:add-third-party \
+mvn -B -f../../../pom.xml license:add-third-party \
    -Dlicense.thirdPartyFilename=license.rtf \
    -Dlicense.outputDirectory=dist/mac/dmg/resources \
    -Dlicense.fileTemplate=resources/licenseTemplate.ftl \
@@ -137,11 +128,7 @@ mvn -B -Djavafx.platform=mac -f../../../pom.xml license:add-third-party \
    -Dlicense.licenseMergesUrl=file://$(pwd)/../../../license/merges

 # codesign
-if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then
-    echo "Codesigning jdk files..."
-    find ${APP_NAME}.app/Contents/runtime/Contents/Home/lib/ -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
-    find ${APP_NAME}.app/Contents/runtime/Contents/Home/lib/ -name 'jspawnhelper' -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \;
-    echo "Codesigning jar contents..."
+if [ -n "${CODESIGN_IDENTITY}" ]; then
    find ${APP_NAME}.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
    for JAR_PATH in `find ${APP_NAME}.app -name "*.jar"`; do
    if [[ `unzip -l ${JAR_PATH} | grep '.dylib\|.jnilib'` ]]; then
@@ -159,10 +146,7 @@ if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then
    fi
    done
    echo "Codesigning ${APP_NAME}.app..."
-    cp ../${APP_NAME}.entitlements .
-    sed -i '' "s|###APP_IDENTIFIER_PREFIX###|${TEAM_IDENTIFIER}.|g" ${APP_NAME}.entitlements
-    sed -i '' "s|###TEAM_IDENTIFIER###|${TEAM_IDENTIFIER}|g" ${APP_NAME}.entitlements
-    codesign --force --deep --entitlements ${APP_NAME}.entitlements -o runtime -s ${CODESIGN_IDENTITY} ${APP_NAME}.app
+    codesign --force --deep --entitlements ../${APP_NAME}.entitlements -o runtime -s ${CODESIGN_IDENTITY} ${APP_NAME}.app
 fi

 # prepare dmg contents
@@ -17,7 +17,7 @@
 \f1\b0 \
 \

-\f0\b \'a9 2016 \'96 2025 Skymatic GmbH
+\f0\b \'a9 2016 \'96 2024 Skymatic GmbH
 \f1\b0 \
 \
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\
@@ -6,5 +6,4 @@ installer
 *.msi
 *.exe
 *.jmod
-resources/jfxJmods.zip
 license.rtf
@@ -11,7 +11,7 @@ SET HELP_URL="https://cryptomator.org/contact/"
 SET MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator"
 SET LOOPBACK_ALIAS="cryptomator-vault"

-pwsh -NoLogo -NoProfile -ExecutionPolicy Unrestricted -Command .\build.ps1^
+powershell -NoLogo -NoProfile -ExecutionPolicy Unrestricted -Command .\build.ps1^
 -AppName %APPNAME%^
 -MainJarGlob "%MAIN_JAR_GLOB%"^
 -ModuleAndMainClass "%MODULE_AND_MAIN_CLASS%"^
@@ -41,7 +41,7 @@ Write-Output "`$Env:JAVA_HOME=$Env:JAVA_HOME"
 $copyright = "(C) $CopyrightStartYear - $((Get-Date).Year) $Vendor"

 # compile
-&mvn -B -f $buildDir/../../pom.xml clean package -DskipTests -Pwin "-Djavafx.platform=win"
+&mvn -B -f $buildDir/../../pom.xml clean package -DskipTests -Pwin
 Copy-Item "$buildDir\..\..\target\$MainJarGlob.jar" -Destination "$buildDir\..\..\target\mods"

 # add runtime
@@ -51,23 +51,22 @@ if ($clean -and (Test-Path -Path $runtimeImagePath)) {
 }

 ## download jfx jmods
-$javaFxVersion='23.0.1'
-$javaFxJmodsUrl = "https://download2.gluonhq.com/openjfx/${javaFxVersion}/openjfx-${javaFxVersion}_windows-x64_bin-jmods.zip"
-$javaFxJmodsSHA256 = 'ee176dcee3bd78bde7910735bd67f67c792882f5b89626796ae06f7a1c0119d3'
-$javaFxJmods = '.\resources\jfxJmods.zip'
-if( !(Test-Path -Path $javaFxJmods) ) {
-	Write-Output "Downloading ${javaFxJmodsUrl}..."
-	Invoke-WebRequest $javaFxJmodsUrl -OutFile $javaFxJmods # redirects are followed by default
+$jmodsVersion='21.0.1'
+$jmodsUrl = "https://download2.gluonhq.com/openjfx/${jmodsVersion}/openjfx-${jmodsVersion}_windows-x64_bin-jmods.zip"
+$jfxJmodsChecksum = 'daf8acae631c016c24cfe23f88469400274d3441dd890615a42dfb501f3eb94a'
+$jfxJmodsZip = '.\resources\jfxJmods.zip'
+if( !(Test-Path -Path $jfxJmodsZip) ) {
+	Write-Output "Downloading ${jmodsUrl}..."
+	Invoke-WebRequest $jmodsUrl -OutFile $jfxJmodsZip # redirects are followed by default
 }

-$jmodsChecksumActual = $(Get-FileHash -Path $javaFxJmods -Algorithm SHA256).Hash.ToLower()
-if( $jmodsChecksumActual -ne $javaFxJmodsSHA256 ) {
-	Write-Error "Checksum mismatch for jfxJmods.zip. Expected: $javaFxJmodsSHA256
-, actual: $jmodsChecksumActual"
+$jmodsChecksumActual = $(Get-FileHash -Path $jfxJmodsZip -Algorithm SHA256).Hash
+if( $jmodsChecksumActual -ne $jfxJmodsChecksum ) {
+	Write-Error "Checksum mismatch for jfxJmods.zip. Expected: $jfxJmodsChecksum, actual: $jmodsChecksumActual"
 	exit 1;
 }
-Expand-Archive -Path $javaFxJmods -Force -DestinationPath ".\resources\"
-Remove-Item -Recurse -Force -Path ".\resources\javafx-jmods" -ErrorAction Ignore
+Expand-Archive -Path $jfxJmodsZip -Force -DestinationPath ".\resources\"
+Remove-Item -Recurse -Force -Path ".\resources\javafx-jmods"
 Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\javafx-jmods" -ErrorAction Stop

 ## create custom runtime
@@ -75,7 +74,7 @@ Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\ja
 	--verbose `
 	--output runtime `
 	--module-path "$Env:JAVA_HOME/jmods;$buildDir/resources/javafx-jmods" `
-	--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,jdk.crypto.mscapi,java.compiler,javafx.base,javafx.graphics,javafx.controls,javafx.fxml `
+	--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr,javafx.base,javafx.graphics,javafx.controls,javafx.fxml `
 	--strip-native-commands `
 	--no-header-files `
 	--no-man-pages `
@@ -100,7 +99,7 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--vendor $Vendor `
 	--copyright $copyright `
 	--java-options "--enable-preview" `
-	--java-options "--enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win" `
+	--java-options "--enable-native-access=org.cryptomator.jfuse.win" `
 	--java-options "-Xss5m" `
 	--java-options "-Xmx256m" `
 	--java-options "-Dcryptomator.appVersion=`"$semVerNo`"" `
@@ -122,7 +121,7 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--icon resources/$AppName.ico

 #Create RTF license for msi
-&mvn -B -f $buildDir/../../pom.xml license:add-third-party "-Djavafx.platform=win" `
+&mvn -B -f $buildDir/../../pom.xml license:add-third-party `
 "-Dlicense.thirdPartyFilename=license.rtf" `
 "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl" `
 "-Dlicense.outputDirectory=$buildDir\resources\" `
@@ -167,7 +166,7 @@ $Env:JP_WIXHELPER_DIR = "."
 	--file-associations resources/FAvaultFile.properties

 #Create RTF license for bundle
-&mvn -B -f $buildDir/../../pom.xml license:add-third-party "-Djavafx.platform=win" `
+&mvn -B -f $buildDir/../../pom.xml license:add-third-party `
 "-Dlicense.thirdPartyFilename=license.rtf" `
 "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl" `
 "-Dlicense.outputDirectory=$buildDir\bundle\resources\" `
@@ -31,6 +31,7 @@
        </BootstrapperApplicationRef>

        <Chain>
+            <!-- WixBundleActions are defined in the BOOTSTRAPPER_ACTION enum, see https://github.com/wixtoolset/wix3/blob/473562c0c3904216f2b6963c0ad244a8cc41e9ee/src/burn/inc/IBootstrapperEngine.h#L15 -->
            <ExePackage Cache="yes" PerMachine="yes" Permanent="no"
              SourceFile="resources\winfsp-uninstaller.exe"
              DisplayName="Removing outdated WinFsp Driver"
@@ -51,11 +52,13 @@ Do you want to continue?&quot;" RepairArgument="-q" UninstallArgument="-s" />
            </ExePackage>
            <!-- see https://wixtoolset.org/documentation/manual/v3/xsd/wix/msipackage.html-->
            <MsiPackage
+                Cache="yes"
                SourceFile="resources\Cryptomator.msi"
                CacheId="cryptomator-bundle-cryptomator"
                DisplayInternalUI="no"
                Visible="no"/>
            <MsiPackage
+                Cache="yes"
                SourceFile="resources\winfsp.msi"
                CacheId="cryptomator-bundle-winfsp"
                Visible="yes"
@@ -10,7 +10,7 @@
 \vieww12000\viewh15840\viewkind0
 \pard\tx283\tx567\tx850\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par
 \par
-\b\'a9 2016 \'96 2025 Skymatic GmbH \b0\par
+\b\'a9 2016 \'96 2024 Skymatic GmbH \b0\par
 \par
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\par
 \par
@@ -0,0 +1,5 @@
+@echo off
+:: see comments in file ./version170-migrate-settings.ps1
+
+cd %~dp0
+powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -Command .\version170-migrate-settings.ps1
@@ -0,0 +1,35 @@
+# This script migrates Cryptomator settings for all local users on Windows in case the users uses custom directories as mountpoint
+# See also https://github.com/cryptomator/cryptomator/pull/2654.
+#
+# TODO: This script should be evaluated in a yearly interval if it is still needed and if not, should be removed
+#
+#Requires -RunAsAdministrator
+
+#Get all active, local user profiles
+$profileList = 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList'
+Get-ChildItem $profileList | ForEach-Object {
+    $profilePath =  $_.GetValue("ProfileImagePath") 
+    $settingsPath = "$profilePath\AppData\Roaming\Cryptomator\settings.json"
+    if(!(Test-Path -Path $settingsPath -PathType Leaf)) {
+        #No settings file, nothing to do.
+        return;
+    }
+    $settings = Get-Content -Path $settingsPath | ConvertFrom-Json
+    if($settings.preferredVolumeImpl -ne "FUSE") {
+        #Fuse not used, nothing to do
+        return;
+    }
+
+    #check if customMountPoints are used
+    $atLeastOneCustomPath = $false;
+    foreach ($vault in $settings.directories){
+        $atLeastOneCustomPath = $atLeastOneCustomPath -or ($vault.useCustomMountPath -eq "True")
+    }
+
+    #if so, use WinFsp Local Drive
+    if( $atLeastOneCustomPath ) {
+        Add-Member -Force -InputObject $settings -Name "mountService" -Value "org.cryptomator.frontend.fuse.mount.WinFspMountProvider" -MemberType NoteProperty
+        $newSettings  = $settings | Select-Object * -ExcludeProperty "preferredVolumeImpl"
+        ConvertTo-Json $newSettings | Set-Content -Path $settingsPath
+    }
+}
@@ -10,7 +10,7 @@
 \vieww12000\viewh15840\viewkind0
 \pard\tx283\tx567\tx850\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par
 \par
-\b\'a9 2016 \'96 2025 Skymatic GmbH \b0\par
+\b\'a9 2016 \'96 2024 Skymatic GmbH \b0\par
 \par
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\par
 \par
@@ -139,6 +139,11 @@
            Sequence="execute" Before="PatchWebDAV" />
    <CustomAction Id="PatchWebDAV" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>

+    <!-- Special Settings migration for 1.7.0,. Should be removed eventually, for more info, see ../contrib/version170-migrate-settings.ps1-->
+    <SetProperty Id="V170MigrateSettings" Value="&quot;[INSTALLDIR]version170-migrate-settings.bat&quot;"
+            Sequence="execute" Before="V170MigrateSettings" />
+    <CustomAction Id="V170MigrateSettings" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>
+
    <!-- Running App detection and exit -->
    <Property Id="FOUNDRUNNINGAPP" Admin="yes"/>
    <util:CloseApplication
@@ -190,6 +195,7 @@
      <RemoveExistingProducts After="InstallValidate"/> <!-- Moved from CostInitialize, due to WixCloseApplications -->

      <Custom Action="PatchWebDAV" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
+      <Custom Action="V170MigrateSettings" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
    </InstallExecuteSequence>

    <InstallUISequence>
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptomator</artifactId>
-	<version>1.16.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<name>Cryptomator Desktop App</name>

 	<organization>
@@ -26,62 +26,56 @@

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>23</project.jdk.version>
+		<project.jdk.version>21</project.jdk.version>

 		<!-- Group IDs of jars that need to stay on the class path for now -->
 		<!-- remove them, as soon they got modularized or support is dropped (i.e., WebDAV) -->
 		<nonModularGroupIds>org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents</nonModularGroupIds>

 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.8.0</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>1.5.0</cryptomator.integrations.version>
-		<cryptomator.integrations.win.version>1.3.0</cryptomator.integrations.win.version>
-		<cryptomator.integrations.mac.version>1.2.4</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>1.5.2</cryptomator.integrations.linux.version>
-		<cryptomator.fuse.version>5.0.2</cryptomator.fuse.version>
-		<cryptomator.webdav.version>2.0.7</cryptomator.webdav.version>
+		<cryptomator.cryptofs.version>2.6.9</cryptomator.cryptofs.version>
+		<cryptomator.integrations.version>1.3.1</cryptomator.integrations.version>
+		<cryptomator.integrations.win.version>1.2.5</cryptomator.integrations.win.version>
+		<cryptomator.integrations.mac.version>1.2.3</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.linux.version>1.4.4</cryptomator.integrations.linux.version>
+		<cryptomator.fuse.version>4.0.0</cryptomator.fuse.version>
+		<cryptomator.dokany.version>2.0.0</cryptomator.dokany.version>
+		<cryptomator.webdav.version>2.0.6</cryptomator.webdav.version>

 		<!-- 3rd party dependencies -->
-		<commons-lang3.version>3.17.0</commons-lang3.version>
-		<dagger.version>2.55</dagger.version>
+		<commons-lang3.version>3.14.0</commons-lang3.version>
+		<dagger.version>2.50</dagger.version>
 		<easybind.version>2.2</easybind.version>
-		<jackson.version>2.18.2</jackson.version>
-		<javafx.version>23.0.1</javafx.version>
+		<guava.version>33.0.0-jre</guava.version>
+		<jackson.version>2.16.1</jackson.version>
+		<javafx.version>21.0.1</javafx.version>
 		<jwt.version>4.4.0</jwt.version>
 		<nimbus-jose.version>9.37.3</nimbus-jose.version>
-		<logback.version>1.5.16</logback.version>
-		<slf4j.version>2.0.16</slf4j.version>
+		<logback.version>1.5.0</logback.version>
+		<slf4j.version>2.0.12</slf4j.version>
 		<tinyoauth2.version>0.8.0</tinyoauth2.version>
-		<zxcvbn.version>1.9.0</zxcvbn.version>
+		<zxcvbn.version>1.8.2</zxcvbn.version>

 		<!-- test dependencies -->
-		<junit.jupiter.version>5.11.4</junit.jupiter.version>
-		<mockito.version>5.15.2</mockito.version>
-		<hamcrest.version>3.0</hamcrest.version>
+		<junit.jupiter.version>5.10.2</junit.jupiter.version>
+		<mockito.version>5.10.0</mockito.version>
+		<hamcrest.version>2.2</hamcrest.version>

 		<!-- build-time dependencies -->
-		<jetbrains.annotations.version>26.0.1</jetbrains.annotations.version>
-		<dependency-check.version>12.0.1</dependency-check.version>
-		<jacoco.version>0.8.12</jacoco.version>
-		<license-generator.version>2.5.0</license-generator.version>
-		<junit-tree-reporter.version>1.4.0</junit-tree-reporter.version>
-		<mvn-compiler.version>3.13.0</mvn-compiler.version>
+		<jetbrains.annotations.version>24.1.0</jetbrains.annotations.version>
+		<dependency-check.version>9.0.9</dependency-check.version>
+		<jacoco.version>0.8.11</jacoco.version>
+		<license-generator.version>2.4.0</license-generator.version>
+		<junit-tree-reporter.version>1.2.1</junit-tree-reporter.version>
+		<mvn-compiler.version>3.12.1</mvn-compiler.version>
 		<mvn-resources.version>3.3.1</mvn-resources.version>
-		<mvn-dependency.version>3.8.1</mvn-dependency.version>
-		<mvn-surefire.version>3.5.2</mvn-surefire.version>
-		<mvn-jar.version>3.4.2</mvn-jar.version>
-
-		<!-- Property used by surefire to determine jacoco engine -->
-		<surefire.jacoco.args></surefire.jacoco.args>
+		<mvn-dependency.version>3.6.1</mvn-dependency.version>
+		<mvn-surefire.version>3.2.5</mvn-surefire.version>
+		<mvn-jar.version>3.3.0</mvn-jar.version>
 	</properties>

 	<dependencies>
 		<!-- Cryptomator Libs -->
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>cryptolib</artifactId>
-			<version>2.2.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>cryptofs</artifactId>
@@ -92,6 +86,11 @@
 			<artifactId>fuse-nio-adapter</artifactId>
 			<version>${cryptomator.fuse.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>dokany-nio-adapter</artifactId>
+			<version>${cryptomator.dokany.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>webdav-nio-adapter</artifactId>
@@ -165,18 +164,11 @@
 			<artifactId>nimbus-jose-jwt</artifactId>
 			<version>${nimbus-jose.version}</version>
 		</dependency>
-
-		<!-- Jackson -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>

 		<!-- EasyBind -->
 		<dependency>
@@ -193,23 +185,40 @@
 		</dependency>

 		<!-- Google -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<exclusions>
+				<!-- see https://github.com/google/guava/wiki/UseGuavaInYourBuild#what-about-guavas-own-dependencies -->
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>listenablefuture</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.code.findbugs</groupId>
+					<artifactId>jsr305</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.checkerframework</groupId>
+					<artifactId>checker-qual</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.errorprone</groupId>
+					<artifactId>error_prone_annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.j2objc</groupId>
+					<artifactId>j2objc-annotations</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger</artifactId>
 			<version>${dagger.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>jakarta.inject</groupId>
-			<artifactId>jakarta.inject-api</artifactId>
-			<version>2.0.1</version>
-		</dependency>

-		<!-- Caffeine -->
-		<dependency>
-			<groupId>com.github.ben-manes.caffeine</groupId>
-			<artifactId>caffeine</artifactId>
-			<version>3.2.0</version>
-		</dependency>
 		<!-- JUnit / Mockito / Hamcrest -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -311,6 +320,7 @@
 					<compilerArgs>
 						<arg>-Adagger.fastInit=enabled</arg>
 						<arg>-Adagger.formatGeneratedSource=enabled</arg>
+						<arg>--enable-preview</arg>
 					</compilerArgs>
 				</configuration>
 			</plugin>
@@ -337,11 +347,11 @@
 					</dependency>
 				</dependencies>
 				<configuration>
+					<argLine>--enable-preview</argLine>
 					<reportFormat>plain</reportFormat>
 					<consoleOutputReporter>
 						<disable>true</disable>
 					</consoleOutputReporter>
-					<argLine>@{surefire.jacoco.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
 					<statelessTestsetInfoReporter
 							implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoTreeReporter">
 					</statelessTestsetInfoReporter>
@@ -351,13 +361,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
-					<execution>
-						<id>jar-paths-to-properties</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>properties</goal>
-						</goals>
-					</execution>
 					<!-- sort jars into two buckets (classpath and modulepath). exclude openjfx, which gets jlinked separately -->
 					<execution>
 						<id>copy-mods</id>
@@ -430,9 +433,6 @@
 								<goals>
 									<goal>prepare-agent</goal>
 								</goals>
-								<configuration>
-									<propertyName>surefire.jacoco.args</propertyName>
-								</configuration>
 							</execution>
 							<execution>
 								<id>report</id>
@@ -465,7 +465,7 @@
 							<skipTestScope>true</skipTestScope>
 							<detail>true</detail>
 							<suppressionFile>suppression.xml</suppressionFile>
-							<nvdApiKeyEnvironmentVariable>NVD_API_KEY</nvdApiKeyEnvironmentVariable>
+							<nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
 						</configuration>
 						<executions>
 							<execution>
@@ -1,10 +1,8 @@
 import ch.qos.logback.classic.spi.Configurator;
-import org.cryptomator.networking.SSLContextWithPKCS12TrustStore;
 import org.cryptomator.common.locationpresets.DropboxLinuxLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.DropboxMacLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.DropboxWindowsLocationPresetsProvider;
-import org.cryptomator.common.locationpresets.GoogleDriveMacLocationPresetsProvider;
-import org.cryptomator.common.locationpresets.GoogleDriveWindowsLocationPresetsProvider;
+import org.cryptomator.common.locationpresets.GoogleDriveLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.ICloudMacLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.ICloudWindowsLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.LeitzcloudLocationPresetsProvider;
@@ -14,9 +12,6 @@ import org.cryptomator.common.locationpresets.OneDriveLinuxLocationPresetsProvid
 import org.cryptomator.common.locationpresets.OneDriveMacLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.OneDriveWindowsLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.PCloudLocationPresetsProvider;
-import org.cryptomator.networking.SSLContextWithMacKeychain;
-import org.cryptomator.networking.SSLContextProvider;
-import org.cryptomator.networking.SSLContextWithWindowsCertStore;
 import org.cryptomator.integrations.tray.TrayMenuController;
 import org.cryptomator.logging.LogbackConfiguratorFactory;
 import org.cryptomator.ui.traymenu.AwtTrayMenuController;
@@ -26,6 +21,7 @@ open module org.cryptomator.desktop {

 	requires org.cryptomator.cryptolib;
 	requires org.cryptomator.cryptofs;
+	requires org.cryptomator.frontend.dokany;
 	requires org.cryptomator.frontend.fuse;
 	requires org.cryptomator.frontend.webdav;
 	requires org.cryptomator.integrations.api;
@@ -36,13 +32,13 @@ open module org.cryptomator.desktop {
 	requires javafx.graphics;
 	requires javafx.controls;
 	requires javafx.fxml;
+	requires jdk.crypto.ec;
 	// 3rd party:
 	requires ch.qos.logback.classic;
 	requires ch.qos.logback.core;
 	requires com.auth0.jwt;
 	requires com.google.common;
 	requires com.fasterxml.jackson.databind;
-	requires com.fasterxml.jackson.datatype.jsr310;
 	requires com.nimbusds.jose.jwt;
 	requires com.nulabinc.zxcvbn;
 	requires com.tobiasdiez.easybind;
@@ -51,21 +47,16 @@ open module org.cryptomator.desktop {
 	requires org.slf4j;
 	requires org.apache.commons.lang3;

-	/* dagger bs */
-	requires jakarta.inject;
-	requires static javax.inject;
-	requires java.compiler;
-	requires com.github.benmanes.caffeine;
+	/* TODO: filename-based modules: */
+	requires static javax.inject; /* ugly dagger/guava crap */

 	uses org.cryptomator.common.locationpresets.LocationPresetsProvider;
-	uses SSLContextProvider;

 	provides TrayMenuController with AwtTrayMenuController;
 	provides Configurator with LogbackConfiguratorFactory;
-	provides SSLContextProvider with SSLContextWithWindowsCertStore, SSLContextWithMacKeychain, SSLContextWithPKCS12TrustStore;
 	provides LocationPresetsProvider with //
 			DropboxWindowsLocationPresetsProvider, DropboxMacLocationPresetsProvider, DropboxLinuxLocationPresetsProvider, //
-			GoogleDriveMacLocationPresetsProvider, GoogleDriveWindowsLocationPresetsProvider, //
+			GoogleDriveLocationPresetsProvider, //
 			ICloudWindowsLocationPresetsProvider, ICloudMacLocationPresetsProvider, //
 			LeitzcloudLocationPresetsProvider, //
 			MegaLocationPresetsProvider, //
@@ -1,31 +0,0 @@
-package org.cryptomator.common;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.IOException;
-
-public record Hyperlinks(String docsVolumeType, String docsGettingStarted, String homepageHub) {
-
-	private static final ObjectMapper JSON_DESERIALIZER = new ObjectMapper();
-	/*
-	String docsAccessingVaults;
-	String docsExpertSettings;
-	String docsManualMigration;
-	String homepageDownload;
-	String homepageHub;
-	String homepageDonate;
-	String homepageSponsors;
-	String storeDesktop;
-	 */
-
-
-	public static Hyperlinks load() {
-		try {
-			return JSON_DESERIALIZER.readValue(Hyperlinks.class.getResource("/hyperlinks.json"), Hyperlinks.class);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-}
@@ -5,7 +5,6 @@ import org.slf4j.LoggerFactory;

 import java.util.Map;
 import java.util.Properties;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 public class SubstitutingProperties extends PropertiesDecorator {
@@ -59,7 +58,7 @@ public class SubstitutingProperties extends PropertiesDecorator {
 			LoggerFactory.getLogger(SubstitutingProperties.class).warn("Variable {} used for substitution not found in {}. Replaced with empty string.", key, src);
 			return "";
 		} else {
-			return Matcher.quoteReplacement(val);
+			return val.replace("\\", "\\\\");
 		}
 	}

@@ -1,7 +1,8 @@
 package org.cryptomator.common.keychain;

-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;

@@ -23,9 +24,9 @@ public class KeychainManager implements KeychainAccessProvider {
 	@Inject
 	KeychainManager(ObjectExpression<KeychainAccessProvider> selectedKeychain) {
 		this.keychain = selectedKeychain;
-		this.passphraseStoredProperties = Caffeine.newBuilder() //
+		this.passphraseStoredProperties = CacheBuilder.newBuilder() //
 				.weakValues() //
-				.build(this::createStoredPassphraseProperty);
+				.build(CacheLoader.from(this::createStoredPassphraseProperty));
 		keychain.addListener(ignored -> passphraseStoredProperties.invalidateAll());
 	}

@@ -43,7 +44,7 @@ public class KeychainManager implements KeychainAccessProvider {
 	}

 	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		getKeychainOrFail().storePassphrase(key, displayName, passphrase);
 		setPassphraseStored(key, true);
 	}
@@ -123,7 +124,7 @@ public class KeychainManager implements KeychainAccessProvider {
 	 * @see #isPassphraseStored(String)
 	 */
 	public ReadOnlyBooleanProperty getPassphraseStoredProperty(String key) {
-		return passphraseStoredProperties.get(key);
+		return passphraseStoredProperties.getUnchecked(key);
 	}

 	private BooleanProperty createStoredPassphraseProperty(String key) {
@@ -9,11 +9,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;

+import static org.cryptomator.integrations.common.OperatingSystem.Value.MAC;
 import static org.cryptomator.integrations.common.OperatingSystem.Value.WINDOWS;

@OperatingSystem(WINDOWS)
+@OperatingSystem(MAC)
@CheckAvailability
-public final class GoogleDriveWindowsLocationPresetsProvider implements LocationPresetsProvider {
+public final class GoogleDriveLocationPresetsProvider implements LocationPresetsProvider {

 	private static final List<Path> LOCATIONS = Arrays.asList( //
 			LocationPresetsProvider.resolveLocation("~/GoogleDrive/My Drive"), //
@@ -35,4 +37,5 @@ public final class GoogleDriveWindowsLocationPresetsProvider implements Location
 				.findFirst() //
 				.stream();
 	}
+
 }
@@ -1,144 +0,0 @@
-package org.cryptomator.common.locationpresets;
-
-import org.cryptomator.integrations.common.CheckAvailability;
-import org.cryptomator.integrations.common.OperatingSystem;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import static org.cryptomator.integrations.common.OperatingSystem.Value.MAC;
-
-@OperatingSystem(MAC)
-@CheckAvailability
-public final class GoogleDriveMacLocationPresetsProvider implements LocationPresetsProvider {
-
-	private static final Path ROOT_LOCATION = LocationPresetsProvider.resolveLocation("~/Library/CloudStorage/").toAbsolutePath();
-	private static final Predicate<String> PATTERN = Pattern.compile("^GoogleDrive-[^/]+$").asMatchPredicate();
-
-	private static final List<Path> FALLBACK_LOCATIONS = List.of( //
-			LocationPresetsProvider.resolveLocation("~/GoogleDrive/My Drive"), //
-			LocationPresetsProvider.resolveLocation("~/Google Drive/My Drive"), //
-			LocationPresetsProvider.resolveLocation("~/GoogleDrive"), //
-			LocationPresetsProvider.resolveLocation("~/Google Drive") //
-	);
-
-	@Override
-	public Stream<LocationPreset> getLocations() {
-		List<LocationPreset> cloudStorageDirLocations = getCloudStorageDirLocations();
-		return cloudStorageDirLocations.isEmpty() ? getFallbackLocation().stream() : cloudStorageDirLocations.stream();
-
-	}
-
-	@CheckAvailability
-	public static boolean isPresent() {
-		return isRootLocationPresent() || FALLBACK_LOCATIONS.stream().anyMatch(Files::isDirectory);
-	}
-
-	/**
-	 * Checks if a root location directory is present that matches the specified pattern.
-	 * <p>
-	 * This method scans the {@code ROOT_LOCATION} directory for subdirectories and tests each one against a pre-defined pattern ({@code PATTERN}).
-	 *
-	 * @return {@code true} if a matching root location is present, otherwise {@code false}.
-	 */
-	public static boolean isRootLocationPresent() {
-		try (var dirStream = Files.list(ROOT_LOCATION)) {
-			return dirStream.anyMatch(path -> Files.isDirectory(path) && PATTERN.test(path.getFileName().toString()));
-		} catch (IOException | UncheckedIOException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns Google Drive preset String.
-	 *
-	 * @param accountPath The path to the Google Drive account directory (e.g. {@code ~/Library/CloudStorage/GoogleDrive-username})
-	 * @return {@code String}. For example: "Google Drive - username"
-	 */
-	private String getDriveLocationString(Path accountPath) {
-		String accountName = accountPath.getFileName().toString().replace("GoogleDrive-", "");
-		return "Google Drive - " + accountName;
-	}
-
-	/**
-	 * Retrieves a list of cloud storage directory locations based on the {@code ROOT_LOCATION}.
-	 * <p>
-	 * This method lists all directories in the {@code ROOT_LOCATION}, filters them based on whether their names match
-	 * a predefined pattern ({@code PATTERN}), and then extracts presets using {@code getPresetsFromAccountPath(Path)}.
-	 * <p>
-	 *
-	 * @return a list of {@code LocationPreset} objects representing valid cloud storage directory locations.
-	 */
-	private List<LocationPreset> getCloudStorageDirLocations() {
-		try (var dirStream = Files.list(ROOT_LOCATION)) {
-			return dirStream.filter(path -> Files.isDirectory(path) && PATTERN.test(path.getFileName().toString()))
-					.flatMap(this::getPresetsFromAccountPath)
-					.toList();
-		} catch (IOException | UncheckedIOException e) {
-			return List.of();
-		}
-	}
-
-	/**
-	 * Retrieves a stream of {@code LocationPreset} objects from a given Google Drive account path.
-	 * <p>
-	 * This method lists all directories within the provided {@code accountPath} and filters them
-	 * to identify folders whose names match any of the translations defined in {@code MY_DRIVE_TRANSLATIONS}.
-	 *
-	 * @param accountPath the root path of the Google Drive account to scan.
-	 * @return a stream of {@code LocationPreset} objects representing matching directories.
-	 */
-	private Stream<LocationPreset> getPresetsFromAccountPath(Path accountPath) {
-		try (var driveStream = Files.list(accountPath)) {
-			return driveStream
-					.filter(preset -> MY_DRIVE_TRANSLATIONS
-							.contains(preset.getFileName().toString()))
-					.map(drivePath -> new LocationPreset(
-							getDriveLocationString(accountPath),
-							drivePath
-					)).toList().stream();
-		} catch (IOException e) {
-			return Stream.empty();
-		}
-	}
-
-	/**
-	 * Returns a list containing a fallback location preset for Google Drive.
-	 * <p>
-	 * This method iterates through the predefined fallback locations, checks if any of them is a directory,
-	 * and creates a {@code LocationPreset} object for the first matching directory found.
-	 *
-	 * @return a list containing a single fallback location preset if a valid directory is found, otherwise an empty list.
-	 * @deprecated This method is intended for legacy support and may be removed in future releases.
-	 */
-	@Deprecated
-	private List<LocationPreset> getFallbackLocation() {
-		return FALLBACK_LOCATIONS.stream()
-				.filter(Files::isDirectory)
-				.map(location -> new LocationPreset("Google Drive", location))
-				.findFirst()
-				.stream()
-				.toList();
-	}
-
-	/**
-	 * Set of translations for "My Drive" in various languages.
-	 * <p>
-	 * This constant is used to identify different language-specific labels for "My Drive" in Google Drive.
-	 * <p>
-	 * The translations were originally extracted from the Chromium project’s Chrome OS translation files.
-	 * <p>
-	 * Source: `ui/chromeos/translations` directory in the Chromium repository.
-	 */
-	private static final Set<String> MY_DRIVE_TRANSLATIONS = Set.of("My Drive", "የእኔ Drive", "ملفاتي", "মোৰ ড্ৰাইভ", "Diskim", "Мой Дыск", "Моят диск", "আমার ড্রাইভ", "Moj disk", "La meva unitat", "Můj disk", "Mit drev", "Meine Ablage", "Το Drive μου", "Mi unidad", "Minu ketas", "Nire unitatea", "Aking Drive", "Oma Drive", "Mon disque", "Mon Drive", "A miña unidade", "મારી ડ્રાઇવ", "मेरी ड्राइव", "Saját meghajtó", "Իմ դրայվը", "Drive Saya", "Drifið mitt", "I miei file", "האחסון שלי", "マイドライブ", "ჩემი Drive", "Менің Drive дискім", "ដ្រាយរបស់ខ្ញុំ", "ನನ್ನ ಡ್ರೈವ್", "내 드라이브", "Менин Drive'ым", "Mano Diskas", "Mans disks", "Мојот Drive", "എന്റെ ഡ്രൈവ്", "Миний Драйв", "माझा ड्राइव्ह", "मेरो ड्राइभ", "Mijn Drive", "Min disk", "ମୋ ଡ୍ରାଇଭ୍", "Mój dysk", "Meu Drive", "O meu disco", "Contul meu Drive", "Мой диск", "මගේ Drive", "Môj disk", "Disku im", "Мој диск", "Min enhet", "Hifadhi Yangu", "எனது இயக்ககம்", "నా డ్రైవ్‌", "ไดรฟ์ของฉัน", "Drive'ım", "Мій диск", "میری ڈرائیو", "Drive của tôi", "我的云端硬盘", "我的雲端硬碟",  "IDrayivu yami");
-}
@@ -160,7 +160,7 @@ public class Mounter {
 		var mountService = mountProviders.stream().filter(s -> s.getClass().getName().equals(vaultSettings.mountService.getValue())).findFirst().orElse(defaultMountService.getValue());

 		if (isConflictingMountService(mountService)) {
-			var msg = mountService.getClass() + " unavailable due to conflict with either of " + CONFLICTING_MOUNT_SERVICES.get(mountService.getClass().getName());
+			var msg = STR."\{mountService.getClass()} unavailable due to conflict with either of \{CONFLICTING_MOUNT_SERVICES.get(mountService.getClass().getName())}";
 			throw new ConflictingMountServiceException(msg);
 		}

@@ -25,33 +25,30 @@ import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.NodeOrientation;
-import java.time.Instant;
 import java.util.function.Consumer;

 public class Settings {

 	private static final Logger LOG = LoggerFactory.getLogger(Settings.class);

+	static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false;
 	static final boolean DEFAULT_CHECK_FOR_UPDATES = false;
 	static final boolean DEFAULT_START_HIDDEN = false;
 	static final boolean DEFAULT_AUTO_CLOSE_VAULTS = false;
 	static final boolean DEFAULT_USE_KEYCHAIN = true;
-	static final boolean DEFAULT_USE_QUICKACCESS = true;
 	static final int DEFAULT_PORT = 42427;
 	static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
 	static final boolean DEFAULT_DEBUG_MODE = false;
 	static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
 	@Deprecated // to be changed to "whatever is available" eventually
-	static final String DEFAULT_KEYCHAIN_PROVIDER = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess" : //
-			SystemUtils.IS_OS_MAC ? "org.cryptomator.macos.keychain.MacSystemKeychainAccess" : //
-					"org.cryptomator.linux.keychain.SecretServiceKeychainAccess";
-	static final String DEFAULT_QUICKACCESS_SERVICE = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.quickaccess.ExplorerQuickAccessService" : //
-			SystemUtils.IS_OS_LINUX ? "org.cryptomator.linux.quickaccess.NautilusBookmarks" : null;
-
+	static final String DEFAULT_KEYCHAIN_PROVIDER = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess" : SystemUtils.IS_OS_MAC ? "org.cryptomator.macos.keychain.MacSystemKeychainAccess" : "org.cryptomator.linux.keychain.SecretServiceKeychainAccess";
 	static final String DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT.name();
-	public static final Instant DEFAULT_TIMESTAMP = Instant.parse("2000-01-01T00:00:00Z");
+	static final boolean DEFAULT_SHOW_MINIMIZE_BUTTON = false;
+	static final String DEFAULT_LAST_UPDATE_CHECK = "2000-01-01";

 	public final ObservableList<VaultSettings> directories;
+	public final BooleanProperty askedForUpdateCheck;
+	public final BooleanProperty checkForUpdates;
 	public final BooleanProperty startHidden;
 	public final BooleanProperty autoCloseVaults;
 	public final BooleanProperty useKeychain;
@@ -60,21 +57,17 @@ public class Settings {
 	public final BooleanProperty debugMode;
 	public final ObjectProperty<UiTheme> theme;
 	public final StringProperty keychainProvider;
-	public final BooleanProperty useQuickAccess;
-	public final StringProperty quickAccessService;
 	public final ObjectProperty<NodeOrientation> userInterfaceOrientation;
 	public final StringProperty licenseKey;
+	public final BooleanProperty showMinimizeButton;
 	public final BooleanProperty showTrayIcon;
-	public final BooleanProperty compactMode;
 	public final IntegerProperty windowXPosition;
 	public final IntegerProperty windowYPosition;
 	public final IntegerProperty windowWidth;
 	public final IntegerProperty windowHeight;
 	public final StringProperty language;
 	public final StringProperty mountService;
-	public final BooleanProperty checkForUpdates;
-	public final ObjectProperty<Instant> lastUpdateCheckReminder;
-	public final ObjectProperty<Instant> lastSuccessfulUpdateCheck;
+	public final StringProperty lastUpdateCheck;

 	private Consumer<Settings> saveCmd;

@@ -91,10 +84,11 @@ public class Settings {
 	 */
 	Settings(SettingsJson json) {
 		this.directories = FXCollections.observableArrayList(VaultSettings::observables);
+		this.askedForUpdateCheck = new SimpleBooleanProperty(this, "askedForUpdateCheck", json.askedForUpdateCheck);
+		this.checkForUpdates = new SimpleBooleanProperty(this, "checkForUpdates", json.checkForUpdatesEnabled);
 		this.startHidden = new SimpleBooleanProperty(this, "startHidden", json.startHidden);
 		this.autoCloseVaults = new SimpleBooleanProperty(this, "autoCloseVaults", json.autoCloseVaults);
 		this.useKeychain = new SimpleBooleanProperty(this, "useKeychain", json.useKeychain);
-		this.useQuickAccess = new SimpleBooleanProperty(this, "addToQuickAccess", json.useQuickAccess);
 		this.port = new SimpleIntegerProperty(this, "webDavPort", json.port);
 		this.numTrayNotifications = new SimpleIntegerProperty(this, "numTrayNotifications", json.numTrayNotifications);
 		this.debugMode = new SimpleBooleanProperty(this, "debugMode", json.debugMode);
@@ -102,28 +96,26 @@ public class Settings {
 		this.keychainProvider = new SimpleStringProperty(this, "keychainProvider", json.keychainProvider);
 		this.userInterfaceOrientation = new SimpleObjectProperty<>(this, "userInterfaceOrientation", parseEnum(json.uiOrientation, NodeOrientation.class, NodeOrientation.LEFT_TO_RIGHT));
 		this.licenseKey = new SimpleStringProperty(this, "licenseKey", json.licenseKey);
+		this.showMinimizeButton = new SimpleBooleanProperty(this, "showMinimizeButton", json.showMinimizeButton);
 		this.showTrayIcon = new SimpleBooleanProperty(this, "showTrayIcon", json.showTrayIcon);
-		this.compactMode = new SimpleBooleanProperty(this, "compactMode", json.compactMode);
 		this.windowXPosition = new SimpleIntegerProperty(this, "windowXPosition", json.windowXPosition);
 		this.windowYPosition = new SimpleIntegerProperty(this, "windowYPosition", json.windowYPosition);
 		this.windowWidth = new SimpleIntegerProperty(this, "windowWidth", json.windowWidth);
 		this.windowHeight = new SimpleIntegerProperty(this, "windowHeight", json.windowHeight);
 		this.language = new SimpleStringProperty(this, "language", json.language);
 		this.mountService = new SimpleStringProperty(this, "mountService", json.mountService);
-		this.quickAccessService = new SimpleStringProperty(this, "quickAccessService", json.quickAccessService);
-		this.checkForUpdates = new SimpleBooleanProperty(this, "checkForUpdates", json.checkForUpdatesEnabled);
-		this.lastUpdateCheckReminder = new SimpleObjectProperty<>(this, "lastUpdateCheckReminder", json.lastReminderForUpdateCheck);
-		this.lastSuccessfulUpdateCheck = new SimpleObjectProperty<>(this, "lastSuccessfulUpdateCheck", json.lastSuccessfulUpdateCheck);
+		this.lastUpdateCheck = new SimpleStringProperty(this, "lastUpdateCheck", json.lastUpdateCheck);

 		this.directories.addAll(json.directories.stream().map(VaultSettings::new).toList());

 		migrateLegacySettings(json);

 		directories.addListener(this::somethingChanged);
+		askedForUpdateCheck.addListener(this::somethingChanged);
+		checkForUpdates.addListener(this::somethingChanged);
 		startHidden.addListener(this::somethingChanged);
 		autoCloseVaults.addListener(this::somethingChanged);
 		useKeychain.addListener(this::somethingChanged);
-		useQuickAccess.addListener(this::somethingChanged);
 		port.addListener(this::somethingChanged);
 		numTrayNotifications.addListener(this::somethingChanged);
 		debugMode.addListener(this::somethingChanged);
@@ -131,18 +123,15 @@ public class Settings {
 		keychainProvider.addListener(this::somethingChanged);
 		userInterfaceOrientation.addListener(this::somethingChanged);
 		licenseKey.addListener(this::somethingChanged);
+		showMinimizeButton.addListener(this::somethingChanged);
 		showTrayIcon.addListener(this::somethingChanged);
-		compactMode.addListener(this::somethingChanged);
 		windowXPosition.addListener(this::somethingChanged);
 		windowYPosition.addListener(this::somethingChanged);
 		windowWidth.addListener(this::somethingChanged);
 		windowHeight.addListener(this::somethingChanged);
 		language.addListener(this::somethingChanged);
 		mountService.addListener(this::somethingChanged);
-		quickAccessService.addListener(this::somethingChanged);
-		checkForUpdates.addListener(this::somethingChanged);
-		lastUpdateCheckReminder.addListener(this::somethingChanged);
-		lastSuccessfulUpdateCheck.addListener(this::somethingChanged);
+		lastUpdateCheck.addListener(this::somethingChanged);
 	}

 	@SuppressWarnings("deprecation")
@@ -176,10 +165,11 @@ public class Settings {
 	SettingsJson serialized() {
 		var json = new SettingsJson();
 		json.directories = directories.stream().map(VaultSettings::serialized).toList();
+		json.askedForUpdateCheck = askedForUpdateCheck.get();
+		json.checkForUpdatesEnabled = checkForUpdates.get();
 		json.startHidden = startHidden.get();
 		json.autoCloseVaults = autoCloseVaults.get();
 		json.useKeychain = useKeychain.get();
-		json.useQuickAccess = useQuickAccess.get();
 		json.port = port.get();
 		json.numTrayNotifications = numTrayNotifications.get();
 		json.debugMode = debugMode.get();
@@ -187,18 +177,15 @@ public class Settings {
 		json.keychainProvider = keychainProvider.get();
 		json.uiOrientation = userInterfaceOrientation.get().name();
 		json.licenseKey = licenseKey.get();
+		json.showMinimizeButton = showMinimizeButton.get();
 		json.showTrayIcon = showTrayIcon.get();
-		json.compactMode = compactMode.get();
 		json.windowXPosition = windowXPosition.get();
 		json.windowYPosition = windowYPosition.get();
 		json.windowWidth = windowWidth.get();
 		json.windowHeight = windowHeight.get();
 		json.language = language.get();
 		json.mountService = mountService.get();
-		json.quickAccessService = quickAccessService.get();
-		json.checkForUpdatesEnabled = checkForUpdates.get();
-		json.lastReminderForUpdateCheck = lastUpdateCheckReminder.get();
-		json.lastSuccessfulUpdateCheck = lastSuccessfulUpdateCheck.get();
+		json.lastUpdateCheck = lastUpdateCheck.get();
 		return json;
 	}

@@ -1,11 +1,9 @@
 package org.cryptomator.common.settings;

-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

-import java.time.Instant;
 import java.util.List;

@JsonIgnoreProperties(ignoreUnknown = true)
@@ -18,9 +16,15 @@ class SettingsJson {
 	@JsonProperty("writtenByVersion")
 	String writtenByVersion;

+	@JsonProperty("askedForUpdateCheck")
+	boolean askedForUpdateCheck = Settings.DEFAULT_ASKED_FOR_UPDATE_CHECK;
+
 	@JsonProperty("autoCloseVaults")
 	boolean autoCloseVaults = Settings.DEFAULT_AUTO_CLOSE_VAULTS;

+	@JsonProperty("checkForUpdatesEnabled")
+	boolean checkForUpdatesEnabled = Settings.DEFAULT_CHECK_FOR_UPDATES;
+
 	@JsonProperty("debugMode")
 	boolean debugMode = Settings.DEFAULT_DEBUG_MODE;

@@ -45,12 +49,12 @@ class SettingsJson {
 	@JsonProperty("port")
 	int port = Settings.DEFAULT_PORT;

+	@JsonProperty("showMinimizeButton")
+	boolean showMinimizeButton = Settings.DEFAULT_SHOW_MINIMIZE_BUTTON;
+
 	@JsonProperty("showTrayIcon")
 	boolean showTrayIcon;

-	@JsonProperty("compactMode")
-	boolean compactMode;
-
 	@JsonProperty("startHidden")
 	boolean startHidden = Settings.DEFAULT_START_HIDDEN;

@@ -76,20 +80,7 @@ class SettingsJson {
 	@JsonProperty(value = "preferredVolumeImpl", access = JsonProperty.Access.WRITE_ONLY) // WRITE_ONLY means value is "written" into the java object during deserialization. Upvote this: https://github.com/FasterXML/jackson-annotations/issues/233
 	String preferredVolumeImpl;

-	@JsonProperty("checkForUpdatesEnabled")
-	boolean checkForUpdatesEnabled = Settings.DEFAULT_CHECK_FOR_UPDATES;
+	@JsonProperty("lastUpdateCheck")
+	String lastUpdateCheck = Settings.DEFAULT_LAST_UPDATE_CHECK;

-	@JsonProperty("lastReminderForUpdateCheck")
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
-	Instant lastReminderForUpdateCheck = Settings.DEFAULT_TIMESTAMP;
-
-	@JsonProperty("lastSuccessfulUpdateCheck")
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC")
-	Instant lastSuccessfulUpdateCheck = Settings.DEFAULT_TIMESTAMP;
-
-	@JsonProperty("useQuickAccess")
-	boolean useQuickAccess = Settings.DEFAULT_USE_QUICKACCESS;
-
-	@JsonProperty("quickAccessService")
-	String quickAccessService = Settings.DEFAULT_QUICKACCESS_SERVICE;
 }
@@ -10,7 +10,6 @@ package org.cryptomator.common.settings;

 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.google.common.base.Suppliers;
 import org.cryptomator.common.Environment;
 import org.slf4j.Logger;
@@ -37,7 +36,7 @@ import java.util.stream.Stream;
@Singleton
 public class SettingsProvider implements Supplier<Settings> {

-	private static final ObjectMapper JSON = new ObjectMapper().setDefaultLeniency(true).registerModule(new JavaTimeModule());
+	private static final ObjectMapper JSON = new ObjectMapper().setDefaultLeniency(true);
 	private static final Logger LOG = LoggerFactory.getLogger(SettingsProvider.class);
 	private static final long SAVE_DELAY_MS = 1000;

@@ -58,10 +57,7 @@ public class SettingsProvider implements Supplier<Settings> {
 	}

 	private Settings load() {
-		Settings settings = env.getSettingsPath() //
-				.flatMap(this::tryLoad) //
-				.findFirst() //
-				.orElseGet(() -> Settings.create(env));
+		Settings settings = env.getSettingsPath().flatMap(this::tryLoad).findFirst().orElseGet(() -> Settings.create(env));
 		settings.setSaveCmd(this::scheduleSave);
 		return settings;
 	}
@@ -11,7 +11,6 @@ package org.cryptomator.common.vaults;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Constants;
 import org.cryptomator.common.mount.Mounter;
-import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.cryptofs.CryptoFileSystemProperties;
@@ -24,9 +23,6 @@ import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
 import org.cryptomator.integrations.mount.MountFailedException;
 import org.cryptomator.integrations.mount.Mountpoint;
 import org.cryptomator.integrations.mount.UnmountFailedException;
-import org.cryptomator.integrations.quickaccess.QuickAccessService;
-import org.cryptomator.integrations.quickaccess.QuickAccessServiceException;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -44,7 +40,6 @@ import javafx.beans.property.SimpleBooleanProperty;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.ReadOnlyFileSystemException;
 import java.util.EnumSet;
 import java.util.Objects;
 import java.util.Set;
@@ -59,7 +54,6 @@ public class Vault {

 	private final VaultSettings vaultSettings;
 	private final AtomicReference<CryptoFileSystem> cryptoFileSystem;
-	private final AtomicReference<QuickAccessService.QuickAccessEntry> quickAccessEntry;
 	private final VaultState state;
 	private final ObjectProperty<Exception> lastKnownException;
 	private final VaultConfigCache configCache;
@@ -73,7 +67,6 @@ public class Vault {
 	private final BooleanBinding unknownError;
 	private final ObjectBinding<Mountpoint> mountPoint;
 	private final Mounter mounter;
-	private final Settings settings;
 	private final BooleanProperty showingStats;

 	private final AtomicReference<Mounter.MountHandle> mountHandle = new AtomicReference<>(null);
@@ -85,7 +78,7 @@ public class Vault {
 		  VaultState state, //
 		  @Named("lastKnownException") ObjectProperty<Exception> lastKnownException, //
 		  VaultStats stats, //
-		  Mounter mounter, Settings settings) {
+		  Mounter mounter) {
 		this.vaultSettings = vaultSettings;
 		this.configCache = configCache;
 		this.cryptoFileSystem = cryptoFileSystem;
@@ -101,9 +94,7 @@ public class Vault {
 		this.unknownError = Bindings.createBooleanBinding(this::isUnknownError, state);
 		this.mountPoint = Bindings.createObjectBinding(this::getMountPoint, state);
 		this.mounter = mounter;
-		this.settings = settings;
 		this.showingStats = new SimpleBooleanProperty(false);
-		this.quickAccessEntry = new AtomicReference<>(null);
 	}

 	// ******************************************************************************
@@ -112,22 +103,15 @@ public class Vault {

 	private CryptoFileSystem createCryptoFileSystem(MasterkeyLoader keyLoader) throws IOException, MasterkeyLoadingFailedException {
 		Set<FileSystemFlags> flags = EnumSet.noneOf(FileSystemFlags.class);
-		var createReadOnly = vaultSettings.usesReadOnlyMode.get();
-		try {
-			FileSystemCapabilityChecker.assertWriteAccess(getPath());
-		} catch (FileSystemCapabilityChecker.MissingCapabilityException e) {
-			if (!createReadOnly) {
-				throw new ReadOnlyFileSystemException();
-			}
-		}
-		if (createReadOnly) {
+		if (vaultSettings.usesReadOnlyMode.get()) {
 			flags.add(FileSystemFlags.READONLY);
 		} else if (vaultSettings.maxCleartextFilenameLength.get() == -1) {
 			LOG.debug("Determining cleartext filename length limitations...");
+			var checker = new FileSystemCapabilityChecker();
 			int shorteningThreshold = configCache.get().allegedShorteningThreshold();
-			int ciphertextLimit = FileSystemCapabilityChecker.determineSupportedCiphertextFileNameLength(getPath());
+			int ciphertextLimit = checker.determineSupportedCiphertextFileNameLength(getPath());
 			if (ciphertextLimit < shorteningThreshold) {
-				int cleartextLimit = FileSystemCapabilityChecker.determineSupportedCleartextFileNameLength(getPath());
+				int cleartextLimit = checker.determineSupportedCleartextFileNameLength(getPath());
 				vaultSettings.maxCleartextFilenameLength.set(cleartextLimit);
 			} else {
 				vaultSettings.maxCleartextFilenameLength.setValue(UNLIMITED_FILENAME_LENGTH);
@@ -170,9 +154,6 @@ public class Vault {
 			var rootPath = fs.getRootDirectories().iterator().next();
 			var mountHandle = mounter.mount(vaultSettings, rootPath);
 			success = this.mountHandle.compareAndSet(null, mountHandle);
-			if (settings.useQuickAccess.getValue()) {
-				addToQuickAccess();
-			}
 		} finally {
 			if (!success) {
 				destroyCryptoFileSystem();
@@ -197,7 +178,6 @@ public class Vault {
 			mountHandle.mountObj().close();
 			mountHandle.specialCleanup().run();
 		} finally {
-			removeFromQuickAccess();
 			destroyCryptoFileSystem();
 		}

@@ -205,52 +185,6 @@ public class Vault {
 		LOG.info("Locked vault '{}'", getDisplayName());
 	}

-	private synchronized void addToQuickAccess() {
-		if (quickAccessEntry.get() != null) {
-			//we don't throw an exception since we don't wanna block unlocking
-			LOG.warn("Vault already added to quick access area. Will be removed on next lock operation.");
-			return;
-		}
-
-		QuickAccessService.get() //
-				.filter(s -> s.getClass().getName().equals(settings.quickAccessService.getValue())) //
-				.findFirst() //
-				.ifPresentOrElse( //
-						this::addToQuickAccessInternal, //
-						() -> LOG.warn("Unable to add Vault to quick access area: Desired implementation not available.") //
-				);
-	}
-
-	private void addToQuickAccessInternal(@NotNull QuickAccessService s) {
-		if (getMountPoint() instanceof Mountpoint.WithPath mp) {
-			try {
-				var entry = s.add(mp.path(), getDisplayName());
-				quickAccessEntry.set(entry);
-			} catch (QuickAccessServiceException e) {
-				LOG.error("Adding vault to quick access area failed", e);
-			}
-		} else {
-			LOG.warn("Unable to add vault to quick access area: Vault is not mounted to local system path.");
-		}
-	}
-
-	private synchronized void removeFromQuickAccess() {
-		if (quickAccessEntry.get() == null) {
-			LOG.debug("Removing vault from quick access area: Entry not found, nothing to do.");
-			return;
-		}
-		removeFromQuickAccessInternal();
-	}
-
-	private void removeFromQuickAccessInternal() {
-		try {
-			quickAccessEntry.get().remove();
-			quickAccessEntry.set(null);
-		} catch (QuickAccessServiceException e) {
-			LOG.error("Removing vault from quick access area failed", e);
-		}
-	}
-
 	// ******************************************************************************
 	// Observable Properties
 	// *******************************************************************************
@@ -8,13 +8,11 @@
 *******************************************************************************/
 package org.cryptomator.common.vaults;

-import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
 import org.cryptomator.cryptofs.DirStructure;
 import org.cryptomator.cryptofs.migration.Migrators;
-import org.cryptomator.integrations.mount.MountService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -26,7 +24,6 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.List;
 import java.util.Optional;
 import java.util.ResourceBundle;

@@ -41,21 +38,14 @@ public class VaultListManager {
 	private static final Logger LOG = LoggerFactory.getLogger(VaultListManager.class);

 	private final AutoLocker autoLocker;
-	private final List<MountService> mountServices;
 	private final VaultComponent.Factory vaultComponentFactory;
 	private final ObservableList<Vault> vaultList;
 	private final String defaultVaultName;

 	@Inject
-	public VaultListManager(ObservableList<Vault> vaultList, //
-							AutoLocker autoLocker, //
-							List<MountService> mountServices,
-							VaultComponent.Factory vaultComponentFactory,
-							ResourceBundle resourceBundle,
-							Settings settings) {
+	public VaultListManager(ObservableList<Vault> vaultList, AutoLocker autoLocker, VaultComponent.Factory vaultComponentFactory, ResourceBundle resourceBundle, Settings settings) {
 		this.vaultList = vaultList;
 		this.autoLocker = autoLocker;
-		this.mountServices = mountServices;
 		this.vaultComponentFactory = vaultComponentFactory;
 		this.defaultVaultName = resourceBundle.getString("defaults.vault.vaultName");

@@ -86,15 +76,6 @@ public class VaultListManager {
 		} else {
 			vaultSettings.displayName.set(defaultVaultName);
 		}
-
-		//due to https://github.com/cryptomator/cryptomator/issues/2880#issuecomment-1680313498
-		var nameOfWinfspLocalMounter = "org.cryptomator.frontend.fuse.mount.WinFspMountProvider";
-		if (SystemUtils.IS_OS_WINDOWS //
-				&& vaultSettings.path.get().toString().contains("Dropbox") //
-				&& mountServices.stream().anyMatch(s -> s.getClass().getName().equals(nameOfWinfspLocalMounter))) {
-			vaultSettings.mountService.setValue(nameOfWinfspLocalMounter);
-		}
-
 		return vaultSettings;
 	}

@@ -9,9 +9,8 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import dagger.Lazy;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.common.SubstitutingProperties;
-import org.cryptomator.networking.SSLContextProvider;
+import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.ipc.IpcCommunicator;
 import org.cryptomator.logging.DebugMode;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
@@ -20,10 +19,8 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Singleton;
-import javax.net.ssl.SSLContext;
 import javafx.application.Application;
 import javafx.stage.Stage;
-import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -51,16 +48,14 @@ public class Cryptomator {
 	private final Environment env;
 	private final Lazy<IpcMessageHandler> ipcMessageHandler;
 	private final ShutdownHook shutdownHook;
-	private final SecureRandom csprng;

 	@Inject
-	Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook, SecureRandom csprng) {
+	Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook) {
 		this.debugMode = debugMode;
 		this.supportedLanguages = supportedLanguages;
 		this.env = env;
 		this.ipcMessageHandler = ipcMessageHandler;
 		this.shutdownHook = shutdownHook;
-		this.csprng = csprng;
 	}

 	public static void main(String[] args) {
@@ -94,7 +89,7 @@ public class Cryptomator {
 		LOG.info("Starting Cryptomator {} on {} {} ({})", env.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
 		debugMode.initialize();
 		supportedLanguages.applyPreferred();
-		changeDefaultSSLContext();
+
 		/*
 		 * Attempts to create an IPC connection to a running Cryptomator instance and sends it the given args.
 		 * If no external process could be reached, the args will be handled by the loopback IPC endpoint.
@@ -120,17 +115,6 @@ public class Cryptomator {
 		}
 	}

-	private void changeDefaultSSLContext() {
-		SSLContextProvider.loadAll().findFirst().ifPresent(p -> {
-			try {
-				var context = p.getContext(csprng);
-				SSLContext.setDefault(context);
-			} catch (SSLContextProvider.SSLContextBuildException e) {
-				LOG.warn("Failed to change default SSL context with provider {}", p.getClass().getName(), e);
-			}
-		});
-	}
-
 	/**
 	 * Launches the JavaFX application, blocking the main thread until shuts down.
 	 *
@@ -2,7 +2,6 @@ package org.cryptomator.launcher;

 import dagger.Module;
 import dagger.Provides;
-import org.cryptomator.common.Hyperlinks;
 import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.integrations.tray.TrayIntegrationProvider;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
@@ -24,12 +23,6 @@ class CryptomatorModule {
 		return ResourceBundle.getBundle("i18n.strings");
 	}

-	@Provides
-	@Singleton
-	static Hyperlinks provideHyperlinks() {
-		return Hyperlinks.load();
-	}
-
 	@Provides
 	@Singleton
 	@Named("launchEventQueue")
@@ -20,7 +20,7 @@ public class SupportedLanguages {
 	// "en" is not part of this list - it is always inserted at the top.
 	public static final List<String> LANGUAGE_TAGS = List.of("ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fr", "gl", "he", //
 			"hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "nb", "nl", "nn", "pa", "pl", "pt", "pt-BR", "ro", "ru", "sk", "sr", "sr-Latn", "sv", "sw", //
-			"ta", "th", "tr", "ug", "uk", "vi", "zh", "zh-HK", "zh-TW");
+			"ta", "th", "tr", "uk", "vi", "zh", "zh-HK", "zh-TW");
 	public static final String ENGLISH = "en";

 	private final List<String> sortedLanguageTags;
@@ -1,33 +0,0 @@
-package org.cryptomator.networking;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-
-abstract class SSLContextDifferentTrustStoreBase implements SSLContextProvider {
-
-	abstract KeyStore getTruststore() throws KeyStoreException, CertificateException, IOException, NoSuchAlgorithmException;
-
-	@Override
-	public SSLContext getContext(SecureRandom csprng) throws SSLContextBuildException {
-		try {
-			KeyStore truststore = getTruststore();
-			truststore.load(null, null);
-
-			TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-			tmf.init(truststore);
-
-			SSLContext context = SSLContext.getInstance("TLS");
-			context.init(null, tmf.getTrustManagers(), csprng);
-			return context;
-		} catch (KeyStoreException | CertificateException | NoSuchAlgorithmException | KeyManagementException | IOException e) {
-			throw new SSLContextBuildException(e);
-		}
-	}
-}
@@ -1,24 +0,0 @@
-package org.cryptomator.networking;
-
-import org.cryptomator.integrations.common.IntegrationsLoader;
-
-import javax.net.ssl.SSLContext;
-import java.security.SecureRandom;
-import java.util.ServiceLoader;
-import java.util.stream.Stream;
-
-public interface SSLContextProvider {
-
-	SSLContext getContext(SecureRandom csprng) throws SSLContextBuildException;
-
-	class SSLContextBuildException extends Exception {
-
-		SSLContextBuildException(Throwable t) {
-			super(t);
-		}
-	}
-
-	static Stream<SSLContextProvider> loadAll() {
-		return IntegrationsLoader.loadAll(ServiceLoader.load(SSLContextProvider.class), SSLContextProvider.class);
-	}
-}
@@ -1,21 +0,0 @@
-package org.cryptomator.networking;
-
-import org.cryptomator.integrations.common.OperatingSystem;
-
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-
-/**
- * SSLContextProvider for macOS using the macOS Keychain as truststore
- */
-@OperatingSystem(OperatingSystem.Value.MAC)
-public class SSLContextWithMacKeychain extends SSLContextDifferentTrustStoreBase implements SSLContextProvider {
-
-	@Override
-	KeyStore getTruststore() throws KeyStoreException, CertificateException, IOException, NoSuchAlgorithmException {
-		return KeyStore.getInstance("KeychainStore-ROOT");
-	}
-}
@@ -1,42 +0,0 @@
-package org.cryptomator.networking;
-
-import org.cryptomator.integrations.common.CheckAvailability;
-import org.cryptomator.integrations.common.OperatingSystem;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.util.Optional;
-
-/**
- * SSLContextProvider for Linux using a PKCS#12 file as trust store
- */
-@OperatingSystem(OperatingSystem.Value.LINUX)
-@CheckAvailability
-public class SSLContextWithPKCS12TrustStore extends SSLContextDifferentTrustStoreBase implements SSLContextProvider {
-
-	private static final String CERT_FILE_LOCATION_PROPERTY = "cryptomator.networking.truststore.p12Path";
-
-	@Override
-	KeyStore getTruststore() throws KeyStoreException, CertificateException, IOException, NoSuchAlgorithmException {
-		var pkcs12FilePath = Path.of(System.getProperty(CERT_FILE_LOCATION_PROPERTY));
-		try {
-			return KeyStore.getInstance(pkcs12FilePath.toFile(), new char[]{});
-		} catch (IllegalArgumentException e) {
-			throw new NoSuchFileException(pkcs12FilePath.toString());
-		}
-	}
-
-	@CheckAvailability
-	public static boolean isSupported() {
-		var pkcs12Path = System.getProperty(CERT_FILE_LOCATION_PROPERTY);
-		return Optional.ofNullable(pkcs12Path) //
-				.map(Path::of) //
-				.map(Files::exists).orElse(false);
-	}
-}
@@ -1,21 +0,0 @@
-package org.cryptomator.networking;
-
-import org.cryptomator.integrations.common.OperatingSystem;
-
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-
-/**
- * SSLContextProvider for Windows using the Windows certificate store as trust store
- * <p>
- * In order to work, the jdk.crypto.mscapi jmod is needed
- */
-@OperatingSystem(OperatingSystem.Value.WINDOWS)
-public class SSLContextWithWindowsCertStore extends SSLContextDifferentTrustStoreBase implements SSLContextProvider {
-
-	@Override
-	KeyStore getTruststore() throws KeyStoreException {
-		return KeyStore.getInstance("WINDOWS-ROOT");
-	}
-
-}
@@ -40,6 +40,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.concurrent.ExecutorService;
@@ -49,7 +50,7 @@ public class CreateNewVaultLocationController implements FxController {

 	private static final Logger LOG = LoggerFactory.getLogger(CreateNewVaultLocationController.class);
 	private static final Path DEFAULT_CUSTOM_VAULT_PATH = Paths.get(System.getProperty("user.home"));
-	private static final String TEMP_FILE_PREFIX = ".locationTest.cryptomator";
+	private static final String TEMP_FILE_FORMAT = ".locationTest.cryptomator.tmp";

 	private final Stage window;
 	private final Lazy<Scene> chooseNameScene;
@@ -125,19 +126,16 @@ public class CreateNewVaultLocationController implements FxController {


 	private boolean isActuallyWritable(Path p) {
-		Path tmpDir = null;
-		try {
-			tmpDir = Files.createTempDirectory(p, TEMP_FILE_PREFIX );
+		Path tmpFile = p.resolve(TEMP_FILE_FORMAT);
+		try (var chan = Files.newByteChannel(tmpFile, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE, StandardOpenOption.DELETE_ON_CLOSE)) {
 			return true;
 		} catch (IOException e) {
 			return false;
 		} finally {
-			if (tmpDir != null) {
-				try {
-					Files.deleteIfExists(tmpDir);
-				} catch (IOException e) {
-					LOG.warn("Unable to delete temporary directory {}. Needs to be deleted manually.", tmpDir);
-				}
+			try {
+				Files.deleteIfExists(tmpFile);
+			} catch (IOException e) {
+				LOG.warn("Unable to delete temporary file {}. Needs to be deleted manually.", tmpFile);
 			}
 		}
 	}
@@ -44,8 +44,8 @@ public enum FxmlFile {
 	RECOVERYKEY_RESET_PASSWORD("/fxml/recoverykey_reset_password.fxml"), //
 	RECOVERYKEY_RESET_PASSWORD_SUCCESS("/fxml/recoverykey_reset_password_success.fxml"), //
 	RECOVERYKEY_SUCCESS("/fxml/recoverykey_success.fxml"), //
+	REMOVE_VAULT("/fxml/remove_vault.fxml"), //
 	SHARE_VAULT("/fxml/share_vault.fxml"), //
-	SIMPLE_DIALOG("/fxml/simple_dialog.fxml"), //
 	UPDATE_REMINDER("/fxml/update_reminder.fxml"), //
 	UNLOCK_ENTER_PASSWORD("/fxml/unlock_enter_password.fxml"),
 	UNLOCK_REQUIRES_RESTART("/fxml/unlock_requires_restart.fxml"), //
@@ -17,7 +17,6 @@ public enum FontAwesome5Icon {
 	COGS("\uF085"), //
 	COPY("\uF0C5"), //
 	CROWN("\uF521"), //
-	DONATE("\uF4B9"), //
 	EDIT("\uF044"), //
 	EXCHANGE_ALT("\uF362"), //
 	EXCLAMATION("\uF12A"), //
@@ -50,7 +49,6 @@ public enum FontAwesome5Icon {
 	SEARCH("\uF002"), //
 	SHARE("\uF064"), //
 	SPINNER("\uF110"), //
-	SPONSORS("\uF2B5"), //
 	STETHOSCOPE("\uF0f1"), //
 	SYNC("\uF021"), //
 	TIMES("\uF00D"), //
@@ -1,96 +0,0 @@
-package org.cryptomator.ui.controls;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.VBox;
-
-public class NotificationBar extends HBox {
-
-	@FXML
-	private Label notificationLabel;
-
-	private final BooleanProperty dismissable = new SimpleBooleanProperty();
-	private final BooleanProperty notify = new SimpleBooleanProperty();
-
-
-	public NotificationBar() {
-		setAlignment(Pos.CENTER);
-		setStyle("-fx-alignment: center;");
-
-		Region spacer = new Region();
-		spacer.setMinWidth(40);
-
-		Region leftRegion = new Region();
-		HBox.setHgrow(leftRegion, javafx.scene.layout.Priority.ALWAYS);
-
-		Region rightRegion = new Region();
-		HBox.setHgrow(rightRegion, javafx.scene.layout.Priority.ALWAYS);
-
-		VBox vbox = new VBox();
-		vbox.setAlignment(Pos.CENTER);
-		HBox.setHgrow(vbox, javafx.scene.layout.Priority.ALWAYS);
-
-		notificationLabel = new Label();
-		notificationLabel.getStyleClass().add("notification-label");
-		notificationLabel.setStyle("-fx-alignment: center;");
-		vbox.getChildren().add(notificationLabel);
-
-		Button closeButton = new Button("X");
-		closeButton.setMinWidth(40);
-		closeButton.setStyle("-fx-background-color: transparent; -fx-text-fill: white; -fx-font-weight: bold;");
-		closeButton.visibleProperty().bind(dismissable);
-
-		closeButton.setOnAction(_ -> {
-			visibleProperty().unbind();
-			managedProperty().unbind();
-			visibleProperty().set(false);
-			managedProperty().set(false);
-		});
-		closeButton.visibleProperty().bind(dismissable);
-
-		getChildren().addAll(spacer, leftRegion, vbox, rightRegion, closeButton);
-
-		visibleProperty().bind(notifyProperty());
-		managedProperty().bind(notifyProperty());
-	}
-
-	public String getText() {
-		return notificationLabel.getText();
-	}
-
-	public void setText(String text) {
-		notificationLabel.setText(text);
-	}
-
-	public void setStyleClass(String styleClass) {
-		getStyleClass().clear();
-		getStyleClass().add(styleClass);
-	}
-
-	public boolean isDismissable() {
-		return dismissable.get();
-	}
-
-	public void setDismissable(boolean value) {
-		dismissable.set(value);
-	}
-
-	public boolean getNotify() {
-		return notify.get();
-	}
-
-	public void setNotify(boolean value) {
-		notify.set(value);
-	}
-
-	public BooleanProperty notifyProperty() {
-		return notify;
-	}
-
-}
@@ -1,90 +0,0 @@
-package org.cryptomator.ui.dialogs;
-
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.StageFactory;
-import org.cryptomator.ui.controls.FontAwesome5Icon;
-import org.cryptomator.ui.fxapp.FxApplicationScoped;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javafx.collections.ObservableList;
-import javafx.stage.Stage;
-import java.util.ResourceBundle;
-import java.util.function.Consumer;
-
-@FxApplicationScoped
-public class Dialogs {
-
-	private final ResourceBundle resourceBundle;
-	private final StageFactory stageFactory;
-
-	@Inject
-	public Dialogs(ResourceBundle resourceBundle, StageFactory stageFactory) {
-		this.resourceBundle = resourceBundle;
-		this.stageFactory = stageFactory;
-	}
-
-	private static final Logger LOG = LoggerFactory.getLogger(Dialogs.class);
-
-	private SimpleDialog.Builder createDialogBuilder() {
-		return new SimpleDialog.Builder(resourceBundle, stageFactory);
-	}
-
-	public SimpleDialog.Builder prepareRemoveVaultDialog(Stage window, Vault vault, ObservableList<Vault> vaults) {
-		return createDialogBuilder().setOwner(window) //
-				.setTitleKey("removeVault.title", vault.getDisplayName()) //
-				.setMessageKey("removeVault.message") //
-				.setDescriptionKey("removeVault.description") //
-				.setIcon(FontAwesome5Icon.QUESTION) //
-				.setOkButtonKey("removeVault.confirmBtn") //
-				.setCancelButtonKey("generic.button.cancel") //
-				.setOkAction(stage -> {
-					LOG.debug("Removing vault {}.", vault.getDisplayName());
-					vaults.remove(vault);
-					stage.close();
-				});
-	}
-
-	public SimpleDialog.Builder prepareRemoveCertDialog(Stage window, Settings settings) {
-		return createDialogBuilder() //
-				.setOwner(window) //
-				.setTitleKey("removeCert.title") //
-				.setMessageKey("removeCert.message") //
-				.setDescriptionKey("removeCert.description") //
-				.setIcon(FontAwesome5Icon.QUESTION) //
-				.setOkButtonKey("removeCert.confirmBtn") //
-				.setCancelButtonKey("generic.button.cancel") //
-				.setOkAction(stage -> {
-					settings.licenseKey.set(null);
-					stage.close();
-				});
-	}
-
-	public SimpleDialog.Builder prepareDokanySupportEndDialog(Stage window, Consumer<Stage> cancelAction) {
-		return createDialogBuilder() //
-				.setOwner(window) //
-				.setTitleKey("dokanySupportEnd.title") //
-				.setMessageKey("dokanySupportEnd.message") //
-				.setDescriptionKey("dokanySupportEnd.description") //
-				.setIcon(FontAwesome5Icon.EXCLAMATION) //
-				.setOkButtonKey("generic.button.close") //
-				.setCancelButtonKey("dokanySupportEnd.preferencesBtn") //
-				.setOkAction(Stage::close) //
-				.setCancelAction(cancelAction);
-	}
-
-	public SimpleDialog.Builder prepareRetryIfReadonlyDialog(Stage window, Consumer<Stage> okAction) {
-		return createDialogBuilder() //
-				.setOwner(window) //
-				.setTitleKey("retryIfReadonly.title") //
-				.setMessageKey("retryIfReadonly.message") //
-				.setDescriptionKey("retryIfReadonly.description") //
-				.setIcon(FontAwesome5Icon.EXCLAMATION) //
-				.setOkButtonKey("retryIfReadonly.retry") //
-				.setCancelButtonKey("generic.button.close") //
-				.setOkAction(okAction) //
-				.setCancelAction(Stage::close);
-	}
-}
@@ -1,140 +0,0 @@
-package org.cryptomator.ui.dialogs;
-
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlLoaderFactory;
-import org.cryptomator.ui.common.StageFactory;
-import org.cryptomator.ui.controls.FontAwesome5Icon;
-
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.IllegalFormatException;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import java.util.function.Consumer;
-
-public class SimpleDialog {
-
-	private final ResourceBundle resourceBundle;
-	private final Stage dialogStage;
-
-	SimpleDialog(Builder builder) throws IOException {
-		this.resourceBundle = builder.resourceBundle;
-		dialogStage = builder.stageFactory.create();
-		dialogStage.initOwner(builder.owner);
-		dialogStage.initModality(Modality.WINDOW_MODAL);
-		dialogStage.setTitle(resolveText(builder.titleKey, builder.titleArgs));
-		dialogStage.setResizable(false);
-
-		FxmlLoaderFactory loaderFactory = FxmlLoaderFactory.forController( //
-				new SimpleDialogController(resolveText(builder.messageKey, null), //
-						resolveText(builder.descriptionKey, null), //
-						builder.icon, resolveText(builder.okButtonKey, null), //
-						resolveText(builder.cancelButtonKey, null), //
-						() -> builder.okAction.accept(dialogStage), //
-						() -> builder.cancelAction.accept(dialogStage)), //
-				Scene::new, builder.resourceBundle);
-
-		dialogStage.setScene(new Scene(loaderFactory.load(FxmlFile.SIMPLE_DIALOG.getRessourcePathString()).getRoot()));
-	}
-
-	public void showAndWait() {
-		dialogStage.showAndWait();
-	}
-
-	private String resolveText(String key, String[] args) {
-		if (key == null || key.isEmpty() || !resourceBundle.containsKey(key)) {
-			throw new IllegalArgumentException(String.format("Invalid key: '%s'. Key not found in ResourceBundle.", key));
-		}
-		String text = resourceBundle.getString(key);
-		try {
-			return args != null && args.length > 0 ? String.format(text, (Object[]) args) : text;
-		} catch (IllegalFormatException e) {
-			throw new IllegalArgumentException("Formatting error: Check if arguments match placeholders in the text.", e);
-		}
-	}
-
-	public static class Builder {
-
-		private Stage owner;
-		private final ResourceBundle resourceBundle;
-		private final StageFactory stageFactory;
-		private String titleKey;
-		private String[] titleArgs;
-		private String messageKey;
-		private String descriptionKey;
-		private String okButtonKey;
-		private String cancelButtonKey;
-
-		private FontAwesome5Icon icon;
-		private Consumer<Stage> okAction = Stage::close;
-		private Consumer<Stage> cancelAction = Stage::close;
-
-		public Builder(ResourceBundle resourceBundle, StageFactory stageFactory) {
-			this.resourceBundle = resourceBundle;
-			this.stageFactory = stageFactory;
-		}
-
-		public Builder setOwner(Stage owner) {
-			this.owner = owner;
-			return this;
-		}
-
-		public Builder setTitleKey(String titleKey, String... args) {
-			this.titleKey = titleKey;
-			this.titleArgs = args;
-			return this;
-		}
-
-		public Builder setMessageKey(String messageKey) {
-			this.messageKey = messageKey;
-			return this;
-		}
-
-		public Builder setDescriptionKey(String descriptionKey) {
-			this.descriptionKey = descriptionKey;
-			return this;
-		}
-
-		public Builder setIcon(FontAwesome5Icon icon) {
-			this.icon = icon;
-			return this;
-		}
-
-		public Builder setOkButtonKey(String okButtonKey) {
-			this.okButtonKey = okButtonKey;
-			return this;
-		}
-
-		public Builder setCancelButtonKey(String cancelButtonKey) {
-			this.cancelButtonKey = cancelButtonKey;
-			return this;
-		}
-
-		public Builder setOkAction(Consumer<Stage> okAction) {
-			this.okAction = okAction;
-			return this;
-		}
-
-		public Builder setCancelAction(Consumer<Stage> cancelAction) {
-			this.cancelAction = cancelAction;
-			return this;
-		}
-
-		public SimpleDialog build() {
-			Objects.requireNonNull(titleKey, "SimpleDialog titleKey must be set.");
-			Objects.requireNonNull(messageKey, "SimpleDialog messageKey must be set.");
-			Objects.requireNonNull(descriptionKey, "SimpleDialog descriptionKey must be set.");
-			Objects.requireNonNull(okButtonKey, "SimpleDialog okButtonKey must be set.");
-			Objects.requireNonNull(cancelButtonKey, "SimpleDialog cancelButtonKey must be set.");
-
-			try {
-				return new SimpleDialog(this);
-			} catch (IOException e) {
-				throw new UncheckedIOException("Failed to create SimpleDialog.", e);
-			}
-		}
-	}
-}
@@ -1,61 +0,0 @@
-package org.cryptomator.ui.dialogs;
-
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.controls.FontAwesome5Icon;
-
-import javafx.fxml.FXML;
-
-public class SimpleDialogController implements FxController {
-
-	private final String message;
-	private final String description;
-	private final FontAwesome5Icon icon;
-	private final String okButtonText;
-	private final String cancelButtonText;
-	private final Runnable okAction;
-	private final Runnable cancelAction;
-
-	public SimpleDialogController(String message, String description, FontAwesome5Icon icon, String okButtonText, String cancelButtonText, Runnable okAction, Runnable cancelAction) {
-		this.message = message;
-		this.description = description;
-		this.icon = icon;
-		this.okButtonText = okButtonText;
-		this.cancelButtonText = cancelButtonText;
-		this.okAction = okAction;
-		this.cancelAction = cancelAction;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public FontAwesome5Icon getIcon() {
-		return icon;
-	}
-
-	public String getOkButtonText() {
-		return okButtonText;
-	}
-
-	public String getCancelButtonText() {
-		return cancelButtonText;
-	}
-
-	@FXML
-	private void handleOk() {
-		if (okAction != null) {
-			okAction.run();
-		}
-	}
-
-	@FXML
-	private void handleCancel() {
-		if (cancelAction != null) {
-			cancelAction.run();
-		}
-	}
-}
@@ -20,8 +20,6 @@ public interface ErrorComponent {
 	default Stage show() {
 		Stage stage = window();
 		stage.setScene(scene());
-		stage.setMinWidth(420);
-		stage.setMinHeight(300);
 		stage.show();
 		return stage;
 	}
@@ -3,7 +3,6 @@ package org.cryptomator.ui.fxapp;
 import dagger.Lazy;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,8 +10,6 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.application.Platform;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.concurrent.TimeUnit;

@FxApplicationScoped
@@ -74,35 +71,11 @@ public class FxApplication {
 			return null;
 		});

-		var time14DaysAgo = Instant.now().minus(Duration.ofDays(14));
-		if (!environment.disableUpdateCheck() //
-				&& !settings.checkForUpdates.getValue() //
-				&& settings.lastSuccessfulUpdateCheck.get().isBefore(time14DaysAgo) //
-				&& settings.lastUpdateCheckReminder.get().isBefore(time14DaysAgo)) {
-			appWindows.showUpdateReminderWindow();
+		if (!environment.disableUpdateCheck()) {
+			appWindows.checkAndShowUpdateReminderWindow();
 		}

-		migrateAndInformDokanyRemoval();
-
 		launchEventHandler.startHandlingLaunchEvents();
 		autoUnlocker.tryUnlockForTimespan(2, TimeUnit.MINUTES);
 	}
-
-	private void migrateAndInformDokanyRemoval() {
-		var dokanyProviderId = "org.cryptomator.frontend.dokany.mount.DokanyMountProvider";
-		boolean dokanyFound = false;
-		if (settings.mountService.getValueSafe().equals(dokanyProviderId)) {
-			dokanyFound = true;
-			settings.mountService.set(null);
-		}
-		for (VaultSettings vaultSettings : settings.directories) {
-			if (vaultSettings.mountService.getValueSafe().equals(dokanyProviderId)) {
-				dokanyFound = true;
-				vaultSettings.mountService.set(null);
-			}
-		}
-		if (dokanyFound) {
-			appWindows.showDokanySupportEndWindow();
-		}
-	}
 }
@@ -5,7 +5,6 @@ import dagger.Lazy;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.integrations.tray.TrayIntegrationProvider;
-import org.cryptomator.ui.dialogs.Dialogs;
 import org.cryptomator.ui.error.ErrorComponent;
 import org.cryptomator.ui.lock.LockComponent;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
@@ -48,43 +47,40 @@ public class FxApplicationWindows {
 	private final Lazy<PreferencesComponent> preferencesWindow;
 	private final QuitComponent.Builder quitWindowBuilder;
 	private final UnlockComponent.Factory unlockWorkflowFactory;
-	private final UpdateReminderComponent.Factory updateReminderWindowFactory;
+	private final UpdateReminderComponent.Factory updateReminderWindowBuilder;
 	private final LockComponent.Factory lockWorkflowFactory;
 	private final ErrorComponent.Factory errorWindowFactory;
 	private final ExecutorService executor;
 	private final VaultOptionsComponent.Factory vaultOptionsWindow;
 	private final ShareVaultComponent.Factory shareVaultWindow;
 	private final FilteredList<Window> visibleWindows;
-	private final Dialogs dialogs;

 	@Inject
-	public FxApplicationWindows(@PrimaryStage Stage primaryStage, //
+	public FxApplicationWindows(@PrimaryStage Stage primaryStage,
 								Optional<TrayIntegrationProvider> trayIntegration, //
 								Lazy<MainWindowComponent> mainWindow, //
 								Lazy<PreferencesComponent> preferencesWindow, //
 								QuitComponent.Builder quitWindowBuilder, //
 								UnlockComponent.Factory unlockWorkflowFactory, //
-								UpdateReminderComponent.Factory updateReminderWindowFactory, //
+								UpdateReminderComponent.Factory updateReminderWindowBuilder, //
 								LockComponent.Factory lockWorkflowFactory, //
 								ErrorComponent.Factory errorWindowFactory, //
 								VaultOptionsComponent.Factory vaultOptionsWindow, //
 								ShareVaultComponent.Factory shareVaultWindow, //
-								ExecutorService executor, //
-								Dialogs dialogs) {
+								ExecutorService executor) {
 		this.primaryStage = primaryStage;
 		this.trayIntegration = trayIntegration;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
 		this.quitWindowBuilder = quitWindowBuilder;
 		this.unlockWorkflowFactory = unlockWorkflowFactory;
-		this.updateReminderWindowFactory = updateReminderWindowFactory;
+		this.updateReminderWindowBuilder = updateReminderWindowBuilder;
 		this.lockWorkflowFactory = lockWorkflowFactory;
 		this.errorWindowFactory = errorWindowFactory;
 		this.executor = executor;
 		this.vaultOptionsWindow = vaultOptionsWindow;
 		this.shareVaultWindow = shareVaultWindow;
 		this.visibleWindows = Window.getWindows().filtered(Window::isShowing);
-		this.dialogs = dialogs;
 	}

 	public void initialize() {
@@ -142,18 +138,8 @@ public class FxApplicationWindows {
 			CompletableFuture.runAsync(() -> quitWindowBuilder.build().showQuitWindow(response,forced), Platform::runLater);
 	}

-	public void showUpdateReminderWindow() {
-		CompletableFuture.runAsync(() -> updateReminderWindowFactory.create().showUpdateReminderWindow(), Platform::runLater);
-	}
-
-	public void showDokanySupportEndWindow() {
-		CompletableFuture.runAsync(() -> dialogs.prepareDokanySupportEndDialog(
-				mainWindow.get().window(),
-				stage -> {
-					showPreferencesWindow(SelectedPreferencesTab.VOLUME);
-					stage.close();
-				}
-		).build().showAndWait(), Platform::runLater);
+	public void checkAndShowUpdateReminderWindow() {
+		CompletableFuture.runAsync(() -> updateReminderWindowBuilder.create().checkAndShowUpdateReminderWindow(), Platform::runLater);
 	}

 	public CompletionStage<Void> startUnlockWorkflow(Vault vault, @Nullable Stage owner) {
@@ -1,57 +1,45 @@
 package org.cryptomator.ui.fxapp;

 import org.cryptomator.common.Environment;
-import org.cryptomator.common.SemVerComparator;
 import org.cryptomator.common.settings.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
-import javafx.beans.binding.Bindings;
+import javax.inject.Named;
 import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyStringProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Worker;
 import javafx.concurrent.WorkerStateEvent;
 import javafx.util.Duration;
-import java.time.Instant;
 import java.util.Comparator;

@FxApplicationScoped
 public class UpdateChecker {

 	private static final Logger LOG = LoggerFactory.getLogger(UpdateChecker.class);
-	private static final Duration AUTO_CHECK_DELAY = Duration.seconds(5);
+	private static final Duration AUTOCHECK_DELAY = Duration.seconds(5);

 	private final Environment env;
 	private final Settings settings;
-	private final StringProperty latestVersion = new SimpleStringProperty();
+	private final StringProperty latestVersionProperty;
+	private final Comparator<String> semVerComparator;
 	private final ScheduledService<String> updateCheckerService;
-	private final ObjectProperty<UpdateCheckState> state = new SimpleObjectProperty<>(UpdateCheckState.NOT_CHECKED);
-	private final ObjectProperty<Instant> lastSuccessfulUpdateCheck;
-	private final Comparator<String> versionComparator = new SemVerComparator();
-	private final BooleanBinding updateAvailable;
-	private final BooleanBinding checkFailed;

 	@Inject
-	UpdateChecker(Settings settings, //
-				  Environment env, //
-				  ScheduledService<String> updateCheckerService) {
+	UpdateChecker(Settings settings, Environment env, @Named("latestVersion") StringProperty latestVersionProperty, @Named("SemVer") Comparator<String> semVerComparator, ScheduledService<String> updateCheckerService) {
 		this.env = env;
 		this.settings = settings;
+		this.latestVersionProperty = latestVersionProperty;
+		this.semVerComparator = semVerComparator;
 		this.updateCheckerService = updateCheckerService;
-		this.lastSuccessfulUpdateCheck = settings.lastSuccessfulUpdateCheck;
-		this.updateAvailable = Bindings.createBooleanBinding(this::isUpdateAvailable, latestVersion);
-		this.checkFailed = Bindings.equal(UpdateCheckState.CHECK_FAILED, state);
 	}

 	public void automaticallyCheckForUpdatesIfEnabled() {
 		if (!env.disableUpdateCheck() && settings.checkForUpdates.get()) {
-			startCheckingForUpdates(AUTO_CHECK_DELAY);
+			startCheckingForUpdates(AUTOCHECK_DELAY);
 		}
 	}

@@ -71,65 +59,36 @@ public class UpdateChecker {

 	private void checkStarted(WorkerStateEvent event) {
 		LOG.debug("Checking for updates...");
-		state.set(UpdateCheckState.IS_CHECKING);
 	}

 	private void checkSucceeded(WorkerStateEvent event) {
-		var latestVersionString = updateCheckerService.getValue();
-		LOG.info("Current version: {}, latest version: {}", getCurrentVersion(), latestVersionString);
-		lastSuccessfulUpdateCheck.set(Instant.now());
-		latestVersion.set(latestVersionString);
-		state.set(UpdateCheckState.CHECK_SUCCESSFUL);
+		String latestVersion = updateCheckerService.getValue();
+		LOG.info("Current version: {}, lastest version: {}", getCurrentVersion(), latestVersion);
+
+		if (semVerComparator.compare(getCurrentVersion(), latestVersion) < 0) {
+			// update is available
+			latestVersionProperty.set(latestVersion);
+		} else {
+			latestVersionProperty.set(null);
+		}
 	}

 	private void checkFailed(WorkerStateEvent event) {
-		state.set(UpdateCheckState.CHECK_FAILED);
-	}
-
-	public enum UpdateCheckState {
-		NOT_CHECKED,
-		IS_CHECKING,
-		CHECK_SUCCESSFUL,
-		CHECK_FAILED;
+		LOG.warn("Error checking for updates", event.getSource().getException());
 	}

 	/* Observable Properties */
+
 	public BooleanBinding checkingForUpdatesProperty() {
 		return updateCheckerService.stateProperty().isEqualTo(Worker.State.RUNNING);
 	}

 	public ReadOnlyStringProperty latestVersionProperty() {
-		return latestVersion;
-	}
-
-	public BooleanBinding updateAvailableProperty() {
-		return updateAvailable;
-	}
-
-	public BooleanBinding checkFailedProperty() {
-		return checkFailed;
-	}
-
-	public boolean isUpdateAvailable() {
-		String currentVersion = getCurrentVersion();
-		String latestVersionString = latestVersion.get();
-
-		if (currentVersion == null || latestVersionString == null) {
-			return false;
-		} else {
-			return versionComparator.compare(currentVersion, latestVersionString) < 0;
-		}
-	}
-
-	public ObjectProperty<Instant> lastSuccessfulUpdateCheckProperty() {
-		return lastSuccessfulUpdateCheck;
-	}
-
-	public ObjectProperty<UpdateCheckState> updateCheckStateProperty() {
-		return state;
+		return latestVersionProperty;
 	}

 	public String getCurrentVersion() {
 		return env.getAppVersion();
 	}
+
 }
@@ -11,6 +11,8 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
@@ -30,6 +32,13 @@ public abstract class UpdateCheckerModule {
 	private static final Duration UPDATE_CHECK_INTERVAL = Duration.hours(3);
 	private static final Duration DISABLED_UPDATE_CHECK_INTERVAL = Duration.hours(100000); // Duration.INDEFINITE leads to overflows...

+	@Provides
+	@Named("latestVersion")
+	@FxApplicationScoped
+	static StringProperty provideLatestVersion() {
+		return new SimpleStringProperty();
+	}
+
 	@Provides
 	@FxApplicationScoped
 	static Optional<HttpClient> provideHttpClient() {
@@ -25,8 +25,6 @@ public interface HealthCheckComponent {
 	default Stage showHealthCheckWindow() {
 		Stage stage = window();
 		stage.setScene(startScene().get());
-		stage.setMinWidth(420);
-		stage.setMinHeight(300);
 		stage.show();
 		return stage;
 	}
@@ -20,7 +20,7 @@ public class HubConfig {
 	public String devicesResourceUrl;

 	/**
-	 * A collection of functions to construct URIs related to this Hub instance.
+	 * A collection of String template processors to construct URIs related to this Hub instance.
 	 */
 	@JsonIgnore
 	public final URIProcessors URIs = new URIProcessors();
@@ -49,20 +49,14 @@ public class HubConfig {

 	public class URIProcessors {

-		public final URIProcessor API = this::fromApiEndpoint;
-
 		/**
 		 * Resolves paths relative to the <code>/api/</code> endpoint of this Hub instance.
 		 */
-		public URI fromApiEndpoint(String path) {
+		public final StringTemplate.Processor<URI, RuntimeException> API = template -> {
+			var path = template.interpolate();
 			var relPath = path.startsWith("/") ? path.substring(1) : path;
 			return getApiBaseUrl().resolve(relPath);
-		}
-	}
+		};

-	@FunctionalInterface
-	public interface URIProcessor {
-
-		URI resolve(String path);
 	}
 }
@@ -88,7 +88,7 @@ public class ReceiveKeyController implements FxController {
 	 * STEP 0 (Request): GET /api/config
 	 */
 	private void requestApiConfig() {
-		var configUri = hubConfig.URIs.API.resolve("config");
+		var configUri = hubConfig.URIs.API."config";
 		var request = HttpRequest.newBuilder(configUri) //
 				.GET() //
 				.timeout(REQ_TIMEOUT) //
@@ -122,7 +122,7 @@ public class ReceiveKeyController implements FxController {
 	 * STEP 1 (Request): GET user key for this device
 	 */
 	private void requestDeviceData() {
-		var deviceUri = hubConfig.URIs.API.resolve("devices/" + deviceId);
+		var deviceUri = hubConfig.URIs.API."devices/\{deviceId}";
 		var request = HttpRequest.newBuilder(deviceUri) //
 				.header("Authorization", "Bearer " + bearerToken) //
 				.GET() //
@@ -162,7 +162,7 @@ public class ReceiveKeyController implements FxController {
 	 * STEP 2 (Request): GET vault key for this user
 	 */
 	private void requestVaultMasterkey(String encryptedUserKey) {
-		var vaultKeyUri = hubConfig.URIs.API.resolve("vaults/" + vaultId + "/access-token");
+		var vaultKeyUri = hubConfig.URIs.API."vaults/\{vaultId}/access-token";
 		var request = HttpRequest.newBuilder(vaultKeyUri) //
 				.header("Authorization", "Bearer " + bearerToken) //
 				.GET() //
@@ -205,7 +205,7 @@ public class ReceiveKeyController implements FxController {
 	 */
 	@Deprecated
 	private void requestLegacyAccessToken() {
-		var legacyAccessTokenUri = hubConfig.URIs.API.resolve("vaults/" + vaultId + "/keys/" + deviceId);
+		var legacyAccessTokenUri = hubConfig.URIs.API."vaults/\{vaultId}/keys/\{deviceId}";
 		var request = HttpRequest.newBuilder(legacyAccessTokenUri) //
 				.header("Authorization", "Bearer " + bearerToken) //
 				.GET() //
@@ -115,7 +115,7 @@ public class RegisterDeviceController implements FxController {
 		workInProgress.set(true);


-		var userReq = HttpRequest.newBuilder(hubConfig.URIs.API.resolve("users/me")) //
+		var userReq = HttpRequest.newBuilder(hubConfig.URIs.API."users/me") //
 				.GET() //
 				.timeout(REQ_TIMEOUT) //
 				.header("Authorization", "Bearer " + bearerToken) //
@@ -143,7 +143,7 @@ public class RegisterDeviceController implements FxController {
 					var now = Instant.now().toString();
 					var dto = new CreateDeviceDto(deviceId, deviceNameField.getText(), BaseEncoding.base64().encode(deviceKeyPair.getPublic().getEncoded()), "DESKTOP", jwe.serialize(), now);
 					var json = toJson(dto);
-					var deviceUri = hubConfig.URIs.fromApiEndpoint("devices/" + deviceId);
+					var deviceUri = hubConfig.URIs.API."devices/\{deviceId}";
 					var putDeviceReq = HttpRequest.newBuilder(deviceUri) //
 							.PUT(HttpRequest.BodyPublishers.ofString(json, StandardCharsets.UTF_8)) //
 							.timeout(REQ_TIMEOUT) //
@@ -164,7 +164,7 @@ public class RegisterDeviceController implements FxController {
 	private void migrateLegacyDevices(ECPublicKey userPublicKey) {
 		try {
 			// GET legacy access tokens
-			var getUri = hubConfig.URIs.API.resolve("devices/" + deviceId + "/legacy-access-tokens");
+			var getUri = hubConfig.URIs.API."devices/\{deviceId}/legacy-access-tokens";
 			var getReq = HttpRequest.newBuilder(getUri).GET().timeout(REQ_TIMEOUT).header("Authorization", "Bearer " + bearerToken).build();
 			var getRes = httpClient.send(getReq, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
 			if (getRes.statusCode() != 200) {
@@ -185,12 +185,12 @@ public class RegisterDeviceController implements FxController {
 					LOG.warn("Failed to decrypt legacy access token for vault {}. Skipping migration.", entry.getKey());
 				}
 			}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-			var postUri = hubConfig.URIs.fromApiEndpoint("users/me/access-tokens");
+			var postUri = hubConfig.URIs.API."users/me/access-tokens";
 			var postBody = JSON.writer().writeValueAsString(newAccessTokens);
 			var postReq = HttpRequest.newBuilder(postUri).POST(HttpRequest.BodyPublishers.ofString(postBody)).timeout(REQ_TIMEOUT).header("Authorization", "Bearer " + bearerToken).build();
 			var postRes = httpClient.send(postReq, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
 			if (postRes.statusCode() != 200) {
-				throw new IOException("Unexpected response from POST " + postUri + ": " + postRes.statusCode());
+				throw new IOException(STR."Unexpected response from POST \{postUri}: \{postRes.statusCode()}");
 			}
 		} catch (IOException e) {
 			// log and ignore: this is merely a best-effort attempt of migrating legacy devices. Failure is uncritical as this is merely a convenience feature.
@@ -1,26 +1,19 @@
 package org.cryptomator.ui.mainwindow;

-import javafx.beans.Observable;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.LicenseHolder;
-import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.FxApplicationWindows;
-import org.cryptomator.ui.fxapp.UpdateChecker;
-import org.cryptomator.ui.preferences.SelectedPreferencesTab;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.beans.Observable;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;

@MainWindowScoped
 public class MainWindowController implements FxController {
@@ -29,61 +22,22 @@ public class MainWindowController implements FxController {

 	private final Stage window;
 	private final ReadOnlyObjectProperty<Vault> selectedVault;
-	private final Settings settings;
-	private final FxApplicationWindows appWindows;
-	private final BooleanBinding updateAvailable;
-	private final LicenseHolder licenseHolder;

-	@FXML
-	private StackPane root;
+	public StackPane root;

 	@Inject
-	public MainWindowController(@MainWindow Stage window, //
-								ObjectProperty<Vault> selectedVault, //
-								Settings settings, //
-								FxApplicationWindows appWindows, //
-								UpdateChecker updateChecker, //
-								LicenseHolder licenseHolder) {
+	public MainWindowController(@MainWindow Stage window, ObjectProperty<Vault> selectedVault) {
 		this.window = window;
 		this.selectedVault = selectedVault;
-		this.settings = settings;
-		this.appWindows = appWindows;
-		this.updateAvailable = updateChecker.updateAvailableProperty();
-		this.licenseHolder = licenseHolder;
-		updateChecker.automaticallyCheckForUpdatesIfEnabled();
-
 	}

 	@FXML
 	public void initialize() {
 		LOG.trace("init MainWindowController");
-
 		if (SystemUtils.IS_OS_WINDOWS) {
 			root.getStyleClass().add("os-windows");
 		}
 		window.focusedProperty().addListener(this::mainWindowFocusChanged);
-
-		if (!neverTouched()) {
-			window.setHeight(settings.windowHeight.get() > window.getMinHeight() ? settings.windowHeight.get() : window.getMinHeight());
-			window.setWidth(settings.windowWidth.get() > window.getMinWidth() ? settings.windowWidth.get() : window.getMinWidth());
-			window.setX(settings.windowXPosition.get());
-			window.setY(settings.windowYPosition.get());
-		}
-		window.widthProperty().addListener((_, _, _) -> savePositionalSettings());
-		window.heightProperty().addListener((_, _, _) -> savePositionalSettings());
-		window.xProperty().addListener((_, _, _) -> savePositionalSettings());
-		window.yProperty().addListener((_, _, _) -> savePositionalSettings());
-	}
-
-	private boolean neverTouched() {
-		return (settings.windowHeight.get() == 0) && (settings.windowWidth.get() == 0) && (settings.windowXPosition.get() == 0) && (settings.windowYPosition.get() == 0);
-	}
-
-	public void savePositionalSettings() {
-		settings.windowWidth.setValue(window.getWidth());
-		settings.windowHeight.setValue(window.getHeight());
-		settings.windowXPosition.setValue(window.getX());
-		settings.windowYPosition.setValue(window.getY());
 	}

 	private void mainWindowFocusChanged(Observable observable) {
@@ -93,43 +47,4 @@ public class MainWindowController implements FxController {
 		}
 	}

-	@FXML
-	public void showGeneralPreferences() {
-		appWindows.showPreferencesWindow(SelectedPreferencesTab.GENERAL);
-	}
-
-	@FXML
-	public void showContributePreferences() {
-		appWindows.showPreferencesWindow(SelectedPreferencesTab.CONTRIBUTE);
-	}
-
-	@FXML
-	public void showUpdatePreferences() {
-		appWindows.showPreferencesWindow(SelectedPreferencesTab.UPDATES);
-	}
-
-	public ReadOnlyBooleanProperty debugModeEnabledProperty() {
-		return settings.debugMode;
-	}
-
-	public boolean getDebugModeEnabled() {
-		return debugModeEnabledProperty().get();
-	}
-
-	public BooleanBinding updateAvailableProperty() {
-		return updateAvailable;
-	}
-
-	public boolean getUpdateAvailable() {
-		return updateAvailable.get();
-	}
-
-	public BooleanBinding licenseValidProperty(){
-		return licenseHolder.validLicenseProperty();
-	}
-
-	public boolean getLicenseValid() {
-		return licenseHolder.isValidLicense();
-	}
-
 }
@@ -6,6 +6,7 @@ import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
+import org.cryptomator.ui.error.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxControllerKey;
 import org.cryptomator.ui.common.FxmlFile;
@@ -13,9 +14,10 @@ import org.cryptomator.ui.common.FxmlLoaderFactory;
 import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.common.StageInitializer;
-import org.cryptomator.ui.error.ErrorComponent;
 import org.cryptomator.ui.fxapp.PrimaryStage;
+import org.cryptomator.ui.health.HealthCheckComponent;
 import org.cryptomator.ui.migration.MigrationComponent;
+import org.cryptomator.ui.removevault.RemoveVaultComponent;
 import org.cryptomator.ui.stats.VaultStatisticsComponent;
 import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;

@@ -26,10 +28,11 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import java.util.Map;
 import java.util.ResourceBundle;

-@Module(subcomponents = {AddVaultWizardComponent.class, MigrationComponent.class, VaultStatisticsComponent.class, WrongFileAlertComponent.class, ErrorComponent.class})
+@Module(subcomponents = {AddVaultWizardComponent.class, MigrationComponent.class, RemoveVaultComponent.class, VaultStatisticsComponent.class, WrongFileAlertComponent.class, ErrorComponent.class})
 abstract class MainWindowModule {

 	@Provides
@@ -38,8 +41,9 @@ abstract class MainWindowModule {
 	static Stage provideMainWindow(@PrimaryStage Stage stage, StageInitializer initializer) {
 		initializer.accept(stage);
 		stage.setTitle("Cryptomator");
+		stage.initStyle(StageStyle.UNDECORATED);
 		stage.setMinWidth(650);
-		stage.setMinHeight(498);
+		stage.setMinHeight(440);
 		return stage;
 	}

@@ -81,6 +85,16 @@ abstract class MainWindowModule {
 	@FxControllerKey(MainWindowController.class)
 	abstract FxController bindMainWindowController(MainWindowController controller);

+	@Binds
+	@IntoMap
+	@FxControllerKey(MainWindowTitleController.class)
+	abstract FxController bindMainWindowTitleController(MainWindowTitleController controller);
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(ResizeController.class)
+	abstract FxController bindResizeController(ResizeController controller);
+
 	@Binds
 	@IntoMap
 	@FxControllerKey(VaultListController.class)
@@ -18,20 +18,22 @@ public class MainWindowSceneFactory extends DefaultSceneFactory {
 	protected static final KeyCodeCombination SHORTCUT_N = new KeyCodeCombination(KeyCode.N, KeyCombination.SHORTCUT_DOWN);
 	protected static final KeyCodeCombination SHORTCUT_O = new KeyCodeCombination(KeyCode.O, KeyCombination.SHORTCUT_DOWN);

-	private final Stage window;
+	private final Lazy<MainWindowTitleController> mainWindowTitleController;
 	private final Lazy<VaultListController> vaultListController;

 	@Inject
-	public MainWindowSceneFactory(Settings settings, @MainWindow Stage window, Lazy<VaultListController> vaultListController) {
+	public MainWindowSceneFactory(Settings settings, Lazy<MainWindowTitleController> mainWindowTitleController, Lazy<VaultListController> vaultListController) {
 		super(settings);
-		this.window = window;
+		this.mainWindowTitleController = mainWindowTitleController;
 		this.vaultListController = vaultListController;
 	}

 	@Override
 	protected void setupDefaultAccelerators(Scene scene, Stage stage) {
-		if (!SystemUtils.IS_OS_WINDOWS) {
-			scene.getAccelerators().put(SHORTCUT_W, window::close);
+		if (SystemUtils.IS_OS_WINDOWS) {
+			scene.getAccelerators().put(ALT_F4, mainWindowTitleController.get()::close);
+		} else {
+			scene.getAccelerators().put(SHORTCUT_W, mainWindowTitleController.get()::close);
 		}
 		scene.getAccelerators().put(SHORTCUT_N, vaultListController.get()::didClickAddNewVault);
 		scene.getAccelerators().put(SHORTCUT_O, vaultListController.get()::didClickAddExistingVault);
@@ -0,0 +1,157 @@
+package org.cryptomator.ui.mainwindow;
+
+import org.cryptomator.common.LicenseHolder;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.FxApplicationTerminator;
+import org.cryptomator.ui.fxapp.FxApplicationWindows;
+import org.cryptomator.ui.fxapp.UpdateChecker;
+import org.cryptomator.ui.preferences.SelectedPreferencesTab;
+import org.cryptomator.ui.traymenu.TrayMenuComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.fxml.FXML;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.HBox;
+import javafx.stage.Stage;
+
+@MainWindowScoped
+public class MainWindowTitleController implements FxController {
+
+	private static final Logger LOG = LoggerFactory.getLogger(MainWindowTitleController.class);
+
+	private final Stage window;
+	private final FxApplicationTerminator terminator;
+	private final FxApplicationWindows appWindows;
+	private final boolean trayMenuInitialized;
+	private final UpdateChecker updateChecker;
+	private final BooleanBinding updateAvailable;
+	private final LicenseHolder licenseHolder;
+	private final Settings settings;
+	private final BooleanBinding showMinimizeButton;
+
+	public HBox titleBar;
+	private double xOffset;
+	private double yOffset;
+
+	@Inject
+	MainWindowTitleController(@MainWindow Stage window, FxApplicationTerminator terminator, FxApplicationWindows appWindows, TrayMenuComponent trayMenu, UpdateChecker updateChecker, LicenseHolder licenseHolder, Settings settings) {
+		this.window = window;
+		this.terminator = terminator;
+		this.appWindows = appWindows;
+		this.trayMenuInitialized = trayMenu.isInitialized();
+		this.updateChecker = updateChecker;
+		this.updateAvailable = updateChecker.latestVersionProperty().isNotNull();
+		this.licenseHolder = licenseHolder;
+		this.settings = settings;
+		this.showMinimizeButton = Bindings.createBooleanBinding(this::isShowMinimizeButton, settings.showMinimizeButton, settings.showTrayIcon);
+	}
+
+	@FXML
+	public void initialize() {
+		LOG.trace("init MainWindowTitleController");
+		updateChecker.automaticallyCheckForUpdatesIfEnabled();
+		titleBar.setOnMousePressed(event -> {
+			xOffset = event.getSceneX();
+			yOffset = event.getSceneY();
+
+		});
+		titleBar.setOnMouseClicked(event -> {
+			if (event.getButton().equals(MouseButton.PRIMARY) && event.getClickCount() == 2) {
+				window.setFullScreen(!window.isFullScreen());
+			}
+		});
+		titleBar.setOnMouseDragged(event -> {
+			if (window.isFullScreen()) return;
+			window.setX(event.getScreenX() - xOffset);
+			window.setY(event.getScreenY() - yOffset);
+		});
+		titleBar.setOnDragDetected(mouseDragEvent -> {
+			titleBar.startFullDrag();
+		});
+		titleBar.setOnMouseDragReleased(mouseDragEvent -> {
+			saveWindowSettings();
+		});
+
+		window.setOnCloseRequest(event -> {
+			close();
+			event.consume();
+		});
+	}
+
+	private void saveWindowSettings() {
+		settings.windowXPosition.setValue(window.getX());
+		settings.windowYPosition.setValue(window.getY());
+		settings.windowWidth.setValue(window.getWidth());
+		settings.windowHeight.setValue(window.getHeight());
+	}
+
+	@FXML
+	public void close() {
+		if (trayMenuInitialized) {
+			window.close();
+		} else {
+			terminator.terminate();
+		}
+	}
+
+	@FXML
+	public void minimize() {
+		window.setIconified(true);
+	}
+
+	@FXML
+	public void showPreferences() {
+		appWindows.showPreferencesWindow(SelectedPreferencesTab.ANY);
+	}
+
+	@FXML
+	public void showGeneralPreferences() {
+		appWindows.showPreferencesWindow(SelectedPreferencesTab.GENERAL);
+	}
+
+	@FXML
+	public void showContributePreferences() {
+		appWindows.showPreferencesWindow(SelectedPreferencesTab.CONTRIBUTE);
+	}
+
+	/* Getter/Setter */
+
+	public LicenseHolder getLicenseHolder() {
+		return licenseHolder;
+	}
+
+	public BooleanBinding updateAvailableProperty() {
+		return updateAvailable;
+	}
+
+	public boolean isUpdateAvailable() {
+		return updateAvailable.get();
+	}
+
+	public boolean isTrayIconPresent() {
+		return trayMenuInitialized;
+	}
+
+	public ReadOnlyBooleanProperty debugModeEnabledProperty() {
+		return settings.debugMode;
+	}
+
+	public boolean isDebugModeEnabled() {
+		return debugModeEnabledProperty().get();
+	}
+
+	public BooleanBinding showMinimizeButtonProperty() {
+		return showMinimizeButton;
+	}
+
+	public boolean isShowMinimizeButton() {
+		// always show the minimize button if no tray icon is present OR it is explicitly enabled
+		return !trayMenuInitialized || settings.showMinimizeButton.get();
+	}
+}
@@ -0,0 +1,194 @@
+package org.cryptomator.ui.mainwindow;
+
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.beans.binding.BooleanBinding;
+import javafx.fxml.FXML;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Region;
+import javafx.stage.Screen;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
+
+@MainWindow
+public class ResizeController implements FxController {
+
+	private static final Logger LOG = LoggerFactory.getLogger(ResizeController.class);
+
+	private final Stage window;
+
+	public Region tlResizer;
+	public Region trResizer;
+	public Region blResizer;
+	public Region brResizer;
+	public Region tResizer;
+	public Region rResizer;
+	public Region bResizer;
+	public Region lResizer;
+	public Region lDefaultRegion;
+	public Region tDefaultRegion;
+	public Region rDefaultRegion;
+	public Region bDefaultRegion;
+
+	private double origX, origY, origW, origH;
+
+	private final Settings settings;
+
+	private final BooleanBinding showResizingArrows;
+
+	@Inject
+	ResizeController(@MainWindow Stage window, Settings settings) {
+		this.window = window;
+		this.settings = settings;
+		this.showResizingArrows = window.fullScreenProperty().not();
+	}
+
+	@FXML
+	public void initialize() {
+		LOG.trace("init ResizeController");
+
+		if (!neverTouched()) {
+			window.setHeight(settings.windowHeight.get() > window.getMinHeight() ? settings.windowHeight.get() : window.getMinHeight());
+			window.setWidth(settings.windowWidth.get() > window.getMinWidth() ? settings.windowWidth.get() : window.getMinWidth());
+			window.setX(settings.windowXPosition.get());
+			window.setY(settings.windowYPosition.get());
+		}
+
+		window.setOnShowing(this::checkDisplayBounds);
+	}
+
+	private boolean neverTouched() {
+		return (settings.windowHeight.get() == 0) && (settings.windowWidth.get() == 0) && (settings.windowXPosition.get() == 0) && (settings.windowYPosition.get() == 0);
+	}
+
+	private void checkDisplayBounds(WindowEvent evt) {
+		// Minimizing a window in Windows and closing it could result in an out of bounds position at (x, y) = (-32000, -32000)
+		// See https://devblogs.microsoft.com/oldnewthing/20041028-00/?p=37453
+		// If the position is (-32000, -32000), restore to the last saved position
+		if (window.getX() == -32000 && window.getY() == -32000) {
+			window.setX(settings.windowXPosition.get());
+			window.setY(settings.windowYPosition.get());
+			window.setWidth(settings.windowWidth.get());
+			window.setHeight(settings.windowHeight.get());
+		}
+
+		if (isOutOfDisplayBounds()) {
+			// If the position is illegal, then the window appears on the main screen in the middle of the window.
+			LOG.debug("Resetting window position due to insufficient screen overlap");
+			Rectangle2D primaryScreenBounds = Screen.getPrimary().getBounds();
+			window.setX((primaryScreenBounds.getWidth() - window.getMinWidth()) / 2);
+			window.setY((primaryScreenBounds.getHeight() - window.getMinHeight()) / 2);
+			window.setWidth(window.getMinWidth());
+			window.setHeight(window.getMinHeight());
+			savePositionalSettings();
+		}
+	}
+
+	private boolean isOutOfDisplayBounds() {
+		// define a rect which is inset on all sides from the window's rect:
+		final double x = window.getX() + 20; // 20px left
+		final double y = window.getY() + 5; // 5px top
+		final double w = window.getWidth() - 40; // 20px left + 20px right
+		final double h = window.getHeight() - 25; // 5px top + 20px bottom
+		return isRectangleOutOfScreen(x, y, 0, h) // Left pixel column
+				|| isRectangleOutOfScreen(x + w, y, 0, h) // Right pixel column
+				|| isRectangleOutOfScreen(x, y, w, 0) // Top pixel row
+				|| isRectangleOutOfScreen(x, y + h, w, 0); // Bottom pixel row
+	}
+
+	private boolean isRectangleOutOfScreen(double x, double y, double width, double height) {
+		return Screen.getScreensForRectangle(x, y, width, height).isEmpty();
+	}
+
+	private void startResize(MouseEvent evt) {
+		origX = window.getX();
+		origY = window.getY();
+		origW = window.getWidth();
+		origH = window.getHeight();
+	}
+
+	@FXML
+	private void resizeTopLeft(MouseEvent evt) {
+		resizeTop(evt);
+		resizeLeft(evt);
+	}
+
+	@FXML
+	private void resizeTopRight(MouseEvent evt) {
+		resizeTop(evt);
+		resizeRight(evt);
+	}
+
+	@FXML
+	private void resizeBottomLeft(MouseEvent evt) {
+		resizeBottom(evt);
+		resizeLeft(evt);
+	}
+
+	@FXML
+	private void resizeBottomRight(MouseEvent evt) {
+		resizeBottom(evt);
+		resizeRight(evt);
+	}
+
+	@FXML
+	private void resizeTop(MouseEvent evt) {
+		startResize(evt);
+		double newY = evt.getScreenY();
+		double dy = newY - origY;
+		double newH = origH - dy;
+		if (newH < window.getMaxHeight() && newH > window.getMinHeight()) {
+			window.setY(newY);
+			window.setHeight(newH);
+		}
+	}
+
+	@FXML
+	private void resizeLeft(MouseEvent evt) {
+		startResize(evt);
+		double newX = evt.getScreenX();
+		double dx = newX - origX;
+		double newW = origW - dx;
+		if (newW < window.getMaxWidth() && newW > window.getMinWidth()) {
+			window.setX(newX);
+			window.setWidth(newW);
+		}
+	}
+
+	@FXML
+	private void resizeBottom(MouseEvent evt) {
+		double newH = evt.getSceneY();
+		if (newH < window.getMaxHeight() && newH > window.getMinHeight()) {
+			window.setHeight(newH);
+		}
+	}
+
+	@FXML
+	private void resizeRight(MouseEvent evt) {
+		double newW = evt.getSceneX();
+		if (newW < window.getMaxWidth() && newW > window.getMinWidth()) {
+			window.setWidth(newW);
+		}
+	}
+
+	@FXML
+	public void savePositionalSettings() {
+		settings.windowWidth.setValue(window.getWidth());
+		settings.windowHeight.setValue(window.getHeight());
+		settings.windowXPosition.setValue(window.getX());
+		settings.windowYPosition.setValue(window.getY());
+	}
+
+	public BooleanBinding showResizingArrowsProperty() {
+		return showResizingArrows;
+	}
+
+	public boolean isShowResizingArrows() {
+		return showResizingArrows.get();
+	}
+}
@@ -3,11 +3,10 @@ package org.cryptomator.ui.mainwindow;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.dialogs.Dialogs;
+import org.cryptomator.ui.removevault.RemoveVaultComponent;

 import javax.inject.Inject;
 import javafx.beans.property.ObjectProperty;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
@@ -20,22 +19,17 @@ import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_GLOB;
 public class VaultDetailMissingVaultController implements FxController {

 	private final ObjectProperty<Vault> vault;
-	private final ObservableList<Vault> vaults;
+	private final RemoveVaultComponent.Builder removeVault;
 	private final ResourceBundle resourceBundle;
 	private final Stage window;
-	private final Dialogs dialogs;
+

 	@Inject
-	public VaultDetailMissingVaultController(ObjectProperty<Vault> vault, //
-											 ObservableList<Vault> vaults, //
-											 ResourceBundle resourceBundle, //
-											 @MainWindow Stage window, //
-											 Dialogs dialogs) {
+	public VaultDetailMissingVaultController(ObjectProperty<Vault> vault, RemoveVaultComponent.Builder removeVault, ResourceBundle resourceBundle, @MainWindow Stage window) {
 		this.vault = vault;
-		this.vaults = vaults;
+		this.removeVault = removeVault;
 		this.resourceBundle = resourceBundle;
 		this.window = window;
-		this.dialogs = dialogs;
 	}

 	@FXML
@@ -45,7 +39,7 @@ public class VaultDetailMissingVaultController implements FxController {

 	@FXML
 	void didClickRemoveVault() {
-		dialogs.prepareRemoveVaultDialog(window, vault.get(), vaults).build().showAndWait();
+		removeVault.vault(vault.get()).build().showRemoveVault();
 	}

 	@FXML
@@ -3,13 +3,12 @@ package org.cryptomator.ui.mainwindow;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.dialogs.Dialogs;
 import org.cryptomator.ui.fxapp.FxApplicationWindows;
+import org.cryptomator.ui.removevault.RemoveVaultComponent;

 import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.beans.property.ObjectProperty;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;

@@ -19,23 +18,14 @@ public class VaultDetailUnknownErrorController implements FxController {
 	private final ObjectProperty<Vault> vault;
 	private final FxApplicationWindows appWindows;
 	private final Stage errorWindow;
-	private final ObservableList<Vault> vaults;
-	private final Stage mainWindow;
-	private final Dialogs dialogs;
+	private final RemoveVaultComponent.Builder removeVault;

 	@Inject
-	public VaultDetailUnknownErrorController(@MainWindow Stage mainWindow, //
-											 ObjectProperty<Vault> vault, //
-											 ObservableList<Vault> vaults, //
-											 FxApplicationWindows appWindows, //
-											 @Named("errorWindow") Stage errorWindow, //
-											 Dialogs dialogs) {
-		this.mainWindow = mainWindow;
+	public VaultDetailUnknownErrorController(ObjectProperty<Vault> vault, FxApplicationWindows appWindows, @Named("errorWindow") Stage errorWindow, RemoveVaultComponent.Builder removeVault) {
 		this.vault = vault;
-		this.vaults = vaults;
 		this.appWindows = appWindows;
 		this.errorWindow = errorWindow;
-		this.dialogs = dialogs;
+		this.removeVault = removeVault;
 	}

 	@FXML
@@ -50,6 +40,6 @@ public class VaultDetailUnknownErrorController implements FxController {

 	@FXML
 	void didClickRemoveVault() {
-		dialogs.prepareRemoveVaultDialog(mainWindow, vault.get(), vaults).build().showAndWait();
+		removeVault.vault(vault.get()).build().showRemoveVault();
 	}
 }
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.mainwindow;

-import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.Animations;
@@ -13,31 +12,21 @@ import javax.inject.Inject;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
-import javafx.fxml.FXML;
-import javafx.geometry.Insets;
-import javafx.scene.layout.HBox;

 // unscoped because each cell needs its own controller
 public class VaultListCellController implements FxController {

-	private static final Insets COMPACT_INSETS = new Insets(6, 12, 6, 12);
-	private static final Insets DEFAULT_INSETS = new Insets(12);
-
 	private final ObjectProperty<Vault> vault = new SimpleObjectProperty<>();
 	private final ObservableValue<FontAwesome5Icon> glyph;
-	private final ObservableValue<Boolean> compactMode;

 	private AutoAnimator spinAnimation;

 	/* FXML */
 	public FontAwesome5IconView vaultStateView;
-	@FXML
-	public HBox vaultListCell;

 	@Inject
-	VaultListCellController(Settings settings) {
+	VaultListCellController() {
 		this.glyph = vault.flatMap(Vault::stateProperty).map(this::getGlyphForVaultState);
-		this.compactMode = settings.compactMode;
 	}

 	public void initialize() {
@@ -45,7 +34,6 @@ public class VaultListCellController implements FxController {
 				.onCondition(vault.flatMap(Vault::stateProperty).map(VaultState.Value.PROCESSING::equals).orElse(false)) //
 				.afterStop(() -> vaultStateView.setRotate(0)) //
 				.build();
-		this.vaultListCell.paddingProperty().bind(compactMode.map(c -> c ? COMPACT_INSETS : DEFAULT_INSETS));
 	}

 	// TODO deduplicate w/ VaultDetailController
@@ -80,14 +68,6 @@ public class VaultListCellController implements FxController {
 		return vault.get();
 	}

-	public ObservableValue<Boolean> compactModeProperty() {
-		return compactMode;
-	}
-
-	public boolean getCompactMode() {
-		return compactMode.getValue();
-	}
-
 	public void setVault(Vault value) {
 		vault.set(value);
 	}
@@ -5,8 +5,8 @@ import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
-import org.cryptomator.ui.dialogs.Dialogs;
 import org.cryptomator.ui.fxapp.FxApplicationWindows;
+import org.cryptomator.ui.removevault.RemoveVaultComponent;
 import org.cryptomator.ui.vaultoptions.SelectedVaultOptionsTab;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;

@@ -14,7 +14,6 @@ import javax.inject.Inject;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
 import java.util.EnumSet;
@@ -34,32 +33,23 @@ public class VaultListContextMenuController implements FxController {
 	private final FxApplicationWindows appWindows;
 	private final VaultService vaultService;
 	private final KeychainManager keychain;
+	private final RemoveVaultComponent.Builder removeVault;
 	private final VaultOptionsComponent.Factory vaultOptionsWindow;
 	private final ObservableValue<VaultState.Value> selectedVaultState;
 	private final ObservableValue<Boolean> selectedVaultPassphraseStored;
 	private final ObservableValue<Boolean> selectedVaultRemovable;
 	private final ObservableValue<Boolean> selectedVaultUnlockable;
 	private final ObservableValue<Boolean> selectedVaultLockable;
-	private final ObservableList<Vault> vaults;
-	private final Dialogs dialogs;

 	@Inject
-	VaultListContextMenuController(ObjectProperty<Vault> selectedVault, //
-								   ObservableList<Vault> vaults, //
-								   @MainWindow Stage mainWindow, //
-								   FxApplicationWindows appWindows, //
-								   VaultService vaultService, //
-								   KeychainManager keychain, //
-								   VaultOptionsComponent.Factory vaultOptionsWindow, //
-								   Dialogs dialogs) {
+	VaultListContextMenuController(ObjectProperty<Vault> selectedVault, @MainWindow Stage mainWindow, FxApplicationWindows appWindows, VaultService vaultService, KeychainManager keychain, RemoveVaultComponent.Builder removeVault, VaultOptionsComponent.Factory vaultOptionsWindow) {
 		this.selectedVault = selectedVault;
-		this.vaults = vaults;
 		this.mainWindow = mainWindow;
 		this.appWindows = appWindows;
 		this.vaultService = vaultService;
 		this.keychain = keychain;
+		this.removeVault = removeVault;
 		this.vaultOptionsWindow = vaultOptionsWindow;
-		this.dialogs = dialogs;

 		this.selectedVaultState = selectedVault.flatMap(Vault::stateProperty).orElse(null);
 		this.selectedVaultPassphraseStored = selectedVault.map(this::isPasswordStored).orElse(false);
@@ -75,7 +65,7 @@ public class VaultListContextMenuController implements FxController {
 	@FXML
 	public void didClickRemoveVault() {
 		var vault = Objects.requireNonNull(selectedVault.get());
-		dialogs.prepareRemoveVaultDialog(mainWindow, vault, vaults).build().showAndWait();
+		removeVault.vault(vault).build().showRemoveVault();
 	}

 	@FXML
@@ -1,17 +1,14 @@
 package org.cryptomator.ui.mainwindow;

 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
 import org.cryptomator.cryptofs.DirStructure;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.VaultService;
-import org.cryptomator.ui.dialogs.Dialogs;
 import org.cryptomator.ui.fxapp.FxApplicationWindows;
-import org.cryptomator.ui.preferences.SelectedPreferencesTab;
+import org.cryptomator.ui.removevault.RemoveVaultComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -26,6 +23,7 @@ import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.geometry.Side;
+import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.ListView;
 import javafx.scene.input.ContextMenuEvent;
@@ -34,7 +32,6 @@ import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
-import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import java.io.File;
@@ -61,22 +58,19 @@ public class VaultListController implements FxController {

 	private final Stage mainWindow;
 	private final ObservableList<Vault> vaults;
-	private final VaultService vaultService;
 	private final ObjectProperty<Vault> selectedVault;
 	private final VaultListCellFactory cellFactory;
 	private final AddVaultWizardComponent.Builder addVaultWizard;
 	private final BooleanBinding emptyVaultList;
+	private final RemoveVaultComponent.Builder removeVaultDialogue;
 	private final VaultListManager vaultListManager;
 	private final BooleanProperty draggingVaultOver = new SimpleBooleanProperty();
 	private final ResourceBundle resourceBundle;
 	private final FxApplicationWindows appWindows;
-	private final ObservableValue<Double> cellSize;
-	private final Dialogs dialogs;

 	public ListView<Vault> vaultList;
 	public StackPane root;
-	@FXML
-	private HBox addVaultButton;
+	public Button addVaultBtn;
 	@FXML
 	private ContextMenu addVaultContextMenu;

@@ -85,38 +79,29 @@ public class VaultListController implements FxController {
 						ObservableList<Vault> vaults, //
 						ObjectProperty<Vault> selectedVault, //
 						VaultListCellFactory cellFactory, //
-						VaultService vaultService, //
 						AddVaultWizardComponent.Builder addVaultWizard, //
+						RemoveVaultComponent.Builder removeVaultDialogue, //
 						VaultListManager vaultListManager, //
 						ResourceBundle resourceBundle, //
-						FxApplicationWindows appWindows, //
-						Settings settings, //
-						Dialogs dialogs) {
+						FxApplicationWindows appWindows) {
 		this.mainWindow = mainWindow;
 		this.vaults = vaults;
 		this.selectedVault = selectedVault;
 		this.cellFactory = cellFactory;
-		this.vaultService = vaultService;
 		this.addVaultWizard = addVaultWizard;
+		this.removeVaultDialogue = removeVaultDialogue;
 		this.vaultListManager = vaultListManager;
 		this.resourceBundle = resourceBundle;
 		this.appWindows = appWindows;
-		this.dialogs = dialogs;

 		this.emptyVaultList = Bindings.isEmpty(vaults);

 		selectedVault.addListener(this::selectedVaultDidChange);
-		cellSize = settings.compactMode.map(compact -> compact ? 30.0 : 60.0);
 	}

 	public void initialize() {
 		vaultList.setItems(vaults);
 		vaultList.setCellFactory(cellFactory);
-
-		vaultList.prefHeightProperty().bind(
-				vaultList.fixedCellSizeProperty().multiply(Bindings.size(vaultList.getItems()))
-		);
-
 		selectedVault.bind(vaultList.getSelectionModel().selectedItemProperty());
 		vaults.addListener((ListChangeListener.Change<? extends Vault> c) -> {
 			while (c.next()) {
@@ -134,9 +119,6 @@ public class VaultListController implements FxController {
 				Optional.ofNullable(selectedVault.get())
 						.filter(Vault::isLocked)
 						.ifPresent(vault -> appWindows.startUnlockWorkflow(vault, mainWindow));
-				Optional.ofNullable(selectedVault.get())
-						.filter(Vault::isUnlocked)
-						.ifPresent(vaultService::reveal);
 			}
 		});

@@ -182,7 +164,7 @@ public class VaultListController implements FxController {
 		if (addVaultContextMenu.isShowing()) {
 			addVaultContextMenu.hide();
 		} else {
-			addVaultContextMenu.show(addVaultButton, Side.BOTTOM, 0.0, 0.0);
+			addVaultContextMenu.show(addVaultBtn, Side.BOTTOM, 0.0, 0.0);
 		}
 	}

@@ -213,7 +195,7 @@ public class VaultListController implements FxController {
 	private void pressedShortcutToRemoveVault() {
 		final var vault = selectedVault.get();
 		if (vault != null && EnumSet.of(LOCKED, MISSING, ERROR, NEEDS_MIGRATION).contains(vault.getState())) {
-			dialogs.prepareRemoveVaultDialog(mainWindow, vault, vaults).build().showAndWait();
+			removeVaultDialogue.vault(vault).build().showRemoveVault();
 		}
 	}

@@ -258,11 +240,6 @@ public class VaultListController implements FxController {
 		}
 	}

-	@FXML
-	public void showPreferences() {
-		appWindows.showPreferencesWindow(SelectedPreferencesTab.ANY);
-	}
-
 	// Getter and Setter

 	public BooleanBinding emptyVaultListProperty() {
@@ -281,12 +258,5 @@ public class VaultListController implements FxController {
 		return draggingVaultOver.get();
 	}

-	public ObservableValue<Double> cellSizeProperty() {
-		return cellSize;
-	}
-
-	public Double getCellSize() {
-		return cellSize.getValue();
-	}

 }
@@ -4,9 +4,7 @@ import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException;
-import org.cryptomator.integrations.common.NamedServiceProvider;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
-import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplicationWindows;
 import org.slf4j.Logger;
@@ -32,15 +30,12 @@ public class GeneralPreferencesController implements FxController {
 	private final Stage window;
 	private final Settings settings;
 	private final Optional<AutoStartProvider> autoStartProvider;
-	private final List<QuickAccessService> quickAccessServices;
 	private final Application application;
 	private final Environment environment;
 	private final List<KeychainAccessProvider> keychainAccessProviders;
 	private final FxApplicationWindows appWindows;
 	public CheckBox useKeychainCheckbox;
 	public ChoiceBox<KeychainAccessProvider> keychainBackendChoiceBox;
-	public CheckBox useQuickAccessCheckbox;
-	public ChoiceBox<QuickAccessService> quickAccessServiceChoiceBox;
 	public CheckBox startHiddenCheckbox;
 	public CheckBox autoCloseVaultsCheckbox;
 	public CheckBox debugModeCheckbox;
@@ -53,7 +48,6 @@ public class GeneralPreferencesController implements FxController {
 		this.settings = settings;
 		this.autoStartProvider = autoStartProvider;
 		this.keychainAccessProviders = keychainAccessProviders;
-		this.quickAccessServices = QuickAccessService.get().toList();
 		this.application = application;
 		this.environment = environment;
 		this.appWindows = appWindows;
@@ -66,21 +60,13 @@ public class GeneralPreferencesController implements FxController {
 		debugModeCheckbox.selectedProperty().bindBidirectional(settings.debugMode);
 		autoStartProvider.ifPresent(autoStart -> autoStartCheckbox.setSelected(autoStart.isEnabled()));

-		var keychainSettingsConverter = new ServiceToSettingsConverter<>(keychainAccessProviders);
+		var keychainSettingsConverter = new KeychainProviderClassNameConverter(keychainAccessProviders);
 		keychainBackendChoiceBox.getItems().addAll(keychainAccessProviders);
 		keychainBackendChoiceBox.setValue(keychainSettingsConverter.fromString(settings.keychainProvider.get()));
 		keychainBackendChoiceBox.setConverter(new KeychainProviderDisplayNameConverter());
 		Bindings.bindBidirectional(settings.keychainProvider, keychainBackendChoiceBox.valueProperty(), keychainSettingsConverter);
 		useKeychainCheckbox.selectedProperty().bindBidirectional(settings.useKeychain);
 		keychainBackendChoiceBox.disableProperty().bind(useKeychainCheckbox.selectedProperty().not());
-
-		useQuickAccessCheckbox.selectedProperty().bindBidirectional(settings.useQuickAccess);
-		var quickAccessSettingsConverter = new ServiceToSettingsConverter<>(quickAccessServices);
-		quickAccessServiceChoiceBox.getItems().addAll(quickAccessServices);
-		quickAccessServiceChoiceBox.setValue(quickAccessSettingsConverter.fromString(settings.quickAccessService.get()));
-		quickAccessServiceChoiceBox.setConverter(new NamedServiceConverter<>());
-		Bindings.bindBidirectional(settings.quickAccessService, quickAccessServiceChoiceBox.valueProperty(), quickAccessSettingsConverter);
-		quickAccessServiceChoiceBox.disableProperty().bind(useQuickAccessCheckbox.selectedProperty().not());
 	}

 	public boolean isAutoStartSupported() {
@@ -105,10 +91,6 @@ public class GeneralPreferencesController implements FxController {
 		});
 	}

-	public boolean isSomeQuickAccessServiceAvailable() {
-		return !quickAccessServices.isEmpty();
-	}
-
 	@FXML
 	public void showLogfileDirectory() {
 		environment.getLogDir().ifPresent(logDirPath -> application.getHostServices().showDocument(logDirPath.toUri().toString()));
@@ -134,47 +116,29 @@ public class GeneralPreferencesController implements FxController {

 	}

-	private static class NamedServiceConverter<T extends NamedServiceProvider> extends StringConverter<T> {
+	private static class KeychainProviderClassNameConverter extends StringConverter<KeychainAccessProvider> {
+
+		private final List<KeychainAccessProvider> keychainAccessProviders;
+
+		public KeychainProviderClassNameConverter(List<KeychainAccessProvider> keychainAccessProviders) {
+			this.keychainAccessProviders = keychainAccessProviders;
+		}

 		@Override
-		public String toString(T namedService) {
-			if (namedService == null) {
+		public String toString(KeychainAccessProvider provider) {
+			if (provider == null) {
 				return null;
 			} else {
-				return namedService.getName();
+				return provider.getClass().getName();
 			}
 		}

 		@Override
-		public T fromString(String string) {
-			throw new UnsupportedOperationException();
-		}
-
-	}
-
-	private static class ServiceToSettingsConverter<T> extends StringConverter<T> {
-
-		private final List<T> services;
-
-		public ServiceToSettingsConverter(List<T> services) {
-			this.services = services;
-		}
-
-		@Override
-		public String toString(T service) {
-			if (service == null) {
-				return null;
-			} else {
-				return service.getClass().getName();
-			}
-		}
-
-		@Override
-		public T fromString(String string) {
+		public KeychainAccessProvider fromString(String string) {
 			if (string == null) {
 				return null;
 			} else {
-				return services.stream().filter(provider -> provider.getClass().getName().equals(string)).findAny().orElse(null);
+				return keychainAccessProviders.stream().filter(provider -> provider.getClass().getName().equals(string)).findAny().orElse(null);
 			}
 		}
 	}
@@ -36,8 +36,8 @@ public class InterfacePreferencesController implements FxController {
 	private final ResourceBundle resourceBundle;
 	private final SupportedLanguages supportedLanguages;
 	public ChoiceBox<UiTheme> themeChoiceBox;
+	public CheckBox showMinimizeButtonCheckbox;
 	public CheckBox showTrayIconCheckbox;
-	public CheckBox compactModeCheckbox;
 	public ChoiceBox<String> preferredLanguageChoiceBox;
 	public ToggleGroup nodeOrientation;
 	public RadioButton nodeOrientationLtr;
@@ -63,8 +63,9 @@ public class InterfacePreferencesController implements FxController {
 		themeChoiceBox.valueProperty().bindBidirectional(settings.theme);
 		themeChoiceBox.setConverter(new UiThemeConverter(resourceBundle));

+		showMinimizeButtonCheckbox.selectedProperty().bindBidirectional(settings.showMinimizeButton);
+
 		showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon);
-		compactModeCheckbox.selectedProperty().bindBidirectional(settings.compactMode);

 		preferredLanguageChoiceBox.getItems().addAll(supportedLanguages.getLanguageTags());
 		preferredLanguageChoiceBox.valueProperty().bindBidirectional(settings.language);
@@ -30,8 +30,6 @@ public interface PreferencesComponent {
 		selectedTabProperty().set(selectedTab);
 		Stage stage = window();
 		stage.setScene(scene().get());
-		stage.setMinWidth(420);
-		stage.setMinHeight(400);
 		stage.show();
 		stage.requestFocus();
 		return stage;
@@ -37,7 +37,7 @@ public class PreferencesController implements FxController {
 		this.env = env;
 		this.window = window;
 		this.selectedTabProperty = selectedTabProperty;
-		this.updateAvailable = updateChecker.updateAvailableProperty();
+		this.updateAvailable = updateChecker.latestVersionProperty().isNotNull();
 	}

 	@FXML
@@ -5,7 +5,6 @@ import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.dialogs.Dialogs;

 import javax.inject.Inject;
 import javafx.application.Application;
@@ -13,36 +12,22 @@ import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextFormatter;
-import javafx.stage.Stage;
-

@PreferencesScoped
 public class SupporterCertificateController implements FxController {

-	private static final String DONATE_URI = "https://cryptomator.org/donate";
-	private static final String SPONSORS_URI = "https://cryptomator.org/sponsors";
 	private static final String SUPPORTER_URI = "https://store.cryptomator.org/desktop";

 	private final Application application;
-	private final Stage window;
 	private final LicenseHolder licenseHolder;
 	private final Settings settings;
-	private final Dialogs dialogs;
-
-	@FXML
-	private TextArea supporterCertificateField;
+	public TextArea supporterCertificateField;

 	@Inject
-	SupporterCertificateController(Application application, //
-								   @PreferencesWindow Stage window,  //
-								   LicenseHolder licenseHolder, //
-								   Settings settings, //
-								   Dialogs dialogs) {
+	SupporterCertificateController(Application application, LicenseHolder licenseHolder, Settings settings) {
 		this.application = application;
-		this.window = window;
 		this.licenseHolder = licenseHolder;
 		this.settings = settings;
-		this.dialogs = dialogs;
 	}

 	@FXML
@@ -50,11 +35,6 @@ public class SupporterCertificateController implements FxController {
 		supporterCertificateField.setText(licenseHolder.getLicenseKey().orElse(null));
 		supporterCertificateField.textProperty().addListener(this::registrationKeyChanged);
 		supporterCertificateField.setTextFormatter(new TextFormatter<>(this::removeWhitespaces));
-		settings.licenseKey.addListener((_, _, newValue) -> {
-			if (newValue == null) {
-				supporterCertificateField.setText(null);
-			}
-		});
 	}

 	private TextFormatter.Change removeWhitespaces(TextFormatter.Change change) {
@@ -77,23 +57,7 @@ public class SupporterCertificateController implements FxController {
 		application.getHostServices().showDocument(SUPPORTER_URI);
 	}

-	@FXML
-	public void showDonate() {
-		application.getHostServices().showDocument(DONATE_URI);
-	}
-
-	@FXML
-	public void showSponsors() {
-		application.getHostServices().showDocument(SPONSORS_URI);
-	}
-
-	@FXML
-	void didClickRemoveCert() {
-		dialogs.prepareRemoveCertDialog(window, settings).build().showAndWait();
-	}
-
 	public LicenseHolder getLicenseHolder() {
 		return licenseHolder;
 	}
-
 }
@@ -1,33 +1,18 @@
 package org.cryptomator.ui.preferences;

-import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.UpdateChecker;

 import javax.inject.Inject;
-import javafx.animation.PauseTransition;
 import javafx.application.Application;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.ObjectBinding;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyStringProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.Locale;
-import java.util.ResourceBundle;
-

@PreferencesScoped
 public class UpdatesPreferencesController implements FxController {
@@ -35,55 +20,29 @@ public class UpdatesPreferencesController implements FxController {
 	private static final String DOWNLOADS_URI = "https://cryptomator.org/downloads";

 	private final Application application;
-	private final Environment environment;
-	private final ResourceBundle resourceBundle;
 	private final Settings settings;
 	private final UpdateChecker updateChecker;
 	private final ObjectBinding<ContentDisplay> checkForUpdatesButtonState;
 	private final ReadOnlyStringProperty latestVersion;
-	private final ObservableValue<Instant> lastSuccessfulUpdateCheck;
-	private final StringBinding lastUpdateCheckMessage;
-	private final ObservableValue<String> timeDifferenceMessage;
 	private final String currentVersion;
 	private final BooleanBinding updateAvailable;
-	private final BooleanBinding checkFailed;
-	private final BooleanProperty upToDateLabelVisible = new SimpleBooleanProperty(false);
-	private final DateTimeFormatter formatter;
-	private final BooleanBinding upToDate;

 	/* FXML */
 	public CheckBox checkForUpdatesCheckbox;

 	@Inject
-	UpdatesPreferencesController(Application application, Environment environment, ResourceBundle resourceBundle, Settings settings, UpdateChecker updateChecker) {
+	UpdatesPreferencesController(Application application, Settings settings, UpdateChecker updateChecker) {
 		this.application = application;
-		this.environment = environment;
-		this.resourceBundle = resourceBundle;
 		this.settings = settings;
 		this.updateChecker = updateChecker;
 		this.checkForUpdatesButtonState = Bindings.when(updateChecker.checkingForUpdatesProperty()).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY);
 		this.latestVersion = updateChecker.latestVersionProperty();
-		this.lastSuccessfulUpdateCheck = updateChecker.lastSuccessfulUpdateCheckProperty();
-		this.timeDifferenceMessage = Bindings.createStringBinding(this::getTimeDifferenceMessage, lastSuccessfulUpdateCheck);
+		this.updateAvailable = latestVersion.isNotNull();
 		this.currentVersion = updateChecker.getCurrentVersion();
-		this.updateAvailable = updateChecker.updateAvailableProperty();
-		this.formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault());
-		this.upToDate = updateChecker.updateCheckStateProperty().isEqualTo(UpdateChecker.UpdateCheckState.CHECK_SUCCESSFUL).and(latestVersion.isEqualTo(currentVersion));
-		this.checkFailed = updateChecker.checkFailedProperty();
-		this.lastUpdateCheckMessage = Bindings.createStringBinding(this::getLastUpdateCheckMessage, lastSuccessfulUpdateCheck);
 	}

 	public void initialize() {
 		checkForUpdatesCheckbox.selectedProperty().bindBidirectional(settings.checkForUpdates);
-
-		upToDate.addListener((_, _, newVal) -> {
-			if (newVal) {
-				upToDateLabelVisible.set(true);
-				PauseTransition delay = new PauseTransition(javafx.util.Duration.seconds(5));
-				delay.setOnFinished(_ -> upToDateLabelVisible.set(false));
-				delay.play();
-			}
-		});
 	}

 	@FXML
@@ -96,11 +55,6 @@ public class UpdatesPreferencesController implements FxController {
 		application.getHostServices().showDocument(DOWNLOADS_URI);
 	}

-	@FXML
-	public void showLogfileDirectory() {
-		environment.getLogDir().ifPresent(logDirPath -> application.getHostServices().showDocument(logDirPath.toUri().toString()));
-	}
-
 	/* Observable Properties */

 	public ObjectBinding<ContentDisplay> checkForUpdatesButtonStateProperty() {
@@ -123,46 +77,6 @@ public class UpdatesPreferencesController implements FxController {
 		return currentVersion;
 	}

-	public StringBinding lastUpdateCheckMessageProperty() {
-		return lastUpdateCheckMessage;
-	}
-
-	public String getLastUpdateCheckMessage() {
-		Instant lastCheck = lastSuccessfulUpdateCheck.getValue();
-		if (lastCheck != null && !lastCheck.equals(Settings.DEFAULT_TIMESTAMP)) {
-			return formatter.format(LocalDateTime.ofInstant(lastCheck, ZoneId.systemDefault()));
-		} else {
-			return "-";
-		}
-	}
-
-	public ObservableValue<String> timeDifferenceMessageProperty() {
-		return timeDifferenceMessage;
-	}
-
-	public String getTimeDifferenceMessage() {
-		var lastSuccessCheck = lastSuccessfulUpdateCheck.getValue();
-		var duration = Duration.between(lastSuccessCheck, Instant.now());
-		var hours = duration.toHours();
-		if (lastSuccessCheck.equals(Settings.DEFAULT_TIMESTAMP)) {
-			return resourceBundle.getString("preferences.updates.lastUpdateCheck.never");
-		} else if (hours < 1) {
-			return resourceBundle.getString("preferences.updates.lastUpdateCheck.recently");
-		} else if (hours < 24) {
-			return String.format(resourceBundle.getString("preferences.updates.lastUpdateCheck.hoursAgo"), hours);
-		} else {
-			return String.format(resourceBundle.getString("preferences.updates.lastUpdateCheck.daysAgo"), duration.toDays());
-		}
-	}
-
-	public BooleanProperty upToDateLabelVisibleProperty() {
-		return upToDateLabelVisible;
-	}
-
-	public boolean isUpToDateLabelVisible() {
-		return upToDateLabelVisible.get();
-	}
-
 	public BooleanBinding updateAvailableProperty() {
 		return updateAvailable;
 	}
@@ -170,13 +84,4 @@ public class UpdatesPreferencesController implements FxController {
 	public boolean isUpdateAvailable() {
 		return updateAvailable.get();
 	}
-
-	public BooleanBinding checkFailedProperty() {
-		return checkFailed;
-	}
-
-	public boolean isCheckFailed() {
-		return checkFailed.getValue();
-	}
-
 }
@@ -0,0 +1,39 @@
+package org.cryptomator.ui.removevault;
+
+import dagger.BindsInstance;
+import dagger.Lazy;
+import dagger.Subcomponent;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+@RemoveVaultScoped
+@Subcomponent(modules = {RemoveVaultModule.class})
+public interface RemoveVaultComponent {
+
+	@RemoveVaultWindow
+	Stage window();
+
+	@FxmlScene(FxmlFile.REMOVE_VAULT)
+	Lazy<Scene> scene();
+
+	default void showRemoveVault() {
+		Stage stage = window();
+		stage.setScene(scene().get());
+		stage.sizeToScene();
+		stage.show();
+	}
+
+	@Subcomponent.Builder
+	interface Builder {
+
+		@BindsInstance
+		Builder vault(@RemoveVaultWindow Vault vault);
+
+		RemoveVaultComponent build();
+	}
+
+}
@@ -0,0 +1,40 @@
+package org.cryptomator.ui.removevault;
+
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
+
+@RemoveVaultScoped
+public class RemoveVaultController implements FxController {
+
+	private static final Logger LOG = LoggerFactory.getLogger(RemoveVaultController.class);
+
+	private final Stage window;
+	private final Vault vault;
+	private final ObservableList<Vault> vaults;
+
+	@Inject
+	public RemoveVaultController(@RemoveVaultWindow Stage window, @RemoveVaultWindow Vault vault, ObservableList<Vault> vaults) {
+		this.window = window;
+		this.vault = vault;
+		this.vaults = vaults;
+	}
+
+	@FXML
+	public void close() {
+		window.close();
+	}
+
+	@FXML
+	public void finish() {
+		vaults.remove(vault);
+		LOG.debug("Removing vault {}.", vault.getDisplayName());
+		window.close();
+	}
+}
@@ -0,0 +1,59 @@
+package org.cryptomator.ui.removevault;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.DefaultSceneFactory;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxControllerKey;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlLoaderFactory;
+import org.cryptomator.ui.common.FxmlScene;
+import org.cryptomator.ui.common.StageFactory;
+import org.cryptomator.ui.fxapp.PrimaryStage;
+
+import javax.inject.Provider;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+@Module
+abstract class RemoveVaultModule {
+
+	@Provides
+	@RemoveVaultWindow
+	@RemoveVaultScoped
+	static FxmlLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
+		return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle);
+	}
+
+	@Provides
+	@RemoveVaultWindow
+	@RemoveVaultScoped
+	static Stage provideStage(StageFactory factory, @PrimaryStage Stage primaryStage, @RemoveVaultWindow Vault vault, ResourceBundle resourceBundle) {
+		Stage stage = factory.create();
+		stage.setTitle(String.format(resourceBundle.getString("removeVault.title"), vault.getDisplayName()));
+		stage.setResizable(false);
+		stage.initModality(Modality.WINDOW_MODAL);
+		stage.initOwner(primaryStage);
+		return stage;
+	}
+
+	@Provides
+	@FxmlScene(FxmlFile.REMOVE_VAULT)
+	@RemoveVaultScoped
+	static Scene provideRemoveVaultScene(@RemoveVaultWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.REMOVE_VAULT);
+	}
+
+	// ------------------
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(RemoveVaultController.class)
+	abstract FxController bindRemoveVaultController(RemoveVaultController controller);
+}
@@ -0,0 +1,13 @@
+package org.cryptomator.ui.removevault;
+
+import javax.inject.Scope;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Scope
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RemoveVaultScoped {
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Armin Schrenk	c615ad2cd7	Merge branch 'develop' into feature/exe-cache-msis	2024-02-28 13:25:25 +01:00
Armin Schrenk	91a4db388f	cache also cryptomator and winfsp msi	2024-02-28 12:51:30 +01:00