From 364d59fdf7ea6678cc9de77f3dd13760cc39b0d9 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 11 Jun 2021 18:27:51 +0200
Subject: [PATCH 01/13] Added ".idea/**/shelf" to .gitignore

See: https://github.com/github/gitignore/blob/991e760c1c6d50fdda246e0178b9c58b06770b90/Global/JetBrains.gitignore#L9
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d0e6b59a3..2bbe9355a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ pom.xml.versionsBackup
 # IntelliJ Settings Files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems) #
 .idea/**/workspace.xml
 .idea/**/tasks.xml
+.idea/**/shelf
 .idea/dictionaries
 .idea/compiler.xml
 .idea/encodings.xml

From 0dc401883f5616d59ad1afcb01c67dbc49736463 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sat, 12 Jun 2021 01:35:36 +0200
Subject: [PATCH 02/13] Enabled proofreading

Removed dict_* files from .gitignore
Added dict_de.xml
Added dict_project.xml
---
 .gitignore                                   |   3 +-
 .idea/dictionaries/dict_de.xml               |  15 +++
 .idea/dictionaries/dict_project.xml          | 106 +++++++++++++++++++
 .idea/inspectionProfiles/Project_Default.xml |   2 +-
 4 files changed, 124 insertions(+), 2 deletions(-)
 create mode 100644 .idea/dictionaries/dict_de.xml
 create mode 100644 .idea/dictionaries/dict_project.xml

diff --git a/.gitignore b/.gitignore
index 2bbe9355a..be67207df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,8 @@ pom.xml.versionsBackup
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/shelf
-.idea/dictionaries
+.idea/dictionaries/**
+!.idea/dictionaries/dict_*
 .idea/compiler.xml
 .idea/encodings.xml
 .idea/jarRepositories.xml
diff --git a/.idea/dictionaries/dict_de.xml b/.idea/dictionaries/dict_de.xml
new file mode 100644
index 000000000..a6ecf3c80
--- /dev/null
+++ b/.idea/dictionaries/dict_de.xml
@@ -0,0 +1,15 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="dict_de">
+    <words>
+      <w>tresorinhalt</w>
+      <w>tresorkonfigurationsdatei</w>
+      <w>tresorlaufwerk</w>
+      <w>tresorliste</w>
+      <w>tresorname</w>
+      <w>tresoroptionen</w>
+      <w>tresorstatistik</w>
+      <w>ungespeicherten</w>
+      <w>ungespeicherter</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/dictionaries/dict_project.xml b/.idea/dictionaries/dict_project.xml
new file mode 100644
index 000000000..5649810c7
--- /dev/null
+++ b/.idea/dictionaries/dict_project.xml
@@ -0,0 +1,106 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="dict_project">
+    <words>
+      <w>addvault</w>
+      <w>addvaultwizard</w>
+      <w>adoptopenjdk</w>
+      <w>affero</w>
+      <w>aquafx</w>
+      <w>autolock</w>
+      <w>autolocked</w>
+      <w>autolocking</w>
+      <w>baos</w>
+      <w>bkup</w>
+      <w>buildkit</w>
+      <w>changepassword</w>
+      <w>checkerframework</w>
+      <w>crit</w>
+      <w>crowdin</w>
+      <w>cryptofs</w>
+      <w>cryptomator</w>
+      <w>cryptomator's</w>
+      <w>cryptor</w>
+      <w>csprng</w>
+      <w>dcryptomator</w>
+      <w>dfuse</w>
+      <w>dirid</w>
+      <w>djdk</w>
+      <w>dokany</w>
+      <w>dragboard</w>
+      <w>easybind</w>
+      <w>encr</w>
+      <w>errorprone</w>
+      <w>failureaccess</w>
+      <w>fbidis</w>
+      <w>fldinst</w>
+      <w>fldrslt</w>
+      <w>fontawesomefx</w>
+      <w>gdrive</w>
+      <w>gvfs</w>
+      <w>hmmss</w>
+      <w>httpcomponents</w>
+      <w>httpcore</w>
+      <w>iclouddrive</w>
+      <w>jensd</w>
+      <w>jffi</w>
+      <w>keyloading</w>
+      <w>kibs</w>
+      <w>listcell</w>
+      <w>listenablefuture</w>
+      <w>lopp</w>
+      <w>mainwindow</w>
+      <w>masterkey</w>
+      <w>masterkeyfile</w>
+      <w>mibs</w>
+      <w>mountpath</w>
+      <w>mpc's</w>
+      <w>needsmigration</w>
+      <w>noncommercially</w>
+      <w>noël</w>
+      <w>nulab</w>
+      <w>oatomic</w>
+      <w>oauto</w>
+      <w>objectgraph</w>
+      <w>odefault</w>
+      <w>ogid</w>
+      <w>onoappledouble</w>
+      <w>ordonly</w>
+      <w>ouid</w>
+      <w>ovolname</w>
+      <w>passthrough</w>
+      <w>patreon</w>
+      <w>pcloud</w>
+      <w>probot</w>
+      <w>recoverykey</w>
+      <w>relicensing</w>
+      <w>removevault</w>
+      <w>revealer</w>
+      <w>serceman</w>
+      <w>setolabs</w>
+      <w>skymatic</w>
+      <w>socio</w>
+      <w>spof</w>
+      <w>stenzel</w>
+      <w>styleclass</w>
+      <w>sublicenses</w>
+      <w>sublicensing</w>
+      <w>systemkeychain</w>
+      <w>tada</w>
+      <w>tidelift</w>
+      <w>tmpmountpoint</w>
+      <w>tobiasdiez</w>
+      <w>toggler</w>
+      <w>traymenu</w>
+      <w>unknownerror</w>
+      <w>unlockable</w>
+      <w>vaultconfig</w>
+      <w>vaultlist</w>
+      <w>vaultname</w>
+      <w>vaultoptions</w>
+      <w>wrongfilealert</w>
+      <w>xattr</w>
+      <w>zillmann</w>
+      <w>zxcvbn</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 146ab09b7..0634be039 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+    <inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />
       <option name="processComments" value="true" />

From e1d83c996e501649b2253741e4a80ce54646b317 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sat, 12 Jun 2021 01:45:31 +0200
Subject: [PATCH 03/13] Fixed independent spelling mistakes

Added @SuppressWarnings("SpellCheckingInspection") to binary data (e.g. keys) or deliberately misspelled strings
---
 .github/SUPPORT.md                                 |  2 +-
 .../java/org/cryptomator/common/CommonsModule.java |  1 +
 .../java/org/cryptomator/common/Environment.java   |  4 ++--
 .../org/cryptomator/common/SemVerComparator.java   | 10 +++++-----
 .../org/cryptomator/common/settings/Settings.java  |  4 ++--
 .../common/settings/SettingsProvider.java          |  2 +-
 .../cryptomator/common/settings/VaultSettings.java |  4 ++--
 .../common/settings/VaultSettingsJsonAdapter.java  |  2 +-
 .../org/cryptomator/common/vaults/VaultModule.java |  2 +-
 .../org/cryptomator/common/vaults/VaultState.java  |  2 +-
 .../java/org/cryptomator/common/vaults/Volume.java |  4 ++--
 .../cryptomator/common/vaults/WebDavVolume.java    |  2 +-
 .../cryptomator/ui/common/FxmlLoaderFactory.java   |  4 ++--
 .../ui/controls/NiceSecurePasswordField.java       |  8 ++++----
 .../cryptomator/ui/health/CheckListController.java |  8 ++++----
 .../ui/keyloading/KeyLoadingStrategy.java          |  4 ++--
 .../MasterkeyFileLoadingStrategy.java              |  8 ++++----
 .../ui/launcher/AppLaunchEventHandler.java         |  2 +-
 .../java/org/cryptomator/ui/lock/LockWorkflow.java |  2 +-
 .../ui/mainwindow/MainWindowTitleController.java   |  2 +-
 .../cryptomator/ui/recoverykey/WordEncoder.java    | 14 +++++++-------
 .../ui/stats/VaultStatisticsController.java        |  2 +-
 src/main/resources/i18n/strings.properties         |  6 +++---
 .../org/cryptomator/common/LicenseCheckerTest.java |  5 +++++
 .../common/settings/SettingsJsonAdapterTest.java   |  1 +
 .../settings/VaultSettingsJsonAdapterTest.java     |  1 +
 .../org/cryptomator/launcher/IpcFactoryTest.java   |  2 +-
 .../ui/addvaultwizard/ReadMeGeneratorTest.java     |  1 +
 .../ui/controls/SecurePasswordFieldTest.java       |  6 ++++++
 .../ui/recoverykey/AutoCompleterTest.java          |  2 ++
 30 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
index c7dc14547..f9ef8460a 100644
--- a/.github/SUPPORT.md
+++ b/.github/SUPPORT.md
@@ -14,5 +14,5 @@ For _everything else_, please visit our official [Cryptomator Community](https:/
   - Discussions about the apps
 - [Development discussions](https://community.cryptomator.org/c/development)
   - General questions
-  - Discussions regarding our design decissions
+  - Discussions regarding our design decisions
   - Our roadmap
diff --git a/src/main/java/org/cryptomator/common/CommonsModule.java b/src/main/java/org/cryptomator/common/CommonsModule.java
index 705f98b8f..eb7e6cd13 100644
--- a/src/main/java/org/cryptomator/common/CommonsModule.java
+++ b/src/main/java/org/cryptomator/common/CommonsModule.java
@@ -46,6 +46,7 @@ public abstract class CommonsModule {
 	private static final int NUM_CORE_BG_THREADS = 6;
 	private static final long BG_THREAD_KEEPALIVE_SECONDS = 60l;
 
+	@SuppressWarnings("SpellCheckingInspection")
 	@Provides
 	@Singleton
 	@Named("licensePublicKey")
diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java
index e27ae9bde..a6c20c2d7 100644
--- a/src/main/java/org/cryptomator/common/Environment.java
+++ b/src/main/java/org/cryptomator/common/Environment.java
@@ -123,8 +123,8 @@ public class Environment {
 			return Stream.empty();
 		} else {
 			Iterable<String> iter = Splitter.on(separator).split(value);
-			Spliterator<String> spliter = Spliterators.spliteratorUnknownSize(iter.iterator(), Spliterator.ORDERED | Spliterator.IMMUTABLE);
-			return StreamSupport.stream(spliter, false);
+			Spliterator<String> spliterator = Spliterators.spliteratorUnknownSize(iter.iterator(), Spliterator.ORDERED | Spliterator.IMMUTABLE);
+			return StreamSupport.stream(spliterator, false);
 		}
 	}
 }
diff --git a/src/main/java/org/cryptomator/common/SemVerComparator.java b/src/main/java/org/cryptomator/common/SemVerComparator.java
index e0ff9ae25..0f9148bd5 100644
--- a/src/main/java/org/cryptomator/common/SemVerComparator.java
+++ b/src/main/java/org/cryptomator/common/SemVerComparator.java
@@ -60,17 +60,17 @@ public class SemVerComparator implements Comparator<String> {
 		final int commonCompCount = Math.min(vComps1.length, vComps2.length);
 
 		for (int i = 0; i < commonCompCount; i++) {
-			int subversionComparisionResult = 0;
+			int subversionComparisonResult = 0;
 			try {
 				final int v1 = Integer.parseInt(vComps1[i]);
 				final int v2 = Integer.parseInt(vComps2[i]);
-				subversionComparisionResult = v1 - v2;
+				subversionComparisonResult = v1 - v2;
 			} catch (NumberFormatException ex) {
 				// ok, lets compare this fragment lexicographically
-				subversionComparisionResult = vComps1[i].compareTo(vComps2[i]);
+				subversionComparisonResult = vComps1[i].compareTo(vComps2[i]);
 			}
-			if (subversionComparisionResult != 0) {
-				return subversionComparisionResult;
+			if (subversionComparisonResult != 0) {
+				return subversionComparisonResult;
 			}
 		}
 
diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java
index ee654db49..e4cb9b8f7 100644
--- a/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -30,7 +30,7 @@ public class Settings {
 	public static final int MIN_PORT = 1024;
 	public static final int MAX_PORT = 65535;
 	public static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false;
-	public static final boolean DEFAULT_CHECK_FOR_UDPATES = false;
+	public static final boolean DEFAULT_CHECK_FOR_UPDATES = false;
 	public static final boolean DEFAULT_START_HIDDEN = false;
 	public static final int DEFAULT_PORT = 42427;
 	public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
@@ -46,7 +46,7 @@ public class Settings {
 
 	private final ObservableList<VaultSettings> directories = FXCollections.observableArrayList(VaultSettings::observables);
 	private final BooleanProperty askedForUpdateCheck = new SimpleBooleanProperty(DEFAULT_ASKED_FOR_UPDATE_CHECK);
-	private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UDPATES);
+	private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UPDATES);
 	private final BooleanProperty startHidden = new SimpleBooleanProperty(DEFAULT_START_HIDDEN);
 	private final IntegerProperty port = new SimpleIntegerProperty(DEFAULT_PORT);
 	private final IntegerProperty numTrayNotifications = new SimpleIntegerProperty(DEFAULT_NUM_TRAY_NOTIFICATIONS);
diff --git a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
index 8310d0fa9..3be42f7ac 100644
--- a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
+++ b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
@@ -101,7 +101,7 @@ public class SettingsProvider implements Supplier<Settings> {
 		if (settings == null) {
 			return;
 		}
-		final Optional<Path> settingsPath = env.getSettingsPath().findFirst(); // alway save to preferred (first) path
+		final Optional<Path> settingsPath = env.getSettingsPath().findFirst(); // always save to preferred (first) path
 		settingsPath.ifPresent(path -> {
 			Runnable saveCommand = () -> this.save(settings, path);
 			ScheduledFuture<?> scheduledTask = scheduler.schedule(saveCommand, SAVE_DELAY_MS, TimeUnit.MILLISECONDS);
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 10a023806..a7f366bfd 100644
--- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -31,7 +31,7 @@ import java.util.Random;
 public class VaultSettings {
 
 	public static final boolean DEFAULT_UNLOCK_AFTER_STARTUP = false;
-	public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true;
+	public static final boolean DEFAULT_REVEAL_AFTER_MOUNT = true;
 	public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false;
 	public static final boolean DEFAULT_USES_READONLY_MODE = false;
 	public static final String DEFAULT_MOUNT_FLAGS = "";
@@ -47,7 +47,7 @@ public class VaultSettings {
 	private final StringProperty displayName = new SimpleStringProperty();
 	private final StringProperty winDriveLetter = new SimpleStringProperty();
 	private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP);
-	private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT);
+	private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REVEAL_AFTER_MOUNT);
 	private final BooleanProperty useCustomMountPath = new SimpleBooleanProperty(DEFAULT_USES_INDIVIDUAL_MOUNTPATH);
 	private final StringProperty customMountPath = new SimpleStringProperty();
 	private final BooleanProperty usesReadOnlyMode = new SimpleBooleanProperty(DEFAULT_USES_READONLY_MODE);
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
index 0cf92a48b..15a081f0d 100644
--- a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
@@ -44,7 +44,7 @@ class VaultSettingsJsonAdapter {
 		String customMountPath = null;
 		String winDriveLetter = null;
 		boolean unlockAfterStartup = VaultSettings.DEFAULT_UNLOCK_AFTER_STARTUP;
-		boolean revealAfterMount = VaultSettings.DEFAULT_REAVEAL_AFTER_MOUNT;
+		boolean revealAfterMount = VaultSettings.DEFAULT_REVEAL_AFTER_MOUNT;
 		boolean useCustomMountPath = VaultSettings.DEFAULT_USES_INDIVIDUAL_MOUNTPATH;
 		boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE;
 		String mountFlags = VaultSettings.DEFAULT_MOUNT_FLAGS;
diff --git a/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 901ee7f42..4ee13a083 100644
--- a/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -138,7 +138,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 choosen
+	// see https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions/5ba00e4be4f5e938eaae6ef1500b331de12dee77 (FUSE 4.) on why the given defaults were chosen
 	private String getWindowsFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) {
 		assert SystemUtils.IS_OS_WINDOWS;
 		StringBuilder flags = new StringBuilder();
diff --git a/src/main/java/org/cryptomator/common/vaults/VaultState.java b/src/main/java/org/cryptomator/common/vaults/VaultState.java
index 801ea7653..51365fbd2 100644
--- a/src/main/java/org/cryptomator/common/vaults/VaultState.java
+++ b/src/main/java/org/cryptomator/common/vaults/VaultState.java
@@ -46,7 +46,7 @@ public class VaultState extends ObservableValueBase<VaultState.Value> implements
 		UNLOCKED,
 
 		/**
-		 * Unknown state due to preceeding unrecoverable exceptions.
+		 * Unknown state due to preceding unrecoverable exceptions.
 		 */
 		ERROR;
 	}
