Fixed #2270

2026-09-22 07:54:19 +00:00 · 2022-06-30 02:28:42 +02:00
234 changed files with 2250 additions and 8977 deletions
@@ -10,38 +10,43 @@ on:
        required: false

 env:
-  JAVA_VERSION: 19
+  JAVA_VERSION: 17

 jobs:
-  get-version:
-    uses: ./.github/workflows/get-version.yml
-    with:
-      version: ${{ github.event.inputs.version }}
-
  build:
    name: Build AppImage
    runs-on: ubuntu-latest
-    needs: [get-version]
    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Java
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
        with:
-          distribution: 'zulu'
+          fetch-depth: 0
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
          java-version: ${{ env.JAVA_VERSION }}
-          java-package: 'jdk+fx'
          cache: 'maven'
-      - name: Ensure major jfx version in pom equals in jdk
-        shell: pwsh
+      - id: versions 
+        name: Apply version information
        run: |
-          $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\."
-          $jfxJdkVersion = ((Get-Content -path "${env:JAVA_HOME}/lib/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\."
-          if ($jfxPomVersion[0] -ne $jfxJdkVersion[0]) {
-            Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version in JDK($($jfxJdkVersion[0])) "
-            exit 1
-          }
-      - name: Set version
-        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
+          if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR=${GITHUB_REF##*/}
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR="${{ github.event.inputs.version }}"
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          else
+            SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
+          fi
+          SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'`
+          REVCOUNT=`git rev-list --count HEAD`
+          echo "::set-output name=semVerStr::${SEM_VER_STR}"
+          echo "::set-output name=semVerNum::${SEM_VER_NUM}"
+          echo "::set-output name=revNum::${REVCOUNT}"
+      - name: Validate Version
+        uses: skymatic/semver-validation-action@v1
+        with:
+          version: ${{ steps.versions.outputs.semVerStr }}
      - name: Run maven
        run: mvn -B clean package -Pdependency-check,linux -DskipTests
      - name: Patch target dir
@@ -55,7 +60,7 @@ jobs:
          --verbose
          --output runtime
          --module-path "${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.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
+          --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
          --strip-native-commands
          --no-header-files
          --no-man-pages
@@ -64,8 +69,8 @@ jobs:
      - name: Prepare additional launcher
        run: envsubst '${SEMVER_STR} ${REVISION_NUM}' < dist/linux/launcher-gtk2.properties > launcher-gtk2.properties
        env:
-          SEMVER_STR: ${{  needs.get-version.outputs.semVerStr }}
-          REVISION_NUM: ${{  needs.get-version.outputs.revNum }}
+          SEMVER_STR: ${{  steps.versions.outputs.semVerStr }}
+          REVISION_NUM: ${{  steps.versions.outputs.revNum }}
      - name: Run jpackage
        run: >
          ${JAVA_HOME}/bin/jpackage
@@ -79,19 +84,18 @@ jobs:
          --name Cryptomator
          --vendor "Skymatic GmbH"
          --copyright "(C) 2016 - 2022 Skymatic GmbH"
-          --app-version "${{  needs.get-version.outputs.semVerNum }}.${{  needs.get-version.outputs.revNum }}"
+          --app-version "${{  steps.versions.outputs.semVerNum }}.${{  steps.versions.outputs.revNum }}"
          --java-options "-Xss5m"
          --java-options "-Xmx256m"
-          --java-options "-Dcryptomator.appVersion=\"${{  needs.get-version.outputs.semVerStr }}\""
+          --java-options "-Dcryptomator.appVersion=\"${{  steps.versions.outputs.semVerStr }}\""
          --java-options "-Dfile.encoding=\"utf-8\""
          --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\""
          --java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\""
          --java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"~/.config/Cryptomator/key.p12\""
          --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\""
          --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\""
          --java-options "-Dcryptomator.showTrayIcon=false"
-          --java-options "-Dcryptomator.buildNumber=\"appimage-${{  needs.get-version.outputs.revNum }}\""
+          --java-options "-Dcryptomator.buildNumber=\"appimage-${{  steps.versions.outputs.revNum }}\""
          --add-launcher Cryptomator-gtk2=launcher-gtk2.properties
          --resource-dir dist/linux/resources
      - name: Patch Cryptomator.AppDir
@@ -129,7 +133,7 @@ jobs:
          GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
      - name: Build AppImage
        run: >
-          ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{  needs.get-version.outputs.semVerStr }}-x86_64.AppImage
+          ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{  steps.versions.outputs.semVerStr }}-x86_64.AppImage
          -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync'
          --sign --sign-key=615D449FE6E6A235 --sign-args="--batch --pinentry-mode loopback"
      - name: Create detached GPG signatures
@@ -6,25 +6,26 @@ on:
    types: [labeled]

 env:
-  JAVA_VERSION: 19
+  JAVA_VERSION: 17

 defaults:
  run:
    shell: bash

-jobs:
+jobs: 
  test:
    name: Compile and Test
    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
        with:
-          distribution: 'zulu'
+          distribution: 'temurin'
          java-version: ${{ env.JAVA_VERSION }}
          cache: 'maven'
      - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: ~/.sonar/cache
          key: ${{ runner.os }}-sonar
@@ -15,74 +15,55 @@ on:
        required: false

 env:
-  JAVA_VERSION: 19
-  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/19/openjfx-19_linux-x64_bin-jmods.zip'
-  OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/19/openjfx-19_linux-aarch64_bin-jmods.zip'
+  JAVA_VERSION: 17

 jobs:
-  get-version:
-    uses: ./.github/workflows/get-version.yml
-    with:
-      version: ${{ github.event.inputs.version }}
-
  build:
    name: Build Debian Package
-    runs-on: ubuntu-20.04
-    needs: [get-version]
+    runs-on: ubuntu-18.04
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
      - name: Install build tools
        run: |
-          sudo add-apt-repository ppa:coffeelibs/openjdk
          sudo apt-get update
-          sudo apt-get install debhelper devscripts dput coffeelibs-jdk-19 libgtk2.0-0
+          sudo apt-get install debhelper devscripts dput
      - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
        with:
-          distribution: 'zulu'
+          distribution: 'temurin'
          java-version: ${{ env.JAVA_VERSION }}
          cache: 'maven'
-      - id: versions
-        name: Create PPA version string
-        run: echo "ppaVerStr=${SEM_VER_STR/-/\~}-${REVCOUNT}" >> $GITHUB_OUTPUT
-        env:
-          SEM_VER_STR: ${{ needs.get-version.outputs.semVerStr }}
-          REVCOUNT: ${{ needs.get-version.outputs.revNum }}
+      - id: versions 
+        name: Apply version information
+        run: |
+          if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR=${GITHUB_REF##*/}
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR="${{ github.event.inputs.version }}"
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          else
+            SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
+          fi
+          SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'`
+          REVCOUNT=`git rev-list --count HEAD`
+          echo "::set-output name=semVerStr::${SEM_VER_STR}"
+          echo "::set-output name=semVerNum::${SEM_VER_NUM}"
+          echo "::set-output name=revNum::${REVCOUNT}"
+          echo "::set-output name=ppaVerStr::${SEM_VER_STR/-/\~}-${REVCOUNT}"
+      - name: Validate Version
+        uses: skymatic/semver-validation-action@v1
+        with:
+          version: ${{ steps.versions.outputs.semVerStr }}
      - name: Run maven
        run: mvn -B clean package -Pdependency-check,linux -DskipTests
-      - name: Download OpenJFX jmods
-        id: download-jmods
-        run: |
-          curl -L ${{ env.OPENJFX_JMODS_AMD64 }} -o openjfx-amd64.zip
-          mkdir -p jmods/amd64
-          unzip -j openjfx-amd64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/amd64
-          curl -L ${{ env.OPENJFX_JMODS_AARCH64 }} -o openjfx-aarch64.zip
-          mkdir -p jmods/aarch64
-          unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64
-      - name: Ensure major jfx version in pom and in jmods is the same
-        shell: pwsh
-        run: |
-          mkdir jfxBaseJmodAmd64
-          jmod extract --dir jfxBaseJmodAmd64 jmods/amd64/javafx.base.jmod
-          $jfxJmodVersionAmd64 = ((Get-Content -Path "jfxBaseJmodAmd64/lib/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\."
-          mkdir jfxBaseJmodAarch64
-          jmod extract --dir jfxBaseJmodAarch64 jmods/aarch64/javafx.base.jmod
-          $jfxJmodVersionAarch64 = ((Get-Content -Path "jfxBaseJmodAarch64/lib/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\."
-          if ($jfxJmodVersionAmd64[0] -ne $jfxJmodVersionAarch64[0] ) {
-            Write-Error "JavaFX Jmods for aarch64 and amd64 are different major versions"
-            exit 1
-          }
-          $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\."
-          if ($jfxPomVersion[0] -ne $jfxJmodVersionAmd64[0]) {
-            Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version of Jmods($($jfxJmodVersionAmd64[0])) "
-            exit 1
-          }
-      - name: Create orig.tar.gz with common/ libs/ mods/ jmods/
+      - name: Create orig.tar.gz with common/ libs/ mods/
        run: |
          mkdir pkgdir
          cp -r target/libs pkgdir
          cp -r target/mods pkgdir
-          cp -r jmods pkgdir
          cp -r dist/linux/common/ pkgdir
          cp target/cryptomator-*.jar pkgdir/mods
          tar -cJf cryptomator_${{ steps.versions.outputs.ppaVerStr }}.orig.tar.xz -C pkgdir .
@@ -95,9 +76,9 @@ jobs:
          find . -name "*.jar" >> pkgdir/debian/source/include-binaries
          mv pkgdir cryptomator_${{ steps.versions.outputs.ppaVerStr }}
        env:
-          SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }}
-          VERSION_NUM: ${{ needs.get-version.outputs.semVerNum }}
-          REVISION_NUM: ${{ needs.get-version.outputs.revNum }}
+          SEMVER_STR: ${{ steps.versions.outputs.semVerStr }}
+          VERSION_NUM: ${{ steps.versions.outputs.semVerNum }}
+          REVISION_NUM: ${{ steps.versions.outputs.revNum }}
          PPA_VERSION: ${{ steps.versions.outputs.ppaVerStr }}-0ppa1
      - name: Prepare GPG-Agent for signing with key 615D449FE6E6A235
        run: |
@@ -130,7 +111,7 @@ jobs:
            cryptomator_*_amd64.deb
            cryptomator_*.asc
      - name: Publish on PPA
-        if: startsWith(github.ref, 'refs/tags/') || inputs.dput
+        if: startsWith(github.ref, 'refs/tags/') || github.event.inputs.dput == 'true'
        run: dput ppa:sebastian-stenzel/cryptomator-beta cryptomator_*_source.changes
      - name: Publish Debian package on GitHub Releases
        if: startsWith(github.ref, 'refs/tags/')
@@ -48,7 +48,7 @@ jobs:
          jq -c 'select(.filename|endswith(".dmg")) | select(.filename|endswith("-arm64.dmg")|not) | {name: "github.releases.downloads", tags: ["file=dmg", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json

          RESULT=$(jq -s -c "." output.json)
-          echo "result=${RESULT}" >> $GITHUB_OUTPUT
+          echo "::set-output name=result::${RESULT}"
        env:
          INTERVAL: 900
          JSON_DATA: ${{ steps.get-stats.outputs.result }}
@@ -1,60 +0,0 @@
-name: Update Error Database
-
-on:
-  discussion:
-    types: [created, edited, category_changed, answered, unanswered]
-  discussion_comment:
-    types: [created, edited, deleted]
-
-jobs:
-  update-error-db:
-    runs-on: ubuntu-latest
-    if: github.event.discussion.category.name == 'Errors'
-    steps:
-      - name: Query Discussion Data
-        id: query-data
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const query = `query ($owner: String!, $name: String!, $discussionNumber: Int!) {
-              repository(owner: $owner, name: $name) {
-                discussion(number: $discussionNumber) {
-                  id
-                  upvoteCount
-                  title
-                  url
-                  answer {
-                    url
-                    upvoteCount
-                  }
-                  comments {
-                    totalCount
-                  }
-                }
-              }
-            }`;
-            const variables = {
-              owner: context.repo.owner,
-              name: context.repo.repo,
-              discussionNumber: context.payload.discussion.number
-            }
-            return await github.graphql(query, variables)
-      - name: Get Gist
-        id: get-gist
-        uses: andymckay/get-gist-action@master
-        with:
-          gistURL: https://gist.github.com/cryptobot/accba9fb9555e7192271b85606f97230
-      - name: Merge Error Code Data
-        run: |
-          jq -c '.' ${{ steps.get-gist.outputs.file }} > original.json
-          echo $DISCUSSION | jq -c '.repository.discussion | .comments = .comments.totalCount | {(.id|tostring) : .}' > new.json
-          jq -s '.[0] * .[1]' original.json new.json > merged.json
-        env:
-          DISCUSSION: ${{ steps.query-data.outputs.result }}
-      - name: Patch Gist
-        uses: exuanbo/actions-deploy-gist@v1
-        with:
-          token: ${{ secrets.CRYPTOBOT_GIST_TOKEN }}
-          gist_id: accba9fb9555e7192271b85606f97230
-          gist_file_name: errorcodes.json
-          file_path: merged.json
@@ -1,77 +0,0 @@
-name: Parse and Validate a version string or tag
-
-on:
-  workflow_call:
-    inputs:
-      version:
-        description: "A specific version to use"
-        required: false
-        type: string
-    outputs:
-      semVerStr:
-        description: "The full version string."
-        value: ${{ jobs.determine-version.outputs.semVerStr}}
-      semVerNum:
-        description: "The numerical part of the version string"
-        value: ${{ jobs.determine-version.outputs.semVerNum}}
-      revNum:
-        description: "The revision number"
-        value: ${{ jobs.determine-version.outputs.revNum}}
-      versionType:
-        description: "Type of the version. Values are [stable, alpha, beta, rc, unknown]"
-        value: ${{ jobs.determine-version.outputs.type }}
-
-env:
-  JAVA_VERSION: 19
-  JAVA_DIST: 'temurin'
-  JAVA_CACHE: 'maven'
-
-jobs:
-  determine-version:
-    name: 'Determines the version following semver'
-    runs-on: ubuntu-latest
-    outputs:
-      semVerNum: ${{ steps.versions.outputs.semVerNum }}
-      semVerStr: ${{ steps.versions.outputs.semVerStr }}
-      revNum: ${{ steps.versions.outputs.revNum }}
-      type: ${{ steps.versions.outputs.type}}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: ${{ env.JAVA_DIST }}
-          java-version: ${{ env.JAVA_VERSION }}
-          cache: ${{ env.JAVA_CACHE }}
-      - id: versions
-        name: Get version information
-        run: |
-          if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
-            SEM_VER_STR=${GITHUB_REF##*/}
-          elif [[ "${{ inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then
-            SEM_VER_STR="${{ github.event.inputs.version }}"
-          else
-            SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
-          fi
-          SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'`
-          REVCOUNT=`git rev-list --count HEAD`
-          TYPE="unknown"
-          if [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
-            TYPE="stable"
-          elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-alpha[1-9] ]]; then
-            TYPE="alpha"
-          elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-beta[1-9] ]]; then
-            TYPE="beta"
-          elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-rc[1-9] ]]; then
-            TYPE="rc"
-          fi
-          echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT
-          echo "semVerNum=${SEM_VER_NUM}" >> $GITHUB_OUTPUT
-          echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT
-          echo "type=${TYPE}" >> $GITHUB_OUTPUT
-      - name: Validate Version
-        uses: skymatic/semver-validation-action@v2
-        with:
-          version: ${{ steps.versions.outputs.semVerStr }} 
@@ -10,52 +10,43 @@ on:
        required: false

 env:
-  JAVA_VERSION: 19
+  JAVA_VERSION: 17

 jobs:
-  get-version:
-    uses: ./.github/workflows/get-version.yml
-    with:
-      version: ${{ github.event.inputs.version }}
-
  build:
-    name: Build Cryptomator.app for ${{ matrix.output-suffix }}
-    runs-on: ${{ matrix.os }}
-    needs: [get-version]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - os: macos-11
-          architecture: x64
-          output-suffix: x64
-          xcode-path: '/Applications/Xcode_13.2.1.app'
-        - os: [self-hosted, macOS, ARM64]
-          architecture: aarch64
-          output-suffix: arm64
-          xcode-path: '/Applications/Xcode_13.2.1.app'
+    name: Build Cryptomator.app
+    runs-on: macos-11
    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Java
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
        with:
-          distribution: 'zulu'
+          fetch-depth: 0
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
          java-version: ${{ env.JAVA_VERSION }}
-          java-package: 'jdk+fx'
-          architecture: ${{ matrix.architecture }}
          cache: 'maven'
-      - name: Ensure major jfx version in pom equals in jdk
-        if: ${{ !contains(matrix.os, 'self-hosted') }}
-        shell: pwsh
+      - id: versions 
+        name: Apply version information
        run: |
-          $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\."
-          $jfxJdkVersion = ((Get-Content -path "${env:JAVA_HOME}/lib/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\."
-          if ($jfxPomVersion[0] -ne $jfxJdkVersion[0]) {
-            Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version in JDK($($jfxJdkVersion[0])) "
-            exit 1
-          }
-      - name: Set version
-        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
+          if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR=${GITHUB_REF##*/}
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR="${{ github.event.inputs.version }}"
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          else
+            SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
+          fi
+          SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'`
+          REVCOUNT=`git rev-list --count HEAD`
+          echo "::set-output name=semVerStr::${SEM_VER_STR}"
+          echo "::set-output name=semVerNum::${SEM_VER_NUM}"
+          echo "::set-output name=revNum::${REVCOUNT}"
+      - name: Validate Version
+        uses: skymatic/semver-validation-action@v1
+        with:
+          version: ${{ steps.versions.outputs.semVerStr }}
      - name: Run maven
        run: mvn -B clean package -Pdependency-check,mac -DskipTests
      - name: Patch target dir
@@ -69,7 +60,7 @@ jobs:
          --verbose
          --output runtime
          --module-path "${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.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
+          --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
          --strip-native-commands
          --no-header-files
          --no-man-pages
@@ -88,21 +79,20 @@ jobs:
          --name Cryptomator
          --vendor "Skymatic GmbH"
          --copyright "(C) 2016 - 2022 Skymatic GmbH"
-          --app-version "${{ needs.get-version.outputs.semVerNum }}"
+          --app-version "${{ steps.versions.outputs.semVerNum }}"
          --java-options "-Xss5m"
          --java-options "-Xmx256m"
          --java-options "-Dfile.encoding=\"utf-8\""
          --java-options "-Dapple.awt.enableTemplateImages=true"
          --java-options "-Dsun.java2d.metal=true"
-          --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
+          --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\""
          --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\""
          --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\""
          --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"~/Library/Application Support/Cryptomator/key.p12\""
          --java-options "-Dcryptomator.ipcSocketPath=\"~/Library/Application Support/Cryptomator/ipc.socket\""
          --java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"Cryptomator\""
          --java-options "-Dcryptomator.showTrayIcon=true"
-          --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\""
+          --java-options "-Dcryptomator.buildNumber=\"dmg-${{ steps.versions.outputs.revNum }}\""
          --mac-package-identifier org.cryptomator
          --resource-dir dist/mac/resources
      - name: Patch Cryptomator.app
@@ -112,8 +102,8 @@ jobs:
          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
        env:
-          VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
-          REVISION_NO: ${{ needs.get-version.outputs.revNum }}
+          VERSION_NO: ${{ steps.versions.outputs.semVerNum }}
+          REVISION_NO: ${{ steps.versions.outputs.revNum }}
      - name: Generate license for dmg
        run: >
          mvn -B license:add-third-party
@@ -147,10 +137,6 @@ jobs:
          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' -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
@@ -199,9 +185,9 @@ jobs:
          --icon ".background" 128 758
          --icon ".fseventsd" 320 758
          --icon ".VolumeIcon.icns" 512 758
-          Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg
+          Cryptomator-${VERSION_NO}.dmg dmg
        env:
-          VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
+          VERSION_NO: ${{ steps.versions.outputs.semVerNum }}
      - name: Notarize .dmg
        if: startsWith(github.ref, 'refs/tags/')
        uses: cocoalibs/xcode-notarization-action@v1
@@ -210,9 +196,8 @@ jobs:
          apple-id: ${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}
          password: ${{ secrets.MACOS_NOTARIZATION_PW }}
          team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
-          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
+        run: mv Cryptomator-*.dmg Cryptomator-${{ steps.versions.outputs.semVerStr }}.dmg
      - name: Create detached GPG signature with key 615D449FE6E6A235
        run: |
          echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
@@ -227,7 +212,7 @@ jobs:
      - name: Upload artifacts
        uses: actions/upload-artifact@v3
        with:
-          name: dmg-${{ matrix.output-suffix }}
+          name: dmg
          path: Cryptomator-*.dmg
          if-no-files-found: error
      - name: Publish dmg on GitHub Releases
@@ -239,3 +224,5 @@ jobs:
          files: |
            Cryptomator-*.dmg
            Cryptomator-*.asc
+
+
@@ -4,7 +4,7 @@ on:
  pull_request:

 env:
-  JAVA_VERSION: 19
+  JAVA_VERSION: 17

 defaults:
  run:
@@ -16,10 +16,10 @@ jobs:
    runs-on: ubuntu-latest
    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
        with:
-          distribution: 'zulu'
+          distribution: 'temurin'
          java-version: ${{ env.JAVA_VERSION }}
          cache: 'maven'
      - name: Build and Test
@@ -1,43 +0,0 @@
-name: Release Check
-
-on:
-  push:
-    branches:
-      - 'release/**'
-      - 'hotfix/**'
-
-env:
-  JAVA_VERSION: 19
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  release-check-precondition:
-    name: Validate commits pushed to release/hotfix branch to fulfill release requirements
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - id: validate-pom-version
-        name: Validate POM version
-        run: |
-          if [[ $GITHUB_REF =~ refs/heads/(hotfix|release)/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
-            SEM_VER_STR=${GITHUB_REF##*/}
-          else
-            echo "Failed to parse version"
-            exit 1
-          fi
-
-          if [[ ${SEM_VER_STR} == `mvn help:evaluate -Dexpression=project.version -q -DforceStdout` ]]; then
-            echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT
-          else
-            echo "Version not set in POM"
-            exit 1
-          fi
-      - name: Validate release in org.cryptomator.Cryptomator.metainfo.xml file
-        run: |
-          if ! grep -q "<release date=\".*\" version=\"${{ steps.validate-pom-version.outputs.semVerStr }}\"/>" dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml; then
-            echo "Release not set in dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml"
-            exit 1
-          fi
@@ -10,46 +10,48 @@ on:
        required: false

 env:
-  JAVA_VERSION: 19
-  JAVA_DIST: 'zulu'
-  JAVA_CACHE: 'maven'
+  JAVA_VERSION: 17
+  WINFSP_MSI: https://github.com/winfsp/winfsp/releases/download/v1.10/winfsp-1.10.22006.msi

 defaults:
  run:
    shell: bash

 jobs:
-  get-version:
-    uses: ./.github/workflows/get-version.yml
-    with:
-      version: ${{ github.event.inputs.version }}
-
  build-msi:
    name: Build .msi Installer
    runs-on: windows-latest
-    needs: [get-version]
-    env:
-      LOOPBACK_ALIAS: 'cryptomator-vault'
    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Java
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
        with:
-          distribution: ${{ env.JAVA_DIST }}
+          fetch-depth: 0
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
          java-version: ${{ env.JAVA_VERSION }}
-          java-package: 'jdk+fx'
-          cache: ${{ env.JAVA_CACHE }}
-      - name: Ensure major jfx version in pom equals in jdk
-        shell: pwsh
+          cache: 'maven'
+      - id: versions 
+        name: Apply version information
        run: |
-          $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\."
-          $jfxJdkVersion = ((Get-Content -path "${env:JAVA_HOME}/lib/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\."
-          if ($jfxPomVersion[0] -ne $jfxJdkVersion[0]) {
-            Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version in JDK($($jfxJdkVersion[0])) "
-            exit 1
-          }
-      - name: Set version
-        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
+          if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR=${GITHUB_REF##*/}
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then
+            SEM_VER_STR="${{ github.event.inputs.version }}"
+            mvn versions:set -DnewVersion=${SEM_VER_STR}
+          else
+            SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
+          fi
+          SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'`
+          REVCOUNT=`git rev-list --count HEAD`
+          echo "::set-output name=semVerStr::${SEM_VER_STR}"
+          echo "::set-output name=semVerNum::${SEM_VER_NUM}"
+          echo "::set-output name=revNum::${REVCOUNT}"
+      - name: Validate Version
+        uses: skymatic/semver-validation-action@v1
+        with:
+          version: ${{ steps.versions.outputs.semVerStr }}
      - name: Run maven
        run: mvn -B clean package -Pdependency-check,win -DskipTests
      - name: Patch target dir
@@ -63,7 +65,7 @@ jobs:
          --verbose
          --output runtime
          --module-path "${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.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
+          --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr
          --strip-native-commands
          --no-header-files
          --no-man-pages
@@ -82,46 +84,34 @@ jobs:
          --name Cryptomator
          --vendor "Skymatic GmbH"
          --copyright "(C) 2016 - 2022 Skymatic GmbH"
-          --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
+          --app-version "${{ steps.versions.outputs.semVerNum }}.${{ steps.versions.outputs.revNum }}"
          --java-options "-Xss5m"
          --java-options "-Xmx256m"
-          --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
+          --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\""
          --java-options "-Dfile.encoding=\"utf-8\""
          --java-options "-Dcryptomator.logDir=\"~/AppData/Roaming/Cryptomator\""
          --java-options "-Dcryptomator.pluginDir=\"~/AppData/Roaming/Cryptomator/Plugins\""
          --java-options "-Dcryptomator.settingsPath=\"~/AppData/Roaming/Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"~/AppData/Roaming/Cryptomator/key.p12\""
          --java-options "-Dcryptomator.ipcSocketPath=\"~/AppData/Roaming/Cryptomator/ipc.socket\""
+          --java-options "-Dcryptomator.keychainPath=\"~/AppData/Roaming/Cryptomator/keychain.json\""
          --java-options "-Dcryptomator.mountPointsDir=\"~/Cryptomator\""
-          --java-options "-Dcryptomator.loopbackAlias=\"${{ env.LOOPBACK_ALIAS }}\""
          --java-options "-Dcryptomator.showTrayIcon=true"
-          --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\""
+          --java-options "-Dcryptomator.buildNumber=\"msi-${{ steps.versions.outputs.revNum }}\""
          --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\""
-          --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"~/AppData/Roaming/Cryptomator/keychain.json\""
          --resource-dir dist/win/resources
          --icon dist/win/resources/Cryptomator.ico
      - name: Patch Application Directory
        run: |
          cp dist/win/contrib/* appdir/Cryptomator
-      - name: Set LOOPBACK_ALIAS in patchWebDAV.bat
-        shell: pwsh
-        run: |
-          $patchScript = "appdir\Cryptomator\patchWebDAV.bat"
-          try {
-            (Get-Content $patchScript ) -replace '::REPLACE ME', "SET LOOPBACK_ALIAS=`"${{ env.LOOPBACK_ALIAS}}`"" | Set-Content $patchScript
-          } catch {
-            Write-Host "Failed to set LOOPBACK_ALIAS for patchWebDAV.bat"
-            exit 1
-          }
      - name: Fix permissions
        run: attrib -r appdir/Cryptomator/Cryptomator.exe
        shell: pwsh
      - name: Codesign
-        uses: skymatic/code-sign-action@v2
+        uses: skymatic/code-sign-action@v1
        with:
          certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }}
          password: ${{ secrets.WIN_CODESIGN_P12_PW }}
-          certificatesha1: 5FC94CE149E5B511E621F53A060AC67CBD446B3A
+          certificatesha1: FF52240075AD7D14AF25629FDF69635357C7D14B
          description: Cryptomator
          timestampUrl: 'http://timestamp.digicert.com'
          folder: appdir/Cryptomator
@@ -148,7 +138,7 @@ jobs:
          --name Cryptomator
          --vendor "Skymatic GmbH"
          --copyright "(C) 2016 - 2022 Skymatic GmbH"
-          --app-version "${{ needs.get-version.outputs.semVerNum }}"
+          --app-version "${{ steps.versions.outputs.semVerNum }}"
          --win-menu
          --win-dir-chooser
          --win-shortcut-prompt
@@ -160,16 +150,16 @@ jobs:
        env:
          JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs
      - name: Codesign MSI
-        uses: skymatic/code-sign-action@v2
+        uses: skymatic/code-sign-action@v1
        with:
          certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }}
          password: ${{ secrets.WIN_CODESIGN_P12_PW }}
-          certificatesha1: 5FC94CE149E5B511E621F53A060AC67CBD446B3A
+          certificatesha1: FF52240075AD7D14AF25629FDF69635357C7D14B
          description: Cryptomator Installer
          timestampUrl: 'http://timestamp.digicert.com'
          folder: installer
      - name: Add possible alpha/beta tags to installer name
-        run: mv installer/Cryptomator-*.msi Cryptomator-${{ needs.get-version.outputs.semVerStr }}-x64.msi
+        run: mv installer/Cryptomator-*.msi Cryptomator-${{ steps.versions.outputs.semVerStr }}-x64.msi
      - name: Create detached GPG signature with key 615D449FE6E6A235
        run: |
          echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
@@ -194,34 +184,42 @@ jobs:
          files: |
            *.msi
            *.asc
+    outputs:
+      semVerNum: ${{ steps.versions.outputs.semVerNum }}
+      semVerStr: ${{ steps.versions.outputs.semVerStr }}
+      revNum: ${{ steps.versions.outputs.revNum }}

-  call-winget-flow:
-    needs: [get-version, build-msi]
-    if: github.event.action == 'published' && needs.get-version.outputs.type == 'stable'
-    uses: ./.github/workflows/winget.yml
-    with:
-      releaseTag: ${{ github.event.release.tag_name }}
-    secrets: inherit
-
+  publish-winget:
+    name: Publish on winget repo
+    runs-on: windows-latest
+    needs: [build-msi]
+    steps:
+      - name: Submit package to Windows Package Manager Community Repository
+        run: |
+          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
+          $github = Get-Content '${{ github.event_path }}' | ConvertFrom-Json
+          $installerUrl = $github.release.assets | Where-Object -Property name -match 'Cryptomator-*.msi' | Select -ExpandProperty browser_download_url -First 1
+          .\wingetcreate.exe update Cryptomator.Cryptomator -s -v $github.release.tag_name -u $installerUrl -t ${{ secrets.CRYPTOBOT_WINGET_TOKEN }}
+        shell: pwsh

  build-exe:
    name: Build .exe installer
    runs-on: windows-latest
-    needs: [get-version, build-msi]
+    needs: [build-msi]
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - name: Download .msi
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
        with:
          name: msi
          path: dist/win/bundle/resources
      - name: Strip version info from msi file name
        run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v2
        with:
-          distribution: ${{ env.JAVA_DIST }}
+          distribution: 'temurin'
          java-version: ${{ env.JAVA_VERSION }}
-          cache: ${{ env.JAVA_CACHE }}
+          cache: 'maven'
      - name: Generate license for exe
        run: >
          mvn -B license:add-third-party
@@ -234,16 +232,14 @@ jobs:
          "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
        shell: pwsh
      - name: Download WinFsp
-        run: |
-          $winfspUrl= (Select-String -Path ".\dist\win\bundle\resources\winfsp-download.url" -Pattern 'https:.*').Matches.Value
-          curl --output dist/win/bundle/resources/winfsp.msi -L $winfspUrl
-        shell: pwsh
+        run:
+          curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }}
      - name: Compile to wixObj file
        run: >
          "${WIX}/bin/candle.exe" dist/win/bundle/bundleWithWinfsp.wxs
          -ext WixBalExtension
          -out dist/win/bundle/
-          -dBundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
+          -dBundleVersion="${{ needs.build-msi.outputs.semVerNum }}.${{ needs.build-msi.outputs.revNum }}"
          -dBundleVendor="Skymatic GmbH"
          -dBundleCopyright="(C) 2016 - 2022 Skymatic GmbH"
          -dAboutUrl="https://cryptomator.org"
@@ -260,11 +256,11 @@ jobs:
          -ib installer/unsigned/Cryptomator-Installer.exe
          -o tmp/engine.exe
      - name: Codesign burn engine
-        uses: skymatic/code-sign-action@v2
+        uses: skymatic/code-sign-action@v1
        with:
          certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }}
          password: ${{ secrets.WIN_CODESIGN_P12_PW }}
-          certificatesha1: 5FC94CE149E5B511E621F53A060AC67CBD446B3A
+          certificatesha1: FF52240075AD7D14AF25629FDF69635357C7D14B
          description: Cryptomator Installer
          timestampUrl: 'http://timestamp.digicert.com'
          folder: tmp
@@ -274,16 +270,16 @@ jobs:
          -ab tmp/engine.exe installer/unsigned/Cryptomator-Installer.exe
          -o installer/Cryptomator-Installer.exe
      - name: Codesign EXE
-        uses: skymatic/code-sign-action@v2
+        uses: skymatic/code-sign-action@v1
        with:
          certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }}
          password: ${{ secrets.WIN_CODESIGN_P12_PW }}
-          certificatesha1: 5FC94CE149E5B511E621F53A060AC67CBD446B3A
+          certificatesha1: FF52240075AD7D14AF25629FDF69635357C7D14B
          description: Cryptomator Installer
          timestampUrl: 'http://timestamp.digicert.com'
          folder: installer
      - name: Add possible alpha/beta tags to installer name
-        run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.get-version.outputs.semVerStr }}-x64.exe
+        run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.build-msi.outputs.semVerStr }}-x64.exe
      - name: Create detached GPG signature with key 615D449FE6E6A235
        run: |
          echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
@@ -1,49 +0,0 @@
-name: Release to Winget
-
-on:
-  workflow_call:
-    inputs:
-      releaseTag:
-        required: true
-        type: string
-  workflow_dispatch:
-    inputs:
-      releaseTag:
-        description: 'Release tag name'
-        required: true
-        type: string
-
-jobs:
-  publish-winget:
-    name: Publish on winget repo
-    runs-on: windows-latest
-    steps:
-      - name: Get download url for msi artifacts
-        id: get-release-assets
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const query =`query($tag:String!) {
-              repository(owner:"cryptomator", name:"cryptomator"){
-                release(tagName: $tag) {
-                    releaseAssets(first:20) {
-                      nodes {
-                        name
-                        downloadUrl
-                      }
-                  }
-                }
-              }
-            }`;
-            const variables = {
-              tag: "${{ inputs.releaseTag }}"
-            }
-            return await github.graphql(query, variables)
-      - name: Submit package to Windows Package Manager Community Repository
-        id: submit-winget
-        run: |
-          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-          $releaseAssets = (ConvertFrom-Json '${{ steps.get-release-assets.outputs.result }}').repository.release.releaseAssets.nodes
-          $installerUrl = $releaseAssets | Where-Object -Property name -match '^Cryptomator-.*\.msi$' | Select -ExpandProperty downloadUrl -First 1
-          .\wingetcreate.exe update Cryptomator.Cryptomator -s -v "${{ inputs.releaseTag }}" -u "$installerUrl" -t ${{ secrets.CRYPTOBOT_WINGET_TOKEN }}
-        shell: pwsh
@@ -14,10 +14,10 @@
        <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.44/dagger-compiler-2.44.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.44/dagger-2.44.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.41/dagger-compiler-2.41.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.41/dagger-2.41.jar" />
          <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.44/dagger-producers-2.44.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.41/dagger-producers-2.41.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" />
@@ -26,18 +26,18 @@
          <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.44/dagger-spi-2.44.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/devtools/ksp/symbol-processing-api/1.7.0-1.0.6/symbol-processing-api-1.7.0-1.0.6.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.41/dagger-spi-2.41.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/devtools/ksp/symbol-processing-api/1.5.30-1.0.0/symbol-processing-api-1.5.30-1.0.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.32/kotlin-stdlib-jdk8-1.5.32.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.5.32/kotlin-stdlib-1.5.32.jar" />
          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.32/kotlin-stdlib-common-1.5.32.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.32/kotlin-stdlib-jdk7-1.5.32.jar" />
          <entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.13.0/javapoet-1.13.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.0/kotlin-stdlib-jdk8-1.7.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.0/kotlin-stdlib-jdk7-1.7.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$/net/ltgt/gradle/incap/incap/0.2/incap-0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.5.0/kotlinx-metadata-jvm-0.5.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.3.0/kotlinx-metadata-jvm-0.3.0.jar" />
        </processorPath>
        <module name="cryptomator" />
      </profile>
@@ -8,7 +8,7 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="19" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Linux" 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;~/.config/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;~/.config/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/.config/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator/logs&quot; -Dcryptomator.pluginDir=&quot;~/.local/share/Cryptomator/plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/.config/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/.config/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator/logs&quot; -Dcryptomator.pluginDir=&quot;~/.local/share/Cryptomator/plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Linux 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;~/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;~/.config/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/.config/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.pluginDir=&quot;~/.local/share/Cryptomator-Dev/plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/.config/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.pluginDir=&quot;~/.local/share/Cryptomator-Dev/plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -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/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/AppData/Roaming/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/AppData/Roaming/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;~/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/AppData/Roaming/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/AppData/Roaming/Cryptomator/Plugins&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m" />
    <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/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/AppData/Roaming/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/AppData/Roaming/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;~/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;~/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/AppData/Roaming/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/AppData/Roaming/Cryptomator-Dev/Plugins&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -5,7 +5,7 @@
    </envs>
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;~/Library/Application Support/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea" />
+    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -5,7 +5,7 @@
    </envs>
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;~/Library/Application Support/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea" />
+    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -32,17 +32,10 @@ Cryptomator is provided free of charge as an open-source project despite the hig
  <tbody>
    <tr>
      <td><a href="https://mowcapital.com/"><img src="https://cryptomator.org/img/sponsors/mowcapital.svg" alt="Mow Capital" height="40"></a></td>
-      <td><a href="https://www.easeus.com/"><img src="https://cryptomator.org/img/sponsors/easeus.png" alt="EaseUS" height="40"></a></td>
    </tr>
  </tbody>
 </table>

-### Special Shoutout
-
-Continuous integration hosting for ARM64 builds is provided by [MacStadium](https://www.macstadium.com/opensource).
-
-<a href="https://www.macstadium.com/opensource"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="MacStadium" height="100"></a>
-
 ---

 ## Introduction
@@ -61,7 +54,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
- Four thousand commits for the security of your data!! :tada:
+- Three thousand commits for the security of your data!! :tada:

 ### Privacy

@@ -85,20 +78,24 @@ For more information on the security details visit [cryptomator.org](https://doc

 ### Dependencies

-* JDK 19 (e.g. temurin)
+* JDK 17 (e.g. temurin)
 * Maven 3

 ### Run Maven

 ```
 mvn clean install
-# or mvn clean install -Pwin
+# or mvn clean install -Pwindows
 # or mvn clean install -Pmac
 # or mvn clean install -Plinux
 ```

 This will build all the jars and bundle them together with their OS-specific dependencies under `target`. This can now be used to build native packages.

+### Start Cryptomator
+
+If you unzip the buildkit for your OS, you will find a launcher script with some basic settings. You might want to adjust these to your needs. To start Cryptomator, simply execute the launcher script from a terminal, e.g. `launcher-linux.sh`, if you're on a Linux system.
+
 ## License

 This project is dual-licensed under the GPLv3 for FOSS projects as well as a commercial license for independent software vendors and resellers. If you want to modify this application under different conditions, feel free to contact our support team.
@@ -19,7 +19,7 @@ cp ../../../target/cryptomator-*.jar ../../../target/mods
 ${JAVA_HOME}/bin/jlink \
    --output runtime \
    --module-path "${JAVA_HOME}/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.crypto.ec,jdk.accessibility,jdk.management.jfr \
+    --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \
    --strip-native-commands \
    --no-header-files \
    --no-man-pages \
@@ -19,7 +19,7 @@ fi
 export LD_PRELOAD=lib/app/libjffi.so

 if [ "$GTK2_PRESENT" -eq 0 ] && [ "$GTK3_PRESENT" -ne 0 ]; then
-	bin/Cryptomator-gtk2 $@
+	bin/Cryptomator-gtk2
 else
-	bin/Cryptomator $@
+	bin/Cryptomator
 fi
@@ -66,11 +66,6 @@
 	</content_rating>

 	<releases>
-		<release date="2022-12-06" version="1.6.16"/>
-		<release date="2022-10-06" version="1.6.15"/>
-		<release date="2022-08-31" version="1.6.14"/>
-		<release date="2022-07-27" version="1.6.12"/>
-		<release date="2022-07-26" version="1.6.11"/>
 		<release date="2022-05-03" version="1.6.10"/>
 		<release date="2022-04-27" version="1.6.9"/>
 		<release date="2022-03-30" version="1.6.8"/>
@@ -1,4 +1,4 @@
-cryptomator (${PPA_VERSION}) focal; urgency=low
+cryptomator (${PPA_VERSION}) bionic; urgency=low

  * Full changelog can be found on https://github.com/cryptomator/cryptomator/releases

@@ -2,7 +2,7 @@ Source: cryptomator
 Maintainer: Cryptobot <releases@cryptomator.org>
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>=10), coffeelibs-jdk-19, libgtk2.0-0
+Build-Depends: debhelper (>=10), openjdk-17-jdk
 Standards-Version: 4.5.0
 Homepage: https://cryptomator.org
 Vcs-Git: https://github.com/cryptomator/cryptomator.git
@@ -3,4 +3,4 @@
 # fix for https://github.com/cryptomator/cryptomator/issues/1370
 export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/jni/libjffi-1.2.so

-/usr/lib/cryptomator/bin/cryptomator $@
+/usr/lib/cryptomator/bin/cryptomator
@@ -4,14 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

-JAVA_HOME = /usr/lib/jvm/java-19-coffeelibs
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(DEB_BUILD_ARCH),amd64)
-JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods
-else ifeq ($(DEB_BUILD_ARCH),arm64)
-JMODS_PATH = jmods/aarch64:${JAVA_HOME}/jmods
-endif
-
 %:
 	dh $@

@@ -24,16 +16,15 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	mkdir resources
 	ln -s ../common/org.cryptomator.Cryptomator512.png resources/cryptomator.png
-	$(JAVA_HOME)/bin/jlink \
+	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.crypto.ec,jdk.accessibility,jdk.management.jfr \
+		--add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \
 		--strip-native-commands \
 		--no-header-files \
 		--no-man-pages \
 		--strip-debug \
 		--compress=2
-	$(JAVA_HOME)/bin/jpackage \
+	jpackage \
 		--type app-image \
 		--runtime-image runtime \
 		--input libs \
@@ -49,7 +40,6 @@ override_dh_auto_build:
 		--java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" \
 		--java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\"" \
 		--java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\"" \
-		--java-options "-Dcryptomator.p12Path=\"~/.config/Cryptomator/key.p12\"" \
 		--java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" \
 		--java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" \
 		--java-options "-Dcryptomator.showTrayIcon=false" \
@@ -45,7 +45,7 @@ cp ../../../target/${MAIN_JAR_GLOB} ../../../target/mods
 ${JAVA_HOME}/bin/jlink \
    --output runtime \
    --module-path "${JAVA_HOME}/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.crypto.ec,jdk.accessibility,jdk.management.jfr \
+    --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \
    --strip-native-commands \
    --no-header-files \
    --no-man-pages \
@@ -75,7 +75,6 @@ ${JAVA_HOME}/bin/jpackage \
    --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/${APP_NAME}/Plugins\"" \
    --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/${APP_NAME}/settings.json\"" \
    --java-options "-Dcryptomator.ipcSocketPath=\"~/Library/Application Support/${APP_NAME}/ipc.socket\"" \
-    --java-options "-Dcryptomator.p12Path=\"~/Library/Application Support/${APP_NAME}/key.p12\"" \
    --java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"${APP_NAME}\"" \
    --java-options "-Dcryptomator.showTrayIcon=true" \
    --java-options "-Dcryptomator.buildNumber=\"dmg-${REVISION_NO}\"" \
@@ -9,9 +9,8 @@ SET ABOUT_URL="https://cryptomator.org"
 SET UPDATE_URL="https://cryptomator.org/downloads/"
 SET HELP_URL="https://cryptomator.org/contact/"
 SET MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator"
-SET LOOPBACK_ALIAS="cryptomator-vault"

-powershell -NoLogo -ExecutionPolicy Unrestricted -Command .\build.ps1^
+powershell -NoLogo -NoExit -ExecutionPolicy Unrestricted -Command .\build.ps1^
 -AppName %APPNAME%^
 -MainJarGlob "%MAIN_JAR_GLOB%"^
 -ModuleAndMainClass "%MODULE_AND_MAIN_CLASS%"^
@@ -21,5 +20,4 @@ powershell -NoLogo -ExecutionPolicy Unrestricted -Command .\build.ps1^
 -AboutUrl "%ABOUT_URL%"^
 -HelpUrl "%HELP_URL%"^
 -UpdateUrl "%UPDATE_URL%"^
- -LoopbackAlias "%LOOPBACK_ALIAS%"^
 -Clean 1
@@ -8,7 +8,6 @@ Param(
 	[Parameter(Mandatory, HelpMessage="Please provide a help url")][string] $HelpUrl,
 	[Parameter(Mandatory, HelpMessage="Please provide an update url")][string] $UpdateUrl,
 	[Parameter(Mandatory, HelpMessage="Please provide an about url")][string] $AboutUrl,
-	[Parameter(Mandatory, HelpMessage="Please provide an alias for localhost")][string] $LoopbackAlias,
 	[bool] $clean
 )

@@ -51,7 +50,7 @@ if ($clean -and (Test-Path -Path $runtimeImagePath)) {
 	--verbose `
 	--output runtime `
 	--module-path "$Env:JAVA_HOME/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.crypto.ec,jdk.accessibility,jdk.management.jfr `
+	--add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr `
 	--strip-native-commands `
 	--no-header-files `
 	--no-man-pages `
@@ -84,11 +83,9 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--java-options "-Dcryptomator.pluginDir=`"~/AppData/Roaming/$AppName/Plugins`"" `
 	--java-options "-Dcryptomator.settingsPath=`"~/AppData/Roaming/$AppName/settings.json`"" `
 	--java-options "-Dcryptomator.ipcSocketPath=`"~/AppData/Roaming/$AppName/ipc.socket`"" `
-	--java-options "-Dcryptomator.p12Path=`"~/AppData/Roaming/$AppName/key.p12`"" `
+	--java-options "-Dcryptomator.keychainPath=`"~/AppData/Roaming/$AppName/keychain.json`"" `
 	--java-options "-Dcryptomator.mountPointsDir=`"~/$AppName`"" `
-	--java-options "-Dcryptomator.loopbackAlias=`"$LoopbackAlias`"" `
 	--java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=`"$AppName`"" `
-	--java-options "-Dcryptomator.integrationsWin.keychainPaths=`"~/AppData/Roaming/$AppName/keychain.json`"" `
 	--java-options "-Dcryptomator.showTrayIcon=true" `
 	--java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" `
 	--resource-dir resources `
@@ -107,14 +104,6 @@ if ($clean -and (Test-Path -Path $appPath)) {
 # patch app dir
 Copy-Item "contrib\*" -Destination "$AppName"
 attrib -r "$AppName\$AppName.exe"
-# patch batch script to set hostfile
-$webDAVPatcher = "$AppName\patchWebDAV.bat"
-try {
-	(Get-Content $webDAVPatcher ) -replace '::REPLACE ME', "SET LOOPBACK_ALIAS=`"$LoopbackAlias`"" | Set-Content $webDAVPatcher
-} catch {
-   Write-Host "Failed to set LOOPBACK_ALIAS for patchWebDAV.bat"
-   exit 1
-}

 # create .msi
 $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
@@ -151,7 +140,7 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
 # download Winfsp
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 $ProgressPreference = 'SilentlyContinue' # disables Invoke-WebRequest's progress bar, which slows down downloads to a few bytes/s
-$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winfsp-download.url" -Pattern 'https:.*').Matches.Value
+$winfspMsiUrl = "https://github.com/winfsp/winfsp/releases/download/v1.10/winfsp-1.10.22006.msi"
 Write-Output "Downloading ${winfspMsiUrl}..."
 Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redirects are followed by default

@@ -1,2 +0,0 @@
-[InternetShortcut]
-URL=https://github.com/winfsp/winfsp/releases/download/v1.12/winfsp-1.12.22301.msi
@@ -1,6 +1,6 @@
@echo off
 :: Default values for Cryptomator builds
-::REPLACE ME
+SET LOOPBACK_ALIAS="cryptomator-vault"

 cd %~dp0
 powershell -NoLogo -NonInteractive -ExecutionPolicy Unrestricted -Command .\patchWebDAV.ps1^
@@ -23,11 +23,6 @@
    <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
  <?endif?>

-  <!-- Cryptomator defaults -->
-  <?define IconFileEncryptedData= "Cryptomator-Vault.ico" ?>
-  <?define ProgIdContentType= "application/vnd.cryptomator.encrypted" ?>
-  <?define CloseApplicationTarget= "cryptomator.exe" ?>
-
  <?include $(var.JpConfigDir)/overrides.wxi ?>

  <Product
@@ -70,16 +65,16 @@
    <CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
    <?endif?>

-    <?ifndef SkipCryptomatorLegacyCheck ?>
-      <!-- Block installation if innosetup entry of Cryptomator is found -->
-      <Property Id="OLDEXEINSTALLER">
-        <RegistrySearch Id="InnoSetupInstallation" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Cryptomator_is1" Type="raw" Name="DisplayName" />
-      </Property>
-      <!-- TODO: localize -->
-      <Condition Message="A lower version of [ProductName] is already installed. Uninstall it first and then start the setup again. Setup will now exit.">
-          <![CDATA[Installed OR NOT OLDEXEINSTALLER]]>
-      </Condition>
-    <?endif?>
+
+    <!-- Looking for legacy Cryptomator versions-->
+    <Property Id="OLDEXEINSTALLER">
+      <RegistrySearch Id="InnoSetupInstallation" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Cryptomator_is1" Type="raw" Name="DisplayName" />
+    </Property>
+    <!-- Block installation if innosetup entry of Cryptomator is found -->
+    <!-- TODO: localize -->
+    <Condition Message="A lower version of [ProductName] is already installed. Uninstall it first and then start the setup again. Setup will now exit.">
+        <![CDATA[Installed OR NOT OLDEXEINSTALLER]]>
+    </Condition>
    <!-- Cryptomator uses UNIX Sockets, which are supported starting with Windows 10 v1803-->
    <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
      <RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
@@ -91,7 +86,7 @@
    <!-- Non-Opening ProgID -->
    <DirectoryRef Id="INSTALLDIR">
        <Component Win64="yes" Id="nonStartingProgID" >
-          <File Id="IconFileForEncryptedData" KeyPath="yes" Source="$(env.JP_WIXWIZARD_RESOURCES)\$(var.IconFileEncryptedData)" Name="$(var.IconFileEncryptedData)"></File>
+          <File Id="IconFileForEncryptedData" KeyPath="yes" Source="$(env.JP_WIXWIZARD_RESOURCES)\$(var.IconFileC9rC9s)" Name="$(var.IconFileC9rC9s)"></File>
          <ProgId Id="$(var.JpAppName).Encrypted.1" Description="$(var.JpAppName) Encrypted Data" Icon="IconFileForEncryptedData" IconIndex="0">
            <Extension Id="c9r" Advertise="no" ContentType="$(var.ProgIdContentType)">
              <MIME ContentType="$(var.ProgIdContentType)" Default="yes"></MIME>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Stub by design -->

-<!-- jPackage Section
+<!--
 overrides.wxi is a placeholder to set/alter WiX variables referenced from default
 main.wxs file.

@@ -30,21 +30,10 @@ Should be defined to enable upgrades and undefined to disable upgrades.
 Default value is `yes`.
 -->

-<!-- Cryptomator Section
+<!-- Non-opening ProgID settings-->
+<?define IconFileC9rC9s= "Cryptomator-Vault.ico" ?>
+<?define ProgIdContentType= "application/vnd.cryptomator.encrypted" ?>

-Non-opening ProgID settings:
- IconFileEncryptedData
-Full file name of icon file used for encrypted data files. Default is "Cryptomator-Vault.ico"
-
- ProgIdContentType
-Media Type of the encrypted data files. Default is "application/vnd.cryptomator.encrypted"
-
-Close Application settings:
- CloseApplicationTarget
-Full name of executable to be checkd in the close application util. Default is "cryptomator.exe"
-
-Legacy Installation settings:
- SkipCryptomatorLegacyCheck
-Should be defined to disable checking for the inno setup installation of Cryptomator and undefined, to enable it.
- -->
+<!-- Close Application util -->
+<?define CloseApplicationTarget= "cryptomator.exe" ?>
 <Include/>
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptomator</artifactId>
-	<version>1.6.16</version>
+	<version>1.7.0-SNAPSHOT</version>
 	<name>Cryptomator Desktop App</name>

 	<organization>
@@ -21,44 +21,42 @@

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>19</project.jdk.version>
+		<project.jdk.version>17</project.jdk.version>

 		<!-- Group IDs of jars that need to stay on the class path for now -->
 		<nonModularGroupIds>com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh</nonModularGroupIds>

 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.5.3</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>1.2.0-beta1</cryptomator.integrations.version>
-		<cryptomator.integrations.win.version>1.1.2</cryptomator.integrations.win.version>
-		<cryptomator.integrations.mac.version>1.1.2</cryptomator.integrations.mac.version>
+		<cryptomator.cryptofs.version>2.4.2</cryptomator.cryptofs.version>
+		<cryptomator.integrations.version>1.1.0</cryptomator.integrations.version>
+		<cryptomator.integrations.win.version>1.1.1</cryptomator.integrations.win.version>
+		<cryptomator.integrations.mac.version>1.1.1</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>1.1.0</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.3.4</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.3.3</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.2.8</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.2.7</cryptomator.webdav.version>

 		<!-- 3rd party dependencies -->
+		<javafx.version>18.0.1</javafx.version>
 		<commons-lang3.version>3.12.0</commons-lang3.version>
-		<dagger.version>2.44</dagger.version>
+		<jwt.version>3.19.1</jwt.version>
 		<easybind.version>2.2</easybind.version>
 		<guava.version>31.1-jre</guava.version>
-		<gson.version>2.9.1</gson.version>
-		<javafx.version>19</javafx.version>
-		<jwt.version>4.2.1</jwt.version>
-		<nimbus-jose.version>9.25.4</nimbus-jose.version>
-		<logback.version>1.4.4</logback.version>
-		<slf4j.version>2.0.3</slf4j.version>
-		<tinyoauth2.version>0.5.1</tinyoauth2.version>
+		<dagger.version>2.41</dagger.version>
+		<gson.version>2.9.0</gson.version>
 		<zxcvbn.version>1.7.0</zxcvbn.version>
+		<slf4j.version>1.7.36</slf4j.version>
+		<logback.version>1.2.11</logback.version>

 		<!-- test dependencies -->
-		<junit.jupiter.version>5.9.1</junit.jupiter.version>
-		<mockito.version>4.8.0</mockito.version>
+		<junit.jupiter.version>5.8.1</junit.jupiter.version>
+		<mockito.version>4.4.0</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>

 		<!-- build-time dependencies -->
 		<jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
-		<dependency-check.version>7.2.1</dependency-check.version>
-		<jacoco.version>0.8.8</jacoco.version>
+		<dependency-check.version>7.1.0</dependency-check.version>
+		<jacoco.version>0.8.7</jacoco.version>
 	</properties>

 	<dependencies>
@@ -135,22 +133,12 @@
 			<version>${commons-lang3.version}</version>
 		</dependency>

-		<!-- OAuth/JWT -->
-		<dependency>
-			<groupId>io.github.coffeelibs</groupId>
-			<artifactId>tiny-oauth2-client</artifactId>
-			<version>${tinyoauth2.version}</version>
-		</dependency>
+		<!-- JWT -->
 		<dependency>
 			<groupId>com.auth0</groupId>
 			<artifactId>java-jwt</artifactId>
 			<version>${jwt.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.nimbusds</groupId>
-			<artifactId>nimbus-jose-jwt</artifactId>
-			<version>${nimbus-jose.version}</version>
-		</dependency>

 		<!-- EasyBind -->
 		<dependency>
@@ -257,7 +245,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -267,7 +255,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M7</version>
+					<version>3.0.0-M5</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -277,7 +265,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.2.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
@@ -313,7 +301,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>compile-light-theme</id>
@@ -365,7 +353,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
-					<!-- sort jars into two buckets (classpath and modulepath). exclude openjfx, which gets jlinked separately -->
 					<execution>
 						<id>copy-mods</id>
 						<phase>prepare-package</phase>
@@ -375,7 +362,7 @@
 						<configuration>
 							<includeScope>runtime</includeScope>
 							<outputDirectory>${project.build.directory}/mods</outputDirectory>
-							<excludeGroupIds>org.openjfx,${nonModularGroupIds}</excludeGroupIds>
+							<excludeGroupIds>${nonModularGroupIds}</excludeGroupIds>
 						</configuration>
 					</execution>
 					<execution>
@@ -1,42 +1,60 @@
-import ch.qos.logback.classic.spi.Configurator;
 import org.cryptomator.integrations.tray.TrayMenuController;
-import org.cryptomator.logging.LogbackConfiguratorFactory;
 import org.cryptomator.ui.traymenu.AwtTrayMenuController;

-open module org.cryptomator.desktop {
+module org.cryptomator.desktop {
 	requires static org.jetbrains.annotations;

-	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;
-	// jdk:
 	requires java.desktop;
 	requires java.net.http;
 	requires javafx.base;
 	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.tobiasdiez.easybind;
 	requires com.google.common;
 	requires com.google.gson;
-	requires com.nimbusds.jose.jwt;
 	requires com.nulabinc.zxcvbn;
-	requires com.tobiasdiez.easybind;
-	requires dagger;
-	requires io.github.coffeelibs.tinyoauth2client;
 	requires org.slf4j;
 	requires org.apache.commons.lang3;
+	requires dagger;
+	requires com.auth0.jwt;

 	/* TODO: filename-based modules: */
 	requires static javax.inject; /* ugly dagger/guava crap */
+	requires logback.classic;
+	requires logback.core;

+	exports org.cryptomator.ui.traymenu to org.cryptomator.integrations.api;
 	provides TrayMenuController with AwtTrayMenuController;
-	provides Configurator with LogbackConfiguratorFactory;
+
+	opens org.cryptomator.common.settings to com.google.gson;
+
+	opens org.cryptomator.launcher to javafx.graphics;
+
+	opens org.cryptomator.common to javafx.fxml;
+	opens org.cryptomator.common.vaults to javafx.fxml;
+	opens org.cryptomator.ui.addvaultwizard to javafx.fxml;
+	opens org.cryptomator.ui.changepassword to javafx.fxml;
+	opens org.cryptomator.ui.common to javafx.fxml;
+	opens org.cryptomator.ui.controls to javafx.fxml;
+	opens org.cryptomator.ui.forgetPassword to javafx.fxml;
+	opens org.cryptomator.ui.fxapp to javafx.fxml;
+	opens org.cryptomator.ui.health to javafx.fxml;
+	opens org.cryptomator.ui.keyloading.masterkeyfile to javafx.fxml;
+	opens org.cryptomator.ui.lock to javafx.fxml;
+	opens org.cryptomator.ui.mainwindow to javafx.fxml;
+	opens org.cryptomator.ui.migration to javafx.fxml;
+	opens org.cryptomator.ui.preferences to javafx.fxml;
+	opens org.cryptomator.ui.quit to javafx.fxml;
+	opens org.cryptomator.ui.recoverykey to javafx.fxml;
+	opens org.cryptomator.ui.removevault to javafx.fxml;
+	opens org.cryptomator.ui.stats to javafx.fxml;
+	opens org.cryptomator.ui.unlock to javafx.fxml;
+	opens org.cryptomator.ui.vaultoptions to javafx.fxml;
+	opens org.cryptomator.ui.wrongfilealert to javafx.fxml;
 }
@@ -10,7 +10,6 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -29,18 +28,6 @@ public final class CatchingExecutors {
 			super(corePoolSize, threadFactory);
 		}

-		@Override
-		public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) {
-			Runnable oneShot = () -> this.execute(command);
-			return super.scheduleAtFixedRate(oneShot, initialDelay, period, unit);
-		}
-
-		@Override
-		public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) {
-			Runnable oneShot = () -> this.execute(command);
-			return super.scheduleWithFixedDelay(oneShot, initialDelay, delay, unit);
-		}
-
 		@Override
 		protected void afterExecute(Runnable runnable, Throwable throwable) {
 			super.afterExecute(runnable, throwable);
@@ -66,7 +53,7 @@ public final class CatchingExecutors {
 			callHandler(Thread.currentThread(), throwable);
 		} else if (runnable instanceof Task<?> t) {
 			afterExecuteTask(t);
-		} else if (runnable instanceof Future<?> f) {
+		} else if (runnable instanceof Future<?> f && f.isDone()) {
 			afterExecuteFuture(f);
 		}
 		//Errors in this method are delegated to the UncaughtExceptionHandler of the current thread
@@ -90,16 +77,11 @@ public final class CatchingExecutors {
 	}

 	private static void afterExecuteFuture(Future<?> future) {
-		if (future instanceof ScheduledFuture<?> && !future.isDone()) {
-			//we assume that this must be a repeated ScheduledFutureTask, where the done-status is only set when not executed anymore
-			//see also https://github.com/cryptomator/cryptomator/pull/2422
-			return;
-		}
-
+		assert future.isDone();
 		try {
 			future.get();
 		} catch (CancellationException ce) {
-			//Ignore
+			callHandler(Thread.currentThread(), ce);
 		} catch (ExecutionException ee) {
 			callHandler(Thread.currentThread(), ee.getCause());
 		} catch (InterruptedException ie) {
@@ -23,7 +23,6 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
-import javafx.beans.value.ObservableValue;
 import java.net.InetSocketAddress;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -42,12 +41,6 @@ public abstract class CommonsModule {
 	private static final int NUM_CORE_BG_THREADS = 6;
 	private static final long BG_THREAD_KEEPALIVE_SECONDS = 60l;

-	@Provides
-	@Singleton
-	static Environment provideEnvironment() {
-		return Environment.getInstance();
-	}
-
 	@SuppressWarnings("SpellCheckingInspection")
 	@Provides
 	@Singleton
@@ -131,16 +124,16 @@ public abstract class CommonsModule {

 	@Provides
 	@Singleton
-	static ObservableValue<InetSocketAddress> provideServerSocketAddressBinding(Settings settings) {
-		return settings.port().map(port -> {
+	static Binding<InetSocketAddress> provideServerSocketAddressBinding(Settings settings) {
+		return Bindings.createObjectBinding(() -> {
 			String host = SystemUtils.IS_OS_WINDOWS ? "127.0.0.1" : "localhost";
 			return InetSocketAddress.createUnresolved(host, settings.port().intValue());
-		});
+		}, settings.port());
 	}

 	@Provides
 	@Singleton
-	static WebDavServer provideWebDavServer(ObservableValue<InetSocketAddress> serverSocketAddressBinding) {
+	static WebDavServer provideWebDavServer(Binding<InetSocketAddress> serverSocketAddressBinding) {
 		WebDavServer server = WebDavServer.create();
 		// no need to unsubscribe eventually, because server is a singleton
 		EasyBind.subscribe(serverSocketAddressBinding, server::bind);
@@ -5,6 +5,8 @@ import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -15,57 +17,31 @@ import java.util.function.Predicate;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;

+@Singleton
 public class Environment {

 	private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
 	private static final Path RELATIVE_HOME_DIR = Paths.get("~");
 	private static final char PATH_LIST_SEP = ':';
 	private static final int DEFAULT_MIN_PW_LENGTH = 8;
-	private static final String SETTINGS_PATH_PROP_NAME = "cryptomator.settingsPath";
-	private static final String IPC_SOCKET_PATH_PROP_NAME = "cryptomator.ipcSocketPath";
-	private static final String KEYCHAIN_PATHS_PROP_NAME = "cryptomator.integrationsWin.keychainPaths";
-	private static final String P12_PATH_PROP_NAME = "cryptomator.p12Path";
-	private static final String LOG_DIR_PROP_NAME = "cryptomator.logDir";
-	private static final String LOOPBACK_ALIAS_PROP_NAME = "cryptomator.loopbackAlias";
-	private static final String MOUNTPOINT_DIR_PROP_NAME = "cryptomator.mountPointsDir";
-	private static final String MIN_PW_LENGTH_PROP_NAME = "cryptomator.minPwLength";
-	private static final String APP_VERSION_PROP_NAME = "cryptomator.appVersion";
-	private static final String BUILD_NUMBER_PROP_NAME = "cryptomator.buildNumber";
-	private static final String PLUGIN_DIR_PROP_NAME = "cryptomator.pluginDir";
-	private static final String TRAY_ICON_PROP_NAME = "cryptomator.showTrayIcon";

-	private Environment() {}
-
-	public void log() {
-		LOG.info("user.home: {}", System.getProperty("user.home"));
-		LOG.info("java.library.path: {}", System.getProperty("java.library.path"));
-		LOG.info("user.language: {}", System.getProperty("user.language"));
-		LOG.info("user.region: {}", System.getProperty("user.region"));
-		LOG.info("logback.configurationFile: {}", System.getProperty("logback.configurationFile"));
-		logCryptomatorSystemProperty(SETTINGS_PATH_PROP_NAME);
-		logCryptomatorSystemProperty(IPC_SOCKET_PATH_PROP_NAME);
-		logCryptomatorSystemProperty(KEYCHAIN_PATHS_PROP_NAME);
-		logCryptomatorSystemProperty(LOG_DIR_PROP_NAME);
-		logCryptomatorSystemProperty(LOOPBACK_ALIAS_PROP_NAME);
-		logCryptomatorSystemProperty(PLUGIN_DIR_PROP_NAME);
-		logCryptomatorSystemProperty(MOUNTPOINT_DIR_PROP_NAME);
-		logCryptomatorSystemProperty(MIN_PW_LENGTH_PROP_NAME);
-		logCryptomatorSystemProperty(APP_VERSION_PROP_NAME);
-		logCryptomatorSystemProperty(BUILD_NUMBER_PROP_NAME);
-		logCryptomatorSystemProperty(TRAY_ICON_PROP_NAME);
-		logCryptomatorSystemProperty(P12_PATH_PROP_NAME);
-	}
-
-	public static Environment getInstance() {
-		final class Holder {
-
-			private static final Environment INSTANCE = new Environment();
-		}
-		return Holder.INSTANCE;
-	}
-
-	private void logCryptomatorSystemProperty(String propertyName) {
-		LOG.info("{}: {}", propertyName, System.getProperty(propertyName));
+	@Inject
+	public Environment() {
+		LOG.debug("user.home: {}", System.getProperty("user.home"));
+		LOG.debug("java.library.path: {}", System.getProperty("java.library.path"));
+		LOG.debug("user.language: {}", System.getProperty("user.language"));
+		LOG.debug("user.region: {}", System.getProperty("user.region"));
+		LOG.debug("logback.configurationFile: {}", System.getProperty("logback.configurationFile"));
+		LOG.debug("cryptomator.settingsPath: {}", System.getProperty("cryptomator.settingsPath"));
+		LOG.debug("cryptomator.ipcSocketPath: {}", System.getProperty("cryptomator.ipcSocketPath"));
+		LOG.debug("cryptomator.keychainPath: {}", System.getProperty("cryptomator.keychainPath"));
+		LOG.debug("cryptomator.logDir: {}", System.getProperty("cryptomator.logDir"));
+		LOG.debug("cryptomator.pluginDir: {}", System.getProperty("cryptomator.pluginDir"));
+		LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir"));
+		LOG.debug("cryptomator.minPwLength: {}", System.getProperty("cryptomator.minPwLength"));
+		LOG.debug("cryptomator.appVersion: {}", System.getProperty("cryptomator.appVersion"));
+		LOG.debug("cryptomator.buildNumber: {}", System.getProperty("cryptomator.buildNumber"));
+		LOG.debug("cryptomator.showTrayIcon: {}", System.getProperty("cryptomator.showTrayIcon"));
 	}

 	public boolean useCustomLogbackConfig() {
@@ -73,56 +49,52 @@ public class Environment {
 	}

 	public Stream<Path> getSettingsPath() {
-		return getPaths(SETTINGS_PATH_PROP_NAME);
-	}
-
-	public Stream<Path> getP12Path() {
-		return getPaths(P12_PATH_PROP_NAME);
+		return getPaths("cryptomator.settingsPath");
 	}

 	public Stream<Path> ipcSocketPath() {
-		return getPaths(IPC_SOCKET_PATH_PROP_NAME);
+		return getPaths("cryptomator.ipcSocketPath");
 	}

 	public Stream<Path> getKeychainPath() {
-		return getPaths(KEYCHAIN_PATHS_PROP_NAME);
+		return getPaths("cryptomator.keychainPath");
 	}

 	public Optional<Path> getLogDir() {
-		return getPath(LOG_DIR_PROP_NAME).map(this::replaceHomeDir);
-	}
-
-	public Optional<String> getLoopbackAlias() {
-		return Optional.ofNullable(System.getProperty(LOOPBACK_ALIAS_PROP_NAME));
+		return getPath("cryptomator.logDir").map(this::replaceHomeDir);
 	}

 	public Optional<Path> getPluginDir() {
-		return getPath(PLUGIN_DIR_PROP_NAME).map(this::replaceHomeDir);
+		return getPath("cryptomator.pluginDir").map(this::replaceHomeDir);
 	}

 	public Optional<Path> getMountPointsDir() {
-		return getPath(MOUNTPOINT_DIR_PROP_NAME).map(this::replaceHomeDir);
+		return getPath("cryptomator.mountPointsDir").map(this::replaceHomeDir);
 	}

-	/**
-	 * Returns the app version defined in the {@value APP_VERSION_PROP_NAME} property or returns "SNAPSHOT".
-	 *
-	 * @return App version or "SNAPSHOT", if undefined
-	 */
-	public String getAppVersion() {
-		return System.getProperty(APP_VERSION_PROP_NAME, "SNAPSHOT");
+	public Optional<String> getAppVersion() {
+		return Optional.ofNullable(System.getProperty("cryptomator.appVersion"));
 	}

 	public Optional<String> getBuildNumber() {
-		return Optional.ofNullable(System.getProperty(BUILD_NUMBER_PROP_NAME));
+		return Optional.ofNullable(System.getProperty("cryptomator.buildNumber"));
 	}

 	public int getMinPwLength() {
-		return Integer.getInteger(MIN_PW_LENGTH_PROP_NAME, DEFAULT_MIN_PW_LENGTH);
+		return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH);
 	}

 	public boolean showTrayIcon() {
-		return Boolean.getBoolean(TRAY_ICON_PROP_NAME);
+		return Boolean.getBoolean("cryptomator.showTrayIcon");
+	}
+
+	private int getInt(String propertyName, int defaultValue) {
+		String value = System.getProperty(propertyName);
+		try {
+			return Integer.parseInt(value);
+		} catch (NumberFormatException e) { // includes "null" values
+			return defaultValue;
+		}
 	}

 	private Optional<Path> getPath(String propertyName) {
@@ -10,7 +10,6 @@ import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ObservableValue;
 import java.util.Optional;

@Singleton
@@ -19,7 +18,7 @@ public class LicenseHolder {
 	private final Settings settings;
 	private final LicenseChecker licenseChecker;
 	private final ObjectProperty<DecodedJWT> validJwtClaims;
-	private final ObservableValue<String> licenseSubject;
+	private final StringBinding licenseSubject;
 	private final BooleanBinding validLicenseProperty;

 	@Inject
@@ -27,7 +26,7 @@ public class LicenseHolder {
 		this.settings = settings;
 		this.licenseChecker = licenseChecker;
 		this.validJwtClaims = new SimpleObjectProperty<>();
-		this.licenseSubject = validJwtClaims.map(DecodedJWT::getSubject);
+		this.licenseSubject = Bindings.createStringBinding(this::getLicenseSubject, validJwtClaims);
 		this.validLicenseProperty = validJwtClaims.isNotNull();

 		Optional<DecodedJWT> claims = licenseChecker.check(settings.licenseKey().get());
@@ -56,12 +55,17 @@ public class LicenseHolder {
 		}
 	}

-	public ObservableValue<String> licenseSubjectProperty() {
+	public StringBinding licenseSubjectProperty() {
 		return licenseSubject;
 	}

 	public String getLicenseSubject() {
-		return licenseSubject.getValue();
+		DecodedJWT claims = validJwtClaims.get();
+		if (claims != null) {
+			return claims.getSubject();
+		} else {
+			return null;
+		}
 	}

 	public BooleanBinding validLicenseProperty() {
@@ -23,14 +23,11 @@ public class KeychainModule {
 	@Singleton
 	static ObjectExpression<KeychainAccessProvider> provideKeychainAccessProvider(Settings settings, List<KeychainAccessProvider> providers) {
 		return Bindings.createObjectBinding(() -> {
-			if (!settings.useKeychain().get()) {
-				return null;
-			}
 			var selectedProviderClass = settings.keychainProvider().get();
 			var selectedProvider = providers.stream().filter(provider -> provider.getClass().getName().equals(selectedProviderClass)).findAny();
 			var fallbackProvider = providers.stream().findFirst().orElse(null);
 			return selectedProvider.orElse(fallbackProvider);
-		}, settings.keychainProvider(), settings.useKeychain());
+		}, settings.keychainProvider());
 	}

 }
@@ -1,6 +1,7 @@
 package org.cryptomator.common.mountpoint;

 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.common.vaults.MountPointRequirement;
@@ -18,6 +19,7 @@ import java.nio.file.NoSuchFileException;
 import java.nio.file.NotDirectoryException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Optional;

 class CustomMountPointChooser implements MountPointChooser {
@@ -116,7 +118,6 @@ class CustomMountPointChooser implements MountPointChooser {
 		if (caller.getMountPointRequirement() == MountPointRequirement.PARENT_NO_MOUNT_POINT) {
 			Path hideaway = getHideaway(mountPoint);
 			try {
-				waitForMountpointRestoration(mountPoint);
 				Files.move(hideaway, mountPoint);
 				if (SystemUtils.IS_OS_WINDOWS) {
 					Files.setAttribute(mountPoint, WIN_HIDDEN, false);
@@ -127,24 +128,6 @@ class CustomMountPointChooser implements MountPointChooser {
 		}
 	}

-	//on Windows removing the mountpoint takes some time, so we poll for at most 3 seconds
-	private void waitForMountpointRestoration(Path mountPoint) throws FileAlreadyExistsException {
-		int attempts = 0;
-		while (!Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
-			attempts++;
-			if (attempts >= 10) {
-				throw new FileAlreadyExistsException("Timeout waiting for mountpoint cleanup for " + mountPoint + " .");
-			}
-
-			try {
-				Thread.sleep(300);
-			} catch (InterruptedException e) {
-				Thread.currentThread().interrupt();
-				throw new FileAlreadyExistsException("Interrupted before mountpoint " + mountPoint + " was cleared");
-			}
-		}
-	}
-
 	private void checkIsDirectory(Path toCheck) throws InvalidMountPointException {
 		if (!Files.isDirectory(toCheck, LinkOption.NOFOLLOW_LINKS)) {
 			throw new InvalidMountPointException(new NotDirectoryException(toCheck.toString()));
@@ -1,99 +0,0 @@
-package org.cryptomator.common.settings;
-
-import com.google.common.base.Preconditions;
-import com.google.common.base.Suppliers;
-import org.cryptomator.common.Environment;
-import org.cryptomator.common.keychain.KeychainManager;
-import org.cryptomator.cryptolib.common.P384KeyPair;
-import org.cryptomator.cryptolib.common.Pkcs12Exception;
-import org.cryptomator.integrations.keychain.KeychainAccessException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.io.IOException;
-import java.nio.CharBuffer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.UUID;
-import java.util.function.Supplier;
-
-@Singleton
-public class DeviceKey {
-
-	private static final Logger LOG = LoggerFactory.getLogger(DeviceKey.class);
-	private static final String KEYCHAIN_KEY = "cryptomator-device-p12";
-	private static final String KEYCHAIN_DISPLAY_NAME = "Cryptomator Device Keypair .p12 Passphrase";
-
-	private final KeychainManager keychainManager;
-	private final Environment env;
-	private final SecureRandom csprng;
-	private final Supplier<P384KeyPair> keyPairSupplier;
-
-	@Inject
-	public DeviceKey(KeychainManager keychainManager, Environment env, SecureRandom csprng) {
-		this.keychainManager = keychainManager;
-		this.env = env;
-		this.csprng = csprng;
-		this.keyPairSupplier = Suppliers.memoize(this::loadOrCreate);
-	}
-
-	public P384KeyPair get() throws DeviceKeyRetrievalException {
-		Preconditions.checkState(keychainManager.isSupported());
-		return keyPairSupplier.get();
-	}
-
-	private P384KeyPair loadOrCreate() throws DeviceKeyRetrievalException {
-		Path p12File = env.getP12Path().findFirst().orElseThrow(() -> new DeviceKeyRetrievalException("No path for .p12 file configured"));
-		char[] passphrase = null;
-		try {
-			passphrase = keychainManager.loadPassphrase(KEYCHAIN_KEY);
-			if (passphrase != null && Files.isRegularFile(p12File)) {
-				return loadExistingKeyPair(passphrase, p12File);
-			} else { // (re)generate new key pair if either file or password got lost
-				passphrase = randomPassword();
-				keychainManager.storePassphrase(KEYCHAIN_KEY, KEYCHAIN_DISPLAY_NAME, CharBuffer.wrap(passphrase));
-				return createAndStoreNewKeyPair(passphrase, p12File);
-			}
-		} catch (KeychainAccessException e) {
-			throw new DeviceKeyRetrievalException("Failed to access system keychain", e);
-		} catch (Pkcs12Exception | IOException e) {
-			throw new DeviceKeyRetrievalException("Failed to access .p12 file", e);
-		} finally {
-			if (passphrase != null) {
-				Arrays.fill(passphrase, '\0');
-			}
-		}
-	}
-
-	private P384KeyPair loadExistingKeyPair(char[] passphrase, Path p12File) throws IOException {
-		LOG.debug("Loading existing device key from {}", p12File);
-		return P384KeyPair.load(p12File, passphrase);
-	}
-
-	private P384KeyPair createAndStoreNewKeyPair(char[] passphrase, Path p12File) throws IOException {
-		var keyPair = P384KeyPair.generate();
-		LOG.debug("Store new device key to {}", p12File);
-		keyPair.store(p12File, passphrase);
-		return keyPair;
-	}
-
-	private char[] randomPassword() {
-		// this is a fast & easy attempt to create a random string:
-		var uuid = new UUID(csprng.nextLong(), csprng.nextLong());
-		return uuid.toString().toCharArray();
-	}
-
-	public static class DeviceKeyRetrievalException extends RuntimeException {
-		private DeviceKeyRetrievalException(String message) {
-			super(message);
-		}
-		private DeviceKeyRetrievalException(String message, Throwable cause) {
-			super(message, cause);
-		}
-	}
-
-}
@@ -32,8 +32,6 @@ public class Settings {
 	public static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false;
 	public static final boolean DEFAULT_CHECK_FOR_UPDATES = false;
 	public static final boolean DEFAULT_START_HIDDEN = false;
-	public static final boolean DEFAULT_AUTO_CLOSE_VAULTS = false;
-	public static final boolean DEFAULT_USE_KEYCHAIN = true;
 	public static final int DEFAULT_PORT = 42427;
 	public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
 	public static final WebDavUrlScheme DEFAULT_GVFS_SCHEME = WebDavUrlScheme.DAV;
@@ -53,8 +51,6 @@ public class Settings {
 	private final BooleanProperty askedForUpdateCheck = new SimpleBooleanProperty(DEFAULT_ASKED_FOR_UPDATE_CHECK);
 	private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UPDATES);
 	private final BooleanProperty startHidden = new SimpleBooleanProperty(DEFAULT_START_HIDDEN);
-	private final BooleanProperty autoCloseVaults = new SimpleBooleanProperty(DEFAULT_AUTO_CLOSE_VAULTS);
-	private final BooleanProperty useKeychain = new SimpleBooleanProperty(DEFAULT_USE_KEYCHAIN);
 	private final IntegerProperty port = new SimpleIntegerProperty(DEFAULT_PORT);
 	private final IntegerProperty numTrayNotifications = new SimpleIntegerProperty(DEFAULT_NUM_TRAY_NOTIFICATIONS);
 	private final ObjectProperty<WebDavUrlScheme> preferredGvfsScheme = new SimpleObjectProperty<>(DEFAULT_GVFS_SCHEME);
@@ -86,8 +82,6 @@ public class Settings {
 		askedForUpdateCheck.addListener(this::somethingChanged);
 		checkForUpdates.addListener(this::somethingChanged);
 		startHidden.addListener(this::somethingChanged);
-		autoCloseVaults.addListener(this::somethingChanged);
-		useKeychain.addListener(this::somethingChanged);
 		port.addListener(this::somethingChanged);
 		numTrayNotifications.addListener(this::somethingChanged);
 		preferredGvfsScheme.addListener(this::somethingChanged);
@@ -139,12 +133,6 @@ public class Settings {
 		return startHidden;
 	}

-	public BooleanProperty autoCloseVaults() {
-		return autoCloseVaults;
-	}
-
-	public BooleanProperty useKeychain() { return useKeychain; }
-
 	public IntegerProperty port() {
 		return port;
 	}
@@ -41,7 +41,6 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		out.name("askedForUpdateCheck").value(value.askedForUpdateCheck().get());
 		out.name("checkForUpdatesEnabled").value(value.checkForUpdates().get());
 		out.name("startHidden").value(value.startHidden().get());
-		out.name("autoCloseVaults").value(value.autoCloseVaults().get());
 		out.name("port").value(value.port().get());
 		out.name("numTrayNotifications").value(value.numTrayNotifications().get());
 		out.name("preferredGvfsScheme").value(value.preferredGvfsScheme().get().name());
@@ -50,7 +49,6 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		out.name("theme").value(value.theme().get().name());
 		out.name("uiOrientation").value(value.userInterfaceOrientation().get().name());
 		out.name("keychainProvider").value(value.keychainProvider().get());
-		out.name("useKeychain").value(value.useKeychain().get());
 		out.name("licenseKey").value(value.licenseKey().get());
 		out.name("showMinimizeButton").value(value.showMinimizeButton().get());
 		out.name("showTrayIcon").value(value.showTrayIcon().get());
@@ -84,7 +82,6 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "askedForUpdateCheck" -> settings.askedForUpdateCheck().set(in.nextBoolean());
 				case "checkForUpdatesEnabled" -> settings.checkForUpdates().set(in.nextBoolean());
 				case "startHidden" -> settings.startHidden().set(in.nextBoolean());
-				case "autoCloseVaults" -> settings.autoCloseVaults().set(in.nextBoolean());
 				case "port" -> settings.port().set(in.nextInt());
 				case "numTrayNotifications" -> settings.numTrayNotifications().set(in.nextInt());
 				case "preferredGvfsScheme" -> settings.preferredGvfsScheme().set(parseWebDavUrlSchemePrefix(in.nextString()));
@@ -93,7 +90,6 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "theme" -> settings.theme().set(parseUiTheme(in.nextString()));
 				case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString()));
 				case "keychainProvider" -> settings.keychainProvider().set(in.nextString());
-				case "useKeychain" -> settings.useKeychain().set(in.nextBoolean());
 				case "licenseKey" -> settings.licenseKey().set(in.nextString());
 				case "showMinimizeButton" -> settings.showMinimizeButton().set(in.nextBoolean());
 				case "showTrayIcon" -> settings.showTrayIcon().set(in.nextBoolean());
@@ -105,7 +101,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "language" -> settings.languageProperty().set(in.nextString());

 				default -> {
-					LOG.warn("Unsupported vault setting found in JSON: {}", name);
+					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
 				}
 			}
@@ -49,12 +49,14 @@ public class SettingsProvider implements Supplier<Settings> {

 	private final AtomicReference<ScheduledFuture<?>> scheduledSaveCmd = new AtomicReference<>();
 	private final Supplier<Settings> settings = Suppliers.memoize(this::load);
+	private final SettingsJsonAdapter settingsJsonAdapter;
 	private final Environment env;
 	private final ScheduledExecutorService scheduler;
 	private final Gson gson;

 	@Inject
 	public SettingsProvider(SettingsJsonAdapter settingsJsonAdapter, Environment env, ScheduledExecutorService scheduler) {
+		this.settingsJsonAdapter = settingsJsonAdapter;
 		this.env = env;
 		this.scheduler = scheduler;
 		this.gson = new GsonBuilder() //
@@ -116,7 +118,7 @@ public class SettingsProvider implements Supplier<Settings> {
 		try {
 			Files.createDirectories(settingsPath.getParent());
 			Path tmpPath = settingsPath.resolveSibling(settingsPath.getFileName().toString() + ".tmp");
-			try (OutputStream out = Files.newOutputStream(tmpPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE); //
+			try (OutputStream out = Files.newOutputStream(tmpPath, StandardOpenOption.CREATE_NEW); //
 				 Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
 				gson.toJson(settings, writer);
 			}
@@ -12,7 +12,6 @@ import com.google.common.io.BaseEncoding;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.StringBinding;
-import javafx.beans.binding.StringExpression;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
@@ -21,7 +20,6 @@ import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.beans.value.ObservableValue;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
@@ -58,11 +56,11 @@ public class VaultSettings {
 	private final ObjectProperty<WhenUnlocked> actionAfterUnlock = new SimpleObjectProperty<>(DEFAULT_ACTION_AFTER_UNLOCK);
 	private final BooleanProperty autoLockWhenIdle = new SimpleBooleanProperty(DEFAULT_AUTOLOCK_WHEN_IDLE);
 	private final IntegerProperty autoLockIdleSeconds = new SimpleIntegerProperty(DEFAULT_AUTOLOCK_IDLE_SECONDS);
-	private final StringExpression mountName;
+	private final StringBinding mountName;

 	public VaultSettings(String id) {
 		this.id = Objects.requireNonNull(id);
-		this.mountName = StringExpression.stringExpression(displayName.map(VaultSettings::normalizeDisplayName).orElse(""));
+		this.mountName = Bindings.createStringBinding(this::normalizeDisplayName, displayName);
 	}

 	Observable[] observables() {
@@ -80,7 +78,8 @@ public class VaultSettings {
 	}

 	//visible for testing
-	static String normalizeDisplayName(String original) {
+	String normalizeDisplayName() {
+		var original = displayName.getValueSafe();
 		if (original.isBlank() || ".".equals(original) || "..".equals(original)) {
 			return "_";
 		}
@@ -106,7 +105,7 @@ public class VaultSettings {
 		return displayName;
 	}

-	public StringExpression mountName() {
+	public StringBinding mountName() {
 		return mountName;
 	}

@@ -73,7 +73,7 @@ class VaultSettingsJsonAdapter {
 				case "autoLockWhenIdle" -> autoLockWhenIdle = in.nextBoolean();
 				case "autoLockIdleSeconds" -> autoLockIdleSeconds = in.nextInt();
 				default -> {
-					LOG.warn("Unsupported vault setting found in JSON: {}", name);
+					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
 				}
 			}
@@ -46,6 +46,7 @@ public class AutoLocker {

 	private boolean exceedsIdleTime(Vault vault) {
 		assert vault.isUnlocked();
+		// TODO: shouldn't we read these properties from within FX Application Thread?
 		if (vault.getVaultSettings().autoLockWhenIdle().get()) {
 			int maxIdleSeconds = vault.getVaultSettings().autoLockIdleSeconds().get();
 			var deadline = vault.getStats().getLastActivity().plusSeconds(maxIdleSeconds);
@@ -13,6 +13,8 @@ import org.cryptomator.frontend.fuse.mount.FuseMountFactory;
 import org.cryptomator.frontend.fuse.mount.FuseNotSupportedException;
 import org.cryptomator.frontend.fuse.mount.Mount;
 import org.cryptomator.frontend.fuse.mount.Mounter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
@@ -24,6 +26,7 @@ import java.util.regex.Pattern;

 public class FuseVolume extends AbstractVolume {

+	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 	private static final Pattern NON_WHITESPACE_OR_QUOTED = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'"); // Thanks to https://stackoverflow.com/a/366532

 	private final VaultSettings vaultSettings;
@@ -34,7 +34,6 @@ import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -61,6 +60,7 @@ public class Vault {
 	private final ObjectProperty<Exception> lastKnownException;
 	private final VaultConfigCache configCache;
 	private final VaultStats stats;
+	private final StringBinding displayName;
 	private final StringBinding displayablePath;
 	private final BooleanBinding locked;
 	private final BooleanBinding processing;
@@ -84,6 +84,7 @@ public class Vault {
 		this.state = state;
 		this.lastKnownException = lastKnownException;
 		this.stats = stats;
+		this.displayName = Bindings.createStringBinding(this::getDisplayName, vaultSettings.displayName());
 		this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path());
 		this.locked = Bindings.createBooleanBinding(this::isLocked, state);
 		this.processing = Bindings.createBooleanBinding(this::isProcessing, state);
@@ -265,8 +266,8 @@ public class Vault {
 		return state.get() == VaultState.Value.ERROR;
 	}

-	public ReadOnlyStringProperty displayNameProperty() {
-		return vaultSettings.displayName();
+	public StringBinding displayNameProperty() {
+		return displayName;
 	}

 	public String getDisplayName() {
@@ -19,7 +19,6 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.StringBinding;
-import javafx.beans.binding.StringExpression;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -69,7 +68,7 @@ public class VaultModule {
 	@DefaultMountFlags
 	public StringBinding provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) {
 		ObjectProperty<VolumeImpl> preferredVolumeImpl = settings.preferredVolumeImpl();
-		StringExpression mountName = vaultSettings.mountName();
+		StringBinding mountName = vaultSettings.mountName();
 		BooleanProperty readOnly = vaultSettings.usesReadOnlyMode();

 		return Bindings.createStringBinding(() -> {
@@ -89,7 +88,7 @@ public class VaultModule {
 	}

 	// see: https://github.com/osxfuse/osxfuse/wiki/Mount-options
-	private String getMacFuseDefaultMountFlags(StringExpression mountName, ReadOnlyBooleanProperty readOnly) {
+	private String getMacFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) {
 		assert SystemUtils.IS_OS_MAC_OSX;
 		StringBuilder flags = new StringBuilder();
 		if (readOnly.get()) {
@@ -140,7 +139,7 @@ public class VaultModule {
 	// see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse_main.c#L53-L62 for syntax guide
 	// see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse.c#L295-L319 for options (-o <...>)
 	// see https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions/5ba00e4be4f5e938eaae6ef1500b331de12dee77 (FUSE 4.) on why the given defaults were chosen
-	private String getWindowsFuseDefaultMountFlags(StringExpression mountName, ReadOnlyBooleanProperty readOnly) {
+	private String getWindowsFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) {
 		assert SystemUtils.IS_OS_WINDOWS;
 		StringBuilder flags = new StringBuilder();

@@ -41,8 +41,6 @@ public class VaultStats {
 	private final LongProperty totalBytesDecrypted = new SimpleLongProperty();
 	private final LongProperty filesRead = new SimpleLongProperty();
 	private final LongProperty filesWritten = new SimpleLongProperty();
-	private final LongProperty filesAccessed = new SimpleLongProperty();
-	private final LongProperty totalFilesAccessed = new SimpleLongProperty();
 	private final ObjectProperty<Instant> lastActivity = new SimpleObjectProperty<>();

 	@Inject
@@ -84,8 +82,6 @@ public class VaultStats {
 		var oldAccessCount = filesRead.get() + filesWritten.get();
 		filesRead.set(stats.map(CryptoFileSystemStats::pollAmountOfAccessesRead).orElse(0L));
 		filesWritten.set(stats.map(CryptoFileSystemStats::pollAmountOfAccessesWritten).orElse(0L));
-		filesAccessed.set(stats.map(CryptoFileSystemStats::pollAmountOfAccesses).orElse(0L));
-		totalFilesAccessed.set(stats.map(CryptoFileSystemStats::pollTotalAmountOfAccesses).orElse(0L));
 		var newAccessCount = filesRead.get() + filesWritten.get();

 		// check for any I/O activity
@@ -192,19 +188,6 @@ public class VaultStats {

 	public long getFilesWritten() {return filesWritten.get();}

-	public LongProperty filesAccessed() {
-		return filesAccessed;}
-
-	public long getFilesAccessed() {return filesAccessed.get();}
-
-	public LongProperty totalFilesAccessed(){
-		return totalFilesAccessed;
-	}
-
-	public long getTotalFilesAccessed(){
-		return totalFilesAccessed.get();
-	}
-
 	public ObjectProperty<Instant> lastActivityProperty() {
 		return lastActivity;
 	}
@@ -2,7 +2,6 @@ package org.cryptomator.common.vaults;


 import com.google.common.base.CharMatcher;
-import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.settings.VolumeImpl;
@@ -23,11 +22,12 @@ import java.util.function.Supplier;

 public class WebDavVolume implements Volume {

+	private static final String LOCALHOST_ALIAS = "cryptomator-vault";
+
 	private final Provider<WebDavServer> serverProvider;
 	private final VaultSettings vaultSettings;
 	private final Settings settings;
 	private final WindowsDriveLetters windowsDriveLetters;
-	private final Environment environment;

 	private WebDavServer server;
 	private WebDavServletController servlet;
@@ -35,12 +35,11 @@ public class WebDavVolume implements Volume {
 	private Consumer<Throwable> onExitAction;

 	@Inject
-	public WebDavVolume(Provider<WebDavServer> serverProvider, VaultSettings vaultSettings, Settings settings, WindowsDriveLetters windowsDriveLetters, Environment environment) {
+	public WebDavVolume(Provider<WebDavServer> serverProvider, VaultSettings vaultSettings, Settings settings, WindowsDriveLetters windowsDriveLetters) {
 		this.serverProvider = serverProvider;
 		this.vaultSettings = vaultSettings;
 		this.settings = settings;
 		this.windowsDriveLetters = windowsDriveLetters;
-		this.environment = environment;
 	}

 	@Override
@@ -130,17 +129,16 @@ public class WebDavVolume implements Volume {
 	}

 	private String getLocalhostAliasOrNull() {
-		return environment.getLoopbackAlias().map(alias -> {
-			try {
-				var address = InetAddress.getByName(alias);
-				if (address.getHostAddress().equals("127.0.0.1")) {
-					return alias;
-				}
-			} catch (UnknownHostException e) {
-				//no-op
+		try {
+			InetAddress alias = InetAddress.getByName(LOCALHOST_ALIAS);
+			if (alias.getHostAddress().equals("127.0.0.1")) {
+				return LOCALHOST_ALIAS;
+			} else {
+				return null;
 			}
+		} catch (UnknownHostException e) {
 			return null;
-		}).orElse(null);
+		}
 	}

 	private void cleanup() {
@@ -12,6 +12,7 @@ import org.cryptomator.common.Environment;
 import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.ipc.IpcCommunicator;
 import org.cryptomator.logging.DebugMode;
+import org.cryptomator.logging.LoggerConfiguration;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,6 +35,7 @@ public class Cryptomator {
 	private static final CryptomatorComponent CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.factory().create(STARTUP_TIME);
 	private static final Logger LOG = LoggerFactory.getLogger(Cryptomator.class);

+	private final LoggerConfiguration logConfig;
 	private final DebugMode debugMode;
 	private final SupportedLanguages supportedLanguages;
 	private final Environment env;
@@ -41,7 +43,8 @@ public class Cryptomator {
 	private final ShutdownHook shutdownHook;

 	@Inject
-	Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook) {
+	Cryptomator(LoggerConfiguration logConfig, DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook) {
+		this.logConfig = logConfig;
 		this.debugMode = debugMode;
 		this.supportedLanguages = supportedLanguages;
 		this.env = env;
@@ -76,9 +79,9 @@ public class Cryptomator {
 	 * @return Nonzero exit code in case of an error.
 	 */
 	private int run(String[] args) {
-		env.log();
+		logConfig.init();
 		LOG.debug("Dagger graph initialized after {}ms", System.currentTimeMillis() - STARTUP_TIME);
-		LOG.info("Starting Cryptomator {} on {} {} ({})", env.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+		LOG.info("Starting Cryptomator {} on {} {} ({})", env.getAppVersion().orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
 		debugMode.initialize();
 		supportedLanguages.applyPreferred();

@@ -3,13 +3,14 @@ package org.cryptomator.launcher;
 import dagger.BindsInstance;
 import dagger.Component;
 import org.cryptomator.common.CommonsModule;
+import org.cryptomator.logging.LoggerModule;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;

 import javax.inject.Named;
 import javax.inject.Singleton;

@Singleton
-@Component(modules = {CryptomatorModule.class, CommonsModule.class})
+@Component(modules = {CryptomatorModule.class, CommonsModule.class, LoggerModule.class})
 public interface CryptomatorComponent {

 	Cryptomator application();
@@ -15,9 +15,9 @@ public class SupportedLanguages {

 	private static final Logger LOG = LoggerFactory.getLogger(SupportedLanguages.class);
 	// these are BCP 47 language codes, not ISO. Note the "-" instead of the "_":
-	public static final List<String> LANGUAGAE_TAGS = List.of("en", "ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", //
-			"hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "mk", "nb", "nl", "nn", "no", "pa", "pl", "pt", "pt-BR", "ro", "ru", "si", "sk", "sr", "sr-Latn", "sv", "sw", //
-			"ta", "te", "th", "tr", "uk", "vi", "zh", "zh-HK", "zh-TW");
+	public static final List<String> LANGUAGAE_TAGS = List.of("en", "ar", "bn", "bs", "ca", "cs", "de", "el", "es", "fil", "fr", "gl", "he", //
+			"hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "mk", "nb", "nl", "nn", "no", "pa", "pl", "pt", "pt-BR", "ro", "ru", "sk", "sr", //
+			"sr-Latn", "sv", "sw", "ta", "te", "th", "tr", "uk", "zh", "zh-HK", "zh-TW");

 	@Nullable
 	private final String preferredLanguage;
@@ -5,24 +5,29 @@
 *******************************************************************************/
 package org.cryptomator.logging;

+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
 import org.cryptomator.common.settings.Settings;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javafx.beans.value.ObservableValue;
+import java.util.Map;

@Singleton
 public class DebugMode {

-	private static final Logger LOG = LoggerFactory.getLogger(DebugMode.class);
+	private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(DebugMode.class);

 	private final Settings settings;
+	private final LoggerContext context;

 	@Inject
-	public DebugMode(Settings settings) {
+	public DebugMode(Settings settings, LoggerContext context) {
 		this.settings = settings;
+		this.context = context;
 	}

 	public void initialize() {
@@ -35,13 +40,19 @@ public class DebugMode {
 	}

 	private void setLogLevels(boolean debugMode) {
-		var configurator = LogbackConfiguratorFactory.provider();
 		if (debugMode) {
-			configurator.setLogLevels(LogbackConfigurator.DEBUG_LOG_LEVELS);
+			setLogLevels(LoggerModule.DEBUG_LOG_LEVELS);
 			LOG.debug("Debug mode enabled");
 		} else {
 			LOG.debug("Debug mode disabled");
-			configurator.setLogLevels(LogbackConfigurator.DEFAULT_LOG_LEVELS);
+			setLogLevels(LoggerModule.DEFAULT_LOG_LEVELS);
+		}
+	}
+
+	private void setLogLevels(Map<String, Level> logLevels) {
+		for (Map.Entry<String, Level> loglevel : logLevels.entrySet()) {
+			Logger logger = context.getLogger(loglevel.getKey());
+			logger.setLevel(loglevel.getValue());
 		}
 	}

@@ -1,145 +0,0 @@
-package org.cryptomator.logging;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
-import ch.qos.logback.classic.spi.Configurator;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.ConsoleAppender;
-import ch.qos.logback.core.FileAppender;
-import ch.qos.logback.core.helpers.NOPAppender;
-import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
-import ch.qos.logback.core.rolling.RollingFileAppender;
-import ch.qos.logback.core.spi.ContextAwareBase;
-import ch.qos.logback.core.util.FileSize;
-import org.cryptomator.common.Environment;
-
-import java.nio.file.Path;
-import java.util.Map;
-
-public class LogbackConfigurator extends ContextAwareBase implements Configurator {
-
-	private static final String LOG_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
-	private static final String UPGRADE_FILENAME = "upgrade.log";
-	private static final String LOGFILE_NAME = "cryptomator0.log";
-	private static final String LOGFILE_ROLLING_PATTERN = "cryptomator%i.log";
-	private static final int LOGFILE_ROLLING_MIN = 1;
-	private static final int LOGFILE_ROLLING_MAX = 9;
-	private static final String LOG_MAX_SIZE = "100mb";
-
-	static final Map<String, Level> DEFAULT_LOG_LEVELS = Map.of( //
-			Logger.ROOT_LOGGER_NAME, Level.INFO, //
-			"org.cryptomator", Level.INFO //
-	);
-	static final Map<String, Level> DEBUG_LOG_LEVELS = Map.of( //
-			Logger.ROOT_LOGGER_NAME, Level.INFO, //
-			"org.cryptomator", Level.TRACE //
-	);
-
-	LogbackConfigurator() {}
-
-	/**
-	 * Adjust the log levels
-	 *
-	 * @param logLevels new log levels to use
-	 */
-	void setLogLevels(Map<String, Level> logLevels) {
-		if (context instanceof LoggerContext lc) {
-			for (var loglevel : logLevels.entrySet()) {
-				Logger logger = lc.getLogger(loglevel.getKey());
-				logger.setLevel(loglevel.getValue());
-			}
-		}
-	}
-
-	@Override
-	public ExecutionStatus configure(LoggerContext context) {
-		var useCustomCfg = Environment.getInstance().useCustomLogbackConfig();
-		var logDir = Environment.getInstance().getLogDir().orElse(null);
-
-		if (useCustomCfg) {
-			addInfo("Using external logback configuration file.");
-		} else {
-			// configure appenders:
-			var stdout = stdOutAppender(context);
-			var noop = noopAppender(context);
-			var file = logDir == null ? noop : fileAppender(context, logDir);
-			var upgrade = logDir == null ? noop : upgradeAppender(context, logDir);
-
-			// configure loggers:
-			for (var loglevel : DEFAULT_LOG_LEVELS.entrySet()) {
-				Logger logger = context.getLogger(loglevel.getKey());
-				logger.setLevel(loglevel.getValue());
-				logger.setAdditive(false);
-				logger.addAppender(stdout);
-				logger.addAppender(file);
-			}
-
-			// configure upgrade logger:
-			Logger upgrades = context.getLogger("org.cryptomator.cryptofs.migration");
-			upgrades.setLevel(Level.DEBUG);
-			upgrades.addAppender(stdout);
-			upgrades.addAppender(upgrade);
-			upgrades.addAppender(file);
-			upgrades.setAdditive(false);
-		}
-		return ExecutionStatus.DO_NOT_INVOKE_NEXT_IF_ANY;
-	}
-
-	private Appender<ILoggingEvent> noopAppender(LoggerContext context) {
-		var appender = new NOPAppender<ILoggingEvent>();
-		appender.setContext(context);
-		return appender;
-	}
-
-	private Appender<ILoggingEvent> stdOutAppender(LoggerContext context) {
-		var appender = new ConsoleAppender<ILoggingEvent>();
-		appender.setContext(context);
-		appender.setName("STDOUT");
-		appender.setEncoder(encoder(context));
-		appender.start();
-		return appender;
-	}
-
-	private Appender<ILoggingEvent> upgradeAppender(LoggerContext context, Path logDir) {
-		var appender = new FileAppender<ILoggingEvent>();
-		appender.setContext(context);
-		appender.setName("UPGRADE");
-		appender.setFile(logDir.resolve(UPGRADE_FILENAME).toString());
-		appender.setEncoder(encoder(context));
-		appender.start();
-		return appender;
-	}
-
-	private Appender<ILoggingEvent> fileAppender(LoggerContext context, Path logDir) {
-		var appender = new RollingFileAppender<ILoggingEvent>();
-		appender.setContext(context);
-		appender.setName("FILE");
-		appender.setFile(logDir.resolve(LOGFILE_NAME).toString());
-		appender.setEncoder(encoder(context));
-		var triggeringPolicy = new LaunchAndSizeBasedTriggeringPolicy<ILoggingEvent>(FileSize.valueOf(LOG_MAX_SIZE));
-		triggeringPolicy.setContext(context);
-		triggeringPolicy.start();
-		appender.setTriggeringPolicy(triggeringPolicy);
-		var rollingPolicy = new FixedWindowRollingPolicy();
-		rollingPolicy.setContext(context);
-		rollingPolicy.setFileNamePattern(logDir.resolve(LOGFILE_ROLLING_PATTERN).toString());
-		rollingPolicy.setMinIndex(LOGFILE_ROLLING_MIN);
-		rollingPolicy.setMaxIndex(LOGFILE_ROLLING_MAX);
-		rollingPolicy.setParent(appender);
-		rollingPolicy.start();
-		appender.setRollingPolicy(rollingPolicy);
-		appender.start();
-		return appender;
-	}
-
-	private PatternLayoutEncoder encoder(LoggerContext context) {
-		var encoder = new PatternLayoutEncoder();
-		encoder.setContext(context);
-		encoder.setPattern(LOG_PATTERN);
-		encoder.start();
-		return encoder;
-	}
-}
@@ -1,12 +0,0 @@
-package org.cryptomator.logging;
-
-public class LogbackConfiguratorFactory {
-
-	public static LogbackConfigurator provider() {
-		final class Holder {
-			private static final LogbackConfigurator INSTANCE = new LogbackConfigurator();
-		}
-		return Holder.INSTANCE;
-	}
-
-}
@@ -0,0 +1,70 @@
+package org.cryptomator.logging;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Appender;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.ShutdownHook;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.util.Map;
+
+@Singleton
+public class LoggerConfiguration {
+
+	private final LoggerContext context;
+	private final Environment environment;
+	private final Appender<ILoggingEvent> stdout;
+	private final Appender<ILoggingEvent> upgrade;
+	private final Appender<ILoggingEvent> file;
+	private final ShutdownHook shutdownHook;
+
+	@Inject
+	LoggerConfiguration(LoggerContext context, //
+						Environment environment, //
+						@Named("stdoutAppender") Appender<ILoggingEvent> stdout, //
+						@Named("upgradeAppender") Appender<ILoggingEvent> upgrade, //
+						@Named("fileAppender") Appender<ILoggingEvent> file, //
+						ShutdownHook shutdownHook) {
+		this.context = context;
+		this.environment = environment;
+		this.stdout = stdout;
+		this.upgrade = upgrade;
+		this.file = file;
+		this.shutdownHook = shutdownHook;
+	}
+
+	public void init() {
+		if (environment.useCustomLogbackConfig()) {
+			Logger root = context.getLogger(Logger.ROOT_LOGGER_NAME);
+			root.info("Using external logback configuration file.");
+		} else {
+			context.reset();
+
+			// configure loggers:
+			for (Map.Entry<String, Level> loglevel : LoggerModule.DEFAULT_LOG_LEVELS.entrySet()) {
+				Logger logger = context.getLogger(loglevel.getKey());
+				logger.setLevel(loglevel.getValue());
+				logger.setAdditive(false);
+				logger.addAppender(stdout);
+				logger.addAppender(file);
+			}
+
+			// configure upgrade logger:
+			Logger upgrades = context.getLogger("org.cryptomator.cryptofs.migration");
+			upgrades.setLevel(Level.DEBUG);
+			upgrades.addAppender(stdout);
+			upgrades.addAppender(upgrade);
+			upgrades.addAppender(file);
+			upgrades.setAdditive(false);
+
+			// add shutdown hook
+			shutdownHook.runOnShutdown(ShutdownHook.PRIO_LAST, context::stop);
+		}
+	}
+
+}
@@ -0,0 +1,130 @@
+package org.cryptomator.logging;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.ConsoleAppender;
+import ch.qos.logback.core.FileAppender;
+import ch.qos.logback.core.helpers.NOPAppender;
+import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
+import ch.qos.logback.core.rolling.RollingFileAppender;
+import ch.qos.logback.core.util.FileSize;
+import dagger.Module;
+import dagger.Provides;
+import org.cryptomator.common.Environment;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.nio.file.Path;
+import java.util.Map;
+
+@Module
+public class LoggerModule {
+
+	private static final String UPGRADE_FILENAME = "upgrade.log";
+	private static final String LOGFILE_NAME = "cryptomator0.log";
+	private static final String LOGFILE_ROLLING_PATTERN = "cryptomator%i.log";
+	private static final int LOGFILE_ROLLING_MIN = 1;
+	private static final int LOGFILE_ROLLING_MAX = 9;
+	private static final String LOG_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
+	private static final String LOG_MAX_SIZE = "100mb";
+
+	static final Map<String, Level> DEFAULT_LOG_LEVELS = Map.of( //
+			Logger.ROOT_LOGGER_NAME, Level.INFO, //
+			"org.cryptomator", Level.INFO //
+	);
+	static final Map<String, Level> DEBUG_LOG_LEVELS = Map.of( //
+			Logger.ROOT_LOGGER_NAME, Level.INFO, //
+			"org.cryptomator", Level.TRACE //
+	);
+
+	@Provides
+	@Singleton
+	static LoggerContext provideLoggerContext() {
+		ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
+		if (loggerFactory instanceof LoggerContext context) {
+			return context;
+		} else {
+			throw new IllegalStateException("SLF4J not bound to Logback.");
+		}
+	}
+
+	@Provides
+	@Singleton
+	static PatternLayoutEncoder provideLayoutEncoder(LoggerContext context) {
+		PatternLayoutEncoder ple = new PatternLayoutEncoder();
+		ple.setPattern(LOG_PATTERN);
+		ple.setContext(context);
+		ple.start();
+		return ple;
+	}
+
+	@Provides
+	@Singleton
+	@Named("stdoutAppender")
+	static Appender<ILoggingEvent> provideStdoutAppender(LoggerContext context, PatternLayoutEncoder encoder) {
+		ConsoleAppender<ILoggingEvent> appender = new ConsoleAppender<>();
+		appender.setContext(context);
+		appender.setEncoder(encoder);
+		appender.start();
+		return appender;
+	}
+
+	@Provides
+	@Singleton
+	@Named("fileAppender")
+	static Appender<ILoggingEvent> provideFileAppender(LoggerContext context, PatternLayoutEncoder encoder, Environment environment) {
+		var optionalLogDir = environment.getLogDir();
+		if (optionalLogDir.isPresent()) {
+			Path logDir = optionalLogDir.get();
+			RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<>();
+			appender.setContext(context);
+			appender.setFile(logDir.resolve(LOGFILE_NAME).toString());
+			appender.setEncoder(encoder);
+			LaunchAndSizeBasedTriggeringPolicy triggeringPolicy = new LaunchAndSizeBasedTriggeringPolicy(FileSize.valueOf(LOG_MAX_SIZE));
+			triggeringPolicy.setContext(context);
+			triggeringPolicy.start();
+			appender.setTriggeringPolicy(triggeringPolicy);
+			FixedWindowRollingPolicy rollingPolicy = new FixedWindowRollingPolicy();
+			rollingPolicy.setContext(context);
+			rollingPolicy.setFileNamePattern(logDir.resolve(LOGFILE_ROLLING_PATTERN).toString());
+			rollingPolicy.setMinIndex(LOGFILE_ROLLING_MIN);
+			rollingPolicy.setMaxIndex(LOGFILE_ROLLING_MAX);
+			rollingPolicy.setParent(appender);
+			rollingPolicy.start();
+			appender.setRollingPolicy(rollingPolicy);
+			appender.start();
+			return appender;
+		} else {
+			NOPAppender appender = new NOPAppender<>();
+			appender.setContext(context);
+			return appender;
+		}
+	}
+
+	@Provides
+	@Singleton
+	@Named("upgradeAppender")
+	static Appender<ILoggingEvent> provideUpgradeAppender(LoggerContext context, PatternLayoutEncoder encoder, Environment environment) {
+		var optionalLogDir = environment.getLogDir();
+		if (optionalLogDir.isPresent()) {
+			FileAppender<ILoggingEvent> appender = new FileAppender<>();
+			appender.setFile(optionalLogDir.get().resolve(UPGRADE_FILENAME).toString());
+			appender.setContext(context);
+			appender.setEncoder(encoder);
+			appender.start();
+			return appender;
+		} else {
+			NOPAppender appender = new NOPAppender<>();
+			appender.setContext(context);
+			return appender;
+		}
+	}
+
+
+}
@@ -2,20 +2,19 @@ package org.cryptomator.ui.addvaultwizard;

 import dagger.Lazy;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
-import org.cryptomator.integrations.uiappearance.Theme;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.fxapp.FxApplicationStyle;
 import org.cryptomator.ui.fxapp.FxApplicationWindows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -24,7 +23,6 @@ import javafx.stage.Stage;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Objects;
 import java.util.ResourceBundle;

 import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_GLOB;
@@ -42,10 +40,12 @@ public class ChooseExistingVaultController implements FxController {
 	private final ObjectProperty<Vault> vault;
 	private final VaultListManager vaultListManager;
 	private final ResourceBundle resourceBundle;
-	private final ObservableValue<Image> screenshot;
+	private final Settings settings;
+
+	private Image screenshot;

 	@Inject
-	ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy<Scene> welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy<Scene> successScene, FxApplicationWindows appWindows, ObjectProperty<Path> vaultPath, @AddVaultWizardWindow ObjectProperty<Vault> vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, FxApplicationStyle applicationStyle) {
+	ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy<Scene> welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy<Scene> successScene, FxApplicationWindows appWindows, ObjectProperty<Path> vaultPath, @AddVaultWizardWindow ObjectProperty<Vault> vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, Settings settings) {
 		this.window = window;
 		this.welcomeScene = welcomeScene;
 		this.successScene = successScene;
@@ -54,20 +54,16 @@ public class ChooseExistingVaultController implements FxController {
 		this.vault = vault;
 		this.vaultListManager = vaultListManager;
 		this.resourceBundle = resourceBundle;
-		this.screenshot = applicationStyle.appliedThemeProperty().map(this::selectScreenshot);
+		this.settings = settings;
 	}

-	private Image selectScreenshot(Theme theme) {
-		String imageResourcePath;
+	@FXML
+	public void initialize() {
 		if (SystemUtils.IS_OS_MAC) {
-			imageResourcePath = switch (theme) {
-				case LIGHT -> "/img/select-masterkey-mac.png";
-				case DARK -> "/img/select-masterkey-mac-dark.png";
-			};
+			this.screenshot = new Image(getClass().getResource("/img/select-masterkey-mac"+(UiTheme.LIGHT == settings.theme().get()? "":"-dark")+".png").toString());
 		} else {
-			imageResourcePath = "/img/select-masterkey-win.png";
+			this.screenshot = new Image(getClass().getResource("/img/select-masterkey-win.png").toString());
 		}
-		return new Image((Objects.requireNonNull(getClass().getResource(imageResourcePath)).toString()));
 	}

 	@FXML
@@ -96,13 +92,8 @@ public class ChooseExistingVaultController implements FxController {

 	/* Getter */

-	public ObservableValue<Image> screenshotProperty() {
+	public Image getScreenshot() {
 		return screenshot;
 	}

-	public Image getScreenshot() {
-		return screenshot.getValue();
-	}
-
-
 }
@@ -10,6 +10,7 @@ import javax.inject.Named;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
@@ -32,6 +33,8 @@ public class CreateNewVaultNameController implements FxController {
 	private final ObjectProperty<Path> vaultPath;
 	private final StringProperty vaultName;
 	private final BooleanBinding validVaultName;
+	private final BooleanBinding invalidVaultName;
+	private final StringBinding warningText;

 	@Inject
 	CreateNewVaultNameController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy<Scene> welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy<Scene> chooseLocationScene, ObjectProperty<Path> vaultPath, @Named("vaultName") StringProperty vaultName, ResourceBundle resourceBundle) {
@@ -41,14 +44,20 @@ public class CreateNewVaultNameController implements FxController {
 		this.vaultPath = vaultPath;
 		this.vaultName = vaultName;
 		this.validVaultName = Bindings.createBooleanBinding(this::isValidVaultName, vaultName);
+		this.invalidVaultName = validVaultName.not();
+		this.warningText = Bindings.when(vaultName.isNotEmpty().and(invalidVaultName)).then(resourceBundle.getString("addvaultwizard.new.invalidName")).otherwise((String) null);
 	}

 	@FXML
 	public void initialize() {
-		vaultName.bindBidirectional(textField.textProperty());
+		vaultName.bind(textField.textProperty());
 		vaultName.addListener(this::vaultNameChanged);
 	}

+	public boolean isValidVaultName() {
+		return vaultName.get() != null && VALID_NAME_PATTERN.matcher(vaultName.get().trim()).matches();
+	}
+
 	private void vaultNameChanged(@SuppressWarnings("unused") Observable observable) {
 		if (isValidVaultName()) {
 			if (vaultPath.get() != null) {
@@ -66,17 +75,32 @@ public class CreateNewVaultNameController implements FxController {
 	@FXML
 	public void next() {
 		window.setScene(chooseLocationScene.get());
-		vaultName.set(vaultName.get().trim());
 	}

 	/* Getter/Setter */

-	public BooleanBinding validVaultNameProperty() {
-		return validVaultName;
+	public BooleanBinding invalidVaultNameProperty() {
+		return invalidVaultName;
 	}

-	public boolean isValidVaultName() {
-		return vaultName.get() != null && VALID_NAME_PATTERN.matcher(vaultName.get().trim()).matches();
+	public boolean isInvalidVaultName() {
+		return invalidVaultName.get();
+	}
+
+	public StringBinding warningTextProperty() {
+		return warningText;
+	}
+
+	public String getWarningText() {
+		return warningText.get();
+	}
+
+	public BooleanBinding showWarningProperty() {
+		return warningText.isNotEmpty();
+	}
+
+	public boolean isShowWarning() {
+		return showWarningProperty().get();
 	}

 }
@@ -102,7 +102,7 @@ public class CreateNewVaultPasswordController implements FxController {
 		this.masterkeyFileAccess = masterkeyFileAccess;
 		this.processing = new SimpleBooleanProperty();
 		this.readyToCreateVault = new SimpleBooleanProperty();
-		this.createVaultButtonState = Bindings.when(processing).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY);
+		this.createVaultButtonState = Bindings.createObjectBinding(this::getCreateVaultButtonState, processing);
 	}

 	@FXML
@@ -231,6 +231,6 @@ public class CreateNewVaultPasswordController implements FxController {
 	}

 	public ContentDisplay getCreateVaultButtonState() {
-		return createVaultButtonState.get();
+		return processing.get() ? ContentDisplay.LEFT : ContentDisplay.TEXT_ONLY;
 	}
 }
@@ -12,15 +12,15 @@ import javafx.beans.value.ObservableValue;
 * <p>
 * During creation the consumer can optionally define actions to be executed everytime before the animation starts and after it stops.
 */
-public class AutoAnimator {
+public class AutoAnimator<T extends Animation> {

-	private final Animation animation;
+	private final T animation;
 	private final ObservableValue<Boolean> condition;
 	private final Runnable beforeStart;
 	private final Runnable afterStop;
 	private final Subscription sub;

-	AutoAnimator(Animation animation, ObservableValue<Boolean> condition, Runnable beforeStart, Runnable afterStop) {
+	AutoAnimator(T animation, ObservableValue<Boolean> condition, Runnable beforeStart, Runnable afterStop) {
 		this.animation = animation;
 		this.condition = condition;
 		this.beforeStart = beforeStart;
@@ -52,7 +52,7 @@ public class AutoAnimator {

 	public static class Builder {

-		private final Animation animation;
+		private Animation animation;
 		private ObservableValue<Boolean> condition = new SimpleBooleanProperty(true);
 		private Runnable beforeStart = () -> {};
 		private Runnable afterStop = () -> {};
@@ -77,7 +77,7 @@ public class ErrorController implements FxController {
 		var enhancedTemplate = String.format(REPORT_BODY_TEMPLATE, //
 				System.getProperty("os.name"), //
 				System.getProperty("os.version"), //
-				environment.getAppVersion(), //
+				environment.getAppVersion().orElse("undefined"), //
 				environment.getBuildNumber().orElse("undefined"));
 		var body = URLEncoder.encode(enhancedTemplate, StandardCharsets.UTF_8);
 		application.getHostServices().showDocument(REPORT_URL_FORMAT.formatted(title, body));
@@ -13,13 +13,6 @@ public enum FxmlFile {
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
 	HEALTH_CHECK_LIST("/fxml/health_check_list.fxml"), //
-	HUB_AUTH_FLOW("/fxml/hub_auth_flow.fxml"), //
-	HUB_LICENSE_EXCEEDED("/fxml/hub_license_exceeded.fxml"), //
-	HUB_RECEIVE_KEY("/fxml/hub_receive_key.fxml"), //
-	HUB_REGISTER_DEVICE("/fxml/hub_register_device.fxml"), //
-	HUB_REGISTER_SUCCESS("/fxml/hub_register_success.fxml"), //
-	HUB_REGISTER_FAILED("/fxml/hub_register_failed.fxml"),
-	HUB_UNAUTHORIZED_DEVICE("/fxml/hub_unauthorized_device.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
@@ -30,11 +23,9 @@ public enum FxmlFile {
 	MIGRATION_SUCCESS("/fxml/migration_success.fxml"), //
 	PREFERENCES("/fxml/preferences.fxml"), //
 	QUIT("/fxml/quit.fxml"), //
-	QUIT_FORCED("/fxml/quit_forced.fxml"), //
 	RECOVERYKEY_CREATE("/fxml/recoverykey_create.fxml"), //
 	RECOVERYKEY_RECOVER("/fxml/recoverykey_recover.fxml"), //
 	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"), //
 	UNLOCK_ENTER_PASSWORD("/fxml/unlock_enter_password.fxml"),
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.common;

+import com.tobiasdiez.easybind.EasyBind;
 import org.cryptomator.ui.controls.FontAwesome5IconView;
 import org.cryptomator.ui.controls.NiceSecurePasswordField;

@@ -41,7 +42,7 @@ public class NewPasswordController implements FxController {
 		passwordStrength.bind(Bindings.createIntegerBinding(() -> strengthRater.computeRate(passwordField.getCharacters()), passwordField.textProperty()));

 		passwordStrengthLabel.graphicProperty().bind(Bindings.createObjectBinding(this::getIconViewForPasswordStrengthLabel, passwordField.textProperty(), passwordStrength));
-		passwordStrengthLabel.textProperty().bind(passwordStrength.map(strengthRater::getStrengthDescription));
+		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));

 		BooleanBinding passwordsMatch = Bindings.createBooleanBinding(this::passwordFieldsMatch, passwordField.textProperty(), reenterField.textProperty());
 		BooleanBinding reenterFieldNotEmpty = reenterField.textProperty().isNotEmpty();
@@ -86,8 +86,7 @@ public class VaultService {
 	}

 	/**
-	 * Creates a lock-all task.
-	 * This task itself is _not started_, but its subtasks locking each vault will be already executed.
+	 * Creates but doesn't start a lock-all task.
 	 *
 	 * @param vaults The list of vaults to be locked
 	 * @param forced Whether to attempt a forced lock
@@ -27,7 +27,6 @@ public enum FontAwesome5Icon {
 	FILE("\uF15B"), //
 	FILE_IMPORT("\uF56F"), //
 	FOLDER_OPEN("\uF07C"), //
-	FUNNEL("\uF0B0"), //
 	HAND_HOLDING_HEART("\uF4BE"), //
 	HEART("\uF004"), //
 	HDD("\uF0A0"), //
@@ -46,7 +46,7 @@ public class NiceSecurePasswordField extends StackPane {
 		nonPrintableCharsIcon.managedProperty().bind(passwordField.containingNonPrintableCharsProperty());

 		revealPasswordIcon.setGlyph(FontAwesome5Icon.EYE);
-		revealPasswordIcon.glyphProperty().bind(Bindings.when(revealPasswordButton.selectedProperty()).then(FontAwesome5Icon.EYE_SLASH).otherwise(FontAwesome5Icon.EYE));
+		revealPasswordIcon.glyphProperty().bind(Bindings.createObjectBinding(this::getRevealPasswordGlyph, revealPasswordButton.selectedProperty()));
 		revealPasswordIcon.setGlyphSize(ICON_SIZE);

 		revealPasswordButton.setContentDisplay(ContentDisplay.LEFT);
@@ -61,6 +61,10 @@ public class NiceSecurePasswordField extends StackPane {
 		disabledProperty().addListener(this::disabledChanged);
 	}

+	private FontAwesome5Icon getRevealPasswordGlyph() {
+		return revealPasswordButton.isSelected() ? FontAwesome5Icon.EYE_SLASH : FontAwesome5Icon.EYE;
+	}
+
 	private void disabledChanged(@SuppressWarnings("unused") Observable observable) {
 		revealPasswordButton.setSelected(false);
 	}
@@ -71,11 +71,9 @@ public class SecurePasswordField extends TextField {
 	}

 	public void cut() {
-		//not implemented by design
 	}

 	public void copy() {
-		//not implemented by design
 	}

 	public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
@@ -43,11 +43,9 @@ public class ForgetPasswordController implements FxController {
 				LOG.debug("Forgot password for vault {}.", vault.getDisplayName());
 				confirmedResult.setValue(true);
 			} catch (KeychainAccessException e) {
-				LOG.error("Failed to delete passphrase from system keychain.", e);
+				LOG.error("Failed to remove entry from system keychain.", e);
 				confirmedResult.setValue(false);
 			}
-		} else {
-			LOG.warn("Keychain not supported. Doing nothing.");
 		}
 		window.close();
 	}
@@ -4,8 +4,6 @@ import org.cryptomator.common.vaults.Vault;

 import javax.inject.Inject;
 import javafx.collections.ObservableList;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;

@FxApplicationScoped
 public class AutoUnlocker {
@@ -20,11 +18,9 @@ public class AutoUnlocker {
 	}

 	public void unlock() {
-		vaults.stream().filter(Vault::isLocked) //
-				.filter(v -> v.getVaultSettings().unlockAfterStartup().get()) //
-				.<CompletionStage<Void>>reduce(CompletableFuture.completedFuture(null), //
-						(unlockFlow, v) -> unlockFlow.handle((voit, ex) -> appWindows.startUnlockWorkflow(v, null)).thenCompose(stage -> stage), //we don't care here about the exception, logged elsewhere
-						(unlockChain1, unlockChain2) -> unlockChain1.handle((voit, ex) -> unlockChain2).thenCompose(stage -> stage));
+		vaults.stream().filter(Vault::isLocked).filter(v -> v.getVaultSettings().unlockAfterStartup().get()).forEach(v -> {
+			appWindows.startUnlockWorkflow(v, null);
+		});
 	}

 }
@@ -14,7 +14,6 @@ import org.cryptomator.ui.lock.LockComponent;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.quit.QuitComponent;
-
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.cryptomator.ui.unlock.UnlockComponent;

@@ -58,4 +57,4 @@ abstract class FxApplicationModule {
 	static QuitComponent provideQuitComponent(QuitComponent.Builder builder) {
 		return builder.build();
 	}
-}
+}
@@ -12,8 +12,6 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javafx.application.Application;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import java.util.Optional;

@@ -26,10 +24,9 @@ public class FxApplicationStyle {
 	private final Optional<UiAppearanceProvider> appearanceProvider;
 	private final LicenseHolder licenseHolder;
 	private final UiAppearanceListener systemInterfaceThemeListener = this::systemInterfaceThemeChanged;
-	private final ObjectProperty<Theme> appliedTheme = new SimpleObjectProperty<>(Theme.LIGHT);

 	@Inject
-	public FxApplicationStyle(Settings settings, Optional<UiAppearanceProvider> appearanceProvider, LicenseHolder licenseHolder) {
+	public FxApplicationStyle(Settings settings, Optional<UiAppearanceProvider> appearanceProvider, LicenseHolder licenseHolder){
 		this.settings = settings;
 		this.appearanceProvider = appearanceProvider;
 		this.licenseHolder = licenseHolder;
@@ -94,7 +91,6 @@ public class FxApplicationStyle {
 		} else {
 			Application.setUserAgentStylesheet(stylesheet.toString());
 			appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.LIGHT));
-			appliedTheme.set(Theme.LIGHT);
 		}
 	}

@@ -107,11 +103,6 @@ public class FxApplicationStyle {
 		} else {
 			Application.setUserAgentStylesheet(stylesheet.toString());
 			appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.DARK));
-			appliedTheme.set(Theme.DARK);
 		}
 	}
-
-	public ObjectProperty<Theme> appliedThemeProperty() {
-		return appliedTheme;
-	}
 }
@@ -2,12 +2,10 @@ package org.cryptomator.ui.fxapp;

 import com.google.common.base.Preconditions;
 import org.cryptomator.common.ShutdownHook;
-import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.LockNotCompletedException;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume;
-import org.cryptomator.ui.common.VaultService;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,24 +27,18 @@ import static org.cryptomator.common.vaults.VaultState.Value.*;
 public class FxApplicationTerminator {

 	private static final Set<VaultState.Value> STATES_ALLOWING_TERMINATION = EnumSet.of(LOCKED, NEEDS_MIGRATION, MISSING, ERROR);
-	private static final Set<VaultState.Value> STATES_PREVENT_TERMINATION = EnumSet.of(PROCESSING);
 	private static final Logger LOG = LoggerFactory.getLogger(FxApplicationTerminator.class);

 	private final ObservableList<Vault> vaults;
 	private final ShutdownHook shutdownHook;
 	private final FxApplicationWindows appWindows;
 	private final AtomicBoolean allowQuitWithoutPrompt = new AtomicBoolean();
-	private final AtomicBoolean preventQuitWithGracefulLock = new AtomicBoolean();
-	private final Settings settings;
-	private final VaultService vaultService;

 	@Inject
-	public FxApplicationTerminator(ObservableList<Vault> vaults, ShutdownHook shutdownHook, FxApplicationWindows appWindows, Settings settings, VaultService vaultService) {
+	public FxApplicationTerminator(ObservableList<Vault> vaults, ShutdownHook shutdownHook, FxApplicationWindows appWindows) {
 		this.vaults = vaults;
 		this.shutdownHook = shutdownHook;
 		this.appWindows = appWindows;
-		this.settings = settings;
-		this.vaultService = vaultService;
 	}

 	public void initialize() {
@@ -80,10 +72,6 @@ public class FxApplicationTerminator {
 	private void vaultListChanged(@SuppressWarnings("unused") Observable observable) {
 		boolean allowSuddenTermination = vaults.stream().map(Vault::getState).allMatch(STATES_ALLOWING_TERMINATION::contains);
 		boolean stateChanged = allowQuitWithoutPrompt.compareAndSet(!allowSuddenTermination, allowSuddenTermination);
-
-		boolean preventGracefulTermination = vaults.stream().map(Vault::getState).anyMatch(STATES_PREVENT_TERMINATION::contains);
-		preventQuitWithGracefulLock.set(preventGracefulTermination);
-
 		Desktop desktop = Desktop.getDesktop();
 		if (stateChanged && desktop.isSupported(Desktop.Action.APP_SUDDEN_TERMINATION)) {
 			if (allowSuddenTermination) {
@@ -104,22 +92,10 @@ public class FxApplicationTerminator {
 	 */
 	private void handleQuitRequest(@SuppressWarnings("unused") @Nullable EventObject e, QuitResponse response) {
 		var exitingResponse = new ExitingQuitResponse(response);
-
 		if (allowQuitWithoutPrompt.get()) {
 			exitingResponse.performQuit();
-		} else if (settings.autoCloseVaults().get() && !preventQuitWithGracefulLock.get()) {
-			var lockAllTask = vaultService.createLockAllTask(vaults.filtered(Vault::isUnlocked), false);
-			lockAllTask.setOnSucceeded(event -> {
-				LOG.info("Locked remaining vaults was succesful.");
-				exitingResponse.performQuit();
-			});
-			lockAllTask.setOnFailed(event -> {
-				LOG.warn("Unable to lock all vaults.");
-				appWindows.showQuitWindow(exitingResponse, true);
-			});
-			lockAllTask.run();
 		} else {
-			appWindows.showQuitWindow(exitingResponse, false);
+			appWindows.showQuitWindow(exitingResponse);
 		}
 	}

@@ -139,7 +115,7 @@ public class FxApplicationTerminator {

 	/**
 	 * A dummy QuitResponse that ignores the response.
-	 * <p>
+	 *
 	 * To be used with {@link #handleQuitRequest(EventObject, QuitResponse)} if the invoking method is not interested in the response.
 	 */
 	private static class NoopQuitResponse implements QuitResponse {
@@ -40,7 +40,7 @@ public class FxApplicationWindows {
 	private final Optional<TrayIntegrationProvider> trayIntegration;
 	private final Lazy<MainWindowComponent> mainWindow;
 	private final Lazy<PreferencesComponent> preferencesWindow;
-	private final QuitComponent.Builder quitWindowBuilder;
+	private final Lazy<QuitComponent> quitWindow;
 	private final UnlockComponent.Factory unlockWorkflowFactory;
 	private final LockComponent.Factory lockWorkflowFactory;
 	private final ErrorComponent.Factory errorWindowFactory;
@@ -48,12 +48,12 @@ public class FxApplicationWindows {
 	private final FilteredList<Window> visibleWindows;

 	@Inject
-	public FxApplicationWindows(@PrimaryStage Stage primaryStage, Optional<TrayIntegrationProvider> trayIntegration, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, QuitComponent.Builder quitWindowBuilder, UnlockComponent.Factory unlockWorkflowFactory, LockComponent.Factory lockWorkflowFactory, ErrorComponent.Factory errorWindowFactory, ExecutorService executor) {
+	public FxApplicationWindows(@PrimaryStage Stage primaryStage, Optional<TrayIntegrationProvider> trayIntegration, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Lazy<QuitComponent> quitWindow, UnlockComponent.Factory unlockWorkflowFactory, LockComponent.Factory lockWorkflowFactory, ErrorComponent.Factory errorWindowFactory, ExecutorService executor) {
 		this.primaryStage = primaryStage;
 		this.trayIntegration = trayIntegration;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
-		this.quitWindowBuilder = quitWindowBuilder;
+		this.quitWindow = quitWindow;
 		this.unlockWorkflowFactory = unlockWorkflowFactory;
 		this.lockWorkflowFactory = lockWorkflowFactory;
 		this.errorWindowFactory = errorWindowFactory;
@@ -104,8 +104,8 @@ public class FxApplicationWindows {
 		return CompletableFuture.supplyAsync(() -> preferencesWindow.get().showPreferencesWindow(selectedTab), Platform::runLater).whenComplete(this::reportErrors);
 	}

-	public void showQuitWindow(QuitResponse response, boolean forced) {
-			CompletableFuture.runAsync(() -> quitWindowBuilder.build().showQuitWindow(response,forced), Platform::runLater);
+	public CompletionStage<Stage> showQuitWindow(QuitResponse response) {
+		return CompletableFuture.supplyAsync(() -> quitWindow.get().showQuitWindow(response), Platform::runLater).whenComplete(this::reportErrors);
 	}

 	public CompletionStage<Void> startUnlockWorkflow(Vault vault, @Nullable Stage owner) {
@@ -9,12 +9,14 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ReadOnlyStringProperty;
+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.util.Comparator;
+import java.util.Optional;

@FxApplicationScoped
 public class UpdateChecker {
@@ -23,7 +25,8 @@ public class UpdateChecker {
 	private static final Duration AUTOCHECK_DELAY = Duration.seconds(5);

 	private final Settings settings;
-	private final String currentVersion;
+	private final Optional<String> applicationVersion;
+	private final StringProperty currentVersionProperty;
 	private final StringProperty latestVersionProperty;
 	private final Comparator<String> semVerComparator;
 	private final ScheduledService<String> updateCheckerService;
@@ -31,10 +34,11 @@ public class UpdateChecker {
 	@Inject
 	UpdateChecker(Settings settings, Environment env, @Named("latestVersion") StringProperty latestVersionProperty, @Named("SemVer") Comparator<String> semVerComparator, ScheduledService<String> updateCheckerService) {
 		this.settings = settings;
+		this.applicationVersion = env.getAppVersion();
 		this.latestVersionProperty = latestVersionProperty;
 		this.semVerComparator = semVerComparator;
 		this.updateCheckerService = updateCheckerService;
-		this.currentVersion = env.getAppVersion();
+		this.currentVersionProperty = new SimpleStringProperty(applicationVersion.orElse("SNAPSHOT"));
 	}

 	public void automaticallyCheckForUpdatesIfEnabled() {
@@ -62,10 +66,11 @@ public class UpdateChecker {
 	}

 	private void checkSucceeded(WorkerStateEvent event) {
+		String currentVersion = applicationVersion.orElse(null);
 		String latestVersion = updateCheckerService.getValue();
 		LOG.info("Current version: {}, lastest version: {}", currentVersion, latestVersion);

-		if (semVerComparator.compare(currentVersion, latestVersion) < 0) {
+		if (currentVersion == null || semVerComparator.compare(currentVersion, latestVersion) < 0) {
 			// update is available
 			latestVersionProperty.set(latestVersion);
 		} else {
@@ -87,8 +92,8 @@ public class UpdateChecker {
 		return latestVersionProperty;
 	}

-	public String getCurrentVersion() {
-		return currentVersion;
+	public ReadOnlyStringProperty currentVersionProperty() {
+		return currentVersionProperty;
 	}

 }
@@ -56,7 +56,7 @@ public abstract class UpdateCheckerModule {
 	@FxApplicationScoped
 	static HttpRequest provideCheckForUpdatesRequest(Environment env) {
 		String userAgent = String.format("Cryptomator VersionChecker/%s %s %s (%s)", //
-				env.getAppVersion(), //
+				env.getAppVersion().orElse("SNAPSHOT"), //
 				SystemUtils.OS_NAME, //
 				SystemUtils.OS_VERSION, //
 				SystemUtils.OS_ARCH); //
@@ -3,99 +3,62 @@ package org.cryptomator.ui.health;
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.EasyObservableList;
 import com.tobiasdiez.easybind.Subscription;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;

 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.binding.BooleanExpression;
-import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.ListView;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
-import javafx.util.StringConverter;
-import java.util.Arrays;
-import java.util.ResourceBundle;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.stream.Stream;

-import static org.cryptomator.cryptofs.health.api.DiagnosticResult.Severity;
-import static org.cryptomator.ui.health.Result.FixState.FIXABLE;
-import static org.cryptomator.ui.health.Result.FixState.FIXED;
-import static org.cryptomator.ui.health.Result.FixState.FIXING;
-import static org.cryptomator.ui.health.Result.FixState.FIX_FAILED;
-import static org.cryptomator.ui.health.Result.FixState.NOT_FIXABLE;
-
@HealthCheckScoped
 public class CheckDetailController implements FxController {

 	private final EasyObservableList<Result> results;
 	private final ObjectProperty<Check> check;
-	private final ObservableValue<Check.CheckState> checkState;
-	private final ObservableValue<String> checkName;
-	private final BooleanExpression checkRunning;
-	private final BooleanExpression checkScheduled;
-	private final BooleanExpression checkFinished;
-	private final BooleanExpression checkSkipped;
-	private final BooleanExpression checkSucceeded;
-	private final BooleanExpression checkFailed;
-	private final BooleanExpression checkCancelled;
+	private final OptionalBinding<Check.CheckState> checkState;
+	private final Binding<String> checkName;
+	private final Binding<Boolean> checkRunning;
+	private final Binding<Boolean> checkScheduled;
+	private final Binding<Boolean> checkFinished;
+	private final Binding<Boolean> checkSkipped;
+	private final Binding<Boolean> checkSucceeded;
+	private final Binding<Boolean> checkFailed;
+	private final Binding<Boolean> checkCancelled;
 	private final Binding<Number> countOfWarnSeverity;
 	private final Binding<Number> countOfCritSeverity;
 	private final Binding<Boolean> warnOrCritsExist;
 	private final ResultListCellFactory resultListCellFactory;
-	private final ResultFixApplier resultFixApplier;
-	private final ResourceBundle resourceBundle;
-
-	private final BooleanProperty fixAllInfoResultsExecuted;
-	private final BooleanBinding fixAllInfoResultsPossible;
-	private final ObjectProperty<Predicate<Result>> resultsFilter;

 	public ListView<Result> resultsListView;
-	public ChoiceBox<DiagnosticResult.Severity> severityChoiceBox;
-	public ChoiceBox<Result.FixState> fixStateChoiceBox;
 	private Subscription resultSubscription;

 	@Inject
-	public CheckDetailController(ObjectProperty<Check> selectedTask, ResultListCellFactory resultListCellFactory, ResultFixApplier resultFixApplier, ResourceBundle resourceBundle) {
+	public CheckDetailController(ObjectProperty<Check> selectedTask, ResultListCellFactory resultListCellFactory) {
 		this.resultListCellFactory = resultListCellFactory;
-		this.resultFixApplier = resultFixApplier;
-		this.resourceBundle = resourceBundle;
 		this.results = EasyBind.wrapList(FXCollections.observableArrayList());
 		this.check = selectedTask;
-		this.checkState = selectedTask.flatMap(Check::stateProperty);
-		this.checkName = selectedTask.map(Check::getName).orElse("");
-		this.checkRunning = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.RUNNING::equals).orElse(false));
-		this.checkScheduled = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.SCHEDULED::equals).orElse(false));
-		this.checkSkipped = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.SKIPPED::equals).orElse(false));
-		this.checkSucceeded = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.SUCCEEDED::equals).orElse(false));
-		this.checkFailed = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.ERROR::equals).orElse(false));
-		this.checkCancelled = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.CANCELLED::equals).orElse(false));
-		this.checkFinished = checkSucceeded.or(checkFailed).or(checkCancelled);
-		this.countOfWarnSeverity = results.reduce(countSeverity(Severity.WARN));
-		this.countOfCritSeverity = results.reduce(countSeverity(Severity.CRITICAL));
-		this.warnOrCritsExist = EasyBind.combine(checkSucceeded, countOfWarnSeverity, countOfCritSeverity, (suceeded, warns, crits) -> suceeded && (warns.longValue() > 0 || crits.longValue() > 0));
-		this.fixAllInfoResultsExecuted = new SimpleBooleanProperty(false);
-		this.fixAllInfoResultsPossible = Bindings.createBooleanBinding(() -> results.stream().anyMatch(this::isFixableInfoResult), results) //
-				.and(fixAllInfoResultsExecuted.not());
-		this.resultsFilter = new SimpleObjectProperty<>(r -> true);
+		this.checkState = EasyBind.wrapNullable(selectedTask).mapObservable(Check::stateProperty);
+		this.checkName = EasyBind.wrapNullable(selectedTask).map(Check::getName).orElse("");
+		this.checkRunning = checkState.map(Check.CheckState.RUNNING::equals).orElse(false);
+		this.checkScheduled = checkState.map(Check.CheckState.SCHEDULED::equals).orElse(false);
+		this.checkSkipped = checkState.map(Check.CheckState.SKIPPED::equals).orElse(false);
+		this.checkSucceeded = checkState.map(Check.CheckState.SUCCEEDED::equals).orElse(false);
+		this.checkFailed = checkState.map(Check.CheckState.ERROR::equals).orElse(false);
+		this.checkCancelled = checkState.map(Check.CheckState.CANCELLED::equals).orElse(false);
+		this.checkFinished = EasyBind.combine(checkSucceeded, checkFailed, checkCancelled, (a, b, c) -> a || b || c);
+		this.countOfWarnSeverity = results.reduce(countSeverity(DiagnosticResult.Severity.WARN));
+		this.countOfCritSeverity = results.reduce(countSeverity(DiagnosticResult.Severity.CRITICAL));
+		this.warnOrCritsExist = EasyBind.combine(checkSucceeded, countOfWarnSeverity, countOfCritSeverity, (suceeded, warns, crits) -> suceeded && (warns.longValue() > 0 || crits.longValue() > 0) );
 		selectedTask.addListener(this::selectedTaskChanged);
 	}

-	private boolean isFixableInfoResult(Result r) {
-		return r.diagnosis().getSeverity() == Severity.INFO && r.getState() == FIXABLE;
-	}
-
 	private void selectedTaskChanged(ObservableValue<? extends Check> observable, Check oldValue, Check newValue) {
 		if (resultSubscription != null) {
 			resultSubscription.unsubscribe();
@@ -103,8 +66,6 @@ public class CheckDetailController implements FxController {
 		if (newValue != null) {
 			resultSubscription = EasyBind.bindContent(results, newValue.getResults());
 		}
-		severityChoiceBox.setValue(null);
-		fixStateChoiceBox.setValue(null);
 	}

 	private Function<Stream<? extends Result>, Long> countSeverity(DiagnosticResult.Severity severity) {
@@ -113,110 +74,8 @@ public class CheckDetailController implements FxController {

 	@FXML
 	public void initialize() {
-		resultsListView.setItems(results.filtered(resultsFilter));
+		resultsListView.setItems(results);
 		resultsListView.setCellFactory(resultListCellFactory);
-
-		severityChoiceBox.getItems().add(null);
-		severityChoiceBox.getItems().addAll(Arrays.stream(DiagnosticResult.Severity.values()).toList());
-		severityChoiceBox.setConverter(new SeverityStringifier());
-		severityChoiceBox.setValue(null);
-
-		fixStateChoiceBox.getItems().add(null);
-		fixStateChoiceBox.getItems().addAll(Arrays.stream(Result.FixState.values()).toList());
-		fixStateChoiceBox.setConverter(new FixStateStringifier());
-		fixStateChoiceBox.setValue(null);
-
-		resultsFilter.bind(Bindings.createObjectBinding(() -> this::filterResults, severityChoiceBox.valueProperty(), fixStateChoiceBox.valueProperty()));
-	}
-
-	private boolean filterResults(Result r) {
-		var desiredFixState = fixStateChoiceBox.getValue();
-		var desiredSeverity = severityChoiceBox.getValue();
-		return (desiredFixState == null || r.getState() == desiredFixState) && (desiredSeverity == null || r.diagnosis().getSeverity() == desiredSeverity);
-	}
-
-	@FXML
-	public void fixAllInfoResults() {
-		fixAllInfoResultsExecuted.setValue(true);
-		results.stream().filter(this::isFixableInfoResult).forEach(resultFixApplier::fix);
-	}
-
-
-	@FXML
-	public void copyResultDetails() {
-		var result = resultsListView.getSelectionModel().getSelectedItem();
-		if (result != null) {
-			ClipboardContent clipboardContent = new ClipboardContent();
-			clipboardContent.putString(result.diagnosis().toString());
-			Clipboard.getSystemClipboard().setContent(clipboardContent);
-		}
-	}
-
-	/* -- Internal classes -- */
-
-	class SeverityStringifier extends StringConverter<Severity> {
-
-		@Override
-		public String toString(Severity object) {
-			if (object == null) {
-				return resourceBundle.getString("health.result.severityFilter.all");
-			}
-			return switch (object) {
-				case GOOD -> resourceBundle.getString("health.result.severityFilter.good");
-				case INFO -> resourceBundle.getString("health.result.severityFilter.info");
-				case WARN -> resourceBundle.getString("health.result.severityFilter.warn");
-				case CRITICAL -> resourceBundle.getString("health.result.severityFilter.crit");
-			};
-		}
-
-		@Override
-		public Severity fromString(String string) {
-			if (resourceBundle.getString("health.result.severityFilter.good").equals(string)) {
-				return Severity.GOOD;
-			} else if (resourceBundle.getString("health.result.severityFilter.info").equals(string)) {
-				return Severity.INFO;
-			} else if (resourceBundle.getString("health.result.severityFilter.warn").equals(string)) {
-				return Severity.WARN;
-			} else if (resourceBundle.getString("health.result.severityFilter.crit").equals(string)) {
-				return Severity.CRITICAL;
-			} else {
-				return null;
-			}
-		}
-	}
-
-	class FixStateStringifier extends StringConverter<Result.FixState> {
-
-		@Override
-		public String toString(Result.FixState object) {
-			if (object == null) {
-				return resourceBundle.getString("health.result.fixStateFilter.all");
-			}
-			return switch (object) {
-				case FIXABLE -> resourceBundle.getString("health.result.fixStateFilter.fixable");
-				case NOT_FIXABLE -> resourceBundle.getString("health.result.fixStateFilter.notFixable");
-				case FIXING -> resourceBundle.getString("health.result.fixStateFilter.fixing");
-				case FIXED -> resourceBundle.getString("health.result.fixStateFilter.fixed");
-				case FIX_FAILED -> resourceBundle.getString("health.result.fixStateFilter.fixFailed");
-			};
-		}
-
-		@Override
-		public Result.FixState fromString(String string) {
-			if (resourceBundle.getString("health.result.fixStateFilter.fixable").equals(string)) {
-				return FIXABLE;
-			} else if (resourceBundle.getString("health.result.fixStateFilter.notFixable").equals(string)) {
-				return NOT_FIXABLE;
-			} else if (resourceBundle.getString("health.result.fixStateFilter.fixing").equals(string)) {
-				return FIXING;
-			} else if (resourceBundle.getString("health.result.fixStateFilter.fixed").equals(string)) {
-				return FIXED;
-			} else if (resourceBundle.getString("health.result.fixStateFilter.fixFailed").equals(string)) {
-				return FIX_FAILED;
-			} else {
-				return null;
-			}
-		}
 	}

 	/* Getter/Setter */
@@ -225,7 +84,7 @@ public class CheckDetailController implements FxController {
 		return checkName.getValue();
 	}

-	public ObservableValue<String> checkNameProperty() {
+	public Binding<String> checkNameProperty() {
 		return checkName;
 	}

@@ -249,7 +108,7 @@ public class CheckDetailController implements FxController {
 		return checkRunning.getValue();
 	}

-	public BooleanExpression checkRunningProperty() {
+	public Binding<Boolean> checkRunningProperty() {
 		return checkRunning;
 	}

@@ -257,7 +116,7 @@ public class CheckDetailController implements FxController {
 		return checkFinished.getValue();
 	}

-	public BooleanExpression checkFinishedProperty() {
+	public Binding<Boolean> checkFinishedProperty() {
 		return checkFinished;
 	}

@@ -265,7 +124,7 @@ public class CheckDetailController implements FxController {
 		return checkScheduled.getValue();
 	}

-	public BooleanExpression checkScheduledProperty() {
+	public Binding<Boolean> checkScheduledProperty() {
 		return checkScheduled;
 	}

@@ -273,7 +132,7 @@ public class CheckDetailController implements FxController {
 		return checkSkipped.getValue();
 	}

-	public BooleanExpression checkSkippedProperty() {
+	public Binding<Boolean> checkSkippedProperty() {
 		return checkSkipped;
 	}

@@ -281,7 +140,7 @@ public class CheckDetailController implements FxController {
 		return checkSucceeded.getValue();
 	}

-	public BooleanExpression checkSucceededProperty() {
+	public Binding<Boolean> checkSucceededProperty() {
 		return checkSucceeded;
 	}

@@ -289,7 +148,7 @@ public class CheckDetailController implements FxController {
 		return checkFailed.getValue();
 	}

-	public BooleanExpression checkFailedProperty() {
+	public Binding<Boolean> checkFailedProperty() {
 		return checkFailed;
 	}

@@ -305,7 +164,7 @@ public class CheckDetailController implements FxController {
 		return warnOrCritsExist.getValue();
 	}

-	public BooleanExpression checkCancelledProperty() {
+	public Binding<Boolean> checkCancelledProperty() {
 		return checkCancelled;
 	}

@@ -316,12 +175,4 @@ public class CheckDetailController implements FxController {
 	public Check getCheck() {
 		return check.get();
 	}
-
-	public ObservableValue<Boolean> fixAllInfoResultsPossibleProperty() {
-		return fixAllInfoResultsPossible;
-	}
-
-	public boolean getFixAllInfoResultsPossible() {
-		return fixAllInfoResultsPossible.getValue();
-	}
 }
@@ -70,7 +70,7 @@ public class CheckExecutor {
 			try (var masterkeyClone = masterkey.copy(); //
 				 var cryptor = CryptorProvider.forScheme(vaultConfig.getCipherCombo()).provide(masterkeyClone, csprng)) {
 				c.getHealthCheck().check(vaultPath, vaultConfig, masterkeyClone, cryptor, diagnosis -> {
-					Platform.runLater(() -> c.getResults().add(Result.create(diagnosis, vaultPath, vaultConfig, masterkeyClone, cryptor)));
+					Platform.runLater(() -> c.getResults().add(Result.create(diagnosis)));
 					highestResultSeverity = Comparators.max(highestResultSeverity, diagnosis.getSeverity());
 				});
 			}
@@ -1,20 +1,21 @@
 package org.cryptomator.ui.health;

+import com.tobiasdiez.easybind.EasyBind;
 import org.cryptomator.ui.common.FxController;

 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ObservableValue;
 import javafx.scene.control.CheckBox;

 public class CheckListCellController implements FxController {


 	private final ObjectProperty<Check> check;
-	private final ObservableValue<Boolean> checkRunnable;
-	private final ObservableValue<String> checkName;
+	private final Binding<String> checkName;
+	private final Binding<Boolean> checkRunnable;

 	/* FXML */
 	public CheckBox checkbox;
@@ -22,8 +23,8 @@ public class CheckListCellController implements FxController {
 	@Inject
 	public CheckListCellController() {
 		check = new SimpleObjectProperty<>();
-		checkRunnable = check.flatMap(Check::stateProperty).map(Check.CheckState.RUNNABLE::equals).orElse(false);
-		checkName = check.map(Check::getName).orElse("");
+		checkRunnable = EasyBind.wrapNullable(check).mapObservable(Check::stateProperty).map(Check.CheckState.RUNNABLE::equals).orElse(false);
+		checkName = EasyBind.wrapNullable(check).map(Check::getName).orElse("");
 	}

 	public void initialize() {
@@ -49,7 +50,7 @@ public class CheckListCellController implements FxController {
 		check.set(c);
 	}

-	public ObservableValue<String> checkNameProperty() {
+	public Binding<String> checkNameProperty() {
 		return checkName;
 	}

@@ -57,7 +58,7 @@ public class CheckListCellController implements FxController {
 		return checkName.getValue();
 	}

-	public ObservableValue<Boolean> checkRunnableProperty() {
+	public Binding<Boolean> checkRunnableProperty() {
 		return checkRunnable;
 	}

@@ -31,7 +31,7 @@ public class CheckStateIconView extends FontAwesome5IconView {
 		this.severity = EasyBind.wrapNullable(check).mapObservable(Check::highestResultSeverityProperty).asOrdinary();
 		this.glyph.bind(Bindings.createObjectBinding(this::glyphForState, state, severity));
 		this.subscriptions = List.of( //
-				EasyBind.includeWhen(getStyleClass(), "glyph-icon-muted", Bindings.equal(state, Check.CheckState.SKIPPED).or(Bindings.equal(state, Check.CheckState.CANCELLED)).or(Bindings.equal(severity, DiagnosticResult.Severity.INFO))), //
+				EasyBind.includeWhen(getStyleClass(), "glyph-icon-muted", Bindings.equal(state, Check.CheckState.SKIPPED).or(Bindings.equal(state, Check.CheckState.CANCELLED))), //
 				EasyBind.includeWhen(getStyleClass(), "glyph-icon-primary", Bindings.equal(severity, DiagnosticResult.Severity.GOOD)), //
 				EasyBind.includeWhen(getStyleClass(), "glyph-icon-orange", Bindings.equal(severity, DiagnosticResult.Severity.WARN).or(Bindings.equal(severity, DiagnosticResult.Severity.CRITICAL))), //
 				EasyBind.includeWhen(getStyleClass(), "glyph-icon-red", Bindings.equal(state, Check.CheckState.ERROR)) //
@@ -1,14 +1,10 @@
 package org.cryptomator.ui.health;

-import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
-import org.cryptomator.cryptolib.api.Cryptor;
-import org.cryptomator.cryptolib.api.Masterkey;

 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import java.nio.file.Path;

 record Result(DiagnosticResult diagnosis, ObjectProperty<FixState> fixState) {

@@ -20,8 +16,8 @@ record Result(DiagnosticResult diagnosis, ObjectProperty<FixState> fixState) {
 		FIX_FAILED
 	}

-	public static Result create(DiagnosticResult diagnosis, Path vaultPath, VaultConfig config, Masterkey masterkey, Cryptor cryptor) {
-		FixState initialState = diagnosis.getFix(vaultPath, config, masterkey, cryptor).map( _f -> FixState.FIXABLE).orElse(FixState.NOT_FIXABLE);
+	public static Result create(DiagnosticResult diagnosis) {
+		FixState initialState = diagnosis.getSeverity() == DiagnosticResult.Severity.WARN ? FixState.FIXABLE : FixState.NOT_FIXABLE;
 		return new Result(diagnosis, new SimpleObjectProperty<>(initialState));
 	}

@@ -23,8 +23,6 @@ import java.util.concurrent.atomic.AtomicReference;
@HealthCheckScoped
 class ResultFixApplier {

-	private static final Logger LOG = LoggerFactory.getLogger(ResultFixApplier.class);
-
 	private final Path vaultPath;
 	private final SecureRandom csprng;
 	private final Masterkey masterkey;
@@ -42,34 +40,25 @@ class ResultFixApplier {

 	public CompletionStage<Void> fix(Result result) {
 		Preconditions.checkArgument(result.getState() == Result.FixState.FIXABLE);
-		return CompletableFuture.runAsync(() -> result.setState(Result.FixState.FIXING), Platform::runLater) //
-				.thenRunAsync(() -> fix(result.diagnosis()), sequentialExecutor) //
+		result.setState(Result.FixState.FIXING);
+		return CompletableFuture.runAsync(() -> fix(result.diagnosis()), sequentialExecutor)
 				.whenCompleteAsync((unused, throwable) -> {
-					final Result.FixState s;
-					if (throwable == null) {
-						LOG.debug("Fix for {} applied successful.", result.diagnosis().getClass().getName());
-						s = Result.FixState.FIXED;
-					} else {
-						LOG.error("Failed to apply fix for {}", result.diagnosis().getClass().getName(), throwable);
-						s = Result.FixState.FIX_FAILED;
-					}
-					result.setState(s);
+					var fixed = throwable == null ? Result.FixState.FIXED : Result.FixState.FIX_FAILED;
+					result.setState(fixed);
 				}, Platform::runLater);
 	}

-	private void fix(DiagnosticResult diagnosis) {
+	public void fix(DiagnosticResult diagnosis) {
+		Preconditions.checkArgument(diagnosis.getSeverity() == DiagnosticResult.Severity.WARN, "Unfixable result");
 		try (var masterkeyClone = masterkey.copy(); //
 			 var cryptor = CryptorProvider.forScheme(vaultConfig.getCipherCombo()).provide(masterkeyClone, csprng)) {
-			diagnosis.getFix(vaultPath, vaultConfig, masterkeyClone, cryptor) //
-					.orElseThrow(() -> new IllegalStateException("No fix for diagnosis " + diagnosis.getClass().getName() + " implemented.")) //
-					.apply();
+			diagnosis.fix(vaultPath, vaultConfig, masterkeyClone, cryptor);
 		} catch (Exception e) {
 			throw new FixFailedException(e);
 		}
 	}

 	public static class FixFailedException extends CompletionException {
-
 		private FixFailedException(Throwable cause) {
 			super(cause);
 		}
@@ -12,12 +12,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.application.Platform;
+import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ObservableValue;
+import javafx.beans.value.ObservableObjectValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.Tooltip;
 import javafx.util.Duration;
@@ -33,24 +35,25 @@ public class ResultListCellController implements FxController {
 	private static final FontAwesome5Icon WARN_ICON = FontAwesome5Icon.EXCLAMATION_TRIANGLE;
 	private static final FontAwesome5Icon CRIT_ICON = FontAwesome5Icon.TIMES;

+	private final Logger LOG = LoggerFactory.getLogger(ResultListCellController.class);

 	private final ObjectProperty<Result> result;
-	private final ObservableValue<DiagnosticResult.Severity> severity;
-	private final ObservableValue<String> description;
+	private final ObservableObjectValue<DiagnosticResult.Severity> severity;
+	private final Binding<String> description;
 	private final ResultFixApplier fixApplier;
-	private final ObservableValue<Result.FixState> fixState;
+	private final ObservableObjectValue<Result.FixState> fixState;
 	private final ObjectBinding<FontAwesome5Icon> severityGlyph;
+	private final ObjectBinding<FontAwesome5Icon> fixGlyph;
 	private final BooleanBinding fixable;
 	private final BooleanBinding fixing;
 	private final BooleanBinding fixed;
 	private final BooleanBinding fixFailed;
 	private final BooleanBinding fixRunningOrDone;
-	private final ObservableValue<FontAwesome5Icon> fixGlyph;
 	private final List<Subscription> subscriptions;
-	private final Tooltip fixStateTip;
-	private final Tooltip severityTip;
+	private final Tooltip fixSuccess;
+	private final Tooltip fixFail;
+
 	private AutoAnimator fixRunningRotator;
-	private final ResourceBundle resourceBundle;

 	/* FXML */
 	public FontAwesome5IconView severityView;
@@ -58,83 +61,54 @@ public class ResultListCellController implements FxController {

 	@Inject
 	public ResultListCellController(ResultFixApplier fixApplier, ResourceBundle resourceBundle) {
-		this.resourceBundle = resourceBundle;
 		this.result = new SimpleObjectProperty<>(null);
-		this.severity = result.map(Result::diagnosis).map(DiagnosticResult::getSeverity);
-		this.description = result.map(Result::getDescription).orElse("");
+		this.severity = EasyBind.wrapNullable(result).map(r -> r.diagnosis().getSeverity()).asOrdinary();
+		this.description = EasyBind.wrapNullable(result).map(Result::getDescription).orElse("");
 		this.fixApplier = fixApplier;
-		this.fixState = result.flatMap(Result::fixState);
+		this.fixState = EasyBind.wrapNullable(result).mapObservable(Result::fixState).asOrdinary();
 		this.severityGlyph = Bindings.createObjectBinding(this::getSeverityGlyph, result);
+		this.fixGlyph = Bindings.createObjectBinding(this::getFixGlyph, fixState);
 		this.fixable = Bindings.createBooleanBinding(this::isFixable, fixState);
 		this.fixing = Bindings.createBooleanBinding(this::isFixing, fixState);
 		this.fixed = Bindings.createBooleanBinding(this::isFixed, fixState);
 		this.fixFailed = Bindings.createBooleanBinding(this::isFixFailed, fixState);
 		this.fixRunningOrDone = fixing.or(fixed).or(fixFailed);
-		this.fixGlyph = fixState.map(this::getFixGlyph);
 		this.subscriptions = new ArrayList<>();
-
-		this.fixStateTip = new Tooltip();
-		fixStateTip.textProperty().bind(fixState.map(this::getFixStateDescription));
-		fixStateTip.setShowDelay(Duration.millis(100));
-
-		this.severityTip = new Tooltip();
-		severityTip.textProperty().bind(severity.map(this::getSeverityDescription));
-		severityTip.setShowDelay(Duration.millis(150));
-	}
-
-	public FontAwesome5Icon getFixGlyph(Result.FixState state) {
-		return switch (state) {
-			case FIXING -> FontAwesome5Icon.SPINNER;
-			case FIXED -> FontAwesome5Icon.CHECK;
-			case FIX_FAILED -> FontAwesome5Icon.TIMES;
-			default -> null;
-		};
-	}
-
-	private String getFixStateDescription(Result.FixState fixState) {
-		return switch (fixState) {
-			case FIXED -> resourceBundle.getString("health.fix.successTip");
-			case FIX_FAILED -> resourceBundle.getString("health.fix.failTip");
-			default -> "";
-		};
-	}
-
-	private String getSeverityDescription(DiagnosticResult.Severity severity) {
-		return resourceBundle.getString(switch (severity) {
-			case GOOD -> "health.result.severityTip.good";
-			case INFO -> "health.result.severityTip.info";
-			case WARN -> "health.result.severityTip.warn";
-			case CRITICAL -> "health.result.severityTip.crit";
-		});
+		this.fixSuccess = new Tooltip(resourceBundle.getString("health.fix.successTip"));
+		this.fixFail = new Tooltip(resourceBundle.getString("health.fix.failTip"));
+		fixSuccess.setShowDelay(Duration.millis(100));
+		fixFail.setShowDelay(Duration.millis(100));
 	}

 	@FXML
 	public void initialize() {
 		// see getGlyph() for relevant glyphs:
-		subscriptions.addAll(List.of(EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-muted", severity.map(DiagnosticResult.Severity.INFO::equals).orElse(false)), //
-				EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-primary", severity.map(DiagnosticResult.Severity.GOOD::equals).orElse(false)), //
-				EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-orange", severity.map(DiagnosticResult.Severity.WARN::equals).orElse(false)), //
-				EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-red", severity.map(DiagnosticResult.Severity.CRITICAL::equals).orElse(false)) //
+		subscriptions.addAll(List.of(EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-muted", Bindings.equal(severity, DiagnosticResult.Severity.INFO)), //
+				EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-primary", Bindings.equal(severity, DiagnosticResult.Severity.GOOD)), //
+				EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-orange", Bindings.equal(severity, DiagnosticResult.Severity.WARN)), //
+				EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-red", Bindings.equal(severity, DiagnosticResult.Severity.CRITICAL)) //
 		));
-
 		var animation = Animations.createDiscrete360Rotation(fixView);
 		this.fixRunningRotator = AutoAnimator.animate(animation) //
-				.onCondition(fixing) //
+				.onCondition(Bindings.equal(fixState, Result.FixState.FIXING)) //
 				.afterStop(() -> fixView.setRotate(0)) //
 				.build();
-		fixState.addListener(((observable, oldValue, newValue) -> {
-			if (newValue == Result.FixState.FIXED || newValue == Result.FixState.FIX_FAILED) {
-				Tooltip.install(fixView, fixStateTip);
-			}
-		}));
-		Tooltip.install(severityView, severityTip);
 	}

 	@FXML
 	public void fix() {
 		Result r = result.get();
 		if (r != null) {
-			fixApplier.fix(r);
+			fixApplier.fix(r).whenCompleteAsync(this::fixFinished, Platform::runLater);
+		}
+	}
+
+	private void fixFinished(Void unused, Throwable exception) {
+		if (exception != null) {
+			LOG.error("Failed to apply fix", exception);
+			Tooltip.install(fixView, fixFail);
+		} else {
+			Tooltip.install(fixView, fixSuccess);
 		}
 	}

@@ -153,7 +127,7 @@ public class ResultListCellController implements FxController {
 		return result;
 	}

-	public ObservableValue<String> descriptionProperty() {
+	public Binding<String> descriptionProperty() {
 		return description;
 	}

@@ -178,12 +152,20 @@ public class ResultListCellController implements FxController {
 		};
 	}

-	public ObservableValue<FontAwesome5Icon> fixGlyphProperty() {
+	public ObjectBinding<FontAwesome5Icon> fixGlyphProperty() {
 		return fixGlyph;
 	}

 	public FontAwesome5Icon getFixGlyph() {
-		return fixGlyph.getValue();
+		if (fixState.getValue() == null) {
+			return null;
+		}
+		return switch (fixState.getValue()) {
+			case NOT_FIXABLE, FIXABLE -> null;
+			case FIXING -> FontAwesome5Icon.SPINNER;
+			case FIXED -> FontAwesome5Icon.CHECK;
+			case FIX_FAILED -> FontAwesome5Icon.TIMES;
+		};
 	}

 	public BooleanBinding fixableProperty() {
@@ -191,7 +173,7 @@ public class ResultListCellController implements FxController {
 	}

 	public boolean isFixable() {
-		return Result.FixState.FIXABLE.equals(fixState.getValue());
+		return Result.FixState.FIXABLE.equals(fixState.get());
 	}

 	public BooleanBinding fixingProperty() {
@@ -199,7 +181,7 @@ public class ResultListCellController implements FxController {
 	}

 	public boolean isFixing() {
-		return Result.FixState.FIXING.equals(fixState.getValue());
+		return Result.FixState.FIXING.equals(fixState.get());
 	}

 	public BooleanBinding fixedProperty() {
@@ -207,7 +189,7 @@ public class ResultListCellController implements FxController {
 	}

 	public boolean isFixed() {
-		return Result.FixState.FIXED.equals(fixState.getValue());
+		return Result.FixState.FIXED.equals(fixState.get());
 	}

 	public BooleanBinding fixFailedProperty() {
@@ -215,7 +197,7 @@ public class ResultListCellController implements FxController {
 	}

 	public Boolean isFixFailed() {
-		return Result.FixState.FIX_FAILED.equals(fixState.getValue());
+		return Result.FixState.FIX_FAILED.equals(fixState.get());
 	}

 	public BooleanBinding fixRunningOrDoneProperty() {
@@ -6,7 +6,6 @@ import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlLoaderFactory;
-import org.cryptomator.ui.keyloading.hub.HubKeyLoadingModule;
 import org.cryptomator.ui.keyloading.masterkeyfile.MasterkeyFileLoadingModule;

 import javax.inject.Provider;
@@ -14,7 +13,7 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.ResourceBundle;

-@Module(includes = {MasterkeyFileLoadingModule.class, HubKeyLoadingModule.class})
+@Module(includes = {MasterkeyFileLoadingModule.class})
 abstract class KeyLoadingModule {

 	@Provides
@@ -1,5 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-record AuthFlowContext(String deviceId) {
-
-}
@@ -1,101 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import com.nimbusds.jose.JWEObject;
-import dagger.Lazy;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.keyloading.KeyLoading;
-import org.cryptomator.ui.keyloading.KeyLoadingScoped;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.concurrent.WorkerStateEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
-import java.net.URI;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicReference;
-
-@KeyLoadingScoped
-public class AuthFlowController implements FxController {
-
-	private final Application application;
-	private final Stage window;
-	private final ExecutorService executor;
-	private final String deviceId;
-	private final HubConfig hubConfig;
-	private final AtomicReference<String> tokenRef;
-	private final CompletableFuture<JWEObject> result;
-	private final Lazy<Scene> receiveKeyScene;
-	private final ObjectProperty<URI> authUri;
-	private AuthFlowTask task;
-
-	@Inject
-	public AuthFlowController(Application application, @KeyLoading Stage window, ExecutorService executor, @Named("deviceId") String deviceId, HubConfig hubConfig, @Named("bearerToken") AtomicReference<String> tokenRef, CompletableFuture<JWEObject> result, @FxmlScene(FxmlFile.HUB_RECEIVE_KEY) Lazy<Scene> receiveKeyScene) {
-		this.application = application;
-		this.window = window;
-		this.executor = executor;
-		this.deviceId = deviceId;
-		this.hubConfig = hubConfig;
-		this.tokenRef = tokenRef;
-		this.result = result;
-		this.receiveKeyScene = receiveKeyScene;
-		this.authUri = new SimpleObjectProperty<>();
-		this.window.addEventHandler(WindowEvent.WINDOW_HIDING, this::windowClosed);
-	}
-
-	@FXML
-	public void initialize() {
-		assert task == null;
-		task = new AuthFlowTask(hubConfig, new AuthFlowContext(deviceId), this::setAuthUri);
-		task.setOnFailed(this::authFailed);
-		task.setOnSucceeded(this::authSucceeded);
-		executor.submit(task);
-	}
-
-	@FXML
-	public void browse() {
-		application.getHostServices().showDocument(authUri.get().toString());
-	}
-
-	@FXML
-	public void cancel() {
-		window.close();
-	}
-
-	private void setAuthUri(URI uri) {
-		Platform.runLater(() -> {
-			authUri.set(uri);
-			browse();
-		});
-	}
-
-	private void windowClosed(WindowEvent windowEvent) {
-		// stop server, if it is still running
-		task.cancel();
-		result.cancel(true);
-	}
-
-	private void authSucceeded(WorkerStateEvent workerStateEvent) {
-		tokenRef.set(task.getValue());
-		window.requestFocus();
-		window.setScene(receiveKeyScene.get());
-	}
-
-	private void authFailed(WorkerStateEvent workerStateEvent) {
-		window.requestFocus();
-		var exception = workerStateEvent.getSource().getException();
-		result.completeExceptionally(exception);
-	}
-
-}
@@ -1,53 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import com.google.gson.JsonParser;
-import io.github.coffeelibs.tinyoauth2client.AuthFlow;
-import io.github.coffeelibs.tinyoauth2client.TinyOAuth2;
-import io.github.coffeelibs.tinyoauth2client.http.response.Response;
-
-import javafx.concurrent.Task;
-import java.io.IOException;
-import java.net.URI;
-import java.util.function.Consumer;
-
-class AuthFlowTask extends Task<String> {
-
-	private final HubConfig hubConfig;
-	private final AuthFlowContext authFlowContext;
-	private final Consumer<URI> redirectUriConsumer;
-
-	/**
-	 * Spawns a server and waits for the redirectUri to be called.
-	 *
-	 * @param hubConfig Configuration object holding parameters required by {@link AuthFlow}
-	 * @param redirectUriConsumer A callback invoked with the redirectUri, as soon as the server has started
-	 */
-	public AuthFlowTask(HubConfig hubConfig, AuthFlowContext authFlowContext, Consumer<URI> redirectUriConsumer) {
-		this.hubConfig = hubConfig;
-		this.authFlowContext = authFlowContext;
-		this.redirectUriConsumer = redirectUriConsumer;
-	}
-
-	@Override
-	protected String call() throws IOException, InterruptedException {
-		var response = TinyOAuth2.client(hubConfig.clientId) //
-				.withTokenEndpoint(URI.create(hubConfig.tokenEndpoint)) //
-				.authFlow(URI.create(hubConfig.authEndpoint)) //
-				.setSuccessResponse(Response.redirect(URI.create(hubConfig.authSuccessUrl + "&device=" + authFlowContext.deviceId()))) //
-				.setErrorResponse(Response.redirect(URI.create(hubConfig.authErrorUrl + "&device=" + authFlowContext.deviceId()))) //
-				.authorize(redirectUriConsumer);
-		if (response.statusCode() != 200) {
-			throw new NotOkResponseException("Authorization returned status code " + response.statusCode());
-		}
-		var json = JsonParser.parseString(response.body());
-		return json.getAsJsonObject().get("access_token").getAsString();
-	}
-
-	public static class NotOkResponseException extends RuntimeException {
-
-		NotOkResponseException(String msg) {
-			super(msg);
-		}
-	}
-
-}
@@ -1,9 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-class CreateDeviceDto {
-
-	public String id;
-	public String name;
-	public String publicKey;
-
-}
@@ -1,23 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import com.google.common.io.CharStreams;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonParser;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-
-class HttpHelper {
-
-	public static String readBody(HttpResponse<InputStream> response) throws IOException {
-		try (var in = response.body(); var reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
-			return CharStreams.toString(reader);
-		}
-	}
-
-}
@@ -1,13 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-// needs to be accessible by JSON decoder
-public class HubConfig {
-
-	public String clientId;
-	public String authEndpoint;
-	public String tokenEndpoint;
-	public String devicesResourceUrl;
-	public String authSuccessUrl;
-	public String authErrorUrl;
-
-}
@@ -1,180 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import com.google.common.io.BaseEncoding;
-import com.nimbusds.jose.JWEObject;
-import dagger.Binds;
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.IntoMap;
-import dagger.multibindings.StringKey;
-import org.cryptomator.common.settings.DeviceKey;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.cryptolib.common.MessageDigestSupplier;
-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.NewPasswordController;
-import org.cryptomator.ui.common.PasswordStrengthUtil;
-import org.cryptomator.ui.keyloading.KeyLoading;
-import org.cryptomator.ui.keyloading.KeyLoadingScoped;
-import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
-
-import javax.inject.Named;
-import javafx.scene.Scene;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicReference;
-
-@Module
-public abstract class HubKeyLoadingModule {
-
-	@Provides
-	@KeyLoadingScoped
-	static HubConfig provideHubConfig(@KeyLoading Vault vault) {
-		try {
-			return vault.getVaultConfigCache().get().getHeader("hub", HubConfig.class);
-		} catch (IOException e) {
-			throw new UncheckedIOException(e);
-		}
-	}
-
-	@Provides
-	@KeyLoadingScoped
-	@Named("windowTitle")
-	static String provideWindowTitle(@KeyLoading Vault vault, ResourceBundle resourceBundle) {
-		return String.format(resourceBundle.getString("unlock.title"), vault.getDisplayName());
-	}
-
-
-	@Provides
-	@KeyLoadingScoped
-	@Named("deviceId")
-	static String provideDeviceId(DeviceKey deviceKey) {
-		var publicKey = Objects.requireNonNull(deviceKey.get()).getPublic().getEncoded();
-		try (var instance = MessageDigestSupplier.SHA256.instance()) {
-			var hashedKey = instance.get().digest(publicKey);
-			return BaseEncoding.base16().encode(hashedKey);
-		}
-	}
-
-	@Provides
-	@Named("bearerToken")
-	@KeyLoadingScoped
-	static AtomicReference<String> provideBearerTokenRef() {
-		return new AtomicReference<>();
-	}
-
-	@Provides
-	@KeyLoadingScoped
-	static CompletableFuture<JWEObject> provideResult() {
-		return new CompletableFuture<>();
-	}
-
-	@Binds
-	@IntoMap
-	@KeyLoadingScoped
-	@StringKey(HubKeyLoadingStrategy.SCHEME_HUB_HTTP)
-	abstract KeyLoadingStrategy bindHubKeyLoadingStrategyToHubHttp(HubKeyLoadingStrategy strategy);
-
-	@Binds
-	@IntoMap
-	@KeyLoadingScoped
-	@StringKey(HubKeyLoadingStrategy.SCHEME_HUB_HTTPS)
-	abstract KeyLoadingStrategy bindHubKeyLoadingStrategyToHubHttps(HubKeyLoadingStrategy strategy);
-
-	@Provides
-	@FxmlScene(FxmlFile.HUB_AUTH_FLOW)
-	@KeyLoadingScoped
-	static Scene provideHubAuthFlowScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HUB_AUTH_FLOW);
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.HUB_LICENSE_EXCEEDED)
-	@KeyLoadingScoped
-	static Scene provideLicenseExceededScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HUB_LICENSE_EXCEEDED);
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.HUB_RECEIVE_KEY)
-	@KeyLoadingScoped
-	static Scene provideHubReceiveKeyScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HUB_RECEIVE_KEY);
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.HUB_REGISTER_DEVICE)
-	@KeyLoadingScoped
-	static Scene provideHubRegisterDeviceScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HUB_REGISTER_DEVICE);
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.HUB_REGISTER_SUCCESS)
-	@KeyLoadingScoped
-	static Scene provideHubRegisterSuccessScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HUB_REGISTER_SUCCESS);
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.HUB_REGISTER_FAILED)
-	@KeyLoadingScoped
-	static Scene provideHubRegisterFailedScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HUB_REGISTER_FAILED);
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.HUB_UNAUTHORIZED_DEVICE)
-	@KeyLoadingScoped
-	static Scene provideHubUnauthorizedDeviceScene(@KeyLoading FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HUB_UNAUTHORIZED_DEVICE);
-	}
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(AuthFlowController.class)
-	abstract FxController bindAuthFlowController(AuthFlowController controller);
-
-	@Provides
-	@IntoMap
-	@FxControllerKey(NewPasswordController.class)
-	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater) {
-		return new NewPasswordController(resourceBundle, strengthRater);
-	}
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(LicenseExceededController.class)
-	abstract FxController bindLicenseExceededController(LicenseExceededController controller);
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(ReceiveKeyController.class)
-	abstract FxController bindReceiveKeyController(ReceiveKeyController controller);
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(RegisterDeviceController.class)
-	abstract FxController bindRegisterDeviceController(RegisterDeviceController controller);
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(RegisterSuccessController.class)
-	abstract FxController bindRegisterSuccessController(RegisterSuccessController controller);
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(RegisterFailedController.class)
-	abstract FxController bindRegisterFailedController(RegisterFailedController controller);
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(UnauthorizedDeviceController.class)
-	abstract FxController bindUnauthorizedDeviceController(UnauthorizedDeviceController controller);
-}
@@ -1,80 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import com.google.common.base.Preconditions;
-import com.nimbusds.jose.JWEObject;
-import dagger.Lazy;
-import org.cryptomator.common.settings.DeviceKey;
-import org.cryptomator.cryptolib.api.Masterkey;
-import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.keyloading.KeyLoading;
-import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
-import org.cryptomator.ui.unlock.UnlockCancelledException;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javafx.application.Platform;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import javafx.stage.Window;
-import java.net.URI;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-@KeyLoading
-public class HubKeyLoadingStrategy implements KeyLoadingStrategy {
-
-	private static final String SCHEME_PREFIX = "hub+";
-	static final String SCHEME_HUB_HTTP = SCHEME_PREFIX + "http";
-	static final String SCHEME_HUB_HTTPS = SCHEME_PREFIX + "https";
-
-	private final Stage window;
-	private final Lazy<Scene> authFlowScene;
-	private final CompletableFuture<JWEObject> result;
-	private final DeviceKey deviceKey;
-
-	@Inject
-	public HubKeyLoadingStrategy(@KeyLoading Stage window, @FxmlScene(FxmlFile.HUB_AUTH_FLOW) Lazy<Scene> authFlowScene, CompletableFuture<JWEObject> result, DeviceKey deviceKey, @Named("windowTitle") String windowTitle) {
-		this.window = window;
-		window.setTitle(windowTitle);
-		this.authFlowScene = authFlowScene;
-		this.result = result;
-		this.deviceKey = deviceKey;
-	}
-
-	@Override
-	public Masterkey loadKey(URI keyId) throws MasterkeyLoadingFailedException {
-		Preconditions.checkArgument(keyId.getScheme().startsWith(SCHEME_PREFIX));
-		try {
-			startAuthFlow();
-			var jwe = result.get();
-			return JWEHelper.decrypt(jwe, deviceKey.get().getPrivate());
-		} catch (DeviceKey.DeviceKeyRetrievalException e) {
-			throw new MasterkeyLoadingFailedException("Failed to load keypair", e);
-		} catch (CancellationException e) {
-			throw new UnlockCancelledException("User cancelled auth workflow", e);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			throw new UnlockCancelledException("Loading interrupted", e);
-		} catch (ExecutionException e) {
-			throw new MasterkeyLoadingFailedException("Failed to retrieve key", e);
-		}
-	}
-
-	private void startAuthFlow() {
-		Platform.runLater(() -> {
-			window.setScene(authFlowScene.get());
-			window.show();
-			Window owner = window.getOwner();
-			if (owner != null) {
-				window.setX(owner.getX() + (owner.getWidth() - window.getWidth()) / 2);
-				window.setY(owner.getY() + (owner.getHeight() - window.getHeight()) / 2);
-			} else {
-				window.centerOnScreen();
-			}
-		});
-	}
-
-}
@@ -1,55 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import com.google.common.base.Preconditions;
-import com.google.common.io.BaseEncoding;
-import com.nimbusds.jose.JOSEException;
-import com.nimbusds.jose.JWEObject;
-import com.nimbusds.jose.crypto.ECDHDecrypter;
-import org.cryptomator.cryptolib.api.Masterkey;
-import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.security.interfaces.ECPrivateKey;
-import java.util.Arrays;
-
-class JWEHelper {
-
-	private static final Logger LOG = LoggerFactory.getLogger(JWEHelper.class);
-	private static final String JWE_PAYLOAD_MASTERKEY_FIELD = "key";
-
-	private JWEHelper(){}
-
-	public static Masterkey decrypt(JWEObject jwe, ECPrivateKey privateKey) throws MasterkeyLoadingFailedException {
-		try {
-			jwe.decrypt(new ECDHDecrypter(privateKey));
-			return readKey(jwe);
-		} catch (JOSEException e) {
-			LOG.warn("Failed to decrypt JWE: {}", jwe);
-			throw new MasterkeyLoadingFailedException("Failed to decrypt JWE", e);
-		}
-	}
-
-	private static Masterkey readKey(JWEObject jwe) throws MasterkeyLoadingFailedException {
-		Preconditions.checkArgument(jwe.getState() == JWEObject.State.DECRYPTED);
-		var fields = jwe.getPayload().toJSONObject();
-		if (fields == null) {
-			LOG.error("Expected JWE payload to be JSON: {}", jwe.getPayload());
-			throw new MasterkeyLoadingFailedException("Expected JWE payload to be JSON");
-		}
-		var keyBytes = new byte[0];
-		try {
-			if (fields.get(JWE_PAYLOAD_MASTERKEY_FIELD) instanceof String key) {
-				keyBytes = BaseEncoding.base64().decode(key);
-				return new Masterkey(keyBytes);
-			} else {
-				throw new IllegalArgumentException("JWE payload doesn't contain field " + JWE_PAYLOAD_MASTERKEY_FIELD);
-			}
-		} catch (IllegalArgumentException e) {
-			LOG.error("Unexpected JWE payload: {}", jwe.getPayload());
-			throw new MasterkeyLoadingFailedException("Unexpected JWE payload", e);
-		} finally {
-			Arrays.fill(keyBytes, (byte) 0x00);
-		}
-	}
-}
@@ -1,23 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.keyloading.KeyLoading;
-
-import javax.inject.Inject;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
-
-public class LicenseExceededController implements FxController {
-
-	private final Stage window;
-
-	@Inject
-	public LicenseExceededController(@KeyLoading Stage window) {
-		this.window = window;
-	}
-
-	@FXML
-	public void close() {
-		window.close();
-	}
-}
@@ -1,145 +0,0 @@
-package org.cryptomator.ui.keyloading.hub;
-
-import com.nimbusds.jose.JWEObject;
-import dagger.Lazy;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.keyloading.KeyLoading;
-import org.cryptomator.ui.keyloading.KeyLoadingScoped;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UncheckedIOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.text.ParseException;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicReference;
-
-@KeyLoadingScoped
-public class ReceiveKeyController implements FxController {
-
-	private static final String SCHEME_PREFIX = "hub+";
-
-	private final Stage window;
-	private final String deviceId;
-	private final String bearerToken;
-	private final CompletableFuture<JWEObject> result;
-	private final Lazy<Scene> registerDeviceScene;
-	private final Lazy<Scene> unauthorizedScene;
-	private final URI vaultBaseUri;
-	private final Lazy<Scene> licenseExceededScene;
-	private final HttpClient httpClient;
-
-	@Inject
-	public ReceiveKeyController(@KeyLoading Vault vault, ExecutorService executor, @KeyLoading Stage window, @Named("deviceId") String deviceId, @Named("bearerToken") AtomicReference<String> tokenRef, CompletableFuture<JWEObject> result, @FxmlScene(FxmlFile.HUB_REGISTER_DEVICE) Lazy<Scene> registerDeviceScene, @FxmlScene(FxmlFile.HUB_UNAUTHORIZED_DEVICE) Lazy<Scene> unauthorizedScene, @FxmlScene(FxmlFile.HUB_LICENSE_EXCEEDED) Lazy<Scene> licenseExceededScene) {
-		this.window = window;
-		this.deviceId = deviceId;
-		this.bearerToken = Objects.requireNonNull(tokenRef.get());
-		this.result = result;
-		this.registerDeviceScene = registerDeviceScene;
-		this.unauthorizedScene = unauthorizedScene;
-		this.vaultBaseUri = getVaultBaseUri(vault);
-		this.licenseExceededScene = licenseExceededScene;
-		this.window.addEventHandler(WindowEvent.WINDOW_HIDING, this::windowClosed);
-		this.httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).executor(executor).build();
-	}
-
-	@FXML
-	public void initialize() {
-		var keyUri = appendPath(vaultBaseUri, "/keys/" + deviceId);
-		var request = HttpRequest.newBuilder(keyUri) //
-				.header("Authorization", "Bearer " + bearerToken) //
-				.GET() //
-				.build();
-		httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()) //
-				.thenAcceptAsync(this::loadedExistingKey, Platform::runLater) //
-				.exceptionally(this::retrievalFailed);
-	}
-
-	private void loadedExistingKey(HttpResponse<InputStream> response) {
-		try {
-			switch (response.statusCode()) {
-				case 200 -> retrievalSucceeded(response);
-				case 402 -> licenseExceeded();
-				case 403 -> accessNotGranted();
-				case 404 -> needsDeviceRegistration();
-				default -> throw new IOException("Unexpected response " + response.statusCode());
-			}
-		} catch (IOException e) {
-			throw new UncheckedIOException(e);
-		}
-	}
-
-	private void retrievalSucceeded(HttpResponse<InputStream> response) throws IOException {
-		try {
-			var string = HttpHelper.readBody(response);
-			result.complete(JWEObject.parse(string));
-			window.close();
-		} catch (ParseException e) {
-			throw new IOException("Failed to parse JWE", e);
-		}
-	}
-
-	private void licenseExceeded() {
-		window.setScene(licenseExceededScene.get());
-	}
-
-	private void needsDeviceRegistration() {
-		window.setScene(registerDeviceScene.get());
-	}
-
-	private void accessNotGranted() {
-		window.setScene(unauthorizedScene.get());
-	}
-
-	private Void retrievalFailed(Throwable cause) {
-		result.completeExceptionally(cause);
-		return null;
-	}
-
-	@FXML
-	public void cancel() {
-		window.close();
-	}
-
-	private void windowClosed(WindowEvent windowEvent) {
-		result.cancel(true);
-	}
-
-	private static URI appendPath(URI base, String path) {
-		try {
-			var newPath = base.getPath() + path;
-			return new URI(base.getScheme(), base.getAuthority(), newPath, base.getQuery(), base.getFragment());
-		} catch (URISyntaxException e) {
-			throw new IllegalArgumentException("Can't append '" + path + "' to URI: " + base, e);
-		}
-	}
-
-	private static URI getVaultBaseUri(Vault vault) {
-		try {
-			var kid = vault.getVaultConfigCache().get().getKeyId();
-			assert kid.getScheme().startsWith(SCHEME_PREFIX);
-			var hubUriScheme = kid.getScheme().substring(SCHEME_PREFIX.length());
-			return new URI(hubUriScheme, kid.getSchemeSpecificPart(), kid.getFragment());
-		} catch (IOException e) {
-			throw new UncheckedIOException(e);
-		} catch (URISyntaxException e) {
-			throw new IllegalStateException("URI constructed from params known to be valid", e);
-		}
-	}
-}
--- a/Show More
+++ b/Show More