diff --git a/src/main/java/org/cryptomator/common/vaults/Volume.java b/src/main/java/org/cryptomator/common/vaults/Volume.java
index f608122bf..5f434fa43 100644
--- a/src/main/java/org/cryptomator/common/vaults/Volume.java
+++ b/src/main/java/org/cryptomator/common/vaults/Volume.java
@@ -12,7 +12,7 @@ import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 /**
- * Takes a Volume and usess it to mount an unlocked vault
+ * Takes a Volume and uses it to mount an unlocked vault
  */
 public interface Volume {
 
@@ -24,7 +24,7 @@ public interface Volume {
 	boolean isSupported();
 
 	/**
-	 * Gets the coresponding enum type of the {@link VolumeImpl volume implementation ("VolumeImpl")} that is implemented by this Volume.
+	 * Gets the corresponding enum type of the {@link VolumeImpl volume implementation ("VolumeImpl")} that is implemented by this Volume.
 	 *
 	 * @return the type of implementation as defined by the {@link VolumeImpl VolumeImpl enum}
 	 */
diff --git a/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
index 03c83377c..b1850bc1e 100644
--- a/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
+++ b/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
@@ -67,7 +67,7 @@ public class WebDavVolume implements Volume {
 			throw new IllegalStateException("Mounting requires unlocked WebDAV servlet.");
 		}
 
-		//on windows, prevent an automatic drive letter selection in the upstream library. Either we choose already a specifc one or there is no free.
+		//on windows, prevent an automatic drive letter selection in the upstream library. Either we choose already a specific one or there is no free.
 		Supplier<String> driveLetterSupplier;
 		if (System.getProperty("os.name").toLowerCase().contains("windows") && vaultSettings.winDriveLetter().isEmpty().get()) {
 			driveLetterSupplier = () -> windowsDriveLetters.getAvailableDriveLetter().orElse(null);
diff --git a/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java b/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java
index cf8940cc2..cbd023ce3 100644
--- a/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java
+++ b/src/main/java/org/cryptomator/ui/common/FxmlLoaderFactory.java
@@ -67,8 +67,8 @@ public class FxmlLoaderFactory {
 		}
 		Parent root = loader.getRoot();
 		// TODO: discuss if we can remove language-specific stylesheets
-		// List<String> addtionalStyleSheets = Splitter.on(',').omitEmptyStrings().splitToList(resourceBundle.getString("additionalStyleSheets"));
-		// addtionalStyleSheets.forEach(styleSheet -> root.getStylesheets().add("/css/" + styleSheet));
+		// List<String> additionalStyleSheets = Splitter.on(',').omitEmptyStrings().splitToList(resourceBundle.getString("additionalStyleSheets"));
+		// additionalStyleSheets.forEach(styleSheet -> root.getStylesheets().add("/css/" + styleSheet));
 		return sceneFactory.apply(root);
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java b/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
index 928cfc40e..4a4e43fff 100644
--- a/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
+++ b/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
@@ -12,8 +12,8 @@ import javafx.scene.layout.StackPane;
 public class NiceSecurePasswordField extends StackPane {
 
 	private static final String STYLE_CLASS = "nice-secure-password-field";
-	private static final String ICONS_STLYE_CLASS = "icons";
-	private static final String REVEAL_BUTTON_STLYE_CLASS = "reveal-button";
+	private static final String ICONS_STYLE_CLASS = "icons";
+	private static final String REVEAL_BUTTON_STYLE_CLASS = "reveal-button";
 	private static final int ICON_SPACING = 6;
 	private static final double ICON_SIZE = 14.0;
 
@@ -30,7 +30,7 @@ public class NiceSecurePasswordField extends StackPane {
 		iconContainer.setAlignment(Pos.CENTER_RIGHT);
 		iconContainer.setMaxWidth(Double.NEGATIVE_INFINITY);
 		iconContainer.setPrefWidth(42); // TODO
-		iconContainer.getStyleClass().add(ICONS_STLYE_CLASS);
+		iconContainer.getStyleClass().add(ICONS_STYLE_CLASS);
 		StackPane.setAlignment(iconContainer, Pos.CENTER_RIGHT);
 
 		capsLockedIcon.setGlyph(FontAwesome5Icon.ARROW_UP);
@@ -51,7 +51,7 @@ public class NiceSecurePasswordField extends StackPane {
 		revealPasswordButton.setFocusTraversable(false);
 		revealPasswordButton.visibleProperty().bind(passwordField.focusedProperty());
 		revealPasswordButton.managedProperty().bind(passwordField.focusedProperty());
-		revealPasswordButton.getStyleClass().add(REVEAL_BUTTON_STLYE_CLASS);
+		revealPasswordButton.getStyleClass().add(REVEAL_BUTTON_STYLE_CLASS);
 
 		passwordField.revealPasswordProperty().bind(revealPasswordButton.selectedProperty());
 
diff --git a/src/main/java/org/cryptomator/ui/health/CheckListController.java b/src/main/java/org/cryptomator/ui/health/CheckListController.java
index ccb41d56b..169083e02 100644
--- a/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -46,7 +46,7 @@ public class CheckListController implements FxController {
 	private final ReportWriter reportWriter;
 	private final ExecutorService executorService;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
-	private final Lazy<ErrorComponent.Builder> errorComponenBuilder;
+	private final Lazy<ErrorComponent.Builder> errorComponentBuilder;
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final Binding<Boolean> finished;
@@ -60,13 +60,13 @@ public class CheckListController implements FxController {
 
 
 	@Inject
-	public CheckListController(@HealthCheckWindow Stage window, Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, Lazy<ErrorComponent.Builder> errorComponenBuilder) {
+	public CheckListController(@HealthCheckWindow Stage window, Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, Lazy<ErrorComponent.Builder> errorComponentBuilder) {
 		this.window = window;
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
 		this.selectedTask = selectedTask;
-		this.errorComponenBuilder = errorComponenBuilder;
+		this.errorComponentBuilder = errorComponentBuilder;
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(END_STATES::contains).orElse(false);
@@ -131,7 +131,7 @@ public class CheckListController implements FxController {
 			reportWriter.writeReport(tasks);
 		} catch (IOException e) {
 			LOG.error("Failed to write health check report.", e);
-			errorComponenBuilder.get().cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
+			errorComponentBuilder.get().cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java
index ed8ca0540..eaef7480b 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingStrategy.java
@@ -35,7 +35,7 @@ public interface KeyLoadingStrategy extends MasterkeyLoader {
 	}
 
 	/**
-	 * Release any ressources or do follow-up tasks after loading a key.
+	 * Release any resources or do follow-up tasks after loading a key.
 	 *
 	 * @param unlockedSuccessfully <code>true</code> if successfully unlocked a vault with the loaded key
 	 * @implNote This method might be invoked multiple times, depending on whether multiple attempts to load a key are started.
@@ -47,7 +47,7 @@ public interface KeyLoadingStrategy extends MasterkeyLoader {
 	/**
 	 * A key loading strategy that will always fail by throwing a {@link MasterkeyLoadingFailedException}.
 	 *
-	 * @param exception The cause of the failure. If not alreay an {@link MasterkeyLoadingFailedException}, it will get wrapped.
+	 * @param exception The cause of the failure. If not already an {@link MasterkeyLoadingFailedException}, it will get wrapped.
 	 * @return A new KeyLoadingStrategy that will always fail with an {@link MasterkeyLoadingFailedException}.
 	 */
 	static KeyLoadingStrategy failed(Exception exception) {
diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
index f8fbdd720..39db1cc04 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
@@ -32,7 +32,7 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy {
 	public static final String SCHEME = "masterkeyfile";
 
 	private final Vault vault;
-	private final MasterkeyFileAccess masterkeyFileAcccess;
+	private final MasterkeyFileAccess masterkeyFileAccess;
 	private final Stage window;
 	private final Lazy<Scene> passphraseEntryScene;
 	private final Lazy<Scene> selectMasterkeyFileScene;
@@ -45,9 +45,9 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy {
 	private boolean wrongPassword;
 
 	@Inject
-	public MasterkeyFileLoadingStrategy(@KeyLoading Vault vault, MasterkeyFileAccess masterkeyFileAcccess, @KeyLoading Stage window, @FxmlScene(FxmlFile.UNLOCK_ENTER_PASSWORD) Lazy<Scene> passphraseEntryScene, @FxmlScene(FxmlFile.UNLOCK_SELECT_MASTERKEYFILE) Lazy<Scene> selectMasterkeyFileScene, UserInteractionLock<MasterkeyFileLoadingModule.PasswordEntry> passwordEntryLock, UserInteractionLock<MasterkeyFileLoadingModule.MasterkeyFileProvision> masterkeyFileProvisionLock, AtomicReference<char[]> password, AtomicReference<Path> filePath, MasterkeyFileLoadingFinisher finisher) {
+	public MasterkeyFileLoadingStrategy(@KeyLoading Vault vault, MasterkeyFileAccess masterkeyFileAccess, @KeyLoading Stage window, @FxmlScene(FxmlFile.UNLOCK_ENTER_PASSWORD) Lazy<Scene> passphraseEntryScene, @FxmlScene(FxmlFile.UNLOCK_SELECT_MASTERKEYFILE) Lazy<Scene> selectMasterkeyFileScene, UserInteractionLock<MasterkeyFileLoadingModule.PasswordEntry> passwordEntryLock, UserInteractionLock<MasterkeyFileLoadingModule.MasterkeyFileProvision> masterkeyFileProvisionLock, AtomicReference<char[]> password, AtomicReference<Path> filePath, MasterkeyFileLoadingFinisher finisher) {
 		this.vault = vault;
-		this.masterkeyFileAcccess = masterkeyFileAcccess;
+		this.masterkeyFileAccess = masterkeyFileAccess;
 		this.window = window;
 		this.passphraseEntryScene = passphraseEntryScene;
 		this.selectMasterkeyFileScene = selectMasterkeyFileScene;
@@ -68,7 +68,7 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy {
 				filePath = getAlternateMasterkeyFilePath();
 			}
 			CharSequence passphrase = getPassphrase();
-			return masterkeyFileAcccess.load(filePath, passphrase);
+			return masterkeyFileAccess.load(filePath, passphrase);
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			throw new UnlockCancelledException("Unlock interrupted", e);
diff --git a/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java b/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java
index 49ef79e83..f4e5bb790 100644
--- a/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java
+++ b/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java
@@ -64,7 +64,7 @@ class AppLaunchEventHandler {
 		}
 	}
 
-	// TODO dedup MainWindowController...
+	// TODO deduplicate MainWindowController...
 	private void addOrRevealVault(Path potentialVaultPath) {
 		assert Platform.isFxApplicationThread();
 		try {
diff --git a/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java b/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java
index 87fd486f2..73b4844b9 100644
--- a/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java
+++ b/src/main/java/org/cryptomator/ui/lock/LockWorkflow.java
@@ -22,7 +22,7 @@ import javafx.stage.Window;
 /**
  * The sequence of actions performed and checked during lock of a vault.
  * <p>
- * This class implements the Task interface, sucht that it can run in the background with some possible forground operations/requests to the ui, without blocking the main app.
+ * This class implements the Task interface, sucht that it can run in the background with some possible foreground operations/requests to the ui, without blocking the main app.
  * If the task state is
  * <li>succeeded, the vault was successfully locked;</li>
  * <li>canceled, the lock was canceled;</li>
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
index ea9311c88..ef050e799 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
@@ -129,7 +129,7 @@ public class MainWindowTitleController implements FxController {
 	}
 
 	public boolean isShowMinimizeButton() {
-		// always show the minimize button if no tray icon is present OR it is explicitily enabled
+		// always show the minimize button if no tray icon is present OR it is explicitly enabled
 		return !trayMenuInitialized || settings.showMinimizeButton().get();
 	}
 }
diff --git a/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java b/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
index ba4753879..7d31d660c 100644
--- a/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
+++ b/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
@@ -58,7 +58,7 @@ class WordEncoder {
 	 * @throws IllegalArgumentException If input is not a multiple of three bytes
 	 */
 	public String encodePadded(byte[] input) {
-		Preconditions.checkArgument(input.length % 3 == 0, "input needs to be padded to a multipe of three");
+		Preconditions.checkArgument(input.length % 3 == 0, "input needs to be padded to a multiple of three");
 		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < input.length; i += 3) {
 			byte b1 = input[i];
@@ -85,12 +85,12 @@ class WordEncoder {
 	 * @throws IllegalArgumentException If the encoded string doesn't consist of a multiple of two words or one of the words is unknown to this encoder.
 	 */
 	public byte[] decode(String encoded) {
-		List<String> splitted = Splitter.on(DELIMITER).omitEmptyStrings().splitToList(Strings.nullToEmpty(encoded));
-		Preconditions.checkArgument(splitted.size() % 2 == 0, "%s needs to be a multiple of two words", encoded);
-		byte[] result = new byte[splitted.size() / 2 * 3];
-		for (int i = 0; i < splitted.size(); i += 2) {
-			String w1 = splitted.get(i);
-			String w2 = splitted.get(i + 1);
+		List<String> split = Splitter.on(DELIMITER).omitEmptyStrings().splitToList(Strings.nullToEmpty(encoded));
+		Preconditions.checkArgument(split.size() % 2 == 0, "%s needs to be a multiple of two words", encoded);
+		byte[] result = new byte[split.size() / 2 * 3];
+		for (int i = 0; i < split.size(); i += 2) {
+			String w1 = split.get(i);
+			String w2 = split.get(i + 1);
 			int firstWordIndex = indices.getOrDefault(w1, -1);
 			int secondWordIndex = indices.getOrDefault(w2, -1);
 			Preconditions.checkArgument(firstWordIndex != -1, "%s not in dictionary", w1);
diff --git a/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index f8937e90f..96116db36 100644
--- a/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -102,7 +102,7 @@ public class VaultStatisticsController implements FxController {
 			this.decryptedBytesRead = readData;
 			this.encryptedBytesWrite = writeData;
 
-			// initialize data once and change value of datapoints later:
+			// initialize data once and change value of data points later:
 			for (int i = 0; i < IO_SAMPLING_STEPS; i++) {
 				decryptedBytesRead.getData().add(new Data<>(i, 0));
 				encryptedBytesWrite.getData().add(new Data<>(i, 0));
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index f0f550769..692423e8f 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -14,7 +14,7 @@ generic.button.done=Done
 generic.button.next=Next
 generic.button.print=Print
 ## Error
-generic.error.title=An unexpected error occured
+generic.error.title=An unexpected error occurred
 generic.error.instruction=This should not have happened. Please report the error text below and include a description of what steps did lead to this error.
 
 # Defaults
@@ -131,7 +131,7 @@ migration.start.confirm=Yes, my vault is fully synced
 migration.run.enterPassword=Enter the password for "%s"
 migration.run.startMigrationBtn=Migrate Vault
 migration.run.progressHint=This might take some time…
-## Sucess
+## Success
 migration.success.nextStepsInstructions=Migrated "%s" successfully.\nYou can now unlock your vault.
 migration.success.unlockNow=Unlock Now
 ## Missing file system capabilities
@@ -148,7 +148,7 @@ migration.impossible.moreInfo=The vault can still be opened with an older versio
 
 # Health Check
 health.title=Vault Health Check
-health.start.introduction=The Vault Health Check is a collection of checks to detect and possilby fix problems in the internal structure of your vault. Please note, that not all problems are fixable. You need the vault password to perform the checks.
+health.start.introduction=The Vault Health Check is a collection of checks to detect and possibly fix problems in the internal structure of your vault. Please note, that not all problems are fixable. You need the vault password to perform the checks.
 health.start.configValid=Reading and parsing vault configuration file was successful. Proceed to select checks.
 health.start.configInvalid=Error while reading and parsing the vault configuration file.
 health.checkList.header=Available Health Checks
diff --git a/src/test/java/org/cryptomator/common/LicenseCheckerTest.java b/src/test/java/org/cryptomator/common/LicenseCheckerTest.java
index 02d6a6d29..2370b2fe2 100644
--- a/src/test/java/org/cryptomator/common/LicenseCheckerTest.java
+++ b/src/test/java/org/cryptomator/common/LicenseCheckerTest.java
@@ -9,6 +9,7 @@ import java.util.Optional;
 
 public class LicenseCheckerTest {
 
+	@SuppressWarnings("SpellCheckingInspection")
 	private static final String PUBLIC_KEY = """
 			MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBgc4HZz+/fBbC7lmEww0AO3NK9wVZ\
 			PDZ0VEnsaUFLEYpTzb90nITtJUcPUbvOsdZIZ1Q8fnbquAYgxXL5UgHMoywAib47\
@@ -25,6 +26,7 @@ public class LicenseCheckerTest {
 
 	@Test
 	public void testCheckValidLicense() {
+		@SuppressWarnings("SpellCheckingInspection")
 		String license = "eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.eyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.AQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj";
 
 		Optional<DecodedJWT> decoded = licenseChecker.check(license);
@@ -35,6 +37,7 @@ public class LicenseCheckerTest {
 
 	@Test
 	public void testCheckInvalidLicenseHeader() {
+		@SuppressWarnings("SpellCheckingInspection")
 		String license = "EyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.eyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.AQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj";
 
 		Optional<DecodedJWT> decoded = licenseChecker.check(license);
@@ -44,6 +47,7 @@ public class LicenseCheckerTest {
 
 	@Test
 	public void testCheckInvalidLicensePayload() {
+		@SuppressWarnings("SpellCheckingInspection")
 		String license = "eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.EyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.AQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj";
 
 		Optional<DecodedJWT> decoded = licenseChecker.check(license);
@@ -53,6 +57,7 @@ public class LicenseCheckerTest {
 
 	@Test
 	public void testCheckInvalidLicenseSignature() {
+		@SuppressWarnings("SpellCheckingInspection")
 		String license = "eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.eyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.aQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj";
 
 		Optional<DecodedJWT> decoded = licenseChecker.check(license);
diff --git a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java b/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
index a03eb1d57..b2ecf4b89 100644
--- a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
+++ b/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
@@ -44,6 +44,7 @@ public class SettingsJsonAdapterTest {
 		Assertions.assertEquals(VolumeImpl.FUSE, settings.preferredVolumeImpl().get());
 	}
 
+	@SuppressWarnings("SpellCheckingInspection")
 	@ParameterizedTest(name = "fromJson() should throw IOException for input: {0}")
 	@ValueSource(strings = { //
 			"", //
diff --git a/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
index a606de948..3d902ba6c 100644
--- a/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
+++ b/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
@@ -40,6 +40,7 @@ public class VaultSettingsJsonAdapterTest {
 		);
 	}
 
+	@SuppressWarnings("SpellCheckingInspection")
 	@Test
 	public void testSerialize() throws IOException {
 		VaultSettings vaultSettings = new VaultSettings("test");
diff --git a/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java b/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java
index aeb9fbeb3..d5e244d0c 100644
--- a/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java
+++ b/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java
@@ -24,7 +24,7 @@ public class IpcFactoryTest {
 	private IpcProtocolImpl protocolHandler = Mockito.mock(IpcProtocolImpl.class);
 
 	@Test
-	@DisplayName("Wihout IPC port files")
+	@DisplayName("Without IPC port files")
 	public void testNoIpcWithoutPortFile() throws IOException {
 		IpcFactory inTest = new IpcFactory(environment, protocolHandler);
 
diff --git a/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java b/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java
index 9715c6654..97f02aee1 100644
--- a/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java
+++ b/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java
@@ -11,6 +11,7 @@ import java.util.List;
 
 public class ReadMeGeneratorTest {
 
+	@SuppressWarnings("SpellCheckingInspection")
 	@ParameterizedTest
 	@CsvSource({ //
 			"test,test", //
diff --git a/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java b/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java
index 0956967e6..865966049 100644
--- a/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java
+++ b/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java
@@ -49,6 +49,7 @@ public class SecurePasswordFieldTest {
 			Assertions.assertEquals("anteater", pwField.getCharacters().toString());
 		}
 
+		@SuppressWarnings("SpellCheckingInspection")
 		@Test
 		@DisplayName("\"anteater\".insert(3, \"b\")")
 		public void insert2() {
@@ -76,6 +77,7 @@ public class SecurePasswordFieldTest {
 			Assertions.assertEquals("ant", pwField.getCharacters().toString());
 		}
 
+		@SuppressWarnings("SpellCheckingInspection")
 		@Test
 		@DisplayName("\"anteater\".replace(0, 3, \"hand\")")
 		public void replace1() {
@@ -85,6 +87,7 @@ public class SecurePasswordFieldTest {
 			Assertions.assertEquals("handeater", pwField.getCharacters().toString());
 		}
 
+		@SuppressWarnings("SpellCheckingInspection")
 		@Test
 		@DisplayName("\"anteater\".replace(3, 6, \"keep\")")
 		public void replace2() {
@@ -94,6 +97,7 @@ public class SecurePasswordFieldTest {
 			Assertions.assertEquals("antkeeper", pwField.getCharacters().toString());
 		}
 
+		@SuppressWarnings("SpellCheckingInspection")
 		@Test
 		@DisplayName("\"anteater\".replace(0, 3, \"bee\")")
 		public void replace3() {
@@ -105,6 +109,7 @@ public class SecurePasswordFieldTest {
 
 	}
 
+	@SuppressWarnings("SpellCheckingInspection")
 	@Test
 	@DisplayName("entering NFC string leads to NFC char[]")
 	public void enterNfcString() {
@@ -125,6 +130,7 @@ public class SecurePasswordFieldTest {
 		Assertions.assertEquals('\uDCA9', result.charAt(9));
 	}
 
+	@SuppressWarnings("SpellCheckingInspection")
 	@Test
 	@DisplayName("entering NFD string leads to NFC char[]")
 	public void enterNfdString() {
diff --git a/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java b/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java
index e5bbe24c9..953507b89 100644
--- a/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java
+++ b/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java
@@ -43,6 +43,7 @@ public class AutoCompleterTest {
 			Assertions.assertEquals("tame", result.get());
 		}
 
+		@SuppressWarnings("SpellCheckingInspection")
 		@ParameterizedTest
 		@DisplayName("find 'teach'")
 		@ValueSource(strings = {"te", "tea", "teac", "teach"})
@@ -52,6 +53,7 @@ public class AutoCompleterTest {
 			Assertions.assertEquals("teach", result.get());
 		}
 
+		@SuppressWarnings("SpellCheckingInspection")
 		@ParameterizedTest
 		@DisplayName("find 'teacher'")
 		@ValueSource(strings = {"teache", "teacher"})

From 000f27e166fc592ca46480bff2244e0c39940046 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sat, 12 Jun 2021 01:56:15 +0200
Subject: [PATCH 04/13] Fixed spelling mistakes that required API breaking
 changes

---
 .github/CODE_OF_CONDUCT.md                     |  2 +-
 .../cryptomator/common/vaults/VaultStats.java  | 18 +++++++++---------
 ...=> LaunchAndSizeBasedTriggeringPolicy.java} |  4 ++--
 .../org/cryptomator/logging/LoggerModule.java  |  2 +-
 .../cryptomator/ui/common/WeakBindings.java    |  2 +-
 ...hrougputLabel.java => ThroughputLabel.java} |  4 ++--
 .../ui/recoverykey/AutoCompleter.java          | 10 +++++-----
 .../ui/stats/VaultStatisticsController.java    |  4 ++--
 src/main/resources/fxml/stats.fxml             |  6 +++---
 .../resources/fxml/vault_detail_unlocked.fxml  |  6 +++---
 10 files changed, 29 insertions(+), 29 deletions(-)
 rename src/main/java/org/cryptomator/logging/{LaunchAndSizeBasedTriggerinPolicy.java => LaunchAndSizeBasedTriggeringPolicy.java} (86%)
 rename src/main/java/org/cryptomator/ui/controls/{ThrougputLabel.java => ThroughputLabel.java} (96%)

diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
index 3a7337fe3..83ec96635 100644
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -22,7 +22,7 @@ include:
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
+* The use of sexual language or imagery and unwelcome sexual attention or
   advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
diff --git a/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 649be3a09..ac0b8df38 100644
--- a/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -35,8 +35,8 @@ public class VaultStats {
 	private final LongProperty bytesPerSecondEncrypted = new SimpleLongProperty();
 	private final LongProperty bytesPerSecondDecrypted = new SimpleLongProperty();
 	private final DoubleProperty cacheHitRate = new SimpleDoubleProperty();
-	private final LongProperty toalBytesRead = new SimpleLongProperty();
-	private final LongProperty toalBytesWritten = new SimpleLongProperty();
+	private final LongProperty totalBytesRead = new SimpleLongProperty();
+	private final LongProperty totalBytesWritten = new SimpleLongProperty();
 	private final LongProperty totalBytesEncrypted = new SimpleLongProperty();
 	private final LongProperty totalBytesDecrypted = new SimpleLongProperty();
 	private final LongProperty filesRead = new SimpleLongProperty();
@@ -75,8 +75,8 @@ public class VaultStats {
 		cacheHitRate.set(stats.map(this::getCacheHitRate).orElse(0.0));
 		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0L));
 		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0L));
-		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollTotalBytesRead).orElse(0L));
-		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollTotalBytesWritten).orElse(0L));
+		totalBytesRead.set(stats.map(CryptoFileSystemStats::pollTotalBytesRead).orElse(0L));
+		totalBytesWritten.set(stats.map(CryptoFileSystemStats::pollTotalBytesWritten).orElse(0L));
 		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesEncrypted).orElse(0L));
 		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesDecrypted).orElse(0L));
 		var oldAccessCount = filesRead.get() + filesWritten.get();
@@ -146,7 +146,7 @@ public class VaultStats {
 		return bytesPerSecondEncrypted;
 	}
 
-	public long getBytesPerSecondEnrypted() {
+	public long getBytesPerSecondEncrypted() {
 		return bytesPerSecondEncrypted.get();
 	}
 
@@ -164,13 +164,13 @@ public class VaultStats {
 		return cacheHitRate.get();
 	}
 
-	public LongProperty toalBytesReadProperty() {return toalBytesRead;}
+	public LongProperty totalBytesReadProperty() {return totalBytesRead;}
 
-	public long getTotalBytesRead() { return toalBytesRead.get();}
+	public long getTotalBytesRead() { return totalBytesRead.get();}
 
-	public LongProperty toalBytesWrittenProperty() {return toalBytesWritten;}
+	public LongProperty totalBytesWrittenProperty() {return totalBytesWritten;}
 
-	public long getTotalBytesWritten() { return toalBytesWritten.get();}
+	public long getTotalBytesWritten() { return totalBytesWritten.get();}
 
 	public LongProperty totalBytesEncryptedProperty() {return totalBytesEncrypted;}
 
diff --git a/src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggerinPolicy.java b/src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggeringPolicy.java
similarity index 86%
rename from src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggerinPolicy.java
rename to src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggeringPolicy.java
index 3879fbdc6..25f5239ab 100644
--- a/src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggerinPolicy.java
+++ b/src/main/java/org/cryptomator/logging/LaunchAndSizeBasedTriggeringPolicy.java
@@ -11,12 +11,12 @@ import java.io.File;
  *
  * @param <E> Event type the policy possibly reacts to
  */
-public class LaunchAndSizeBasedTriggerinPolicy<E> extends TriggeringPolicyBase<E> {
+public class LaunchAndSizeBasedTriggeringPolicy<E> extends TriggeringPolicyBase<E> {
 
 	LaunchBasedTriggeringPolicy<E> launchBasedTriggeringPolicy;
 	SizeBasedTriggeringPolicy<E> sizeBasedTriggeringPolicy;
 
-	public LaunchAndSizeBasedTriggerinPolicy(FileSize threshold) {
+	public LaunchAndSizeBasedTriggeringPolicy(FileSize threshold) {
 		this.launchBasedTriggeringPolicy = new LaunchBasedTriggeringPolicy<>();
 		this.sizeBasedTriggeringPolicy = new SizeBasedTriggeringPolicy<>();
 		sizeBasedTriggeringPolicy.setMaxFileSize(threshold);
diff --git a/src/main/java/org/cryptomator/logging/LoggerModule.java b/src/main/java/org/cryptomator/logging/LoggerModule.java
index 0b24e0e24..4866655e3 100644
--- a/src/main/java/org/cryptomator/logging/LoggerModule.java
+++ b/src/main/java/org/cryptomator/logging/LoggerModule.java
@@ -85,7 +85,7 @@ public class LoggerModule {
 			appender.setContext(context);
 			appender.setFile(logDir.resolve(LOGFILE_NAME).toString());
 			appender.setEncoder(encoder);
-			LaunchAndSizeBasedTriggerinPolicy triggeringPolicy = new LaunchAndSizeBasedTriggerinPolicy(FileSize.valueOf(LOG_MAX_SIZE));
+			LaunchAndSizeBasedTriggeringPolicy triggeringPolicy = new LaunchAndSizeBasedTriggeringPolicy(FileSize.valueOf(LOG_MAX_SIZE));
 			triggeringPolicy.setContext(context);
 			triggeringPolicy.start();
 			appender.setTriggeringPolicy(triggeringPolicy);
diff --git a/src/main/java/org/cryptomator/ui/common/WeakBindings.java b/src/main/java/org/cryptomator/ui/common/WeakBindings.java
index e6071df1d..6efa747c9 100644
--- a/src/main/java/org/cryptomator/ui/common/WeakBindings.java
+++ b/src/main/java/org/cryptomator/ui/common/WeakBindings.java
@@ -77,7 +77,7 @@ public final class WeakBindings {
 	 * @param observable The observable
 	 * @return a IntegerBinding weakly referenced from the given observable
 	 */
-	public static IntegerBinding bindInterger(ObservableValue<Number> observable) {
+	public static IntegerBinding bindInteger(ObservableValue<Number> observable) {
 		return new IntegerBinding() {
 			{
 				bind(observable);
diff --git a/src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java b/src/main/java/org/cryptomator/ui/controls/ThroughputLabel.java
similarity index 96%
rename from src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java
rename to src/main/java/org/cryptomator/ui/controls/ThroughputLabel.java
index a21e6d916..19999ea11 100644
--- a/src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java
+++ b/src/main/java/org/cryptomator/ui/controls/ThroughputLabel.java
@@ -8,7 +8,7 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.Label;
 
-public class ThrougputLabel extends Label {
+public class ThroughputLabel extends Label {
 
 	private static final long KIBS_THRESHOLD = 1l << 7; // 0.128 kiB/s
 	private static final long MIBS_THRESHOLD = 1l << 19; // 0.512 MiB/s
@@ -18,7 +18,7 @@ public class ThrougputLabel extends Label {
 	private final StringProperty mibsFormat = new SimpleStringProperty("%.3f");
 	private final LongProperty bytesPerSecond = new SimpleLongProperty();
 
-	public ThrougputLabel() {
+	public ThroughputLabel() {
 		textProperty().bind(createStringBinding());
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java b/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
index 5c747261b..daac7f459 100644
--- a/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
+++ b/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
@@ -26,7 +26,7 @@ public class AutoCompleter {
 		if (Strings.isNullOrEmpty(prefix)) {
 			return Optional.empty();
 		}
-		int potentialMatchIdx = findIndexOfLexicographicallyPreceeding(0, dictionary.size(), prefix);
+		int potentialMatchIdx = findIndexOfLexicographicallyPreceding(0, dictionary.size(), prefix);
 		if (potentialMatchIdx < dictionary.size()) {
 			String potentialMatch = dictionary.get(potentialMatchIdx);
 			return potentialMatch.startsWith(prefix) ? Optional.of(potentialMatch) : Optional.empty();
@@ -48,21 +48,21 @@ public class AutoCompleter {
 	 * @param prefix
 	 * @return index between [0, dictLen], i.e. index can exceed the upper bounds of {@link #dictionary}.
 	 */
-	private int findIndexOfLexicographicallyPreceeding(int begin, int end, String prefix) {
+	private int findIndexOfLexicographicallyPreceding(int begin, int end, String prefix) {
 		if (begin >= end) {
 			return begin; // this is usually where a binary search ends "unsuccessful"
 		}
 
 		int mid = (begin + end) / 2;
 		String word = dictionary.get(mid);
-		if (prefix.compareTo(word) <= 0) { // prefix preceeds or matches word
+		if (prefix.compareTo(word) <= 0) { // prefix precedes or matches word
 			// proceed in left half
 			assert mid < end;
-			return findIndexOfLexicographicallyPreceeding(0, mid, prefix);
+			return findIndexOfLexicographicallyPreceding(0, mid, prefix);
 		} else {
 			// proceed in right half
 			assert mid >= begin;
-			return findIndexOfLexicographicallyPreceeding(mid + 1, end, prefix);
+			return findIndexOfLexicographicallyPreceding(mid + 1, end, prefix);
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index 96116db36..a3c430946 100644
--- a/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -65,8 +65,8 @@ public class VaultStatisticsController implements FxController {
 		this.cacheHitRate = WeakBindings.bindDouble(stats.cacheHitRateProperty());
 		this.cacheHitDegrees = cacheHitRate.multiply(-270);
 		this.cacheHitPercentage = cacheHitRate.multiply(100);
-		this.totalBytesRead = WeakBindings.bindLong(stats.toalBytesReadProperty());
-		this.totalBytesWritten = WeakBindings.bindLong(stats.toalBytesWrittenProperty());
+		this.totalBytesRead = WeakBindings.bindLong(stats.totalBytesReadProperty());
+		this.totalBytesWritten = WeakBindings.bindLong(stats.totalBytesWrittenProperty());
 		this.totalBytesDecrypted = WeakBindings.bindLong(stats.totalBytesDecryptedProperty());
 		this.totalBytesEncrypted = WeakBindings.bindLong(stats.totalBytesEncryptedProperty());
 		this.filesRead = WeakBindings.bindLong(stats.filesRead());
diff --git a/src/main/resources/fxml/stats.fxml b/src/main/resources/fxml/stats.fxml
index a2ef920b9..b17dc67f6 100644
--- a/src/main/resources/fxml/stats.fxml
+++ b/src/main/resources/fxml/stats.fxml
@@ -2,7 +2,7 @@
 
 <?import org.cryptomator.ui.controls.DataLabel?>
 <?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
+<?import org.cryptomator.ui.controls.ThroughputLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.AreaChart?>
 <?import javafx.scene.chart.NumberAxis?>
@@ -37,7 +37,7 @@
 
 	<!-- Read -->
 	<VBox prefWidth="300" prefHeight="300" spacing="6" alignment="CENTER">
-		<ThrougputLabel styleClass="label-large" idleFormat="%stats.read.throughput.idle" kibsFormat="%stats.read.throughput.kibs" mibsFormat="%stats.read.throughput.mibs" bytesPerSecond="${controller.bpsRead}"/>
+		<ThroughputLabel styleClass="label-large" idleFormat="%stats.read.throughput.idle" kibsFormat="%stats.read.throughput.kibs" mibsFormat="%stats.read.throughput.mibs" bytesPerSecond="${controller.bpsRead}"/>
 		<AreaChart fx:id="readChart" styleClass="io-stats" createSymbols="false" animated="false">
 			<xAxis>
 				<NumberAxis fx:id="readChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
@@ -56,7 +56,7 @@
 
 	<!-- Write -->
 	<VBox prefWidth="300" prefHeight="300" spacing="6" alignment="CENTER">
-		<ThrougputLabel styleClass="label-large" idleFormat="%stats.write.throughput.idle" kibsFormat="%stats.write.throughput.kibs" mibsFormat="%stats.write.throughput.mibs" bytesPerSecond="${controller.bpsWritten}"/>
+		<ThroughputLabel styleClass="label-large" idleFormat="%stats.write.throughput.idle" kibsFormat="%stats.write.throughput.kibs" mibsFormat="%stats.write.throughput.mibs" bytesPerSecond="${controller.bpsWritten}"/>
 		<AreaChart fx:id="writeChart" styleClass="io-stats" createSymbols="false" animated="false">
 			<xAxis>
 				<NumberAxis fx:id="writeChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
diff --git a/src/main/resources/fxml/vault_detail_unlocked.fxml b/src/main/resources/fxml/vault_detail_unlocked.fxml
index 7a4d62952..29b11ed17 100644
--- a/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -1,5 +1,5 @@
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
+<?import org.cryptomator.ui.controls.ThroughputLabel?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tooltip?>
@@ -41,11 +41,11 @@
 				<VBox spacing="6">
 					<HBox alignment="CENTER_RIGHT" spacing="6">
 						<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
-						<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps" mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondRead}"/>
+						<ThroughputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps" mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondRead}"/>
 					</HBox>
 					<HBox alignment="CENTER_RIGHT" spacing="6">
 						<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
-						<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps" mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
+						<ThroughputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps" mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
 					</HBox>
 				</VBox>
 			</graphic>

From 74355b128a8ea1f0defe630e53efb69717b016b9 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 16 Jun 2021 13:24:25 +0200
Subject: [PATCH 05/13] Sign tarball in release using GPG

---
 .github/workflows/build.yml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3cf0cb845..62990ca23 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,13 +52,14 @@ jobs:
         with:
           name: buildkit-win.zip
           path: target/buildkit-win.zip
-          
+
   release:
     name: Draft a Release on GitHub Releases
     runs-on: ubuntu-latest
     needs: build
     if: startsWith(github.ref, 'refs/tags/') && github.repository == 'cryptomator/cryptomator'
     steps:
+      - uses: actions/checkout@v2
       - name: Download buildkit-linux.zip
         uses: actions/download-artifact@v1
         with:
@@ -74,6 +75,17 @@ jobs:
         with:
           name: buildkit-win.zip
           path: .
+      - name: Create tarball
+        run: git archive --prefix="cryptomator-${{ github.ref }}/" -o ${{ github.ref }}.tar.gz ${{ github.ref }}
+      - name: Prepare GPG-Agent to sign tarball with key 615D449FE6E6A235
+        run: |
+          echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
+          echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --dry-run --sign ${{ github.ref }}.tar.gz
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
+          GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
+      - name: Sign tarball
+        run: gpg --batch --quiet --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a ${{ github.ref }}.tar.gz
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -127,4 +139,13 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: buildkit-win.zip
           asset_name: buildkit-win.zip
-          asset_content_type: application/zip
\ No newline at end of file
+          asset_content_type: application/zip
+      - name: Upload tarball signature to GitHub Releases
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ github.ref }}.tar.gz.asc
+          asset_name: ${{ github.ref }}.tar.gz.asc
+          asset_content_type: application/octet-stream
\ No newline at end of file

From b15cda260e35ca7f6a9a0cf4fa94c07ead89439c Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 16 Jun 2021 12:13:49 +0000
Subject: [PATCH 06/13] Apply suggestions from code review

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
---
 .github/workflows/build.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62990ca23..0539bec21 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,15 +77,13 @@ jobs:
           path: .
       - name: Create tarball
         run: git archive --prefix="cryptomator-${{ github.ref }}/" -o ${{ github.ref }}.tar.gz ${{ github.ref }}
-      - name: Prepare GPG-Agent to sign tarball with key 615D449FE6E6A235
+      - name: Sign tarball with key 615D449FE6E6A235
         run: |
           echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
-          echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --dry-run --sign ${{ github.ref }}.tar.gz
+          echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a ${{ github.ref }}.tar.gz
         env:
           GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
-      - name: Sign tarball
-        run: gpg --batch --quiet --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a ${{ github.ref }}.tar.gz
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -148,4 +146,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ github.ref }}.tar.gz.asc
           asset_name: ${{ github.ref }}.tar.gz.asc
-          asset_content_type: application/octet-stream
\ No newline at end of file
+          asset_content_type: application/octet-stream

From 08cbfd47eaa7f086afd4bd3fa0574e699f07c7a6 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 16 Jun 2021 14:19:14 +0200
Subject: [PATCH 07/13] Prefix signature of tarball in release with cryptomator

To apply convention of the other release assets
---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0539bec21..21ef6aca2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,11 +76,11 @@ jobs:
           name: buildkit-win.zip
           path: .
       - name: Create tarball
-        run: git archive --prefix="cryptomator-${{ github.ref }}/" -o ${{ github.ref }}.tar.gz ${{ github.ref }}
+        run: git archive --prefix="cryptomator-${{ github.ref }}/" -o "cryptomator-${{ github.ref }}.tar.gz" ${{ github.ref }}
       - name: Sign tarball with key 615D449FE6E6A235
         run: |
           echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
-          echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a ${{ github.ref }}.tar.gz
+          echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a "cryptomator-${{ github.ref }}.tar.gz"
         env:
           GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
           GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
@@ -144,6 +144,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ github.ref }}.tar.gz.asc
-          asset_name: ${{ github.ref }}.tar.gz.asc
+          asset_path: "cryptomator-${{ github.ref }}.tar.gz.asc"
+          asset_name: "cryptomator-${{ github.ref }}.tar.gz.asc"
           asset_content_type: application/octet-stream

From f2fadafa6629f075fad535a1b434b7683a3273f2 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Wed, 16 Jun 2021 16:10:28 +0200
Subject: [PATCH 08/13] Fix snyk.io badge in README due to switch to single
 maven module

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad821780e..bcff4c978 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![cryptomator](cryptomator.png)](https://cryptomator.org/)
 
 [![Build](https://github.com/cryptomator/cryptomator/workflows/Build/badge.svg)](https://github.com/cryptomator/cryptomator/actions?query=workflow%3ABuild)
-[![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/cryptomator/badge.svg?targetFile=main%2Fpom.xml)](https://snyk.io/test/github/cryptomator/cryptomator?targetFile=main%2Fpom.xml)
+[![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/cryptomator/badge.svg)](https://snyk.io/test/github/cryptomator/cryptomator)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/2a0adf3cec6a4143b91035d3924178f1)](https://www.codacy.com/gh/cryptomator/cryptomator/dashboard)
 [![Twitter](https://img.shields.io/badge/twitter-@Cryptomator-blue.svg?style=flat)](http://twitter.com/Cryptomator)
 [![Crowdin](https://badges.crowdin.net/cryptomator/localized.svg)](https://translate.cryptomator.org/)

From 903f55a24f9685bcd6e784ae7fe3ccacea4cca0c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 22 Jun 2021 17:15:37 +0200
Subject: [PATCH 09/13] improve health check gui: * convert milliseconds to
 hours, minutes and seconds * spelling * adjust to dark theme

---
 .../ui/health/CheckDetailController.java      | 35 ++++++++---
 .../cryptomator/ui/health/CheckListCell.java  | 61 +++++++++++++++++--
 .../ui/health/CheckListController.java        | 14 +----
 src/main/resources/i18n/strings.properties    |  7 ++-
 4 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 281e404cc..68a74c4a0 100644
--- a/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -15,6 +15,8 @@ import javafx.collections.FXCollections;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
+import java.time.Duration;
+import java.util.ResourceBundle;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -24,8 +26,7 @@ public class CheckDetailController implements FxController {
 	private final EasyObservableList<DiagnosticResult> results;
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
-	private final Binding<Number> taskDuration;
-	private final ResultListCellFactory resultListCellFactory;
+	private final Binding<String> taskDuration;
 	private final Binding<Boolean> taskRunning;
 	private final Binding<Boolean> taskScheduled;
 	private final Binding<Boolean> taskFinished;
@@ -35,17 +36,20 @@ public class CheckDetailController implements FxController {
 	private final Binding<Boolean> taskCancelled;
 	private final Binding<Number> countOfWarnSeverity;
 	private final Binding<Number> countOfCritSeverity;
+	private final ResultListCellFactory resultListCellFactory;
+	private final ResourceBundle resourceBundle;
 
 	public ListView<DiagnosticResult> resultsListView;
 	private Subscription resultSubscription;
 
 	@Inject
-	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask, ResultListCellFactory resultListCellFactory) {
+	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask, ResultListCellFactory resultListCellFactory, ResourceBundle resourceBundle) {
+		this.resultListCellFactory = resultListCellFactory;
+		this.resourceBundle = resourceBundle;
 		this.results = EasyBind.wrapList(FXCollections.observableArrayList());
 		this.taskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
 		this.taskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
-		this.taskDuration = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::durationInMillisProperty).orElse(-1L);
-		this.resultListCellFactory = resultListCellFactory;
+		this.taskDuration = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::durationInMillisProperty).orElse(-1L).map(this::millisToReadAbleDuration);
 		this.taskRunning = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::runningProperty).orElse(false); //TODO: DOES NOT WORK
 		this.taskScheduled = taskState.map(Worker.State.SCHEDULED::equals).orElse(false);
 		this.taskNotStarted = taskState.map(Worker.State.READY::equals).orElse(false);
@@ -87,11 +91,11 @@ public class CheckDetailController implements FxController {
 		return taskName;
 	}
 
-	public Number getTaskDuration() {
+	public String getTaskDuration() {
 		return taskDuration.getValue();
 	}
 
-	public Binding<Number> taskDurationProperty() {
+	public Binding<String> taskDurationProperty() {
 		return taskDuration;
 	}
 
@@ -167,4 +171,21 @@ public class CheckDetailController implements FxController {
 		return taskCancelled;
 	}
 
+	private String millisToReadAbleDuration(Number millis) {
+		Duration tmp = Duration.ofMillis(millis.longValue());
+		long hours = tmp.toHoursPart();
+		long minutes = tmp.toMinutesPart();
+		long seconds = tmp.toSecondsPart();
+		if (hours != 0) {
+			String hms_format = resourceBundle.getString("health.check.detail.hmsFormat");
+			return String.format(hms_format, hours, minutes, seconds);
+		} else if (minutes != 0) {
+			String ms_format = resourceBundle.getString("health.check.detail.msFormat");
+			return String.format(ms_format, minutes, seconds);
+		} else {
+			String s_format = resourceBundle.getString("health.check.detail.sFormat");
+			return String.format(s_format, seconds);
+		}
+	}
+
 }
diff --git a/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index 78f8b1b33..63d9d8d6b 100644
--- a/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -4,35 +4,81 @@ import org.cryptomator.ui.controls.FontAwesome5Icon;
 import org.cryptomator.ui.controls.FontAwesome5IconView;
 
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
+import javafx.util.Callback;
 
 class CheckListCell extends ListCell<HealthCheckTask> {
 
 	private final FontAwesome5IconView stateIcon = new FontAwesome5IconView();
+	private final Callback<HealthCheckTask, BooleanProperty> selectedGetter;
+	private final ObjectProperty<State> stateProperty;
 
-	CheckListCell() {
+	private CheckBox checkBox = new CheckBox();
+	private BooleanProperty selectedProperty;
+
+	CheckListCell(Callback<HealthCheckTask, BooleanProperty> selectedGetter, ObservableValue<Boolean> switchIndicator) {
+		this.selectedGetter = selectedGetter;
+		this.stateProperty = new SimpleObjectProperty<>(State.SELECTION);
+		switchIndicator.addListener(this::changeState);
 		setPadding(new Insets(6));
 		setAlignment(Pos.CENTER_LEFT);
 		setContentDisplay(ContentDisplay.LEFT);
+		getStyleClass().add("label");
+	}
+
+	private void changeState(ObservableValue<? extends Boolean> observableValue, boolean oldValue, boolean newValue) {
+		if (newValue) {
+			stateProperty.set(State.RUN);
+		} else {
+			stateProperty.set(State.SELECTION);
+		}
 	}
 
 	@Override
 	protected void updateItem(HealthCheckTask item, boolean empty) {
 		super.updateItem(item, empty);
-
 		if (item != null) {
-			textProperty().bind(item.titleProperty());
+			setText(item.getTitle());
+		}
+		switch (stateProperty.get()) {
+			case SELECTION -> updateItemSelection(item, empty);
+			case RUN -> updateItemRun(item, empty);
+		}
+	}
+
+	private void updateItemSelection(HealthCheckTask item, boolean empty) {
+		if (!empty) {
+			setGraphic(checkBox);
+
+			if (selectedProperty != null) {
+				checkBox.selectedProperty().unbindBidirectional(selectedProperty);
+			}
+			selectedProperty = selectedGetter.call(item);
+			if (selectedProperty != null) {
+				checkBox.selectedProperty().bindBidirectional(selectedProperty);
+			}
+		} else {
+			setGraphic(null);
+			setText(null);
+		}
+	}
+
+	private void updateItemRun(HealthCheckTask item, boolean empty) {
+		if (item != null) {
 			item.stateProperty().addListener(this::stateChanged);
-			graphicProperty().bind(Bindings.createObjectBinding(() -> graphicForState(item.getState()),item.stateProperty()));
+			graphicProperty().bind(Bindings.createObjectBinding(() -> graphicForState(item.getState()), item.stateProperty()));
 			stateIcon.setGlyph(glyphForState(item.getState()));
 		} else {
-			textProperty().unbind();
 			graphicProperty().unbind();
 			setGraphic(null);
 			setText(null);
@@ -61,4 +107,9 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 			case SUCCEEDED -> FontAwesome5Icon.CHECK;
 		};
 	}
+
+	private enum State {
+		SELECTION,
+		RUN;
+	}
 }
diff --git a/src/main/java/org/cryptomator/ui/health/CheckListController.java b/src/main/java/org/cryptomator/ui/health/CheckListController.java
index ccb41d56b..f72aa8481 100644
--- a/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -84,17 +84,7 @@ public class CheckListController implements FxController {
 	@FXML
 	public void initialize() {
 		checksListView.setItems(tasks);
-		checksListView.setCellFactory(CheckBoxListCell.forListView(listPickIndicators::get, new StringConverter<HealthCheckTask>() {
-			@Override
-			public String toString(HealthCheckTask object) {
-				return object.getTitle();
-			}
-
-			@Override
-			public HealthCheckTask fromString(String string) {
-				return null;
-			}
-		}));
+		checksListView.setCellFactory(view -> new CheckListCell(listPickIndicators::get, showResultScreen));
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
 	}
 
@@ -115,7 +105,7 @@ public class CheckListController implements FxController {
 		runningTask.set(batchService);
 		showResultScreen.set(true);
 		checksListView.getSelectionModel().select(batch.get(0));
-		checksListView.setCellFactory(view -> new CheckListCell());
+		checksListView.refresh();
 		window.sizeToScene();
 	}
 
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index f0f550769..23e86c55a 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -153,19 +153,22 @@ health.start.configValid=Reading and parsing vault configuration file was succes
 health.start.configInvalid=Error while reading and parsing the vault configuration file.
 health.checkList.header=Available Health Checks
 health.checkList.selectAllBox=Select All
-health.check.runBatchBtn=Run selected Checks
+health.check.runBatchBtn=Run Selected Checks
 ## Detail view
 health.check.detail.noSelectedCheck=For results select a finished health check in the left list.
 health.check.detail.header=Results of %s
 health.check.detail.taskNotStarted=The check was not selected to run.
 health.check.detail.taskScheduled=The check is scheduled.
 health.check.detail.taskRunning=The check is currently running…
-health.check.detail.taskSucceeded=The check finished successfully after %d milliseconds.
+health.check.detail.taskSucceeded=The check finished successfully after %s.
 health.check.detail.taskFailed=The check exited due to an error.
 health.check.detail.taskCancelled=The check was cancelled.
 health.check.detail.problemCount=Found %d problems and %d unfixable errors.
 health.check.exportBtn=Export Report
 health.check.fixBtn=Fix
+health.check.detail.hmsFormat= %d hours, %2d minutes and %2d seconds
+health.check.detail.msFormat= %d minutes and %2d seconds
+health.check.detail.sFormat= %d seconds
 ## Checks
 health.org.cryptomator.cryptofs.health.dirid.DirIdCheck=Directory Check
 

From 135b61070dbda04eb64c755acefd09f3a05daf44 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 23 Jun 2021 22:48:18 +0200
Subject: [PATCH 10/13] Fixed misspelled key

---
 src/main/resources/fxml/vault_options_masterkey.fxml | 2 +-
 src/main/resources/i18n/strings.properties           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/fxml/vault_options_masterkey.fxml b/src/main/resources/fxml/vault_options_masterkey.fxml
index a8ba03f8f..ad7097924 100644
--- a/src/main/resources/fxml/vault_options_masterkey.fxml
+++ b/src/main/resources/fxml/vault_options_masterkey.fxml
@@ -29,7 +29,7 @@
 			</Button>
 		</VBox>
 		<Region VBox.vgrow="ALWAYS"/>
-		<Label maxWidth="-Infinity" text="%vaultOptions.masterkey.recoveryKeyExpanation" wrapText="true"/>
+		<Label maxWidth="-Infinity" text="%vaultOptions.masterkey.recoveryKeyExplanation" wrapText="true"/>
 		<VBox spacing="6" alignment="CENTER">
 			<Button text="%vaultOptions.masterkey.showRecoveryKeyBtn" onAction="#showRecoveryKey" contentDisplay="LEFT" maxWidth="Infinity">
 				<graphic>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 692423e8f..d1a49efa8 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -322,7 +322,7 @@ vaultOptions.mount.mountPoint.directoryPickerTitle=Pick an empty directory
 vaultOptions.masterkey=Password
 vaultOptions.masterkey.changePasswordBtn=Change Password
 vaultOptions.masterkey.forgetSavedPasswordBtn=Forget Saved Password
-vaultOptions.masterkey.recoveryKeyExpanation=A recovery key is your only means to restore access to a vault if you lose your password.
+vaultOptions.masterkey.recoveryKeyExplanation=A recovery key is your only means to restore access to a vault if you lose your password.
 vaultOptions.masterkey.showRecoveryKeyBtn=Display Recovery Key
 vaultOptions.masterkey.recoverPasswordBtn=Recover Password
 ## Auto Lock

From b4a97803ff775edda85071729eb856785126f810 Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Thu, 24 Jun 2021 10:58:47 +0300
Subject: [PATCH 11/13] [Snyk] Security upgrade
 org.cryptomator:webdav-nio-adapter from 1.2.2 to 1.2.3 (#1698)

* fix: pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1313686

* adjusted suppression config

* bump webdav version

Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
---
 pom.xml         |  2 +-
 suppression.xml | 41 ++++++++---------------------------------
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61bae548b..b0dde763a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 		<cryptomator.integrations.linux.version>1.0.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.3.1</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.3.1</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.2.2</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.2.4</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
 		<javafx.version>16</javafx.version>
diff --git a/suppression.xml b/suppression.xml
index a5fa9d766..c747f92a7 100644
--- a/suppression.xml
+++ b/suppression.xml
@@ -14,40 +14,15 @@
 
 	<!-- Jetty false positives below -->
 	<suppress>
-		<notes><![CDATA[ Affects jetty < 6.1.22 ]]></notes>
-		<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
-		<cve>CVE-2009-5045</cve>
-	</suppress>
-	<suppress>
-		<notes><![CDATA[ Affects jetty < 6.1.22 ]]></notes>
-		<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
-		<cve>CVE-2009-5046</cve>
-	</suppress>
+		<notes><![CDATA[
+		Suppress all for this javax.servlet api package:
+		There are lots of false positives, simply because its version number is way beyond the remaining
+		org.eclipse.jetty jar files. Note, that our actual Jetty version is different.
 
-	<suppress>
-		<notes><![CDATA[ Affects jetty-server 9.x ]]></notes>
+		As long as we don't suppress anything in org.eclipse.jetty:jetty-server or :jetty-servlet,
+		vulnerabilities will still trigger if we actually use an outdated Jetty version.
+		]]></notes>
 		<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
-		<cve>CVE-2017-9735</cve>
-	</suppress>
-	<suppress>
-		<notes><![CDATA[ Affects jetty-server 9.x ]]></notes>
-		<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
-		<cve>CVE-2017-7656</cve>
-	</suppress>
-	<suppress>
-		<notes><![CDATA[ Affects jetty-server 9.x ]]></notes>
-		<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
-		<cve>CVE-2017-7657</cve>
-	</suppress>
-	<suppress>
-		<notes><![CDATA[ Affects jetty-server 9.x ]]></notes>
-		<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
-		<cve>CVE-2017-7658</cve>
-	</suppress>
-
-	<suppress>
-		<notes><![CDATA[ Fixed since jetty-server 10.0.0.beta2 ]]></notes>
-		<gav>org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6</gav>
-		<cve>CVE-2020-27216</cve>
+		<cpe regex="true">.*</cpe>
 	</suppress>
 </suppressions>
\ No newline at end of file

From f1b40e32a7a4cf321a8715643982a4466264ca5b Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sat, 26 Jun 2021 17:25:00 +0200
Subject: [PATCH 12/13] dependency update

---
 pom.xml                                    |  2 +-
 src/main/resources/license/THIRD-PARTY.txt | 30 ++++++++++------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0dde763a..98542948a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 		<project.jdk.version>16</project.jdk.version>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.1.0-beta6</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.1.0-beta7</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.0.0-rc1</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
diff --git a/src/main/resources/license/THIRD-PARTY.txt b/src/main/resources/license/THIRD-PARTY.txt
index 4c7ff5c1c..e756db0eb 100644
--- a/src/main/resources/license/THIRD-PARTY.txt
+++ b/src/main/resources/license/THIRD-PARTY.txt
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see http://www.gnu.org/licenses/.
 
-Cryptomator uses 47 third-party dependencies under the following licenses:
+Cryptomator uses 45 third-party dependencies under the following licenses:
         Apache License v2.0:
 			- jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi)
 			- jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm)
@@ -32,14 +32,12 @@ Cryptomator uses 47 third-party dependencies under the following licenses:
 			- Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - https://commons.apache.org/proper/commons-lang/)
 			- Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.14 - http://hc.apache.org/httpcomponents-core-ga)
 			- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.5 - http://jackrabbit.apache.org/jackrabbit-webdav/)
-			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.2 - https://eclipse.org/jetty/jetty-http)
-			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.2 - https://eclipse.org/jetty/jetty-io)
-			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.2 - https://eclipse.org/jetty/jetty-security)
-			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.2 - https://eclipse.org/jetty/jetty-server)
-			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.2 - https://eclipse.org/jetty/jetty-servlet)
-			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.2 - https://eclipse.org/jetty/jetty-util)
-			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:10.0.2 - https://eclipse.org/jetty/jetty-webapp)
-			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:10.0.2 - https://eclipse.org/jetty/jetty-xml)
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.3 - https://eclipse.org/jetty/jetty-http)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.3 - https://eclipse.org/jetty/jetty-io)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.3 - https://eclipse.org/jetty/jetty-security)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.3 - https://eclipse.org/jetty/jetty-server)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.3 - https://eclipse.org/jetty/jetty-servlet)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.3 - https://eclipse.org/jetty/jetty-util)
 			- Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api)
         BSD:
 			- asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/)
@@ -50,14 +48,12 @@ Cryptomator uses 47 third-party dependencies under the following licenses:
         Eclipse Public License - Version 1.0:
 			- Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api)
         Eclipse Public License - Version 2.0:
-			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.2 - https://eclipse.org/jetty/jetty-http)
-			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.2 - https://eclipse.org/jetty/jetty-io)
-			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.2 - https://eclipse.org/jetty/jetty-security)
-			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.2 - https://eclipse.org/jetty/jetty-server)
-			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.2 - https://eclipse.org/jetty/jetty-servlet)
-			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.2 - https://eclipse.org/jetty/jetty-util)
-			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:10.0.2 - https://eclipse.org/jetty/jetty-webapp)
-			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:10.0.2 - https://eclipse.org/jetty/jetty-xml)
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.3 - https://eclipse.org/jetty/jetty-http)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.3 - https://eclipse.org/jetty/jetty-io)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.3 - https://eclipse.org/jetty/jetty-security)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.3 - https://eclipse.org/jetty/jetty-server)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.3 - https://eclipse.org/jetty/jetty-servlet)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.3 - https://eclipse.org/jetty/jetty-util)
         Eclipse Public License - v 1.0:
 			- Logback Classic Module (ch.qos.logback:logback-classic:1.2.3 - http://logback.qos.ch/logback-classic)
 			- Logback Core Module (ch.qos.logback:logback-core:1.2.3 - http://logback.qos.ch/logback-core)

From 46691f057ee0c59de3dbdd5a5f1ec1a285c781ea Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sat, 26 Jun 2021 17:42:40 +0200
Subject: [PATCH 13/13] dependency update

---
 pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98542948a..4673375ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,18 +35,18 @@
 
 		<!-- 3rd party dependencies -->
 		<javafx.version>16</javafx.version>
-		<commons-lang3.version>3.11</commons-lang3.version>
-		<jwt.version>3.15.0</jwt.version>
-		<easybind.version>2.1.0</easybind.version>
+		<commons-lang3.version>3.12.0</commons-lang3.version>
+		<jwt.version>3.17.0</jwt.version>
+		<easybind.version>2.2</easybind.version>
 		<guava.version>30.1.1-jre</guava.version>
-		<dagger.version>2.35.1</dagger.version>
+		<dagger.version>2.37</dagger.version>
 		<gson.version>2.8.6</gson.version>
-		<slf4j.version>1.7.30</slf4j.version>
+		<slf4j.version>1.7.31</slf4j.version>
 		<logback.version>1.2.3</logback.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.7.1</junit.jupiter.version>
-		<mockito.version>3.9.0</mockito.version>
+		<junit.jupiter.version>5.7.2</junit.jupiter.version>
+		<mockito.version>3.11.2</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>
 	</properties>