diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 1bcb1adc3..06c81a72f 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -2,123 +2,25 @@
 
 ## Reporting a Vulnerability
 
-For reporting security-related vulnerabilities or exploits that [haven't been reported yet](https://github.com/cryptomator/android/labels/type%3Asecurity-issue), contact us at: security@cryptomator.org
+We take security seriously at Cryptomator. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
 
-<details>
-<summary>PGP Key</summary>
+To report a security vulnerability, please use the [GitHub Security Advisory feature](https://github.com/cryptomator/android/security/advisories). This feature allows you to privately discuss, fix, and publish information about security vulnerabilities.
 
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: GPGTools - https://gpgtools.org
+If you prefer to report the vulnerability via email, please send an email to security@cryptomator.org.
 
-mQINBFbgeicBEADM9AcU6DTgM5KZnBaJc6x9DBLr+TCMHntTt7YM9GLTlO2Z43Jt
-oYoyqdRWAY28veqpLEFgRvvVD3fdBj/KUOxF1cr2JsErwXqbjwaLq0o/0KIXz7UK
-a6pQSemZKfpOtJrfacofOTwvG6AuG9uakBYNMyxuojyOkoh3xsYS1KZ7TwPgCdET
-t8/zva41Pa5kh5+GeSZJdCuygG6ynPBJEpmK5V7Qizvics5fziXecF+QaFZijafv
-YahfxokvF9pXCQTmV4m57NQma9uK0w83U9nJCPjEd+x3wK0Hxrc1ojy8ZFTA1YND
-AQg/MTABgHbQQkXDQhjS/TloOObqtbMBqNSbcSXpaR4teaCWKBl1MSq00nJLj8db
-vPJGqfg7UbXhlALggp029/kskYlR5SmbxWquLbl0Xre3fDHuHEiWcJL6MS3454Wt
-Mno13/4UhOlRFh5g0pLmPz7seOTJjDqc9abn/RXOLq0+3qX0gC0bDm5aCE5dQ2MV
-FMbrrlw/dZESNLZvtB3gOsramSry1R3HVZ0QJ2vMaF2cxewebqcYbuecUNj6bxpv
-5LEhEmqz6dG1meLLWDsvQLPEUWEIJnfpBiDSm342yxJq4pXnVF+aqAQsCL3FpmvZ
-2j0FgFOs7iXOcFUJIiR0xUmWPk1NWYcUowqmRW8pMM9nFUzFF99iggPznwARAQAB
-tC1DcnlwdG9tYXRvciBTdXBwb3J0IDxzdXBwb3J0QGNyeXB0b21hdG9yLm9yZz6J
-AkAEEwEKACoCGwMFCQcrKAAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAleu2cQC
-GQEACgkQI7Xb75TU2B3+7A/7BKRWdo5/moCCEbBzYQ7vRMLFdwmjFFlSZ7aGC0fP
-YHdeUwxPbO0cATwmNpGMma7rBn1FDg3Vto6/wottGxm+XIRwlyY84CD1VZAihZ/e
-WvjOO28/7VgRy6PGKzlhpDSoT8GwFOgO69e7bEff1Zj562RZe7nXc4tDivILMB++
-KgmmSgtddygmNQCS3RD3KssGo+l+cSjsg09F5WAJ6nQe8Jq2hICq+o/P6UXPI5lX
-bhvWYDn4/8sRHsIlGpQYYDDe0fz7IQKuSLAHpF5upNDxj6dYb05F8PPVrk6MW6nL
-/kf1fZ27DlLN5/NFvhhBRuwxxoAFqPS7Iel3z7L0JkRUYmGLVB5m9Cqiw6FK8JRv
-OtvakdDoKb5lVAoN5NeBfNBSqEcXVF/EdfTfIyyo7hZRA6xFMEVbmYbzt0sj0djV
-ZOey2TOFrTCpkHfUUDgKvk5sn+F3u8mmPIbqquEzlFJSFjcyiYYDv22rg1In+zKV
-Xmw4BFZRDS6IVSQRGlskRGJBixCaGyDYxHXXT2cg4Rk9uiCX11+0E9qlAsg6xPe6
-rnaYDT8dU0AFyVpDpshflXH3kVQSpiqZS3jkAk1/54ODO8pE80Zrnd5m5AMuNcmX
-+9MkZKE+h0882UskDs1dyt26GU2hoy4lAeRUaut7zIK/WO6nnuLaTvGWT95RDz+q
-kD2JAiIEEwEKAAwFAleu2iYFgweGH4AACgkQZnuGbqgkCgnmCA//U22uhyEC/Tp3
-Cbt5lctQmqbgMbjRBaHQyW52tPFMaq8vXMbo/5TTtVC6xsp2PJT84cxAd8KX8hWq
-cPtF4wWCJGng/AzyxQ5dWfGvA/ll32ygjtJN3P/AvA9KlhG+6XYmS8cPkBkJBi6B
-2yCdZT1cXc/TPAFzjgAwz7K9g3awG0OeOc/CXymH0DD/snkiwKQoucStolYywZGc
-GszjMQgeT4zOc1wtEz24uL3dMNDlDcQMAh56YvK2oB0iMYmAFyX/IS+f2bM9paXi
-HX+mg/z53iwgf5ZXbslNDbMTJ5GNksjEGjCFfDHAdNdgT+lcW4l2U7q4PYUaN4LA
-DE9j2OlOlQ9qjucOgoCStirnTP7XHd4p31lgdz8+THOQowB5Ji95OkiNQAFCfxBt
-mcA/bWnJZQDm7L8RVzHovBpAaK6vUjxEvR+DXdESSzyZwkpsZwGZcyqGRT26R1/L
-JE5WvjKufNc5v3Cat320MjyrLZwVGRgvEpDMoCw3nTWl9AtOj5vgaakEWr7AnqET
-xk7UFbYmdTlQqkWuLKubz9Rx/FbrBmvd6vwTHy1Dfl6QyMWNCClatgN00Hxped/6
-CErg+R/RXd8apGxnOuWDqoujPn5LOHzgJolp1Ox16nTiZe2G+LbDr3hqRFi1wW6w
-ioMB4KpkdA03uyxJSWmDEMiR1l3Oxom0KUNyeXB0b21hdG9yIFByZXNzIDxwcmVz
-c0BjcnlwdG9tYXRvci5vcmc+iQI9BBMBCgAnBQJXrtnDAhsDBQkHKygABQsJCAcD
-BRUKCQgLBRYCAwEAAh4BAheAAAoJECO12++U1NgdQYMQAKCIzNJF8rURQcFLSv3J
-sPBjRy2HCzCWm21MuhU+bsaZx7U9M9dgEjzLfxN9s19VsBH3WKLgok2FgiYSGka3
-6Oy/P8VFLFmHs7dS9i2fro2eF7i4zj/ZD/9t0jM4ZIgLpbzr5sTBld292nsfXGob
-xOJeOx3oWYyR2FO9VQxXjC3JvJyZkFgoy0tauS4Mvii4cF56wJGcxDTbe1s7UaRC
-a/fh4zgISZSBE3rYhCawkN4mqMDM5RDjrdtjKUPWk345HcjjQ4Wos8xw4YbGbNr9
-Pc7m2URYJJ0jFM4tnoRF6cmA3bT9tm8pcOFg+K/ycVrltVEy+A8Wj8UGjyP1uI1t
-EqWHN3LZpIGfW0w9AGrw7OUI9czXcukfngj/DsOU3WMBDIM8pW9+zBpr75yIS6lz
-C0IqksLXSqX0b/Rby4O+wb6UZ1ZFkaim2GGtAZV+nGXtdnEXSNFiP7ykzjZ02m/1
-7CKyj3VmdAgT56zEIypFSfxm9gOWsJPmfhSyuE8bFyoitgNxpheZk6xZy4upVMPR
-WK3hutScU0yDv2HVCiA3o3Ggy42nmz9HpGF6W2DmBx4bhMaVs6I2VFyKdQzmJD/3
-FCWjwz8PiEgVGHGPnD+WdPFLhrc/44gF4h/VuLjkubtULGuTVvgjeTIJ5LR1Gmwc
-YOk6eD7MAJPzJVj5/PYFtIbKiQIiBBMBCgAMBQJXrtonBYMHhh+AAAoJEGZ7hm6o
-JAoJBh4P/1w88YMTKUHpFTfJEwH2hK36BZN96Bf/k+vP7n1Xxp3NheInJblHFOt/
-ccsup6am+APrk8gGtlIVmtVc3nO8WMsWxfJxGDecyRsNbessnODv/llyg3tzVU/H
-tLk7gLiK0TcIsOLfeNXGTxRRSKWjVFsNfuixNCzzHa7tFq6ddVn9VRZ8fqJB2p21
-OogWSDqUo9q9Wfb4RkYHguDx+8Jzoo/MxR1TSt8gUO2xDvEbqgeQiMCLF8R0lO3Y
-zz0FrpyOsFU1CxVp+wo55bWv1UdwgQKQt4o0m5/zDJ2RAtscXpd4YcTE+XxKeK+4
-qhihhkhLGpKsxzK5m9/qwMbodHwoBCBzfalkUR9xOq9yQIeEoC8XYL62NqB3BCSU
-KfWFIHxUkE9WH5zHWaV+bhrlNgk7nz3xBfPf1P2mNIc1VUHoNqOZOmWwz2VaKLSW
-f3GIqx9wGythFbLdXmUoC3W//DDYgQnvImvkncMqQ5nRHPf8uHcLQK5WZyIxpgWT
-eKon5G/cj0BTptcBhapMwSIyfaC5FV7so0/CkOA6R9Fyq2VpGoHy7XPhFS+6ieLi
-KUWhCvbuf2deWbSaJ0peMdzy1p72UXwrsEM0M3Fz+Jd8zvCaFzf5Fx27+pAAdlfg
-4bT3/2gSf7S+cU3+DnYOH0NeRt2Z2mjEKg9OwttTO/oDboQHdZlrtDRDcnlwdG9t
-YXRvciBTZWN1cml0eS1UZWFtIDxzZWN1cml0eUBjcnlwdG9tYXRvci5vcmc+iQI9
-BBMBCgAnBQJXrtnWAhsDBQkHKygABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ
-ECO12++U1NgddzoQAI78+Nvm6VvNuptXJjEmrpHRyKCnHF9wH5kxvF8WZCgpOkJ4
-vONmyS+9ZlepnT83MpGm/MzdIMCnDJmDmqmA5ISBRcD7k9Gjzz5rPKwE2zDyo0M0
-wF1L2UEUqAlcvE0e4twZcP2DGoNqdSf6IaWsXhQMb1a/rTMsoGZLuTB8kCbv6Ntl
-ULahcRToTB2shsbZjzE896P6X5hDCfGWl0Jhcbf53pnXX1dOsEw3et9AGru1IUMs
-UGM+wpgTwagRj+XB/WY1x9IznKtiHTq83Fvt+3bkg0+NIcV3GDqXDIUtqIwy8gDd
-4KgBU+LkyxXFDa4OxLc53n6b+Iy1nDosM+SiqSzdCCgEs/dY1tQBn/7P1GT18dEe
-tFgeH/c6wLvEpDIc9urAsYXf8H+1uy7glWpWTq8DE0yhCr4adjCqlIsVHQQO4UUW
-NfqMGEFpJ+3HjSSwnvDGY78lLQh5d4vqWV435aNaMqZg0gJIA0FtiP1fRtmT73BG
-N/tBNiBxretFR4B+x/TWqPd5iJV7/MAn/pa1WSOcaxzJrVUsjXdgLQCqcHWd4/w1
-f4DU9cJjl3sxZlMdAlg8Q1bF+pmjQQ4WKZkqMtwpoUilfVXmL42ay1LBCgW68/uJ
-OTyGfp8ntUsbbm5raGsny3TLqnacyG9hxcPGNTzD1+MrbUvfsc7+4U0dCZTuiQIi
-BBMBCgAMBQJXrtonBYMHhh+AAAoJEGZ7hm6oJAoJ1DQP/R+1drZiZQU45ChMbfTb
-XQjJRsUOGZp3PTWtx4KrVFvE8ea0PF+DZX5gLJYIU+iZmPXRpzFu6dKPbcZ7RfRt
-5RRH102zDZzijt2CQd7YLO8wxUFoWX9X7DGgxXEcNjl9kFVmnyHgiTwTzuZ0Zy4y
-PvoiwrhcZmXEYbOeV40gLFie6wuzz5IIcs01e30xIs+1/1gwmgI5UnG3jveUgmcj
-f/lvg3POKiwrY5Uzw1FSruJx21X06wTpDcfOACID4L7aY9eg2B/qL2Xj8nuhejqG
-+1AVTMk2o6pxkvevHmxYQfEpuWGCw0RCBn9ObWwz6Zn5J9pjGbMrM+b1/M2Ouv3N
-cpoGgCSahKNsRMKO7RMrBG0jtLcasPSgZFYPJSZAAb+YhxKUbpPHzDIwTEjgM7CL
-gKSyRTKyp5IoFK53bpXL/ZIjkAhMvyDult6+BL6vI0+h3BBA9I0FF2Qhe139xLv/
-DS7aDiYAE9vGMGoeCBfxJPwUsDU3hrGe/wgL7fR6nmN7R2QffisBHKHsklORy9t3
-w3YFRd5sBAxv+EOcdkgXEmqKOfVQ8KU9adQcxPDGMAK/esjVwxUxsaf2PF5noxxW
-3zL2ureUO/mMoH5Cwr0BuM3HFb82t1JJd4IXlLEyNvDMFMwD2d7h37bGK7Y5hEsl
-zL7Dm+wQRY8sxg4QOZHbJjQXuQINBFbgeicBEADnkxGSEL1zwACaiVqADKC6/pgO
-MMWjxoENBT6r8Vnp1D5hfNDkEi9iXUpCEO6nzywBf3/4c4Yk1wBOBZ7YWyWXMf4v
-2g1evxELO5z1UlAwna6HSl7G0omIBqzz1Er5IS7C9WEZM8ZggwcuswCrbxfz4+fN
-t7cCL5QyOvuxez+vrn+VIgLQzKm+LV4Wc+OFbHIys+0saQUhItKO0/CsXGc8R314
-jdN5UsZk/MUdPPAs+6OCr8d3PpJvR6IST76TtN8aDjSS9T6em7dwdGFEwCGww3Jc
-xrAkvvUmSlscz+rnvHA5DYQGK6NXLenB40sVQVfch1r1VqwvlzA0u7OovjwM8+7u
-+DaBQ0YejbdnC7yfeE91LmZkG6jRKfvTJkv18tjNsgZsVmM13xzP67fCFIB9M+lN
-t9zEldGKHVwm+06FHIWJsBDRgrquNb9xd1vgHHeIbJvKf+LqZhVrbKVEneG34Km+
-ndtb+mvcGc0fOoMU9lYrFaxAWl8oU9BchC9IyjcPZB445R+AhfTuoHSUViSCo6IO
-TG0hQsJuNoKmDAU8l5sTsiFXuXBOo1wK8gTkRnhZHduZrZIjJXvT7efz1knLQ6eG
-prZHf4CtbgHyAe2XZabetWtCsFcPbOjC7ezNK57UvVH98h2GkckxOM00BESMCTee
-kYy7uG0v0rrajzHY1wARAQABiQIlBBgBCgAPBQJW4HonAhsMBQkHKygAAAoJECO1
-2++U1NgdyAsQAKZUVA6pY225BASkeNiW31L7K4VeRYpAdFkiRex2zQFtj9Vovfi1
-JeTs0fRm35dUsQraf1bkhsjEdPVZ3gD324/baauFO04KX+soyQvK/tUq8KO+5ALt
-Ul5aAljuSwxfJWFpApv+Mbf7gOjm+77jirs7pgG/gCow/mkRlmKTwAmn2DXjkckC
-2EH0mqmh5pdoNWKO7WeTFFbUmESsPcnB2FwTpEjHFvgHll+rmKpXZTgFYN4dDhhm
-HsL/SCf/Nw+YIsuvErQ9TJVdJDLG8ZYatruk7dZZMPtFxvxM1Q36gDIpPEOKPkvm
-dMXg6jHaIdYIaoMpzXFaXsQMdRuMtzbcA+CdwXVY55qGLtfmM/QuEiIJdDeeh7iB
-+VAMyEFOOpi8IFhixaeMoZAmrKDqOkzPcMJVklLYq8N+b9p5JszYNwZEbpyWCACM
-6K+iJzlWzW/OPZttGLJBgYuSYIJIuG80Cx5m5m1e5RAgQ1iT8nbfrS+gYttwP48J
-V7SXQg7QugxG9l1vlK4VjnXiOFulJ7V0e/VyUBpJp3qHcCxFq3RnxVwlIqKZh+jm
-Q1bk0H0Xodd27nQITfDP5ullByGW2Jrjs6SsXeR3jl9+t0XQfInU1L9d/wSOkMjL
-9IMUt06lV4vB/WP2xioqLZiZ4eAi0E+lWkFxjZsgNs2xbOAYRThMB8a5
-=W1Ri
------END PGP PUBLIC KEY BLOCK-----
-```
-</details>
+PGP key fingerprint: `3647 9903 B23A E0A5 9359  9A3E 23B5 DBEF 94D4 D81D` ([public key](https://gist.github.com/cryptobot/864300b6b44ae2d2a15abedfe14bd040))
+
+## Expectations
+
+When reporting a vulnerability, please provide us with a detailed report that includes:
+
+- A description of the vulnerability
+- Steps to reproduce the vulnerability
+- Possible impact of the vulnerability
+- Any additional information that may be helpful
+
+We ask that you do not publicly disclose the vulnerability until we have had a chance to address it.
+
+## Thank You
+
+We appreciate your help in keeping Cryptomator for Android secure. Thank you for your contributions to the security of our project.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9ac4f6d0e..a3fbc47e3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,6 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build and Test
         run: bash ./gradlew clean test --stacktrace
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4f05b3345..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "subsampling-scale-image-view"]
-	path = lib/subsampling-scale-image-view
-	url = https://github.com/SailReal/subsampling-scale-image-view.git
-[submodule "pcloud-sdk-java"]
-	path = lib/pcloud-sdk-java
-	url = https://github.com/SailReal/pcloud-sdk-java.git
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 1ed39b2bf..7928f60d5 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -11,6 +11,40 @@
       <value />
     </option>
     <option name="RIGHT_MARGIN" value="220" />
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value />
@@ -26,9 +60,9 @@
           <package name="java" alias="false" withSubpackages="true" />
           <package name="javax" alias="false" withSubpackages="true" />
           <package name="" alias="false" withSubpackages="true" />
-          <package name="" alias="false" withSubpackages="true" />
         </value>
       </option>
+      <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="999" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="999" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -186,4 +220,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index a51d7b336..35eb1ddfb 100755
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/lib/pcloud-sdk-java" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/lib/subsampling-scale-image-view" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e1f019d2..2a50fd372 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,46 +1,48 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    apktools (0.7.4)
+    apktools (0.7.5)
       rubyzip (~> 2.0)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.723.0)
-    aws-sdk-core (3.170.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.933.0)
+    aws-sdk-core (3.196.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.82.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.1)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.151.0)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    bcrypt_pbkdf (1.1.0)
+    base64 (0.2.0)
+    bcrypt_pbkdf (1.1.1)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     ed25519 (1.3.0)
     emoji_regex (3.2.3)
-    excon (0.99.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -69,15 +71,15 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.212.1)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -89,35 +91,37 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-aws_s3 (2.1.0)
       apktools (~> 0.7)
       aws-sdk-s3 (~> 1)
       mime-types (~> 3.3)
     fastlane-plugin-get_version_name (0.2.2)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.35.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -125,31 +129,29 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.3.0)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -158,37 +160,39 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
-    mime-types (3.4.1)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2024.0507)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     naturally (2.2.1)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-ssh (7.0.1)
-    optparse (0.1.1)
+    net-ssh (7.2.3)
+    nkf (0.2.0)
+    optparse (0.5.0)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.1)
-    rake (13.0.6)
+    plist (3.7.1)
+    public_suffix (5.0.5)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.17.0)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -196,22 +200,19 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unicode-display_width (2.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/README.md b/README.md
index 381afc26d..79ec1d958 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,12 @@ Cryptomator for Android is currently available in the following  distribution ch
 ### Dependencies
 
 * Git
-* JDK 11
+* JDK 17
 * Gradle
 
 ### Run Git and Gradle
 
 ```
-git submodule init && git submodule update // (not necessary if cloned using --recurse-submodules)
 ./gradlew assembleApkstoreDebug
 ```
 
@@ -42,7 +41,7 @@ Before connecting to Google Drive you have to create a new project in [Google Cl
 
 Use the Docker image to verify the build of the 'lite' flavor:
 
-1. Clone this repository (don't forget `--recurse-submodules`)
+1. Clone this repository
 2. Checkout the tag you want to build, e.g. 1.8.0
 3. Build the image using `docker build -t cryptomator-android .` in the `buildsystem/` directory
 4. Build Cryptomator using `docker run --rm -u $(id -u):$(id -g) -v $(pwd):/project -w /project cryptomator-android ./gradlew clean assembleLiteRelease` in the root of this folder
diff --git a/build.gradle b/build.gradle
index d39cb8ff3..49bb42fa2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,14 @@
 apply from: 'buildsystem/dependencies.gradle'
-apply plugin: "com.vanniktech.android.junit.jacoco"
 
 buildscript {
-	ext.kotlin_version = '1.7.20'
+	ext.kotlin_version = '1.9.24'
 	repositories {
 		mavenCentral()
 		google()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:7.4.2'
-		classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
-		classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
+		classpath 'com.android.tools.build:gradle:8.4.1'
+		classpath 'org.greenrobot:greendao-gradle-plugin:3.3.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 		classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1"
 	}
@@ -38,8 +36,8 @@ def getVersionCode = { ->
 allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
-		androidVersionCode = 2824 // must be getVersionCode(). only at release tag set the actual value
-		androidVersionName = '1.10.0'
+		androidVersionCode = 2897 // must be getVersionCode(). only at release tag set the actual value
+		androidVersionName = '1.10.1'
 	}
 	repositories {
 		mavenCentral()
@@ -53,3 +51,20 @@ allprojects {
 task clean(type: Delete) {
 	delete rootProject.buildDir
 }
+
+def getApiKey(key) {
+	return !liteFlavor() ? System.getenv().getOrDefault(key, getApiKeyLocal(key)) : ""
+}
+
+def liteFlavor() {
+	gradle.startParameter.taskNames.stream().filter(t -> t.toLowerCase().contains("lite")).findAny().isPresent()
+}
+
+def getApiKeyLocal(key) {
+	if (!rootProject.file("local.properties").exists()) {
+		return ""
+	}
+	def localPropertyList = new Properties()
+	localPropertyList.load(new FileInputStream(rootProject.file("local.properties")))
+	return localPropertyList.getOrDefault(key, "")
+}
diff --git a/buildsystem/Dockerfile b/buildsystem/Dockerfile
index 9c1b1bf0a..41aad9c18 100644
--- a/buildsystem/Dockerfile
+++ b/buildsystem/Dockerfile
@@ -19,9 +19,9 @@ RUN apt-get update -y && apt-get install -y apt-utils wget git unzip
 RUN apt-get update -y && apt-get install -y $(cat docker/dependencies.txt)
 RUN docker/print-versions.sh docker/dependencies.txt
 
-ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-9477386_latest.zip
-ENV ANDROID_API_LEVELS                  android-33
-ENV ANDROID_BUILD_TOOLS_VERSION         33.0.2
+ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip
+ENV ANDROID_API_LEVELS                  android-34
+ENV ANDROID_BUILD_TOOLS_VERSION         34.0.0
 
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV PATH         ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin
@@ -35,6 +35,6 @@ RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
 RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
 
 RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
-RUN update-java-alternatives -s java-1.11.0-openjdk-amd64
+RUN update-java-alternatives -s java-1.17.0-openjdk-amd64
 
 RUN rm -rf ${ANDROID_HOME}/tools
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
index fe2662a7f..387a69409 100644
--- a/buildsystem/dependencies.gradle
+++ b/buildsystem/dependencies.gradle
@@ -1,7 +1,25 @@
+Action<InclusiveRepositoryContentDescriptor> jitpackFilterConfigurationAction = { filter ->
+	filter.includeModule('com.github.solkin', 'disk-lru-cache')
+	filter.includeModule('com.github.cryptomator', 'subsampling-scale-image-view')
+	filter.includeModule('com.github.cryptomator.pcloud-sdk-java', 'java-core')
+	filter.includeModule('com.github.cryptomator.google-http-java-client', 'google-http-client-parent') //Required by com.github.cryptomator.google-http-java-client:*
+	filter.includeModule('com.github.cryptomator.google-http-java-client', 'google-http-client')
+	filter.includeModule('com.github.cryptomator.google-http-java-client', 'google-http-client-android')
+}
+
 allprojects {
 	repositories {
 		mavenCentral()
-		maven { url 'https://jitpack.io' }
+		exclusiveContent {
+			forRepository {
+				maven {
+					url 'https://jitpack.io'
+					//Apparently this filter is already applied implicitly, but it's not documented...
+					content(jitpackFilterConfigurationAction)
+				}
+			}
+			filter(jitpackFilterConfigurationAction)
+		}
 		// needed for 'com.microsoft.device.display' required by 'com.microsoft.graph:microsoft-graph'
 		exclusiveContent {
 			forRepository {
@@ -19,10 +37,10 @@ allprojects {
 }
 
 ext {
-	androidBuildToolsVersion = "33.0.2"
+	androidBuildToolsVersion = "34.0.0"
 	androidMinSdkVersion = 26
-	androidTargetSdkVersion = 33
-	androidCompileSdkVersion = 33
+	androidTargetSdkVersion = 34
+	androidCompileSdkVersion = 34
 
 	// android and java libs
 	androidVersion = '4.1.1.4'
@@ -42,20 +60,20 @@ ext {
 	rxAndroidVersion = '2.1.1'
 	rxBindingVersion = '2.2.0'
 
-	daggerVersion = '2.45'
+	daggerVersion = '2.51.1'
 
-	gsonVersion = '2.10.1'
+	gsonVersion = '2.11.0'
 
-	okHttpVersion = '4.10.0'
-	okHttpDigestVersion = '3.0'
+	okHttpVersion = '4.12.0'
+	okHttpDigestVersion = '3.1.0'
 
 	velocityVersion = '2.3'
 
 	timberVersion = '5.0.1'
 
-	zxcvbnVersion = '1.7.0'
+	zxcvbnVersion = '1.9.0'
 
-	scaleImageViewVersion = '3.10.0'
+	scaleImageViewVersion = '3.10.1-dev.0002'
 
 	lruFileCacheVersion = '1.2'
 
@@ -65,33 +83,30 @@ ext {
 	// cloud provider libs
 	cryptolibVersion = '2.1.2'
 
-	dropboxVersion = '5.4.4'
+	dropboxVersion = '7.0.0'
 
 	googleApiServicesVersion = 'v3-rev20220508-1.32.1'
 	googlePlayServicesVersion = '19.2.0'
-	googleClientVersion = '2.2.0' // keep in sync with https://github.com/SailReal/google-http-java-client
-	/*
-		update using https://github.com/SailReal/google-http-java-client with `mvn clean install`,
-		copying `google-http-client-*.jar` and `google-http-client-android-*.jar` into the lib folder of this project
-	 */
-	trackingFreeGoogleCLientVersion = '1.43.0'
+	googleClientVersion = '2.2.0' // keep in sync with https://github.com/cryptomator/google-http-java-client
+	trackingFreeGoogleCLientVersion = '1.44.2-dev.0001'
 
 	msgraphVersion = '5.47.0'
 	msgraphAuthVersion = '4.0.5' // contains com.microsoft.identity:common lib which added opentelemetry in 9.0.0, do we need to fork another lib before updating to >=4.2.0 ???
 
-	minIoVersion = '8.5.2'
+	minIoVersion = '8.5.10'
+	pcloudVersion = '1.9.2-dev.0001'
 	staxVersion = '1.2.0' // needed for minIO
-
-	commonsCodecVersion = '1.15'
+	commonsCodecVersion = '1.17.0'
 
 	recyclerViewFastScrollVersion = '2.0.1'
 
 	// testing dependencies
 
-	jUnitVersion = '5.9.2'
+	jUnitVersion = '5.10.2'
 	assertJVersion = '1.7.1'
-	mockitoVersion = '5.1.1'
-	mockitoKotlinVersion = '4.1.0'
+	mockitoVersion = '5.12.0'
+	mockitoKotlinVersion = '5.3.1'
+	mockitoInlineVersion = '5.2.0'
 	hamcrestVersion = '1.3'
 	dexmakerVersion = '1.0'
 	espressoVersion = '3.4.0'
@@ -113,72 +128,72 @@ ext {
 	androidxTestCoreVersion = '1.4.0'
 	androidxSplashscreenVersion = '1.0.0-rc01'
 
-	jsonWebTokenApiVersion = '0.11.5'
+	jsonWebTokenVersion = '4.4.0'
 
 	dependencies = [
-			android               : "com.google.android:android:${androidVersion}",
-			androidAnnotations    : "androidx.annotation:annotation:${androidSupportAnnotationsVersion}",
-			appcompat             : "androidx.appcompat:appcompat:${androidSupportAppcompatVersion}",
-			androidxBiometric     : "androidx.biometric:biometric:${androidxBiometricVersion}",
-			androidxCore          : "androidx.core:core-ktx:${androidxCoreVersion}",
-			androidxFragment      : "androidx.fragment:fragment-ktx:${androidxFragmentVersion}",
-			androidxViewpager     : "androidx.viewpager:viewpager:${androidxViewpagerVersion}",
-			androidxSwiperefresh  : "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwiperefreshVersion}",
-			androidxPreference    : "androidx.preference:preference:${androidxPreferenceVersion}",
-			documentFile          : "androidx.documentfile:documentfile:${androidxDocumentfileVersion}",
-			recyclerView          : "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}",
-			androidxSplashscreen  : "androidx.core:core-splashscreen:${androidxSplashscreenVersion}",
-			androidxTestCore      : "androidx.test:core:${androidxTestCoreVersion}",
-			androidxTestJunitKtln : "androidx.test.ext:junit-ktx:${androidxTestJunitKtlnVersion}",
-			commonsCodec          : "commons-codec:commons-codec:${commonsCodecVersion}",
-			cryptolib             : "org.cryptomator:cryptolib:${cryptolibVersion}",
-			dagger                : "com.google.dagger:dagger:${daggerVersion}",
-			daggerCompiler        : "com.google.dagger:dagger-compiler:${daggerVersion}",
-			design                : "com.google.android.material:material:${androidMaterialDesignVersion}",
-			coreDesugaring        : "com.android.tools:desugar_jdk_libs:${coreDesugaringVersion}",
-			dropbox               : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}",
-			espresso              : "androidx.test.espresso:espresso-core:${espressoVersion}",
-			googleApiClientAndroid: "com.google.api-client:google-api-client-android:${googleClientVersion}",
-			googleApiServicesDrive: "com.google.apis:google-api-services-drive:${googleApiServicesVersion}",
-			googlePlayServicesAuth: "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}",
-			trackingFreeGoogleCLient       : files("lib/google-http-client-${trackingFreeGoogleCLientVersion}.jar"),
-			trackingFreeGoogleAndroidCLient: files("lib/google-http-client-android-${trackingFreeGoogleCLientVersion}.jar"),
-			greenDao              : "org.greenrobot:greendao:${greenDaoVersion}",
-			gson                  : "com.google.code.gson:gson:${gsonVersion}",
-			hamcrest              : "org.hamcrest:hamcrest-all:${hamcrestVersion}",
-			javaxAnnotation       : "javax.annotation:jsr250-api:${javaxAnnotationVersion}",
-			junit                 : "org.junit.jupiter:junit-jupiter:${jUnitVersion}",
-			junitApi              : "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}",
-			junitEngine           : "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}",
-			junitParams           : "org.junit.jupiter:junit-jupiter-params:${jUnitVersion}",
-			junit4Engine          : "org.junit.vintage:junit-vintage-engine:${jUnitVersion}",
-			minIo                 : "io.minio:minio:${minIoVersion}",
-			mockito               : "org.mockito:mockito-core:${mockitoVersion}",
-			mockitoInline         : "org.mockito:mockito-inline:${mockitoVersion}",
-			mockitoKotlin         : "org.mockito.kotlin:mockito-kotlin:${mockitoKotlinVersion}",
-			msgraph               : "com.microsoft.graph:microsoft-graph:${msgraphVersion}",
-			msgraphAuth           : "com.microsoft.identity.client:msal:${msgraphAuthVersion}",
-			multidex              : "androidx.multidex:multidex:${multidexVersion}",
-			okHttp                : "com.squareup.okhttp3:okhttp:${okHttpVersion}",
-			okHttpDigest          : "io.github.rburgst:okhttp-digest:${okHttpDigestVersion}",
-			recyclerViewFastScroll: "com.simplecityapps:recyclerview-fastscroll:${recyclerViewFastScrollVersion}",
-			rxJava                : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}",
-			rxAndroid             : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}",
-			rxBinding             : "com.jakewharton.rxbinding2:rxbinding:${rxBindingVersion}",
-			stax                  : "stax:stax:${staxVersion}",
-			testingSupportLib     : "com.android.support.test:testing-support-lib:${testingSupportLibVersion}",
-			timber                : "com.jakewharton.timber:timber:${timberVersion}",
-			velocity              : "org.apache.velocity:velocity-engine-core:${velocityVersion}",
-			runner                : "androidx.test:runner:${runnerVersion}",
-			rules                 : "androidx.test:rules:${rulesVersion}",
-			contribution          : "androidx.test.espresso:espresso-contrib:${contributionVersion}",
-			uiAutomator           : "androidx.test.uiautomator:uiautomator:${uiautomatorVersion}",
-			zxcvbn                : "com.nulab-inc:zxcvbn:${zxcvbnVersion}",
-			scaleImageView        : "com.davemorrissey.labs:subsampling-scale-image-view:${scaleImageViewVersion}",
-			lruFileCache          : "com.github.solkin:disk-lru-cache:${lruFileCacheVersion}",
-			jsonWebTokenApi       : "io.jsonwebtoken:jjwt-api:${jsonWebTokenApiVersion}",
-			jsonWebTokenImpl      : "io.jsonwebtoken:jjwt-impl:${jsonWebTokenApiVersion}",
-			jsonWebTokenJson      : "io.jsonwebtoken:jjwt-orgjson:${jsonWebTokenApiVersion}"
+			android                        : "com.google.android:android:${androidVersion}",
+			androidAnnotations             : "androidx.annotation:annotation:${androidSupportAnnotationsVersion}",
+			appcompat                      : "androidx.appcompat:appcompat:${androidSupportAppcompatVersion}",
+			androidxBiometric              : "androidx.biometric:biometric:${androidxBiometricVersion}",
+			androidxCore                   : "androidx.core:core-ktx:${androidxCoreVersion}",
+			androidxFragment               : "androidx.fragment:fragment-ktx:${androidxFragmentVersion}",
+			androidxViewpager              : "androidx.viewpager:viewpager:${androidxViewpagerVersion}",
+			androidxSwiperefresh           : "androidx.swiperefreshlayout:swiperefreshlayout:${androidxSwiperefreshVersion}",
+			androidxPreference             : "androidx.preference:preference:${androidxPreferenceVersion}",
+			documentFile                   : "androidx.documentfile:documentfile:${androidxDocumentfileVersion}",
+			recyclerView                   : "androidx.recyclerview:recyclerview:${androidxRecyclerViewVersion}",
+			androidxSplashscreen           : "androidx.core:core-splashscreen:${androidxSplashscreenVersion}",
+			androidxTestCore               : "androidx.test:core:${androidxTestCoreVersion}",
+			androidxTestJunitKtln          : "androidx.test.ext:junit-ktx:${androidxTestJunitKtlnVersion}",
+			commonsCodec                   : "commons-codec:commons-codec:${commonsCodecVersion}",
+			cryptolib                      : "org.cryptomator:cryptolib:${cryptolibVersion}",
+			dagger                         : "com.google.dagger:dagger:${daggerVersion}",
+			daggerCompiler                 : "com.google.dagger:dagger-compiler:${daggerVersion}",
+			design                         : "com.google.android.material:material:${androidMaterialDesignVersion}",
+			coreDesugaring                 : "com.android.tools:desugar_jdk_libs:${coreDesugaringVersion}",
+			dropboxCore                    : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}",
+			dropboxAndroid                 : "com.dropbox.core:dropbox-android-sdk:${dropboxVersion}",
+			espresso                       : "androidx.test.espresso:espresso-core:${espressoVersion}",
+			googleApiClientAndroid         : "com.google.api-client:google-api-client-android:${googleClientVersion}",
+			googleApiServicesDrive         : "com.google.apis:google-api-services-drive:${googleApiServicesVersion}",
+			googlePlayServicesAuth         : "com.google.android.gms:play-services-auth:${googlePlayServicesVersion}",
+			trackingFreeGoogleCLient       : "com.github.cryptomator.google-http-java-client:google-http-client:${trackingFreeGoogleCLientVersion}",
+			trackingFreeGoogleAndroidCLient: "com.github.cryptomator.google-http-java-client:google-http-client-android:${trackingFreeGoogleCLientVersion}",
+			greenDao                       : "org.greenrobot:greendao:${greenDaoVersion}",
+			gson                           : "com.google.code.gson:gson:${gsonVersion}",
+			hamcrest                       : "org.hamcrest:hamcrest-all:${hamcrestVersion}",
+			javaxAnnotation                : "javax.annotation:jsr250-api:${javaxAnnotationVersion}",
+			junit                          : "org.junit.jupiter:junit-jupiter:${jUnitVersion}",
+			junitApi                       : "org.junit.jupiter:junit-jupiter-api:${jUnitVersion}",
+			junitEngine                    : "org.junit.jupiter:junit-jupiter-engine:${jUnitVersion}",
+			junitParams                    : "org.junit.jupiter:junit-jupiter-params:${jUnitVersion}",
+			junit4Engine                   : "org.junit.vintage:junit-vintage-engine:${jUnitVersion}",
+			minIo                          : "io.minio:minio:${minIoVersion}",
+			mockito                        : "org.mockito:mockito-core:${mockitoVersion}",
+			mockitoInline                  : "org.mockito:mockito-inline:${mockitoInlineVersion}",
+			mockitoKotlin                  : "org.mockito.kotlin:mockito-kotlin:${mockitoKotlinVersion}",
+			msgraph                        : "com.microsoft.graph:microsoft-graph:${msgraphVersion}",
+			msgraphAuth                    : "com.microsoft.identity.client:msal:${msgraphAuthVersion}",
+			multidex                       : "androidx.multidex:multidex:${multidexVersion}",
+			okHttp                         : "com.squareup.okhttp3:okhttp:${okHttpVersion}",
+			okHttpDigest                   : "io.github.rburgst:okhttp-digest:${okHttpDigestVersion}",
+			pcloud                         : "com.github.cryptomator.pcloud-sdk-java:java-core:${pcloudVersion}",
+			recyclerViewFastScroll         : "com.simplecityapps:recyclerview-fastscroll:${recyclerViewFastScrollVersion}",
+			rxJava                         : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}",
+			rxAndroid                      : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}",
+			rxBinding                      : "com.jakewharton.rxbinding2:rxbinding:${rxBindingVersion}",
+			stax                           : "stax:stax:${staxVersion}",
+			testingSupportLib              : "com.android.support.test:testing-support-lib:${testingSupportLibVersion}",
+			timber                         : "com.jakewharton.timber:timber:${timberVersion}",
+			velocity                       : "org.apache.velocity:velocity-engine-core:${velocityVersion}",
+			runner                         : "androidx.test:runner:${runnerVersion}",
+			rules                          : "androidx.test:rules:${rulesVersion}",
+			contribution                   : "androidx.test.espresso:espresso-contrib:${contributionVersion}",
+			uiAutomator                    : "androidx.test.uiautomator:uiautomator:${uiautomatorVersion}",
+			zxcvbn                         : "com.nulab-inc:zxcvbn:${zxcvbnVersion}",
+			scaleImageView                 : "com.github.cryptomator:subsampling-scale-image-view:${scaleImageViewVersion}",
+			lruFileCache                   : "com.github.solkin:disk-lru-cache:${lruFileCacheVersion}",
+			jsonWebToken                   : "com.auth0:java-jwt:${jsonWebTokenVersion}"
 	]
 
 }
diff --git a/buildsystem/docker/dependencies.txt b/buildsystem/docker/dependencies.txt
index d184c22c2..29371773d 100644
--- a/buildsystem/docker/dependencies.txt
+++ b/buildsystem/docker/dependencies.txt
@@ -1 +1 @@
-openjdk-11-jdk=11.0.16+8-1
+openjdk-17-jdk=17.0.11+9-1
diff --git a/buildsystem/docker/sources.list b/buildsystem/docker/sources.list
index 37218b643..b7a8e6ecd 100644
--- a/buildsystem/docker/sources.list
+++ b/buildsystem/docker/sources.list
@@ -1,4 +1,4 @@
 # From https://github.com/signalapp/Signal-Android
 
 #deb http://snapshot.debian.org/archive/debian-security/20220816T110409Z/ bullseye/updates main
-deb http://snapshot.debian.org/archive/debian/20220816T041409Z/ unstable main
+deb http://snapshot.debian.org/archive/debian/20240522T144944Z/ unstable main
diff --git a/data/build.gradle b/data/build.gradle
index 596b438a3..f28de6329 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -20,8 +20,8 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 
 		coreLibraryDesugaringEnabled true
 	}
@@ -103,9 +103,9 @@ dependencies {
 
 	implementation project(':domain')
 	implementation project(':util')
-	playstoreImplementation project(':pcloud-sdk-java')
-	apkstoreImplementation project(':pcloud-sdk-java')
-	fdroidImplementation project(':pcloud-sdk-java')
+	playstoreImplementation dependencies.pcloud
+	apkstoreImplementation dependencies.pcloud
+	fdroidImplementation dependencies.pcloud
 
 	coreLibraryDesugaring dependencies.coreDesugaring
 
@@ -118,14 +118,16 @@ dependencies {
 	annotationProcessor dependencies.daggerCompiler
 	implementation dependencies.dagger
 
-	api dependencies.jsonWebTokenApi
-	implementation dependencies.jsonWebTokenImpl
-	implementation dependencies.jsonWebTokenJson
+	implementation dependencies.jsonWebToken
 
 	// cloud
-	playstoreImplementation dependencies.dropbox
-	apkstoreImplementation dependencies.dropbox
-	fdroidImplementation dependencies.dropbox
+	playstoreImplementation dependencies.dropboxCore
+	playstoreImplementation dependencies.dropboxAndroid
+	apkstoreImplementation dependencies.dropboxCore
+	apkstoreImplementation dependencies.dropboxAndroid
+	fdroidImplementation dependencies.dropboxCore
+	fdroidImplementation dependencies.dropboxAndroid
+
 
 	playstoreImplementation dependencies.msgraphAuth
 	apkstoreImplementation dependencies.msgraphAuth
@@ -224,14 +226,6 @@ configurations {
 	all*.exclude group: 'com.google.android', module: 'android'
 }
 
-def liteFlavor() {
-	gradle.startParameter.taskNames.stream().filter(t -> t.toLowerCase().contains("lite")).findAny().isPresent()
-}
-
-def getApiKey(key) {
-	return !liteFlavor() ? System.getenv().getOrDefault(key, "") : ""
-}
-
 tasks.withType(Test) {
 	testLogging {
 		events "failed"
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt
index 101330e58..090f12dc1 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepository.kt
@@ -28,7 +28,7 @@ import java.io.File
 import java.io.IOException
 import java.io.OutputStream
 
-internal class DropboxCloudContentRepository(private val cloud: DropboxCloud, context: Context) : InterceptingCloudContentRepository<DropboxCloud, DropboxNode, DropboxFolder, DropboxFile>(Intercepted(cloud, context)){
+internal class DropboxCloudContentRepository(private val cloud: DropboxCloud, context: Context) : InterceptingCloudContentRepository<DropboxCloud, DropboxNode, DropboxFolder, DropboxFile>(Intercepted(cloud, context)) {
 
 	@Throws(BackendException::class)
 	override fun throwWrappedIfRequired(e: Exception) {
@@ -164,13 +164,12 @@ internal class DropboxCloudContentRepository(private val cloud: DropboxCloud, co
 			}
 		}
 
-		private fun mapToNoSuchCloudFileExceptionIfMatches(e: Exception, file: DropboxFile) : NoSuchCloudFileException? {
+		private fun mapToNoSuchCloudFileExceptionIfMatches(e: Exception, file: DropboxFile): NoSuchCloudFileException? {
 			if (ExceptionUtil.contains(e, GetMetadataErrorException::class.java)) {
 				if (ExceptionUtil.extract(e, GetMetadataErrorException::class.java).get().errorValue.pathValue.isNotFound) {
 					return NoSuchCloudFileException(file.name)
 				}
-			}
-			else if (ExceptionUtil.contains(e, DownloadErrorException::class.java)) {
+			} else if (ExceptionUtil.contains(e, DownloadErrorException::class.java)) {
 				if (ExceptionUtil.extract(e, DownloadErrorException::class.java).get().errorValue.pathValue.isNotFound) {
 					return NoSuchCloudFileException(file.name)
 				}
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java
index 6db5fbc7d..c2abd0f69 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud.dropbox;
 
-import static org.cryptomator.domain.CloudType.DROPBOX;
-
 import android.content.Context;
 
 import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -12,6 +10,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import static org.cryptomator.domain.CloudType.DROPBOX;
+
 @Singleton
 public class DropboxCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
 
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudNodeFactory.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudNodeFactory.kt
index e7414081b..bce99457b 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudNodeFactory.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxCloudNodeFactory.kt
@@ -7,7 +7,7 @@ import com.dropbox.core.v2.files.Metadata
 internal object DropboxCloudNodeFactory {
 
 	fun from(parent: DropboxFolder, metadata: FileMetadata): DropboxFile {
-		return DropboxFile(parent, metadata.name, metadata.pathDisplay, metadata.size, metadata.serverModified)
+		return DropboxFile(parent, metadata.name, metadata.pathLower!!, metadata.size, metadata.clientModified)
 	}
 
 	@JvmStatic
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt
index 412b3b56e..42f6331ee 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/dropbox/DropboxImpl.kt
@@ -39,6 +39,7 @@ import org.cryptomator.util.file.LruFileCacheUtil.Companion.retrieveFromLruCache
 import java.io.File
 import java.io.IOException
 import java.io.OutputStream
+import java.util.Date
 import timber.log.Timber
 
 internal class DropboxImpl(cloud: DropboxCloud, context: Context) {
@@ -167,6 +168,7 @@ internal class DropboxImpl(cloud: DropboxCloud, context: Context) {
 				client() //
 					.files() //
 					.uploadBuilder(file.path) //
+					.withClientModified(data.modifiedDate(context).orElse(Date())) //
 					.withMode(writeMode) //
 					.uploadAndFinish(it)
 			}
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
index ee4a310b6..dffa87f3f 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepository.kt
@@ -24,8 +24,8 @@ import java.io.OutputStream
 import java.net.SocketTimeoutException
 import okhttp3.Request
 
-internal class OnedriveCloudContentRepository(private val cloud: OnedriveCloud, graphServiceClient: GraphServiceClient<Request>, context: Context)
-	: InterceptingCloudContentRepository<OnedriveCloud, OnedriveNode, OnedriveFolder, OnedriveFile>(Intercepted(cloud, graphServiceClient, context)) {
+internal class OnedriveCloudContentRepository(private val cloud: OnedriveCloud, graphServiceClient: GraphServiceClient<Request>, context: Context) :
+	InterceptingCloudContentRepository<OnedriveCloud, OnedriveNode, OnedriveFolder, OnedriveFile>(Intercepted(cloud, graphServiceClient, context)) {
 
 	@Throws(BackendException::class)
 	override fun throwWrappedIfRequired(e: Exception) {
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
index 202111855..148d4d646 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud.onedrive;
 
-import static org.cryptomator.domain.CloudType.ONEDRIVE;
-
 import android.content.Context;
 
 import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -12,6 +10,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import static org.cryptomator.domain.CloudType.ONEDRIVE;
+
 @Singleton
 public class OnedriveCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
 
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudNodeFactory.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudNodeFactory.kt
index 3d0036ee9..714a21984 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudNodeFactory.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveCloudNodeFactory.kt
@@ -74,8 +74,7 @@ internal object OnedriveCloudNodeFactory {
 	}
 
 	private fun lastModified(item: DriveItem): Date? {
-		return item.lastModifiedDateTime?.let {
-			return Date.from(it.toInstant())
-		}
+		return item.fileSystemInfo?.lastModifiedDateTime?.let { clientDate -> Date.from(clientDate.toInstant()) }
+			?: item.lastModifiedDateTime?.let { serverDate -> Date.from(serverDate.toInstant()) }
 	}
 }
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt
index b9f747d93..a6ce6b09c 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveImpl.kt
@@ -5,6 +5,7 @@ import com.microsoft.graph.http.GraphServiceException
 import com.microsoft.graph.models.DriveItem
 import com.microsoft.graph.models.DriveItemCreateUploadSessionParameterSet
 import com.microsoft.graph.models.DriveItemUploadableProperties
+import com.microsoft.graph.models.FileSystemInfo
 import com.microsoft.graph.models.Folder
 import com.microsoft.graph.models.ItemReference
 import com.microsoft.graph.options.Option
@@ -39,6 +40,8 @@ import org.cryptomator.util.file.LruFileCacheUtil.Companion.retrieveFromLruCache
 import java.io.File
 import java.io.IOException
 import java.io.OutputStream
+import java.time.OffsetDateTime
+import java.time.ZoneId
 import java.util.Date
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutionException
@@ -202,7 +205,9 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 		}
 		progressAware.onProgress(Progress.completed(UploadState.upload(file)))
 		return try {
-			OnedriveCloudNodeFactory.file(file.parent, result.get(), Date())
+			val driveItem: DriveItem = result.get()
+			val lastModifiedDate = getLastModifiedDateTime(driveItem) ?: Date()
+			OnedriveCloudNodeFactory.file(file.parent, driveItem, lastModifiedDate)
 		} catch (e: ExecutionException) {
 			throw FatalBackendException(e)
 		} catch (e: InterruptedException) {
@@ -210,6 +215,11 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 		}
 	}
 
+	private fun getLastModifiedDateTime(driveItem: DriveItem): Date? {
+		return driveItem.fileSystemInfo?.lastModifiedDateTime?.let { clientDate -> Date.from(clientDate.toInstant()) }
+			?: driveItem.lastModifiedDateTime?.let { serverDate -> Date.from(serverDate.toInstant()) }
+	}
+
 	@Throws(NoSuchCloudFileException::class)
 	private fun uploadFile(file: OnedriveFile, data: DataSource, progressAware: ProgressAware<UploadState>, result: CompletableFuture<DriveItem>, conflictBehaviorOption: Option, size: Long) {
 		data.open(context)?.use { inputStream ->
@@ -228,12 +238,26 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 						.putAsync(CopyStream.toByteArray(it)) //
 						.whenComplete { driveItem, error ->
 							run {
-								if (error == null) {
+								val modifiedDate = data.modifiedDate(context)
+								if (error != null) {
+									result.completeExceptionally(error)
+									return@whenComplete
+								}
+								if (modifiedDate.isPresent) {
+									patchAsyncLastModifiedDate(parentNodeInfo, driveItem, modifiedDate.get())
+										.whenComplete { driveItem, error ->
+											if (error == null) {
+												progressAware.onProgress(Progress.completed(UploadState.upload(file)))
+												result.complete(driveItem)
+												cacheNodeInfo(file, driveItem)
+											} else {
+												result.completeExceptionally(error)
+											}
+										}
+								} else { // current date is the default, no need to patch()
 									progressAware.onProgress(Progress.completed(UploadState.upload(file)))
 									result.complete(driveItem)
 									cacheNodeInfo(file, driveItem)
-								} else {
-									result.completeExceptionally(error)
 								}
 							}
 						}
@@ -244,13 +268,32 @@ internal class OnedriveImpl(private val cloud: OnedriveCloud, private val client
 		} ?: throw FatalBackendException("InputStream shouldn't bee null")
 	}
 
+	private fun patchAsyncLastModifiedDate(parentNodeInfo: OnedriveIdCache.NodeInfo, driveItem: DriveItem, modifiedDate: Date): CompletableFuture<DriveItem> {
+		val diffItem = DriveItem()
+		diffItem.fileSystemInfo = FileSystemInfo()
+		diffItem.fileSystemInfo!!.lastModifiedDateTime = OffsetDateTime.ofInstant(modifiedDate.toInstant(), ZoneId.systemDefault())
+		return drive(parentNodeInfo.driveId) //
+			.items(driveItem.id!!) //
+			.buildRequest() //
+			.patchAsync(diffItem) //
+	}
+
 	@Throws(IOException::class, NoSuchCloudFileException::class)
 	private fun chunkedUploadFile(file: OnedriveFile, data: DataSource, progressAware: ProgressAware<UploadState>, result: CompletableFuture<DriveItem>, conflictBehaviorOption: Option, size: Long) {
 		val parentNodeInfo = requireNodeInfo(file.parent)
+
+		val props = DriveItemUploadableProperties()
+		val modifiedDate = data.modifiedDate(context)
+
+		if (modifiedDate.isPresent) {
+			props.fileSystemInfo = FileSystemInfo()
+			props.fileSystemInfo!!.lastModifiedDateTime = OffsetDateTime.ofInstant(modifiedDate.get().toInstant(), ZoneId.systemDefault())
+		}
+
 		drive(parentNodeInfo.driveId) //
 			.items(parentNodeInfo.id) //
 			.itemWithPath(file.name) //
-			.createUploadSession(DriveItemCreateUploadSessionParameterSet.newBuilder().withItem(DriveItemUploadableProperties()).build()) //
+			.createUploadSession(DriveItemCreateUploadSessionParameterSet.newBuilder().withItem(props).build()) //
 			.buildRequest() //
 			.post()?.let { uploadSession ->
 				data.open(context)?.use { inputStream ->
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt
index 087554301..574749810 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/onedrive/OnedriveNode.kt
@@ -8,5 +8,5 @@ interface OnedriveNode : CloudNode {
 	override val name: String
 	override val path: String
 	override val parent: OnedriveFolder?
-	
+
 }
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt
index 11a9407ee..a2e6deebc 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudApiError.kt
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud.pcloud
 
-import java.util.HashSet
-
 object PCloudApiError {
 
 	@JvmField
@@ -14,6 +12,7 @@ object PCloudApiError {
 			PCloudApiErrorCodes.INVALID_FILE_OR_FOLDER_NAME.value //
 		)
 	)
+
 	@JvmField
 	val ignoreMoveSet = HashSet( //
 		listOf( //
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt
index 27a3cef11..d3ddc1427 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepository.kt
@@ -19,7 +19,8 @@ import java.io.File
 import java.io.IOException
 import java.io.OutputStream
 
-internal class PCloudContentRepository(private val cloud: PCloud, client: ApiClient, context: Context) : InterceptingCloudContentRepository<PCloud, PCloudNode, PCloudFolder, PCloudFile>(Intercepted(cloud, client, context)) {
+internal class PCloudContentRepository(private val cloud: PCloud, client: ApiClient, context: Context) :
+	InterceptingCloudContentRepository<PCloud, PCloudNode, PCloudFolder, PCloudFile>(Intercepted(cloud, client, context)) {
 
 	@Throws(BackendException::class)
 	override fun throwWrappedIfRequired(e: Exception) {
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java
index 61ab2ca9c..ad64e0653 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud.pcloud;
 
-import static org.cryptomator.domain.CloudType.PCLOUD;
-
 import android.content.Context;
 
 import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -12,6 +10,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import static org.cryptomator.domain.CloudType.PCLOUD;
+
 @Singleton
 public class PCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
 
diff --git a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt
index fba87a304..e8a262c42 100644
--- a/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt
+++ b/data/src/apiKey/java/org/cryptomator/data/cloud/pcloud/PCloudImpl.kt
@@ -208,7 +208,7 @@ internal class PCloudImpl(private val cloud: PCloud, private val client: ApiClie
 		}
 		return try {
 			client //
-				.createFile(file.parent.path, file.name, pCloudDataSource, Date(), listener, uploadOptions) //
+				.createFile(file.parent.path, file.name, pCloudDataSource, data.modifiedDate(context).orElse(Date()), listener, uploadOptions) //
 				.execute()
 		} catch (ex: ApiError) {
 			handleApiError(ex, file.name)
diff --git a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
index 4e7a72847..918d4dfb2 100644
--- a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
+++ b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud;
 
-import static java.util.Arrays.asList;
-
 import org.cryptomator.data.cloud.crypto.CryptoCloudContentRepositoryFactory;
 import org.cryptomator.data.cloud.dropbox.DropboxCloudContentRepositoryFactory;
 import org.cryptomator.data.cloud.googledrive.GoogleDriveCloudContentRepositoryFactory;
@@ -18,6 +16,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import static java.util.Arrays.asList;
+
 @Singleton
 public class CloudContentRepositoryFactories implements Iterable<CloudContentRepositoryFactory> {
 
diff --git a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
index 77d426594..32766b449 100644
--- a/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
+++ b/data/src/apkStorePlaystore/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
@@ -3,6 +3,7 @@ package org.cryptomator.data.cloud.googledrive
 import android.content.Context
 import com.google.api.client.googleapis.json.GoogleJsonResponseException
 import com.google.api.client.http.HttpResponseException
+import com.google.api.client.util.DateTime
 import com.google.api.services.drive.Drive
 import com.google.api.services.drive.model.File
 import com.google.api.services.drive.model.Revision
@@ -25,6 +26,7 @@ import org.cryptomator.util.file.LruFileCacheUtil
 import org.cryptomator.util.file.LruFileCacheUtil.Companion.retrieveFromLruCache
 import java.io.IOException
 import java.io.OutputStream
+import java.util.Date
 import timber.log.Timber
 
 internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCloud, idCache: GoogleDriveIdCache) {
@@ -98,7 +100,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 		folder?.let {
 			if (GoogleDriveCloudNodeFactory.isFolder(it)) {
 				return idCache.cache(GoogleDriveCloudNodeFactory.folder(parent, it))
-			} else if(GoogleDriveCloudNodeFactory.isShortcutFolder(it)) {
+			} else if (GoogleDriveCloudNodeFactory.isShortcutFolder(it)) {
 				return idCache.cache(GoogleDriveCloudNodeFactory.folder(parent, name, path, it.shortcutDetails.targetId))
 			}
 		}
@@ -203,6 +205,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 		val metadata = File()
 		metadata.name = file.name
 		progressAware.onProgress(Progress.started(UploadState.upload(file)))
+		metadata.setModifiedTime(DateTime(data.modifiedDate(context).orElse(Date())))
 		val uploadedFile = if (file.driveId != null && replace) {
 			updateFile(file, data, progressAware, size, metadata)
 		} else {
diff --git a/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java b/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
index 748dea6ed..b058c305b 100644
--- a/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
+++ b/data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
@@ -20,8 +20,7 @@ public class CloudContentRepositoryFactories implements Iterable<CloudContentRep
 	private final Iterable<CloudContentRepositoryFactory> factories;
 
 	@Inject
-	public CloudContentRepositoryFactories(
-			S3CloudContentRepositoryFactory s3Factory, //
+	public CloudContentRepositoryFactories(S3CloudContentRepositoryFactory s3Factory, //
 			CryptoCloudContentRepositoryFactory cryptoFactory, //
 			LocalStorageContentRepositoryFactory localStorageFactory, //
 			WebDavCloudContentRepositoryFactory webDavFactory) {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloud.java b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloud.java
index eeadb1358..65a843d33 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloud.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloud.java
@@ -41,6 +41,11 @@ public boolean requiresNetwork() {
 		return false;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	public Vault getVault() {
 		return vault;
 	}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java
index eb6bcaf06..87ff7d316 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoCloudContentRepositoryFactory.java
@@ -16,8 +16,8 @@
 
 import dagger.Lazy;
 
-import static java.lang.String.format;
 import static org.cryptomator.domain.CloudType.CRYPTO;
+import static java.lang.String.format;
 
 @Singleton
 public class CryptoCloudContentRepositoryFactory implements CloudContentRepositoryFactory {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplDecorator.kt b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplDecorator.kt
index f32cd3e32..6e5c0ad83 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplDecorator.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplDecorator.kt
@@ -449,6 +449,7 @@ abstract class CryptoImplDecorator(
 								progressAware.onProgress(Progress.progress(UploadState.encryption(cryptoFile)).between(0).and(ciphertextSize).withValue(encrypted))
 							}
 							encryptingWritableByteChannel.close()
+							data.modifiedDate(context).ifPresent { encryptedTmpFile.setLastModified(it.time) }
 							progressAware.onProgress(Progress.completed(UploadState.encryption(cryptoFile)))
 							return writeFromTmpFile(data, cryptoFile, encryptedTmpFile, progressAware, replace)
 						}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt
index f50d78645..4128ccc7a 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/CryptoImplVaultFormat7.kt
@@ -486,6 +486,7 @@ open class CryptoImplVaultFormat7 : CryptoImplDecorator {
 									progressAware.onProgress(Progress.progress(UploadState.encryption(cloudFile)).between(0).and(ciphertextSize).withValue(encrypted))
 								}
 								encryptingWritableByteChannel.close()
+								data.modifiedDate(context).ifPresent { encryptedTmpFile.setLastModified(it.time) }
 								progressAware.onProgress(Progress.completed(UploadState.encryption(cloudFile)))
 								val targetFile = targetFile(cryptoFile, cloudFile, replace)
 								return file(
diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/VaultConfig.kt b/data/src/main/java/org/cryptomator/data/cloud/crypto/VaultConfig.kt
index d7c082aaf..2a324f142 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/crypto/VaultConfig.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/VaultConfig.kt
@@ -1,24 +1,18 @@
 package org.cryptomator.data.cloud.crypto
 
+import com.auth0.jwt.JWT
+import com.auth0.jwt.algorithms.Algorithm
+import com.auth0.jwt.exceptions.InvalidClaimException
+import com.auth0.jwt.exceptions.JWTVerificationException
+import com.auth0.jwt.exceptions.SignatureVerificationException
+import com.auth0.jwt.interfaces.DecodedJWT
 import org.cryptomator.cryptolib.api.CryptorProvider
 import org.cryptomator.domain.UnverifiedVaultConfig
 import org.cryptomator.domain.exception.vaultconfig.VaultConfigLoadException
 import org.cryptomator.domain.exception.vaultconfig.VaultKeyInvalidException
 import org.cryptomator.domain.exception.vaultconfig.VaultVersionMismatchException
 import java.net.URI
-import java.security.Key
 import java.util.UUID
-import io.jsonwebtoken.Claims
-import io.jsonwebtoken.IncorrectClaimException
-import io.jsonwebtoken.JwsHeader
-import io.jsonwebtoken.JwtException
-import io.jsonwebtoken.Jwts
-import io.jsonwebtoken.MissingClaimException
-import io.jsonwebtoken.SignatureAlgorithm
-import io.jsonwebtoken.SigningKeyResolverAdapter
-import io.jsonwebtoken.security.Keys
-import io.jsonwebtoken.security.SignatureException
-import kotlin.properties.Delegates
 
 class VaultConfig private constructor(builder: VaultConfigBuilder) {
 
@@ -29,14 +23,13 @@ class VaultConfig private constructor(builder: VaultConfigBuilder) {
 	val shorteningThreshold: Int
 
 	fun toToken(rawKey: ByteArray): String {
-		return Jwts.builder()
-			.setHeaderParam(JSON_KEY_ID, keyId.toASCIIString()) //
-			.setId(id) //
-			.claim(JSON_KEY_VAULTFORMAT, vaultFormat) //
-			.claim(JSON_KEY_CIPHERCONFIG, cipherCombo.name) //
-			.claim(JSON_KEY_SHORTENING_THRESHOLD, shorteningThreshold) //
-			.signWith(Keys.hmacShaKeyFor(rawKey), SignatureAlgorithm.HS256) //
-			.compact()
+		return JWT.create() //
+			.withKeyId(keyId.toString()) //
+			.withJWTId(id) //
+			.withClaim(JSON_KEY_VAULTFORMAT, vaultFormat) //
+			.withClaim(JSON_KEY_CIPHERCONFIG, cipherCombo.name) //
+			.withClaim(JSON_KEY_SHORTENING_THRESHOLD, shorteningThreshold) //
+			.sign(Algorithm.HMAC256(rawKey))
 	}
 
 	class VaultConfigBuilder {
@@ -87,42 +80,46 @@ class VaultConfig private constructor(builder: VaultConfigBuilder) {
 		@JvmStatic
 		@Throws(VaultConfigLoadException::class)
 		fun decode(token: String): UnverifiedVaultConfig {
-			val unverifiedSigningKeyResolver = UnverifiedSigningKeyResolver()
-
-			// At this point we can't verify the signature because we don't have the masterkey yet.
-			try {
-				Jwts.parserBuilder().setSigningKeyResolver(unverifiedSigningKeyResolver).build().parse(token)
-			} catch (e: IllegalArgumentException) {
-				return UnverifiedVaultConfig(token, unverifiedSigningKeyResolver.keyId, unverifiedSigningKeyResolver.vaultFormat)
-			}
-			throw VaultConfigLoadException("Failed to load vaultconfig")
+			val unverifiedJwt = JWT.decode(token)
+			val vaultFormat = unverifiedJwt.getClaim(JSON_KEY_VAULTFORMAT).asInt()
+			val keyId = URI.create(unverifiedJwt.keyId)
+			return UnverifiedVaultConfig(token, keyId, vaultFormat)
 		}
 
 		@JvmStatic
 		@Throws(VaultKeyInvalidException::class, VaultVersionMismatchException::class, VaultConfigLoadException::class)
 		fun verify(rawKey: ByteArray, unverifiedVaultConfig: UnverifiedVaultConfig): VaultConfig {
 			return try {
-				val parser = Jwts //
-					.parserBuilder() //
-					.setSigningKey(rawKey) //
-					.require(JSON_KEY_VAULTFORMAT, unverifiedVaultConfig.vaultFormat) //
-					.build() //
-					.parseClaimsJws(unverifiedVaultConfig.jwt)
+				val unverifiedJwt = JWT.decode(unverifiedVaultConfig.jwt)
+				val verifier = JWT.require(initAlgorithm(rawKey, unverifiedJwt)) //
+					.withClaim(JSON_KEY_VAULTFORMAT, unverifiedVaultConfig.vaultFormat) //
+					.build()
+				val verifiedJwt = verifier.verify(unverifiedJwt)
 
 				val vaultConfigBuilder = createVaultConfig() //
-					.keyId(unverifiedVaultConfig.keyId)
-					.id(parser.header[JSON_KEY_ID] as String) //
-					.cipherCombo(CryptorProvider.Scheme.valueOf(parser.body.get(JSON_KEY_CIPHERCONFIG, String::class.java))) //
-					.vaultFormat(unverifiedVaultConfig.vaultFormat) //
-					.shorteningThreshold(parser.body[JSON_KEY_SHORTENING_THRESHOLD] as Int)
+					.keyId(URI.create(verifiedJwt.keyId)) //
+					.id(verifiedJwt.getHeaderClaim(JSON_KEY_ID).asString()) //
+					.cipherCombo(CryptorProvider.Scheme.valueOf(verifiedJwt.getClaim(JSON_KEY_CIPHERCONFIG).asString())) //
+					.vaultFormat(verifiedJwt.getClaim(JSON_KEY_VAULTFORMAT).asInt()) //
+					.shorteningThreshold(verifiedJwt.getClaim(JSON_KEY_SHORTENING_THRESHOLD).asInt()) //
 
 				VaultConfig(vaultConfigBuilder)
-			} catch (e: JwtException) {
-				when (e) {
-					is MissingClaimException, is IncorrectClaimException -> throw VaultVersionMismatchException("Vault config not for version " + unverifiedVaultConfig.vaultFormat)
-					is SignatureException -> throw VaultKeyInvalidException()
-					else -> throw VaultConfigLoadException(e)
-				}
+			} catch (e: SignatureVerificationException) {
+				throw VaultKeyInvalidException()
+			} catch (e: InvalidClaimException) {
+				throw VaultVersionMismatchException("Vault config not for version $unverifiedVaultConfig.vaultFormat")
+			} catch (e: JWTVerificationException) {
+				throw VaultConfigLoadException("Failed to verify vault config")
+			}
+		}
+
+		@Throws(VaultConfigLoadException::class)
+		private fun initAlgorithm(rawKey: ByteArray, jwt: DecodedJWT): Algorithm {
+			return when (val algo = jwt.algorithm) {
+				"HS256" -> Algorithm.HMAC256(rawKey)
+				"HS384" -> Algorithm.HMAC384(rawKey)
+				"HS512" -> Algorithm.HMAC512(rawKey)
+				else -> throw VaultConfigLoadException("Unsupported signature algorithm: $algo")
 			}
 		}
 
@@ -132,18 +129,6 @@ class VaultConfig private constructor(builder: VaultConfigBuilder) {
 		}
 	}
 
-	private class UnverifiedSigningKeyResolver : SigningKeyResolverAdapter() {
-
-		lateinit var keyId: URI
-		var vaultFormat: Int by Delegates.notNull()
-
-		override fun resolveSigningKey(jwsHeader: JwsHeader<*>, claims: Claims): Key? {
-			keyId = URI.create(jwsHeader.keyId)
-			vaultFormat = claims[JSON_KEY_VAULTFORMAT] as Int
-			return null
-		}
-	}
-
 	init {
 		id = builder.id
 		keyId = builder.keyId
diff --git a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt
index 4a5eabbb7..97cb7eb43 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageAccessFrameworkImpl.kt
@@ -76,7 +76,7 @@ internal class LocalStorageAccessFrameworkImpl(private val context: Context, pri
 			return file(parent, name, path, size, nodeInfo.id)
 		}
 		listFilesWithNameFilter(parent, name).getOrNull(0)?.let {
-			if(it is LocalStorageAccessFile) {
+			if (it is LocalStorageAccessFile) {
 				return idCache.cache(it)
 			}
 		}
@@ -94,7 +94,7 @@ internal class LocalStorageAccessFrameworkImpl(private val context: Context, pri
 			return folder(parent, name, nodeInfo.id)
 		}
 		listFilesWithNameFilter(parent, name).getOrNull(0)?.let {
-			if(it is LocalStorageAccessFolder) {
+			if (it is LocalStorageAccessFolder) {
 				return idCache.cache(it)
 			}
 		}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java
index b07bfebbb..97c4b18ef 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/local/LocalStorageContentRepositoryFactory.java
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud.local;
 
-import static org.cryptomator.domain.CloudType.LOCAL;
-
 import android.content.Context;
 import android.content.UriPermission;
 
@@ -17,6 +15,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import static org.cryptomator.domain.CloudType.LOCAL;
+
 @Singleton
 public class LocalStorageContentRepositoryFactory implements CloudContentRepositoryFactory {
 
@@ -38,7 +38,7 @@ public boolean supports(Cloud cloud) {
 	public CloudContentRepository cloudContentRepositoryFor(Cloud cloud) {
 		List<UriPermission> permissions = context.getContentResolver().getPersistedUriPermissions();
 		for (UriPermission permission : permissions) {
-			if(permission.getUri().toString().equals(((LocalStorageCloud) cloud).rootUri())) {
+			if (permission.getUri().toString().equals(((LocalStorageCloud) cloud).rootUri())) {
 				return new LocalStorageAccessFrameworkContentRepository(context, mimeTypes, (LocalStorageCloud) cloud);
 			}
 		}
diff --git a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt
index 885b854e7..70c309eaa 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HeaderNames.kt
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud.okhttplogging
 
-import java.util.HashSet
-
 internal class HeaderNames(vararg headerNames: String) {
 
 	private val lowercaseNames: MutableSet<String> = HashSet()
diff --git a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt
index b388fbb8e..52c4fec21 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/okhttplogging/HttpLoggingInterceptor.kt
@@ -114,6 +114,7 @@ class HttpLoggingInterceptor(private val logger: Logger, private val context: Co
 	}
 
 	interface Logger {
+
 		fun log(message: String)
 	}
 
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java
index 647ae0c1f..6c41e2702 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudContentRepositoryFactory.java
@@ -1,7 +1,5 @@
 package org.cryptomator.data.cloud.s3;
 
-import static org.cryptomator.domain.CloudType.S3;
-
 import android.content.Context;
 
 import org.cryptomator.data.repository.CloudContentRepositoryFactory;
@@ -13,6 +11,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import static org.cryptomator.domain.CloudType.S3;
+
 @Singleton
 public class S3CloudContentRepositoryFactory implements CloudContentRepositoryFactory {
 
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt
index 1c6432b6f..e977e795b 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3CloudNodeFactory.kt
@@ -7,7 +7,7 @@ internal object S3CloudNodeFactory {
 	private const val DELIMITER = "/"
 
 	fun file(parent: S3Folder, name: String): S3File {
-		return S3File(parent, name, getNodePath(parent, name), null,  null)
+		return S3File(parent, name, getNodePath(parent, name), null, null)
 	}
 
 	fun file(parent: S3Folder, name: String, size: Long?): S3File {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt
index 9a7875463..0c00cb9eb 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Folder.kt
@@ -18,6 +18,7 @@ internal open class S3Folder(override val parent: S3Folder?, override val name:
 	}
 
 	companion object {
+
 		private const val DELIMITER = "/"
 	}
 }
diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt
index e86736b02..55eef9509 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3Impl.kt
@@ -342,21 +342,21 @@ internal class S3Impl(private val cloud: S3Cloud, private val client: MinioClien
 	}
 
 	private fun handleApiError(e: ErrorResponseException, name: String): Exception {
-			val errorCode = e.errorResponse().code()
-			return when {
-				isAccessProblem(errorCode) -> {
-					ForbiddenException()
-				}
-				S3CloudApiErrorCodes.NO_SUCH_BUCKET.value == errorCode -> {
-					NoSuchBucketException(name)
-				}
-				S3CloudApiErrorCodes.NO_SUCH_KEY.value == errorCode -> {
-					NoSuchCloudFileException(name)
-				}
-				else -> {
-					FatalBackendException(e)
-				}
+		val errorCode = e.errorResponse().code()
+		return when {
+			isAccessProblem(errorCode) -> {
+				ForbiddenException()
 			}
+			S3CloudApiErrorCodes.NO_SUCH_BUCKET.value == errorCode -> {
+				NoSuchBucketException(name)
+			}
+			S3CloudApiErrorCodes.NO_SUCH_KEY.value == errorCode -> {
+				NoSuchCloudFileException(name)
+			}
+			else -> {
+				FatalBackendException(e)
+			}
+		}
 	}
 
 	fun logout() {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.kt
index fd28fcdc6..c8b415092 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/WebDavImpl.kt
@@ -23,6 +23,7 @@ import org.cryptomator.domain.usecases.cloud.Progress
 import org.cryptomator.domain.usecases.cloud.UploadState
 import java.io.IOException
 import java.io.OutputStream
+import java.util.Date
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 internal class WebDavImpl(private val cloud: WebDavCloud, private val connectionHandler: ConnectionHandlerHandlerImpl, private val context: Context) {
@@ -133,7 +134,7 @@ internal class WebDavImpl(private val cloud: WebDavCloud, private val connection
 					)
 				}
 			}.use {
-				connectionHandler.writeFile(absoluteUriFrom(uploadFile.path), it)
+				connectionHandler.writeFile(absoluteUriFrom(uploadFile.path), it, data.modifiedDate(context).orElse(Date()))
 			}
 		} ?: throw FatalBackendException("InputStream shouldn't bee null")
 
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/ConnectionHandlerHandlerImpl.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/ConnectionHandlerHandlerImpl.kt
index 49bd6309a..6063efb54 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/ConnectionHandlerHandlerImpl.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/ConnectionHandlerHandlerImpl.kt
@@ -5,6 +5,7 @@ import org.cryptomator.data.cloud.webdav.WebDavNode
 import org.cryptomator.domain.CloudFolder
 import org.cryptomator.domain.exception.BackendException
 import java.io.InputStream
+import java.util.Date
 import javax.inject.Inject
 
 class ConnectionHandlerHandlerImpl @Inject internal constructor(httpClient: WebDavCompatibleHttpClient) {
@@ -27,8 +28,8 @@ class ConnectionHandlerHandlerImpl @Inject internal constructor(httpClient: WebD
 	}
 
 	@Throws(BackendException::class)
-	fun writeFile(url: String, inputStream: InputStream) {
-		webDavClient.writeFile(url, inputStream)
+	fun writeFile(url: String, inputStream: InputStream, modifiedDate: Date) {
+		webDavClient.writeFile(url, inputStream, modifiedDate)
 	}
 
 	@Throws(BackendException::class)
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/InputStreamSourceBasedRequestBody.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/InputStreamSourceBasedRequestBody.kt
index 51db86cff..202615641 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/InputStreamSourceBasedRequestBody.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/InputStreamSourceBasedRequestBody.kt
@@ -13,7 +13,17 @@ internal class InputStreamSourceBasedRequestBody private constructor(private val
 
 	@Throws(IOException::class)
 	override fun contentLength(): Long {
-		return inputStream.available().toLong()
+		val availableBytes = inputStream.available()
+		/**
+		 * inputStream.available() is an int and if the file to upload is > int.max it will overflow to 0.
+		 * In this case we set contentLength to -1, which is fine, it just means the length is unknown.
+		 * If inputStream.available() is actually 0, it does no harm either because we are not uploading a byte.
+		 */
+		return if (availableBytes != 0) {
+			availableBytes.toLong()
+		} else {
+			-1
+		}
 	}
 
 	override fun contentType(): MediaType? {
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt
index 51448cd1c..0e99cae0e 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindEntryData.kt
@@ -39,7 +39,7 @@ internal class PropfindEntryData {
 	fun setPath(pathOrUri: String) {
 		path = extractPath(pathOrUri).also {
 			var pathSegs = it.split("/")
-			if(pathSegs.last() == "") {
+			if (pathSegs.last() == "") {
 				pathSegs = pathSegs.subList(0, pathSegs.size - 1)
 			}
 			pathSegments = pathSegs.toTypedArray()
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt
index 1e9856c62..8bd1185ad 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParser.kt
@@ -7,7 +7,6 @@ import org.xmlpull.v1.XmlPullParserException
 import org.xmlpull.v1.XmlPullParserFactory
 import java.io.IOException
 import java.io.InputStream
-import java.util.ArrayList
 import java.util.Date
 import timber.log.Timber
 
diff --git a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavClient.kt b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavClient.kt
index 620412335..1bdf3249e 100644
--- a/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavClient.kt
+++ b/data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavClient.kt
@@ -18,6 +18,7 @@ import java.io.IOException
 import java.io.InputStream
 import java.net.HttpURLConnection
 import java.util.Collections
+import java.util.Date
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -150,8 +151,9 @@ internal class WebDavClient(private val httpClient: WebDavCompatibleHttpClient)
 	}
 
 	@Throws(BackendException::class)
-	fun writeFile(url: String, inputStream: InputStream) {
+	fun writeFile(url: String, inputStream: InputStream, modifiedDate: Date) {
 		val builder = Request.Builder() //
+			.addHeader("X-OC-Mtime", modifiedDate.toInstant().toEpochMilli().div(1000).toString()) //
 			.put(InputStreamSourceBasedRequestBody.from(inputStream)) //
 			.url(url)
 		try {
diff --git a/data/src/main/java/org/cryptomator/data/repository/UpdateCheckRepositoryImpl.java b/data/src/main/java/org/cryptomator/data/repository/UpdateCheckRepositoryImpl.java
index b768ad661..431438e41 100644
--- a/data/src/main/java/org/cryptomator/data/repository/UpdateCheckRepositoryImpl.java
+++ b/data/src/main/java/org/cryptomator/data/repository/UpdateCheckRepositoryImpl.java
@@ -3,6 +3,10 @@
 import android.content.Context;
 import android.net.Uri;
 
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.auth0.jwt.interfaces.JWTVerifier;
 import com.google.common.base.Optional;
 import com.google.common.io.BaseEncoding;
 
@@ -32,8 +36,6 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -44,7 +46,7 @@
 @Singleton
 public class UpdateCheckRepositoryImpl implements UpdateCheckRepository {
 
-	private static final String HOSTNAME_LATEST_VERSION = "https://static.cryptomator.org/android/latest-version.json";
+	private static final String HOSTNAME_LATEST_VERSION = "https://api.cryptomator.org/android/latest-version.json";
 
 	private final Database database;
 	private final OkHttpClient httpClient;
@@ -263,16 +265,14 @@ private class LatestVersion {
 
 		LatestVersion(String json) throws GeneralUpdateErrorException {
 			try {
-				Claims jws = Jwts //
-						.parserBuilder().setSigningKey(getPublicKey()) //
-						.build() //
-						.parseClaimsJws(json) //
-						.getBody();
-
-				version = jws.get("version", String.class);
-				urlApk = jws.get("url", String.class);
-				apkSha256 = jws.get("apk_sha_256", String.class);
-				urlReleaseNote = jws.get("release_notes", String.class);
+				Algorithm algorithm = Algorithm.ECDSA256(getPublicKey(), null);
+				JWTVerifier verifier = JWT.require(algorithm).build();
+				DecodedJWT jwt = verifier.verify(json);
+
+				version = jwt.getClaim("version").asString();
+				urlApk = jwt.getClaim("url").asString();
+				apkSha256 = jwt.getClaim("apk_sha_256").asString();
+				urlReleaseNote = jwt.getClaim("release_notes").asString();
 			} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
 				throw new GeneralUpdateErrorException("Failed to parse latest version", e);
 			}
diff --git a/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt b/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt
index 9ad874201..7b07fca1a 100644
--- a/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt
+++ b/data/src/main/java/org/cryptomator/data/util/NetworkConnectionCheck.kt
@@ -27,7 +27,7 @@ class NetworkConnectionCheck @Inject internal constructor(private val context: C
 
 	fun checkWifiOnAndConnected(): Boolean {
 		val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-			val activeNetwork = connectivityManager.activeNetwork
-			return connectivityManager.getNetworkCapabilities(activeNetwork)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
+		val activeNetwork = connectivityManager.activeNetwork
+		return connectivityManager.getNetworkCapabilities(activeNetwork)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
 	}
 }
diff --git a/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt b/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt
index 67d3bb4de..bc668c8c8 100644
--- a/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt
+++ b/data/src/test/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProviderTest.kt
@@ -57,7 +57,7 @@ internal class MasterkeyCryptoCloudProviderTest {
 	private val masterkeyV7 =
 		"{  \"version\": 7,  \"scryptSalt\": \"AAAAAAAAAAA=\",  \"scryptCostParam\": 32768,  \"scryptBlockSize\": 8,  \"primaryMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\",  \"hmacMasterKey\": \"D2kc+xBoAcVY+M7s74YBEy6l7ga2+Nz+HS5o0TQY3JMW1uQ5jTlLIQ==\",  \"versionMac\": \"cn2sAK6l9p1/w9deJVUuW3h7br056mpv5srvALiYw+g=\"}"
 	private val vaultConfig =
-		"eyJraWQiOiJtYXN0ZXJrZXlmaWxlOm1hc3RlcmtleS5jcnlwdG9tYXRvciIsImFsZyI6IkhTMjU2In0.eyJmb3JtYXQiOjgsInNob3J0ZW5pbmdUaHJlc2hvbGQiOjIyMCwiY2lwaGVyQ29tYm8iOiJTSVZfR0NNIn0.-tDU6GyH7Iv-LAOnFdhpxei2Qyd7DLbx4hfY9Wywc_Y"
+		"eyJraWQiOiJtYXN0ZXJrZXlmaWxlOm1hc3RlcmtleS5jcnlwdG9tYXRvciIsImFsZyI6IkhTMjU2IiwidHlwIjoiSldUIn0.eyJqdGkiOiIiLCJmb3JtYXQiOjgsImNpcGhlckNvbWJvIjoiU0lWX0dDTSIsInNob3J0ZW5pbmdUaHJlc2hvbGQiOjIyMH0.HHMkCqK-kFv_TXAhrzgp8vuPhws_2NswhaAHB9hkKBs"
 
 	private var context: Context = mock()
 	private var cloud: Cloud = mock()
diff --git a/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java b/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java
index 71df4b48a..7752e058e 100644
--- a/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java
+++ b/data/src/test/java/org/cryptomator/data/cloud/webdav/network/PropfindResponseParserTest.java
@@ -18,7 +18,6 @@
 import java.util.Date;
 import java.util.List;
 
-import static java.util.Collections.sort;
 import static org.cryptomator.data.cloud.CloudFileMatcher.cloudFile;
 import static org.cryptomator.data.cloud.CloudFolderMatcher.cloudFolder;
 import static org.hamcrest.CoreMatchers.is;
@@ -26,6 +25,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.emptyCollectionOf;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static java.util.Collections.sort;
 
 @Disabled
 public class PropfindResponseParserTest {
diff --git a/domain/build.gradle b/domain/build.gradle
index 2d896054d..7b76c4b8e 100644
--- a/domain/build.gradle
+++ b/domain/build.gradle
@@ -19,8 +19,8 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 
 		coreLibraryDesugaringEnabled true
 	}
@@ -54,9 +54,7 @@ dependencies {
 
 	implementation dependencies.appcompat
 
-	api dependencies.jsonWebTokenApi
-	implementation dependencies.jsonWebTokenImpl
-	implementation dependencies.jsonWebTokenJson
+	implementation dependencies.jsonWebToken
 
 	// test
 	testImplementation dependencies.junit
diff --git a/domain/src/main/java/org/cryptomator/domain/Cloud.kt b/domain/src/main/java/org/cryptomator/domain/Cloud.kt
index 6c1f1e22e..30496875b 100644
--- a/domain/src/main/java/org/cryptomator/domain/Cloud.kt
+++ b/domain/src/main/java/org/cryptomator/domain/Cloud.kt
@@ -9,4 +9,5 @@ interface Cloud : Serializable {
 	fun configurationMatches(cloud: Cloud?): Boolean
 	fun persistent(): Boolean
 	fun requiresNetwork(): Boolean
+	fun isReadOnly(): Boolean //TODO Implement read-only checks
 }
diff --git a/domain/src/main/java/org/cryptomator/domain/DropboxCloud.java b/domain/src/main/java/org/cryptomator/domain/DropboxCloud.java
index 2178e3c75..db70d609e 100644
--- a/domain/src/main/java/org/cryptomator/domain/DropboxCloud.java
+++ b/domain/src/main/java/org/cryptomator/domain/DropboxCloud.java
@@ -58,6 +58,11 @@ public boolean requiresNetwork() {
 		return true;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@NotNull
 	@Override
 	public String toString() {
diff --git a/domain/src/main/java/org/cryptomator/domain/GoogleDriveCloud.java b/domain/src/main/java/org/cryptomator/domain/GoogleDriveCloud.java
index 8ebd70f0e..cb1b13ab5 100644
--- a/domain/src/main/java/org/cryptomator/domain/GoogleDriveCloud.java
+++ b/domain/src/main/java/org/cryptomator/domain/GoogleDriveCloud.java
@@ -58,6 +58,11 @@ public boolean requiresNetwork() {
 		return true;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@NotNull
 	@Override
 	public String toString() {
diff --git a/domain/src/main/java/org/cryptomator/domain/LocalStorageCloud.java b/domain/src/main/java/org/cryptomator/domain/LocalStorageCloud.java
index fb96449c6..6915a6e0a 100644
--- a/domain/src/main/java/org/cryptomator/domain/LocalStorageCloud.java
+++ b/domain/src/main/java/org/cryptomator/domain/LocalStorageCloud.java
@@ -57,6 +57,11 @@ public boolean requiresNetwork() {
 		return false;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@NotNull
 	@Override
 	public String toString() {
diff --git a/domain/src/main/java/org/cryptomator/domain/OnedriveCloud.java b/domain/src/main/java/org/cryptomator/domain/OnedriveCloud.java
index 8791bb7e3..389e4611c 100644
--- a/domain/src/main/java/org/cryptomator/domain/OnedriveCloud.java
+++ b/domain/src/main/java/org/cryptomator/domain/OnedriveCloud.java
@@ -53,6 +53,11 @@ public boolean requiresNetwork() {
 		return true;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@Override
 	public boolean configurationMatches(Cloud cloud) {
 		return cloud instanceof OnedriveCloud && configurationMatches((OnedriveCloud) cloud);
diff --git a/domain/src/main/java/org/cryptomator/domain/PCloud.java b/domain/src/main/java/org/cryptomator/domain/PCloud.java
index 89b016177..163da1e96 100644
--- a/domain/src/main/java/org/cryptomator/domain/PCloud.java
+++ b/domain/src/main/java/org/cryptomator/domain/PCloud.java
@@ -69,6 +69,11 @@ public boolean requiresNetwork() {
 		return true;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@NotNull
 	@Override
 	public String toString() {
diff --git a/domain/src/main/java/org/cryptomator/domain/S3Cloud.java b/domain/src/main/java/org/cryptomator/domain/S3Cloud.java
index 064cc93ad..ebc3c858b 100644
--- a/domain/src/main/java/org/cryptomator/domain/S3Cloud.java
+++ b/domain/src/main/java/org/cryptomator/domain/S3Cloud.java
@@ -90,6 +90,11 @@ public boolean requiresNetwork() {
 		return true;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@NotNull
 	@Override
 	public String toString() {
diff --git a/domain/src/main/java/org/cryptomator/domain/Vault.java b/domain/src/main/java/org/cryptomator/domain/Vault.java
index b142ad8a5..de66a6a76 100644
--- a/domain/src/main/java/org/cryptomator/domain/Vault.java
+++ b/domain/src/main/java/org/cryptomator/domain/Vault.java
@@ -87,6 +87,10 @@ public int getPosition() {
 		return position;
 	}
 
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@Override
 	public boolean equals(Object obj) {
 		if (obj == null || getClass() != obj.getClass()) {
diff --git a/domain/src/main/java/org/cryptomator/domain/WebDavCloud.java b/domain/src/main/java/org/cryptomator/domain/WebDavCloud.java
index ccb21dd6d..73f1f3d99 100644
--- a/domain/src/main/java/org/cryptomator/domain/WebDavCloud.java
+++ b/domain/src/main/java/org/cryptomator/domain/WebDavCloud.java
@@ -76,6 +76,11 @@ public boolean requiresNetwork() {
 		return true;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		return false; //TODO Implement read-only check
+	}
+
 	@NotNull
 	@Override
 	public String toString() {
diff --git a/domain/src/main/java/org/cryptomator/domain/exception/update/SSLHandshakePreAndroid5UpdateCheckException.java b/domain/src/main/java/org/cryptomator/domain/exception/update/SSLHandshakePreAndroid5UpdateCheckException.java
deleted file mode 100644
index 9cbd64da4..000000000
--- a/domain/src/main/java/org/cryptomator/domain/exception/update/SSLHandshakePreAndroid5UpdateCheckException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.cryptomator.domain.exception.update;
-
-import org.cryptomator.domain.exception.BackendException;
-
-public class SSLHandshakePreAndroid5UpdateCheckException extends BackendException {
-
-	public SSLHandshakePreAndroid5UpdateCheckException(final String message, javax.net.ssl.SSLHandshakeException e) {
-		super(message, e);
-	}
-
-}
diff --git a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
index 0c0c6833c..7f6d3d8a6 100644
--- a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
+++ b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/MissingVaultConfigFileException.java
@@ -3,4 +3,5 @@
 import org.cryptomator.domain.exception.BackendException;
 
 public class MissingVaultConfigFileException extends BackendException {
+
 }
diff --git a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/UnsupportedMasterkeyLocationException.java b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/UnsupportedMasterkeyLocationException.java
index 12c8b0d00..cae8834d4 100644
--- a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/UnsupportedMasterkeyLocationException.java
+++ b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/UnsupportedMasterkeyLocationException.java
@@ -1,10 +1,10 @@
 package org.cryptomator.domain.exception.vaultconfig;
 
+import com.auth0.jwt.exceptions.JWTVerificationException;
+
 import org.cryptomator.domain.UnverifiedVaultConfig;
 import org.cryptomator.domain.exception.BackendException;
 
-import io.jsonwebtoken.JwtException;
-
 public class UnsupportedMasterkeyLocationException extends BackendException {
 
 	UnverifiedVaultConfig unverifiedVaultConfig;
@@ -13,7 +13,7 @@ public UnsupportedMasterkeyLocationException(UnverifiedVaultConfig unverifiedVau
 		this.unverifiedVaultConfig = unverifiedVaultConfig;
 	}
 
-	public UnsupportedMasterkeyLocationException(String message, JwtException e) {
+	public UnsupportedMasterkeyLocationException(String message, JWTVerificationException e) {
 		super(message, e);
 	}
 }
diff --git a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/VaultConfigLoadException.java b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/VaultConfigLoadException.java
index 4fe159f29..088bfa708 100644
--- a/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/VaultConfigLoadException.java
+++ b/domain/src/main/java/org/cryptomator/domain/exception/vaultconfig/VaultConfigLoadException.java
@@ -1,8 +1,8 @@
 package org.cryptomator.domain.exception.vaultconfig;
 
-import org.cryptomator.domain.exception.BackendException;
+import com.auth0.jwt.exceptions.JWTVerificationException;
 
-import io.jsonwebtoken.JwtException;
+import org.cryptomator.domain.exception.BackendException;
 
 public class VaultConfigLoadException extends BackendException {
 
@@ -10,7 +10,7 @@ public VaultConfigLoadException(String message) {
 		super(message);
 	}
 
-	public VaultConfigLoadException(String message, JwtException e) {
+	public VaultConfigLoadException(String message, JWTVerificationException e) {
 		super(message, e);
 	}
 
diff --git a/domain/src/main/java/org/cryptomator/domain/repository/CloudContentRepository.kt b/domain/src/main/java/org/cryptomator/domain/repository/CloudContentRepository.kt
index f4ca070c7..b7ecb0420 100644
--- a/domain/src/main/java/org/cryptomator/domain/repository/CloudContentRepository.kt
+++ b/domain/src/main/java/org/cryptomator/domain/repository/CloudContentRepository.kt
@@ -67,6 +67,24 @@ interface CloudContentRepository<CloudType : Cloud, NodeType : CloudNode, DirTyp
 	@Throws(BackendException::class)
 	fun move(source: FileType, target: FileType): FileType
 
+	/**
+	 * @return created cloud folder (might be different from target)
+	 * @throws org.cryptomator.domain.exception.CloudNodeAlreadyExistsException If a cloud node with the same target name already exists
+	 */
+	@Throws(BackendException::class)
+	fun copy(source: DirType, target: DirType): DirType {
+		TODO()
+	}
+
+	/**
+	 * @return created cloud file (might be different from target)
+	 * @throws org.cryptomator.domain.exception.CloudNodeAlreadyExistsException If a cloud node with the same target name already exists
+	 */
+	@Throws(BackendException::class)
+	fun copy(source: FileType, target: FileType): FileType {
+		TODO()
+	}
+
 	/**
 	 * @throws org.cryptomator.domain.exception.CloudNodeAlreadyExistsException If a cloud node with the same file name already exists
 	 */
diff --git a/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java b/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java
index 469b2ac86..e3147f931 100644
--- a/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java
+++ b/domain/src/main/java/org/cryptomator/domain/repository/CloudRepository.java
@@ -1,5 +1,7 @@
 package org.cryptomator.domain.repository;
 
+import com.google.common.base.Optional;
+
 import org.cryptomator.domain.Cloud;
 import org.cryptomator.domain.CloudFolder;
 import org.cryptomator.domain.CloudType;
@@ -8,7 +10,6 @@
 import org.cryptomator.domain.exception.BackendException;
 import org.cryptomator.domain.usecases.cloud.Flag;
 import org.cryptomator.domain.usecases.vault.UnlockToken;
-import com.google.common.base.Optional;
 
 import java.util.List;
 
diff --git a/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java b/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java
index f43957636..3ab1d3f28 100644
--- a/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java
+++ b/domain/src/main/java/org/cryptomator/domain/repository/UpdateCheckRepository.java
@@ -1,9 +1,10 @@
 package org.cryptomator.domain.repository;
 
+import com.google.common.base.Optional;
+
 import org.cryptomator.domain.exception.BackendException;
 import org.cryptomator.domain.exception.update.GeneralUpdateErrorException;
 import org.cryptomator.domain.usecases.UpdateCheck;
-import com.google.common.base.Optional;
 
 import java.io.File;
 
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/DoLicenseCheck.java b/domain/src/main/java/org/cryptomator/domain/usecases/DoLicenseCheck.java
index dd624e061..c9497a4af 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/DoLicenseCheck.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/DoLicenseCheck.java
@@ -1,5 +1,11 @@
 package org.cryptomator.domain.usecases;
 
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTDecodeException;
+import com.auth0.jwt.exceptions.SignatureVerificationException;
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.auth0.jwt.interfaces.JWTVerifier;
 import com.google.common.io.BaseEncoding;
 
 import org.cryptomator.domain.exception.BackendException;
@@ -18,11 +24,6 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.JwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.security.SignatureException;
-
 @UseCase
 public class DoLicenseCheck {
 
@@ -45,10 +46,12 @@ public class DoLicenseCheck {
 	public LicenseCheck execute() throws BackendException {
 		license = useLicenseOrRetrieveFromDb(license);
 		try {
-			final Claims claims = Jwts.parserBuilder().setSigningKey(getPublicKey(ANDROID_PUB_KEY)).build().parseClaimsJws(license).getBody();
-			return claims::getSubject;
-		} catch (JwtException | FatalBackendException e) {
-			if (e instanceof SignatureException && isDesktopSupporterCertificate(license)) {
+			Algorithm algorithm = Algorithm.ECDSA512(getPublicKey(ANDROID_PUB_KEY), null);
+			JWTVerifier verifier = JWT.require(algorithm).build();
+			DecodedJWT jwt = verifier.verify(license);
+			return jwt::getSubject;
+		} catch (SignatureVerificationException | JWTDecodeException | FatalBackendException e) {
+			if (e instanceof SignatureVerificationException && isDesktopSupporterCertificate(license)) {
 				throw new DesktopSupporterCertificateException(license);
 			}
 			throw new LicenseNotValidException(license);
@@ -81,9 +84,11 @@ private ECPublicKey getPublicKey(String publicKey) throws NoSuchAlgorithmExcepti
 
 	private boolean isDesktopSupporterCertificate(String license) {
 		try {
-			Jwts.parserBuilder().setSigningKey(getPublicKey(DESKTOP_SUPPORTER_CERTIFICATE_PUB_KEY)).build().parseClaimsJws(license);
+			Algorithm algorithm = Algorithm.ECDSA512(getPublicKey(DESKTOP_SUPPORTER_CERTIFICATE_PUB_KEY), null);
+			JWTVerifier verifier = JWT.require(algorithm).build();
+			verifier.verify(license);
 			return true;
-		} catch (JwtException | NoSuchAlgorithmException | InvalidKeySpecException e) {
+		} catch (SignatureVerificationException | NoSuchAlgorithmException | InvalidKeySpecException e) {
 			return false;
 		}
 	}
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java b/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java
index 01f158ac9..73e193824 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/DoUpdateCheck.java
@@ -1,10 +1,11 @@
 package org.cryptomator.domain.usecases;
 
+import com.google.common.base.Optional;
+
 import org.cryptomator.domain.exception.BackendException;
 import org.cryptomator.domain.repository.UpdateCheckRepository;
 import org.cryptomator.generator.Parameter;
 import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
 
 @UseCase
 public class DoUpdateCheck {
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/ByteArrayDataSource.kt b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/ByteArrayDataSource.kt
index 7fb94639b..b3cd1b1d0 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/ByteArrayDataSource.kt
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/ByteArrayDataSource.kt
@@ -1,9 +1,11 @@
 package org.cryptomator.domain.usecases.cloud
 
 import android.content.Context
+import org.cryptomator.util.Optional
 import java.io.ByteArrayInputStream
 import java.io.IOException
 import java.io.InputStream
+import java.util.Date
 
 class ByteArrayDataSource private constructor(private val bytes: ByteArray) : DataSource {
 
@@ -25,6 +27,10 @@ class ByteArrayDataSource private constructor(private val bytes: ByteArray) : Da
 		// do nothing because ByteArrayInputStream need no close
 	}
 
+	override fun modifiedDate(context: Context): Optional<Date> {
+		return Optional.empty()
+	}
+
 	companion object {
 
 		@JvmStatic
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/CancelAwareDataSource.kt b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/CancelAwareDataSource.kt
index 5c1a82e25..c031b8c41 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/CancelAwareDataSource.kt
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/CancelAwareDataSource.kt
@@ -2,8 +2,10 @@ package org.cryptomator.domain.usecases.cloud
 
 import android.content.Context
 import org.cryptomator.domain.exception.CancellationException
+import org.cryptomator.util.Optional
 import java.io.IOException
 import java.io.InputStream
+import java.util.Date
 
 class CancelAwareDataSource private constructor(private val delegate: DataSource, private val cancelled: Flag) : DataSource {
 
@@ -31,6 +33,13 @@ class CancelAwareDataSource private constructor(private val delegate: DataSource
 		delegate.close()
 	}
 
+	override fun modifiedDate(context: Context): Optional<Date> {
+		if (cancelled.get()) {
+			throw CancellationException()
+		}
+		return delegate.modifiedDate(context)
+	}
+
 	companion object {
 
 		@JvmStatic
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/DataSource.kt b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/DataSource.kt
index 9f965d2d9..ddc0e13b8 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/DataSource.kt
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/DataSource.kt
@@ -1,10 +1,12 @@
 package org.cryptomator.domain.usecases.cloud
 
 import android.content.Context
+import org.cryptomator.util.Optional
 import java.io.Closeable
 import java.io.IOException
 import java.io.InputStream
 import java.io.Serializable
+import java.util.Date
 
 interface DataSource : Serializable, Closeable {
 
@@ -15,4 +17,6 @@ interface DataSource : Serializable, Closeable {
 
 	fun decorate(delegate: DataSource): DataSource
 
+	fun modifiedDate(context: Context): Optional<Date>
+
 }
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/FileBasedDataSource.kt b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/FileBasedDataSource.kt
index 499645682..1d373e1c8 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/FileBasedDataSource.kt
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/FileBasedDataSource.kt
@@ -1,10 +1,12 @@
 package org.cryptomator.domain.usecases.cloud
 
 import android.content.Context
+import org.cryptomator.util.Optional
 import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
 import java.io.InputStream
+import java.util.Date
 
 class FileBasedDataSource private constructor(private val file: File) : DataSource {
 
@@ -26,6 +28,10 @@ class FileBasedDataSource private constructor(private val file: File) : DataSour
 		// Do nothing
 	}
 
+	override fun modifiedDate(context: Context): Optional<Date> {
+		return Optional.of(Date(file.lastModified()))
+	}
+
 	companion object {
 
 		@JvmStatic
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/UploadFiles.java b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/UploadFiles.java
index 284e2a88f..375d34393 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/cloud/UploadFiles.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/cloud/UploadFiles.java
@@ -105,6 +105,7 @@ private File copyDataToFile(DataSource dataSource) {
 			InputStream in = CancelAwareDataSource.wrap(dataSource, cancelledFlag).open(context);
 			OutputStream out = new FileOutputStream(target);
 			copy(in, out);
+			dataSource.modifiedDate(context).ifPresent(value -> target.setLastModified(value.getTime()));
 			return target;
 		} catch (IOException e) {
 			throw new FatalBackendException(e);
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java
index 198002d10..b3b16e7b5 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/ChangePassword.java
@@ -1,5 +1,7 @@
 package org.cryptomator.domain.usecases.vault;
 
+import com.google.common.base.Optional;
+
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.domain.UnverifiedVaultConfig;
 import org.cryptomator.domain.Vault;
@@ -9,7 +11,6 @@
 import org.cryptomator.domain.repository.CloudRepository;
 import org.cryptomator.generator.Parameter;
 import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
 
 import static org.cryptomator.util.ExceptionUtil.contains;
 
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java
index 994f3f9ec..b7630c422 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/CheckVaultPassword.java
@@ -1,12 +1,13 @@
 package org.cryptomator.domain.usecases.vault;
 
+import com.google.common.base.Optional;
+
 import org.cryptomator.domain.UnverifiedVaultConfig;
 import org.cryptomator.domain.Vault;
 import org.cryptomator.domain.exception.BackendException;
 import org.cryptomator.domain.repository.CloudRepository;
 import org.cryptomator.generator.Parameter;
 import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
 
 @UseCase
 class CheckVaultPassword {
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt b/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt
index 3e5977e63..51146966b 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/MoveVaultHelper.kt
@@ -39,7 +39,7 @@ class MoveVaultHelper {
 		}
 
 		fun updateVaultsInDatabase(vaults: List<Vault>, vaultRepository: VaultRepository): List<Vault> {
-			for(vault in vaults) {
+			for (vault in vaults) {
 				vaultRepository.store(vault)
 			}
 			return vaultRepository.vaults()
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java
index ca2a24643..7031aba66 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/PrepareUnlock.java
@@ -1,5 +1,7 @@
 package org.cryptomator.domain.usecases.vault;
 
+import com.google.common.base.Optional;
+
 import org.cryptomator.domain.UnverifiedVaultConfig;
 import org.cryptomator.domain.Vault;
 import org.cryptomator.domain.exception.BackendException;
@@ -8,7 +10,6 @@
 import org.cryptomator.domain.repository.CloudRepository;
 import org.cryptomator.generator.Parameter;
 import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
 
 import static org.cryptomator.util.ExceptionUtil.contains;
 
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java
index 4703ceffd..3a4575e76 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UnlockVaultUsingMasterkey.java
@@ -1,5 +1,7 @@
 package org.cryptomator.domain.usecases.vault;
 
+import com.google.common.base.Optional;
+
 import org.cryptomator.domain.Cloud;
 import org.cryptomator.domain.UnverifiedVaultConfig;
 import org.cryptomator.domain.exception.BackendException;
@@ -7,7 +9,6 @@
 import org.cryptomator.domain.usecases.cloud.Flag;
 import org.cryptomator.generator.Parameter;
 import org.cryptomator.generator.UseCase;
-import com.google.common.base.Optional;
 
 @UseCase
 class UnlockVaultUsingMasterkey {
diff --git a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java
index 8b85d17ee..cb0ee5e0b 100644
--- a/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java
+++ b/domain/src/main/java/org/cryptomator/domain/usecases/vault/UpdateVaultParameterIfChangedRemotely.java
@@ -19,7 +19,7 @@ public UpdateVaultParameterIfChangedRemotely(VaultRepository vaultRepository, @P
 
 	public Vault execute() throws BackendException {
 		Vault oldVault = vaultRepository.load(vault.getId());
-		if(oldVault.getFormat() == vault.getFormat() && oldVault.getShorteningThreshold() == vault.getShorteningThreshold()) {
+		if (oldVault.getFormat() == vault.getFormat() && oldVault.getShorteningThreshold() == vault.getShorteningThreshold()) {
 			return vault;
 		} else {
 			return vaultRepository.store(vault);
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt
index 7975ae63c..1cfdbcb44 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DataSourceCapturingAnswer.kt
@@ -13,7 +13,7 @@ internal class DataSourceCapturingAnswer<T>(private val result: T, private val a
 
 	private lateinit var out: ByteArrayOutputStream
 
-	private val context : Context = mock()
+	private val context: Context = mock()
 
 	@Throws(Throwable::class)
 	override fun answer(invocation: InvocationOnMock): T {
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java
index 9f27f0956..2b0f3470f 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DeleteNodeTest.java
@@ -11,12 +11,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static java.util.Collections.singletonList;
 
 public class DeleteNodeTest {
 
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java
index 481d8fa16..065e0c5c3 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/DownloadFileTest.java
@@ -10,14 +10,14 @@
 import java.io.OutputStream;
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 
 public class DownloadFileTest {
 
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java
index 25bc28e89..ff25f60fc 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFileTest.java
@@ -10,14 +10,14 @@
 
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 
 public class MoveFileTest {
 
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java
index f9a460ee7..36832a147 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/MoveFolderTest.java
@@ -10,13 +10,13 @@
 
 import java.util.List;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 
 public class MoveFolderTest {
 
diff --git a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt
index 23c2f327e..6db6f4948 100644
--- a/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt
+++ b/domain/src/test/java/org/cryptomator/domain/usecases/cloud/UploadFileTest.kt
@@ -8,6 +8,7 @@ import org.cryptomator.domain.CloudNode
 import org.cryptomator.domain.exception.BackendException
 import org.cryptomator.domain.repository.CloudContentRepository
 import org.cryptomator.domain.usecases.ProgressAware
+import org.cryptomator.util.Optional
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
 import org.junit.jupiter.params.ParameterizedTest
@@ -21,14 +22,15 @@ import java.io.ByteArrayInputStream
 import java.io.IOException
 import java.io.InputStream
 import java.util.Arrays
+import java.util.Date
 
 class UploadFileTest {
 
-	private val context :Context = mock()
+	private val context: Context = mock()
 	private var cloudContentRepository: CloudContentRepository<Cloud, CloudNode, CloudFolder, CloudFile> = mock()
-	private val parent :CloudFolder = mock()
-	private val targetFile :CloudFile = mock()
-	private val resultFile :CloudFile = mock()
+	private val parent: CloudFolder = mock()
+	private val targetFile: CloudFile = mock()
+	private val resultFile: CloudFile = mock()
 
 	private val progressAware: ProgressAware<UploadState> = mock()
 
@@ -44,8 +46,8 @@ class UploadFileTest {
 		val dataSource = dataSourceWithBytes(0, fileSize, fileSize)
 		val inTest = testCandidate(dataSource, replacing)
 
-		 whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
-		 whenever(
+		whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
+		whenever(
 			cloudContentRepository.write(
 				same(targetFile),
 				any(DataSource::class.java),
@@ -68,9 +70,9 @@ class UploadFileTest {
 		val fileSize: Long = 8893
 		dataSourceWithBytes(85, fileSize, null).use { dataSource ->
 			val inTest = testCandidate(dataSource, replacing)
-			 whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
+			whenever(cloudContentRepository.file(parent, fileName, fileSize)).thenReturn(targetFile)
 			val capturedStreamData = DataSourceCapturingAnswer<Any?>(resultFile, 1)
-			 whenever(
+			whenever(
 				cloudContentRepository.write(
 					same(targetFile),
 					any(DataSource::class.java),
@@ -105,6 +107,10 @@ class UploadFileTest {
 				return delegate
 			}
 
+			override fun modifiedDate(context: Context): Optional<Date> {
+				return Optional.of(Date())
+			}
+
 			@Throws(IOException::class)
 			override fun close() {
 				// do nothing
diff --git a/fastlane/izzyscript/result_apkstore.json b/fastlane/izzyscript/result_apkstore.json
index 336c3eef4..ba45af20c 100644
--- a/fastlane/izzyscript/result_apkstore.json
+++ b/fastlane/izzyscript/result_apkstore.json
@@ -1 +1 @@
-{"applicationId":"org.cryptomator","emoji":[],"labels":["scanner-warning"],"report":"<h3>APK library scanner</h3><details open>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<b>Offending libs:</b><br>\n<ul>\n  <li>Azure SDK for Java (/com/azure): <b>NonFreeNet</b></li>\n  <li>Dropbox Core SDK for Java (/com/dropbox/core): <b>NonFreeNet</b></li>\n  <li>Google Mobile Services (/com/google/android/gms): <b>NonFreeDep</b></li>\n  <li>Google API Client Libraries (/com/google/api/client): <b>NonFreeNet</b></li>\n  <li>Google Drive API (/com/google/api/services/drive): <b>NonFreeDep,NonFreeNet</b></li>\n  <li>Google Java API Client Services (/com/google/api/services): <b>NonFreeNet</b></li>\n  <li>Microsoft Authentication Library (/com/microsoft/identity): <b>NonFreeNet</b></li>\n  <li>pCloud Java SDK (/com/pcloud/sdk): <b>NonFreeNet</b></li>\n</ul>\n8 offender(s). Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater'>Asynclayoutinflater</a></td><td>/androidx/asynclayoutinflater</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/browser'>Browser</a></td><td>/androidx/browser</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Azure/azure-sdk-for-java'>Azure SDK for Java</a></td><td>/com/azure</td><td>Development Framework</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/woodstox'>Woodstox</a></td><td>/com/ctc/wstx</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/dropbox/dropbox-sdk-java'>Dropbox Core SDK for Java</a></td><td>/com/dropbox/core</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developers.google.com/android/reference/com/google/android/gms/package-summary'>Google Mobile Services</a></td><td>/com/google/android/gms</td><td>Development Framework</td><td>Proprietary</td><td>NonFreeDep</td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client'>Google API Client Libraries</a></td><td>/com/google/api/client</td><td>Development Framework</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive'>Google Drive API</a></td><td>/com/google/api/services/drive</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeDep,NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services'>Google Java API Client Services</a></td><td>/com/google/api/services</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/j2objc'>J2ObjC</a></td><td>/com/google/j2objc</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/azure-activedirectory-library-for-android'>Microsoft Azure Active Directory Authentication Library</a></td><td>/com/microsoft/aad/adal</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoft/surface-duo-sdk'>Surface Duo SDK</a></td><td>/com/microsoft/device/dualscreen</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoftgraph/msgraph-sdk-java'>Microsoft Graph-SDK</a></td><td>/com/microsoft/graph</td><td>Development Framework</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/microsoft-authentication-library-for-android'>Microsoft Authentication Library</a></td><td>/com/microsoft/identity</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/gesellix/Nimbus-JOSE-JWT'>Nimbus JOSE+JWT</a></td><td>/com/nimbusds/jose</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/pCloud/pcloud-sdk-java'>pCloud Java SDK</a></td><td>/com/pcloud/sdk</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/Yubico/yubikit-android'>Yubico Mobile Android SDK</a></td><td>/com/yubico/yubikit</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/smarek/httpclient-android'>HttpClient Android repackaged</a></td><td>/cz/msebera/android/httpclient</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://findbugs.sourceforge.net/'>FindBugs</a></td><td>/edu/umd/cs/findbugs</td><td>Utility</td><td>LGPL-3.0-or-later</td><td></td></tr>\n<tr><td><a href='https://github.com/jwtk/jjwt'>Java JWT</a></td><td>/io/jsonwebtoken</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stephenc/jcip-annotations'>JCIP Annotations</a></td><td>/net/jcip/annotations</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://hc.apache.org/'>Apache Http</a></td><td>/org/apache/http</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/stax2-api'>Stax2 API</a></td><td>/org/codehaus/stax2</td><td>Utility</td><td>BSD</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stleary/JSON-java'>JSON in Java</a></td><td>/org/json</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/reactor/reactor-core'>Reactor Core</a></td><td>/reactor/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/asynclayoutinflater","name":"Asynclayoutinflater","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/browser","name":"Browser","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/browser","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/azure","name":"Azure SDK for Java","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/Azure/azure-sdk-for-java","license":"MIT"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/ctc/wstx","name":"Woodstox","typ":"Utility","anti":"","url":"https://github.com/FasterXML/woodstox","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/dropbox/core","name":"Dropbox Core SDK for Java","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/dropbox/dropbox-sdk-java","license":"MIT"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/gms","name":"Google Mobile Services","typ":"Development Framework","anti":"NonFreeDep","url":"https://developers.google.com/android/reference/com/google/android/gms/package-summary","license":"Proprietary"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/api/client","name":"Google API Client Libraries","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client","license":"Apache-2.0"},{"id":"/com/google/api/services/drive","name":"Google Drive API","typ":"Utility","anti":"NonFreeDep,NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive","license":"Apache-2.0"},{"id":"/com/google/api/services","name":"Google Java API Client Services","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/google/j2objc","name":"J2ObjC","typ":"Utility","anti":"","url":"https://github.com/google/j2objc","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/microsoft/aad/adal","name":"Microsoft Azure Active Directory Authentication Library","typ":"Utility","anti":"","url":"https://github.com/AzureAD/azure-activedirectory-library-for-android","license":"MIT"},{"id":"/com/microsoft/device/dualscreen","name":"Surface Duo SDK","typ":"Utility","anti":"","url":"https://github.com/microsoft/surface-duo-sdk","license":"MIT"},{"id":"/com/microsoft/graph","name":"Microsoft Graph-SDK","typ":"Development Framework","anti":"","url":"https://github.com/microsoftgraph/msgraph-sdk-java","license":"MIT"},{"id":"/com/microsoft/identity","name":"Microsoft Authentication Library","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/AzureAD/microsoft-authentication-library-for-android","license":"MIT"},{"id":"/com/nimbusds/jose","name":"Nimbus JOSE+JWT","typ":"Utility","anti":"","url":"https://github.com/gesellix/Nimbus-JOSE-JWT","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/pcloud/sdk","name":"pCloud Java SDK","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/pCloud/pcloud-sdk-java","license":"Apache-2.0"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/com/yubico/yubikit","name":"Yubico Mobile Android SDK","typ":"Utility","anti":"","url":"https://github.com/Yubico/yubikit-android","license":"Apache-2.0"},{"id":"/cz/msebera/android/httpclient","name":"HttpClient Android repackaged","typ":"Utility","anti":"","url":"https://github.com/smarek/httpclient-android","license":"Apache-2.0"},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/edu/umd/cs/findbugs","name":"FindBugs","typ":"Utility","anti":"","url":"http://findbugs.sourceforge.net/","license":"LGPL-3.0-or-later"},{"id":"/io/jsonwebtoken","name":"Java JWT","typ":"Utility","anti":"","url":"https://github.com/jwtk/jjwt","license":"Apache-2.0"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/net/jcip/annotations","name":"JCIP Annotations","typ":"Utility","anti":"","url":"https://github.com/stephenc/jcip-annotations","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/apache/http","name":"Apache Http","typ":"Utility","anti":"","url":"https://hc.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/codehaus/stax2","name":"Stax2 API","typ":"Utility","anti":"","url":"https://github.com/FasterXML/stax2-api","license":"BSD"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/json","name":"JSON in Java","typ":"Utility","anti":"","url":"https://github.com/stleary/JSON-java","license":"MIT"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/reactor/core","name":"Reactor Core","typ":"Utility","anti":"","url":"https://github.com/reactor/reactor-core","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3386 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 74877 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 103 libraries, 8 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
+{"applicationId":"org.cryptomator","emoji":[],"labels":["scanner-warning"],"report":"<h3>APK library scanner</h3><details open>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<b>Offending libs:</b><br>\n<ul>\n  <li>Azure SDK for Java (/com/azure): <b>NonFreeNet</b></li>\n  <li>Dropbox Core SDK for Java (/com/dropbox/core): <b>NonFreeNet</b></li>\n  <li>Google Mobile Services (/com/google/android/gms): <b>NonFreeComp</b></li>\n  <li>Google API Client Libraries (/com/google/api/client): <b>NonFreeNet</b></li>\n  <li>Google Drive API (/com/google/api/services/drive): <b>NonFreeDep,NonFreeNet</b></li>\n  <li>Google Java API Client Services (/com/google/api/services): <b>NonFreeNet</b></li>\n  <li>Microsoft Authentication Library (/com/microsoft/identity): <b>NonFreeNet</b></li>\n  <li>pCloud Java SDK (/com/pcloud/sdk): <b>NonFreeNet</b></li>\n</ul>\n8 offender(s). Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater'>Asynclayoutinflater</a></td><td>/androidx/asynclayoutinflater</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/browser'>Browser</a></td><td>/androidx/browser</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Azure/azure-sdk-for-java'>Azure SDK for Java</a></td><td>/com/azure</td><td>Development Framework</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/woodstox'>Woodstox</a></td><td>/com/ctc/wstx</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/dropbox/dropbox-sdk-java'>Dropbox Core SDK for Java</a></td><td>/com/dropbox/core</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developers.google.com/android/reference/com/google/android/gms/package-summary'>Google Mobile Services</a></td><td>/com/google/android/gms</td><td>Development Framework</td><td>Proprietary</td><td>NonFreeComp</td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client'>Google API Client Libraries</a></td><td>/com/google/api/client</td><td>Development Framework</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive'>Google Drive API</a></td><td>/com/google/api/services/drive</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeDep,NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services'>Google Java API Client Services</a></td><td>/com/google/api/services</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/j2objc'>J2ObjC</a></td><td>/com/google/j2objc</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/azure-activedirectory-library-for-android'>Microsoft Azure Active Directory Authentication Library</a></td><td>/com/microsoft/aad/adal</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoft/surface-duo-sdk'>Surface Duo SDK</a></td><td>/com/microsoft/device/dualscreen</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoftgraph/msgraph-sdk-java'>Microsoft Graph-SDK</a></td><td>/com/microsoft/graph</td><td>Development Framework</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/microsoft-authentication-library-for-android'>Microsoft Authentication Library</a></td><td>/com/microsoft/identity</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/gesellix/Nimbus-JOSE-JWT'>Nimbus JOSE+JWT</a></td><td>/com/nimbusds/jose</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/pCloud/pcloud-sdk-java'>pCloud Java SDK</a></td><td>/com/pcloud/sdk</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/Yubico/yubikit-android'>Yubico Mobile Android SDK</a></td><td>/com/yubico/yubikit</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/smarek/httpclient-android'>HttpClient Android repackaged</a></td><td>/cz/msebera/android/httpclient</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://findbugs.sourceforge.net/'>FindBugs</a></td><td>/edu/umd/cs/findbugs</td><td>Utility</td><td>LGPL-3.0-or-later</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize'>kotlin-parcelize</a></td><td>/kotlinx/parcelize</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stephenc/jcip-annotations'>JCIP Annotations</a></td><td>/net/jcip/annotations</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://hc.apache.org/'>Apache Http</a></td><td>/org/apache/http</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/stax2-api'>Stax2 API</a></td><td>/org/codehaus/stax2</td><td>Utility</td><td>BSD</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/reactor/reactor-core'>Reactor Core</a></td><td>/reactor/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/asynclayoutinflater","name":"Asynclayoutinflater","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/browser","name":"Browser","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/browser","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/azure","name":"Azure SDK for Java","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/Azure/azure-sdk-for-java","license":"MIT"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/ctc/wstx","name":"Woodstox","typ":"Utility","anti":"","url":"https://github.com/FasterXML/woodstox","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/dropbox/core","name":"Dropbox Core SDK for Java","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/dropbox/dropbox-sdk-java","license":"MIT"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/gms","name":"Google Mobile Services","typ":"Development Framework","anti":"NonFreeComp","url":"https://developers.google.com/android/reference/com/google/android/gms/package-summary","license":"Proprietary"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/api/client","name":"Google API Client Libraries","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client","license":"Apache-2.0"},{"id":"/com/google/api/services/drive","name":"Google Drive API","typ":"Utility","anti":"NonFreeDep,NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive","license":"Apache-2.0"},{"id":"/com/google/api/services","name":"Google Java API Client Services","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/google/j2objc","name":"J2ObjC","typ":"Utility","anti":"","url":"https://github.com/google/j2objc","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/microsoft/aad/adal","name":"Microsoft Azure Active Directory Authentication Library","typ":"Utility","anti":"","url":"https://github.com/AzureAD/azure-activedirectory-library-for-android","license":"MIT"},{"id":"/com/microsoft/device/dualscreen","name":"Surface Duo SDK","typ":"Utility","anti":"","url":"https://github.com/microsoft/surface-duo-sdk","license":"MIT"},{"id":"/com/microsoft/graph","name":"Microsoft Graph-SDK","typ":"Development Framework","anti":"","url":"https://github.com/microsoftgraph/msgraph-sdk-java","license":"MIT"},{"id":"/com/microsoft/identity","name":"Microsoft Authentication Library","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/AzureAD/microsoft-authentication-library-for-android","license":"MIT"},{"id":"/com/nimbusds/jose","name":"Nimbus JOSE+JWT","typ":"Utility","anti":"","url":"https://github.com/gesellix/Nimbus-JOSE-JWT","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/pcloud/sdk","name":"pCloud Java SDK","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/pCloud/pcloud-sdk-java","license":"Apache-2.0"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/com/yubico/yubikit","name":"Yubico Mobile Android SDK","typ":"Utility","anti":"","url":"https://github.com/Yubico/yubikit-android","license":"Apache-2.0"},{"id":"/cz/msebera/android/httpclient","name":"HttpClient Android repackaged","typ":"Utility","anti":"","url":"https://github.com/smarek/httpclient-android","license":"Apache-2.0"},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/edu/umd/cs/findbugs","name":"FindBugs","typ":"Utility","anti":"","url":"http://findbugs.sourceforge.net/","license":"LGPL-3.0-or-later"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/kotlinx/parcelize","name":"kotlin-parcelize","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize","license":"Apache-2.0"},{"id":"/net/jcip/annotations","name":"JCIP Annotations","typ":"Utility","anti":"","url":"https://github.com/stephenc/jcip-annotations","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/apache/http","name":"Apache Http","typ":"Utility","anti":"","url":"https://hc.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/codehaus/stax2","name":"Stax2 API","typ":"Utility","anti":"","url":"https://github.com/FasterXML/stax2-api","license":"BSD"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/reactor/core","name":"Reactor Core","typ":"Utility","anti":"","url":"https://github.com/reactor/reactor-core","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3791 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 80668 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 102 libraries, 8 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
diff --git a/fastlane/izzyscript/result_fdroid.json b/fastlane/izzyscript/result_fdroid.json
index eef17f87d..4ce0050db 100644
--- a/fastlane/izzyscript/result_fdroid.json
+++ b/fastlane/izzyscript/result_fdroid.json
@@ -1 +1 @@
-{"applicationId":"org.cryptomator","emoji":[],"labels":["scanner-warning"],"report":"<h3>APK library scanner</h3><details open>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<b>Offending libs:</b><br>\n<ul>\n  <li>Azure SDK for Java (/com/azure): <b>NonFreeNet</b></li>\n  <li>Dropbox Core SDK for Java (/com/dropbox/core): <b>NonFreeNet</b></li>\n  <li>Microsoft Authentication Library (/com/microsoft/identity): <b>NonFreeNet</b></li>\n  <li>pCloud Java SDK (/com/pcloud/sdk): <b>NonFreeNet</b></li>\n</ul>\n4 offender(s). Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater'>Asynclayoutinflater</a></td><td>/androidx/asynclayoutinflater</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/browser'>Browser</a></td><td>/androidx/browser</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Azure/azure-sdk-for-java'>Azure SDK for Java</a></td><td>/com/azure</td><td>Development Framework</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/woodstox'>Woodstox</a></td><td>/com/ctc/wstx</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/dropbox/dropbox-sdk-java'>Dropbox Core SDK for Java</a></td><td>/com/dropbox/core</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/j2objc'>J2ObjC</a></td><td>/com/google/j2objc</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/azure-activedirectory-library-for-android'>Microsoft Azure Active Directory Authentication Library</a></td><td>/com/microsoft/aad/adal</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoft/surface-duo-sdk'>Surface Duo SDK</a></td><td>/com/microsoft/device/dualscreen</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoftgraph/msgraph-sdk-java'>Microsoft Graph-SDK</a></td><td>/com/microsoft/graph</td><td>Development Framework</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/microsoft-authentication-library-for-android'>Microsoft Authentication Library</a></td><td>/com/microsoft/identity</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/gesellix/Nimbus-JOSE-JWT'>Nimbus JOSE+JWT</a></td><td>/com/nimbusds/jose</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/pCloud/pcloud-sdk-java'>pCloud Java SDK</a></td><td>/com/pcloud/sdk</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/Yubico/yubikit-android'>Yubico Mobile Android SDK</a></td><td>/com/yubico/yubikit</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/smarek/httpclient-android'>HttpClient Android repackaged</a></td><td>/cz/msebera/android/httpclient</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://findbugs.sourceforge.net/'>FindBugs</a></td><td>/edu/umd/cs/findbugs</td><td>Utility</td><td>LGPL-3.0-or-later</td><td></td></tr>\n<tr><td><a href='https://github.com/jwtk/jjwt'>Java JWT</a></td><td>/io/jsonwebtoken</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stephenc/jcip-annotations'>JCIP Annotations</a></td><td>/net/jcip/annotations</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/stax2-api'>Stax2 API</a></td><td>/org/codehaus/stax2</td><td>Utility</td><td>BSD</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stleary/JSON-java'>JSON in Java</a></td><td>/org/json</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/reactor/reactor-core'>Reactor Core</a></td><td>/reactor/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/asynclayoutinflater","name":"Asynclayoutinflater","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/browser","name":"Browser","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/browser","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/azure","name":"Azure SDK for Java","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/Azure/azure-sdk-for-java","license":"MIT"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/ctc/wstx","name":"Woodstox","typ":"Utility","anti":"","url":"https://github.com/FasterXML/woodstox","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/dropbox/core","name":"Dropbox Core SDK for Java","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/dropbox/dropbox-sdk-java","license":"MIT"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/google/j2objc","name":"J2ObjC","typ":"Utility","anti":"","url":"https://github.com/google/j2objc","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/microsoft/aad/adal","name":"Microsoft Azure Active Directory Authentication Library","typ":"Utility","anti":"","url":"https://github.com/AzureAD/azure-activedirectory-library-for-android","license":"MIT"},{"id":"/com/microsoft/device/dualscreen","name":"Surface Duo SDK","typ":"Utility","anti":"","url":"https://github.com/microsoft/surface-duo-sdk","license":"MIT"},{"id":"/com/microsoft/graph","name":"Microsoft Graph-SDK","typ":"Development Framework","anti":"","url":"https://github.com/microsoftgraph/msgraph-sdk-java","license":"MIT"},{"id":"/com/microsoft/identity","name":"Microsoft Authentication Library","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/AzureAD/microsoft-authentication-library-for-android","license":"MIT"},{"id":"/com/nimbusds/jose","name":"Nimbus JOSE+JWT","typ":"Utility","anti":"","url":"https://github.com/gesellix/Nimbus-JOSE-JWT","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/pcloud/sdk","name":"pCloud Java SDK","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/pCloud/pcloud-sdk-java","license":"Apache-2.0"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/com/yubico/yubikit","name":"Yubico Mobile Android SDK","typ":"Utility","anti":"","url":"https://github.com/Yubico/yubikit-android","license":"Apache-2.0"},{"id":"/cz/msebera/android/httpclient","name":"HttpClient Android repackaged","typ":"Utility","anti":"","url":"https://github.com/smarek/httpclient-android","license":"Apache-2.0"},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/edu/umd/cs/findbugs","name":"FindBugs","typ":"Utility","anti":"","url":"http://findbugs.sourceforge.net/","license":"LGPL-3.0-or-later"},{"id":"/io/jsonwebtoken","name":"Java JWT","typ":"Utility","anti":"","url":"https://github.com/jwtk/jjwt","license":"Apache-2.0"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/net/jcip/annotations","name":"JCIP Annotations","typ":"Utility","anti":"","url":"https://github.com/stephenc/jcip-annotations","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/codehaus/stax2","name":"Stax2 API","typ":"Utility","anti":"","url":"https://github.com/FasterXML/stax2-api","license":"BSD"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/json","name":"JSON in Java","typ":"Utility","anti":"","url":"https://github.com/stleary/JSON-java","license":"MIT"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/reactor/core","name":"Reactor Core","typ":"Utility","anti":"","url":"https://github.com/reactor/reactor-core","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3386 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 67523 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 98 libraries, 4 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
+{"applicationId":"org.cryptomator","emoji":[],"labels":["scanner-warning"],"report":"<h3>APK library scanner</h3><details open>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<b>Offending libs:</b><br>\n<ul>\n  <li>Azure SDK for Java (/com/azure): <b>NonFreeNet</b></li>\n  <li>Dropbox Core SDK for Java (/com/dropbox/core): <b>NonFreeNet</b></li>\n  <li>Microsoft Authentication Library (/com/microsoft/identity): <b>NonFreeNet</b></li>\n  <li>pCloud Java SDK (/com/pcloud/sdk): <b>NonFreeNet</b></li>\n</ul>\n4 offender(s). Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater'>Asynclayoutinflater</a></td><td>/androidx/asynclayoutinflater</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/browser'>Browser</a></td><td>/androidx/browser</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Azure/azure-sdk-for-java'>Azure SDK for Java</a></td><td>/com/azure</td><td>Development Framework</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/woodstox'>Woodstox</a></td><td>/com/ctc/wstx</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/dropbox/dropbox-sdk-java'>Dropbox Core SDK for Java</a></td><td>/com/dropbox/core</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/azure-activedirectory-library-for-android'>Microsoft Azure Active Directory Authentication Library</a></td><td>/com/microsoft/aad/adal</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoft/surface-duo-sdk'>Surface Duo SDK</a></td><td>/com/microsoft/device/dualscreen</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoftgraph/msgraph-sdk-java'>Microsoft Graph-SDK</a></td><td>/com/microsoft/graph</td><td>Development Framework</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/microsoft-authentication-library-for-android'>Microsoft Authentication Library</a></td><td>/com/microsoft/identity</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/gesellix/Nimbus-JOSE-JWT'>Nimbus JOSE+JWT</a></td><td>/com/nimbusds/jose</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/pCloud/pcloud-sdk-java'>pCloud Java SDK</a></td><td>/com/pcloud/sdk</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/Yubico/yubikit-android'>Yubico Mobile Android SDK</a></td><td>/com/yubico/yubikit</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/smarek/httpclient-android'>HttpClient Android repackaged</a></td><td>/cz/msebera/android/httpclient</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://findbugs.sourceforge.net/'>FindBugs</a></td><td>/edu/umd/cs/findbugs</td><td>Utility</td><td>LGPL-3.0-or-later</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize'>kotlin-parcelize</a></td><td>/kotlinx/parcelize</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stephenc/jcip-annotations'>JCIP Annotations</a></td><td>/net/jcip/annotations</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/stax2-api'>Stax2 API</a></td><td>/org/codehaus/stax2</td><td>Utility</td><td>BSD</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/reactor/reactor-core'>Reactor Core</a></td><td>/reactor/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/asynclayoutinflater","name":"Asynclayoutinflater","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/browser","name":"Browser","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/browser","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/azure","name":"Azure SDK for Java","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/Azure/azure-sdk-for-java","license":"MIT"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/ctc/wstx","name":"Woodstox","typ":"Utility","anti":"","url":"https://github.com/FasterXML/woodstox","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/dropbox/core","name":"Dropbox Core SDK for Java","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/dropbox/dropbox-sdk-java","license":"MIT"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/microsoft/aad/adal","name":"Microsoft Azure Active Directory Authentication Library","typ":"Utility","anti":"","url":"https://github.com/AzureAD/azure-activedirectory-library-for-android","license":"MIT"},{"id":"/com/microsoft/device/dualscreen","name":"Surface Duo SDK","typ":"Utility","anti":"","url":"https://github.com/microsoft/surface-duo-sdk","license":"MIT"},{"id":"/com/microsoft/graph","name":"Microsoft Graph-SDK","typ":"Development Framework","anti":"","url":"https://github.com/microsoftgraph/msgraph-sdk-java","license":"MIT"},{"id":"/com/microsoft/identity","name":"Microsoft Authentication Library","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/AzureAD/microsoft-authentication-library-for-android","license":"MIT"},{"id":"/com/nimbusds/jose","name":"Nimbus JOSE+JWT","typ":"Utility","anti":"","url":"https://github.com/gesellix/Nimbus-JOSE-JWT","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/pcloud/sdk","name":"pCloud Java SDK","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/pCloud/pcloud-sdk-java","license":"Apache-2.0"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/com/yubico/yubikit","name":"Yubico Mobile Android SDK","typ":"Utility","anti":"","url":"https://github.com/Yubico/yubikit-android","license":"Apache-2.0"},{"id":"/cz/msebera/android/httpclient","name":"HttpClient Android repackaged","typ":"Utility","anti":"","url":"https://github.com/smarek/httpclient-android","license":"Apache-2.0"},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/edu/umd/cs/findbugs","name":"FindBugs","typ":"Utility","anti":"","url":"http://findbugs.sourceforge.net/","license":"LGPL-3.0-or-later"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/kotlinx/parcelize","name":"kotlin-parcelize","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize","license":"Apache-2.0"},{"id":"/net/jcip/annotations","name":"JCIP Annotations","typ":"Utility","anti":"","url":"https://github.com/stephenc/jcip-annotations","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/codehaus/stax2","name":"Stax2 API","typ":"Utility","anti":"","url":"https://github.com/FasterXML/stax2-api","license":"BSD"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/reactor/core","name":"Reactor Core","typ":"Utility","anti":"","url":"https://github.com/reactor/reactor-core","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3791 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 72528 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 96 libraries, 4 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
diff --git a/fastlane/izzyscript/result_lite.json b/fastlane/izzyscript/result_lite.json
index a3e29e0b8..38925293d 100644
--- a/fastlane/izzyscript/result_lite.json
+++ b/fastlane/izzyscript/result_lite.json
@@ -1 +1 @@
-{"applicationId":"org.cryptomator","emoji":[],"labels":[],"report":"<h3>APK library scanner</h3><details>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<ul><li>Library definitions checked against: 3473</li><li>Libraries matched in this APK: 81</li></ul>\nNo offending libs found. Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/j2objc'>J2ObjC</a></td><td>/com/google/j2objc</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/jwtk/jjwt'>Java JWT</a></td><td>/io/jsonwebtoken</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stleary/JSON-java'>JSON in Java</a></td><td>/org/json</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/google/j2objc","name":"J2ObjC","typ":"Utility","anti":"","url":"https://github.com/google/j2objc","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/io/jsonwebtoken","name":"Java JWT","typ":"Utility","anti":"","url":"https://github.com/jwtk/jjwt","license":"Apache-2.0"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/json","name":"JSON in Java","typ":"Utility","anti":"","url":"https://github.com/stleary/JSON-java","license":"MIT"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3473 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 44532 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 81 libraries, 0 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
+{"applicationId":"org.cryptomator","emoji":[],"labels":[],"report":"<h3>APK library scanner</h3><details>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<ul><li>Library definitions checked against: 3791</li><li>Libraries matched in this APK: 79</li></ul>\nNo offending libs found. Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize'>kotlin-parcelize</a></td><td>/kotlinx/parcelize</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/kotlinx/parcelize","name":"kotlin-parcelize","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3791 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 49250 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 79 libraries, 0 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
diff --git a/fastlane/izzyscript/result_playstore.json b/fastlane/izzyscript/result_playstore.json
index 336c3eef4..ba45af20c 100644
--- a/fastlane/izzyscript/result_playstore.json
+++ b/fastlane/izzyscript/result_playstore.json
@@ -1 +1 @@
-{"applicationId":"org.cryptomator","emoji":[],"labels":["scanner-warning"],"report":"<h3>APK library scanner</h3><details open>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<b>Offending libs:</b><br>\n<ul>\n  <li>Azure SDK for Java (/com/azure): <b>NonFreeNet</b></li>\n  <li>Dropbox Core SDK for Java (/com/dropbox/core): <b>NonFreeNet</b></li>\n  <li>Google Mobile Services (/com/google/android/gms): <b>NonFreeDep</b></li>\n  <li>Google API Client Libraries (/com/google/api/client): <b>NonFreeNet</b></li>\n  <li>Google Drive API (/com/google/api/services/drive): <b>NonFreeDep,NonFreeNet</b></li>\n  <li>Google Java API Client Services (/com/google/api/services): <b>NonFreeNet</b></li>\n  <li>Microsoft Authentication Library (/com/microsoft/identity): <b>NonFreeNet</b></li>\n  <li>pCloud Java SDK (/com/pcloud/sdk): <b>NonFreeNet</b></li>\n</ul>\n8 offender(s). Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater'>Asynclayoutinflater</a></td><td>/androidx/asynclayoutinflater</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/browser'>Browser</a></td><td>/androidx/browser</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Azure/azure-sdk-for-java'>Azure SDK for Java</a></td><td>/com/azure</td><td>Development Framework</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/woodstox'>Woodstox</a></td><td>/com/ctc/wstx</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/dropbox/dropbox-sdk-java'>Dropbox Core SDK for Java</a></td><td>/com/dropbox/core</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developers.google.com/android/reference/com/google/android/gms/package-summary'>Google Mobile Services</a></td><td>/com/google/android/gms</td><td>Development Framework</td><td>Proprietary</td><td>NonFreeDep</td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client'>Google API Client Libraries</a></td><td>/com/google/api/client</td><td>Development Framework</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive'>Google Drive API</a></td><td>/com/google/api/services/drive</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeDep,NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services'>Google Java API Client Services</a></td><td>/com/google/api/services</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/j2objc'>J2ObjC</a></td><td>/com/google/j2objc</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/azure-activedirectory-library-for-android'>Microsoft Azure Active Directory Authentication Library</a></td><td>/com/microsoft/aad/adal</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoft/surface-duo-sdk'>Surface Duo SDK</a></td><td>/com/microsoft/device/dualscreen</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoftgraph/msgraph-sdk-java'>Microsoft Graph-SDK</a></td><td>/com/microsoft/graph</td><td>Development Framework</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/microsoft-authentication-library-for-android'>Microsoft Authentication Library</a></td><td>/com/microsoft/identity</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/gesellix/Nimbus-JOSE-JWT'>Nimbus JOSE+JWT</a></td><td>/com/nimbusds/jose</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/pCloud/pcloud-sdk-java'>pCloud Java SDK</a></td><td>/com/pcloud/sdk</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/Yubico/yubikit-android'>Yubico Mobile Android SDK</a></td><td>/com/yubico/yubikit</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/smarek/httpclient-android'>HttpClient Android repackaged</a></td><td>/cz/msebera/android/httpclient</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://findbugs.sourceforge.net/'>FindBugs</a></td><td>/edu/umd/cs/findbugs</td><td>Utility</td><td>LGPL-3.0-or-later</td><td></td></tr>\n<tr><td><a href='https://github.com/jwtk/jjwt'>Java JWT</a></td><td>/io/jsonwebtoken</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stephenc/jcip-annotations'>JCIP Annotations</a></td><td>/net/jcip/annotations</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://hc.apache.org/'>Apache Http</a></td><td>/org/apache/http</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/stax2-api'>Stax2 API</a></td><td>/org/codehaus/stax2</td><td>Utility</td><td>BSD</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stleary/JSON-java'>JSON in Java</a></td><td>/org/json</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/reactor/reactor-core'>Reactor Core</a></td><td>/reactor/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/asynclayoutinflater","name":"Asynclayoutinflater","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/browser","name":"Browser","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/browser","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/azure","name":"Azure SDK for Java","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/Azure/azure-sdk-for-java","license":"MIT"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/ctc/wstx","name":"Woodstox","typ":"Utility","anti":"","url":"https://github.com/FasterXML/woodstox","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/dropbox/core","name":"Dropbox Core SDK for Java","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/dropbox/dropbox-sdk-java","license":"MIT"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/gms","name":"Google Mobile Services","typ":"Development Framework","anti":"NonFreeDep","url":"https://developers.google.com/android/reference/com/google/android/gms/package-summary","license":"Proprietary"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/api/client","name":"Google API Client Libraries","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client","license":"Apache-2.0"},{"id":"/com/google/api/services/drive","name":"Google Drive API","typ":"Utility","anti":"NonFreeDep,NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive","license":"Apache-2.0"},{"id":"/com/google/api/services","name":"Google Java API Client Services","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/google/j2objc","name":"J2ObjC","typ":"Utility","anti":"","url":"https://github.com/google/j2objc","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/microsoft/aad/adal","name":"Microsoft Azure Active Directory Authentication Library","typ":"Utility","anti":"","url":"https://github.com/AzureAD/azure-activedirectory-library-for-android","license":"MIT"},{"id":"/com/microsoft/device/dualscreen","name":"Surface Duo SDK","typ":"Utility","anti":"","url":"https://github.com/microsoft/surface-duo-sdk","license":"MIT"},{"id":"/com/microsoft/graph","name":"Microsoft Graph-SDK","typ":"Development Framework","anti":"","url":"https://github.com/microsoftgraph/msgraph-sdk-java","license":"MIT"},{"id":"/com/microsoft/identity","name":"Microsoft Authentication Library","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/AzureAD/microsoft-authentication-library-for-android","license":"MIT"},{"id":"/com/nimbusds/jose","name":"Nimbus JOSE+JWT","typ":"Utility","anti":"","url":"https://github.com/gesellix/Nimbus-JOSE-JWT","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/pcloud/sdk","name":"pCloud Java SDK","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/pCloud/pcloud-sdk-java","license":"Apache-2.0"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/com/yubico/yubikit","name":"Yubico Mobile Android SDK","typ":"Utility","anti":"","url":"https://github.com/Yubico/yubikit-android","license":"Apache-2.0"},{"id":"/cz/msebera/android/httpclient","name":"HttpClient Android repackaged","typ":"Utility","anti":"","url":"https://github.com/smarek/httpclient-android","license":"Apache-2.0"},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/edu/umd/cs/findbugs","name":"FindBugs","typ":"Utility","anti":"","url":"http://findbugs.sourceforge.net/","license":"LGPL-3.0-or-later"},{"id":"/io/jsonwebtoken","name":"Java JWT","typ":"Utility","anti":"","url":"https://github.com/jwtk/jjwt","license":"Apache-2.0"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/net/jcip/annotations","name":"JCIP Annotations","typ":"Utility","anti":"","url":"https://github.com/stephenc/jcip-annotations","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/apache/http","name":"Apache Http","typ":"Utility","anti":"","url":"https://hc.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/codehaus/stax2","name":"Stax2 API","typ":"Utility","anti":"","url":"https://github.com/FasterXML/stax2-api","license":"BSD"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/json","name":"JSON in Java","typ":"Utility","anti":"","url":"https://github.com/stleary/JSON-java","license":"MIT"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/reactor/core","name":"Reactor Core","typ":"Utility","anti":"","url":"https://github.com/reactor/reactor-core","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3386 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 74877 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 103 libraries, 8 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
+{"applicationId":"org.cryptomator","emoji":[],"labels":["scanner-warning"],"report":"<h3>APK library scanner</h3><details open>\n<summary>unsigned/org.cryptomator_fdroid.apk</summary>\n<b>Offending libs:</b><br>\n<ul>\n  <li>Azure SDK for Java (/com/azure): <b>NonFreeNet</b></li>\n  <li>Dropbox Core SDK for Java (/com/dropbox/core): <b>NonFreeNet</b></li>\n  <li>Google Mobile Services (/com/google/android/gms): <b>NonFreeComp</b></li>\n  <li>Google API Client Libraries (/com/google/api/client): <b>NonFreeNet</b></li>\n  <li>Google Drive API (/com/google/api/services/drive): <b>NonFreeDep,NonFreeNet</b></li>\n  <li>Google Java API Client Services (/com/google/api/services): <b>NonFreeNet</b></li>\n  <li>Microsoft Authentication Library (/com/microsoft/identity): <b>NonFreeNet</b></li>\n  <li>pCloud Java SDK (/com/pcloud/sdk): <b>NonFreeNet</b></li>\n</ul>\n8 offender(s). Full report <a href='/artifacts/public/issuebot///iod-scan-apk.php.json'>available here</a>.\n<details><summary>Full list of libraries detected:</summary><table><thead><tr><th>Library</th><th>Id</th><th>Type</th><th>License</th><th>AntiFeatures</th></tr></thead><tbody>\n<tr><td><a href='https://developer.android.com/reference/android/support/v4/app/package-summary.html'>Android Support v4</a></td><td>/android/support/v4</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>AndroidX Activity</a></td><td>/androidx/activity</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/annotation'>Android Jetpack Annotations</a></td><td>/androidx/annotation</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/arch'>Arch</a></td><td>/androidx/arch</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/appcompat'>AppCompat</a></td><td>/androidx/appcompat</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater'>Asynclayoutinflater</a></td><td>/androidx/asynclayoutinflater</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/biometric'>Biometric</a></td><td>/androidx/biometric</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/browser'>Browser</a></td><td>/androidx/browser</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/'>Cardview</a></td><td>/androidx/cardview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>Android Support Library collections</a></td><td>/androidx/collection</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/concurrent'>Concurrent</a></td><td>/androidx/concurrent</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/androidx/constraintlayout'>Constraint Layout Library</a></td><td>/androidx/constraintlayout</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/coordinatorlayout'>Coordinatorlayout</a></td><td>/androidx/coordinatorlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/core'>Androidx Core</a></td><td>/androidx/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/tools/extras/support-library.html'>AndroidX Cursor Adapter</a></td><td>/androidx/cursoradapter</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/'>Android Support Library Custom View</a></td><td>/androidx/customview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/documentfile'>Documentfile</a></td><td>/androidx/documentfile</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/drawerlayout'>Drawerlayout</a></td><td>/androidx/drawerlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/dynamicanimation'>Dynamicanimation</a></td><td>/androidx/dynamicanimation</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/'>Android Emoji2 Compat</a></td><td>/androidx/emoji2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/exifinterface'>Exifinterface</a></td><td>/androidx/exifinterface</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/'>AndroidX Fragment</a></td><td>/androidx/fragment</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/interpolator'>Interpolator</a></td><td>/androidx/interpolator</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/legacy'>androidx.legacy</a></td><td>/androidx/legacy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/lifecycle'>Lifecycle</a></td><td>/androidx/lifecycle</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/loader'>Loader</a></td><td>/androidx/loader</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/'>AndroidX Local Broadcast Manager</a></td><td>/androidx/localbroadcastmanager</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/multidex'>Android Multi Dex Library</a></td><td>/androidx/multidex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/preference'>Preference</a></td><td>/androidx/preference</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/print'>Print</a></td><td>/androidx/print</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/resourceinspection'>ResourceInspection</a></td><td>/androidx/resourceinspection</td><td>Development Aid</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/recyclerview'>Recyclerview</a></td><td>/androidx/recyclerview</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx'>Android Activity Saved State</a></td><td>/androidx/savedstate</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/slidingpanelayout'>Slidingpanelayout</a></td><td>/androidx/slidingpanelayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/startup'>Startup</a></td><td>/androidx/startup</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout'>Swiperefreshlayout</a></td><td>/androidx/swiperefreshlayout</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/android/android-test'>AndroidX Test</a></td><td>/androidx/test</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/tracing'>Tracing</a></td><td>/androidx/tracing</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/transition'>Transition</a></td><td>/androidx/transition</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/vectordrawable'>Vectordrawable</a></td><td>/androidx/vectordrawable</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/versionedparcelable'>Android Jetpack VersionedParcelable</a></td><td>/androidx/versionedparcelable</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/jetpack/androidx/releases/viewpager'>Viewpager</a></td><td>/androidx/viewpager</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2'>AndroidX Widget ViewPager2</a></td><td>/androidx/viewpager2</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/'>Jetpack WindowManager Library</a></td><td>/androidx/window</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Azure/azure-sdk-for-java'>Azure SDK for Java</a></td><td>/com/azure</td><td>Development Framework</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/rburgst/okhttp-digest'>okhttp-digest</a></td><td>/com/burgstaller/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/woodstox'>Woodstox</a></td><td>/com/ctc/wstx</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/davemorrissey/subsampling-scale-image-view'>Subsampling Scale Image View</a></td><td>/com/davemorrissey/labs/subscaleview</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/dropbox/dropbox-sdk-java'>Dropbox Core SDK for Java</a></td><td>/com/dropbox/core</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/FasterXML/jackson-core'>FasterXML Jackson</a></td><td>/com/fasterxml/jackson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://developers.google.com/android/reference/com/google/android/gms/package-summary'>Google Mobile Services</a></td><td>/com/google/android/gms</td><td>Development Framework</td><td>Proprietary</td><td>NonFreeComp</td></tr>\n<tr><td><a href='https://github.com/material-components/material-components-android'>Google Material Design</a></td><td>/com/google/android/material</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client'>Google API Client Libraries</a></td><td>/com/google/api/client</td><td>Development Framework</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive'>Google Drive API</a></td><td>/com/google/api/services/drive</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeDep,NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/googleapis/google-api-java-client-services'>Google Java API Client Services</a></td><td>/com/google/api/services</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/google/guava'>Google Core Libraries for Java 6+</a></td><td>/com/google/common</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/error-prone'>Error Prone</a></td><td>/com/google/errorprone</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/gson'>Google Gson</a></td><td>/com/google/gson</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/j2objc'>J2ObjC</a></td><td>/com/google/j2objc</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/RxBinding'>RxBinding</a></td><td>/com/jakewharton/rxbinding</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/azure-activedirectory-library-for-android'>Microsoft Azure Active Directory Authentication Library</a></td><td>/com/microsoft/aad/adal</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoft/surface-duo-sdk'>Surface Duo SDK</a></td><td>/com/microsoft/device/dualscreen</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/microsoftgraph/msgraph-sdk-java'>Microsoft Graph-SDK</a></td><td>/com/microsoft/graph</td><td>Development Framework</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/AzureAD/microsoft-authentication-library-for-android'>Microsoft Authentication Library</a></td><td>/com/microsoft/identity</td><td>Utility</td><td>MIT</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/gesellix/Nimbus-JOSE-JWT'>Nimbus JOSE+JWT</a></td><td>/com/nimbusds/jose</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/nulab/zxcvbn4j'>zxcvbn4j</a></td><td>/com/nulabinc/zxcvbn</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/pCloud/pcloud-sdk-java'>pCloud Java SDK</a></td><td>/com/pcloud/sdk</td><td>Utility</td><td>Apache-2.0</td><td>NonFreeNet</td></tr>\n<tr><td><a href='https://github.com/timusus/RecyclerView-FastScroll'>RecyclerView-FastScroll</a></td><td>/com/simplecityapps/recyclerview_fastscroll</td><td>UI Component</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okhttp'>OkHttp</a></td><td>/com/squareup/okhttp</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/solkin/disk-lru-cache'>Disk LRU Cache</a></td><td>/com/tomclaw/cache</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd'>Wutka DTD</a></td><td>/com/wutka/dtd</td><td>Development Aid</td><td>none</td><td></td></tr>\n<tr><td><a href='https://github.com/Yubico/yubikit-android'>Yubico Mobile Android SDK</a></td><td>/com/yubico/yubikit</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/smarek/httpclient-android'>HttpClient Android repackaged</a></td><td>/cz/msebera/android/httpclient</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/google/dagger'>Dagger</a></td><td>/dagger</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://findbugs.sourceforge.net/'>FindBugs</a></td><td>/edu/umd/cs/findbugs</td><td>Utility</td><td>LGPL-3.0-or-later</td><td></td></tr>\n<tr><td><a href='https://github.com/minio/minio-java'>MinIO Client SDK for Java</a></td><td>/io/minio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/ReactiveX/RxJava'>RxJava</a></td><td>/io/reactivex</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/amaembo/jsr-305/tree/master/ri'>JavaX Annotation API</a></td><td>/javax/annotation</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html'>JavaX Dependency Injection</a></td><td>/javax/inject</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html'>Javax XML</a></td><td>/javax/xml</td><td>Utility</td><td>GPL-2.0</td><td></td></tr>\n<tr><td><a href='https://junit.org/junit4/'>Junit</a></td><td>/junit</td><td>Utility</td><td>EPL-1.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin'>Kotlin</a></td><td>/kotlin</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime'>Kotlin Android Extensions Runtime</a></td><td>/kotlinx/android/extensions-runtime</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/Kotlin/kotlinx.coroutines'>kotlinx.coroutines</a></td><td>/kotlinx/coroutines</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize'>kotlin-parcelize</a></td><td>/kotlinx/parcelize</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/stephenc/jcip-annotations'>JCIP Annotations</a></td><td>/net/jcip/annotations</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/square/okio'>OkHttp okio Framework</a></td><td>/okio</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://commons.apache.org/'>Apache Commons</a></td><td>/org/apache/commons</td><td>Development Framework</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://hc.apache.org/'>Apache Http</a></td><td>/org/apache/http</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://www.bouncycastle.org/java.html'>Bouncy Castle</a></td><td>/org/bouncycastle</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://checkerframework.org/'>Checker Framework</a></td><td>/org/checkerframework</td><td>Utility</td><td>GPL-2.0-only</td><td></td></tr>\n<tr><td><a href='https://github.com/FasterXML/stax2-api'>Stax2 API</a></td><td>/org/codehaus/stax2</td><td>Utility</td><td>BSD</td><td></td></tr>\n<tr><td><a href='https://github.com/greenrobot/greenDAO'>greenDAO</a></td><td>/org/greenrobot/greendao</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/hamcrest/JavaHamcrest'>Java Hamcrest</a></td><td>/org/hamcrest</td><td>Utility</td><td>BSD-3-Clause</td><td></td></tr>\n<tr><td><a href='https://github.com/JetBrains/intellij-community'>IntelliJ IDEA</a></td><td>/org/intellij</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='http://junit.org/'>jUnit Java Unit Test</a></td><td>/org/junit</td><td>Utility</td><td>EPL-2.0</td><td></td></tr>\n<tr><td><a href='http://www.reactive-streams.org/'>Reactive Streams</a></td><td>/org/reactivestreams</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://sourceforge.net/projects/simple/'>Simple</a></td><td>/org/simpleframework/xml</td><td>Utility</td><td>LGPL-2.1-only</td><td></td></tr>\n<tr><td><a href='https://www.slf4j.org/'>Simple Logging Facade for Java</a></td><td>/org/slf4j</td><td>Utility</td><td>MIT</td><td></td></tr>\n<tr><td><a href='https://github.com/xerial/snappy-java'>snappy-java</a></td><td>/org/xerial/snappy</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/reactor/reactor-core'>Reactor Core</a></td><td>/reactor/core</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n<tr><td><a href='https://github.com/JakeWharton/timber'>Timber</a></td><td>/timber/log</td><td>Utility</td><td>Apache-2.0</td><td></td></tr>\n</tbody></table></details><br>\n\n</details>\n","reportData":{"unsigned/org.cryptomator_fdroid.apk":[{"id":"/android/support/v4","name":"Android Support v4","typ":"Development Framework","anti":"","url":"https://developer.android.com/reference/android/support/v4/app/package-summary.html","license":"Apache-2.0"},{"id":"/androidx/activity","name":"AndroidX Activity","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/annotation","name":"Android Jetpack Annotations","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/annotation","license":"Apache-2.0"},{"id":"/androidx/arch","name":"Arch","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/arch","license":"Apache-2.0"},{"id":"/androidx/appcompat","name":"AppCompat","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/appcompat","license":"Apache-2.0"},{"id":"/androidx/asynclayoutinflater","name":"Asynclayoutinflater","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/asynclayoutinflater","license":"Apache-2.0"},{"id":"/androidx/biometric","name":"Biometric","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/biometric","license":"Apache-2.0"},{"id":"/androidx/browser","name":"Browser","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/browser","license":"Apache-2.0"},{"id":"/androidx/cardview","name":"Cardview","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/cardview/","license":"Apache-2.0"},{"id":"/androidx/collection","name":"Android Support Library collections","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/concurrent","name":"Concurrent","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/concurrent","license":"Apache-2.0"},{"id":"/androidx/constraintlayout","name":"Constraint Layout Library","typ":"Utility","anti":"","url":"https://github.com/androidx/constraintlayout","license":"Apache-2.0"},{"id":"/androidx/coordinatorlayout","name":"Coordinatorlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/coordinatorlayout","license":"Apache-2.0"},{"id":"/androidx/core","name":"Androidx Core","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/core","license":"Apache-2.0"},{"id":"/androidx/cursoradapter","name":"AndroidX Cursor Adapter","typ":"Utility","anti":"","url":"https://developer.android.com/tools/extras/support-library.html","license":"Apache-2.0"},{"id":"/androidx/customview","name":"Android Support Library Custom View","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/customview/","license":"Apache-2.0"},{"id":"/androidx/documentfile","name":"Documentfile","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/documentfile","license":"Apache-2.0"},{"id":"/androidx/drawerlayout","name":"Drawerlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/drawerlayout","license":"Apache-2.0"},{"id":"/androidx/dynamicanimation","name":"Dynamicanimation","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/dynamicanimation","license":"Apache-2.0"},{"id":"/androidx/emoji2","name":"Android Emoji2 Compat","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/emoji2/","license":"Apache-2.0"},{"id":"/androidx/exifinterface","name":"Exifinterface","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/exifinterface","license":"Apache-2.0"},{"id":"/androidx/fragment","name":"AndroidX Fragment","typ":"UI Component","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/fragment/","license":"Apache-2.0"},{"id":"/androidx/interpolator","name":"Interpolator","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/interpolator","license":"Apache-2.0"},{"id":"/androidx/legacy","name":"androidx.legacy","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/legacy","license":"Apache-2.0"},{"id":"/androidx/lifecycle","name":"Lifecycle","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/lifecycle","license":"Apache-2.0"},{"id":"/androidx/loader","name":"Loader","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/loader","license":"Apache-2.0"},{"id":"/androidx/localbroadcastmanager","name":"AndroidX Local Broadcast Manager","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-localbroadcastmanager-release/localbroadcastmanager/","license":"Apache-2.0"},{"id":"/androidx/multidex","name":"Android Multi Dex Library","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/multidex","license":"Apache-2.0"},{"id":"/androidx/preference","name":"Preference","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/preference","license":"Apache-2.0"},{"id":"/androidx/print","name":"Print","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/print","license":"Apache-2.0"},{"id":"/androidx/resourceinspection","name":"ResourceInspection","typ":"Development Aid","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/resourceinspection","license":"Apache-2.0"},{"id":"/androidx/recyclerview","name":"Recyclerview","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/recyclerview","license":"Apache-2.0"},{"id":"/androidx/savedstate","name":"Android Activity Saved State","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx","license":"Apache-2.0"},{"id":"/androidx/slidingpanelayout","name":"Slidingpanelayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/slidingpanelayout","license":"Apache-2.0"},{"id":"/androidx/startup","name":"Startup","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/startup","license":"Apache-2.0"},{"id":"/androidx/swiperefreshlayout","name":"Swiperefreshlayout","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout","license":"Apache-2.0"},{"id":"/androidx/test","name":"AndroidX Test","typ":"Development Framework","anti":"","url":"https://github.com/android/android-test","license":"Apache-2.0"},{"id":"/androidx/tracing","name":"Tracing","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/tracing","license":"Apache-2.0"},{"id":"/androidx/transition","name":"Transition","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/transition","license":"Apache-2.0"},{"id":"/androidx/vectordrawable","name":"Vectordrawable","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/vectordrawable","license":"Apache-2.0"},{"id":"/androidx/versionedparcelable","name":"Android Jetpack VersionedParcelable","typ":"Utility","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/versionedparcelable","license":"Apache-2.0"},{"id":"/androidx/viewpager","name":"Viewpager","typ":"UI Component","anti":"","url":"https://developer.android.com/jetpack/androidx/releases/viewpager","license":"Apache-2.0"},{"id":"/androidx/viewpager2","name":"AndroidX Widget ViewPager2","typ":"UI Component","anti":"","url":"https://developer.android.com/reference/androidx/viewpager2/widget/ViewPager2","license":"Apache-2.0"},{"id":"/androidx/window","name":"Jetpack WindowManager Library","typ":"Utility","anti":"","url":"https://android.googlesource.com/platform/frameworks/support/+/refs/heads/androidx-main/window/","license":"Apache-2.0"},{"id":"/com/azure","name":"Azure SDK for Java","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/Azure/azure-sdk-for-java","license":"MIT"},{"id":"/com/burgstaller/okhttp","name":"okhttp-digest","typ":"Utility","anti":"","url":"https://github.com/rburgst/okhttp-digest","license":"Apache-2.0"},{"id":"/com/ctc/wstx","name":"Woodstox","typ":"Utility","anti":"","url":"https://github.com/FasterXML/woodstox","license":"Apache-2.0"},{"id":"/com/davemorrissey/labs/subscaleview","name":"Subsampling Scale Image View","typ":"UI Component","anti":"","url":"https://github.com/davemorrissey/subsampling-scale-image-view","license":"Apache-2.0"},{"id":"/com/dropbox/core","name":"Dropbox Core SDK for Java","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/dropbox/dropbox-sdk-java","license":"MIT"},{"id":"/com/fasterxml/jackson","name":"FasterXML Jackson","typ":"Utility","anti":"","url":"https://github.com/FasterXML/jackson-core","license":"Apache-2.0"},{"id":"/com/google/android/gms","name":"Google Mobile Services","typ":"Development Framework","anti":"NonFreeComp","url":"https://developers.google.com/android/reference/com/google/android/gms/package-summary","license":"Proprietary"},{"id":"/com/google/android/material","name":"Google Material Design","typ":"Utility","anti":"","url":"https://github.com/material-components/material-components-android","license":"Apache-2.0"},{"id":"/com/google/api/client","name":"Google API Client Libraries","typ":"Development Framework","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client","license":"Apache-2.0"},{"id":"/com/google/api/services/drive","name":"Google Drive API","typ":"Utility","anti":"NonFreeDep,NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services/tree/main/clients/google-api-services-drive","license":"Apache-2.0"},{"id":"/com/google/api/services","name":"Google Java API Client Services","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/googleapis/google-api-java-client-services","license":"Apache-2.0"},{"id":"/com/google/common","name":"Google Core Libraries for Java 6+","typ":"Utility","anti":"","url":"https://github.com/google/guava","license":"Apache-2.0"},{"id":"/com/google/errorprone","name":"Error Prone","typ":"Utility","anti":"","url":"https://github.com/google/error-prone","license":"Apache-2.0"},{"id":"/com/google/gson","name":"Google Gson","typ":"Utility","anti":"","url":"https://github.com/google/gson","license":"Apache-2.0"},{"id":"/com/google/j2objc","name":"J2ObjC","typ":"Utility","anti":"","url":"https://github.com/google/j2objc","license":"Apache-2.0"},{"id":"/com/jakewharton/rxbinding","name":"RxBinding","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/RxBinding","license":"Apache-2.0"},{"id":"/com/microsoft/aad/adal","name":"Microsoft Azure Active Directory Authentication Library","typ":"Utility","anti":"","url":"https://github.com/AzureAD/azure-activedirectory-library-for-android","license":"MIT"},{"id":"/com/microsoft/device/dualscreen","name":"Surface Duo SDK","typ":"Utility","anti":"","url":"https://github.com/microsoft/surface-duo-sdk","license":"MIT"},{"id":"/com/microsoft/graph","name":"Microsoft Graph-SDK","typ":"Development Framework","anti":"","url":"https://github.com/microsoftgraph/msgraph-sdk-java","license":"MIT"},{"id":"/com/microsoft/identity","name":"Microsoft Authentication Library","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/AzureAD/microsoft-authentication-library-for-android","license":"MIT"},{"id":"/com/nimbusds/jose","name":"Nimbus JOSE+JWT","typ":"Utility","anti":"","url":"https://github.com/gesellix/Nimbus-JOSE-JWT","license":"Apache-2.0"},{"id":"/com/nulabinc/zxcvbn","name":"zxcvbn4j","typ":"Utility","anti":"","url":"https://github.com/nulab/zxcvbn4j","license":"MIT"},{"id":"/com/pcloud/sdk","name":"pCloud Java SDK","typ":"Utility","anti":"NonFreeNet","url":"https://github.com/pCloud/pcloud-sdk-java","license":"Apache-2.0"},{"id":"/com/simplecityapps/recyclerview_fastscroll","name":"RecyclerView-FastScroll","typ":"UI Component","anti":"","url":"https://github.com/timusus/RecyclerView-FastScroll","license":"Apache-2.0"},{"id":"/com/squareup/okhttp","name":"OkHttp","typ":"Utility","anti":"","url":"https://github.com/square/okhttp","license":"Apache-2.0"},{"id":"/com/tomclaw/cache","name":"Disk LRU Cache","typ":"Utility","anti":"","url":"https://github.com/solkin/disk-lru-cache","license":"MIT"},{"id":"/com/wutka/dtd","name":"Wutka DTD","typ":"Development Aid","anti":"","url":"https://mvnrepository.com/artifact/com.liferay/com.wutka.dtd","license":""},{"id":"/com/yubico/yubikit","name":"Yubico Mobile Android SDK","typ":"Utility","anti":"","url":"https://github.com/Yubico/yubikit-android","license":"Apache-2.0"},{"id":"/cz/msebera/android/httpclient","name":"HttpClient Android repackaged","typ":"Utility","anti":"","url":"https://github.com/smarek/httpclient-android","license":"Apache-2.0"},{"id":"/dagger","name":"Dagger","typ":"Utility","anti":"","url":"https://github.com/google/dagger","license":"Apache-2.0"},{"id":"/edu/umd/cs/findbugs","name":"FindBugs","typ":"Utility","anti":"","url":"http://findbugs.sourceforge.net/","license":"LGPL-3.0-or-later"},{"id":"/io/minio","name":"MinIO Client SDK for Java","typ":"Utility","anti":"","url":"https://github.com/minio/minio-java","license":"Apache-2.0"},{"id":"/io/reactivex","name":"RxJava","typ":"Utility","anti":"","url":"https://github.com/ReactiveX/RxJava","license":"Apache-2.0"},{"id":"/javax/annotation","name":"JavaX Annotation API","typ":"Utility","anti":"","url":"https://github.com/amaembo/jsr-305/tree/master/ri","license":"BSD-3-Clause"},{"id":"/javax/inject","name":"JavaX Dependency Injection","typ":"Utility","anti":"","url":"https://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html","license":"Apache-2.0"},{"id":"/javax/xml","name":"Javax XML","typ":"Utility","anti":"","url":"https://docs.oracle.com/en/java/javase/17/docs/api/java.xml/javax/xml/package-summary.html","license":"GPL-2.0"},{"id":"/junit","name":"Junit","typ":"Utility","anti":"","url":"https://junit.org/junit4/","license":"EPL-1.0"},{"id":"/kotlin","name":"Kotlin","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin","license":"Apache-2.0"},{"id":"/kotlinx/android/extensions-runtime","name":"Kotlin Android Extensions Runtime","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime","license":"Apache-2.0"},{"id":"/kotlinx/coroutines","name":"kotlinx.coroutines","typ":"Utility","anti":"","url":"https://github.com/Kotlin/kotlinx.coroutines","license":"Apache-2.0"},{"id":"/kotlinx/parcelize","name":"kotlin-parcelize","typ":"Utility","anti":"","url":"https://github.com/JetBrains/kotlin/tree/cdbfa7fbbc6f31dbcb6264f456bfedee1a85c40b/plugins/parcelize","license":"Apache-2.0"},{"id":"/net/jcip/annotations","name":"JCIP Annotations","typ":"Utility","anti":"","url":"https://github.com/stephenc/jcip-annotations","license":"Apache-2.0"},{"id":"/okio","name":"OkHttp okio Framework","typ":"Utility","anti":"","url":"https://github.com/square/okio","license":"Apache-2.0"},{"id":"/org/apache/commons","name":"Apache Commons","typ":"Development Framework","anti":"","url":"https://commons.apache.org/","license":"Apache-2.0"},{"id":"/org/apache/http","name":"Apache Http","typ":"Utility","anti":"","url":"https://hc.apache.org/","license":"Apache-2.0"},{"id":"/org/bouncycastle","name":"Bouncy Castle","typ":"Utility","anti":"","url":"http://www.bouncycastle.org/java.html","license":"MIT"},{"id":"/org/checkerframework","name":"Checker Framework","typ":"Utility","anti":"","url":"https://checkerframework.org/","license":"GPL-2.0-only"},{"id":"/org/codehaus/stax2","name":"Stax2 API","typ":"Utility","anti":"","url":"https://github.com/FasterXML/stax2-api","license":"BSD"},{"id":"/org/greenrobot/greendao","name":"greenDAO","typ":"Utility","anti":"","url":"https://github.com/greenrobot/greenDAO","license":"Apache-2.0"},{"id":"/org/hamcrest","name":"Java Hamcrest","typ":"Utility","anti":"","url":"https://github.com/hamcrest/JavaHamcrest","license":"BSD-3-Clause"},{"id":"/org/intellij","name":"IntelliJ IDEA","typ":"Utility","anti":"","url":"https://github.com/JetBrains/intellij-community","license":"Apache-2.0"},{"id":"/org/junit","name":"jUnit Java Unit Test","typ":"Utility","anti":"","url":"http://junit.org/","license":"EPL-2.0"},{"id":"/org/reactivestreams","name":"Reactive Streams","typ":"Utility","anti":"","url":"http://www.reactive-streams.org/","license":"MIT"},{"id":"/org/simpleframework/xml","name":"Simple","typ":"Utility","anti":"","url":"https://sourceforge.net/projects/simple/","license":"LGPL-2.1-only"},{"id":"/org/slf4j","name":"Simple Logging Facade for Java","typ":"Utility","anti":"","url":"https://www.slf4j.org/","license":"MIT"},{"id":"/org/xerial/snappy","name":"snappy-java","typ":"Utility","anti":"","url":"https://github.com/xerial/snappy-java","license":"Apache-2.0"},{"id":"/reactor/core","name":"Reactor Core","typ":"Utility","anti":"","url":"https://github.com/reactor/reactor-core","license":"Apache-2.0"},{"id":"/timber/log","name":"Timber","typ":"Utility","anti":"","url":"https://github.com/JakeWharton/timber","license":"Apache-2.0"}],"log":["Fetching library definitions from https://gitlab.com/IzzyOnDroid/repo/-/raw/master/lib","Loaded 3791 library definitions","Analyzing 'unsigned/org.cryptomator_fdroid.apk'...","Apktool returned: 0","Read 80668 bytes of smali path names from 'org.cryptomator_fdroid.dirlist'","Identified 102 libraries, 8 offenders.","Done analyzing 'unsigned/org.cryptomator_fdroid.apk'"],"self_url":"/artifacts/public/issuebot///iod-scan-apk.php.json"}}
\ No newline at end of file
diff --git a/fastlane/release-notes-de.txt b/fastlane/release-notes-de.txt
index 1badea199..992a99407 100644
--- a/fastlane/release-notes-de.txt
+++ b/fastlane/release-notes-de.txt
@@ -1,4 +1,5 @@
-- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
-- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
-- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
-- Übersetzungen aktualisiert
\ No newline at end of file
+- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
+- Update auf die neueste Android-Version
+- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
+- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
+- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
diff --git a/fastlane/release-notes-en.txt b/fastlane/release-notes-en.txt
index 7854290b5..c12e16f1a 100644
--- a/fastlane/release-notes-en.txt
+++ b/fastlane/release-notes-en.txt
@@ -1,4 +1,5 @@
-- Add workaround for editing files in Microsoft Office apps
-- Add support for themed Cryptomator icon
-- Refresh stale authentication token during auto upload
-- Update translations
\ No newline at end of file
+- Preserve original file modification date during upload (if possible)
+- Update to latest Android version
+- Fix for uploading files larger than 2GB in WebDAV
+- Fix vault unlock on Samsung devices
+- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
diff --git a/fastlane/release-notes.html b/fastlane/release-notes.html
index 352a53bae..3c9fd0610 100644
--- a/fastlane/release-notes.html
+++ b/fastlane/release-notes.html
@@ -1,6 +1,7 @@
 <ul>
-  <li>Add workaround for editing files in Microsoft Office apps</li>
-  <li>Add support for themed Cryptomator icon</li>
-  <li>Refresh stale authentication token during auto upload</li>
-  <li>Update translations</li>
-</ul>
\ No newline at end of file
+  <li>Preserve original file modification date during upload (if possible)</li>
+  <li>Update to latest Android version</li>
+  <li>Fix for uploading files larger than 2GB in WebDAV</li>
+  <li>Fix vault unlock on Samsung devices</li>
+  <li>Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app</li>
+</ul>
diff --git a/generator-api/build.gradle b/generator-api/build.gradle
index c560571c9..45cabb4c4 100644
--- a/generator-api/build.gradle
+++ b/generator-api/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'java'
 
 //noinspection GroovyUnusedAssignment
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 //noinspection GroovyUnusedAssignment
-targetCompatibility = 1.8
+targetCompatibility = 17
 
 dependencies {
 	def dependencies = rootProject.ext.dependencies
diff --git a/generator-api/src/main/java/org/cryptomator/generator/Activity.java b/generator-api/src/main/java/org/cryptomator/generator/Activity.java
index 3dfc56bf5..5a9393bab 100644
--- a/generator-api/src/main/java/org/cryptomator/generator/Activity.java
+++ b/generator-api/src/main/java/org/cryptomator/generator/Activity.java
@@ -10,8 +10,6 @@
 @Target(TYPE)
 public @interface Activity {
 
-	int layout() default -1;
-
 	boolean secure() default true;
 
 }
diff --git a/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java b/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java
index a6b4870b1..ebfb60f77 100644
--- a/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java
+++ b/generator-api/src/main/java/org/cryptomator/generator/BottomSheet.java
@@ -12,4 +12,6 @@
 
 	int value();
 
+	boolean secure() default true;
+
 }
diff --git a/generator-api/src/main/java/org/cryptomator/generator/Dialog.java b/generator-api/src/main/java/org/cryptomator/generator/Dialog.java
index 7241e4555..757b3e5b0 100644
--- a/generator-api/src/main/java/org/cryptomator/generator/Dialog.java
+++ b/generator-api/src/main/java/org/cryptomator/generator/Dialog.java
@@ -10,6 +10,6 @@
 @Target(TYPE)
 public @interface Dialog {
 
-	int value();
+	boolean secure() default true;
 
 }
diff --git a/generator-api/src/main/java/org/cryptomator/generator/Fragment.java b/generator-api/src/main/java/org/cryptomator/generator/Fragment.java
index 946fb24a5..34532098d 100644
--- a/generator-api/src/main/java/org/cryptomator/generator/Fragment.java
+++ b/generator-api/src/main/java/org/cryptomator/generator/Fragment.java
@@ -10,6 +10,4 @@
 @Target(TYPE)
 public @interface Fragment {
 
-	int value();
-
 }
diff --git a/generator/build.gradle b/generator/build.gradle
index 3dc33c03f..9fffdf15e 100644
--- a/generator/build.gradle
+++ b/generator/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'java'
 
 //noinspection GroovyUnusedAssignment
-sourceCompatibility = 1.8
+sourceCompatibility = 17
 //noinspection GroovyUnusedAssignment
-targetCompatibility = 1.8
+targetCompatibility = 17
 
 repositories {
 	mavenCentral()
diff --git a/generator/src/main/java/org/cryptomator/generator/ActivityProcessor.java b/generator/src/main/java/org/cryptomator/generator/ActivityProcessor.java
index 92d41342d..7c99c56b6 100644
--- a/generator/src/main/java/org/cryptomator/generator/ActivityProcessor.java
+++ b/generator/src/main/java/org/cryptomator/generator/ActivityProcessor.java
@@ -18,7 +18,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Activity")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class ActivityProcessor extends BaseProcessor {
 
 	@Override
diff --git a/generator/src/main/java/org/cryptomator/generator/CallbackProcessor.java b/generator/src/main/java/org/cryptomator/generator/CallbackProcessor.java
index d31155d13..09b692a48 100644
--- a/generator/src/main/java/org/cryptomator/generator/CallbackProcessor.java
+++ b/generator/src/main/java/org/cryptomator/generator/CallbackProcessor.java
@@ -22,7 +22,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Callback")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class CallbackProcessor extends BaseProcessor {
 
 	@Override
diff --git a/generator/src/main/java/org/cryptomator/generator/FragmentProcessor.java b/generator/src/main/java/org/cryptomator/generator/FragmentProcessor.java
index 8eb902cac..8ab84be61 100644
--- a/generator/src/main/java/org/cryptomator/generator/FragmentProcessor.java
+++ b/generator/src/main/java/org/cryptomator/generator/FragmentProcessor.java
@@ -18,7 +18,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Fragment")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class FragmentProcessor extends BaseProcessor {
 
 	@Override
diff --git a/generator/src/main/java/org/cryptomator/generator/InstanceStateProcessor.java b/generator/src/main/java/org/cryptomator/generator/InstanceStateProcessor.java
index 1d9d93ed8..86b55b446 100644
--- a/generator/src/main/java/org/cryptomator/generator/InstanceStateProcessor.java
+++ b/generator/src/main/java/org/cryptomator/generator/InstanceStateProcessor.java
@@ -19,7 +19,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.InstanceState")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class InstanceStateProcessor extends BaseProcessor {
 
 	@Override
diff --git a/generator/src/main/java/org/cryptomator/generator/IntentProcessor.java b/generator/src/main/java/org/cryptomator/generator/IntentProcessor.java
index afdbb95d8..28d31a290 100644
--- a/generator/src/main/java/org/cryptomator/generator/IntentProcessor.java
+++ b/generator/src/main/java/org/cryptomator/generator/IntentProcessor.java
@@ -22,7 +22,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.Intent")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class IntentProcessor extends BaseProcessor {
 
 	@Override
diff --git a/generator/src/main/java/org/cryptomator/generator/UseCaseProcessor.java b/generator/src/main/java/org/cryptomator/generator/UseCaseProcessor.java
index ef8b10d72..9d2321fbd 100644
--- a/generator/src/main/java/org/cryptomator/generator/UseCaseProcessor.java
+++ b/generator/src/main/java/org/cryptomator/generator/UseCaseProcessor.java
@@ -15,7 +15,7 @@
 import javax.tools.JavaFileObject;
 
 @SupportedAnnotationTypes("org.cryptomator.generator.UseCase")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class UseCaseProcessor extends BaseProcessor {
 
 	@Override
diff --git a/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java b/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java
index 2cb8d66db..834e8c0b4 100644
--- a/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java
+++ b/generator/src/main/java/org/cryptomator/generator/model/CallbacksModel.java
@@ -16,11 +16,11 @@ public void add(CallbackModel callback) {
 	}
 
 	public Collection<CallbacksClassModel> getCallbacksClasses() {
-		return callbacks.stream()
-				.collect(Collectors.groupingBy(CallbackModel::getCallbacksClassName))
-				.entrySet().stream()
-				.map(CallbacksClassModel::new)
-				.sorted(Comparator.comparing(e -> e.callbacksClassName))
+		return callbacks.stream() //
+				.collect(Collectors.groupingBy(CallbackModel::getCallbacksClassName)) //
+				.entrySet().stream() //
+				.map(CallbacksClassModel::new) //
+				.sorted(Comparator.comparing(e -> e.callbacksClassName)) //
 				.collect(Collectors.toList());
 	}
 
diff --git a/generator/src/main/java/org/cryptomator/generator/templates/Template.java b/generator/src/main/java/org/cryptomator/generator/templates/Template.java
index 10a9b1a75..05cbeaf47 100644
--- a/generator/src/main/java/org/cryptomator/generator/templates/Template.java
+++ b/generator/src/main/java/org/cryptomator/generator/templates/Template.java
@@ -6,9 +6,9 @@
 import java.io.Writer;
 import java.lang.reflect.Modifier;
 
+import static org.apache.velocity.app.Velocity.mergeTemplate;
 import static java.lang.Character.toLowerCase;
 import static java.util.Arrays.stream;
-import static org.apache.velocity.app.Velocity.mergeTemplate;
 
 abstract class Template<T> {
 
diff --git a/generator/src/main/java/org/cryptomator/generator/utils/Type.java b/generator/src/main/java/org/cryptomator/generator/utils/Type.java
index d8c9ee6f2..cf45a3737 100644
--- a/generator/src/main/java/org/cryptomator/generator/utils/Type.java
+++ b/generator/src/main/java/org/cryptomator/generator/utils/Type.java
@@ -1,9 +1,5 @@
 package org.cryptomator.generator.utils;
 
-import static javax.lang.model.element.ElementKind.FIELD;
-import static javax.lang.model.type.TypeKind.ARRAY;
-import static javax.lang.model.type.TypeKind.NONE;
-
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -15,6 +11,10 @@
 import javax.lang.model.type.PrimitiveType;
 import javax.lang.model.type.TypeMirror;
 
+import static javax.lang.model.element.ElementKind.FIELD;
+import static javax.lang.model.type.TypeKind.ARRAY;
+import static javax.lang.model.type.TypeKind.NONE;
+
 public class Type implements Comparable<Type> {
 
 	private final TypeMirror mirror;
diff --git a/gradle.properties b/gradle.properties
index 605acdb7f..5db8c731d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,8 @@
 org.gradle.jvmargs=-Xmx2048m
 android.useAndroidX=true
 android.enableJetifier=true
+android.jetifier.ignorelist=jackson-core,fastdoubleparser
 kapt.incremental.apt=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa..e6441136f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 508322917..a80b22ce5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d6..1aa94a426 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85be..7101f8e46 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/lib/google-http-client-1.43.0-sources.jar b/lib/google-http-client-1.43.0-sources.jar
deleted file mode 100644
index c0dca84e9..000000000
Binary files a/lib/google-http-client-1.43.0-sources.jar and /dev/null differ
diff --git a/lib/google-http-client-1.43.0.jar b/lib/google-http-client-1.43.0.jar
deleted file mode 100644
index c3f69fbeb..000000000
Binary files a/lib/google-http-client-1.43.0.jar and /dev/null differ
diff --git a/lib/google-http-client-android-1.43.0-sources.jar b/lib/google-http-client-android-1.43.0-sources.jar
deleted file mode 100644
index 3440faae7..000000000
Binary files a/lib/google-http-client-android-1.43.0-sources.jar and /dev/null differ
diff --git a/lib/google-http-client-android-1.43.0.jar b/lib/google-http-client-android-1.43.0.jar
deleted file mode 100644
index 2afd6978f..000000000
Binary files a/lib/google-http-client-android-1.43.0.jar and /dev/null differ
diff --git a/lib/pcloud-sdk-java b/lib/pcloud-sdk-java
deleted file mode 160000
index c6681ed37..000000000
--- a/lib/pcloud-sdk-java
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6681ed3762fdb3bda63fc9c147a369d3812f7d9
diff --git a/lib/subsampling-scale-image-view b/lib/subsampling-scale-image-view
deleted file mode 160000
index b3f141e40..000000000
--- a/lib/subsampling-scale-image-view
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3f141e408dbcddb60e8203b96af6d610f7ecccd
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 4f6261f4c..25a82f613 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'de.mannodermaus.android-junit5'
 
 if (!liteFlavor()) {
@@ -38,12 +38,16 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 
 		coreLibraryDesugaringEnabled true
 	}
 
+	buildFeatures {
+		viewBinding true
+	}
+
 	buildTypes {
 		release {
 			crunchPngs false
@@ -148,7 +152,7 @@ dependencies {
 	implementation dependencies.appcompat
 	implementation dependencies.recyclerView
 	implementation dependencies.design
-	implementation project(':subsampling-image-view')
+	implementation dependencies.scaleImageView
 	implementation dependencies.recyclerViewFastScroll
 
 	// android x
@@ -161,9 +165,12 @@ dependencies {
 	implementation dependencies.androidxBiometric
 
 	// cloud
-	playstoreImplementation dependencies.dropbox
-	apkstoreImplementation dependencies.dropbox
-	fdroidImplementation dependencies.dropbox
+	playstoreImplementation dependencies.dropboxCore
+	playstoreImplementation dependencies.dropboxAndroid
+	apkstoreImplementation dependencies.dropboxCore
+	apkstoreImplementation dependencies.dropboxAndroid
+	fdroidImplementation dependencies.dropboxCore
+	fdroidImplementation dependencies.dropboxAndroid
 
 	playstoreImplementation dependencies.msgraphAuth
 	apkstoreImplementation dependencies.msgraphAuth
@@ -266,18 +273,10 @@ configurations {
 	all*.exclude group: 'com.google.guava', module: 'listenablefuture'
 }
 
-androidExtensions {
-	experimental = true
-}
-
 def liteFlavor() {
 	gradle.startParameter.taskNames.stream().filter(t -> t.toLowerCase().contains("lite")).findAny().isPresent()
 }
 
-def getApiKey(key) {
-	return !liteFlavor() ? System.getenv().getOrDefault(key, "") : ""
-}
-
 def getOnedriveApiKey() {
 	if (liteFlavor()) {
 		return ""
diff --git a/presentation/prebuild.gradle b/presentation/prebuild.gradle
index b7a5e16ca..20db7bbcb 100644
--- a/presentation/prebuild.gradle
+++ b/presentation/prebuild.gradle
@@ -29,8 +29,4 @@ task generateAppConfigurationFile() {
 	config_file.write(JsonOutput.prettyPrint(JsonOutput.toJson(jsonSlurper.parseText(jsonString))))
 }
 
-static def getApiKey(key) {
-	return System.getenv().getOrDefault(key, "")
-}
-
 build.dependsOn generateAppConfigurationFile
diff --git a/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java b/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java
index ce673f04d..ffa670faf 100644
--- a/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java
+++ b/presentation/src/androidTest/java/org/cryptomator/presentation/logging/LogRotatorTest.java
@@ -13,9 +13,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static java.lang.Thread.sleep;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertThat;
+import static java.lang.Thread.sleep;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
+	<background android:drawable="@color/ic_launcher_background" />
+	<foreground android:drawable="@drawable/ic_launcher_foreground" />
+	<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/presentation/src/debug/res/values/ic_launcher_background.xml b/presentation/src/debug/res/values/ic_launcher_background.xml
index e50a17c8d..33932e5ed 100644
--- a/presentation/src/debug/res/values/ic_launcher_background.xml
+++ b/presentation/src/debug/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#F1C40F</color>
+	<color name="ic_launcher_background">#F1C40F</color>
 </resources>
\ No newline at end of file
diff --git a/presentation/src/lite/res/drawable/ic_launcher_foreground.xml b/presentation/src/lite/res/drawable/ic_launcher_foreground.xml
index 0607f6519..4fb4ba35e 100644
--- a/presentation/src/lite/res/drawable/ic_launcher_foreground.xml
+++ b/presentation/src/lite/res/drawable/ic_launcher_foreground.xml
@@ -1,23 +1,24 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="0.05172973"
-      android:scaleY="0.05172973"
-      android:translateX="25.29"
-      android:translateY="29.480108">
-    <path
-        android:pathData="m877,689.3a51.6,51.6 0,0 0,-23.7 -5.8h-40.5c27.8,-41.7 46.3,-92.3 46.3,-153.2 0.1,-34.3 -5.4,-61.2 -10.5,-78.8a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.1,61.3 18.4,112.2 46.4,154.1h-41.3a51.6,51.6 0,0 0,-23.7 5.8c-19.8,10.1 -35.9,32.7 -45.3,63.7 -8.7,28.8 -11,62.1 -6.5,93.9 8.5,59.3 38.8,99.2 75.5,99.2h103.5v-0.1c4.4,-0.2 8.8,-2.2 12.9,-5.9l49.7,-43.8c10.2,-9.1 17.8,-32 20.2,-61.3a248,248 0,0 0,0.7 -25.9c61.4,33.1 113.8,46.2 113.8,46.2s52.5,-13 114.1,-46a245.8,245.8 0,0 0,0.7 25.7c2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.2,3.7 8.5,5.6 12.9,5.9v0.1h103.5c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-93.9 -9.4,-30.9 -25.5,-53.5 -45.4,-63.7zM404.2,881.4c-0.5,0.3 -25.9,22.9 -40.4,35.7a11.2,11.2 0,0 1,-17.4 -3.3c-21,-41.1 -23.3,-124.9 -8.4,-176.5 25.2,24.3 53.1,44.2 80.1,60.3 1.5,30.4 -4.3,78.1 -14,83.7zM597.1,670.3 L552.4,683 507.7,670.2 540,534.7a57.5,57.5 0,1 1,25.3 0zM758.5,913.8a11.2,11.2 0,0 1,-17.4 3.3c-14.5,-12.8 -39.9,-35.4 -40.4,-35.7 -9.6,-5.6 -15.5,-53.1 -14,-83.5 27.1,-16.1 55,-36 80.3,-60.2 14.8,51.6 12.5,135.1 -8.5,176.1z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m178.9,584.1 l20.6,-40.4a49.4,49.4 0,0 0,-0.5 -46l18.1,-35.3a74.8,74.8 0,0 0,16.4 -0.6c1.4,-6.4 2.9,-12.1 4.3,-16.9a63.6,63.6 0,0 0,0.6 -34.7c-9.9,-36.1 -9.5,-73.8 -7.7,-97.3a75.1,75.1 0,0 0,-68.6 119.1l-19.3,37.7a49.3,49.3 0,0 0,-36.5 26.3l-20.6,40.4a49.3,49.3 0,0 0,-0.5 43.9,82.8 82.8,0 0,0 -74.8,122.8 20,20 0,0 0,35 -19.3,42.8 42.8,0 1,1 42.2,21.8 20,20 0,0 0,2.2 39.9,21.8 21.8,0 0,0 2.3,-0.1 82.8,82.8 0,0 0,54 -135.7,49.3 49.3,0 0,0 32.8,-25.6z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m1099,619.4a82.9,82.9 0,0 0,-73.6 -45.1,49.3 49.3,0 0,0 -3,-37.9l-20.6,-40.4a49.3,49.3 0,0 0,-36.5 -26.3l-19.2,-37.7a75,75 0,0 0,-70.7 -118.8c1.7,23.4 2.1,61.6 -8,97.9a63.6,63.6 0,0 0,0.5 34.7c1.3,4.5 2.7,9.7 4,15.5a75.4,75.4 0,0 0,19.2 1l18.1,35.3a49.4,49.4 0,0 0,-0.5 46l20.6,40.4a49.2,49.2 0,0 0,29 24.6,82.8 82.8,0 0,0 57.8,130.7 22.1,22.1 0,0 0,2.3 0.1,20 20,0 0,0 2.2,-39.9 42.8,42.8 0,1 1,42.2 -21.8,20 20,0 1,0 35,19.3 82.8,82.8 0,0 0,1.3 -77.7z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m553.1,271.7c19,-7.6 67.6,-23.5 139.3,-23.5 39.7,0 80.5,4.9 122,14.5 -9.8,-133.1 -112.4,-262.7 -261.7,-262.7 -160.5,0 -252.7,129.2 -261.7,262.1 41.3,-9.5 81.9,-14.4 121.4,-14.4 72.5,0 121.5,16.2 140.7,24zM623.1,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM646.4,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.2a60.6,60.6 0,0 1,60.6 -60.6zM577.8,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM487.2,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM532.5,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM459,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.3a60.6,60.6 0,0 1,60.7 -60.6z"
-        android:fillColor="#49b04a"/>
-  </group>
+	android:width="108dp"
+	android:height="108dp"
+	android:viewportWidth="108"
+	android:viewportHeight="108">
+	<group
+		android:scaleX="0.05172973"
+		android:scaleY="0.05172973"
+		android:translateX="25.29"
+		android:translateY="29.480108">
+		<path
+			android:pathData="m877,689.3a51.6,51.6 0,0 0,-23.7 -5.8h-40.5c27.8,-41.7 46.3,-92.3 46.3,-153.2 0.1,-34.3 -5.4,-61.2 -10.5,-78.8a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.1,61.3 18.4,112.2 46.4,154.1h-41.3a51.6,51.6 0,0 0,-23.7 5.8c-19.8,10.1 -35.9,32.7 -45.3,63.7 -8.7,28.8 -11,62.1 -6.5,93.9 8.5,59.3 38.8,99.2 75.5,99.2h103.5v-0.1c4.4,-0.2 8.8,-2.2 12.9,-5.9l49.7,-43.8c10.2,-9.1 17.8,-32 20.2,-61.3a248,248 0,0 0,0.7 -25.9c61.4,33.1 113.8,46.2 113.8,46.2s52.5,-13 114.1,-46a245.8,245.8 0,0 0,0.7 25.7c2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.2,3.7 8.5,5.6 12.9,5.9v0.1h103.5c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-93.9 -9.4,-30.9 -25.5,-53.5 -45.4,-63.7zM404.2,881.4c-0.5,0.3 -25.9,22.9 -40.4,35.7a11.2,11.2 0,0 1,-17.4 -3.3c-21,-41.1 -23.3,-124.9 -8.4,-176.5 25.2,24.3 53.1,44.2 80.1,60.3 1.5,30.4 -4.3,78.1 -14,83.7zM597.1,670.3 L552.4,683 507.7,670.2 540,534.7a57.5,57.5 0,1 1,25.3 0zM758.5,913.8a11.2,11.2 0,0 1,-17.4 3.3c-14.5,-12.8 -39.9,-35.4 -40.4,-35.7 -9.6,-5.6 -15.5,-53.1 -14,-83.5 27.1,-16.1 55,-36 80.3,-60.2 14.8,51.6 12.5,135.1 -8.5,176.1z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m178.9,584.1 l20.6,-40.4a49.4,49.4 0,0 0,-0.5 -46l18.1,-35.3a74.8,74.8 0,0 0,16.4 -0.6c1.4,-6.4 2.9,-12.1 4.3,-16.9a63.6,63.6 0,0 0,0.6 -34.7c-9.9,-36.1 -9.5,-73.8 -7.7,-97.3a75.1,75.1 0,0 0,-68.6 119.1l-19.3,37.7a49.3,49.3 0,0 0,-36.5 26.3l-20.6,40.4a49.3,49.3 0,0 0,-0.5 43.9,82.8 82.8,0 0,0 -74.8,122.8 20,20 0,0 0,35 -19.3,42.8 42.8,0 1,1 42.2,21.8 20,20 0,0 0,2.2 39.9,21.8 21.8,0 0,0 2.3,-0.1 82.8,82.8 0,0 0,54 -135.7,49.3 49.3,0 0,0 32.8,-25.6z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m1099,619.4a82.9,82.9 0,0 0,-73.6 -45.1,49.3 49.3,0 0,0 -3,-37.9l-20.6,-40.4a49.3,49.3 0,0 0,-36.5 -26.3l-19.2,-37.7a75,75 0,0 0,-70.7 -118.8c1.7,23.4 2.1,61.6 -8,97.9a63.6,63.6 0,0 0,0.5 34.7c1.3,4.5 2.7,9.7 4,15.5a75.4,75.4 0,0 0,19.2 1l18.1,35.3a49.4,49.4 0,0 0,-0.5 46l20.6,40.4a49.2,49.2 0,0 0,29 24.6,82.8 82.8,0 0,0 57.8,130.7 22.1,22.1 0,0 0,2.3 0.1,20 20,0 0,0 2.2,-39.9 42.8,42.8 0,1 1,42.2 -21.8,20 20,0 1,0 35,19.3 82.8,82.8 0,0 0,1.3 -77.7z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m553.1,271.7c19,-7.6 67.6,-23.5 139.3,-23.5 39.7,0 80.5,4.9 122,14.5 -9.8,-133.1 -112.4,-262.7 -261.7,-262.7 -160.5,0 -252.7,129.2 -261.7,262.1 41.3,-9.5 81.9,-14.4 121.4,-14.4 72.5,0 121.5,16.2 140.7,24zM623.1,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM646.4,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.2a60.6,60.6 0,0 1,60.6 -60.6zM577.8,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM487.2,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM532.5,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM459,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.3a60.6,60.6 0,0 1,60.7 -60.6z"
+			android:fillColor="#49b04a" />
+	</group>
 </vector>
diff --git a/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/lite/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
+	<background android:drawable="@color/ic_launcher_background" />
+	<foreground android:drawable="@drawable/ic_launcher_foreground" />
+	<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/presentation/src/lite/res/values/ic_launcher_background.xml b/presentation/src/lite/res/values/ic_launcher_background.xml
index c5d5899fd..ea6a69e1f 100644
--- a/presentation/src/lite/res/values/ic_launcher_background.xml
+++ b/presentation/src/lite/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
+	<color name="ic_launcher_background">#FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/liteDebug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
+	<background android:drawable="@color/ic_launcher_background" />
+	<foreground android:drawable="@drawable/ic_launcher_foreground" />
+	<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/presentation/src/liteDebug/res/values/ic_launcher_background.xml b/presentation/src/liteDebug/res/values/ic_launcher_background.xml
index e50a17c8d..33932e5ed 100644
--- a/presentation/src/liteDebug/res/values/ic_launcher_background.xml
+++ b/presentation/src/liteDebug/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#F1C40F</color>
+	<color name="ic_launcher_background">#F1C40F</color>
 </resources>
\ No newline at end of file
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index 9a7735bf0..cb407cbe2 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.USE_BIOMETRIC" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
 	<!-- Required for Auto photo upload, READ_EXTERNAL_STORAGE for legacy Android < 10 -->
@@ -196,7 +197,15 @@
 
 		<service
 			android:name=".service.CryptorsService"
-			android:enabled="true" />
+			android:enabled="true"
+			android:foregroundServiceType="specialUse">
+			<property
+				android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+				android:value="This app uses client-side encryption, so the users need to unlock vaults before accessing their data.
+				During this access, we need to store the vault keys in memory so that the user does not need to enter their unlock password
+				each time the vault is accessed. The vault is unlocked until a user-defined inactivity timeout is reached or, if not disabled,
+				the screen is locked. All of this requires this permission." />
+		</service>
 
 		<service
 			android:name=".service.AutoUploadService"
diff --git a/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt b/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
index df950962f..1fce6d214 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/CryptomatorApp.kt
@@ -45,16 +45,11 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
 	override fun onCreate() {
 		super.onCreate()
 		setupLogging()
+		@Suppress("KotlinConstantConditions") //
 		val flavor = when (BuildConfig.FLAVOR) {
-			"apkstore" -> {
-				"APK Store Edition"
-			}
-			"fdroid" -> {
-				"F-Droid Edition"
-			}
-			"lite" -> {
-				"F-Droid Main Repo Edition"
-			}
+			"apkstore" -> "APK Store Edition"
+			"fdroid" -> "F-Droid Edition"
+			"lite" -> "F-Droid Main Repo Edition"
 			else -> "Google Play Edition"
 		}
 		Timber.tag("App").i(
@@ -147,17 +142,16 @@ class CryptomatorApp : MultiDexApplication(), HasComponent<ApplicationComponent>
 				val cloud = applicationComponent.cloudRepository().decryptedViewOf(vault)
 				startAutoUpload(cloud)
 			} else if (vault == null) {
-				autoUploadServiceBinder?.vaultNotFound()
-					?: run {
-						Timber.tag("App").i("autoUploadServiceBinder not yet initialized, manually show notification")
-						AutoUploadNotification(applicationContext, 0).showVaultNotFoundNotification()
-					}
+				autoUploadServiceBinder?.vaultNotFound() ?: run {
+					Timber.tag("App").i("autoUploadServiceBinder not yet initialized, manually show notification")
+					AutoUploadNotification(applicationContext, 0).showVaultNotFoundNotification()
+				}
 			}
 		}
 	}
 
 	private fun checkToStartAutoImageUpload(sharedPreferencesHandler: SharedPreferencesHandler): Boolean {
-		return sharedPreferencesHandler.usePhotoUpload()
+		return sharedPreferencesHandler.usePhotoUpload() //
 				&& (!sharedPreferencesHandler.autoPhotoUploadOnlyUsingWifi() || applicationComponent.networkConnectionCheck().checkWifiOnAndConnected())
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt b/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
index 0062fcf52..a6d26333f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/exception/ExceptionHandlers.kt
@@ -17,7 +17,6 @@ import org.cryptomator.domain.exception.license.LicenseNotValidException
 import org.cryptomator.domain.exception.license.NoLicenseAvailableException
 import org.cryptomator.domain.exception.update.GeneralUpdateErrorException
 import org.cryptomator.domain.exception.update.HashMismatchUpdateCheckException
-import org.cryptomator.domain.exception.update.SSLHandshakePreAndroid5UpdateCheckException
 import org.cryptomator.domain.exception.vaultconfig.MissingVaultConfigFileException
 import org.cryptomator.domain.exception.vaultconfig.UnsupportedMasterkeyLocationException
 import org.cryptomator.domain.exception.vaultconfig.VaultConfigLoadException
@@ -52,7 +51,6 @@ class ExceptionHandlers @Inject constructor(private val context: Context, defaul
 		staticHandler(NoLicenseAvailableException::class.java, R.string.dialog_enter_license_no_content)
 		staticHandler(HashMismatchUpdateCheckException::class.java, R.string.error_hash_mismatch_update)
 		staticHandler(GeneralUpdateErrorException::class.java, R.string.error_general_update)
-		staticHandler(SSLHandshakePreAndroid5UpdateCheckException::class.java, R.string.error_general_update)
 		staticHandler(
 			MissingVaultConfigFileException::class.java, String.format(
 				ResourceHelper.getString(R.string.error_vault_config_file_missing_due_to_format_999),
diff --git a/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java b/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java
index 0af5e8a33..b7e9c3dc6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/intent/AuthenticatePCloudIntent.java
@@ -5,4 +5,5 @@
 
 @Intent(AuthenticatePCloudActivity.class)
 public interface AuthenticatePCloudIntent {
+
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt b/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt
index d68ecf4da..1415c5430 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/logging/Logfiles.kt
@@ -2,7 +2,6 @@ package org.cryptomator.presentation.logging
 
 import android.content.Context
 import java.io.File
-import java.util.ArrayList
 
 object Logfiles {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/model/ImagePreviewFile.kt b/presentation/src/main/java/org/cryptomator/presentation/model/ImagePreviewFile.kt
index 7431c0f94..97616e16c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/model/ImagePreviewFile.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/model/ImagePreviewFile.kt
@@ -3,7 +3,7 @@ package org.cryptomator.presentation.model
 import android.annotation.SuppressLint
 import android.net.Uri
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @SuppressLint("ParcelCreator")
diff --git a/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt b/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt
index fb512f731..e48b11ac9 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/model/comparator/CloudModelComparator.kt
@@ -3,7 +3,6 @@ package org.cryptomator.presentation.model.comparator
 import android.content.Context
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.model.WebDavCloudModel
-import java.util.Comparator
 
 class CloudModelComparator(private val context: Context) : Comparator<CloudModel> {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt
index 51f156f5d..51f3403ec 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/BiometricAuthSettingsPresenter.kt
@@ -16,7 +16,6 @@ import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.ui.activity.view.BiometricAuthSettingsView
 import org.cryptomator.presentation.workflow.ActivityResult
 import org.cryptomator.util.SharedPreferencesHandler
-import java.util.ArrayList
 import javax.inject.Inject
 import timber.log.Timber
 
@@ -81,7 +80,8 @@ class BiometricAuthSettingsPresenter @Inject constructor( //
 		val vault = Vault.aCopyOf(vaultModel.toVault()).withCloud(cloud).withSavedPassword(password).build()
 		requestActivityResult( //
 			ActivityResultCallbacks.encryptVaultPassword(vaultModel), //
-			Intents.unlockVaultIntent().withVaultModel(VaultModel(vault)).withVaultAction(UnlockVaultIntent.VaultAction.ENCRYPT_PASSWORD))
+			Intents.unlockVaultIntent().withVaultModel(VaultModel(vault)).withVaultAction(UnlockVaultIntent.VaultAction.ENCRYPT_PASSWORD) //
+		)
 	}
 
 	@Callback
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
index 5fa1a77db..fa9e235f6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
@@ -292,6 +292,7 @@ class BrowseFilesPresenter @Inject constructor( //
 						override fun onSuccess(t: Void?) {
 							view?.showMessage(R.string.screen_file_browser_msg_file_exported)
 						}
+
 						override fun onFinished() {
 							source.close()
 						}
@@ -537,8 +538,9 @@ class BrowseFilesPresenter @Inject constructor( //
 			Uri.fromFile(fileUtil.getLegacyFileForMicrosoftWorkaround(cloudFile))
 		} else {
 			fileUtil.contentUriFor(cloudFile)
-		}.also {
-			openedCloudFile = cloudFile
+		}
+		openedCloudFile = cloudFile
+		uriToOpenedFile?.let {
 			openedCloudFileMd5 = calculateDigestFromUri(it)
 			viewFileIntent.setDataAndType(it, mimeTypes.fromFilename(cloudFile.name)?.toString())
 			viewFileIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt
index 3b2a5d4c5..21f6dd915 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/ChooseCloudServicePresenter.kt
@@ -96,10 +96,11 @@ class ChooseCloudServicePresenter @Inject constructor( //
 
 	fun showCloudMissingSnackbarHintInLiteVariant() {
 		if (BuildConfig.FLAVOR == "lite") {
-			view?.showSnackbar(R.string.snack_bar_cryptomator_variants_hint, object: SnackbarAction {
+			view?.showSnackbar(R.string.snack_bar_cryptomator_variants_hint, object : SnackbarAction {
 				override fun onClick(v: View?) {
 					startIntent(Intents.cryptomatorVariantsIntent())
 				}
+
 				override val text: Int
 					get() = R.string.snack_bar_cryptomator_variants_title
 			})
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt
index 4403af7e3..6c3f205b3 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/CloudConnectionListPresenter.kt
@@ -34,6 +34,7 @@ import org.cryptomator.util.ExceptionUtil
 import org.cryptomator.util.crypto.CredentialCryptor
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
+import kotlin.jvm.optionals.getOrNull
 import timber.log.Timber
 
 @PerView
@@ -136,7 +137,7 @@ class CloudConnectionListPresenter @Inject constructor( //
 		OnedriveAuthentication.getAuthenticatedOnedriveCloud(activity(), { cloud ->
 			saveOnedriveCloud(cloud)
 		}, { e ->
-			ExceptionUtil.extract(e, NetworkConnectionException::class.java).orNull()?.let { showError(it) } ?: showError(e)
+			ExceptionUtil.extract(e, NetworkConnectionException::class.java).getOrNull()?.let { showError(it) } ?: showError(e)
 		})
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt
index aaada8a0e..14180e85b 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/UnlockVaultPresenter.kt
@@ -84,6 +84,7 @@ class UnlockVaultPresenter @Inject constructor(
 				override fun onSuccess(unverifiedVaultConfig: Optional<UnverifiedVaultConfig>) {
 					onUnverifiedVaultConfigRetrieved(unverifiedVaultConfig)
 				}
+
 				override fun onError(e: Throwable) {
 					if (!authenticationExceptionHandler.handleAuthenticationException(this@UnlockVaultPresenter, e, ActivityResultCallbacks.authenticatedAfterGettingVaultConfig(vault))) {
 						super.onError(e)
@@ -103,6 +104,7 @@ class UnlockVaultPresenter @Inject constructor(
 					override fun onSuccess(unverifiedVaultConfig: Optional<UnverifiedVaultConfig>) {
 						onUnverifiedVaultConfigRetrieved(unverifiedVaultConfig)
 					}
+
 					override fun onError(e: Throwable) {
 						super.onError(e)
 						finishWithResult(null)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/UriBasedDataSource.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/UriBasedDataSource.kt
index 39280129e..79c6defaf 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/UriBasedDataSource.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/UriBasedDataSource.kt
@@ -4,8 +4,10 @@ import android.content.Context
 import android.net.Uri
 import org.cryptomator.domain.usecases.cloud.DataSource
 import org.cryptomator.presentation.util.ContentResolverUtil
+import org.cryptomator.util.Optional
 import java.io.IOException
 import java.io.InputStream
+import java.util.Date
 
 class UriBasedDataSource private constructor(private val uri: Uri) : DataSource {
 
@@ -27,6 +29,10 @@ class UriBasedDataSource private constructor(private val uri: Uri) : DataSource
 		// do nothing
 	}
 
+	override fun modifiedDate(context: Context): Optional<Date> {
+		return Optional.ofNullable(ContentResolverUtil(context).fileModifiedDate(uri))
+	}
+
 	companion object {
 
 		@JvmStatic
diff --git a/presentation/src/main/java/org/cryptomator/presentation/presenter/VaultListPresenter.kt b/presentation/src/main/java/org/cryptomator/presentation/presenter/VaultListPresenter.kt
index ec397f7fc..ddab5bd29 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/presenter/VaultListPresenter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/presenter/VaultListPresenter.kt
@@ -18,7 +18,6 @@ import org.cryptomator.domain.CloudType
 import org.cryptomator.domain.Vault
 import org.cryptomator.domain.di.PerView
 import org.cryptomator.domain.exception.license.LicenseNotValidException
-import org.cryptomator.domain.exception.update.SSLHandshakePreAndroid5UpdateCheckException
 import org.cryptomator.domain.usecases.DoLicenseCheckUseCase
 import org.cryptomator.domain.usecases.DoUpdateCheckUseCase
 import org.cryptomator.domain.usecases.DoUpdateUseCase
@@ -168,15 +167,11 @@ class VaultListPresenter @Inject constructor( //
 					}
 
 					override fun onError(e: Throwable) {
-						if (e is SSLHandshakePreAndroid5UpdateCheckException) {
-							Timber.tag("SettingsPresenter").e(e, "Update check failed due to Android pre 5 and SSL Handshake not accepted")
-						} else {
-							showError(e)
-						}
+						showError(e)
 					}
 				})
 		} else {
-			Timber.tag("VaultListPresenter").i("Update check not started due to no internal connection")
+			Timber.tag("VaultListPresenter").i("Update check not started due to no internet connection")
 		}
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
index 522a97e52..3e9acc2e1 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/AutoUploadService.java
@@ -1,8 +1,5 @@
 package org.cryptomator.presentation.service;
 
-import static org.cryptomator.domain.usecases.cloud.UploadFile.anUploadFile;
-import static java.lang.String.format;
-
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -51,6 +48,9 @@
 
 import timber.log.Timber;
 
+import static org.cryptomator.domain.usecases.cloud.UploadFile.anUploadFile;
+import static java.lang.String.format;
+
 public class AutoUploadService extends Service {
 
 	private static final String ACTION_CANCEL_AUTO_UPLOAD = "CANCEL_AUTO_UPLOAD";
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
index c5dfc0a6c..ef8f0c08f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/PhotoContentJob.kt
@@ -69,7 +69,7 @@ class PhotoContentJob : JobService() {
 			}
 		} ?: Timber.tag("PhotoContentJob").w("No photos content")
 
-		if(filesCaptured && SharedPreferencesHandler(applicationContext).usePhotoUploadInstant()) {
+		if (filesCaptured && SharedPreferencesHandler(applicationContext).usePhotoUploadInstant()) {
 			(application as CryptomatorApp).startAutoUpload()
 		}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java b/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java
index 3f0c6ab8c..b45c99e22 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/service/UnlockedNotification.java
@@ -1,11 +1,14 @@
 package org.cryptomator.presentation.service;
 
+import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ServiceInfo;
+import android.os.Build;
 
 import androidx.core.app.NotificationCompat;
 
@@ -31,8 +34,8 @@ class UnlockedNotification {
 	private static final String NOTIFICATION_GROUP_KEY = "CryptomatorGroup";
 
 	private final Service service;
-	private final NotificationCompat.Builder builder;
 	private final AutolockTimeout autolockTimeout;
+	private NotificationCompat.Builder builder;
 	private int unlocked = 0;
 
 	public UnlockedNotification(Service service, AutolockTimeout autolockTimeout) {
@@ -57,6 +60,11 @@ public UnlockedNotification(Service service, AutolockTimeout autolockTimeout) {
 				.addAction(lockNowAction()) //
 				.setGroup(NOTIFICATION_GROUP_KEY) //
 				.setOngoing(true);
+
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+			this.builder = this.builder.setForegroundServiceBehavior(Notification.FOREGROUND_SERVICE_IMMEDIATE);
+		}
+
 		this.autolockTimeout = autolockTimeout;
 	}
 
@@ -72,7 +80,7 @@ private PendingIntent lockNowIntent() {
 		return PendingIntent.getService( //
 				service.getApplicationContext(), //
 				0, //
-				CryptorsService.lockAllIntent(service.getApplicationContext()),
+				CryptorsService.lockAllIntent(service.getApplicationContext()), //
 				PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 	}
 
@@ -107,7 +115,11 @@ public void update() {
 	}
 
 	public void show() {
-		service.startForeground(NOTIFICATION_ID, builder.build());
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+			service.startForeground(NOTIFICATION_ID, builder.build(), ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+		} else {
+			service.startForeground(NOTIFICATION_ID, builder.build());
+		}
 	}
 
 	public void hide() {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticateCloudActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticateCloudActivity.kt
index 4fd756c05..fad8f3548 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticateCloudActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticateCloudActivity.kt
@@ -3,18 +3,16 @@ package org.cryptomator.presentation.ui.activity
 import org.cryptomator.domain.WebDavCloud
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityEmptyBinding
 import org.cryptomator.presentation.intent.AuthenticateCloudIntent
 import org.cryptomator.presentation.presenter.AuthenticateCloudPresenter
 import org.cryptomator.presentation.ui.activity.view.AuthenticateCloudView
 import org.cryptomator.presentation.ui.dialog.AssignSslCertificateDialog
-
 import java.security.cert.X509Certificate
-
 import javax.inject.Inject
 
-@Activity(layout = R.layout.activity_empty)
-class AuthenticateCloudActivity : BaseActivity(),
+@Activity
+class AuthenticateCloudActivity : BaseActivity<ActivityEmptyBinding>(ActivityEmptyBinding::inflate),
 	AuthenticateCloudView,
 	AssignSslCertificateDialog.Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticatePCloudActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticatePCloudActivity.kt
index 59b610eeb..de7cce9a4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticatePCloudActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AuthenticatePCloudActivity.kt
@@ -7,12 +7,13 @@ import android.widget.Toast
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.BuildConfig
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.presenter.CloudConnectionListPresenter
 import java.util.TreeMap
 import timber.log.Timber
 
 @Activity
-class AuthenticatePCloudActivity : BaseActivity() {
+class AuthenticatePCloudActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate) {
 
 	private val startAuthenticationRequestCode = 1232
 	private val redirectTimeoutAfterAuthenticationAndResumed = 1000L
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadChooseVaultActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadChooseVaultActivity.kt
index f218e0f15..184274803 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadChooseVaultActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadChooseVaultActivity.kt
@@ -3,6 +3,7 @@ package org.cryptomator.presentation.ui.activity
 import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.model.CloudFolderModel
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.presenter.AutoUploadChooseVaultPresenter
@@ -10,10 +11,9 @@ import org.cryptomator.presentation.ui.activity.view.AutoUploadChooseVaultView
 import org.cryptomator.presentation.ui.dialog.NotEnoughVaultsDialog
 import org.cryptomator.presentation.ui.fragment.AutoUploadChooseVaultFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class AutoUploadChooseVaultActivity : BaseActivity(), //
+class AutoUploadChooseVaultActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), //
 	AutoUploadChooseVaultView, //
 	NotEnoughVaultsDialog.Callback {
 
@@ -25,8 +25,8 @@ class AutoUploadChooseVaultActivity : BaseActivity(), //
 	}
 
 	private fun setupToolbar() {
-		toolbar.title = getString(R.string.screen_settings_auto_photo_upload_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_settings_auto_photo_upload_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 		supportActionBar?.let {
 			it.setDisplayHomeAsUpEnabled(true)
 			it.setHomeAsUpIndicator(R.drawable.ic_clear)
@@ -50,8 +50,8 @@ class AutoUploadChooseVaultActivity : BaseActivity(), //
 
 	override fun displayDialogUnableToUploadFiles() {
 		NotEnoughVaultsDialog //
-			.withContext(this) //
-			.andTitle(getString(R.string.dialog_unable_to_auto_upload_files_title)) //
+			.withContext(context()) //
+			.andTitle(R.string.dialog_unable_to_auto_upload_files_title) //
 			.show()
 	}
 
@@ -70,5 +70,5 @@ class AutoUploadChooseVaultActivity : BaseActivity(), //
 		autoUploadChooseVaultFragment().showChosenLocation(location)
 	}
 
-	private fun autoUploadChooseVaultFragment(): AutoUploadChooseVaultFragment = getCurrentFragment(R.id.fragmentContainer) as AutoUploadChooseVaultFragment
+	private fun autoUploadChooseVaultFragment(): AutoUploadChooseVaultFragment = getCurrentFragment(R.id.fragment_container) as AutoUploadChooseVaultFragment
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt
index 21b37247c..4401c92ae 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/AutoUploadRefreshTokenActivity.kt
@@ -3,14 +3,14 @@ package org.cryptomator.presentation.ui.activity
 import android.os.Bundle
 import org.cryptomator.domain.exception.authentication.AuthenticationException
 import org.cryptomator.generator.Activity
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityEmptyBinding
 import org.cryptomator.presentation.presenter.AutoUploadRefreshTokenPresenter
 import org.cryptomator.presentation.ui.activity.view.AutoUploadRefreshTokenView
 import javax.inject.Inject
 import timber.log.Timber
 
-@Activity(layout = R.layout.activity_empty)
-class AutoUploadRefreshTokenActivity : BaseActivity(), AutoUploadRefreshTokenView {
+@Activity
+class AutoUploadRefreshTokenActivity : BaseActivity<ActivityEmptyBinding>(ActivityEmptyBinding::inflate), AutoUploadRefreshTokenView {
 
 	@Inject
 	lateinit var presenter: AutoUploadRefreshTokenPresenter
@@ -27,6 +27,7 @@ class AutoUploadRefreshTokenActivity : BaseActivity(), AutoUploadRefreshTokenVie
 	}
 
 	companion object {
+
 		const val AUTHENTICATION_EXCEPTION_ARG = "authenticationException"
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BaseActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BaseActivity.kt
index 25f4c3ba3..fc725e351 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BaseActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BaseActivity.kt
@@ -6,6 +6,7 @@ import android.content.res.Configuration
 import android.content.res.Configuration.ORIENTATION_LANDSCAPE
 import android.content.res.Configuration.ORIENTATION_PORTRAIT
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
@@ -14,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.BuildConfig
@@ -37,7 +39,7 @@ import javax.inject.Inject
 import kotlin.reflect.KClass
 import timber.log.Timber
 
-abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnRequestPermissionsResultCallback, HasComponent<ActivityComponent> {
+abstract class BaseActivity<VB : ViewBinding>(val bindingFactory: (LayoutInflater) -> VB) : AppCompatActivity(), View, ActivityCompat.OnRequestPermissionsResultCallback, HasComponent<ActivityComponent> {
 
 	@Inject
 	lateinit var exceptionMappings: ExceptionHandlers
@@ -45,6 +47,8 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 	@Inject
 	lateinit var sharedPreferencesHandler: SharedPreferencesHandler
 
+	protected val binding: VB by lazy { bindingFactory(layoutInflater) }
+
 	private var activityComponent: ActivityComponent? = null
 
 	private var presenter: Presenter<*>? = null
@@ -70,7 +74,7 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 		this.activityComponent = initializeDagger()
 
 		javaClass.getAnnotation(Activity::class.java)?.let {
-			setContentView(getContentLayout(it))
+			setContentView(binding.root)
 
 			Activities.setIntent(this)
 			this.presenter = Activities.initializePresenter(this)
@@ -107,7 +111,7 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 		logLifecycleAsInfo("onResume")
 
 		// not using android extensions to access activityRootVIew because the view might be from different layouts with different type
-		findViewById<android.view.View>(R.id.activityRootView)?.filterTouchesWhenObscured = sharedPreferencesHandler.disableAppWhenObscured()
+		findViewById<android.view.View>(R.id.activity_root_view)?.filterTouchesWhenObscured = sharedPreferencesHandler.disableAppWhenObscured()
 
 		val config = javaClass.getAnnotation(Activity::class.java)
 		if (config?.secure == true && sharedPreferencesHandler.secureScreen() && !BuildConfig.DEBUG) {
@@ -152,14 +156,6 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 		presenter?.destroy()
 	}
 
-	private fun getContentLayout(config: Activity): Int {
-		return if (config.layout == -1) {
-			R.layout.activity_layout
-		} else {
-			config.layout
-		}
-	}
-
 	private fun initializeDagger(): ActivityComponent {
 		val activityComponent = DaggerActivityComponent.builder()
 			.applicationComponent(applicationComponent)
@@ -171,7 +167,7 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 
 	private fun createAndAddFragment() {
 		val fragment = createFragment()
-		fragment?.let { addFragment(R.id.fragmentContainer, it) }
+		fragment?.let { addFragment(R.id.fragment_container, it) }
 	}
 
 	private fun afterIntentInjected() {
@@ -222,7 +218,7 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 	internal fun replaceFragment(fragment: Fragment, fragmentAnimation: FragmentAnimation, addToBackStack: Boolean = true) {
 		val transaction = supportFragmentManager.beginTransaction()
 		transaction.setCustomAnimations(fragmentAnimation.enter, fragmentAnimation.exit, fragmentAnimation.popEnter, fragmentAnimation.popExit)
-		transaction.replace(R.id.fragmentContainer, fragment)
+		transaction.replace(R.id.fragment_container, fragment)
 		if (addToBackStack) {
 			transaction.addToBackStack(null)
 		}
@@ -315,9 +311,9 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 	}
 
 	internal open fun snackbarView(): android.view.View {
-		return activity().findViewById(R.id.locationsRecyclerView) as android.view.View?
-			?: activity().findViewById(R.id.rlChooseCloudService) as android.view.View?
-			?: return activity().findViewById(R.id.coordinatorLayout)
+		return activity().findViewById(R.id.locations_recycler_view)
+			?: activity().findViewById(R.id.rl_choose_cloud_service)
+			?: return activity().findViewById(R.id.coordinator_layout)
 	}
 
 	internal fun getCurrentFragment(fragmentContainer: Int): Fragment? = supportFragmentManager.findFragmentById(fragmentContainer)
@@ -374,7 +370,7 @@ abstract class BaseActivity : AppCompatActivity(), View, ActivityCompat.OnReques
 		Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
 	}
 
-	internal enum class FragmentAnimation constructor(
+	internal enum class FragmentAnimation(
 		val enter: Int,
 		val exit: Int,
 		val popEnter: Int,
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BiometricAuthSettingsActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BiometricAuthSettingsActivity.kt
index 0cc223e63..6e63b6c19 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BiometricAuthSettingsActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BiometricAuthSettingsActivity.kt
@@ -4,16 +4,16 @@ import androidx.biometric.BiometricManager
 import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.presenter.BiometricAuthSettingsPresenter
 import org.cryptomator.presentation.ui.activity.view.BiometricAuthSettingsView
 import org.cryptomator.presentation.ui.dialog.EnrollSystemBiometricDialog
 import org.cryptomator.presentation.ui.fragment.BiometricAuthSettingsFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class BiometricAuthSettingsActivity : BaseActivity(), //
+class BiometricAuthSettingsActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), //
 	BiometricAuthSettingsView, //
 	EnrollSystemBiometricDialog.Callback {
 
@@ -21,8 +21,8 @@ class BiometricAuthSettingsActivity : BaseActivity(), //
 	lateinit var presenter: BiometricAuthSettingsPresenter
 
 	override fun setupView() {
-		toolbar.setTitle(R.string.screen_settings_biometric_auth)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_settings_biometric_auth)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 
 		showSetupBiometricAuthDialog()
 	}
@@ -36,7 +36,7 @@ class BiometricAuthSettingsActivity : BaseActivity(), //
 		}
 	}
 
-	override fun createFragment(): Fragment? = BiometricAuthSettingsFragment()
+	override fun createFragment(): Fragment = BiometricAuthSettingsFragment()
 
 	override fun renderVaultList(vaultModelCollection: List<VaultModel>) {
 		biometricAuthSettingsFragment().showVaults(vaultModelCollection)
@@ -46,7 +46,7 @@ class BiometricAuthSettingsActivity : BaseActivity(), //
 		biometricAuthSettingsFragment().clearVaultList()
 	}
 
-	private fun biometricAuthSettingsFragment(): BiometricAuthSettingsFragment = getCurrentFragment(R.id.fragmentContainer) as BiometricAuthSettingsFragment
+	private fun biometricAuthSettingsFragment(): BiometricAuthSettingsFragment = getCurrentFragment(R.id.fragment_container) as BiometricAuthSettingsFragment
 
 	override fun onSetupBiometricAuthInSystemClicked() {
 		presenter.onSetupBiometricAuthInSystemClicked()
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt
index 2a3c30c1a..f3d42fa02 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt
@@ -15,6 +15,7 @@ import org.cryptomator.domain.exception.ParentFolderIsNullException
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.intent.BrowseFilesIntent
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings.NavigationMode.BROWSE_FILES
@@ -51,10 +52,9 @@ import org.cryptomator.presentation.ui.dialog.UploadCloudFileDialog
 import org.cryptomator.presentation.ui.fragment.BrowseFilesFragment
 import java.util.regex.Pattern
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class BrowseFilesActivity : BaseActivity(), //
+class BrowseFilesActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), //
 	BrowseFilesView, //
 	BrowseFilesCallback, //
 	ReplaceDialog.Callback, //
@@ -264,9 +264,9 @@ class BrowseFilesActivity : BaseActivity(), //
 	}
 
 	private fun setupToolbar() {
-		toolbar.title = effectiveTitle(browseFilesIntent.folder())
-		toolbar.subtitle = effectiveSubtitle()
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.title = effectiveTitle(browseFilesIntent.folder())
+		binding.mtToolbar.toolbar.subtitle = effectiveSubtitle()
+		setSupportActionBar(binding.mtToolbar.toolbar)
 		if (hasCloudNodeSettings()) {
 			effectiveToolbarIcon(browseFilesIntent.chooseCloudNodeSettings().extraToolbarIcon())
 		}
@@ -389,9 +389,9 @@ class BrowseFilesActivity : BaseActivity(), //
 
 	override fun updateSelectionTitle(numberSelected: Int) {
 		if (numberSelected == 0) {
-			toolbar.title = getString(R.string.screen_file_browser_selection_mode_title_zero_elements)
+			binding.mtToolbar.toolbar.setTitle(R.string.screen_file_browser_selection_mode_title_zero_elements)
 		} else {
-			toolbar.title = getString(R.string.screen_file_browser_selection_mode_title_one_or_more_elements, numberSelected)
+			binding.mtToolbar.toolbar.title = getString(R.string.screen_file_browser_selection_mode_title_one_or_more_elements, numberSelected)
 		}
 	}
 
@@ -436,7 +436,7 @@ class BrowseFilesActivity : BaseActivity(), //
 	}
 
 	override fun updateTitle(folder: CloudFolderModel) {
-		toolbar.title = effectiveTitle(folder)
+		binding.mtToolbar.toolbar.title = effectiveTitle(folder)
 	}
 
 	override fun hasExcludedFolder(): Boolean {
@@ -553,7 +553,7 @@ class BrowseFilesActivity : BaseActivity(), //
 		browseFilesFragment().showLoading(loading)
 	}
 
-	private fun browseFilesFragment(): BrowseFilesFragment = getCurrentFragment(R.id.fragmentContainer) as BrowseFilesFragment
+	private fun browseFilesFragment(): BrowseFilesFragment = getCurrentFragment(R.id.fragment_container) as BrowseFilesFragment
 
 	override fun onCreateNewTextFileClicked(fileName: String) {
 		browseFilesPresenter.onCreateNewTextFileClicked(browseFilesFragment().folder, fileName)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ChooseCloudServiceActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ChooseCloudServiceActivity.kt
index c5e1bc3c4..90f8be0a8 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ChooseCloudServiceActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ChooseCloudServiceActivity.kt
@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.intent.ChooseCloudServiceIntent
 import org.cryptomator.presentation.intent.Intents.cloudSettingsIntent
 import org.cryptomator.presentation.model.CloudTypeModel
@@ -12,10 +13,9 @@ import org.cryptomator.presentation.presenter.ChooseCloudServicePresenter
 import org.cryptomator.presentation.ui.activity.view.ChooseCloudServiceView
 import org.cryptomator.presentation.ui.fragment.ChooseCloudServiceFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class ChooseCloudServiceActivity : BaseActivity(), ChooseCloudServiceView {
+class ChooseCloudServiceActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), ChooseCloudServiceView {
 
 	@Inject
 	lateinit var presenter: ChooseCloudServicePresenter
@@ -24,9 +24,9 @@ class ChooseCloudServiceActivity : BaseActivity(), ChooseCloudServiceView {
 	lateinit var chooseCloudServiceIntent: ChooseCloudServiceIntent
 
 	override fun setupView() {
-		toolbar.setTitle(R.string.screen_choose_cloud_service_title)
-		toolbar.subtitle = chooseCloudServiceIntent.subtitle()
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_choose_cloud_service_title)
+		binding.mtToolbar.toolbar.subtitle = chooseCloudServiceIntent.subtitle()
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun createFragment(): Fragment = ChooseCloudServiceFragment()
@@ -42,5 +42,5 @@ class ChooseCloudServiceActivity : BaseActivity(), ChooseCloudServiceView {
 		chooseCloudServiceFragment().render(cloudModels)
 	}
 
-	private fun chooseCloudServiceFragment(): ChooseCloudServiceFragment = getCurrentFragment(R.id.fragmentContainer) as ChooseCloudServiceFragment
+	private fun chooseCloudServiceFragment(): ChooseCloudServiceFragment = getCurrentFragment(R.id.fragment_container) as ChooseCloudServiceFragment
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt
index c75c9402c..4e0dba610 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudConnectionListActivity.kt
@@ -5,6 +5,7 @@ import org.cryptomator.domain.Vault
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.intent.CloudConnectionListIntent
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.presenter.CloudConnectionListPresenter
@@ -13,12 +14,10 @@ import org.cryptomator.presentation.ui.bottomsheet.CloudConnectionSettingsBottom
 import org.cryptomator.presentation.ui.dialog.DeleteCloudConnectionWithVaultsDialog
 import org.cryptomator.presentation.ui.dialog.PCloudCredentialsUpdatedDialog
 import org.cryptomator.presentation.ui.fragment.CloudConnectionListFragment
-import java.util.ArrayList
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class CloudConnectionListActivity : BaseActivity(),
+class CloudConnectionListActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate),
 	CloudConnectionListView,
 	CloudConnectionSettingsBottomSheet.Callback,
 	DeleteCloudConnectionWithVaultsDialog.Callback,
@@ -34,8 +33,8 @@ class CloudConnectionListActivity : BaseActivity(),
 		get() = cloudConnectionListIntent.finishOnCloudItemClick()
 
 	override fun setupView() {
-		toolbar.title = cloudConnectionListIntent.dialogTitle()
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.title = cloudConnectionListIntent.dialogTitle()
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun setupPresenter() {
@@ -51,7 +50,7 @@ class CloudConnectionListActivity : BaseActivity(),
 		connectionListFragment().show(cloudNodes)
 	}
 
-	private fun connectionListFragment(): CloudConnectionListFragment = getCurrentFragment(R.id.fragmentContainer) as CloudConnectionListFragment
+	private fun connectionListFragment(): CloudConnectionListFragment = getCurrentFragment(R.id.fragment_container) as CloudConnectionListFragment
 
 	override fun createFragment(): Fragment = CloudConnectionListFragment()
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudSettingsActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudSettingsActivity.kt
index f572bc5de..3735d55a2 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudSettingsActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CloudSettingsActivity.kt
@@ -3,22 +3,22 @@ package org.cryptomator.presentation.ui.activity
 import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.presenter.CloudSettingsPresenter
 import org.cryptomator.presentation.ui.activity.view.CloudSettingsView
 import org.cryptomator.presentation.ui.fragment.CloudSettingsFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class CloudSettingsActivity : BaseActivity(), CloudSettingsView {
+class CloudSettingsActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), CloudSettingsView {
 
 	@Inject
 	lateinit var cloudSettingsPresenter: CloudSettingsPresenter
 
 	override fun setupView() {
-		toolbar.setTitle(R.string.screen_cloud_settings_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_cloud_settings_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun createFragment(): Fragment = CloudSettingsFragment()
@@ -31,5 +31,5 @@ class CloudSettingsActivity : BaseActivity(), CloudSettingsView {
 		cloudSettingsFragment().update(cloud)
 	}
 
-	private fun cloudSettingsFragment(): CloudSettingsFragment = getCurrentFragment(R.id.fragmentContainer) as CloudSettingsFragment
+	private fun cloudSettingsFragment(): CloudSettingsFragment = getCurrentFragment(R.id.fragment_container) as CloudSettingsFragment
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CreateVaultActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CreateVaultActivity.kt
index 2a194ac2d..87b94713c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CreateVaultActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CreateVaultActivity.kt
@@ -3,37 +3,34 @@ package org.cryptomator.presentation.ui.activity
 import android.view.inputmethod.EditorInfo
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityCreateVaultBinding
 import org.cryptomator.presentation.presenter.CreateVaultPresenter
 import org.cryptomator.presentation.ui.activity.view.CreateVaultView
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.content_create_vault.createVaultButton
-import kotlinx.android.synthetic.main.content_create_vault.vaultNameEditText
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
-@Activity(layout = R.layout.activity_create_vault)
-class CreateVaultActivity : BaseActivity(), CreateVaultView {
+@Activity
+class CreateVaultActivity : BaseActivity<ActivityCreateVaultBinding>(ActivityCreateVaultBinding::inflate), CreateVaultView {
 
 	@Inject
 	lateinit var createVaultPresenter: CreateVaultPresenter
 
 	override fun setupView() {
-		createVaultButton.setOnClickListener {
-			createVaultPresenter.onCreateVaultClicked(vaultNameEditText.text.toString())
+		binding.llContentCreateVault.createVaultButton.setOnClickListener {
+			createVaultPresenter.onCreateVaultClicked(binding.llContentCreateVault.vaultNameEditText.text.toString())
 		}
-		createVaultButton.setOnEditorActionListener { _, actionId, _ ->
+		binding.llContentCreateVault.createVaultButton.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
-				createVaultPresenter.onCreateVaultClicked(vaultNameEditText.text.toString())
+				createVaultPresenter.onCreateVaultClicked(binding.llContentCreateVault.vaultNameEditText.text.toString())
 			}
 			false
 		}
 		setupToolbar()
-
-		vaultNameEditText.requestFocus()
+		binding.llContentCreateVault.vaultNameEditText.requestFocus()
 	}
 
 	private fun setupToolbar() {
-		toolbar.setTitle(R.string.screen_enter_vault_name_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_enter_vault_name_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CryptomatorVariantsActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CryptomatorVariantsActivity.kt
index 97eedf540..063335bd4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CryptomatorVariantsActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/CryptomatorVariantsActivity.kt
@@ -2,48 +2,39 @@ package org.cryptomator.presentation.ui.activity
 
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityCryptomatorVariantsBinding
 import org.cryptomator.presentation.presenter.CryptomatorVariantsPresenter
 import org.cryptomator.presentation.ui.activity.view.CryptomatorVariantsView
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.btnAddRepo
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.btnInstallFDroidVariant
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.btnInstallLiteVariant
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.btnInstallWebsiteVariant
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.tvFdroidCustomSupported
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.tvFdroidCustomUnsupported
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.tvLiteSupported
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.tvLiteUnsupported
-import kotlinx.android.synthetic.main.activity_cryptomator_variants.tvWebsiteSupported
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
-
-@Activity(layout = R.layout.activity_cryptomator_variants)
-class CryptomatorVariantsActivity : BaseActivity(), CryptomatorVariantsView {
+
+@Activity
+class CryptomatorVariantsActivity : BaseActivity<ActivityCryptomatorVariantsBinding>(ActivityCryptomatorVariantsBinding::inflate), CryptomatorVariantsView {
 
 	@Inject
 	lateinit var presenter: CryptomatorVariantsPresenter
 
 	override fun setupView() {
-		toolbar.title = getString(R.string.screen_cryptomator_variants_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_cryptomator_variants_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 
-		tvLiteSupported.text = "WebDAV, S3, Local Storage"
-		tvLiteUnsupported.text = "Dropbox, Google Drive, OneDrive, pCloud"
+		binding.tvLiteSupported.text = "WebDAV, S3, Local Storage"
+		binding.tvLiteUnsupported.text = "Dropbox, Google Drive, OneDrive, pCloud"
 
-		tvFdroidCustomSupported.text = "Dropbox, OneDrive, pCloud, WebDAV, S3, Local Storage"
-		tvFdroidCustomUnsupported.text = "Google Drive"
+		binding.tvFdroidCustomSupported.text = "Dropbox, OneDrive, pCloud, WebDAV, S3, Local Storage"
+		binding.tvFdroidCustomUnsupported.text = "Google Drive"
 
-		tvWebsiteSupported.text = "Dropbox, Google Drive, OneDrive, pCloud, WebDAV, S3, Local Storage"
+		binding.tvWebsiteSupported.text = "Dropbox, Google Drive, OneDrive, pCloud, WebDAV, S3, Local Storage"
 
-		btnInstallLiteVariant.setOnClickListener {
+		binding.btnInstallLiteVariant.setOnClickListener {
 			presenter.onInstallMainFDroidVariantClicked()
 		}
-		btnAddRepo.setOnClickListener {
+		binding.btnAddRepo.setOnClickListener {
 			presenter.onAddRepoClicked()
 		}
-		btnInstallFDroidVariant.setOnClickListener {
+		binding.btnInstallFdroidVariant.setOnClickListener {
 			presenter.onInstallFDroidVariantClicked()
 		}
-		btnInstallWebsiteVariant.setOnClickListener {
+		binding.btnInstallWebsiteVariant.setOnClickListener {
 			presenter.onInstallWebsiteVariantClicked()
 		}
 	}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ImagePreviewActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ImagePreviewActivity.kt
index 901b67cb0..7b7ea88b0 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ImagePreviewActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/ImagePreviewActivity.kt
@@ -17,6 +17,7 @@ import org.cryptomator.domain.exception.FatalBackendException
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityImagePreviewBinding
 import org.cryptomator.presentation.intent.ImagePreviewIntent
 import org.cryptomator.presentation.model.CloudNodeModel
 import org.cryptomator.presentation.model.ImagePreviewFile
@@ -25,15 +26,9 @@ import org.cryptomator.presentation.ui.activity.view.ImagePreviewView
 import org.cryptomator.presentation.ui.dialog.ConfirmDeleteCloudNodeDialog
 import org.cryptomator.presentation.ui.fragment.ImagePreviewFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.activity_image_preview.controlView
-import kotlinx.android.synthetic.main.activity_image_preview.deleteImage
-import kotlinx.android.synthetic.main.activity_image_preview.exportImage
-import kotlinx.android.synthetic.main.activity_image_preview.shareImage
-import kotlinx.android.synthetic.main.activity_image_preview.toolbar
-import kotlinx.android.synthetic.main.activity_image_preview.viewPager
 
-@Activity(layout = R.layout.activity_image_preview)
-class ImagePreviewActivity : BaseActivity(), ImagePreviewView, ConfirmDeleteCloudNodeDialog.Callback {
+@Activity
+class ImagePreviewActivity : BaseActivity<ActivityImagePreviewBinding>(ActivityImagePreviewBinding::inflate), ImagePreviewView, ConfirmDeleteCloudNodeDialog.Callback {
 
 	@Inject
 	lateinit var presenter: ImagePreviewPresenter
@@ -46,7 +41,7 @@ class ImagePreviewActivity : BaseActivity(), ImagePreviewView, ConfirmDeleteClou
 	lateinit var imagePreviewFiles: ArrayList<ImagePreviewFile>
 
 	private val currentImageUri: Uri?
-		get() = imagePreviewFiles[imagePreviewSliderAdapter.getIndex(viewPager.currentItem)].uri
+		get() = imagePreviewFiles[imagePreviewSliderAdapter.getIndex(binding.viewPager.currentItem)].uri
 
 	private val pageChangeListener = object : ViewPager.SimpleOnPageChangeListener() {
 
@@ -62,13 +57,13 @@ class ImagePreviewActivity : BaseActivity(), ImagePreviewView, ConfirmDeleteClou
 			val index = imagePreviewFileStore.index
 			imagePreviewFiles = presenter.getImagePreviewFiles(imagePreviewFileStore, index)
 
-			deleteImage.setOnClickListener {
-				presenter.onDeleteImageClicked(imagePreviewFiles[imagePreviewSliderAdapter.getIndex(viewPager.currentItem)])
+			binding.deleteImage.setOnClickListener {
+				presenter.onDeleteImageClicked(imagePreviewFiles[imagePreviewSliderAdapter.getIndex(binding.viewPager.currentItem)])
 			}
-			exportImage.setOnClickListener {
+			binding.exportImage.setOnClickListener {
 				currentImageUri?.let { presenter.exportImageToUserSelectedLocation(it) }
 			}
-			shareImage.setOnClickListener {
+			binding.shareImage.setOnClickListener {
 				currentImageUri?.let { presenter.onShareImageClicked(it) }
 			}
 
@@ -85,10 +80,10 @@ class ImagePreviewActivity : BaseActivity(), ImagePreviewView, ConfirmDeleteClou
 
 	private fun setupViewPager(index: Int) {
 		imagePreviewSliderAdapter = ImagePreviewSliderAdapter(supportFragmentManager)
-		viewPager.adapter = imagePreviewSliderAdapter
-		viewPager.currentItem = index
-		viewPager.addOnPageChangeListener(pageChangeListener)
-		viewPager.pageMargin = 50
+		binding.viewPager.adapter = imagePreviewSliderAdapter
+		binding.viewPager.currentItem = index
+		binding.viewPager.addOnPageChangeListener(pageChangeListener)
+		binding.viewPager.pageMargin = 50
 	}
 
 	override fun onWindowFocusChanged(hasFocus: Boolean) {
@@ -104,14 +99,14 @@ class ImagePreviewActivity : BaseActivity(), ImagePreviewView, ConfirmDeleteClou
 
 	private fun setupToolbar(index: Int) {
 		updateTitle(index)
-		setSupportActionBar(toolbar)
+		setSupportActionBar(binding.toolbar)
 
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_clear)
 	}
 
 	private fun updateTitle(position: Int) {
-		toolbar.title = imagePreviewFiles[imagePreviewSliderAdapter.getIndex(position)].cloudFileModel.name
+		binding.toolbar.title = imagePreviewFiles[imagePreviewSliderAdapter.getIndex(position)].cloudFileModel.name
 	}
 
 	override fun onMenuItemSelected(itemId: Int): Boolean = when (itemId) {
@@ -189,7 +184,7 @@ class ImagePreviewActivity : BaseActivity(), ImagePreviewView, ConfirmDeleteClou
 	}
 
 	override fun onDeleteCloudNodeConfirmed(nodes: List<CloudNodeModel<*>>) {
-		presenter.onDeleteImageConfirmed(imagePreviewFiles[imagePreviewSliderAdapter.getIndex(viewPager.currentItem)], viewPager.currentItem)
+		presenter.onDeleteImageConfirmed(imagePreviewFiles[imagePreviewSliderAdapter.getIndex(binding.viewPager.currentItem)], binding.viewPager.currentItem)
 	}
 
 	override fun onImageDeleted(index: Int) {
@@ -208,7 +203,7 @@ class ImagePreviewActivity : BaseActivity(), ImagePreviewView, ConfirmDeleteClou
 	}
 
 	private fun setControlViewVisibility(visibility: Int) {
-		controlView.visibility = visibility
+		binding.controlView.visibility = visibility
 	}
 
 	private fun onImageChanged(position: Int) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt
index f7602a647..95cc9e44b 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicenseCheckActivity.kt
@@ -5,6 +5,7 @@ import android.net.Uri
 import android.os.Bundle
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutObscureAwareBinding
 import org.cryptomator.presentation.intent.Intents.vaultListIntent
 import org.cryptomator.presentation.presenter.LicenseCheckPresenter
 import org.cryptomator.presentation.ui.activity.view.UpdateLicenseView
@@ -13,19 +14,19 @@ import org.cryptomator.presentation.ui.dialog.UpdateLicenseDialog
 import org.cryptomator.presentation.ui.layout.ObscuredAwareCoordinatorLayout
 import javax.inject.Inject
 import kotlin.system.exitProcess
-import kotlinx.android.synthetic.main.activity_layout_obscure_aware.activityRootView
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
-@Activity(layout = R.layout.activity_layout_obscure_aware)
-class LicenseCheckActivity : BaseActivity(), UpdateLicenseDialog.Callback, LicenseConfirmationDialog.Callback, UpdateLicenseView {
+@Activity
+class LicenseCheckActivity : BaseActivity<ActivityLayoutObscureAwareBinding>(ActivityLayoutObscureAwareBinding::inflate), //
+	UpdateLicenseDialog.Callback, //
+	LicenseConfirmationDialog.Callback, //
+	UpdateLicenseView {
 
 	@Inject
 	lateinit var licenseCheckPresenter: LicenseCheckPresenter
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-
-		activityRootView.setOnFilteredTouchEventForSecurityListener(object : ObscuredAwareCoordinatorLayout.Listener {
+		binding.activityRootView.setOnFilteredTouchEventForSecurityListener(object : ObscuredAwareCoordinatorLayout.Listener {
 			override fun onFilteredTouchEventForSecurity() {
 				licenseCheckPresenter.onFilteredTouchEventForSecurity()
 			}
@@ -67,8 +68,8 @@ class LicenseCheckActivity : BaseActivity(), UpdateLicenseDialog.Callback, Licen
 	}
 
 	private fun setupToolbar() {
-		toolbar.title = getString(R.string.app_name).uppercase()
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.title = getString(R.string.app_name).uppercase()
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun showConfirmationDialog(mail: String) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicensesActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicensesActivity.kt
index 970ef25c3..3dd063588 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicensesActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/LicensesActivity.kt
@@ -2,18 +2,18 @@ package org.cryptomator.presentation.ui.activity
 
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
+import org.cryptomator.presentation.databinding.ActivityLicensesBinding
 
-@Activity(layout = R.layout.activity_licenses)
-class LicensesActivity : BaseActivity() {
+@Activity
+class LicensesActivity : BaseActivity<ActivityLicensesBinding>(ActivityLicensesBinding::inflate) {
 
 	override fun setupView() {
 		setupToolbar()
 	}
 
 	private fun setupToolbar() {
-		toolbar.setTitle(R.string.screen_licenses_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_licenses_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/S3AddOrChangeActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/S3AddOrChangeActivity.kt
index 39d00be39..584abf0df 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/S3AddOrChangeActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/S3AddOrChangeActivity.kt
@@ -4,15 +4,15 @@ import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.intent.S3AddOrChangeIntent
 import org.cryptomator.presentation.presenter.S3AddOrChangePresenter
 import org.cryptomator.presentation.ui.activity.view.S3AddOrChangeView
 import org.cryptomator.presentation.ui.fragment.S3AddOrChangeFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class S3AddOrChangeActivity : BaseActivity(), S3AddOrChangeView {
+class S3AddOrChangeActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), S3AddOrChangeView {
 
 	@Inject
 	lateinit var s3AddOrChangePresenter: S3AddOrChangePresenter
@@ -21,8 +21,8 @@ class S3AddOrChangeActivity : BaseActivity(), S3AddOrChangeView {
 	lateinit var s3AddOrChangeIntent: S3AddOrChangeIntent
 
 	override fun setupView() {
-		toolbar.setTitle(R.string.screen_s3_settings_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_s3_settings_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun createFragment(): Fragment = S3AddOrChangeFragment.newInstance(s3AddOrChangeIntent.s3Cloud())
@@ -32,6 +32,6 @@ class S3AddOrChangeActivity : BaseActivity(), S3AddOrChangeView {
 		s3AddOrChangePresenter.authenticate(accessKey, secretKey, bucket, endpoint, region, cloudId, displayName)
 	}
 
-	private fun s3AddOrChangeFragment(): S3AddOrChangeFragment = getCurrentFragment(R.id.fragmentContainer) as S3AddOrChangeFragment
+	private fun s3AddOrChangeFragment(): S3AddOrChangeFragment = getCurrentFragment(R.id.fragment_container) as S3AddOrChangeFragment
 
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SetPasswordActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SetPasswordActivity.kt
index c684b6fd1..00e068522 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SetPasswordActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SetPasswordActivity.kt
@@ -3,21 +3,21 @@ package org.cryptomator.presentation.ui.activity
 import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.presenter.SetPasswordPresenter
 import org.cryptomator.presentation.ui.activity.view.SetPasswordView
 import org.cryptomator.presentation.ui.fragment.SetPasswordFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class SetPasswordActivity : BaseActivity(), SetPasswordView {
+class SetPasswordActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), SetPasswordView {
 
 	@Inject
 	lateinit var setPasswordPresenter: SetPasswordPresenter
 
 	override fun setupView() {
-		toolbar.setTitle(R.string.screen_set_password_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_set_password_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun createFragment(): Fragment = SetPasswordFragment()
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SettingsActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SettingsActivity.kt
index 4c43a2ecb..5fa190c17 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SettingsActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SettingsActivity.kt
@@ -5,6 +5,7 @@ import android.net.Uri
 import android.view.View
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivitySettingsBinding
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.presenter.SettingsPresenter
 import org.cryptomator.presentation.ui.activity.view.SettingsView
@@ -17,10 +18,9 @@ import org.cryptomator.presentation.ui.dialog.UpdateAppAvailableDialog
 import org.cryptomator.presentation.ui.dialog.UpdateAppDialog
 import org.cryptomator.presentation.ui.fragment.SettingsFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
-@Activity(layout = R.layout.activity_settings)
-class SettingsActivity : BaseActivity(),
+@Activity
+class SettingsActivity : BaseActivity<ActivitySettingsBinding>(ActivitySettingsBinding::inflate),
 	SettingsView,
 	AskIgnoreBatteryOptimizationsDialog.Callback,
 	DebugModeDisclaimerDialog.Callback,
@@ -39,8 +39,8 @@ class SettingsActivity : BaseActivity(),
 	}
 
 	private fun setupToolbar() {
-		toolbar.setTitle(R.string.screen_settings_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_settings_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	fun presenter(): SettingsPresenter = presenter
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt
index 0d0ed787b..6b318c880 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/SharedFilesActivity.kt
@@ -8,6 +8,7 @@ import android.net.Uri
 import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.model.CloudFolderModel
 import org.cryptomator.presentation.model.ProgressModel.Companion.COMPLETED
 import org.cryptomator.presentation.model.SharedFileModel
@@ -19,13 +20,11 @@ import org.cryptomator.presentation.ui.dialog.ReplaceDialog
 import org.cryptomator.presentation.ui.dialog.UploadCloudFileDialog
 import org.cryptomator.presentation.ui.fragment.SharedFilesFragment
 import java.lang.String.format
-import java.util.ArrayList
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 import timber.log.Timber
 
 @Activity
-class SharedFilesActivity : BaseActivity(), //
+class SharedFilesActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate), //
 	SharedFilesView, //
 	ReplaceDialog.Callback, //
 	NotEnoughVaultsDialog.Callback, //
@@ -111,8 +110,8 @@ class SharedFilesActivity : BaseActivity(), //
 	}
 
 	private fun setupToolbar() {
-		toolbar.title = format(getString(R.string.screen_share_files_title), contentName)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.title = format(getString(R.string.screen_share_files_title), contentName)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 		supportActionBar?.let {
 			it.setDisplayHomeAsUpEnabled(true)
 			it.setHomeAsUpIndicator(R.drawable.ic_clear)
@@ -141,7 +140,7 @@ class SharedFilesActivity : BaseActivity(), //
 		//UnableToShareFilesDialog.withContext(this).show()
 	}
 
-	private fun sharedFilesFragment(): SharedFilesFragment = getCurrentFragment(R.id.fragmentContainer) as SharedFilesFragment
+	private fun sharedFilesFragment(): SharedFilesFragment = getCurrentFragment(R.id.fragment_container) as SharedFilesFragment
 
 	override fun showReplaceDialog(existingFiles: List<String>, size: Int) {
 		ReplaceDialog.withContext(this).show(existingFiles, size)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/TextEditorActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/TextEditorActivity.kt
index 205185b8b..541a44a3c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/TextEditorActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/TextEditorActivity.kt
@@ -7,16 +7,16 @@ import androidx.fragment.app.Fragment
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.intent.TextEditorIntent
 import org.cryptomator.presentation.presenter.TextEditorPresenter
 import org.cryptomator.presentation.ui.activity.view.TextEditorView
 import org.cryptomator.presentation.ui.dialog.UnsavedChangesDialog
 import org.cryptomator.presentation.ui.fragment.TextEditorFragment
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class TextEditorActivity : BaseActivity(),
+class TextEditorActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate),
 	TextEditorView,
 	UnsavedChangesDialog.Callback,
 	SearchView.OnQueryTextListener {
@@ -101,8 +101,8 @@ class TextEditorActivity : BaseActivity(),
 	}
 
 	private fun setupToolbar() {
-		toolbar.title = textEditorIntent.textFile().name
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.title = textEditorIntent.textFile().name
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun performBackPressed() {
@@ -129,6 +129,6 @@ class TextEditorActivity : BaseActivity(),
 		finish()
 	}
 
-	private fun textEditorFragment(): TextEditorFragment = getCurrentFragment(R.id.fragmentContainer) as TextEditorFragment
+	private fun textEditorFragment(): TextEditorFragment = getCurrentFragment(R.id.fragment_container) as TextEditorFragment
 
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/UnlockVaultActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/UnlockVaultActivity.kt
index ee6ed627f..1271df05d 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/UnlockVaultActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/UnlockVaultActivity.kt
@@ -7,6 +7,7 @@ import org.cryptomator.domain.Vault
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityUnlockVaultBinding
 import org.cryptomator.presentation.intent.UnlockVaultIntent
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.presenter.UnlockVaultPresenter
@@ -19,8 +20,8 @@ import org.cryptomator.presentation.ui.fragment.UnlockVaultFragment
 import org.cryptomator.presentation.util.BiometricAuthentication
 import javax.inject.Inject
 
-@Activity(layout = R.layout.activity_unlock_vault)
-class UnlockVaultActivity : BaseActivity(), //
+@Activity
+class UnlockVaultActivity : BaseActivity<ActivityUnlockVaultBinding>(ActivityUnlockVaultBinding::inflate), //
 	UnlockVaultView, //
 	BiometricAuthentication.Callback,
 	ChangePasswordDialog.Callback,
@@ -100,7 +101,7 @@ class UnlockVaultActivity : BaseActivity(), //
 	}
 
 	private fun unlockVaultFragment(): UnlockVaultFragment = //
-		getCurrentFragment(R.id.fragmentContainer) as UnlockVaultFragment
+		getCurrentFragment(R.id.fragment_container) as UnlockVaultFragment
 
 	override fun showChangePasswordDialog(vaultModel: VaultModel, unverifiedVaultConfig: UnverifiedVaultConfig?) {
 		showDialog(ChangePasswordDialog.newInstance(vaultModel, unverifiedVaultConfig))
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt
index 7fe53a3b6..fd124b2a6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/VaultListActivity.kt
@@ -10,6 +10,7 @@ import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.CryptomatorApp
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutObscureAwareBinding
 import org.cryptomator.presentation.intent.Intents.browseFilesIntent
 import org.cryptomator.presentation.intent.Intents.settingsIntent
 import org.cryptomator.presentation.intent.VaultListIntent
@@ -31,11 +32,9 @@ import org.cryptomator.presentation.ui.dialog.VaultRenameDialog
 import org.cryptomator.presentation.ui.fragment.VaultListFragment
 import org.cryptomator.presentation.ui.layout.ObscuredAwareCoordinatorLayout.Listener
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.activity_layout_obscure_aware.activityRootView
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
-@Activity(layout = R.layout.activity_layout_obscure_aware)
-class VaultListActivity : BaseActivity(), //
+@Activity
+class VaultListActivity : BaseActivity<ActivityLayoutObscureAwareBinding>(ActivityLayoutObscureAwareBinding::inflate), //
 	VaultListView, //
 	VaultListCallback, //
 	AskForLockScreenDialog.Callback, //
@@ -62,7 +61,7 @@ class VaultListActivity : BaseActivity(), //
 	override fun setupView() {
 		setupToolbar()
 		vaultListPresenter.prepareView()
-		activityRootView.setOnFilteredTouchEventForSecurityListener(object : Listener {
+		binding.activityRootView.setOnFilteredTouchEventForSecurityListener(object : Listener {
 			override fun onFilteredTouchEventForSecurity() {
 				vaultListPresenter.onFilteredTouchEventForSecurity()
 			}
@@ -106,8 +105,8 @@ class VaultListActivity : BaseActivity(), //
 	}
 
 	private fun setupToolbar() {
-		toolbar.title = getString(R.string.app_name).uppercase()
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.title = getString(R.string.app_name).uppercase()
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun showAddVaultBottomSheet() {
@@ -198,7 +197,7 @@ class VaultListActivity : BaseActivity(), //
 	}
 
 	private fun vaultListFragment(): VaultListFragment = //
-		getCurrentFragment(R.id.fragmentContainer) as VaultListFragment
+		getCurrentFragment(R.id.fragment_container) as VaultListFragment
 
 	override fun onUpdateAppDialogLoaded() {
 		showProgress(ProgressModel.GENERIC)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/WebDavAddOrChangeActivity.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/WebDavAddOrChangeActivity.kt
index 30077acec..5391362a3 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/WebDavAddOrChangeActivity.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/WebDavAddOrChangeActivity.kt
@@ -5,6 +5,7 @@ import org.cryptomator.domain.exception.FatalBackendException
 import org.cryptomator.generator.Activity
 import org.cryptomator.generator.InjectIntent
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityLayoutBinding
 import org.cryptomator.presentation.intent.WebDavAddOrChangeIntent
 import org.cryptomator.presentation.presenter.WebDavAddOrChangePresenter
 import org.cryptomator.presentation.ui.activity.view.WebDavAddOrChangeView
@@ -13,10 +14,9 @@ import org.cryptomator.presentation.ui.fragment.WebDavAddOrChangeFragment
 import java.net.URI
 import java.net.URISyntaxException
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.toolbar_layout.toolbar
 
 @Activity
-class WebDavAddOrChangeActivity : BaseActivity(),
+class WebDavAddOrChangeActivity : BaseActivity<ActivityLayoutBinding>(ActivityLayoutBinding::inflate),
 	WebDavAddOrChangeView,
 	WebDavAskForHttpDialog.Callback {
 
@@ -27,8 +27,8 @@ class WebDavAddOrChangeActivity : BaseActivity(),
 	lateinit var webDavAddOrChangeIntent: WebDavAddOrChangeIntent
 
 	override fun setupView() {
-		toolbar.setTitle(R.string.screen_webdav_settings_title)
-		setSupportActionBar(toolbar)
+		binding.mtToolbar.toolbar.setTitle(R.string.screen_webdav_settings_title)
+		setSupportActionBar(binding.mtToolbar.toolbar)
 	}
 
 	override fun createFragment(): Fragment = WebDavAddOrChangeFragment.newInstance(webDavAddOrChangeIntent.webDavCloud())
@@ -50,6 +50,6 @@ class WebDavAddOrChangeActivity : BaseActivity(),
 		webDavAddOrChangePresenter.authenticate(username, password, url, cloudId, certificate)
 	}
 
-	private fun webDavAddOrChangeFragment(): WebDavAddOrChangeFragment = getCurrentFragment(R.id.fragmentContainer) as WebDavAddOrChangeFragment
+	private fun webDavAddOrChangeFragment(): WebDavAddOrChangeFragment = getCurrentFragment(R.id.fragment_container) as WebDavAddOrChangeFragment
 
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt
index e18f5da0e..fa1fcd2e4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/CloudConnectionListView.kt
@@ -2,7 +2,6 @@ package org.cryptomator.presentation.ui.activity.view
 
 import org.cryptomator.domain.Vault
 import org.cryptomator.presentation.model.CloudModel
-import java.util.ArrayList
 
 interface CloudConnectionListView : View {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BiometricAuthSettingsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BiometricAuthSettingsAdapter.kt
index 2e593ad57..cb5ab746e 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BiometricAuthSettingsAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BiometricAuthSettingsAdapter.kt
@@ -1,19 +1,17 @@
 package org.cryptomator.presentation.ui.adapter
 
-import android.view.View
+import android.view.LayoutInflater
+import android.view.ViewGroup
 import android.widget.Switch
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ItemBiometricAuthVaultBinding
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.model.comparator.VaultPositionComparator
 import org.cryptomator.presentation.ui.adapter.BiometricAuthSettingsAdapter.BiometricAuthSettingsViewHolder
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_biometric_auth_vault.view.cloud
-import kotlinx.android.synthetic.main.item_biometric_auth_vault.view.toggleBiometricAuth
-import kotlinx.android.synthetic.main.item_biometric_auth_vault.view.vaultName
 
 class BiometricAuthSettingsAdapter //
 @Inject
-constructor() : RecyclerViewBaseAdapter<VaultModel, BiometricAuthSettingsAdapter.OnVaultBiometricAuthSettingsChanged, BiometricAuthSettingsViewHolder>(VaultPositionComparator()) {
+constructor() : RecyclerViewBaseAdapter<VaultModel, BiometricAuthSettingsAdapter.OnVaultBiometricAuthSettingsChanged, BiometricAuthSettingsViewHolder, ItemBiometricAuthVaultBinding>(VaultPositionComparator()) {
 
 	private var onVaultBiometricAuthSettingsChanged: OnVaultBiometricAuthSettingsChanged? = null
 
@@ -30,30 +28,30 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, BiometricAuthSettingsAdapter
 		}
 	}
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_biometric_auth_vault
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): ItemBiometricAuthVaultBinding {
+		return ItemBiometricAuthVaultBinding.inflate(inflater, parent, false)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): BiometricAuthSettingsViewHolder {
-		return BiometricAuthSettingsViewHolder(view)
+	override fun createViewHolder(binding: ItemBiometricAuthVaultBinding, viewType: Int): BiometricAuthSettingsViewHolder {
+		return BiometricAuthSettingsViewHolder(binding)
 	}
 
 	fun setOnItemClickListener(onVaultBiometricAuthSettingsChanged: OnVaultBiometricAuthSettingsChanged) {
 		this.onVaultBiometricAuthSettingsChanged = onVaultBiometricAuthSettingsChanged
 	}
 
-	inner class BiometricAuthSettingsViewHolder(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class BiometricAuthSettingsViewHolder(private val binding: ItemBiometricAuthVaultBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
 		override fun bind(position: Int) {
 			val vaultModel = getItem(position)
 
-			itemView.vaultName.text = vaultModel.name
-			itemView.cloud.setImageResource(vaultModel.cloudType.vaultImageResource)
+			binding.vaultName.text = vaultModel.name
+			binding.cloud.setImageResource(vaultModel.cloudType.vaultImageResource)
 
-			itemView.toggleBiometricAuth.isChecked = vaultModel.password != null
+			binding.toggleBiometricAuth.isChecked = vaultModel.password != null
 
 			//itemView.toggleBiometricAuth.setOnCheckedChangeListener doesn't work because bind can be executed multiple times
-			itemView.toggleBiometricAuth.setOnClickListener { switch ->
+			binding.toggleBiometricAuth.setOnClickListener { switch ->
 				onVaultBiometricAuthSettingsChanged?.onVaultBiometricAuthSettingsChanged(vaultModel, (switch as Switch).isChecked)
 			}
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt
index 30edadbdc..7b05f62fc 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BrowseFilesAdapter.kt
@@ -1,12 +1,15 @@
 package org.cryptomator.presentation.ui.adapter
 
 import android.os.PatternMatcher
+import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import org.cryptomator.domain.CloudNode
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ItemBrowseFilesNodeBinding
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings.NavigationMode.BROWSE_FILES
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings.NavigationMode.SELECT_ITEMS
@@ -27,20 +30,7 @@ import org.cryptomator.presentation.util.FileSizeHelper
 import org.cryptomator.presentation.util.FileUtil
 import org.cryptomator.presentation.util.ResourceHelper.Companion.getDrawable
 import org.cryptomator.util.SharedPreferencesHandler
-import java.util.Comparator
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_browse_files_node.view.cloudNodeImage
-import kotlinx.android.synthetic.main.item_browse_files_node.view.itemCheckBox
-import kotlinx.android.synthetic.main.item_browse_files_node.view.settings
-import kotlinx.android.synthetic.main.view_cloud_file_content.view.cloudFileContent
-import kotlinx.android.synthetic.main.view_cloud_file_content.view.cloudFileProgress
-import kotlinx.android.synthetic.main.view_cloud_file_content.view.cloudFileSubText
-import kotlinx.android.synthetic.main.view_cloud_file_content.view.cloudFileText
-import kotlinx.android.synthetic.main.view_cloud_file_content.view.progressIcon
-import kotlinx.android.synthetic.main.view_cloud_file_progress.view.cloudFile
-import kotlinx.android.synthetic.main.view_cloud_folder_content.view.cloudFolderActionText
-import kotlinx.android.synthetic.main.view_cloud_folder_content.view.cloudFolderContent
-import kotlinx.android.synthetic.main.view_cloud_folder_content.view.cloudFolderText
 
 class BrowseFilesAdapter @Inject
 constructor(
@@ -48,7 +38,7 @@ constructor(
 	private val fileSizeHelper: FileSizeHelper, //
 	private val fileUtil: FileUtil, //
 	private val sharedPreferencesHandler: SharedPreferencesHandler
-) : RecyclerViewBaseAdapter<CloudNodeModel<*>, BrowseFilesAdapter.ItemClickListener, VaultContentViewHolder>(CloudNodeModelNameAZComparator()), FastScrollRecyclerView.SectionedAdapter {
+) : RecyclerViewBaseAdapter<CloudNodeModel<*>, BrowseFilesAdapter.ItemClickListener, VaultContentViewHolder, ItemBrowseFilesNodeBinding>(CloudNodeModelNameAZComparator()), FastScrollRecyclerView.SectionedAdapter {
 
 	private var chooseCloudNodeSettings: ChooseCloudNodeSettings? = null
 	private var navigationMode: ChooseCloudNodeSettings.NavigationMode? = null
@@ -56,12 +46,12 @@ constructor(
 	private val isInSelectionMode: Boolean
 		get() = chooseCloudNodeSettings != null
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_browse_files_node
+	override fun createViewHolder(binding: ItemBrowseFilesNodeBinding, viewType: Int): VaultContentViewHolder {
+		return VaultContentViewHolder(binding)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): VaultContentViewHolder {
-		return VaultContentViewHolder(view)
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): ItemBrowseFilesNodeBinding {
+		return ItemBrowseFilesNodeBinding.inflate(inflater, parent, false)
 	}
 
 	fun addOrReplaceCloudNode(cloudNodeModel: CloudNodeModel<*>) {
@@ -124,7 +114,7 @@ constructor(
 		}
 	}
 
-	inner class VaultContentViewHolder internal constructor(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class VaultContentViewHolder internal constructor(private val binding: ItemBrowseFilesNodeBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
 		private var uiState: UiStateTest? = null
 
@@ -145,7 +135,7 @@ constructor(
 		}
 
 		private fun bindNodeImage(node: CloudNodeModel<*>) {
-			itemView.cloudNodeImage.setImageResource(bindCloudNodeImage(node))
+			binding.cloudNodeImage.setImageResource(bindCloudNodeImage(node))
 		}
 
 		private fun bindCloudNodeImage(cloudNodeModel: CloudNodeModel<*>): Int {
@@ -158,7 +148,7 @@ constructor(
 		}
 
 		private fun bindSettings(node: CloudNodeModel<*>) {
-			itemView.settings.setOnClickListener { callback.onNodeSettingsClicked(node) }
+			binding.settings.setOnClickListener { callback.onNodeSettingsClicked(node) }
 		}
 
 		private fun bindLongNodeClick(node: CloudNodeModel<*>) {
@@ -186,8 +176,8 @@ constructor(
 		}
 
 		private fun bindFile(file: CloudFileModel) {
-			itemView.cloudFileText.text = file.name
-			itemView.cloudFileSubText.text = fileDetails(file)
+			binding.llCloudFileContent.cloudFileText.text = file.name
+			binding.llCloudFileContent.cloudFileSubText.text = fileDetails(file)
 
 			enableNodeClick { callback.onFileClicked(file) }
 		}
@@ -197,8 +187,8 @@ constructor(
 				disableNodeLongClick()
 				hideSettings()
 				if (!isSelectable(file)) {
-					itemView.cloudFileSubText.visibility = GONE
-					itemView.cloudFileSubText.text = ""
+					binding.llCloudFileContent.cloudFileSubText.visibility = GONE
+					binding.llCloudFileContent.cloudFileSubText.text = ""
 					itemView.isEnabled = false
 				}
 			}
@@ -229,7 +219,7 @@ constructor(
 		}
 
 		private fun bindFolder(folder: CloudFolderModel) {
-			itemView.cloudFolderText.text = folder.name
+			binding.llCloudFolderContent.cloudFolderText.text = folder.name
 			enableNodeClick { callback.onFolderClicked(folder) }
 		}
 
@@ -244,17 +234,17 @@ constructor(
 		}
 
 		private fun hideSettings() {
-			itemView.settings.visibility = GONE
+			binding.settings.visibility = GONE
 		}
 
 		private fun bindNodeSelection(cloudNodeModel: CloudNodeModel<*>) {
-			itemView.itemCheckBox.setOnCheckedChangeListener { _, isChecked ->
+			binding.itemCheckBox.setOnCheckedChangeListener { _, isChecked ->
 				cloudNodeModel.isSelected = isChecked
 				callback.onSelectedNodesChanged(selectedCloudNodes().size)
 			}
-			enableNodeClick { itemView.itemCheckBox.toggle() }
+			enableNodeClick { binding.itemCheckBox.toggle() }
 
-			itemView.itemCheckBox.isChecked = cloudNodeModel.isSelected
+			binding.itemCheckBox.isChecked = cloudNodeModel.isSelected
 		}
 
 		private fun fileDetails(cloudFile: CloudFileModel): String {
@@ -282,9 +272,9 @@ constructor(
 		private fun showIndeterminateProgress(progress: ProgressModel) {
 			uiState?.let { switchTo(it.indeterminateProgress()) }
 			if (uiState?.isForFile == true) {
-				itemView.cloudFileSubText.setText(progress.state().textResourceId())
+				binding.llCloudFileContent.cloudFileSubText.setText(progress.state().textResourceId())
 			} else {
-				itemView.cloudFolderActionText.setText(progress.state().textResourceId())
+				binding.llCloudFolderContent.cloudFolderActionText.setText(progress.state().textResourceId())
 			}
 
 			if (!progress.state().isSelectable) {
@@ -294,7 +284,7 @@ constructor(
 
 		private fun disableNodeActions() {
 			itemView.isEnabled = false
-			itemView.settings.visibility = GONE
+			binding.settings.visibility = GONE
 		}
 
 		private fun enableNodeClick(clickListener: View.OnClickListener) {
@@ -313,14 +303,14 @@ constructor(
 			uiState?.let { switchTo(it.determinateProgress()) }
 			if (uiState?.isForFile == true) {
 				disableNodeActions()
-				itemView.cloudFile.progress = progress.progress()
+				binding.llCloudFileContent.rlCloudFileProgress.cloudFile.progress = progress.progress()
 				if (currentProgressIcon != progress.state().imageResourceId()) {
 					currentProgressIcon = progress.state().imageResourceId()
-					itemView.progressIcon.setImageDrawable(getDrawable(currentProgressIcon))
+					binding.llCloudFileContent.progressIcon.setImageDrawable(getDrawable(currentProgressIcon))
 				}
 			} else {
 				// no determinate progress for folders
-				itemView.cloudFolderActionText.setText(progress.state().textResourceId())
+				binding.llCloudFolderContent.cloudFolderActionText.setText(progress.state().textResourceId())
 			}
 		}
 
@@ -337,7 +327,7 @@ constructor(
 		}
 
 		fun selectNode(checked: Boolean) {
-			itemView.itemCheckBox.isChecked = checked
+			binding.itemCheckBox.isChecked = checked
 		}
 
 		abstract inner class UiStateTest(val isForFile: Boolean) {
@@ -373,13 +363,13 @@ constructor(
 
 			override fun apply() {
 				itemView.isEnabled = true
-				itemView.cloudFolderContent.visibility = GONE
-				itemView.cloudFileContent.visibility = VISIBLE
-				itemView.cloudFileText.visibility = VISIBLE
-				itemView.cloudFileSubText.visibility = VISIBLE
-				itemView.cloudFileProgress.visibility = GONE
-				itemView.settings.visibility = VISIBLE
-				itemView.itemCheckBox.visibility = GONE
+				binding.llCloudFolderContent.cloudFolderContent.visibility = GONE
+				binding.llCloudFileContent.cloudFileContent.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileText.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileSubText.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileProgress.visibility = GONE
+				binding.settings.visibility = VISIBLE
+				binding.itemCheckBox.visibility = GONE
 			}
 		}
 
@@ -387,36 +377,36 @@ constructor(
 
 			override fun apply() {
 				itemView.isEnabled = true
-				itemView.cloudFileContent.visibility = GONE
-				itemView.cloudFolderContent.visibility = VISIBLE
-				itemView.cloudFolderText.visibility = VISIBLE
-				itemView.cloudFolderActionText.visibility = GONE
-				itemView.settings.visibility = VISIBLE
-				itemView.itemCheckBox.visibility = GONE
+				binding.llCloudFileContent.cloudFileContent.visibility = GONE
+				binding.llCloudFolderContent.cloudFolderContent.visibility = VISIBLE
+				binding.llCloudFolderContent.cloudFolderText.visibility = VISIBLE
+				binding.llCloudFolderContent.cloudFolderActionText.visibility = GONE
+				binding.settings.visibility = VISIBLE
+				binding.itemCheckBox.visibility = GONE
 			}
 		}
 
 		inner class FileDeterminateProgress : UiStateTest(true) {
 
 			override fun apply() {
-				itemView.cloudFolderContent.visibility = GONE
-				itemView.cloudFileContent.visibility = VISIBLE
-				itemView.cloudFileText.visibility = VISIBLE
-				itemView.cloudFileSubText.visibility = GONE
-				itemView.cloudFileProgress.visibility = VISIBLE
-				itemView.itemCheckBox.visibility = GONE
+				binding.llCloudFolderContent.cloudFolderContent.visibility = GONE
+				binding.llCloudFileContent.cloudFileContent.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileText.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileSubText.visibility = GONE
+				binding.llCloudFileContent.cloudFileProgress.visibility = VISIBLE
+				binding.itemCheckBox.visibility = GONE
 			}
 		}
 
 		inner class FileIndeterminateProgress : UiStateTest(true) {
 
 			override fun apply() {
-				itemView.cloudFolderContent.visibility = GONE
-				itemView.cloudFileContent.visibility = VISIBLE
-				itemView.cloudFileText.visibility = VISIBLE
-				itemView.cloudFileSubText.visibility = VISIBLE
-				itemView.cloudFileProgress.visibility = GONE
-				itemView.itemCheckBox.visibility = GONE
+				binding.llCloudFolderContent.cloudFolderContent.visibility = GONE
+				binding.llCloudFileContent.cloudFileContent.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileText.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileSubText.visibility = VISIBLE
+				binding.llCloudFileContent.cloudFileProgress.visibility = GONE
+				binding.itemCheckBox.visibility = GONE
 			}
 
 		}
@@ -424,27 +414,27 @@ constructor(
 		inner class FolderIndeterminateProgress : UiStateTest(false) {
 
 			override fun apply() {
-				itemView.cloudFileContent.visibility = GONE
-				itemView.cloudFolderContent.visibility = VISIBLE
-				itemView.cloudFolderText.visibility = VISIBLE
-				itemView.cloudFolderActionText.visibility = VISIBLE
-				itemView.itemCheckBox.visibility = GONE
+				binding.llCloudFileContent.cloudFileContent.visibility = GONE
+				binding.llCloudFolderContent.cloudFolderContent.visibility = VISIBLE
+				binding.llCloudFolderContent.cloudFolderText.visibility = VISIBLE
+				binding.llCloudFolderContent.cloudFolderActionText.visibility = VISIBLE
+				binding.itemCheckBox.visibility = GONE
 			}
 		}
 
 		inner class FileSelection : UiStateTest(true) {
 
 			override fun apply() {
-				itemView.itemCheckBox.visibility = VISIBLE
-				itemView.settings.visibility = GONE
+				binding.itemCheckBox.visibility = VISIBLE
+				binding.settings.visibility = GONE
 			}
 		}
 
 		inner class FolderSelection : UiStateTest(false) {
 
 			override fun apply() {
-				itemView.itemCheckBox.visibility = VISIBLE
-				itemView.settings.visibility = GONE
+				binding.itemCheckBox.visibility = VISIBLE
+				binding.settings.visibility = GONE
 			}
 
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt
index ea6c6f706..79ade9c33 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudConnectionListAdapter.kt
@@ -2,9 +2,11 @@ package org.cryptomator.presentation.ui.adapter
 
 import android.content.Context
 import android.net.Uri
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import org.cryptomator.domain.exception.FatalBackendException
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ItemBrowseCloudModelConnectionsBinding
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.model.LocalStorageModel
 import org.cryptomator.presentation.model.OnedriveCloudModel
@@ -15,13 +17,9 @@ import org.cryptomator.presentation.model.comparator.CloudModelComparator
 import org.cryptomator.presentation.ui.adapter.CloudConnectionListAdapter.CloudConnectionHolder
 import java.net.URISyntaxException
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_browse_cloud_model_connections.view.cloudImage
-import kotlinx.android.synthetic.main.item_browse_cloud_model_connections.view.settings
-import kotlinx.android.synthetic.main.view_cloud_connection_content.view.cloudSubText
-import kotlinx.android.synthetic.main.view_cloud_connection_content.view.cloudText
 
 class CloudConnectionListAdapter @Inject
-internal constructor(context: Context) : RecyclerViewBaseAdapter<CloudModel, CloudConnectionListAdapter.Callback, CloudConnectionHolder>(CloudModelComparator(context)) {
+internal constructor(context: Context) : RecyclerViewBaseAdapter<CloudModel, CloudConnectionListAdapter.Callback, CloudConnectionHolder, ItemBrowseCloudModelConnectionsBinding>(CloudModelComparator(context)) {
 
 	interface Callback {
 
@@ -30,28 +28,28 @@ internal constructor(context: Context) : RecyclerViewBaseAdapter<CloudModel, Clo
 		fun onCloudSettingsClicked(cloudModel: CloudModel)
 	}
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_browse_cloud_model_connections
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): ItemBrowseCloudModelConnectionsBinding {
+		return ItemBrowseCloudModelConnectionsBinding.inflate(inflater, parent, false)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): CloudConnectionHolder {
-		return CloudConnectionHolder(view)
+	override fun createViewHolder(binding: ItemBrowseCloudModelConnectionsBinding, viewType: Int): CloudConnectionHolder {
+		return CloudConnectionHolder(binding)
 	}
 
 	fun setOnItemClickListener(callback: Callback) {
 		this.callback = callback
 	}
 
-	inner class CloudConnectionHolder(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class CloudConnectionHolder(private val binding: ItemBrowseCloudModelConnectionsBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
 		override fun bind(position: Int) {
 			internalBind(getItem(position))
 		}
 
 		private fun internalBind(cloudModel: CloudModel) {
-			itemView.settings.setOnClickListener { callback.onCloudSettingsClicked(cloudModel) }
+			binding.settings.setOnClickListener { callback.onCloudSettingsClicked(cloudModel) }
 
-			itemView.cloudImage.setImageResource(cloudModel.cloudType().cloudImageResource)
+			binding.cloudImage.setImageResource(cloudModel.cloudType().cloudImageResource)
 
 			itemView.setOnClickListener { callback.onCloudConnectionClicked(cloudModel) }
 
@@ -76,39 +74,39 @@ internal constructor(context: Context) : RecyclerViewBaseAdapter<CloudModel, Clo
 
 
 		private fun bindOnedriveCloudModel(cloudModel: OnedriveCloudModel) {
-			itemView.cloudText.text = cloudModel.username()
-			itemView.cloudSubText.visibility = View.GONE
+			binding.llCloudConnectionContent.cloudText.text = cloudModel.username()
+			binding.llCloudConnectionContent.cloudSubText.visibility = View.GONE
 		}
 
 		private fun bindWebDavCloudModel(cloudModel: WebDavCloudModel) {
 			try {
 				val uri = Uri.parse(cloudModel.url())
-				itemView.cloudText.text = uri.authority
-				itemView.cloudSubText.text = String.format("%s • %s", cloudModel.username(), uri.path)
+				binding.llCloudConnectionContent.cloudText.text = uri.authority
+				binding.llCloudConnectionContent.cloudSubText.text = String.format("%s • %s", cloudModel.username(), uri.path)
 			} catch (e: URISyntaxException) {
 				throw FatalBackendException("path in WebDAV cloud isn't correct (no uri)")
 			}
 		}
 
 		private fun bindPCloudModel(cloudModel: PCloudModel) {
-			itemView.cloudText.text = cloudModel.username()
-			itemView.cloudSubText.visibility = View.GONE
+			binding.llCloudConnectionContent.cloudText.text = cloudModel.username()
+			binding.llCloudConnectionContent.cloudSubText.visibility = View.GONE
 		}
 
 
 		private fun bindS3loudModel(cloudModel: S3CloudModel) {
-			itemView.cloudText.text = cloudModel.username()
-			itemView.cloudSubText.visibility = View.GONE
+			binding.llCloudConnectionContent.cloudText.text = cloudModel.username()
+			binding.llCloudConnectionContent.cloudSubText.visibility = View.GONE
 		}
 
 		private fun bindLocalStorageCloudModel(cloudModel: LocalStorageModel) {
 			if (cloudModel.location().isEmpty()) {
-				itemView.cloudText.text = cloudModel.storage()
-				itemView.cloudSubText.visibility = View.GONE
+				binding.llCloudConnectionContent.cloudText.text = cloudModel.storage()
+				binding.llCloudConnectionContent.cloudSubText.visibility = View.GONE
 			} else {
-				itemView.cloudSubText.visibility = View.VISIBLE
-				itemView.cloudText.text = cloudModel.location()
-				itemView.cloudSubText.text = cloudModel.storage()
+				binding.llCloudConnectionContent.cloudSubText.visibility = View.VISIBLE
+				binding.llCloudConnectionContent.cloudText.text = cloudModel.location()
+				binding.llCloudConnectionContent.cloudSubText.text = cloudModel.storage()
 			}
 		}
 	}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt
index 66bebd23a..da2837cf4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudSettingsAdapter.kt
@@ -1,30 +1,30 @@
 package org.cryptomator.presentation.ui.adapter
 
 import android.content.Context
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ItemCloudSettingBinding
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.model.CloudTypeModel
 import org.cryptomator.presentation.ui.adapter.CloudSettingsAdapter.CloudSettingViewHolder
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_cloud_setting.view.cloudImage
-import kotlinx.android.synthetic.main.item_cloud_setting.view.cloudName
-import kotlinx.android.synthetic.main.item_cloud_setting.view.cloudUsername
 
 class CloudSettingsAdapter @Inject
-constructor(private val context: Context) : RecyclerViewBaseAdapter<CloudModel, CloudSettingsAdapter.OnItemClickListener, CloudSettingViewHolder>() {
+constructor(private val context: Context) : RecyclerViewBaseAdapter<CloudModel, CloudSettingsAdapter.OnItemClickListener, CloudSettingViewHolder, ItemCloudSettingBinding>() {
 
 	interface OnItemClickListener {
 
 		fun onCloudClicked(cloudModel: CloudModel)
 	}
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_cloud_setting
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): ItemCloudSettingBinding {
+		return ItemCloudSettingBinding.inflate(inflater, parent, false)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): CloudSettingViewHolder {
-		return CloudSettingViewHolder(view)
+	override fun createViewHolder(binding: ItemCloudSettingBinding, viewType: Int): CloudSettingViewHolder {
+		return CloudSettingViewHolder(binding)
 	}
 
 	fun notifyCloudChanged(changedCloud: CloudModel?) {
@@ -34,26 +34,26 @@ constructor(private val context: Context) : RecyclerViewBaseAdapter<CloudModel,
 		}
 	}
 
-	inner class CloudSettingViewHolder(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class CloudSettingViewHolder(private val binding: ItemCloudSettingBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
 		override fun bind(position: Int) {
 			val cloudModel = getItem(position)
 
-			itemView.cloudImage.setImageResource(cloudModel.cloudType().cloudImageResource)
+			binding.cloudImage.setImageResource(cloudModel.cloudType().cloudImageResource)
 
 			when (cloudModel.cloudType()) {
-				CloudTypeModel.ONEDRIVE -> itemView.cloudName.text = context.getString(R.string.screen_cloud_settings_onedrive_connections)
-				CloudTypeModel.PCLOUD -> itemView.cloudName.text = context.getString(R.string.screen_cloud_settings_pcloud_connections)
-				CloudTypeModel.S3 -> itemView.cloudName.text = context.getString(R.string.screen_cloud_settings_s3_connections)
-				CloudTypeModel.WEBDAV -> itemView.cloudName.text = context.getString(R.string.screen_cloud_settings_webdav_connections)
-				CloudTypeModel.LOCAL -> itemView.cloudName.text = context.getString(R.string.screen_cloud_settings_local_storage_locations)
+				CloudTypeModel.ONEDRIVE -> binding.cloudName.text = context.getString(R.string.screen_cloud_settings_onedrive_connections)
+				CloudTypeModel.PCLOUD -> binding.cloudName.text = context.getString(R.string.screen_cloud_settings_pcloud_connections)
+				CloudTypeModel.S3 -> binding.cloudName.text = context.getString(R.string.screen_cloud_settings_s3_connections)
+				CloudTypeModel.WEBDAV -> binding.cloudName.text = context.getString(R.string.screen_cloud_settings_webdav_connections)
+				CloudTypeModel.LOCAL -> binding.cloudName.text = context.getString(R.string.screen_cloud_settings_local_storage_locations)
 				else -> {
-					itemView.cloudName.text = getCloudNameText(isAlreadyLoggedIn(cloudModel), cloudModel)
+					binding.cloudName.text = getCloudNameText(isAlreadyLoggedIn(cloudModel), cloudModel)
 					if (isAlreadyLoggedIn(cloudModel)) {
-						itemView.cloudUsername.text = cloudModel.username()
-						itemView.cloudUsername.visibility = View.VISIBLE
+						binding.cloudUsername.text = cloudModel.username()
+						binding.cloudUsername.visibility = View.VISIBLE
 					} else {
-						itemView.cloudUsername.visibility = View.GONE
+						binding.cloudUsername.visibility = View.GONE
 					}
 				}
 			}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudsAdapter.kt
index 72444b575..1babe9b23 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudsAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/CloudsAdapter.kt
@@ -1,37 +1,35 @@
 package org.cryptomator.presentation.ui.adapter
 
-import android.view.View
-import org.cryptomator.presentation.R
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import org.cryptomator.presentation.databinding.ItemCloudBinding
 import org.cryptomator.presentation.model.CloudTypeModel
-import org.cryptomator.presentation.ui.adapter.CloudsAdapter.CloudViewHolder
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_cloud.view.cloudImage
-import kotlinx.android.synthetic.main.item_cloud.view.cloudName
 
 class CloudsAdapter @Inject
-constructor() : RecyclerViewBaseAdapter<CloudTypeModel, CloudsAdapter.OnItemClickListener, CloudViewHolder>() {
+constructor() : RecyclerViewBaseAdapter<CloudTypeModel, CloudsAdapter.OnItemClickListener, CloudsAdapter.CloudViewHolder, ItemCloudBinding>() {
 
 	interface OnItemClickListener {
 
 		fun onCloudClicked(cloudTypeModel: CloudTypeModel)
 	}
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_cloud
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup, viewType: Int): ItemCloudBinding {
+		return ItemCloudBinding.inflate(inflater, parent, false)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): CloudViewHolder {
-		return CloudViewHolder(view)
+	override fun createViewHolder(binding: ItemCloudBinding, viewType: Int): CloudViewHolder {
+		return CloudViewHolder(binding)
 	}
 
-	inner class CloudViewHolder(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class CloudViewHolder(private val binding: ItemCloudBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
 		override fun bind(position: Int) {
 			val cloudTypeModel = getItem(position)
-			itemView.cloudImage.setImageResource(cloudTypeModel.cloudImageResource)
-			itemView.cloudName.setText(cloudTypeModel.displayNameResource)
+			binding.cloudImage.setImageResource(cloudTypeModel.cloudImageResource)
+			binding.cloudName.setText(cloudTypeModel.displayNameResource)
 
-			itemView.setOnClickListener { callback.onCloudClicked(cloudTypeModel) }
+			binding.root.setOnClickListener { callback.onCloudClicked(cloudTypeModel) }
 		}
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/RecyclerViewBaseAdapter.java b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/RecyclerViewBaseAdapter.java
index 3d94339f5..a8ad4d919 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/RecyclerViewBaseAdapter.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/RecyclerViewBaseAdapter.java
@@ -6,6 +6,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewbinding.ViewBinding;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -13,19 +14,19 @@
 import java.util.Comparator;
 import java.util.List;
 
-public abstract class RecyclerViewBaseAdapter<Item, Callback, ViewHolder extends RecyclerViewBaseAdapter.ItemViewHolder> extends RecyclerView.Adapter<ViewHolder> {
+public abstract class RecyclerViewBaseAdapter<Item, Callback, ViewHolder extends RecyclerViewBaseAdapter.ItemViewHolder, Binding extends ViewBinding> extends RecyclerView.Adapter<ViewHolder> {
 
 	final List<Item> itemCollection;
 
-	Callback callback;
+	protected Callback callback;
 
 	private Comparator<Item> comparator;
 
-	RecyclerViewBaseAdapter() {
+	protected RecyclerViewBaseAdapter() {
 		this.itemCollection = new ArrayList<>();
 	}
 
-	RecyclerViewBaseAdapter(Comparator<Item> comparator) {
+	protected RecyclerViewBaseAdapter(Comparator<Item> comparator) {
 		this.itemCollection = new ArrayList<>();
 		this.comparator = comparator;
 	}
@@ -33,8 +34,8 @@ public abstract class RecyclerViewBaseAdapter<Item, Callback, ViewHolder extends
 	@NonNull
 	@Override
 	public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		View view = LayoutInflater.from(parent.getContext()).inflate(getItemLayout(viewType), parent, false);
-		return createViewHolder(view, viewType);
+		Binding binding = getItemBinding(LayoutInflater.from(parent.getContext()), parent, viewType);
+		return createViewHolder(binding, viewType);
 	}
 
 	@Override
@@ -113,9 +114,9 @@ public Item getItem(int position) {
 		return itemCollection.get(position);
 	}
 
-	protected abstract int getItemLayout(int viewType);
+	protected abstract Binding getItemBinding(LayoutInflater inflater, ViewGroup parent, int viewType);
 
-	protected abstract ViewHolder createViewHolder(View view, int viewType);
+	protected abstract ViewHolder createViewHolder(Binding binding, int viewType);
 
 	private void sort() {
 		if (comparator != null) {
@@ -133,7 +134,7 @@ Comparator<Item> getComparator() {
 
 	public abstract class ItemViewHolder extends RecyclerView.ViewHolder {
 
-		ItemViewHolder(View itemView) {
+		protected ItemViewHolder(View itemView) {
 			super(itemView);
 		}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedFilesAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedFilesAdapter.kt
index 41b4ae926..ae3f7fdde 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedFilesAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedFilesAdapter.kt
@@ -3,32 +3,31 @@ package org.cryptomator.presentation.ui.adapter
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.View
+import android.view.LayoutInflater
+import android.view.ViewGroup
 import androidx.appcompat.content.res.AppCompatResources
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ItemSharedFilesBinding
 import org.cryptomator.presentation.model.SharedFileModel
 import org.cryptomator.presentation.ui.adapter.SharedFilesAdapter.FileViewHolder
 import org.cryptomator.presentation.util.FileIcon
 import org.cryptomator.presentation.util.FileUtil
 import org.cryptomator.util.Comparators
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_shared_files.view.fileName
-import kotlinx.android.synthetic.main.item_shared_files.view.til_file_name
 
 class SharedFilesAdapter @Inject
-constructor(private val fileUtil: FileUtil, private val context: Context) : RecyclerViewBaseAdapter<SharedFileModel, SharedFilesAdapter.Callback, FileViewHolder>(Comparators.naturalOrder()) {
+constructor(private val fileUtil: FileUtil, private val context: Context) : RecyclerViewBaseAdapter<SharedFileModel, SharedFilesAdapter.Callback, FileViewHolder, ItemSharedFilesBinding>(Comparators.naturalOrder()) {
 
 	interface Callback {
 
 		fun onFileNameConflict(hasFileNameConflict: Boolean)
 	}
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_shared_files
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): ItemSharedFilesBinding {
+		return ItemSharedFilesBinding.inflate(inflater, parent, false)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): FileViewHolder {
-		return FileViewHolder(view)
+	override fun createViewHolder(binding: ItemSharedFilesBinding, viewType: Int): FileViewHolder {
+		return FileViewHolder(binding)
 	}
 
 	fun show(files: List<SharedFileModel>?) {
@@ -47,18 +46,18 @@ constructor(private val fileUtil: FileUtil, private val context: Context) : Recy
 		return false
 	}
 
-	inner class FileViewHolder(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class FileViewHolder(private val binding: ItemSharedFilesBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
-		private var et_file_name_watcher: TextWatcher? = null
+		private var etFileNameWatcher: TextWatcher? = null
 
 		override fun bind(position: Int) {
-			if (et_file_name_watcher != null) {
-				itemView.fileName.removeTextChangedListener(et_file_name_watcher)
+			if (etFileNameWatcher != null) {
+				binding.fileName.removeTextChangedListener(etFileNameWatcher)
 			}
 			val file = getItem(position)
-			itemView.til_file_name.startIconDrawable = AppCompatResources.getDrawable(context, FileIcon.fileIconFor(file.fileName, fileUtil).iconResource)
-			itemView.fileName.setText(file.fileName)
-			et_file_name_watcher = object : TextWatcher {
+			binding.tilFileName.startIconDrawable = AppCompatResources.getDrawable(context, FileIcon.fileIconFor(file.fileName, fileUtil).iconResource)
+			binding.fileName.setText(file.fileName)
+			etFileNameWatcher = object : TextWatcher {
 				override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
 
 				}
@@ -72,7 +71,7 @@ constructor(private val fileUtil: FileUtil, private val context: Context) : Recy
 					callback.onFileNameConflict(hasFileNameConflict())
 				}
 			}
-			itemView.fileName.addTextChangedListener(et_file_name_watcher)
+			binding.fileName.addTextChangedListener(etFileNameWatcher)
 		}
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
index 3f720ecc1..549ccc01a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
@@ -1,19 +1,16 @@
 package org.cryptomator.presentation.ui.adapter
 
+import android.view.LayoutInflater
 import android.view.View
-import org.cryptomator.presentation.R
+import android.view.ViewGroup
+import org.cryptomator.presentation.databinding.ItemShareableLocationBinding
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.model.comparator.VaultPositionComparator
 import org.cryptomator.presentation.ui.adapter.SharedLocationsAdapter.VaultViewHolder
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_shareable_location.view.chooseFolderLocation
-import kotlinx.android.synthetic.main.item_shareable_location.view.chosenLocation
-import kotlinx.android.synthetic.main.item_shareable_location.view.cloudImage
-import kotlinx.android.synthetic.main.item_shareable_location.view.selectedVault
-import kotlinx.android.synthetic.main.item_shareable_location.view.vaultName
 
 class SharedLocationsAdapter @Inject
-constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callback, VaultViewHolder>(VaultPositionComparator()) {
+constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callback, VaultViewHolder, ItemShareableLocationBinding>(VaultPositionComparator()) {
 
 	private var selectedVault: VaultModel? = null
 	private var selectedLocation: String? = null
@@ -39,12 +36,12 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
 		replaceItem(this.selectedVault)
 	}
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_shareable_location
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): ItemShareableLocationBinding {
+		return ItemShareableLocationBinding.inflate(inflater, parent, false)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): VaultViewHolder {
-		return VaultViewHolder(view)
+	override fun createViewHolder(binding: ItemShareableLocationBinding, viewType: Int): VaultViewHolder {
+		return VaultViewHolder(binding)
 	}
 
 	private fun selectVault(selectedVault: VaultModel?) {
@@ -57,7 +54,7 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
 		callback.onVaultSelected(this.selectedVault)
 	}
 
-	inner class VaultViewHolder(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class VaultViewHolder(private val binding: ItemShareableLocationBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
 		private var boundVault: VaultModel? = null
 
@@ -67,24 +64,24 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
 			boundVault = getItem(position)
 
 			boundVault?.let {
-				itemView.vaultName.text = it.name
+				binding.vaultName.text = it.name
 
 				val boundVaultSelected = it == selectedVault
-				itemView.selectedVault.isChecked = boundVaultSelected
-				itemView.selectedVault.isClickable = !boundVaultSelected
+				binding.selectedVault.isChecked = boundVaultSelected
+				binding.selectedVault.isClickable = !boundVaultSelected
 				if (boundVaultSelected) {
-					itemView.cloudImage.setImageResource(it.cloudType.vaultSelectedImageResource)
+					binding.cloudImage.setImageResource(it.cloudType.vaultSelectedImageResource)
 					if (selectedLocation != null) {
-						itemView.chosenLocation.visibility = View.VISIBLE
-						itemView.chosenLocation.text = selectedLocation
+						binding.chosenLocation.visibility = View.VISIBLE
+						binding.chosenLocation.text = selectedLocation
 					} else {
-						itemView.chosenLocation.visibility = View.GONE
+						binding.chosenLocation.visibility = View.GONE
 					}
-					itemView.chooseFolderLocation.visibility = View.VISIBLE
+					binding.chooseFolderLocation.visibility = View.VISIBLE
 				} else {
-					itemView.cloudImage.setImageResource(it.cloudType.vaultImageResource)
-					itemView.chosenLocation.visibility = View.GONE
-					itemView.chooseFolderLocation.visibility = View.GONE
+					binding.cloudImage.setImageResource(it.cloudType.vaultImageResource)
+					binding.chosenLocation.visibility = View.GONE
+					binding.chooseFolderLocation.visibility = View.GONE
 				}
 			}
 
@@ -93,21 +90,21 @@ constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callb
 
 		private fun removeListener() {
 			itemView.setOnClickListener(null)
-			itemView.selectedVault.setOnCheckedChangeListener(null)
+			binding.selectedVault.setOnCheckedChangeListener(null)
 		}
 
 		private fun bindListener() {
 			itemView.setOnClickListener {
-				if (!itemView.selectedVault.isChecked) {
+				if (!binding.selectedVault.isChecked) {
 					selectVault(boundVault)
 				}
 			}
-			itemView.selectedVault.setOnCheckedChangeListener { _, isChecked ->
+			binding.selectedVault.setOnCheckedChangeListener { _, isChecked ->
 				if (isChecked) {
 					selectVault(boundVault)
 				}
 			}
-			itemView.chooseFolderLocation.setOnClickListener { callback.onChooseLocationPressed() }
+			binding.chooseFolderLocation.setOnClickListener { callback.onChooseLocationPressed() }
 		}
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
index 07c4d65f0..cd9c1d3d1 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
@@ -1,19 +1,16 @@
 package org.cryptomator.presentation.ui.adapter
 
+import android.view.LayoutInflater
 import android.view.View
-import org.cryptomator.presentation.R
+import android.view.ViewGroup
+import org.cryptomator.presentation.databinding.ItemVaultBinding
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.model.comparator.VaultPositionComparator
 import org.cryptomator.presentation.ui.adapter.VaultsAdapter.VaultViewHolder
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.item_vault.view.cloudImage
-import kotlinx.android.synthetic.main.item_vault.view.settings
-import kotlinx.android.synthetic.main.item_vault.view.unlockedImage
-import kotlinx.android.synthetic.main.item_vault.view.vaultName
-import kotlinx.android.synthetic.main.item_vault.view.vaultPath
 
 class VaultsAdapter @Inject
-internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnItemInteractionListener, VaultViewHolder>(VaultPositionComparator()), VaultsMoveListener.Listener {
+internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnItemInteractionListener, VaultViewHolder, ItemVaultBinding>(VaultPositionComparator()), VaultsMoveListener.Listener {
 
 	interface OnItemInteractionListener {
 
@@ -28,12 +25,12 @@ internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnIte
 		fun onVaultMoved(fromPosition: Int, toPosition: Int)
 	}
 
-	override fun getItemLayout(viewType: Int): Int {
-		return R.layout.item_vault
+	override fun getItemBinding(inflater: LayoutInflater, parent: ViewGroup?, viewType: Int): ItemVaultBinding {
+		return ItemVaultBinding.inflate(inflater, parent, false)
 	}
 
-	override fun createViewHolder(view: View, viewType: Int): VaultViewHolder {
-		return VaultViewHolder(view)
+	override fun createViewHolder(binding: ItemVaultBinding, viewType: Int): VaultViewHolder {
+		return VaultViewHolder(binding)
 	}
 
 	fun deleteVault(vaultID: Long) {
@@ -52,31 +49,31 @@ internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnIte
 		return itemCollection.firstOrNull { it.vaultId == vaultId }
 	}
 
-	inner class VaultViewHolder(itemView: View) : RecyclerViewBaseAdapter<*, *, *>.ItemViewHolder(itemView) {
+	inner class VaultViewHolder(private val binding: ItemVaultBinding) : RecyclerViewBaseAdapter<*, *, *, *>.ItemViewHolder(binding.root) {
 
 		override fun bind(position: Int) {
 			val vaultModel = getItem(position)
 
-			itemView.vaultName.text = vaultModel.name
-			itemView.vaultPath.text = vaultModel.path
+			binding.vaultName.text = vaultModel.name
+			binding.vaultPath.text = vaultModel.path
 
-			itemView.cloudImage.setImageResource(vaultModel.cloudType.vaultImageResource)
+			binding.cloudImage.setImageResource(vaultModel.cloudType.vaultImageResource)
 
 			if (vaultModel.isLocked) {
-				itemView.unlockedImage.visibility = View.GONE
+				binding.unlockedImage.visibility = View.GONE
 			} else {
-				itemView.unlockedImage.visibility = View.VISIBLE
+				binding.unlockedImage.visibility = View.VISIBLE
 			}
 
 			itemView.setOnClickListener {
-				itemView.cloudImage.setImageResource(vaultModel.cloudType.vaultSelectedImageResource)
+				binding.cloudImage.setImageResource(vaultModel.cloudType.vaultSelectedImageResource)
 				callback.onVaultClicked(vaultModel)
 			}
 
-			itemView.unlockedImage.setOnClickListener { callback.onVaultLockClicked(vaultModel) }
+			binding.unlockedImage.setOnClickListener { callback.onVaultLockClicked(vaultModel) }
 
-			itemView.settings.setOnClickListener {
-				itemView.cloudImage.setImageResource(vaultModel.cloudType.vaultSelectedImageResource)
+			binding.settings.setOnClickListener {
+				binding.cloudImage.setImageResource(vaultModel.cloudType.vaultSelectedImageResource)
 				callback.onVaultSettingsClicked(vaultModel)
 			}
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/AddVaultBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/AddVaultBottomSheet.kt
index 62c7ef0bd..d62deb73c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/AddVaultBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/AddVaultBottomSheet.kt
@@ -2,12 +2,10 @@ package org.cryptomator.presentation.ui.bottomsheet
 
 import org.cryptomator.generator.BottomSheet
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_add_vault.add_existing_vault
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_add_vault.create_new_vault
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_add_vault.title
+import org.cryptomator.presentation.databinding.DialogBottomSheetAddVaultBinding
 
 @BottomSheet(R.layout.dialog_bottom_sheet_add_vault)
-class AddVaultBottomSheet : BaseBottomSheet<AddVaultBottomSheet.Callback>() {
+class AddVaultBottomSheet : BaseBottomSheet<AddVaultBottomSheet.Callback, DialogBottomSheetAddVaultBinding>(DialogBottomSheetAddVaultBinding::inflate) {
 
 	interface Callback {
 
@@ -16,8 +14,8 @@ class AddVaultBottomSheet : BaseBottomSheet<AddVaultBottomSheet.Callback>() {
 	}
 
 	override fun setupView() {
-		title.text = getString(R.string.screen_vault_list_actions_title)
-		create_new_vault.setOnClickListener { callback?.onCreateVault() }
-		add_existing_vault.setOnClickListener { callback?.onAddExistingVault() }
+		binding.title.setText(R.string.screen_vault_list_actions_title)
+		binding.createNewVault.setOnClickListener { callback?.onCreateVault() }
+		binding.addExistingVault.setOnClickListener { callback?.onAddExistingVault() }
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/BaseBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/BaseBottomSheet.kt
index 519d98fc9..024da0533 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/BaseBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/BaseBottomSheet.kt
@@ -6,13 +6,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.cryptomator.generator.BottomSheet
+import org.cryptomator.presentation.BuildConfig
 import org.cryptomator.presentation.R
+import org.cryptomator.util.SharedPreferencesHandler
 
-abstract class BaseBottomSheet<Callback> : BottomSheetDialogFragment() {
+abstract class BaseBottomSheet<Callback, VB : ViewBinding>(val bindingFactory: (LayoutInflater, ViewGroup?, Boolean) -> VB) : BottomSheetDialogFragment() {
 
 	protected abstract fun setupView()
 
+	protected lateinit var binding: VB
+
 	var callback: Callback? = null
 
 	override fun onAttach(context: Context) {
@@ -28,10 +35,17 @@ abstract class BaseBottomSheet<Callback> : BottomSheetDialogFragment() {
 
 	// Need to return the view here or onViewCreated won't be called by DialogFragment, sigh
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return requireActivity().layoutInflater.inflate(bottomSheetContent, null, false)
+		binding = bindingFactory(inflater, container, false)
+		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		val config = javaClass.getAnnotation(BottomSheet::class.java)
+		if (config?.secure == true && SharedPreferencesHandler(requireContext()).secureScreen() && !BuildConfig.DEBUG) {
+			dialog?.window?.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+		} else {
+			dialog?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+		}
 		setupView()
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt
index ffdc61674..b13df542a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/CloudConnectionSettingsBottomSheet.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import org.cryptomator.generator.BottomSheet
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogBottomSheetCloudSettingsBinding
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.model.CloudTypeModel
 import org.cryptomator.presentation.model.LocalStorageModel
@@ -11,14 +12,9 @@ import org.cryptomator.presentation.model.OnedriveCloudModel
 import org.cryptomator.presentation.model.PCloudModel
 import org.cryptomator.presentation.model.S3CloudModel
 import org.cryptomator.presentation.model.WebDavCloudModel
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_cloud_settings.change_cloud
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_cloud_settings.delete_cloud
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_cloud_settings.iv_cloud_image
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_cloud_settings.tv_cloud_name
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_cloud_settings.tv_cloud_subtext
 
 @BottomSheet(R.layout.dialog_bottom_sheet_cloud_settings)
-class CloudConnectionSettingsBottomSheet : BaseBottomSheet<CloudConnectionSettingsBottomSheet.Callback>() {
+class CloudConnectionSettingsBottomSheet : BaseBottomSheet<CloudConnectionSettingsBottomSheet.Callback, DialogBottomSheetCloudSettingsBinding>(DialogBottomSheetCloudSettingsBinding::inflate) {
 
 	interface Callback {
 
@@ -38,12 +34,12 @@ class CloudConnectionSettingsBottomSheet : BaseBottomSheet<CloudConnectionSettin
 			else -> throw IllegalStateException("Cloud model is not binded in the view")
 		}
 
-		iv_cloud_image.setImageResource(cloudModel.cloudType().cloudImageResource)
-		change_cloud.setOnClickListener {
+		binding.ivCloudImage.setImageResource(cloudModel.cloudType().cloudImageResource)
+		binding.changeCloud.setOnClickListener {
 			callback?.onChangeCloudClicked(cloudModel)
 			dismiss()
 		}
-		delete_cloud.setOnClickListener {
+		binding.deleteCloud.setOnClickListener {
 			callback?.onDeleteCloudClicked(cloudModel)
 			dismiss()
 		}
@@ -51,33 +47,33 @@ class CloudConnectionSettingsBottomSheet : BaseBottomSheet<CloudConnectionSettin
 
 	private fun bindViewForLocal(cloudModel: LocalStorageModel) {
 		if (cloudModel.location().isEmpty()) {
-			tv_cloud_name.text = cloudModel.storage()
-			tv_cloud_subtext.visibility = View.GONE
+			binding.tvCloudName.text = cloudModel.storage()
+			binding.tvCloudSubtext.visibility = View.GONE
 		} else {
-			tv_cloud_name.text = cloudModel.location()
-			tv_cloud_subtext.text = cloudModel.storage()
+			binding.tvCloudName.text = cloudModel.location()
+			binding.tvCloudSubtext.text = cloudModel.storage()
 		}
 	}
 
 	private fun bindViewForOnedrive(cloudModel: OnedriveCloudModel) {
-		change_cloud.visibility = View.GONE
-		tv_cloud_subtext.text = cloudModel.username()
+		binding.changeCloud.visibility = View.GONE
+		binding.tvCloudSubtext.text = cloudModel.username()
 	}
 
 	private fun bindViewForWebDAV(cloudModel: WebDavCloudModel) {
-		change_cloud.visibility = View.VISIBLE
-		tv_cloud_name.text = cloudModel.url()
-		tv_cloud_subtext.text = cloudModel.username()
+		binding.changeCloud.visibility = View.VISIBLE
+		binding.tvCloudName.text = cloudModel.url()
+		binding.tvCloudSubtext.text = cloudModel.username()
 	}
 
 	private fun bindViewForPCloud(cloudModel: PCloudModel) {
-		change_cloud.visibility = View.GONE
-		tv_cloud_name.text = cloudModel.username()
+		binding.changeCloud.visibility = View.GONE
+		binding.tvCloudName.text = cloudModel.username()
 	}
 
 	private fun bindViewForS3(cloudModel: S3CloudModel) {
-		change_cloud.visibility = View.VISIBLE
-		tv_cloud_name.text = cloudModel.username()
+		binding.changeCloud.visibility = View.VISIBLE
+		binding.tvCloudName.text = cloudModel.username()
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt
index e03d706af..62c1aa78a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FileSettingsBottomSheet.kt
@@ -4,20 +4,12 @@ import android.os.Bundle
 import android.view.View
 import org.cryptomator.generator.BottomSheet
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogBottomSheetFileSettingsBinding
 import org.cryptomator.presentation.model.CloudFileModel
 import org.cryptomator.presentation.model.CloudNodeModel
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.delete_file
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.export_file
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.iv_file_image
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.move_file
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.open_with_text
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.rename_file
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.share_file
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.tv_file_name
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_file_settings.tv_file_path
 
 @BottomSheet(R.layout.dialog_bottom_sheet_file_settings)
-class FileSettingsBottomSheet : BaseBottomSheet<FileSettingsBottomSheet.Callback>() {
+class FileSettingsBottomSheet : BaseBottomSheet<FileSettingsBottomSheet.Callback, DialogBottomSheetFileSettingsBinding>(DialogBottomSheetFileSettingsBinding::inflate) {
 
 	interface Callback {
 
@@ -33,36 +25,36 @@ class FileSettingsBottomSheet : BaseBottomSheet<FileSettingsBottomSheet.Callback
 		val cloudFileModel = requireArguments().getSerializable(FILE_ARG) as CloudFileModel
 		val parentFolderPath = requireArguments().getString(PARENT_FOLDER_PATH_ARG)
 
-		iv_file_image.setImageResource(cloudFileModel.icon.iconResource)
-		tv_file_name.text = cloudFileModel.name
-		tv_file_path.text = parentFolderPath
+		binding.ivFileImage.setImageResource(cloudFileModel.icon.iconResource)
+		binding.tvFileName.text = cloudFileModel.name
+		binding.tvFilePath.text = parentFolderPath
 
 		val lowerFileName = cloudFileModel.name.lowercase()
 		if (lowerFileName.endsWith(".txt") || lowerFileName.endsWith(".md") || lowerFileName.endsWith(".todo")) {
-			open_with_text.visibility = View.VISIBLE
-			open_with_text.setOnClickListener {
+			binding.openWithText.visibility = View.VISIBLE
+			binding.openWithText.setOnClickListener {
 				callback?.onOpenWithTextFileClicked(cloudFileModel)
 				dismiss()
 			}
 		}
 
-		share_file.setOnClickListener {
+		binding.shareFile.setOnClickListener {
 			callback?.onShareFileClicked(cloudFileModel)
 			dismiss()
 		}
-		move_file.setOnClickListener {
+		binding.moveFile.setOnClickListener {
 			callback?.onMoveFileClicked(cloudFileModel)
 			dismiss()
 		}
-		export_file.setOnClickListener {
+		binding.exportFile.setOnClickListener {
 			callback?.onExportFileClicked(cloudFileModel)
 			dismiss()
 		}
-		rename_file.setOnClickListener {
+		binding.renameFile.setOnClickListener {
 			callback?.onRenameFileClicked(cloudFileModel)
 			dismiss()
 		}
-		delete_file.setOnClickListener {
+		binding.deleteFile.setOnClickListener {
 			callback?.onDeleteNodeClicked(cloudFileModel)
 			dismiss()
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FolderSettingsBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FolderSettingsBottomSheet.kt
index 1c3a587ff..dd9fe6b5c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FolderSettingsBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/FolderSettingsBottomSheet.kt
@@ -4,18 +4,12 @@ import android.os.Bundle
 import android.view.View
 import org.cryptomator.generator.BottomSheet
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogBottomSheetFolderSettingsBinding
 import org.cryptomator.presentation.model.CloudFolderModel
 import org.cryptomator.presentation.model.CloudNodeModel
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_folder_settings.delete_folder
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_folder_settings.export_folder
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_folder_settings.move_folder
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_folder_settings.rename_folder
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_folder_settings.share_folder
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_folder_settings.tv_folder_name
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_folder_settings.tv_folder_path
 
 @BottomSheet(R.layout.dialog_bottom_sheet_folder_settings)
-class FolderSettingsBottomSheet : BaseBottomSheet<FolderSettingsBottomSheet.Callback>() {
+class FolderSettingsBottomSheet : BaseBottomSheet<FolderSettingsBottomSheet.Callback, DialogBottomSheetFolderSettingsBinding>(DialogBottomSheetFolderSettingsBinding::inflate) {
 
 	interface Callback {
 
@@ -30,27 +24,27 @@ class FolderSettingsBottomSheet : BaseBottomSheet<FolderSettingsBottomSheet.Call
 		val cloudFolderModel = requireArguments().getSerializable(FOLDER_ARG) as CloudFolderModel
 		val parentFolderPath = requireArguments().getString(PARENT_FOLDER_PATH_ARG)
 
-		tv_folder_name.text = cloudFolderModel.name
-		tv_folder_path.text = parentFolderPath
+		binding.tvFolderName.text = cloudFolderModel.name
+		binding.tvFolderPath.text = parentFolderPath
 
-		share_folder.setOnClickListener {
+		binding.shareFolder.setOnClickListener {
 			callback?.onShareFolderClicked(cloudFolderModel)
 			dismiss()
 		}
-		rename_folder.setOnClickListener {
+		binding.renameFolder.setOnClickListener {
 			callback?.onRenameFolderClicked(cloudFolderModel)
 			dismiss()
 		}
-		move_folder.setOnClickListener {
+		binding.moveFolder.setOnClickListener {
 			callback?.onMoveFolderClicked(cloudFolderModel)
 			dismiss()
 		}
-		export_folder.visibility = View.VISIBLE
-		export_folder.setOnClickListener {
+		binding.exportFolder.visibility = View.VISIBLE
+		binding.exportFolder.setOnClickListener {
 			callback?.onExportFolderClicked(cloudFolderModel)
 			dismiss()
 		}
-		delete_folder.setOnClickListener {
+		binding.deleteFolder.setOnClickListener {
 			callback?.onDeleteNodeClicked(cloudFolderModel)
 			dismiss()
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt
index 163d759a3..7dbdd7771 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/SettingsVaultBottomSheet.kt
@@ -4,17 +4,11 @@ import android.os.Bundle
 import android.widget.LinearLayout
 import org.cryptomator.generator.BottomSheet
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogBottomSheetVaultSettingsBinding
 import org.cryptomator.presentation.model.VaultModel
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_settings.change_password
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_settings.cloud_image
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_settings.delete_vault
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_settings.et_rename
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_settings.lock_vault
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_settings.vault_name
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_settings.vault_path
 
 @BottomSheet(R.layout.dialog_bottom_sheet_vault_settings)
-class SettingsVaultBottomSheet : BaseBottomSheet<SettingsVaultBottomSheet.Callback>() {
+class SettingsVaultBottomSheet : BaseBottomSheet<SettingsVaultBottomSheet.Callback, DialogBottomSheetVaultSettingsBinding>(DialogBottomSheetVaultSettingsBinding::inflate) {
 
 	interface Callback {
 
@@ -28,26 +22,26 @@ class SettingsVaultBottomSheet : BaseBottomSheet<SettingsVaultBottomSheet.Callba
 		val vaultModel = requireArguments().getSerializable(VAULT_ARG) as VaultModel
 
 		if (vaultModel.isLocked) {
-			lock_vault.visibility = LinearLayout.GONE
+			binding.lockVault.visibility = LinearLayout.GONE
 		}
 		val cloudType = vaultModel.cloudType
-		cloud_image.setImageResource(cloudType.vaultSelectedImageResource)
-		vault_name.text = vaultModel.name
-		vault_path.text = vaultModel.path
+		binding.cloudImage.setImageResource(cloudType.vaultSelectedImageResource)
+		binding.vaultName.text = vaultModel.name
+		binding.vaultPath.text = vaultModel.path
 
-		et_rename.setOnClickListener {
+		binding.etRename.setOnClickListener {
 			callback?.onRenameVaultClick(vaultModel)
 			dismiss()
 		}
-		delete_vault.setOnClickListener {
+		binding.deleteVault.setOnClickListener {
 			callback?.onDeleteVaultClick(vaultModel)
 			dismiss()
 		}
-		lock_vault.setOnClickListener {
+		binding.lockVault.setOnClickListener {
 			callback?.onLockVaultClick(vaultModel)
 			dismiss()
 		}
-		change_password.setOnClickListener {
+		binding.changePassword.setOnClickListener {
 			callback?.onChangePasswordClick(vaultModel)
 			dismiss()
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/VaultContentActionBottomSheet.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/VaultContentActionBottomSheet.kt
index d8827efab..38ed63a3c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/VaultContentActionBottomSheet.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/bottomsheet/VaultContentActionBottomSheet.kt
@@ -3,14 +3,11 @@ package org.cryptomator.presentation.ui.bottomsheet
 import android.os.Bundle
 import org.cryptomator.generator.BottomSheet
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogBottomSheetVaultActionBinding
 import org.cryptomator.presentation.model.CloudFolderModel
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_action.create_new_folder
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_action.create_new_text_file
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_action.title
-import kotlinx.android.synthetic.main.dialog_bottom_sheet_vault_action.upload_files
 
 @BottomSheet(R.layout.dialog_bottom_sheet_vault_action)
-class VaultContentActionBottomSheet : BaseBottomSheet<VaultContentActionBottomSheet.Callback>() {
+class VaultContentActionBottomSheet : BaseBottomSheet<VaultContentActionBottomSheet.Callback, DialogBottomSheetVaultActionBinding>(DialogBottomSheetVaultActionBinding::inflate) {
 
 	interface Callback {
 
@@ -22,17 +19,17 @@ class VaultContentActionBottomSheet : BaseBottomSheet<VaultContentActionBottomSh
 	override fun setupView() {
 		val folder = requireArguments().getSerializable(FOLDER_ARG) as CloudFolderModel
 
-		title.text = String.format(getString(R.string.screen_file_browser_actions_title), folderPath(folder))
+		binding.title.text = String.format(getString(R.string.screen_file_browser_actions_title), folderPath(folder))
 
-		create_new_folder.setOnClickListener {
+		binding.createNewFolder.setOnClickListener {
 			callback?.onCreateNewFolderClicked()
 			dismiss()
 		}
-		upload_files.setOnClickListener {
+		binding.uploadFiles.setOnClickListener {
 			callback?.onUploadFilesClicked(folder)
 			dismiss()
 		}
-		create_new_text_file.setOnClickListener {
+		binding.createNewTextFile.setOnClickListener {
 			callback?.onCreateNewTextFileClicked()
 			dismiss()
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AppIsObscuredInfoDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AppIsObscuredInfoDialog.kt
index e01fde74c..ea1596bc0 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AppIsObscuredInfoDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AppIsObscuredInfoDialog.kt
@@ -7,10 +7,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_app_is_obscured_info.tv_app_is_obscured_info
+import org.cryptomator.presentation.databinding.DialogAppIsObscuredInfoBinding
 
-@Dialog(R.layout.dialog_app_is_obscured_info)
-class AppIsObscuredInfoDialog : BaseDialog<Activity>() {
+@Dialog
+class AppIsObscuredInfoDialog : BaseDialog<Activity, DialogAppIsObscuredInfoBinding>(DialogAppIsObscuredInfoBinding::inflate) {
 
 	public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
 		return builder //
@@ -24,7 +24,7 @@ class AppIsObscuredInfoDialog : BaseDialog<Activity>() {
 	}
 
 	public override fun setupView() {
-		tv_app_is_obscured_info.movementMethod = LinkMovementMethod.getInstance()
+		binding.tvAppIsObscuredInfo.movementMethod = LinkMovementMethod.getInstance()
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskForLockScreenDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskForLockScreenDialog.kt
index fa2163ff6..562b4d5c4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskForLockScreenDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskForLockScreenDialog.kt
@@ -5,10 +5,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_no_screen_lock_set.cb_select_screen_lock
+import org.cryptomator.presentation.databinding.DialogNoScreenLockSetBinding
 
-@Dialog(R.layout.dialog_no_screen_lock_set)
-class AskForLockScreenDialog : BaseDialog<AskForLockScreenDialog.Callback>() {
+@Dialog
+class AskForLockScreenDialog : BaseDialog<AskForLockScreenDialog.Callback, DialogNoScreenLockSetBinding>(DialogNoScreenLockSetBinding::inflate) {
 
 	interface Callback {
 
@@ -18,7 +18,7 @@ class AskForLockScreenDialog : BaseDialog<AskForLockScreenDialog.Callback>() {
 	override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
 		builder //
 			.setTitle(R.string.dialog_no_screen_lock_title) //
-			.setNeutralButton(getString(R.string.dialog_unable_to_share_positive_button)) { _: DialogInterface, _: Int -> callback?.onAskForLockScreenFinished(cb_select_screen_lock.isChecked) }
+			.setNeutralButton(getString(R.string.dialog_unable_to_share_positive_button)) { _: DialogInterface, _: Int -> callback?.onAskForLockScreenFinished(binding.cbSelectScreenLock.isChecked) }
 		return builder.create()
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
index f09034a17..f5c75361c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AskIgnoreBatteryOptimizationsDialog.kt
@@ -5,11 +5,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_ask_ignore_battery_optimizations.cb_ask_ignore_battery_optimizations
-import kotlinx.android.synthetic.main.dialog_ask_ignore_battery_optimizations.tv_ask_ignore_battery_optimizations
+import org.cryptomator.presentation.databinding.DialogAskIgnoreBatteryOptimizationsBinding
 
-@Dialog(R.layout.dialog_ask_ignore_battery_optimizations)
-class AskIgnoreBatteryOptimizationsDialog : BaseDialog<AskIgnoreBatteryOptimizationsDialog.Callback>() {
+@Dialog
+class AskIgnoreBatteryOptimizationsDialog : BaseDialog<AskIgnoreBatteryOptimizationsDialog.Callback, DialogAskIgnoreBatteryOptimizationsBinding>(DialogAskIgnoreBatteryOptimizationsBinding::inflate) {
 
 	interface Callback {
 
@@ -21,15 +20,16 @@ class AskIgnoreBatteryOptimizationsDialog : BaseDialog<AskIgnoreBatteryOptimizat
 		return builder //
 			.setTitle(R.string.dialog_ask_ignore_battery_optimizations_title) //
 			.setPositiveButton(getString(R.string.dialog_ask_ignore_battery_optimizations_neutral_button)) { _: DialogInterface, _: Int -> callback?.onAskIgnoreBatteryOptimizationsAccepted() } //
-			.setNegativeButton(getString(R.string.dialog_ask_ignore_battery_optimizations_negative_button)) { _: DialogInterface, _: Int -> callback?.onAskIgnoreBatteryOptimizationsRejected(!cb_ask_ignore_battery_optimizations.isChecked) } //
+			.setNegativeButton(getString(R.string.dialog_ask_ignore_battery_optimizations_negative_button)) { _: DialogInterface, _: Int -> callback?.onAskIgnoreBatteryOptimizationsRejected(!binding.cbAskIgnoreBatteryOptimizations.isChecked) } //
 			.create()
 	}
 
 	public override fun setupView() {
-		tv_ask_ignore_battery_optimizations.text = String.format(
-			getString(R.string.dialog_ask_ignore_battery_optimizations_hint),
-			getString(R.string.app_name),
-			getString(R.string.dialog_ask_ignore_battery_optimizations_neutral_button))
+		binding.tvAskIgnoreBatteryOptimizations.text = String.format(
+			getString(R.string.dialog_ask_ignore_battery_optimizations_hint), //
+			getString(R.string.app_name), //
+			getString(R.string.dialog_ask_ignore_battery_optimizations_neutral_button) //
+		)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AssignSslCertificateDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AssignSslCertificateDialog.kt
index b697bdeac..bcb831520 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AssignSslCertificateDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/AssignSslCertificateDialog.kt
@@ -9,15 +9,12 @@ import org.cryptomator.domain.WebDavCloud
 import org.cryptomator.domain.exception.FatalBackendException
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogHandleSslCertificateBinding
 import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
-import kotlinx.android.synthetic.main.dialog_handle_ssl_certificate.cb_accept_certificate
-import kotlinx.android.synthetic.main.dialog_handle_ssl_certificate.certificate_details
-import kotlinx.android.synthetic.main.dialog_handle_ssl_certificate.show_certificate
-import kotlinx.android.synthetic.main.dialog_handle_ssl_certificate.tv_finger_print_text
 
-@Dialog(R.layout.dialog_handle_ssl_certificate)
-class AssignSslCertificateDialog : BaseDialog<AssignSslCertificateDialog.Callback>() {
+@Dialog
+class AssignSslCertificateDialog : BaseDialog<AssignSslCertificateDialog.Callback, DialogHandleSslCertificateBinding>(DialogHandleSslCertificateBinding::inflate) {
 
 	private lateinit var certificate: X509Certificate
 
@@ -43,20 +40,19 @@ class AssignSslCertificateDialog : BaseDialog<AssignSslCertificateDialog.Callbac
 	public override fun setupView() {
 		certificate = requireArguments().getSerializable(CERTIFICATE) as X509Certificate
 		try {
-			tv_finger_print_text.text = X509CertificateHelper.getFingerprintFormatted(certificate)
-			certificate_details.text = certificate.toString()
+			binding.tvFingerPrintText.text = X509CertificateHelper.getFingerprintFormatted(certificate)
+			binding.certificateDetails.text = certificate.toString()
 		} catch (e: CertificateException) {
 			throw FatalBackendException(e)
 		}
 
-		show_certificate.setOnClickListener {
+		binding.showCertificate.setOnClickListener {
 			run {
-				certificate_details.visibility = View.VISIBLE
-				show_certificate.visibility = View.GONE
+				binding.certificateDetails.visibility = View.VISIBLE
+				binding.showCertificate.visibility = View.GONE
 			}
 		}
-
-		cb_accept_certificate.setOnCheckedChangeListener { _, isChecked ->
+		binding.cbAcceptCertificate.setOnCheckedChangeListener { _, isChecked ->
 			run {
 				alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).isEnabled = isChecked
 			}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseDialog.kt
index 5ded788cb..ccab631ad 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseDialog.kt
@@ -1,6 +1,5 @@
 package org.cryptomator.presentation.ui.dialog
 
-import android.app.Dialog
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
@@ -9,6 +8,7 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.Button
 import android.widget.EditText
@@ -16,17 +16,22 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
+import androidx.viewbinding.ViewBinding
+import org.cryptomator.generator.Dialog
+import org.cryptomator.presentation.BuildConfig
 import org.cryptomator.presentation.util.KeyboardHelper
 import org.cryptomator.util.SharedPreferencesHandler
 import java.util.function.Supplier
 
-abstract class BaseDialog<Callback> : DialogFragment() {
+abstract class BaseDialog<Callback, VB : ViewBinding>(val bindingFactory: (LayoutInflater, ViewGroup?, Boolean) -> VB) : DialogFragment() {
 
 	private lateinit var customDialog: View
 
+	protected lateinit var binding: VB
+
 	var callback: Callback? = null
 
-	protected abstract fun setupDialog(builder: AlertDialog.Builder): Dialog
+	protected abstract fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog
 	protected abstract fun setupView()
 
 	fun show(fragmentManager: FragmentManager) {
@@ -38,21 +43,31 @@ abstract class BaseDialog<Callback> : DialogFragment() {
 		callback = context as Callback
 	}
 
-	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+	override fun onCreateDialog(savedInstanceState: Bundle?): android.app.Dialog {
+		val inflater = LayoutInflater.from(context)
+		binding = bindingFactory(inflater, null, false)
+
 		val builder = AlertDialog.Builder(requireActivity())
-		customDialog = requireActivity().layoutInflater.inflate(dialogContent, null)
-		builder.setView(customDialog)
-		val dialog = setupDialog(builder)
+		builder.setView(binding.root)
+		setupDialog(builder)
+
+		val dialog = builder.create()
 		dialog.window?.decorView?.filterTouchesWhenObscured = disableDialogWhenObscured()
+
 		return dialog
 	}
 
-	// Need to return the view here or onViewCreated won't be called by DialogFragment, sigh
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return customDialog
+		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		val config = javaClass.getAnnotation(Dialog::class.java)
+		if (config?.secure == true && SharedPreferencesHandler(requireContext()).secureScreen() && !BuildConfig.DEBUG) {
+			dialog?.window?.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+		} else {
+			dialog?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+		}
 		setupView()
 	}
 
@@ -89,8 +104,8 @@ abstract class BaseDialog<Callback> : DialogFragment() {
 
 	private fun enableButtons(enabled: Boolean) {
 		val dialog = dialog as AlertDialog?
-		dialog?.getButton(Dialog.BUTTON_POSITIVE)?.isEnabled = enabled
-		dialog?.getButton(Dialog.BUTTON_NEGATIVE)?.isEnabled = enabled
+		dialog?.getButton(android.app.Dialog.BUTTON_POSITIVE)?.isEnabled = enabled
+		dialog?.getButton(android.app.Dialog.BUTTON_NEGATIVE)?.isEnabled = enabled
 	}
 
 	fun allowClosingDialog(allow: Boolean) {
@@ -100,7 +115,7 @@ abstract class BaseDialog<Callback> : DialogFragment() {
 		dialog?.setCanceledOnTouchOutside(allow)
 	}
 
-	fun showKeyboard(dialog: Dialog) {
+	fun showKeyboard(dialog: android.app.Dialog) {
 		KeyboardHelper.showKeyboardForDialog(dialog)
 	}
 
@@ -108,9 +123,6 @@ abstract class BaseDialog<Callback> : DialogFragment() {
 		KeyboardHelper.hideKeyboard(requireActivity(), view)
 	}
 
-	private val dialogContent: Int
-		get() = javaClass.getAnnotation(org.cryptomator.generator.Dialog::class.java)!!.value
-
 	protected fun registerOnEditorDoneActionAndPerformButtonClick(editText: EditText, positiveButton: Supplier<Button>) {
 		editText.setOnEditorActionListener { _: TextView?, actionId: Int, _: KeyEvent? ->
 			if (actionId == EditorInfo.IME_ACTION_DONE && positiveButton.get().isEnabled) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseProgressErrorDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseProgressErrorDialog.kt
index 8a741f469..800ce48f5 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseProgressErrorDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BaseProgressErrorDialog.kt
@@ -1,24 +1,28 @@
 package org.cryptomator.presentation.ui.dialog
 
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.viewbinding.ViewBinding
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
 import org.cryptomator.presentation.ui.activity.BaseActivity
 import org.cryptomator.presentation.ui.activity.ErrorDisplay
 import org.cryptomator.presentation.ui.activity.ProgressAware
 import org.cryptomator.presentation.util.FileNameValidator.Companion.isInvalidName
-import kotlinx.android.synthetic.main.view_dialog_error.ll_error
-import kotlinx.android.synthetic.main.view_dialog_error.tv_error
-import kotlinx.android.synthetic.main.view_dialog_progress.ll_progress
-import kotlinx.android.synthetic.main.view_dialog_progress.tv_progress
 
-abstract class BaseProgressErrorDialog<Callback> : BaseDialog<Callback>(), ProgressAware, ErrorDisplay {
+abstract class BaseProgressErrorDialog<Callback, VB : ViewBinding>(
+	mainBindingFactory: (LayoutInflater, ViewGroup?, Boolean) -> VB
+) : BaseDialog<Callback, VB>(mainBindingFactory), ProgressAware, ErrorDisplay {
 
 	override fun showError(message: String) {
-		ll_progress.visibility = View.GONE
-		ll_error.visibility = View.VISIBLE
-		tv_error.text = message
+		dialogProgressLayout().visibility = View.GONE
+		dialogErrorBinding().llError.visibility = View.VISIBLE
+		dialogErrorBinding().tvError.text = message
 		enableOrientationChange(true)
 		onErrorResponse(enableViewAfterError())
 	}
@@ -35,22 +39,26 @@ abstract class BaseProgressErrorDialog<Callback> : BaseDialog<Callback>(), Progr
 		if (hasInvalidInput(input)) {
 			showError(R.string.error_name_contains_invalid_characters)
 		} else {
-			ll_error.visibility = View.GONE
+			dialogErrorBinding().llError.visibility = View.GONE
 		}
 	}
 
 	override fun showProgress(progress: ProgressModel) {
 		if (progress.state() === ProgressStateModel.COMPLETED) {
 			enableOrientationChange(true)
-			(activity as BaseActivity?)?.closeDialog()
+			(activity as BaseActivity<*>?)?.closeDialog()
 		} else {
-			ll_error.visibility = View.GONE
-			ll_progress.visibility = View.VISIBLE
-			tv_progress.setText(progress.state().textResourceId())
+			dialogErrorBinding().llError.visibility = View.GONE
+			dialogProgressLayout().visibility = View.VISIBLE
+			dialogProgressTextView().setText(progress.state().textResourceId())
 			updateProgress(progress.progress())
 		}
 	}
 
+	abstract fun dialogProgressLayout(): LinearLayout
+	abstract fun dialogProgressTextView(): TextView
+	abstract fun dialogErrorBinding(): ViewDialogErrorBinding
+
 	open fun updateProgress(progress: Int) {}
 	open fun enableViewAfterError(): View? {
 		// default empty
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BetaConfirmationDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BetaConfirmationDialog.kt
index 7f15955bc..745550443 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BetaConfirmationDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BetaConfirmationDialog.kt
@@ -5,9 +5,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogBetaConfirmationBinding
 
-@Dialog(R.layout.dialog_beta_confirmation)
-class BetaConfirmationDialog : BaseDialog<BetaConfirmationDialog.Callback>() {
+@Dialog
+class BetaConfirmationDialog : BaseDialog<BetaConfirmationDialog.Callback, DialogBetaConfirmationBinding>(DialogBetaConfirmationBinding::inflate) {
 
 	interface Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BiometricAuthKeyInvalidatedDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BiometricAuthKeyInvalidatedDialog.kt
index 62883ffb5..8b7213e65 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BiometricAuthKeyInvalidatedDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/BiometricAuthKeyInvalidatedDialog.kt
@@ -4,9 +4,10 @@ import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogBiometricAuthKeyInvalidatedBinding
 
-@Dialog(R.layout.dialog_biometric_auth_key_invalidated)
-class BiometricAuthKeyInvalidatedDialog : BaseDialog<BiometricAuthKeyInvalidatedDialog>() {
+@Dialog
+class BiometricAuthKeyInvalidatedDialog : BaseDialog<BiometricAuthKeyInvalidatedDialog, DialogBiometricAuthKeyInvalidatedBinding>(DialogBiometricAuthKeyInvalidatedBinding::inflate) {
 
 	public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
 		builder //
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ChangePasswordDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ChangePasswordDialog.kt
index 3876e3759..616a8e3b4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ChangePasswordDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ChangePasswordDialog.kt
@@ -4,20 +4,19 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.domain.UnverifiedVaultConfig
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogChangePasswordBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.util.PasswordStrengthUtil
-import kotlinx.android.synthetic.main.dialog_change_password.et_new_password
-import kotlinx.android.synthetic.main.dialog_change_password.et_new_retype_password
-import kotlinx.android.synthetic.main.dialog_change_password.et_old_password
-import kotlinx.android.synthetic.main.view_password_strength_indicator.progressBarPwStrengthIndicator
-import kotlinx.android.synthetic.main.view_password_strength_indicator.textViewPwStrengthIndicator
 
-@Dialog(R.layout.dialog_change_password)
-class ChangePasswordDialog : BaseProgressErrorDialog<ChangePasswordDialog.Callback>() {
+@Dialog(secure = true)
+class ChangePasswordDialog : BaseProgressErrorDialog<ChangePasswordDialog.Callback, DialogChangePasswordBinding>(DialogChangePasswordBinding::inflate) {
 
 	// positive button
 	private var changePasswordButton: Button? = null
@@ -37,36 +36,36 @@ class ChangePasswordDialog : BaseProgressErrorDialog<ChangePasswordDialog.Callba
 				val vaultModel = requireArguments().getSerializable(VAULT_ARG) as VaultModel
 				val unverifiedVaultConfig = requireArguments().getSerializable(VAULT_CONFIG_ARG) as UnverifiedVaultConfig?
 				if (valid(
-						et_old_password.text.toString(),  //
-						et_new_password.text.toString(),  //
-						et_new_retype_password.text.toString()
+						binding.etOldPassword.text.toString(),  //
+						binding.etNewPassword.text.toString(),  //
+						binding.etNewRetypePassword.text.toString()
 					)
 				) {
 					callback?.onChangePasswordClick(
 						vaultModel,  //
 						unverifiedVaultConfig, //
-						et_old_password.text.toString(),  //
-						et_new_password.text.toString()
+						binding.etOldPassword.text.toString(),  //
+						binding.etNewPassword.text.toString()
 					)
-					onWaitForResponse(et_old_password)
+					onWaitForResponse(binding.etOldPassword)
 				} else {
-					hideKeyboard(et_old_password)
+					hideKeyboard(binding.etOldPassword)
 				}
 			}
 			dialog.setCanceledOnTouchOutside(false)
-			et_old_password.requestFocus()
-			et_old_password.nextFocusForwardId = et_new_password.id
-			et_new_password.nextFocusForwardId = et_new_retype_password.id
+			binding.etOldPassword.requestFocus()
+			binding.etOldPassword.nextFocusForwardId = binding.etNewPassword.id
+			binding.etNewPassword.nextFocusForwardId = binding.etNewRetypePassword.id
 			changePasswordButton?.let {
-				et_new_retype_password.nextFocusForwardId = it.id
-				registerOnEditorDoneActionAndPerformButtonClick(et_new_retype_password) { it }
+				binding.etNewRetypePassword.nextFocusForwardId = it.id
+				registerOnEditorDoneActionAndPerformButtonClick(binding.etNewRetypePassword) { it }
 			}
 
 			PasswordStrengthUtil() //
 				.startUpdatingPasswordStrengthMeter(
-					et_new_password,  //
-					progressBarPwStrengthIndicator,  //
-					textViewPwStrengthIndicator, //
+					binding.etNewPassword,  //
+					binding.viewPasswordStrengthIndicator.pbPasswordStrengthIndicator,  //
+					binding.viewPasswordStrengthIndicator.tvPwStrengthIndicator, //
 					changePasswordButton
 				)
 		}
@@ -100,12 +99,24 @@ class ChangePasswordDialog : BaseProgressErrorDialog<ChangePasswordDialog.Callba
 	}
 
 	override fun setupView() {
-		et_old_password.requestFocus()
+		binding.etOldPassword.requestFocus()
 		dialog?.let { showKeyboard(it) }
 	}
 
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
+	}
+
 	override fun enableViewAfterError(): View {
-		return et_old_password
+		return binding.etOldPassword
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CloudNodeRenameDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CloudNodeRenameDialog.kt
index 4fa6259b1..51deadf58 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CloudNodeRenameDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CloudNodeRenameDialog.kt
@@ -6,17 +6,20 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogRenameBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.CloudFileModel
 import org.cryptomator.presentation.model.CloudNodeModel
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
-import kotlinx.android.synthetic.main.dialog_rename.et_rename
 
-@Dialog(R.layout.dialog_rename)
-class CloudNodeRenameDialog : BaseProgressErrorDialog<CloudNodeRenameDialog.Callback>() {
+@Dialog
+class CloudNodeRenameDialog : BaseProgressErrorDialog<CloudNodeRenameDialog.Callback, DialogRenameBinding>(DialogRenameBinding::inflate) {
 
 	private var renameConfirmButton: Button? = null
 
@@ -36,13 +39,13 @@ class CloudNodeRenameDialog : BaseProgressErrorDialog<CloudNodeRenameDialog.Call
 
 				// do action
 				val cloudNodeModel = requireArguments().getSerializable(CLOUD_NODE_ARG) as CloudNodeModel<*>
-				callback?.onRenameCloudNodeClicked(cloudNodeModel, et_rename.text.toString())
-				onWaitForResponse(et_rename)
+				callback?.onRenameCloudNodeClicked(cloudNodeModel, binding.etRename.text.toString())
+				onWaitForResponse(binding.etRename)
 			}
 			dialog.setCanceledOnTouchOutside(false)
-			et_rename.requestFocus()
+			binding.etRename.requestFocus()
 			renameConfirmButton?.let { button ->
-				et_rename.nextFocusForwardId = button.id
+				binding.etRename.nextFocusForwardId = button.id
 			}
 		}
 	}
@@ -66,9 +69,9 @@ class CloudNodeRenameDialog : BaseProgressErrorDialog<CloudNodeRenameDialog.Call
 
 	public override fun setupView() {
 		val cloudNodeModel = requireArguments().getSerializable(CLOUD_NODE_ARG) as CloudNodeModel<*>
-		et_rename.setText(cloudNodeModel.name)
-		renameConfirmButton?.let { registerOnEditorDoneActionAndPerformButtonClick(et_rename) { it } }
-		et_rename.addTextChangedListener(object : TextWatcher {
+		binding.etRename.setText(cloudNodeModel.name)
+		renameConfirmButton?.let { registerOnEditorDoneActionAndPerformButtonClick(binding.etRename) { it } }
+		binding.etRename.addTextChangedListener(object : TextWatcher {
 			override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
 			override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 			override fun afterTextChanged(s: Editable) {
@@ -78,23 +81,35 @@ class CloudNodeRenameDialog : BaseProgressErrorDialog<CloudNodeRenameDialog.Call
 				}
 			}
 		})
-		et_rename.onFocusChangeListener = View.OnFocusChangeListener { _: View, _: Boolean ->
+		binding.etRename.onFocusChangeListener = View.OnFocusChangeListener { _: View, _: Boolean ->
 			if (cloudNodeModel is CloudFileModel) {
-				val indexOf = et_rename.text.toString().lastIndexOf(".")
+				val indexOf = binding.etRename.text.toString().lastIndexOf(".")
 				if (indexOf == -1) {
-					et_rename.selectAll()
+					binding.etRename.selectAll()
 				} else {
-					et_rename.setSelection(0, indexOf)
+					binding.etRename.setSelection(0, indexOf)
 				}
 			} else {
-				et_rename.selectAll()
+				binding.etRename.selectAll()
 			}
 		}
 		dialog?.let { showKeyboard(it) }
 	}
 
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
+	}
+
 	override fun enableViewAfterError(): View {
-		return et_rename
+		return binding.etRename
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ConfirmDeleteCloudNodeDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ConfirmDeleteCloudNodeDialog.kt
index 744bdc8d5..1a02cec83 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ConfirmDeleteCloudNodeDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ConfirmDeleteCloudNodeDialog.kt
@@ -6,14 +6,14 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogConfirmDeleteCloudNodeBinding
 import org.cryptomator.presentation.model.CloudFileModel
 import org.cryptomator.presentation.model.CloudFolderModel
 import org.cryptomator.presentation.model.CloudNodeModel
 import java.io.Serializable
-import kotlinx.android.synthetic.main.dialog_confirm_delete_cloud_node.tv_message
 
-@Dialog(R.layout.dialog_confirm_delete_cloud_node)
-class ConfirmDeleteCloudNodeDialog : BaseDialog<ConfirmDeleteCloudNodeDialog.Callback>() {
+@Dialog
+class ConfirmDeleteCloudNodeDialog : BaseDialog<ConfirmDeleteCloudNodeDialog.Callback, DialogConfirmDeleteCloudNodeBinding>(DialogConfirmDeleteCloudNodeBinding::inflate) {
 
 	interface Callback {
 
@@ -44,9 +44,9 @@ class ConfirmDeleteCloudNodeDialog : BaseDialog<ConfirmDeleteCloudNodeDialog.Cal
 
 	public override fun setupView() {
 		val nodes = requireArguments().getSerializable(ARG_CLOUD_NODE) as List<CloudNodeModel<*>>
-		tv_message.text = getString(R.string.dialog_confirm_delete_multiple_message)
+		binding.tvMessage.text = getString(R.string.dialog_confirm_delete_multiple_message)
 		if (nodes.size == 1) {
-			tv_message.text = getMessage(nodes[0])
+			binding.tvMessage.text = getMessage(nodes[0])
 		}
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CreateFolderDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CreateFolderDialog.kt
index 44ad566b3..29ad101f9 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CreateFolderDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CreateFolderDialog.kt
@@ -5,15 +5,18 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogCreateFolderBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
-import kotlinx.android.synthetic.main.dialog_create_folder.et_folder_name
 
-@Dialog(R.layout.dialog_create_folder)
-class CreateFolderDialog : BaseProgressErrorDialog<CreateFolderDialog.Callback>() {
+@Dialog
+class CreateFolderDialog : BaseProgressErrorDialog<CreateFolderDialog.Callback, DialogCreateFolderBinding>(DialogCreateFolderBinding::inflate) {
 
 	private var createFolderButton: Button? = null
 
@@ -31,13 +34,13 @@ class CreateFolderDialog : BaseProgressErrorDialog<CreateFolderDialog.Callback>(
 			createFolderButton?.setOnClickListener {
 				showProgress(ProgressModel(ProgressStateModel.CREATING_FOLDER))
 				// do action
-				callback?.onCreateFolderClick(et_folder_name.text.toString())
-				onWaitForResponse(et_folder_name)
+				callback?.onCreateFolderClick(binding.etFolderName.text.toString())
+				onWaitForResponse(binding.etFolderName)
 			}
 			dialog.setCanceledOnTouchOutside(false)
-			et_folder_name.requestFocus()
+			binding.etFolderName.requestFocus()
 			createFolderButton?.let { button ->
-				et_folder_name.nextFocusForwardId = button.id
+				binding.etFolderName.nextFocusForwardId = button.id
 			}
 		}
 	}
@@ -50,11 +53,11 @@ class CreateFolderDialog : BaseProgressErrorDialog<CreateFolderDialog.Callback>(
 	}
 
 	override fun setupView() {
-		et_folder_name.requestFocus()
+		binding.etFolderName.requestFocus()
 		createFolderButton?.let {
-			registerOnEditorDoneActionAndPerformButtonClick(et_folder_name) { it }
+			registerOnEditorDoneActionAndPerformButtonClick(binding.etFolderName) { it }
 		}
-		et_folder_name.addTextChangedListener(object : TextWatcher {
+		binding.etFolderName.addTextChangedListener(object : TextWatcher {
 			override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
 			override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 			override fun afterTextChanged(s: Editable) {
@@ -67,7 +70,19 @@ class CreateFolderDialog : BaseProgressErrorDialog<CreateFolderDialog.Callback>(
 		dialog?.let { showKeyboard(it) }
 	}
 
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
+	}
+
 	override fun enableViewAfterError(): View {
-		return et_folder_name
+		return binding.etFolderName
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DebugModeDisclaimerDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DebugModeDisclaimerDialog.kt
index 703eb0dc7..ba9c400d4 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DebugModeDisclaimerDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DebugModeDisclaimerDialog.kt
@@ -5,9 +5,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogDebugModeDisclaimerBinding
 
-@Dialog(R.layout.dialog_debug_mode_disclaimer)
-class DebugModeDisclaimerDialog : BaseDialog<DebugModeDisclaimerDialog.Callback>() {
+@Dialog
+class DebugModeDisclaimerDialog : BaseDialog<DebugModeDisclaimerDialog.Callback, DialogDebugModeDisclaimerBinding>(DialogDebugModeDisclaimerBinding::inflate) {
 
 	interface Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DeleteCloudConnectionWithVaultsDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DeleteCloudConnectionWithVaultsDialog.kt
index de4001076..45b43e33f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DeleteCloudConnectionWithVaultsDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DeleteCloudConnectionWithVaultsDialog.kt
@@ -6,11 +6,11 @@ import androidx.appcompat.app.AlertDialog
 import org.cryptomator.domain.Vault
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogDeleteCloudConnectionWithVaultsBinding
 import org.cryptomator.presentation.model.CloudModel
-import java.util.ArrayList
 
-@Dialog(R.layout.dialog_delete_cloud_connection_with_vaults)
-class DeleteCloudConnectionWithVaultsDialog : BaseDialog<DeleteCloudConnectionWithVaultsDialog.Callback>() {
+@Dialog
+class DeleteCloudConnectionWithVaultsDialog : BaseDialog<DeleteCloudConnectionWithVaultsDialog.Callback, DialogDeleteCloudConnectionWithVaultsBinding>(DialogDeleteCloudConnectionWithVaultsBinding::inflate) {
 
 	interface Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableAppWhenObscuredDisclaimerDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableAppWhenObscuredDisclaimerDialog.kt
index 402d68147..604cf96ff 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableAppWhenObscuredDisclaimerDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableAppWhenObscuredDisclaimerDialog.kt
@@ -6,10 +6,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_disable_app_obscured_disclaimer.tv_disable_app_obscured_disclaimer
+import org.cryptomator.presentation.databinding.DialogDisableAppObscuredDisclaimerBinding
 
-@Dialog(R.layout.dialog_disable_app_obscured_disclaimer)
-class DisableAppWhenObscuredDisclaimerDialog : BaseDialog<DisableAppWhenObscuredDisclaimerDialog.Callback>() {
+@Dialog
+class DisableAppWhenObscuredDisclaimerDialog : BaseDialog<DisableAppWhenObscuredDisclaimerDialog.Callback, DialogDisableAppObscuredDisclaimerBinding>(DialogDisableAppObscuredDisclaimerBinding::inflate) {
 
 	interface Callback {
 
@@ -26,7 +26,7 @@ class DisableAppWhenObscuredDisclaimerDialog : BaseDialog<DisableAppWhenObscured
 	}
 
 	public override fun setupView() {
-		tv_disable_app_obscured_disclaimer.movementMethod = LinkMovementMethod.getInstance()
+		binding.tvDisableAppObscuredDisclaimer.movementMethod = LinkMovementMethod.getInstance()
 	}
 
 	override fun onCancel(dialog: DialogInterface) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableSecureScreenDisclaimerDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableSecureScreenDisclaimerDialog.kt
index e8cc028f7..1da208e57 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableSecureScreenDisclaimerDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/DisableSecureScreenDisclaimerDialog.kt
@@ -6,10 +6,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_disable_secure_screen_disclaimer.tv_disable_secure_screen_disclaimer
+import org.cryptomator.presentation.databinding.DialogDisableSecureScreenDisclaimerBinding
 
-@Dialog(R.layout.dialog_disable_secure_screen_disclaimer)
-class DisableSecureScreenDisclaimerDialog : BaseDialog<DisableSecureScreenDisclaimerDialog.Callback>() {
+@Dialog
+class DisableSecureScreenDisclaimerDialog : BaseDialog<DisableSecureScreenDisclaimerDialog.Callback, DialogDisableSecureScreenDisclaimerBinding>(DialogDisableSecureScreenDisclaimerBinding::inflate) {
 
 	interface Callback {
 
@@ -26,7 +26,7 @@ class DisableSecureScreenDisclaimerDialog : BaseDialog<DisableSecureScreenDiscla
 	}
 
 	public override fun setupView() {
-		tv_disable_secure_screen_disclaimer.movementMethod = LinkMovementMethod.getInstance()
+		binding.tvDisableSecureScreenDisclaimer.movementMethod = LinkMovementMethod.getInstance()
 	}
 
 	override fun onCancel(dialog: DialogInterface) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnrollSystemBiometricDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnrollSystemBiometricDialog.kt
index e055df125..6fdbf76d5 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnrollSystemBiometricDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnrollSystemBiometricDialog.kt
@@ -4,9 +4,10 @@ import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogSetupBiometricAuthInSystemBinding
 
-@Dialog(R.layout.dialog_setup_biometric_auth_in_system)
-class EnrollSystemBiometricDialog : BaseDialog<EnrollSystemBiometricDialog.Callback>() {
+@Dialog
+class EnrollSystemBiometricDialog : BaseDialog<EnrollSystemBiometricDialog.Callback, DialogSetupBiometricAuthInSystemBinding>(DialogSetupBiometricAuthInSystemBinding::inflate) {
 
 	interface Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnterPasswordDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnterPasswordDialog.kt
index af1edc370..c7d43f322 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnterPasswordDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnterPasswordDialog.kt
@@ -6,17 +6,20 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogEnterPasswordBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
 import org.cryptomator.presentation.model.VaultModel
-import kotlinx.android.synthetic.main.dialog_enter_password.et_password
 
 
-@Dialog(R.layout.dialog_enter_password)
-class EnterPasswordDialog : BaseProgressErrorDialog<EnterPasswordDialog.Callback>() {
+@Dialog(secure = true)
+class EnterPasswordDialog : BaseProgressErrorDialog<EnterPasswordDialog.Callback, DialogEnterPasswordBinding>(DialogEnterPasswordBinding::inflate) {
 
 	// positive button
 	private var unlockButton: Button? = null
@@ -37,15 +40,15 @@ class EnterPasswordDialog : BaseProgressErrorDialog<EnterPasswordDialog.Callback
 			unlockButton?.setOnClickListener {
 				showProgress(ProgressModel(ProgressStateModel.UNLOCKING_VAULT))
 				val vaultModel = vaultModel()
-				callback?.onUnlockClick(vaultModel, et_password.text.toString())
-				onWaitForResponse(et_password)
+				callback?.onUnlockClick(vaultModel, binding.etPassword.text.toString())
+				onWaitForResponse(binding.etPassword)
 				dialog.getButton(android.app.Dialog.BUTTON_NEGATIVE)?.isEnabled = true
 			}
 			unlockButton?.let { button ->
-				et_password.nextFocusForwardId = button.id
+				binding.etPassword.nextFocusForwardId = button.id
 			}
 			it.setCanceledOnTouchOutside(false)
-			et_password.requestFocus()
+			binding.etPassword.requestFocus()
 		}
 	}
 
@@ -64,8 +67,8 @@ class EnterPasswordDialog : BaseProgressErrorDialog<EnterPasswordDialog.Callback
 	}
 
 	public override fun setupView() {
-		unlockButton?.let { registerOnEditorDoneActionAndPerformButtonClick(et_password) { it } }
-		et_password.addTextChangedListener(object : TextWatcher {
+		unlockButton?.let { registerOnEditorDoneActionAndPerformButtonClick(binding.etPassword) { it } }
+		binding.etPassword.addTextChangedListener(object : TextWatcher {
 			override fun afterTextChanged(s: Editable) {
 				unlockButton?.let { it.isEnabled = s.toString().isNotEmpty() }
 			}
@@ -76,8 +79,20 @@ class EnterPasswordDialog : BaseProgressErrorDialog<EnterPasswordDialog.Callback
 		dialog?.let { showKeyboard(it) }
 	}
 
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
+	}
+
 	override fun enableViewAfterError(): View {
-		return et_password
+		return binding.etPassword
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExistingFileDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExistingFileDialog.kt
index 64034f9ba..d0c3bfc5a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExistingFileDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExistingFileDialog.kt
@@ -6,10 +6,10 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_existing_file.tv_message
+import org.cryptomator.presentation.databinding.DialogExistingFileBinding
 
-@Dialog(R.layout.dialog_existing_file)
-class ExistingFileDialog : BaseDialog<ExistingFileDialog.Callback>() {
+@Dialog
+class ExistingFileDialog : BaseDialog<ExistingFileDialog.Callback, DialogExistingFileBinding>(DialogExistingFileBinding::inflate) {
 
 	interface Callback {
 
@@ -26,7 +26,7 @@ class ExistingFileDialog : BaseDialog<ExistingFileDialog.Callback>() {
 
 	override fun setupView() {
 		val fileName = requireArguments().getString(FILE_NAME_ARG)
-		tv_message.text = String.format(getString(R.string.dialog_existing_file_message), fileName)
+		binding.tvMessage.text = String.format(getString(R.string.dialog_existing_file_message), fileName)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt
index 66f5e3310..045f5e980 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ExportCloudFilesDialog.kt
@@ -2,20 +2,21 @@ package org.cryptomator.presentation.ui.dialog
 
 import android.content.DialogInterface
 import android.os.Bundle
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogUploadLoadingBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.CloudFileModel
 import org.cryptomator.presentation.model.FileProgressStateModel
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
 import org.cryptomator.presentation.util.ResourceHelper
-import java.util.HashSet
-import kotlinx.android.synthetic.main.view_dialog_intermediate_progress.iv_progress_icon
-import kotlinx.android.synthetic.main.view_dialog_intermediate_progress.pb_dialog
 
-@Dialog(R.layout.dialog_upload_loading)
-class ExportCloudFilesDialog : BaseProgressErrorDialog<ExportCloudFilesDialog.Callback>() {
+@Dialog
+class ExportCloudFilesDialog : BaseProgressErrorDialog<ExportCloudFilesDialog.Callback, DialogUploadLoadingBinding>(DialogUploadLoadingBinding::inflate) {
 
 	interface Callback {
 
@@ -54,7 +55,7 @@ class ExportCloudFilesDialog : BaseProgressErrorDialog<ExportCloudFilesDialog.Ca
 			dismissAllowingStateLoss()
 		} else {
 			if (progress.state().imageResourceId() != 0) {
-				iv_progress_icon.setImageDrawable(ResourceHelper.getDrawable(progress.state().imageResourceId()))
+				binding.llDialogIntermediateProgress.ivProgressIcon.setImageDrawable(ResourceHelper.getDrawable(progress.state().imageResourceId()))
 			}
 			dialog?.setTitle(effectiveTitle(seenFiles.size))
 		}
@@ -68,7 +69,19 @@ class ExportCloudFilesDialog : BaseProgressErrorDialog<ExportCloudFilesDialog.Ca
 	}
 
 	override fun updateProgress(progress: Int) {
-		pb_dialog.progress = progress
+		binding.llDialogIntermediateProgress.pbDialog.progress = progress
+	}
+
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogIntermediateProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogIntermediateProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileNameDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileNameDialog.kt
index 47ee7521a..bb2459fdb 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileNameDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileNameDialog.kt
@@ -5,14 +5,17 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogFileNameBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.util.FileUtil
-import kotlinx.android.synthetic.main.dialog_file_name.et_file_name
 
-@Dialog(R.layout.dialog_file_name)
-class FileNameDialog : BaseProgressErrorDialog<FileNameDialog.Callback>() {
+@Dialog
+class FileNameDialog : BaseProgressErrorDialog<FileNameDialog.Callback, DialogFileNameBinding>(DialogFileNameBinding::inflate) {
 
 	private var createFileButton: Button? = null
 
@@ -28,20 +31,20 @@ class FileNameDialog : BaseProgressErrorDialog<FileNameDialog.Callback>() {
 			createFileButton = dialog.getButton(android.app.Dialog.BUTTON_POSITIVE)
 			createFileButton?.setOnClickListener {
 				callback?.onCreateNewTextFileClicked(effectiveTextFileName())
-				onWaitForResponse(et_file_name)
+				onWaitForResponse(binding.etFileName)
 			}
 			dialog.setCanceledOnTouchOutside(false)
-			et_file_name.requestFocus()
+			binding.etFileName.requestFocus()
 			createFileButton?.let { button ->
-				et_file_name.nextFocusForwardId = button.id
+				binding.etFileName.nextFocusForwardId = button.id
 			}
 		}
 	}
 
 	private fun effectiveTextFileName(): String {
-		return if (et_file_name.text.toString().isEmpty()) //
+		return if (binding.etFileName.text.toString().isEmpty()) //
 			requireContext().getString(R.string.dialog_file_name_placeholder) else  //
-			effectiveNewFileName(et_file_name.text.toString())
+			effectiveNewFileName(binding.etFileName.text.toString())
 	}
 
 	override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
@@ -60,8 +63,8 @@ class FileNameDialog : BaseProgressErrorDialog<FileNameDialog.Callback>() {
 	}
 
 	override fun setupView() {
-		createFileButton?.let { registerOnEditorDoneActionAndPerformButtonClick(et_file_name) { it } }
-		et_file_name.addTextChangedListener(object : TextWatcher {
+		createFileButton?.let { registerOnEditorDoneActionAndPerformButtonClick(binding.etFileName) { it } }
+		binding.etFileName.addTextChangedListener(object : TextWatcher {
 			override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
 			override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 			override fun afterTextChanged(s: Editable) {
@@ -74,7 +77,19 @@ class FileNameDialog : BaseProgressErrorDialog<FileNameDialog.Callback>() {
 		dialog?.let { showKeyboard(it) }
 	}
 
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
+	}
+
 	override fun enableViewAfterError(): View {
-		return et_file_name
+		return binding.etFileName
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileTypeNotSupportedDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileTypeNotSupportedDialog.kt
index 4adc00a5f..0b7da4247 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileTypeNotSupportedDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileTypeNotSupportedDialog.kt
@@ -5,10 +5,11 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogFileTypeNotSupportedBinding
 import org.cryptomator.presentation.model.CloudFileModel
 
-@Dialog(R.layout.dialog_file_type_not_supported)
-class FileTypeNotSupportedDialog : BaseDialog<FileTypeNotSupportedDialog.Callback>() {
+@Dialog
+class FileTypeNotSupportedDialog : BaseDialog<FileTypeNotSupportedDialog.Callback, DialogFileTypeNotSupportedBinding>(DialogFileTypeNotSupportedBinding::inflate) {
 
 	interface Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/GenericProgressDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/GenericProgressDialog.kt
index 6bf0ec6ba..d9da4ba61 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/GenericProgressDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/GenericProgressDialog.kt
@@ -5,15 +5,15 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.ActivityEmptyBinding
+import org.cryptomator.presentation.databinding.DialogGenericProgressBinding
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
 import org.cryptomator.presentation.ui.activity.BaseActivity
 import org.cryptomator.presentation.ui.activity.ProgressAware
-import kotlinx.android.synthetic.main.view_dialog_progress.ll_progress
-import kotlinx.android.synthetic.main.view_dialog_progress.tv_progress
 
-@Dialog(R.layout.dialog_generic_progress)
-class GenericProgressDialog : BaseDialog<BaseActivity>(), ProgressAware {
+@Dialog
+class GenericProgressDialog : BaseDialog<BaseActivity<ActivityEmptyBinding>, DialogGenericProgressBinding>(DialogGenericProgressBinding::inflate), ProgressAware {
 
 	override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
 		return builder.create()
@@ -21,13 +21,13 @@ class GenericProgressDialog : BaseDialog<BaseActivity>(), ProgressAware {
 
 	override fun setupView() {
 		isCancelable = false
-		ll_progress.visibility = View.VISIBLE
+		binding.llDialogProgress.llProgress.visibility = View.VISIBLE
 		enableOrientationChange(false)
 		showProgress((requireArguments().getSerializable(INITIAL_PROGRESS) as ProgressModel))
 	}
 
 	override fun showProgress(progress: ProgressModel) {
-		tv_progress.setText(textFor(progress))
+		binding.llDialogProgress.tvProgress.setText(textFor(progress))
 		if (progress.state() === ProgressStateModel.COMPLETED) {
 			enableOrientationChange(true)
 			callback?.closeDialog()
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/LicenseConfirmationDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/LicenseConfirmationDialog.kt
index 031c59eba..3de14a10a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/LicenseConfirmationDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/LicenseConfirmationDialog.kt
@@ -5,10 +5,10 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_license_confirmation.tv_message
+import org.cryptomator.presentation.databinding.DialogLicenseConfirmationBinding
 
-@Dialog(R.layout.dialog_license_confirmation)
-class LicenseConfirmationDialog : BaseDialog<LicenseConfirmationDialog.Callback>() {
+@Dialog
+class LicenseConfirmationDialog : BaseDialog<LicenseConfirmationDialog.Callback, DialogLicenseConfirmationBinding>(DialogLicenseConfirmationBinding::inflate) {
 
 	interface Callback {
 
@@ -24,7 +24,7 @@ class LicenseConfirmationDialog : BaseDialog<LicenseConfirmationDialog.Callback>
 
 	public override fun setupView() {
 		val mail = requireArguments().getSerializable(ARG_MAIL) as String
-		tv_message.text = String.format(getString(R.string.dialog_license_confirmation_message), mail)
+		binding.tvMessage.text = String.format(getString(R.string.dialog_license_confirmation_message), mail)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/MicrosoftWorkaroundDisclaimerDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/MicrosoftWorkaroundDisclaimerDialog.kt
index bcdfba6e6..4b9c73c63 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/MicrosoftWorkaroundDisclaimerDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/MicrosoftWorkaroundDisclaimerDialog.kt
@@ -5,9 +5,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogMicrosoftWorkaroundDisclaimerBinding
 
-@Dialog(R.layout.dialog_microsoft_workaround_disclaimer)
-class MicrosoftWorkaroundDisclaimerDialog : BaseDialog<MicrosoftWorkaroundDisclaimerDialog.Callback>() {
+@Dialog
+class MicrosoftWorkaroundDisclaimerDialog : BaseDialog<MicrosoftWorkaroundDisclaimerDialog.Callback, DialogMicrosoftWorkaroundDisclaimerBinding>(DialogMicrosoftWorkaroundDisclaimerBinding::inflate) {
 
 	interface Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NoDirFileOrEmptyDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NoDirFileOrEmptyDialog.kt
index dd9d36e4e..033c3bd9b 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NoDirFileOrEmptyDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NoDirFileOrEmptyDialog.kt
@@ -6,10 +6,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_no_dir_file_or_empty.tv_no_dir_file_or_empty_info
+import org.cryptomator.presentation.databinding.DialogNoDirFileOrEmptyBinding
 
-@Dialog(R.layout.dialog_no_dir_file_or_empty)
-class NoDirFileOrEmptyDialog : BaseDialog<NoDirFileOrEmptyDialog.CallBack>() {
+@Dialog
+class NoDirFileOrEmptyDialog : BaseDialog<NoDirFileOrEmptyDialog.CallBack, DialogNoDirFileOrEmptyBinding>(DialogNoDirFileOrEmptyBinding::inflate) {
 
 	interface CallBack {
 
@@ -33,7 +33,7 @@ class NoDirFileOrEmptyDialog : BaseDialog<NoDirFileOrEmptyDialog.CallBack>() {
 	public override fun setupView() {
 		val cryptoFolderName = requireArguments().getSerializable(ARG_CRYPTO_FOLDER_NAME) as String
 		val cloudFolderPath = requireArguments().getSerializable(ARG_CLOUD_FOLDER_PATH) as String
-		tv_no_dir_file_or_empty_info.text = String.format(getString(R.string.dialog_no_dir_file_message), cryptoFolderName, cloudFolderPath)
+		binding.tvNoDirFileOrEmptyInfo.text = String.format(getString(R.string.dialog_no_dir_file_message), cryptoFolderName, cloudFolderPath)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NotEnoughVaultsDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NotEnoughVaultsDialog.kt
index c95e606bd..7655f9ffb 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NotEnoughVaultsDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NotEnoughVaultsDialog.kt
@@ -4,12 +4,11 @@ import android.content.Context
 import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.presentation.R
-import org.cryptomator.presentation.util.ResourceHelper
 
 class NotEnoughVaultsDialog private constructor(private val context: Context) {
 
 	private val callback: Callback
-	private var title: String
+	private var titleResourceId: Int
 
 	interface Callback {
 
@@ -17,18 +16,18 @@ class NotEnoughVaultsDialog private constructor(private val context: Context) {
 		fun onNotEnoughVaultsCreateVaultClicked()
 	}
 
-	fun andTitle(title: String): NotEnoughVaultsDialog {
-		this.title = title
+	fun andTitle(titleResourceId: Int): NotEnoughVaultsDialog {
+		this.titleResourceId = titleResourceId
 		return this
 	}
 
 	fun show() {
 		AlertDialog.Builder(context) //
 			.setCancelable(false) //
-			.setTitle(title) //
-			.setMessage(ResourceHelper.getString(R.string.dialog_unable_to_share_message)) //
-			.setPositiveButton(ResourceHelper.getString(R.string.dialog_unable_to_share_positive_button)) { _: DialogInterface, _: Int -> callback.onNotEnoughVaultsOkClicked() } //
-			.setNegativeButton(ResourceHelper.getString(R.string.dialog_unable_to_share_negative_button)) { _: DialogInterface, _: Int -> callback.onNotEnoughVaultsCreateVaultClicked() } //
+			.setTitle(titleResourceId) //
+			.setMessage(R.string.dialog_unable_to_share_message) //
+			.setPositiveButton(R.string.dialog_unable_to_share_positive_button) { _: DialogInterface, _: Int -> callback.onNotEnoughVaultsOkClicked() } //
+			.setNegativeButton(R.string.dialog_unable_to_share_negative_button) { _: DialogInterface, _: Int -> callback.onNotEnoughVaultsCreateVaultClicked() } //
 			.create() //
 			.show()
 	}
@@ -42,6 +41,6 @@ class NotEnoughVaultsDialog private constructor(private val context: Context) {
 
 	init {
 		callback = context as Callback
-		title = ResourceHelper.getString(R.string.dialog_unable_to_share_title)
+		titleResourceId = R.string.dialog_unable_to_share_title
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/PCloudCredentialsUpdatedDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/PCloudCredentialsUpdatedDialog.kt
index 3b538bab1..1832626d7 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/PCloudCredentialsUpdatedDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/PCloudCredentialsUpdatedDialog.kt
@@ -8,12 +8,11 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogPcloudCredentialsUpdatedBinding
 import org.cryptomator.presentation.util.ResourceHelper
-import kotlinx.android.synthetic.main.dialog_pcloud_credentials_updated.tv_pcloud_credentials_updated
 
-
-@Dialog(R.layout.dialog_pcloud_credentials_updated)
-class PCloudCredentialsUpdatedDialog : BaseDialog<PCloudCredentialsUpdatedDialog.Callback>() {
+@Dialog
+class PCloudCredentialsUpdatedDialog : BaseDialog<PCloudCredentialsUpdatedDialog.Callback, DialogPcloudCredentialsUpdatedBinding>(DialogPcloudCredentialsUpdatedBinding::inflate) {
 
 	interface Callback {
 
@@ -29,7 +28,7 @@ class PCloudCredentialsUpdatedDialog : BaseDialog<PCloudCredentialsUpdatedDialog
 		super.onStart()
 		val dialog = dialog as AlertDialog?
 		dialog?.let {
-			tv_pcloud_credentials_updated.setOnClickListener {
+			binding.tvPcloudCredentialsUpdated.setOnClickListener {
 				someActivityResultLauncher.launch(Intent(Intent.ACTION_VIEW, Uri.parse("https://www.pcloud.com")))
 			}
 		}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/SymLinkDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/SymLinkDialog.kt
index 9cfdf35c4..866783c6e 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/SymLinkDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/SymLinkDialog.kt
@@ -6,10 +6,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_sym_link.tv_sym_link_info
+import org.cryptomator.presentation.databinding.DialogSymLinkBinding
 
-@Dialog(R.layout.dialog_sym_link)
-class SymLinkDialog : BaseDialog<SymLinkDialog.CallBack?>() {
+@Dialog
+class SymLinkDialog : BaseDialog<SymLinkDialog.CallBack?, DialogSymLinkBinding>(DialogSymLinkBinding::inflate) {
 
 	interface CallBack {
 
@@ -27,7 +27,7 @@ class SymLinkDialog : BaseDialog<SymLinkDialog.CallBack?>() {
 	}
 
 	public override fun setupView() {
-		tv_sym_link_info.movementMethod = LinkMovementMethod.getInstance()
+		binding.tvSymLinkInfo.movementMethod = LinkMovementMethod.getInstance()
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppAvailableDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppAvailableDialog.kt
index 074113f53..22ce5af06 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppAvailableDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppAvailableDialog.kt
@@ -4,13 +4,16 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.text.Html
 import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_app_update.tv_message
+import org.cryptomator.presentation.databinding.DialogAppUpdateBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 
-@Dialog(R.layout.dialog_app_update)
-class UpdateAppAvailableDialog : BaseProgressErrorDialog<UpdateAppAvailableDialog.Callback>() {
+@Dialog
+class UpdateAppAvailableDialog : BaseProgressErrorDialog<UpdateAppAvailableDialog.Callback, DialogAppUpdateBinding>(DialogAppUpdateBinding::inflate) {
 
 	interface Callback {
 
@@ -31,11 +34,23 @@ class UpdateAppAvailableDialog : BaseProgressErrorDialog<UpdateAppAvailableDialo
 
 	public override fun setupView() {
 		val message = requireArguments().getSerializable(MESSAGE_ARG) as String
-		tv_message.text = Html.fromHtml(message, Html.FROM_HTML_MODE_COMPACT)
+		binding.tvMessage.text = Html.fromHtml(message, Html.FROM_HTML_MODE_COMPACT)
+	}
+
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
 	}
 
 	override fun enableViewAfterError(): View {
-		return tv_message
+		return binding.tvMessage
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppDialog.kt
index ce637aa9f..7fbd6651f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateAppDialog.kt
@@ -1,13 +1,16 @@
 package org.cryptomator.presentation.ui.dialog
 
 import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_app_update.tv_message
+import org.cryptomator.presentation.databinding.DialogAppUpdateBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 
-@Dialog(R.layout.dialog_app_update)
-class UpdateAppDialog : BaseProgressErrorDialog<UpdateAppDialog.Callback>() {
+@Dialog
+class UpdateAppDialog : BaseProgressErrorDialog<UpdateAppDialog.Callback, DialogAppUpdateBinding>(DialogAppUpdateBinding::inflate) {
 
 	interface Callback {
 
@@ -27,12 +30,24 @@ class UpdateAppDialog : BaseProgressErrorDialog<UpdateAppDialog.Callback>() {
 	}
 
 	public override fun setupView() {
-		tv_message.setText(R.string.dialog_download_update_message)
-		tv_message.requestFocus()
+		binding.tvMessage.setText(R.string.dialog_download_update_message)
+		binding.tvMessage.requestFocus()
+	}
+
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
 	}
 
 	override fun enableViewAfterError(): View {
-		return tv_message
+		return binding.tvMessage
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateLicenseDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateLicenseDialog.kt
index dcc76bbe4..167b9ed0c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateLicenseDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateLicenseDialog.kt
@@ -6,17 +6,18 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogEnterLicenseBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.ui.layout.ObscuredAwareDialogCoordinatorLayout
 import org.cryptomator.util.SharedPreferencesHandler
-import kotlinx.android.synthetic.main.dialog_enter_license.dssialogRootView
-import kotlinx.android.synthetic.main.dialog_enter_license.et_license
-import kotlinx.android.synthetic.main.dialog_enter_license.tv_message
 
-@Dialog(R.layout.dialog_enter_license)
-class UpdateLicenseDialog : BaseProgressErrorDialog<UpdateLicenseDialog.Callback>() {
+@Dialog
+class UpdateLicenseDialog : BaseProgressErrorDialog<UpdateLicenseDialog.Callback, DialogEnterLicenseBinding>(DialogEnterLicenseBinding::inflate) {
 
 	// positive button
 	private var checkLicenseButton: Button? = null
@@ -35,13 +36,13 @@ class UpdateLicenseDialog : BaseProgressErrorDialog<UpdateLicenseDialog.Callback
 		dialog?.let {
 			checkLicenseButton = dialog.getButton(android.app.Dialog.BUTTON_POSITIVE)
 			checkLicenseButton?.setOnClickListener {
-				callback?.checkLicenseClicked(et_license.text.toString())
-				onWaitForResponse(et_license)
+				callback?.checkLicenseClicked(binding.etLicense.text.toString())
+				onWaitForResponse(binding.etLicense)
 			}
 			checkLicenseButton?.let { button ->
-				et_license.nextFocusForwardId = button.id
+				binding.etLicense.nextFocusForwardId = button.id
 			}
-			tv_message?.setOnClickListener {
+			binding.tvMessage.setOnClickListener {
 				Intent(Intent.ACTION_VIEW).let {
 					it.data = Uri.parse("https://cryptomator.org/android/")
 					startActivity(it)
@@ -52,14 +53,14 @@ class UpdateLicenseDialog : BaseProgressErrorDialog<UpdateLicenseDialog.Callback
 		/* need to manually handle this in case of dialogs as otherwise the onFilterTouchEventForSecurity method of the ViewGroup
 		isn't called when filterTouchesWhenObscured is set to true in the BaseDialog and in contrast to if set in an Activity */
 		dialog?.window?.decorView?.filterTouchesWhenObscured = false
-		dssialogRootView.setOnFilteredTouchEventForSecurityListener(object : ObscuredAwareDialogCoordinatorLayout.Listener {
+		binding.dssialogRootView.setOnFilteredTouchEventForSecurityListener(object : ObscuredAwareDialogCoordinatorLayout.Listener {
 			override fun onFilteredTouchEventForSecurity() {
 				callback?.appObscuredClosingEnterLicenseDialog()
 			}
 		}, SharedPreferencesHandler(requireContext()).disableAppWhenObscured())
 	}
 
-	public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
+	override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
 		return builder //
 			.setTitle(getString(R.string.dialog_enter_license_title)) //
 			.setPositiveButton(getText(R.string.dialog_enter_license_ok_button)) { _: DialogInterface, _: Int -> } //
@@ -69,13 +70,26 @@ class UpdateLicenseDialog : BaseProgressErrorDialog<UpdateLicenseDialog.Callback
 
 	public override fun setupView() {
 		val license = requireArguments().getSerializable(LICENSE_ARG) as String?
-		license?.let { et_license.setText(it) }
-		et_license.requestFocus()
-		checkLicenseButton?.let { registerOnEditorDoneActionAndPerformButtonClick(et_license) { it } }
+		license?.let { binding.etLicense.setText(it) }
+		binding.etLicense.requestFocus()
+		checkLicenseButton?.let { registerOnEditorDoneActionAndPerformButtonClick(binding.etLicense) { it } }
+	}
+
+
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
 	}
 
 	override fun enableViewAfterError(): View {
-		return et_license
+		return binding.etLicense
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UploadCloudFileDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UploadCloudFileDialog.kt
index 578a9e1f1..7f6bbe7ac 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UploadCloudFileDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UploadCloudFileDialog.kt
@@ -2,19 +2,20 @@ package org.cryptomator.presentation.ui.dialog
 
 import android.content.DialogInterface
 import android.os.Bundle
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogUploadLoadingBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.FileProgressStateModel
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
 import org.cryptomator.presentation.util.ResourceHelper
-import kotlinx.android.synthetic.main.dialog_upload_loading.file_upload
-import kotlinx.android.synthetic.main.view_dialog_intermediate_progress.iv_progress_icon
-import kotlinx.android.synthetic.main.view_dialog_intermediate_progress.pb_dialog
 
-@Dialog(R.layout.dialog_upload_loading)
-class UploadCloudFileDialog : BaseProgressErrorDialog<UploadCloudFileDialog.Callback>() {
+@Dialog
+class UploadCloudFileDialog : BaseProgressErrorDialog<UploadCloudFileDialog.Callback, DialogUploadLoadingBinding>(DialogUploadLoadingBinding::inflate) {
 
 	private var numberOfFileCurrentlyUploaded = 0
 	private var encryptionProgressMeansTheNextFileIsUploaded = true
@@ -59,7 +60,7 @@ class UploadCloudFileDialog : BaseProgressErrorDialog<UploadCloudFileDialog.Call
 		} else {
 			updateRemainingFilesText(progress)
 			if (progress.state().imageResourceId() != 0) {
-				iv_progress_icon?.setImageDrawable(ResourceHelper.getDrawable(progress.state().imageResourceId()))
+				binding.llDialogIntermediateProgress.ivProgressIcon.setImageDrawable(ResourceHelper.getDrawable(progress.state().imageResourceId()))
 			}
 		}
 	}
@@ -75,7 +76,7 @@ class UploadCloudFileDialog : BaseProgressErrorDialog<UploadCloudFileDialog.Call
 			if (encryptionProgressMeansTheNextFileIsUploaded) {
 				encryptionProgressMeansTheNextFileIsUploaded = false
 				numberOfFileCurrentlyUploaded++
-				file_upload?.text = String.format(getString(R.string.dialog_upload_file_remaining), numberOfFileCurrentlyUploaded, numberOfUploadedFiles())
+				binding.fileUpload.text = String.format(getString(R.string.dialog_upload_file_remaining), numberOfFileCurrentlyUploaded, numberOfUploadedFiles())
 			}
 		} else {
 			encryptionProgressMeansTheNextFileIsUploaded = true
@@ -87,7 +88,19 @@ class UploadCloudFileDialog : BaseProgressErrorDialog<UploadCloudFileDialog.Call
 	}
 
 	override fun updateProgress(progress: Int) {
-		pb_dialog.progress = progress
+		binding.llDialogIntermediateProgress.pbDialog.progress = progress
+	}
+
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogIntermediateProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogIntermediateProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultDeleteConfirmationDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultDeleteConfirmationDialog.kt
index d2b8acce8..a77757574 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultDeleteConfirmationDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultDeleteConfirmationDialog.kt
@@ -6,10 +6,11 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogVaultDeleteConfirmationBinding
 import org.cryptomator.presentation.model.VaultModel
 
-@Dialog(R.layout.dialog_vault_delete_confirmation)
-class VaultDeleteConfirmationDialog : BaseDialog<VaultDeleteConfirmationDialog.Callback>() {
+@Dialog
+class VaultDeleteConfirmationDialog : BaseDialog<VaultDeleteConfirmationDialog.Callback, DialogVaultDeleteConfirmationBinding>(DialogVaultDeleteConfirmationBinding::inflate) {
 
 	interface Callback {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultIsRootFolderOfCloudDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultIsRootFolderOfCloudDialog.kt
index 19b836928..808b0d0da 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultIsRootFolderOfCloudDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultIsRootFolderOfCloudDialog.kt
@@ -6,9 +6,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogVaultIsRootFolderOfCloudBinding
 
-@Dialog(R.layout.dialog_vault_is_root_folder_of_cloud)
-class VaultIsRootFolderOfCloudDialog : BaseDialog<Activity>() {
+@Dialog
+class VaultIsRootFolderOfCloudDialog : BaseDialog<Activity, DialogVaultIsRootFolderOfCloudBinding>(DialogVaultIsRootFolderOfCloudBinding::inflate) {
 
 	public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
 		return builder //
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultRenameDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultRenameDialog.kt
index d60a25305..a92076e4e 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultRenameDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultRenameDialog.kt
@@ -6,16 +6,19 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogRenameBinding
+import org.cryptomator.presentation.databinding.ViewDialogErrorBinding
 import org.cryptomator.presentation.model.ProgressModel
 import org.cryptomator.presentation.model.ProgressStateModel
 import org.cryptomator.presentation.model.VaultModel
-import kotlinx.android.synthetic.main.dialog_rename.et_rename
 
-@Dialog(R.layout.dialog_rename)
-class VaultRenameDialog : BaseProgressErrorDialog<VaultRenameDialog.Callback>() {
+@Dialog
+class VaultRenameDialog : BaseProgressErrorDialog<VaultRenameDialog.Callback, DialogRenameBinding>(DialogRenameBinding::inflate) {
 
 	private var renameConfirmButton: Button? = null
 
@@ -32,13 +35,13 @@ class VaultRenameDialog : BaseProgressErrorDialog<VaultRenameDialog.Callback>()
 			renameConfirmButton?.isEnabled = false
 			renameConfirmButton?.setOnClickListener {
 				showProgress(ProgressModel(ProgressStateModel.RENAMING))
-				callback?.onRenameClick(requireArguments().getSerializable(VAULT_ARG) as VaultModel, et_rename.text.toString())
-				onWaitForResponse(et_rename)
+				callback?.onRenameClick(requireArguments().getSerializable(VAULT_ARG) as VaultModel, binding.etRename.text.toString())
+				onWaitForResponse(binding.etRename)
 			}
 			dialog.setCanceledOnTouchOutside(false)
-			et_rename.requestFocus()
+			binding.etRename.requestFocus()
 			renameConfirmButton?.let { button ->
-				et_rename.nextFocusForwardId = button.id
+				binding.etRename.nextFocusForwardId = button.id
 			}
 		}
 	}
@@ -53,9 +56,9 @@ class VaultRenameDialog : BaseProgressErrorDialog<VaultRenameDialog.Callback>()
 
 	public override fun setupView() {
 		val vaultModel = requireArguments().getSerializable(VAULT_ARG) as VaultModel
-		renameConfirmButton?.let { registerOnEditorDoneActionAndPerformButtonClick(et_rename) { it } }
-		et_rename.setText(vaultModel.name)
-		et_rename.addTextChangedListener(object : TextWatcher {
+		renameConfirmButton?.let { registerOnEditorDoneActionAndPerformButtonClick(binding.etRename) { it } }
+		binding.etRename.setText(vaultModel.name)
+		binding.etRename.addTextChangedListener(object : TextWatcher {
 			override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
 			override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 			override fun afterTextChanged(s: Editable) {
@@ -68,8 +71,20 @@ class VaultRenameDialog : BaseProgressErrorDialog<VaultRenameDialog.Callback>()
 		dialog?.let { showKeyboard(it) }
 	}
 
+	override fun dialogProgressLayout(): LinearLayout {
+		return binding.llDialogProgress.llProgress
+	}
+
+	override fun dialogProgressTextView(): TextView {
+		return binding.llDialogProgress.tvProgress
+	}
+
+	override fun dialogErrorBinding(): ViewDialogErrorBinding {
+		return binding.llDialogError
+	}
+
 	override fun enableViewAfterError(): View {
-		return et_rename
+		return binding.etRename
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultsRemovedDuringMigrationDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultsRemovedDuringMigrationDialog.kt
index 0d8de1892..deab570d0 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultsRemovedDuringMigrationDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultsRemovedDuringMigrationDialog.kt
@@ -7,14 +7,13 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
-import kotlinx.android.synthetic.main.dialog_vaults_removed_during_migration.tv_message
+import org.cryptomator.presentation.databinding.DialogVaultsRemovedDuringMigrationBinding
 
-@Dialog(R.layout.dialog_vaults_removed_during_migration)
-class VaultsRemovedDuringMigrationDialog : BaseDialog<Activity>() {
+@Dialog
+class VaultsRemovedDuringMigrationDialog : BaseDialog<Activity, DialogVaultsRemovedDuringMigrationBinding>(DialogVaultsRemovedDuringMigrationBinding::inflate) {
 
 	public override fun setupDialog(builder: AlertDialog.Builder): android.app.Dialog {
 		val vaultsRemovedDuringMigration = requireArguments().getSerializable(VAULTS_REMOVED_ARG) as Pair<String, ArrayList<String>>
-
 		return builder //
 			.setTitle(String.format(getString(R.string.dialog_vaults_removed_during_migration_title), vaultsRemovedDuringMigration.first)) //
 			.setNeutralButton(R.string.dialog_vaults_removed_during_migration_neutral_button) { dialog: DialogInterface, _: Int -> dialog.dismiss() }
@@ -29,7 +28,7 @@ class VaultsRemovedDuringMigrationDialog : BaseDialog<Activity>() {
 			.map { path -> "* $path" }
 			.reduce { acc, s -> "$acc\n$s" }
 
-		tv_message.text = String.format(getString(R.string.dialog_vaults_removed_during_migration_hint), vaultsRemovedDuringMigrationString)
+		binding.tvMessage.text = String.format(getString(R.string.dialog_vaults_removed_during_migration_hint), vaultsRemovedDuringMigrationString)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/WebDavAskForHttpDialog.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/WebDavAskForHttpDialog.kt
index 20fbc9b00..823a3bf9f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/WebDavAskForHttpDialog.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/dialog/WebDavAskForHttpDialog.kt
@@ -6,11 +6,11 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import org.cryptomator.generator.Dialog
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.DialogAskForHttpBinding
 import java.net.URI
-import kotlinx.android.synthetic.main.dialog_ask_for_http.cb_select_http
 
-@Dialog(R.layout.dialog_ask_for_http)
-class WebDavAskForHttpDialog : BaseDialog<WebDavAskForHttpDialog.Callback>() {
+@Dialog
+class WebDavAskForHttpDialog : BaseDialog<WebDavAskForHttpDialog.Callback, DialogAskForHttpBinding>(DialogAskForHttpBinding::inflate) {
 
 	private lateinit var uri: URI
 	private lateinit var username: String
@@ -34,7 +34,7 @@ class WebDavAskForHttpDialog : BaseDialog<WebDavAskForHttpDialog.Callback>() {
 			.setTitle(R.string.dialog_http_security_title) //
 			.setNeutralButton(
 				getString(R.string.dialog_unable_to_share_positive_button)
-			) { _: DialogInterface, _: Int -> callback?.onAksForHttpFinished(username, password, uriWithDesiredProtocol(cb_select_http.isChecked), cloudId, certificate) }
+			) { _: DialogInterface, _: Int -> callback?.onAksForHttpFinished(username, password, uriWithDesiredProtocol(binding.cbSelectHttp.isChecked), cloudId, certificate) }
 		return builder.create()
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt
index bc96cec8b..d8ac7d266 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/AutoUploadChooseVaultFragment.kt
@@ -2,18 +2,16 @@ package org.cryptomator.presentation.ui.fragment
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentAutoUploadChooseVaultBinding
 import org.cryptomator.presentation.model.CloudFolderModel
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.presenter.AutoUploadChooseVaultPresenter
 import org.cryptomator.presentation.ui.adapter.SharedLocationsAdapter
 import org.cryptomator.util.SharedPreferencesHandler
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_auto_upload_choose_vault.locationsRecyclerView
-import kotlinx.android.synthetic.main.view_receive_save_button.saveFiles
 
-@Fragment(R.layout.fragment_auto_upload_choose_vault)
-class AutoUploadChooseVaultFragment : BaseFragment() {
+@Fragment
+class AutoUploadChooseVaultFragment : BaseFragment<FragmentAutoUploadChooseVaultBinding>(FragmentAutoUploadChooseVaultBinding::inflate) {
 
 	@Inject
 	lateinit var presenter: AutoUploadChooseVaultPresenter
@@ -25,7 +23,7 @@ class AutoUploadChooseVaultFragment : BaseFragment() {
 	lateinit var sharedPreferencesHandler: SharedPreferencesHandler
 
 	override fun setupView() {
-		saveFiles.setOnClickListener { presenter.onChooseVaultPressed() }
+		binding.toolbarBottom.saveFiles.setOnClickListener { presenter.onChooseVaultPressed() }
 
 		setupRecyclerView()
 	}
@@ -67,9 +65,9 @@ class AutoUploadChooseVaultFragment : BaseFragment() {
 
 	private fun setupRecyclerView() {
 		locationsAdapter.setCallback(locationsAdapterCallback)
-		locationsRecyclerView.setHasFixedSize(true)
-		locationsRecyclerView.layoutManager = LinearLayoutManager(context())
-		locationsRecyclerView.adapter = locationsAdapter
+		binding.locationsRecyclerView.setHasFixedSize(true)
+		binding.locationsRecyclerView.layoutManager = LinearLayoutManager(context())
+		binding.locationsRecyclerView.adapter = locationsAdapter
 	}
 
 	fun showChosenLocation(folder: CloudFolderModel) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BaseFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BaseFragment.kt
index 131362b14..dfc85d20c 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BaseFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BaseFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
 import org.cryptomator.presentation.di.HasComponent
 import org.cryptomator.presentation.di.component.ActivityComponent
 import org.cryptomator.presentation.exception.ExceptionHandlers
@@ -14,11 +15,13 @@ import org.cryptomator.presentation.util.KeyboardHelper
 import javax.inject.Inject
 import timber.log.Timber
 
-abstract class BaseFragment : Fragment() {
+abstract class BaseFragment<VB : ViewBinding>(val bindingFactory: (LayoutInflater) -> VB) : Fragment() {
 
 	@Inject
 	lateinit var exceptionMappings: ExceptionHandlers
 
+	protected val binding: VB by lazy { bindingFactory(layoutInflater) }
+
 	private var created: Boolean = false
 	private var onViewCreatedCalled: Boolean = false
 
@@ -31,7 +34,7 @@ abstract class BaseFragment : Fragment() {
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		logLifecycle("onCreateView")
-		return inflater.inflate(fragmentLayout(), container, false)
+		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -90,9 +93,6 @@ abstract class BaseFragment : Fragment() {
 		logLifecycle("onPause")
 	}
 
-	private fun fragmentLayout(): Int =
-		javaClass.getAnnotation(org.cryptomator.generator.Fragment::class.java)!!.value
-
 	override fun onDestroyView() {
 		super.onDestroyView()
 		logLifecycle("onDestroyView")
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BiometricAuthSettingsFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BiometricAuthSettingsFragment.kt
index cefcefa9a..ed171a69e 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BiometricAuthSettingsFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BiometricAuthSettingsFragment.kt
@@ -3,19 +3,16 @@ package org.cryptomator.presentation.ui.fragment
 import android.util.TypedValue
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentSettingsBiometricAuthBinding
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.presenter.BiometricAuthSettingsPresenter
 import org.cryptomator.presentation.ui.adapter.BiometricAuthSettingsAdapter
 import org.cryptomator.presentation.ui.adapter.BiometricAuthSettingsAdapter.OnVaultBiometricAuthSettingsChanged
 import org.cryptomator.util.SharedPreferencesHandler
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_settings_biometric_auth.toggleBiometricAuth
-import kotlinx.android.synthetic.main.fragment_settings_biometric_auth.toggleFaceUnlockConfirmation
-import kotlinx.android.synthetic.main.recycler_view_layout.recyclerView
 
-@Fragment(R.layout.fragment_settings_biometric_auth)
-class BiometricAuthSettingsFragment : BaseFragment() {
+@Fragment
+class BiometricAuthSettingsFragment : BaseFragment<FragmentSettingsBiometricAuthBinding>(FragmentSettingsBiometricAuthBinding::inflate) {
 
 	@Inject
 	lateinit var adapter: BiometricAuthSettingsAdapter
@@ -34,32 +31,30 @@ class BiometricAuthSettingsFragment : BaseFragment() {
 
 	override fun setupView() {
 		setupRecyclerView()
+		binding.toggleBiometricAuth.isChecked = sharedPreferencesHandler.useBiometricAuthentication()
 
-		toggleBiometricAuth.isChecked = sharedPreferencesHandler.useBiometricAuthentication()
+		binding.toggleBiometricAuth.setOnCheckedChangeListener { _, isChecked -> biometricAuthSettingsPresenter.switchedGeneralBiometricAuthSettings(isChecked) }
 
-		toggleBiometricAuth.setOnCheckedChangeListener { _, isChecked -> biometricAuthSettingsPresenter.switchedGeneralBiometricAuthSettings(isChecked) }
-
-		if (toggleBiometricAuth.isChecked) {
+		if (binding.toggleBiometricAuth.isChecked) {
 			biometricAuthSettingsPresenter.loadVaultList()
 		}
-
-		toggleFaceUnlockConfirmation.isChecked = sharedPreferencesHandler.useConfirmationInFaceUnlockBiometricAuthentication()
-		toggleFaceUnlockConfirmation.setOnCheckedChangeListener { _, isChecked -> sharedPreferencesHandler.changeUseConfirmationInFaceUnlockBiometricAuthentication(isChecked) }
+		binding.toggleFaceUnlockConfirmation.isChecked = sharedPreferencesHandler.useConfirmationInFaceUnlockBiometricAuthentication()
+		binding.toggleFaceUnlockConfirmation.setOnCheckedChangeListener { _, isChecked -> sharedPreferencesHandler.changeUseConfirmationInFaceUnlockBiometricAuthentication(isChecked) }
 	}
 
 	private fun setupRecyclerView() {
 		adapter.setOnItemClickListener(onVaultVaultBiometricAuthSettingsChangedListener)
-		recyclerView.layoutManager = LinearLayoutManager(context())
-		recyclerView.adapter = adapter
-		recyclerView.setHasFixedSize(true) // smoother scrolling
-		recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
-		recyclerView.clipToPadding = false
+		binding.rvVaults.recyclerView.layoutManager = LinearLayoutManager(context())
+		binding.rvVaults.recyclerView.adapter = adapter
+		binding.rvVaults.recyclerView.setHasFixedSize(true) // smoother scrolling
+		binding.rvVaults.recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
+		binding.rvVaults.recyclerView.clipToPadding = false
 	}
 
 	fun showVaults(vaultModelCollection: List<VaultModel>?) {
 		adapter.clear()
 
-		if (toggleBiometricAuth.isEnabled) {
+		if (binding.toggleBiometricAuth.isEnabled) {
 			adapter.addAll(vaultModelCollection)
 		}
 	}
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BrowseFilesFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BrowseFilesFragment.kt
index 6a98cd7ed..decd01a0e 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BrowseFilesFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/BrowseFilesFragment.kt
@@ -14,6 +14,7 @@ import org.cryptomator.domain.CloudNode
 import org.cryptomator.generator.Fragment
 import org.cryptomator.presentation.R
 import org.cryptomator.presentation.R.dimen.global_padding
+import org.cryptomator.presentation.databinding.FragmentBrowseFilesBinding
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings.NavigationMode.BROWSE_FILES
 import org.cryptomator.presentation.intent.ChooseCloudNodeSettings.NavigationMode.SELECT_ITEMS
@@ -28,17 +29,9 @@ import org.cryptomator.presentation.ui.adapter.BrowseFilesAdapter
 import org.cryptomator.presentation.util.ResourceHelper.Companion.getPixelOffset
 import java.util.Optional
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.floating_action_button_layout.floatingActionButton
-import kotlinx.android.synthetic.main.fragment_browse_files.slidingCoordinatorLayout
-import kotlinx.android.synthetic.main.fragment_browse_files.swipeRefreshLayout
-import kotlinx.android.synthetic.main.recycler_view_layout.recyclerView
-import kotlinx.android.synthetic.main.view_browses_files_extra_text_and_button.chooseLocationButton
-import kotlinx.android.synthetic.main.view_browses_files_extra_text_and_button.extraText
-import kotlinx.android.synthetic.main.view_browses_files_extra_text_and_button.extraTextAndButtonLayout
-import kotlinx.android.synthetic.main.view_empty_folder.emptyFolderHint
-
-@Fragment(R.layout.fragment_browse_files)
-class BrowseFilesFragment : BaseFragment() {
+
+@Fragment
+class BrowseFilesFragment : BaseFragment<FragmentBrowseFilesBinding>(FragmentBrowseFilesBinding::inflate) {
 
 	@Inject
 	lateinit var cloudNodesAdapter: BrowseFilesAdapter
@@ -95,21 +88,21 @@ class BrowseFilesFragment : BaseFragment() {
 	override fun setupView() {
 		setupNavigationMode()
 
-		floatingActionButton.setOnClickListener { browseFilesPresenter.onAddContentClicked() }
-		chooseLocationButton.setOnClickListener { browseFilesPresenter.onFolderChosen(folder) }
+		binding.floatingActionButton.floatingActionButton.setOnClickListener { browseFilesPresenter.onAddContentClicked() }
+		binding.chooseLocationLayout.chooseLocationButton.setOnClickListener { browseFilesPresenter.onFolderChosen(folder) }
 
-		swipeRefreshLayout.setColorSchemeColors(ContextCompat.getColor(context(), R.color.colorPrimary))
-		swipeRefreshLayout.setOnRefreshListener(refreshListener)
+		binding.swipeRefreshLayout.setColorSchemeColors(ContextCompat.getColor(context(), R.color.colorPrimary))
+		binding.swipeRefreshLayout.setOnRefreshListener(refreshListener)
 
 		cloudNodesAdapter.setCallback(nodeClickListener)
 		cloudNodesAdapter.setChooseCloudNodeSettings(chooseCloudNodeSettings)
 		navigationMode?.let { cloudNodesAdapter.updateNavigationMode(it) }
 
-		recyclerView.layoutManager = LinearLayoutManager(context())
-		recyclerView.adapter = cloudNodesAdapter
-		recyclerView.setHasFixedSize(true)
-		recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
-		recyclerView.clipToPadding = false
+		binding.recyclerViewLayout.recyclerView.layoutManager = LinearLayoutManager(context())
+		binding.recyclerViewLayout.recyclerView.adapter = cloudNodesAdapter
+		binding.recyclerViewLayout.recyclerView.setHasFixedSize(true)
+		binding.recyclerViewLayout.recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
+		binding.recyclerViewLayout.recyclerView.clipToPadding = false
 
 		browseFilesPresenter.onFolderRedisplayed(folder)
 
@@ -133,7 +126,7 @@ class BrowseFilesFragment : BaseFragment() {
 
 	private fun setupViewForBrowseFilesMode() {
 		showFloatingActionButton()
-		swipeRefreshLayout.isEnabled = true
+		binding.swipeRefreshLayout.isEnabled = true
 	}
 
 	private fun setupViewForNodeSelectionMode() {
@@ -142,37 +135,37 @@ class BrowseFilesFragment : BaseFragment() {
 	}
 
 	private fun disableSwipeRefresh() {
-		swipeRefreshLayout.isRefreshing = false
-		swipeRefreshLayout.isEnabled = false
+		binding.swipeRefreshLayout.isRefreshing = false
+		binding.swipeRefreshLayout.isEnabled = false
 	}
 
 	private fun setupViewForFilesSelection() {
-		extraTextAndButtonLayout.visibility = VISIBLE
-		chooseLocationButton.visibility = GONE
-		extraText.text = chooseCloudNodeSettings?.extraText()
-		val layoutParams = extraText.layoutParams as RelativeLayout.LayoutParams
+		binding.chooseLocationLayout.extraTextAndButtonLayout.visibility = VISIBLE
+		binding.chooseLocationLayout.chooseLocationButton.visibility = GONE
+		binding.chooseLocationLayout.extraText.text = chooseCloudNodeSettings?.extraText()
+		val layoutParams = binding.chooseLocationLayout.extraText.layoutParams as RelativeLayout.LayoutParams
 		layoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL)
-		extraText?.layoutParams = layoutParams
+		binding.chooseLocationLayout.extraText.layoutParams = layoutParams
 		disableSwipeRefresh()
 	}
 
 	private fun setupViewForFolderSelection() {
-		extraTextAndButtonLayout?.visibility = VISIBLE
-		chooseLocationButton.visibility = VISIBLE
-		chooseLocationButton.text = chooseCloudNodeSettings?.buttonText()
-		extraText.text = chooseCloudNodeSettings?.extraText()
-		extraText.setPadding(getPixelOffset(global_padding), 0, 0, 0)
+		binding.chooseLocationLayout.extraTextAndButtonLayout.visibility = VISIBLE
+		binding.chooseLocationLayout.chooseLocationButton.visibility = VISIBLE
+		binding.chooseLocationLayout.chooseLocationButton.text = chooseCloudNodeSettings?.buttonText()
+		binding.chooseLocationLayout.extraText.text = chooseCloudNodeSettings?.extraText()
+		binding.chooseLocationLayout.extraText.setPadding(getPixelOffset(global_padding), 0, 0, 0)
 		disableSwipeRefresh()
 	}
 
 	@SuppressLint("RestrictedApi") // Due to bug https://stackoverflow.com/questions/50343634/android-p-visibilityawareimagebutton-setvisibility-can-only-be-called-from-the-s
 	private fun showFloatingActionButton() {
-		floatingActionButton.visibility = VISIBLE
+		binding.floatingActionButton.floatingActionButton.visibility = VISIBLE
 	}
 
 	@SuppressLint("RestrictedApi") // Due to bug https://stackoverflow.com/questions/50343634/android-p-visibilityawareimagebutton-setvisibility-can-only-be-called-from-the-s
 	private fun hideFloatingActionButton() {
-		floatingActionButton.visibility = GONE
+		binding.floatingActionButton.floatingActionButton.visibility = GONE
 	}
 
 	override fun loadContent() {
@@ -245,7 +238,7 @@ class BrowseFilesFragment : BaseFragment() {
 
 	private fun viewHolderFor(nodeModel: CloudNodeModel<*>?): Optional<BrowseFilesAdapter.VaultContentViewHolder> {
 		val positionOf = cloudNodesAdapter.positionOf(nodeModel)
-		return Optional.ofNullable(recyclerView.findViewHolderForAdapterPosition(positionOf) as? BrowseFilesAdapter.VaultContentViewHolder)
+		return Optional.ofNullable(binding.recyclerViewLayout.recyclerView.findViewHolderForAdapterPosition(positionOf) as? BrowseFilesAdapter.VaultContentViewHolder)
 	}
 
 	fun replaceRenamedCloudFile(cloudFile: CloudNodeModel<out CloudNode>) {
@@ -253,7 +246,7 @@ class BrowseFilesFragment : BaseFragment() {
 	}
 
 	fun showLoading(loading: Boolean?) {
-		loading?.let { swipeRefreshLayout.isRefreshing = it }
+		loading?.let { binding.swipeRefreshLayout.isRefreshing = it }
 	}
 
 	fun addOrUpdate(cloudNode: CloudNodeModel<*>) {
@@ -262,7 +255,7 @@ class BrowseFilesFragment : BaseFragment() {
 	}
 
 	private fun updateEmptyFolderHint() {
-		emptyFolderHint.visibility = if (cloudNodesAdapter.isEmpty) VISIBLE else GONE
+		binding.rlViewEmptyFolder.emptyFolderHint.visibility = if (cloudNodesAdapter.isEmpty) VISIBLE else GONE
 	}
 
 	private fun fileCanBeChosen(cloudFile: CloudFileModel): Boolean {
@@ -277,7 +270,7 @@ class BrowseFilesFragment : BaseFragment() {
 
 	fun renderedCloudNodes(): List<CloudNodeModel<*>> = cloudNodesAdapter.renderedCloudNodes()
 
-	fun rootView(): View = slidingCoordinatorLayout
+	fun rootView(): View = binding.slidingCoordinatorLayout
 
 	fun navigationModeChanged(navigationMode: ChooseCloudNodeSettings.NavigationMode) {
 		updateNavigationMode(navigationMode)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ChooseCloudServiceFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ChooseCloudServiceFragment.kt
index 31d5ec573..33f4d24ff 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ChooseCloudServiceFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ChooseCloudServiceFragment.kt
@@ -2,16 +2,15 @@ package org.cryptomator.presentation.ui.fragment
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentChooseCloudServiceBinding
 import org.cryptomator.presentation.model.CloudTypeModel
 import org.cryptomator.presentation.presenter.ChooseCloudServicePresenter
 import org.cryptomator.presentation.ui.adapter.CloudsAdapter
 import org.cryptomator.presentation.ui.adapter.CloudsAdapter.OnItemClickListener
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.recycler_view_layout.recyclerView
 
-@Fragment(R.layout.fragment_choose_cloud_service)
-class ChooseCloudServiceFragment : BaseFragment() {
+@Fragment
+class ChooseCloudServiceFragment : BaseFragment<FragmentChooseCloudServiceBinding>(FragmentChooseCloudServiceBinding::inflate) {
 
 	@Inject
 	lateinit var chooseCloudServicePresenter: ChooseCloudServicePresenter
@@ -37,9 +36,9 @@ class ChooseCloudServiceFragment : BaseFragment() {
 
 	private fun setupRecyclerView() {
 		cloudsAdapter.setCallback(onItemClickListener)
-		recyclerView.layoutManager = LinearLayoutManager(context())
-		recyclerView.adapter = cloudsAdapter
+		binding.rvChooseCloudService.recyclerView.layoutManager = LinearLayoutManager(context())
+		binding.rvChooseCloudService.recyclerView.adapter = cloudsAdapter
 		// smoother scrolling
-		recyclerView.setHasFixedSize(true)
+		binding.rvChooseCloudService.recyclerView.setHasFixedSize(true)
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt
index 57d8a0ede..6ae619b50 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudConnectionListFragment.kt
@@ -5,18 +5,15 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentBrowseCloudConnectionsBinding
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.model.CloudTypeModel
 import org.cryptomator.presentation.presenter.CloudConnectionListPresenter
 import org.cryptomator.presentation.ui.adapter.CloudConnectionListAdapter
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_browse_cloud_connections.floating_action_button
-import kotlinx.android.synthetic.main.recycler_view_layout.recyclerView
-import kotlinx.android.synthetic.main.view_empty_cloud_connections.rl_creation_hint
 
-@Fragment(R.layout.fragment_browse_cloud_connections)
-class CloudConnectionListFragment : BaseFragment() {
+@Fragment
+class CloudConnectionListFragment : BaseFragment<FragmentBrowseCloudConnectionsBinding>(FragmentBrowseCloudConnectionsBinding::inflate) {
 
 	@Inject
 	lateinit var cloudConnectionListPresenter: CloudConnectionListPresenter
@@ -38,7 +35,7 @@ class CloudConnectionListFragment : BaseFragment() {
 
 	override fun setupView() {
 		setupRecyclerView()
-		floating_action_button.setOnClickListener { cloudConnectionListPresenter.onAddConnectionClicked() }
+		binding.floatingActionButton.floatingActionButton.setOnClickListener { cloudConnectionListPresenter.onAddConnectionClicked() }
 	}
 
 	override fun loadContent() {
@@ -47,11 +44,11 @@ class CloudConnectionListFragment : BaseFragment() {
 
 	private fun setupRecyclerView() {
 		cloudConnectionListAdapter.setOnItemClickListener(onItemClickListener)
-		recyclerView.layoutManager = LinearLayoutManager(context())
-		recyclerView.adapter = cloudConnectionListAdapter
-		recyclerView.setHasFixedSize(true) // smoother scrolling
-		recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
-		recyclerView.clipToPadding = false
+		binding.rvCloudConnections.recyclerView.layoutManager = LinearLayoutManager(context())
+		binding.rvCloudConnections.recyclerView.adapter = cloudConnectionListAdapter
+		binding.rvCloudConnections.recyclerView.setHasFixedSize(true) // smoother scrolling
+		binding.rvCloudConnections.recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
+		binding.rvCloudConnections.recyclerView.clipToPadding = false
 	}
 
 	fun show(nodes: List<CloudModel>?) {
@@ -61,7 +58,7 @@ class CloudConnectionListFragment : BaseFragment() {
 	}
 
 	private fun updateConnectionListHint() {
-		rl_creation_hint.visibility = if (cloudConnectionListAdapter.isEmpty) VISIBLE else GONE
+		binding.rlCreationHint.creationHint.visibility = if (cloudConnectionListAdapter.isEmpty) VISIBLE else GONE
 	}
 
 	fun setSelectedCloudType(selectedCloudType: CloudTypeModel) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudSettingsFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudSettingsFragment.kt
index 46460eaa7..4c2b474dc 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudSettingsFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/CloudSettingsFragment.kt
@@ -2,16 +2,15 @@ package org.cryptomator.presentation.ui.fragment
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentCloudSettingsBinding
 import org.cryptomator.presentation.model.CloudModel
 import org.cryptomator.presentation.presenter.CloudSettingsPresenter
 import org.cryptomator.presentation.ui.adapter.CloudSettingsAdapter
 import org.cryptomator.presentation.ui.adapter.CloudSettingsAdapter.OnItemClickListener
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.recycler_view_layout.recyclerView
 
-@Fragment(R.layout.fragment_cloud_settings)
-class CloudSettingsFragment : BaseFragment() {
+@Fragment
+class CloudSettingsFragment : BaseFragment<FragmentCloudSettingsBinding>(FragmentCloudSettingsBinding::inflate) {
 
 	@Inject
 	lateinit var cloudSettingsPresenter: CloudSettingsPresenter
@@ -35,10 +34,10 @@ class CloudSettingsFragment : BaseFragment() {
 
 	private fun setupRecyclerView() {
 		cloudSettingsAdapter.setCallback(onItemClickListener)
-		recyclerView.layoutManager = LinearLayoutManager(context())
-		recyclerView.adapter = cloudSettingsAdapter
+		binding.rvCloudSettings.recyclerView.layoutManager = LinearLayoutManager(context())
+		binding.rvCloudSettings.recyclerView.adapter = cloudSettingsAdapter
 		// smoother scrolling
-		recyclerView.setHasFixedSize(true)
+		binding.rvCloudSettings.recyclerView.setHasFixedSize(true)
 	}
 
 	fun showClouds(cloudModels: List<CloudModel>?) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ImagePreviewFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ImagePreviewFragment.kt
index 1722209b2..88d70fa1a 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ImagePreviewFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/ImagePreviewFragment.kt
@@ -9,20 +9,20 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentImagePreviewBinding
 import org.cryptomator.presentation.di.HasComponent
 import org.cryptomator.presentation.di.component.ActivityComponent
 import org.cryptomator.presentation.model.ImagePreviewFile
 import org.cryptomator.presentation.presenter.ImagePreviewPresenter
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_image_preview.imageView
-import kotlinx.android.synthetic.main.fragment_image_preview.progressBar
 
 class ImagePreviewFragment : Fragment() {
 
 	@Inject
 	lateinit var presenter: ImagePreviewPresenter
 
+	private lateinit var binding: FragmentImagePreviewBinding
+
 	private var imagePreviewFile: ImagePreviewFile? = null
 
 	private var created: Boolean = false
@@ -36,7 +36,10 @@ class ImagePreviewFragment : Fragment() {
 		}
 	})
 
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = inflater.inflate(R.layout.fragment_image_preview, container, false)
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+		binding = FragmentImagePreviewBinding.inflate(inflater, container, false)
+		return binding.root
+	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
@@ -64,20 +67,20 @@ class ImagePreviewFragment : Fragment() {
 		imagePreviewFile?.let { imagePreviewFile ->
 			imagePreviewFile.uri?.let {
 				hideProgressBar()
-				imageView.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
+				binding.imageView.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
 				showImage(imagePreviewFile)
 			} ?: presenter.onMissingImagePreviewFile(imagePreviewFile)
 		}
 
-		imageView.setOnTouchListener { _, event -> clickDetector.onTouchEvent(event) }
+		binding.imageView.setOnTouchListener { _, event -> clickDetector.onTouchEvent(event) }
 	}
 
 	fun hideProgressBar() {
-		progressBar?.visibility = View.GONE
+		binding.progressBar.visibility = View.GONE
 	}
 
 	private fun showImage(imagePreviewFile: ImagePreviewFile?) {
-		imageView?.let { imageView ->
+		binding.imageView.let { imageView ->
 			imagePreviewFile?.let { imagePreviewFile ->
 				imageView.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
 				imagePreviewFile.uri?.let { imageView.setImage(ImageSource.uri(it)) }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/S3AddOrChangeFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/S3AddOrChangeFragment.kt
index d0981f1ab..fd5977769 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/S3AddOrChangeFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/S3AddOrChangeFragment.kt
@@ -3,23 +3,16 @@ package org.cryptomator.presentation.ui.fragment
 import android.os.Bundle
 import android.view.inputmethod.EditorInfo
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentSetupS3Binding
 import org.cryptomator.presentation.model.S3CloudModel
 import org.cryptomator.presentation.presenter.S3AddOrChangePresenter
 import org.cryptomator.util.crypto.CredentialCryptor
 import org.cryptomator.util.crypto.FatalCryptoException
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_setup_s3.accessKeyEditText
-import kotlinx.android.synthetic.main.fragment_setup_s3.bucketEditText
-import kotlinx.android.synthetic.main.fragment_setup_s3.createCloudButton
-import kotlinx.android.synthetic.main.fragment_setup_s3.displayNameEditText
-import kotlinx.android.synthetic.main.fragment_setup_s3.endpointEditText
-import kotlinx.android.synthetic.main.fragment_setup_s3.regionEditText
-import kotlinx.android.synthetic.main.fragment_setup_s3.secretKeyEditText
 import timber.log.Timber
 
-@Fragment(R.layout.fragment_setup_s3)
-class S3AddOrChangeFragment : BaseFragment() {
+@Fragment
+class S3AddOrChangeFragment : BaseFragment<FragmentSetupS3Binding>(FragmentSetupS3Binding::inflate) {
 
 	@Inject
 	lateinit var s3AddOrChangePresenter: S3AddOrChangePresenter
@@ -30,8 +23,8 @@ class S3AddOrChangeFragment : BaseFragment() {
 		get() = arguments?.getSerializable(ARG_S3_CLOUD) as? S3CloudModel
 
 	override fun setupView() {
-		createCloudButton.setOnClickListener { createCloud() }
-		createCloudButton.setOnEditorActionListener { _, actionId, _ ->
+		binding.createCloudButton.setOnClickListener { createCloud() }
+		binding.createCloudButton.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
 				createCloud()
 			}
@@ -44,12 +37,12 @@ class S3AddOrChangeFragment : BaseFragment() {
 	private fun showEditableCloudContent(s3CloudModel: S3CloudModel?) {
 		s3CloudModel?.let {
 			cloudId = s3CloudModel.id()
-			displayNameEditText.setText(s3CloudModel.username())
-			accessKeyEditText.setText(decrypt(s3CloudModel.accessKey()))
-			secretKeyEditText.setText(decrypt(s3CloudModel.secretKey()))
-			bucketEditText.setText(s3CloudModel.s3Bucket())
-			endpointEditText.setText(s3CloudModel.s3Endpoint())
-			regionEditText.setText(s3CloudModel.s3Region())
+			binding.displayNameEditText.setText(s3CloudModel.username())
+			binding.accessKeyEditText.setText(decrypt(s3CloudModel.accessKey()))
+			binding.secretKeyEditText.setText(decrypt(s3CloudModel.secretKey()))
+			binding.bucketEditText.setText(s3CloudModel.s3Bucket())
+			binding.endpointEditText.setText(s3CloudModel.s3Endpoint())
+			binding.regionEditText.setText(s3CloudModel.s3Region())
 		}
 	}
 
@@ -67,24 +60,24 @@ class S3AddOrChangeFragment : BaseFragment() {
 	}
 
 	private fun createCloud() {
-		val accessKey = accessKeyEditText.text.toString().trim()
-		val secretKey = secretKeyEditText.text.toString().trim()
-		val bucket = bucketEditText.text.toString().trim()
-		val displayName = displayNameEditText.text.toString().trim()
+		val accessKey = binding.accessKeyEditText.text.toString().trim()
+		val secretKey = binding.secretKeyEditText.text.toString().trim()
+		val bucket = binding.bucketEditText.text.toString().trim()
+		val displayName = binding.displayNameEditText.text.toString().trim()
 
 		s3AddOrChangePresenter.checkUserInput( //
 			accessKey, //
 			secretKey, //
 			bucket, //
-			endpointEditText.text.toString().trim(), //
-			regionEditText.text.toString().trim(), //
+			binding.endpointEditText.text.toString().trim(), //
+			binding.regionEditText.text.toString().trim(), //
 			cloudId, //
 			displayName
 		)
 	}
 
 	fun hideKeyboard() {
-		hideKeyboard(bucketEditText)
+		hideKeyboard(binding.bucketEditText)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SetPasswordFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SetPasswordFragment.kt
index 4939a4ecf..98f9e0fd7 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SetPasswordFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SetPasswordFragment.kt
@@ -2,18 +2,13 @@ package org.cryptomator.presentation.ui.fragment
 
 import android.view.inputmethod.EditorInfo
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentSetPasswordBinding
 import org.cryptomator.presentation.presenter.SetPasswordPresenter
 import org.cryptomator.presentation.util.PasswordStrengthUtil
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_set_password.createVaultButton
-import kotlinx.android.synthetic.main.fragment_set_password.passwordEditText
-import kotlinx.android.synthetic.main.fragment_set_password.passwordRetypedEditText
-import kotlinx.android.synthetic.main.view_password_strength_indicator.progressBarPwStrengthIndicator
-import kotlinx.android.synthetic.main.view_password_strength_indicator.textViewPwStrengthIndicator
 
-@Fragment(R.layout.fragment_set_password)
-class SetPasswordFragment : BaseFragment() {
+@Fragment
+class SetPasswordFragment : BaseFragment<FragmentSetPasswordBinding>(FragmentSetPasswordBinding::inflate) {
 
 	@Inject
 	lateinit var setPasswordPresenter: SetPasswordPresenter
@@ -22,26 +17,26 @@ class SetPasswordFragment : BaseFragment() {
 	lateinit var passwordStrengthUtil: PasswordStrengthUtil
 
 	override fun setupView() {
-		createVaultButton.setOnClickListener { validatePasswords() }
-		createVaultButton.setOnEditorActionListener { _, actionId, _ ->
+		binding.createVaultButton.setOnClickListener { validatePasswords() }
+		binding.createVaultButton.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
 				validatePasswords()
 			}
 			false
 		}
 		passwordStrengthUtil.startUpdatingPasswordStrengthMeter(
-			passwordEditText, //
-			progressBarPwStrengthIndicator, //
-			textViewPwStrengthIndicator, //
-			createVaultButton
+			binding.passwordEditText, //
+			binding.llPasswordStrengthIndicator.pbPasswordStrengthIndicator, //
+			binding.llPasswordStrengthIndicator.tvPwStrengthIndicator, //
+			binding.createVaultButton
 		)
 
-		passwordEditText.requestFocus()
+		binding.passwordEditText.requestFocus()
 	}
 
 	private fun validatePasswords() {
-		val password = passwordEditText.text.toString()
-		val passwordRetyped = passwordRetypedEditText.text.toString()
+		val password = binding.passwordEditText.text.toString()
+		val passwordRetyped = binding.passwordRetypedEditText.text.toString()
 		setPasswordPresenter.validatePasswords(password, passwordRetyped)
 	}
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt
index 4964cd445..50dc8c545 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt
@@ -314,7 +314,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 	}
 
 	fun rootView(): View {
-		return activity().findViewById(R.id.activityRootView)
+		return activity().findViewById(R.id.activity_root_view)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SharedFilesFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SharedFilesFragment.kt
index 351aee117..9b3f03c6f 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SharedFilesFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SharedFilesFragment.kt
@@ -2,7 +2,7 @@ package org.cryptomator.presentation.ui.fragment
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentSharedFilesBinding
 import org.cryptomator.presentation.model.CloudFolderModel
 import org.cryptomator.presentation.model.SharedFileModel
 import org.cryptomator.presentation.model.VaultModel
@@ -12,12 +12,9 @@ import org.cryptomator.presentation.ui.adapter.SharedFilesAdapter
 import org.cryptomator.presentation.ui.adapter.SharedFilesAdapter.Callback
 import org.cryptomator.presentation.ui.adapter.SharedLocationsAdapter
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_shared_files.filesRecyclerView
-import kotlinx.android.synthetic.main.fragment_shared_files.locationsRecyclerView
-import kotlinx.android.synthetic.main.view_receive_save_button.saveFiles
 
-@Fragment(R.layout.fragment_shared_files)
-class SharedFilesFragment : BaseFragment() {
+@Fragment
+class SharedFilesFragment : BaseFragment<FragmentSharedFilesBinding>(FragmentSharedFilesBinding::inflate) {
 
 	@Inject
 	lateinit var presenter: SharedFilesPresenter
@@ -50,7 +47,7 @@ class SharedFilesFragment : BaseFragment() {
 	}
 
 	override fun setupView() {
-		saveFiles.setOnClickListener { presenter.onSaveButtonPressed(filesAdapter.all) }
+		binding.toolbarBottom.saveFiles.setOnClickListener { presenter.onSaveButtonPressed(filesAdapter.all) }
 		setupRecyclerView()
 	}
 
@@ -60,14 +57,14 @@ class SharedFilesFragment : BaseFragment() {
 
 	private fun setupRecyclerView() {
 		filesAdapter.setCallback(filesAdapterCallback)
-		filesRecyclerView.setHasFixedSize(true)
-		filesRecyclerView.layoutManager = LinearLayoutManager(context())
-		filesRecyclerView.adapter = filesAdapter
+		binding.filesRecyclerView.setHasFixedSize(true)
+		binding.filesRecyclerView.layoutManager = LinearLayoutManager(context())
+		binding.filesRecyclerView.adapter = filesAdapter
 
 		locationsAdapter.setCallback(locationsAdapterCallback)
-		locationsRecyclerView.setHasFixedSize(true)
-		locationsRecyclerView.layoutManager = LinearLayoutManager(context())
-		locationsRecyclerView.adapter = locationsAdapter
+		binding.locationsRecyclerView.setHasFixedSize(true)
+		binding.locationsRecyclerView.layoutManager = LinearLayoutManager(context())
+		binding.locationsRecyclerView.adapter = locationsAdapter
 	}
 
 	fun displayVaults(vaults: List<VaultModel>?) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/TextEditorFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/TextEditorFragment.kt
index 734fef030..6bb8715d2 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/TextEditorFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/TextEditorFragment.kt
@@ -7,19 +7,18 @@ import androidx.core.content.ContextCompat
 import com.google.android.material.textfield.TextInputEditText
 import org.cryptomator.generator.Fragment
 import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentTextEditorBinding
 import org.cryptomator.presentation.presenter.TextEditorPresenter
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_text_editor.textEditor
-import kotlinx.android.synthetic.main.fragment_text_editor.textViewWrapper
 
-@Fragment(R.layout.fragment_text_editor)
-class TextEditorFragment : BaseFragment() {
+@Fragment
+class TextEditorFragment : BaseFragment<FragmentTextEditorBinding>(FragmentTextEditorBinding::inflate) {
 
 	@Inject
 	lateinit var textEditorPresenter: TextEditorPresenter
 
 	val textFileContent: String
-		get() = textEditor.text.toString()
+		get() = binding.textEditor.text.toString()
 
 	override fun setupView() {
 		// no-op
@@ -30,13 +29,13 @@ class TextEditorFragment : BaseFragment() {
 	}
 
 	fun displayTextFileContent(textFileContent: String?) {
-		textEditor.setText(textFileContent)
+		binding.textEditor.setText(textFileContent)
 	}
 
 	fun onQueryText(query: String) {
 		textEditorPresenter.query = query
 
-		clearSpans(textEditor)
+		clearSpans(binding.textEditor)
 
 		if (query.isEmpty()) {
 			return
@@ -60,9 +59,9 @@ class TextEditorFragment : BaseFragment() {
 			return
 		}
 
-		clearSpans(textEditor)
+		clearSpans(binding.textEditor)
 
-		val fulltext = textEditor.text.toString().lowercase()
+		val fulltext = binding.textEditor.text.toString().lowercase()
 
 		textEditorPresenter.query?.lowercase()?.let {
 			val index: Int = when (direction) {
@@ -85,7 +84,7 @@ class TextEditorFragment : BaseFragment() {
 				return
 			}
 
-			textEditor.text?.setSpan(
+			binding.textEditor.text?.setSpan(
 				BackgroundColorSpan(ContextCompat.getColor(context(), R.color.colorPrimaryTransparent)),
 				index,
 				index + it.length,
@@ -94,7 +93,7 @@ class TextEditorFragment : BaseFragment() {
 
 			textEditorPresenter.lastFilterLocation = index
 
-			textViewWrapper.scrollTo(0, textEditor.layout.getLineTop(textEditor.layout.getLineForOffset(index)))
+			binding.textViewWrapper.scrollTo(0, binding.textEditor.layout.getLineTop(binding.textEditor.layout.getLineForOffset(index)))
 		}
 	}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/UnlockVaultFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/UnlockVaultFragment.kt
index 006e07c9b..6427a4b08 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/UnlockVaultFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/UnlockVaultFragment.kt
@@ -1,12 +1,12 @@
 package org.cryptomator.presentation.ui.fragment
 
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentUnlockVaultBinding
 import org.cryptomator.presentation.presenter.UnlockVaultPresenter
 import javax.inject.Inject
 
-@Fragment(R.layout.fragment_unlock_vault)
-class UnlockVaultFragment : BaseFragment() {
+@Fragment
+class UnlockVaultFragment : BaseFragment<FragmentUnlockVaultBinding>(FragmentUnlockVaultBinding::inflate) {
 
 	@Inject
 	lateinit var presenter: UnlockVaultPresenter
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt
index acecea515..d66296363 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/VaultListFragment.kt
@@ -5,19 +5,15 @@ import android.view.View
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentVaultListBinding
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.presentation.presenter.VaultListPresenter
 import org.cryptomator.presentation.ui.adapter.VaultsAdapter
 import org.cryptomator.presentation.ui.adapter.VaultsMoveListener
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_vault_list.coordinatorLayout
-import kotlinx.android.synthetic.main.fragment_vault_list.floating_action_button
-import kotlinx.android.synthetic.main.recycler_view_layout.recyclerView
-import kotlinx.android.synthetic.main.view_vault_creation_hint.rl_creation_hint
 
-@Fragment(R.layout.fragment_vault_list)
-class VaultListFragment : BaseFragment() {
+@Fragment
+class VaultListFragment : BaseFragment<FragmentVaultListBinding>(FragmentVaultListBinding::inflate) {
 
 	@Inject
 	lateinit var vaultListPresenter: VaultListPresenter
@@ -52,7 +48,7 @@ class VaultListFragment : BaseFragment() {
 
 	override fun setupView() {
 		setupRecyclerView()
-		floating_action_button.setOnClickListener { vaultListPresenter.onCreateVaultClicked() }
+		binding.floatingActionButton.floatingActionButton.setOnClickListener { vaultListPresenter.onCreateVaultClicked() }
 	}
 
 	override fun onResume() {
@@ -63,13 +59,13 @@ class VaultListFragment : BaseFragment() {
 	private fun setupRecyclerView() {
 		vaultsAdapter.setCallback(onItemClickListener)
 		touchHelper = ItemTouchHelper(VaultsMoveListener(vaultsAdapter))
-		touchHelper.attachToRecyclerView(recyclerView)
+		touchHelper.attachToRecyclerView(binding.rvVaults.recyclerView)
 
-		recyclerView.layoutManager = LinearLayoutManager(context())
-		recyclerView.adapter = vaultsAdapter
-		recyclerView.setHasFixedSize(true) // smoother scrolling
-		recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
-		recyclerView.clipToPadding = false
+		binding.rvVaults.recyclerView.layoutManager = LinearLayoutManager(context())
+		binding.rvVaults.recyclerView.adapter = vaultsAdapter
+		binding.rvVaults.recyclerView.setHasFixedSize(true) // smoother scrolling
+		binding.rvVaults.recyclerView.setPadding(0, 0, 0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 88f, resources.displayMetrics).toInt())
+		binding.rvVaults.recyclerView.clipToPadding = false
 	}
 
 	fun showVaults(vaultModelCollection: List<VaultModel>?) {
@@ -78,11 +74,11 @@ class VaultListFragment : BaseFragment() {
 	}
 
 	fun showVaultCreationHint() {
-		rl_creation_hint.visibility = View.VISIBLE
+		binding.rlCreationHint.creationHint.visibility = View.VISIBLE
 	}
 
 	fun hideVaultCreationHint() {
-		rl_creation_hint.visibility = View.GONE
+		binding.rlCreationHint.creationHint.visibility = View.GONE
 	}
 
 	fun isVaultLocked(vaultModel: VaultModel?): Boolean {
@@ -109,5 +105,5 @@ class VaultListFragment : BaseFragment() {
 		vaultsAdapter.notifyItemMoved(fromPosition, toPosition)
 	}
 
-	fun rootView(): View = coordinatorLayout
+	fun rootView(): View = binding.coordinatorLayout
 }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/WebDavAddOrChangeFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/WebDavAddOrChangeFragment.kt
index a53152b67..d0ef017a1 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/WebDavAddOrChangeFragment.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/WebDavAddOrChangeFragment.kt
@@ -3,20 +3,16 @@ package org.cryptomator.presentation.ui.fragment
 import android.os.Bundle
 import android.view.inputmethod.EditorInfo
 import org.cryptomator.generator.Fragment
-import org.cryptomator.presentation.R
+import org.cryptomator.presentation.databinding.FragmentSetupWebdavBinding
 import org.cryptomator.presentation.model.WebDavCloudModel
 import org.cryptomator.presentation.presenter.WebDavAddOrChangePresenter
 import org.cryptomator.util.crypto.CredentialCryptor
 import org.cryptomator.util.crypto.FatalCryptoException
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_setup_webdav.createCloudButton
-import kotlinx.android.synthetic.main.fragment_setup_webdav.passwordEditText
-import kotlinx.android.synthetic.main.fragment_setup_webdav.urlPortEditText
-import kotlinx.android.synthetic.main.fragment_setup_webdav.userNameEditText
 import timber.log.Timber
 
-@Fragment(R.layout.fragment_setup_webdav)
-class WebDavAddOrChangeFragment : BaseFragment() {
+@Fragment
+class WebDavAddOrChangeFragment : BaseFragment<FragmentSetupWebdavBinding>(FragmentSetupWebdavBinding::inflate) {
 
 	@Inject
 	lateinit var webDavAddOrChangePresenter: WebDavAddOrChangePresenter
@@ -28,23 +24,23 @@ class WebDavAddOrChangeFragment : BaseFragment() {
 		get() = arguments?.getSerializable(ARG_WEBDAV_CLOUD) as? WebDavCloudModel
 
 	override fun setupView() {
-		createCloudButton.setOnClickListener { createCloud() }
-		createCloudButton.setOnEditorActionListener { _, actionId, _ ->
+		binding.createCloudButton.setOnClickListener { createCloud() }
+		binding.createCloudButton.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
 				createCloud()
 			}
 			false
 		}
 
-		urlPortEditText.text?.length?.let { urlPortEditText.setSelection(it) }
+		binding.urlPortEditText.text?.length?.let { binding.urlPortEditText.setSelection(it) }
 		showEditableCloudContent(webDavCloudModel)
 	}
 
 	private fun showEditableCloudContent(webDavCloudModel: WebDavCloudModel?) {
 		if (webDavCloudModel != null) {
-			urlPortEditText.setText(webDavCloudModel.url())
-			userNameEditText.setText(webDavCloudModel.username())
-			passwordEditText.setText(getPassword(webDavCloudModel.accessToken()))
+			binding.urlPortEditText.setText(webDavCloudModel.url())
+			binding.userNameEditText.setText(webDavCloudModel.username())
+			binding.passwordEditText.setText(getPassword(webDavCloudModel.accessToken()))
 			cloudId = webDavCloudModel.id()
 			certificate = webDavCloudModel.certificate()
 		}
@@ -64,15 +60,15 @@ class WebDavAddOrChangeFragment : BaseFragment() {
 	}
 
 	private fun createCloud() {
-		val urlPort = urlPortEditText.text.toString().trim()
-		val username = userNameEditText.text.toString().trim()
-		val password = passwordEditText.text.toString().trim()
+		val urlPort = binding.urlPortEditText.text.toString().trim()
+		val username = binding.userNameEditText.text.toString().trim()
+		val password = binding.passwordEditText.text.toString().trim()
 
 		webDavAddOrChangePresenter.checkUserInput(urlPort, username, password, cloudId, certificate)
 	}
 
 	fun hideKeyboard() {
-		hideKeyboard(passwordEditText)
+		hideKeyboard(binding.passwordEditText)
 	}
 
 	companion object {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt b/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt
index 15485ff01..241ddc9a0 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/BiometricAuthentication.kt
@@ -10,9 +10,9 @@ import org.cryptomator.presentation.R
 import org.cryptomator.presentation.model.VaultModel
 import org.cryptomator.util.crypto.BiometricAuthCryptor
 import org.cryptomator.util.crypto.UnrecoverableStorageKeyException
-import timber.log.Timber
 import java.util.concurrent.Executor
 import javax.crypto.BadPaddingException
+import timber.log.Timber
 
 class BiometricAuthentication(val callback: Callback, val context: Context, val cryptoMode: CryptoMode, private val useConfirmationInFaceUnlockAuth: Boolean) {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt b/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt
index feef2b78e..f834a18eb 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/ContentResolverUtil.kt
@@ -3,18 +3,55 @@ package org.cryptomator.presentation.util
 import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
+import android.provider.DocumentsContract
 import android.provider.OpenableColumns
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.InputStream
 import java.io.OutputStream
-import java.util.ArrayList
+import java.util.Date
 import javax.inject.Inject
 
 class ContentResolverUtil @Inject constructor(context: Context) {
 
 	private val contentResolver: ContentResolver = context.contentResolver
 
+	fun fileModifiedDate(uri: Uri): Date? {
+		return when {
+			isContentUri(uri) -> {
+				fileModifiedDateForContentUri(uri)
+			}
+			isFileUri(uri) -> {
+				fileModifiedDateForFileUri(uri)
+			}
+			else -> null
+		}
+	}
+
+	private fun fileModifiedDateForContentUri(uri: Uri): Date? {
+		contentResolver.query(uri, null, null, null, null).use { cursor ->
+			if (cursor != null && cursor.moveToFirst()) {
+				val dateModifiedColumnIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_LAST_MODIFIED)
+				if (!cursor.isNull(dateModifiedColumnIndex)) {
+					val date = cursor.getLong(dateModifiedColumnIndex)
+					return Date(date);
+				}
+			}
+			return null
+		}
+	}
+
+	private fun fileModifiedDateForFileUri(uri: Uri): Date? {
+		return uri.path?.let {
+			val file = File(it)
+			if (file.exists()) {
+				Date(file.lastModified())
+			} else {
+				null
+			}
+		}
+	}
+
 	@Throws(FileNotFoundException::class)
 	fun openInputStream(uri: Uri): InputStream? {
 		return contentResolver.openInputStream(uri)
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt b/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt
index dd76d4280..1fddd8df6 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/DownloadFileUtil.kt
@@ -5,7 +5,6 @@ import org.cryptomator.presentation.model.CloudFileModel
 import org.cryptomator.presentation.presenter.Presenter
 import java.io.FileNotFoundException
 import java.io.OutputStream
-import java.util.ArrayList
 import javax.inject.Inject
 
 class DownloadFileUtil @Inject constructor(private val fileUtil: FileUtil) {
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt b/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt
index a04905381..cfcbd1255 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/EmailBuilder.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.FileProvider
 import java.io.File
-import java.util.ArrayList
 
 class EmailBuilder private constructor() {
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java b/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
index ac179b49a..937aad902 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/util/FileIcon.java
@@ -59,7 +59,7 @@ public static FileIcon fileIconFor(String name, FileUtil fileUtil) {
 
 	private static Predicate<FileInfo> forExtensions(final String... extensions) {
 		return fileInfo -> {
-			if(fileInfo.getExtension() == null) {
+			if (fileInfo.getExtension() == null) {
 				return FALSE;
 			}
 
diff --git a/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java b/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
index 29b03ba4d..c39cc20fc 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
@@ -117,7 +117,7 @@ void cloudServiceAuthenticated(ActivityResult result) {
 	@Callback
 	void cryptomatorFileChosen(SerializableResult<CloudFileModel> result) {
 		CloudFileModel masterkeyFile = result.getResult();
-		if(!masterkeyFile.getPath().equals("/masterkey.cryptomator") && !masterkeyFile.getPath().equals("/vault.cryptomator")) {
+		if (!masterkeyFile.getPath().equals("/masterkey.cryptomator") && !masterkeyFile.getPath().equals("/vault.cryptomator")) {
 			state().masterkeyFile = masterkeyFile.toCloudNode();
 			presenter().getView().showProgress(ProgressModel.GENERIC);
 			finish();
diff --git a/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java b/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java
index 9521350a0..fa596374e 100644
--- a/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java
+++ b/presentation/src/main/java/org/cryptomator/presentation/workflow/CreateNewVaultWorkflow.java
@@ -19,12 +19,12 @@
 
 import javax.inject.Inject;
 
-import static java.util.Collections.singletonList;
 import static org.cryptomator.presentation.intent.ChooseCloudNodeSettings.chooseCloudNodeSettings;
 import static org.cryptomator.presentation.intent.Intents.browseFilesIntent;
 import static org.cryptomator.presentation.intent.Intents.chooseCloudServiceIntent;
 import static org.cryptomator.presentation.intent.Intents.createVaultIntent;
 import static org.cryptomator.presentation.intent.Intents.setPasswordIntent;
+import static java.util.Collections.singletonList;
 
 public class CreateNewVaultWorkflow extends Workflow<CreateNewVaultWorkflow.State> {
 
diff --git a/presentation/src/main/res/drawable-anydpi/ic_notification.xml b/presentation/src/main/res/drawable-anydpi/ic_notification.xml
index 0b99d37aa..cbd180f77 100644
--- a/presentation/src/main/res/drawable-anydpi/ic_notification.xml
+++ b/presentation/src/main/res/drawable-anydpi/ic_notification.xml
@@ -1,24 +1,25 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.019891892"
-      android:scaleY="0.019891892"
-      android:translateX="0.96"
-      android:translateY="2.5712433">
-    <path
-        android:pathData="m877,689.3a51.6,51.6 0,0 0,-23.7 -5.8h-40.5c27.8,-41.7 46.3,-92.3 46.3,-153.2 0.1,-34.3 -5.4,-61.2 -10.5,-78.8a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.1,61.3 18.4,112.2 46.4,154.1h-41.3a51.6,51.6 0,0 0,-23.7 5.8c-19.8,10.1 -35.9,32.7 -45.3,63.7 -8.7,28.8 -11,62.1 -6.5,93.9 8.5,59.3 38.8,99.2 75.5,99.2h103.5v-0.1c4.4,-0.2 8.8,-2.2 12.9,-5.9l49.7,-43.8c10.2,-9.1 17.8,-32 20.2,-61.3a248,248 0,0 0,0.7 -25.9c61.4,33.1 113.8,46.2 113.8,46.2s52.5,-13 114.1,-46a245.8,245.8 0,0 0,0.7 25.7c2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.2,3.7 8.5,5.6 12.9,5.9v0.1h103.5c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-93.9 -9.4,-30.9 -25.5,-53.5 -45.4,-63.7zM404.2,881.4c-0.5,0.3 -25.9,22.9 -40.4,35.7a11.2,11.2 0,0 1,-17.4 -3.3c-21,-41.1 -23.3,-124.9 -8.4,-176.5 25.2,24.3 53.1,44.2 80.1,60.3 1.5,30.4 -4.3,78.1 -14,83.7zM597.1,670.3 L552.4,683 507.7,670.2 540,534.7a57.5,57.5 0,1 1,25.3 0zM758.5,913.8a11.2,11.2 0,0 1,-17.4 3.3c-14.5,-12.8 -39.9,-35.4 -40.4,-35.7 -9.6,-5.6 -15.5,-53.1 -14,-83.5 27.1,-16.1 55,-36 80.3,-60.2 14.8,51.6 12.5,135.1 -8.5,176.1z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m178.9,584.1 l20.6,-40.4a49.4,49.4 0,0 0,-0.5 -46l18.1,-35.3a74.8,74.8 0,0 0,16.4 -0.6c1.4,-6.4 2.9,-12.1 4.3,-16.9a63.6,63.6 0,0 0,0.6 -34.7c-9.9,-36.1 -9.5,-73.8 -7.7,-97.3a75.1,75.1 0,0 0,-68.6 119.1l-19.3,37.7a49.3,49.3 0,0 0,-36.5 26.3l-20.6,40.4a49.3,49.3 0,0 0,-0.5 43.9,82.8 82.8,0 0,0 -74.8,122.8 20,20 0,0 0,35 -19.3,42.8 42.8,0 1,1 42.2,21.8 20,20 0,0 0,2.2 39.9,21.8 21.8,0 0,0 2.3,-0.1 82.8,82.8 0,0 0,54 -135.7,49.3 49.3,0 0,0 32.8,-25.6z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m1099,619.4a82.9,82.9 0,0 0,-73.6 -45.1,49.3 49.3,0 0,0 -3,-37.9l-20.6,-40.4a49.3,49.3 0,0 0,-36.5 -26.3l-19.2,-37.7a75,75 0,0 0,-70.7 -118.8c1.7,23.4 2.1,61.6 -8,97.9a63.6,63.6 0,0 0,0.5 34.7c1.3,4.5 2.7,9.7 4,15.5a75.4,75.4 0,0 0,19.2 1l18.1,35.3a49.4,49.4 0,0 0,-0.5 46l20.6,40.4a49.2,49.2 0,0 0,29 24.6,82.8 82.8,0 0,0 57.8,130.7 22.1,22.1 0,0 0,2.3 0.1,20 20,0 0,0 2.2,-39.9 42.8,42.8 0,1 1,42.2 -21.8,20 20,0 1,0 35,19.3 82.8,82.8 0,0 0,1.3 -77.7z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m553.1,271.7c19,-7.6 67.6,-23.5 139.3,-23.5 39.7,0 80.5,4.9 122,14.5 -9.8,-133.1 -112.4,-262.7 -261.7,-262.7 -160.5,0 -252.7,129.2 -261.7,262.1 41.3,-9.5 81.9,-14.4 121.4,-14.4 72.5,0 121.5,16.2 140.7,24zM623.1,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM646.4,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.2a60.6,60.6 0,0 1,60.6 -60.6zM577.8,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM487.2,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM532.5,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM459,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.3a60.6,60.6 0,0 1,60.7 -60.6z"
-        android:fillColor="#49b04a"/>
-  </group>
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportWidth="24"
+	android:viewportHeight="24"
+	android:tint="#FFFFFF">
+	<group
+		android:scaleX="0.019891892"
+		android:scaleY="0.019891892"
+		android:translateX="0.96"
+		android:translateY="2.5712433">
+		<path
+			android:pathData="m877,689.3a51.6,51.6 0,0 0,-23.7 -5.8h-40.5c27.8,-41.7 46.3,-92.3 46.3,-153.2 0.1,-34.3 -5.4,-61.2 -10.5,-78.8a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.1,61.3 18.4,112.2 46.4,154.1h-41.3a51.6,51.6 0,0 0,-23.7 5.8c-19.8,10.1 -35.9,32.7 -45.3,63.7 -8.7,28.8 -11,62.1 -6.5,93.9 8.5,59.3 38.8,99.2 75.5,99.2h103.5v-0.1c4.4,-0.2 8.8,-2.2 12.9,-5.9l49.7,-43.8c10.2,-9.1 17.8,-32 20.2,-61.3a248,248 0,0 0,0.7 -25.9c61.4,33.1 113.8,46.2 113.8,46.2s52.5,-13 114.1,-46a245.8,245.8 0,0 0,0.7 25.7c2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.2,3.7 8.5,5.6 12.9,5.9v0.1h103.5c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-93.9 -9.4,-30.9 -25.5,-53.5 -45.4,-63.7zM404.2,881.4c-0.5,0.3 -25.9,22.9 -40.4,35.7a11.2,11.2 0,0 1,-17.4 -3.3c-21,-41.1 -23.3,-124.9 -8.4,-176.5 25.2,24.3 53.1,44.2 80.1,60.3 1.5,30.4 -4.3,78.1 -14,83.7zM597.1,670.3 L552.4,683 507.7,670.2 540,534.7a57.5,57.5 0,1 1,25.3 0zM758.5,913.8a11.2,11.2 0,0 1,-17.4 3.3c-14.5,-12.8 -39.9,-35.4 -40.4,-35.7 -9.6,-5.6 -15.5,-53.1 -14,-83.5 27.1,-16.1 55,-36 80.3,-60.2 14.8,51.6 12.5,135.1 -8.5,176.1z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m178.9,584.1 l20.6,-40.4a49.4,49.4 0,0 0,-0.5 -46l18.1,-35.3a74.8,74.8 0,0 0,16.4 -0.6c1.4,-6.4 2.9,-12.1 4.3,-16.9a63.6,63.6 0,0 0,0.6 -34.7c-9.9,-36.1 -9.5,-73.8 -7.7,-97.3a75.1,75.1 0,0 0,-68.6 119.1l-19.3,37.7a49.3,49.3 0,0 0,-36.5 26.3l-20.6,40.4a49.3,49.3 0,0 0,-0.5 43.9,82.8 82.8,0 0,0 -74.8,122.8 20,20 0,0 0,35 -19.3,42.8 42.8,0 1,1 42.2,21.8 20,20 0,0 0,2.2 39.9,21.8 21.8,0 0,0 2.3,-0.1 82.8,82.8 0,0 0,54 -135.7,49.3 49.3,0 0,0 32.8,-25.6z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m1099,619.4a82.9,82.9 0,0 0,-73.6 -45.1,49.3 49.3,0 0,0 -3,-37.9l-20.6,-40.4a49.3,49.3 0,0 0,-36.5 -26.3l-19.2,-37.7a75,75 0,0 0,-70.7 -118.8c1.7,23.4 2.1,61.6 -8,97.9a63.6,63.6 0,0 0,0.5 34.7c1.3,4.5 2.7,9.7 4,15.5a75.4,75.4 0,0 0,19.2 1l18.1,35.3a49.4,49.4 0,0 0,-0.5 46l20.6,40.4a49.2,49.2 0,0 0,29 24.6,82.8 82.8,0 0,0 57.8,130.7 22.1,22.1 0,0 0,2.3 0.1,20 20,0 0,0 2.2,-39.9 42.8,42.8 0,1 1,42.2 -21.8,20 20,0 1,0 35,19.3 82.8,82.8 0,0 0,1.3 -77.7z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m553.1,271.7c19,-7.6 67.6,-23.5 139.3,-23.5 39.7,0 80.5,4.9 122,14.5 -9.8,-133.1 -112.4,-262.7 -261.7,-262.7 -160.5,0 -252.7,129.2 -261.7,262.1 41.3,-9.5 81.9,-14.4 121.4,-14.4 72.5,0 121.5,16.2 140.7,24zM623.1,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM646.4,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.2a60.6,60.6 0,0 1,60.6 -60.6zM577.8,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM487.2,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM532.5,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM459,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.3a60.6,60.6 0,0 1,60.7 -60.6z"
+			android:fillColor="#49b04a" />
+	</group>
 </vector>
diff --git a/presentation/src/main/res/drawable/dropbox_vault.xml b/presentation/src/main/res/drawable/dropbox_vault.xml
index 61e2890f8..dc0513345 100644
--- a/presentation/src/main/res/drawable/dropbox_vault.xml
+++ b/presentation/src/main/res/drawable/dropbox_vault.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM28,19.629 L19,25.251 10,19.629 19,14.006 28,19.628 37,14.006 46,19.629 37,25.251zM28,30.874 L37,25.252 46,30.874 37,36.5 28,30.878 19,36.5 10,30.878 19,25.256zM37,38.374 L28,44 19,38.378 28,32.755z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM28,19.629 L19,25.251 10,19.629 19,14.006 28,19.628 37,14.006 46,19.629 37,25.251zM28,30.874 L37,25.252 46,30.874 37,36.5 28,30.878 19,36.5 10,30.878 19,25.256zM37,38.374 L28,44 19,38.378 28,32.755z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/dropbox_vault_selected.xml b/presentation/src/main/res/drawable/dropbox_vault_selected.xml
index 1ad2e4771..5745608a0 100644
--- a/presentation/src/main/res/drawable/dropbox_vault_selected.xml
+++ b/presentation/src/main/res/drawable/dropbox_vault_selected.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,0a28,28 0,1 0,28 28,28 28,0 0,0 -28,-28zM19,14.007 L10,19.63 19,25.252 28,19.63zM37,14.007 L28,19.63 37,25.252 46,19.63zM10,30.875 L19,36.5 28,30.878 19,25.256zM37,25.253 L28,30.875 37,36.5 46,30.878zM19,38.373 L28,44 37,38.378 28,32.755z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,0a28,28 0,1 0,28 28,28 28,0 0,0 -28,-28zM19,14.007 L10,19.63 19,25.252 28,19.63zM37,14.007 L28,19.63 37,25.252 46,19.63zM10,30.875 L19,36.5 28,30.878 19,25.256zM37,25.253 L28,30.875 37,36.5 46,30.878zM19,38.373 L28,44 37,38.378 28,32.755z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/google_drive_vault.xml b/presentation/src/main/res/drawable/google_drive_vault.xml
index c4d0cc939..9b0d66324 100644
--- a/presentation/src/main/res/drawable/google_drive_vault.xml
+++ b/presentation/src/main/res/drawable/google_drive_vault.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM23,12h11l11,19h-11zM16,42 L11,33 21,14 27,24zM45,33 L40,42h-21l5,-9z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM23,12h11l11,19h-11zM16,42 L11,33 21,14 27,24zM45,33 L40,42h-21l5,-9z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/google_drive_vault_selected.xml b/presentation/src/main/res/drawable/google_drive_vault_selected.xml
index 869e25aab..f3cf6dfb7 100644
--- a/presentation/src/main/res/drawable/google_drive_vault_selected.xml
+++ b/presentation/src/main/res/drawable/google_drive_vault_selected.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM11,33 L16,42 27,24 21,14zM34,12h-11l11,19h11zM24,33 L19,42h21l5,-9z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM11,33 L16,42 27,24 21,14zM34,12h-11l11,19h11zM24,33 L19,42h21l5,-9z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/ic_launcher_foreground.xml b/presentation/src/main/res/drawable/ic_launcher_foreground.xml
index 6979bda7b..5b518aebd 100644
--- a/presentation/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/presentation/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,92 +1,93 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="0.05172973"
-      android:scaleY="0.05172973"
-      android:translateX="25.29"
-      android:translateY="29.635298">
-    <path
-        android:pathData="m552.7,0c-169.1,0 -262.5,143.5 -262.5,283.5h524.9c0,-140.1 -105.3,-283.5 -262.5,-283.5z"
-        android:fillColor="#cfcfcf"/>
-    <path
-        android:pathData="m552.7,53.2c-137.4,0 -213.2,116.5 -213.2,230.3l213.2,24.2 213.2,-24.2c0,-113.8 -85.6,-230.3 -213.2,-230.3z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="m89.8,739.5a20,20 0,0 1,-2.2 -39.9,42.8 42.8,0 1,0 -42.2,-21.8 20,20 0,0 1,-35 19.3,82.8 82.8,0 1,1 81.8,42.3 21.8,21.8 0,0 1,-2.3 0.1z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="M172.8,474.6L178,477.2A49.4,49.4 72.1,0 1,199.5 543.7L178.9,584.1A49.4,49.4 72.1,0 1,112.4 605.6L107.2,602.9A49.4,49.4 72.1,0 1,85.7 536.4L106.3,496.1A49.4,49.4 72.1,0 1,172.8 474.6z"
-        android:fillColor="#cfcfcf"/>
-    <path
-        android:pathData="m181.6,393.9l55.9,28.6a0,0 0,0 1,0 0l-43.1,84.2a31.4,31.4 72.1,0 1,-42.3 13.7,31.4 31.4,72.1 0,1 -13.7,-42.3l43.1,-84.2a0,0 0,0 1,0 0z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="M222.6,387.5m-75.1,0a75.1,75.1 0,1 1,150.1 0a75.1,75.1 0,1 1,-150.1 0"
-        android:fillColor="#cfcfcf"/>
-    <path
-        android:pathData="m258.1,321.8a75.1,75.1 0,0 0,-91.2 14.6,75.1 75.1,0 0,1 51.6,126.1 75.1,75.1 0,0 0,39.7 -140.7z"
-        android:fillColor="#b1b1b1"/>
-    <path
-        android:pathData="m1018.3,739.5a22.1,22.1 0,0 1,-2.3 -0.1,82.8 82.8,0 1,1 81.8,-42.3 20,20 0,1 1,-35 -19.3,42.8 42.8,0 1,0 -42.2,21.8 20,20 0,0 1,-2.2 39.9z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="M1000.9,603L995.7,605.6A49.4,49.4 107.9,0 1,929.2 584.2L908.6,543.8A49.4,49.4 107.9,0 1,930.1 477.3L935.3,474.6A49.4,49.4 107.9,0 1,1001.8 496.1L1022.4,536.5A49.4,49.4 107.9,0 1,1000.9 603z"
-        android:fillColor="#cfcfcf"/>
-    <path
-        android:pathData="m955.9,520.4a31.4,31.4 107.9,0 1,-42.3 -13.7l-43.1,-84.2a0,0 0,0 1,-0 0l55.9,-28.6a0,0 0,0 1,-0 0l43.1,84.2a31.4,31.4 107.9,0 1,-13.7 42.3z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="M885.5,387.5m-75.1,0a75.1,75.1 0,1 1,150.1 0a75.1,75.1 0,1 1,-150.1 0"
-        android:fillColor="#cfcfcf"/>
-    <path
-        android:pathData="m850,321.8a75.1,75.1 0,0 1,91.2 14.6,75.1 75.1,0 0,0 -51.5,126.1 75.1,75.1 0,0 1,-39.7 -140.7z"
-        android:fillColor="#b1b1b1"/>
-    <path
-        android:pathData="m248.8,940.2c-36.7,0 -67,-39.8 -75.5,-99.2 -4.6,-31.8 -2.3,-65.2 6.5,-94 9.4,-31 25.5,-53.6 45.3,-63.7a51.7,51.7 0,0 1,23.7 -5.8h103.5v262.7z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="m351.4,940.2c-21.3,0 -38.8,-39.8 -43.8,-99.2 -2.6,-31.8 -1.3,-65.2 3.8,-94 5.4,-31 14.8,-53.6 26.3,-63.7 4.4,-3.9 9,-5.8 13.7,-5.8s9.3,2 13.8,5.8l49.7,43.8c17.4,15.3 23.4,64 20.2,102 -2.4,29.3 -10,52.2 -20.2,61.3l-49.7,43.8c-4.4,4 -9.1,6 -13.8,6z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="m360.6,699 l49.7,43.8c11.2,9.9 17.8,47.5 14.8,83.9 -2,24.3 -7.8,42 -14.8,48.1l-49.7,43.8c-18.6,16.4 -37.8,-19.4 -42.8,-80.1s6,-123.1 24.6,-139.5c6.2,-5.4 12.5,-5 18.2,-0z"
-        android:fillColor="#35393b"/>
-    <path
-        android:pathData="m850.7,940.2c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-94 -9.4,-31 -25.5,-53.6 -45.3,-63.7a51.7,51.7 0,0 0,-23.7 -5.8h-103.5v262.7z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="m748.1,940.2c21.3,0 38.8,-39.8 43.8,-99.2 2.6,-31.8 1.3,-65.2 -3.8,-94 -5.4,-31 -14.8,-53.6 -26.3,-63.7 -4.4,-3.9 -9,-5.8 -13.7,-5.8s-9.3,2 -13.8,5.8l-49.7,43.8c-17.4,15.3 -23.4,64 -20.2,102 2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.4,4 9.1,6 13.8,6z"
-        android:fillColor="#585e62"/>
-    <path
-        android:pathData="m738.9,699 l-49.7,43.8c-11.2,9.9 -17.8,47.4 -14.8,83.9 2,24.3 7.8,42 14.8,48.1l49.7,43.8c18.6,16.4 37.8,-19.4 42.8,-80.1s-6,-123.1 -24.6,-139.5c-6.2,-5.4 -12.5,-5 -18.2,0z"
-        android:fillColor="#35393b"/>
-    <path
-        android:pathData="m848.6,451.4a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.4,249 306,326.1 306,326.1s306.6,-76.2 307,-325.2c0,-34.3 -5.5,-61.2 -10.6,-78.8z"
-        android:fillColor="#cfcfcf"/>
-    <path
-        android:pathData="m552.3,808.9c-50.7,-15.9 -261.7,-93.3 -261.4,-279.5 0,-29.6 4.9,-52.4 9,-66.3a128.3,128.3 0,0 0,0.9 -70c-6.2,-22.6 -6.9,-47.1 -6.2,-65.3 40.5,-10.2 80.2,-15.4 118.4,-15.3 75.7,0.1 119.9,21 120.3,21.2l20.4,10.2 19.2,-10.3c0.1,0 44.4,-20.8 120,-20.6 38.2,0.1 77.9,5.3 118.4,15.7 0.7,18.1 -0.1,42.7 -6.4,65.3a128.3,128.3 0,0 0,0.7 70c4,13.9 8.8,36.7 8.8,66.3 -0.3,187.1 -211.3,263.1 -262.1,278.7z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m610.2,478.8a57.5,57.5 0,1 0,-70.2 55.9l-32.3,135.5 44.7,12.9 44.7,-12.7 -31.8,-135.6a57.5,57.5 0,0 0,44.9 -56z"
-        android:fillColor="#35393b"/>
-    <path
-        android:pathData="m454.9,131.1a60.6,60.6 0,0 0,-60.6 60.6h121.3a60.6,60.6 0,0 0,-60.6 -60.6z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m642.4,131.1a60.6,60.6 0,0 0,-60.6 60.6h121.3a60.6,60.6 0,0 0,-60.6 -60.6z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="M483.2,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="M528.5,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="M573.8,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="M619.1,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
-        android:fillColor="#49b04a"/>
-  </group>
+	android:width="108dp"
+	android:height="108dp"
+	android:viewportWidth="108"
+	android:viewportHeight="108">
+	<group
+		android:scaleX="0.05172973"
+		android:scaleY="0.05172973"
+		android:translateX="25.29"
+		android:translateY="29.635298">
+		<path
+			android:pathData="m552.7,0c-169.1,0 -262.5,143.5 -262.5,283.5h524.9c0,-140.1 -105.3,-283.5 -262.5,-283.5z"
+			android:fillColor="#cfcfcf" />
+		<path
+			android:pathData="m552.7,53.2c-137.4,0 -213.2,116.5 -213.2,230.3l213.2,24.2 213.2,-24.2c0,-113.8 -85.6,-230.3 -213.2,-230.3z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="m89.8,739.5a20,20 0,0 1,-2.2 -39.9,42.8 42.8,0 1,0 -42.2,-21.8 20,20 0,0 1,-35 19.3,82.8 82.8,0 1,1 81.8,42.3 21.8,21.8 0,0 1,-2.3 0.1z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="M172.8,474.6L178,477.2A49.4,49.4 72.1,0 1,199.5 543.7L178.9,584.1A49.4,49.4 72.1,0 1,112.4 605.6L107.2,602.9A49.4,49.4 72.1,0 1,85.7 536.4L106.3,496.1A49.4,49.4 72.1,0 1,172.8 474.6z"
+			android:fillColor="#cfcfcf" />
+		<path
+			android:pathData="m181.6,393.9l55.9,28.6a0,0 0,0 1,0 0l-43.1,84.2a31.4,31.4 72.1,0 1,-42.3 13.7,31.4 31.4,72.1 0,1 -13.7,-42.3l43.1,-84.2a0,0 0,0 1,0 0z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="M222.6,387.5m-75.1,0a75.1,75.1 0,1 1,150.1 0a75.1,75.1 0,1 1,-150.1 0"
+			android:fillColor="#cfcfcf" />
+		<path
+			android:pathData="m258.1,321.8a75.1,75.1 0,0 0,-91.2 14.6,75.1 75.1,0 0,1 51.6,126.1 75.1,75.1 0,0 0,39.7 -140.7z"
+			android:fillColor="#b1b1b1" />
+		<path
+			android:pathData="m1018.3,739.5a22.1,22.1 0,0 1,-2.3 -0.1,82.8 82.8,0 1,1 81.8,-42.3 20,20 0,1 1,-35 -19.3,42.8 42.8,0 1,0 -42.2,21.8 20,20 0,0 1,-2.2 39.9z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="M1000.9,603L995.7,605.6A49.4,49.4 107.9,0 1,929.2 584.2L908.6,543.8A49.4,49.4 107.9,0 1,930.1 477.3L935.3,474.6A49.4,49.4 107.9,0 1,1001.8 496.1L1022.4,536.5A49.4,49.4 107.9,0 1,1000.9 603z"
+			android:fillColor="#cfcfcf" />
+		<path
+			android:pathData="m955.9,520.4a31.4,31.4 107.9,0 1,-42.3 -13.7l-43.1,-84.2a0,0 0,0 1,-0 0l55.9,-28.6a0,0 0,0 1,-0 0l43.1,84.2a31.4,31.4 107.9,0 1,-13.7 42.3z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="M885.5,387.5m-75.1,0a75.1,75.1 0,1 1,150.1 0a75.1,75.1 0,1 1,-150.1 0"
+			android:fillColor="#cfcfcf" />
+		<path
+			android:pathData="m850,321.8a75.1,75.1 0,0 1,91.2 14.6,75.1 75.1,0 0,0 -51.5,126.1 75.1,75.1 0,0 1,-39.7 -140.7z"
+			android:fillColor="#b1b1b1" />
+		<path
+			android:pathData="m248.8,940.2c-36.7,0 -67,-39.8 -75.5,-99.2 -4.6,-31.8 -2.3,-65.2 6.5,-94 9.4,-31 25.5,-53.6 45.3,-63.7a51.7,51.7 0,0 1,23.7 -5.8h103.5v262.7z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="m351.4,940.2c-21.3,0 -38.8,-39.8 -43.8,-99.2 -2.6,-31.8 -1.3,-65.2 3.8,-94 5.4,-31 14.8,-53.6 26.3,-63.7 4.4,-3.9 9,-5.8 13.7,-5.8s9.3,2 13.8,5.8l49.7,43.8c17.4,15.3 23.4,64 20.2,102 -2.4,29.3 -10,52.2 -20.2,61.3l-49.7,43.8c-4.4,4 -9.1,6 -13.8,6z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="m360.6,699 l49.7,43.8c11.2,9.9 17.8,47.5 14.8,83.9 -2,24.3 -7.8,42 -14.8,48.1l-49.7,43.8c-18.6,16.4 -37.8,-19.4 -42.8,-80.1s6,-123.1 24.6,-139.5c6.2,-5.4 12.5,-5 18.2,-0z"
+			android:fillColor="#35393b" />
+		<path
+			android:pathData="m850.7,940.2c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-94 -9.4,-31 -25.5,-53.6 -45.3,-63.7a51.7,51.7 0,0 0,-23.7 -5.8h-103.5v262.7z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="m748.1,940.2c21.3,0 38.8,-39.8 43.8,-99.2 2.6,-31.8 1.3,-65.2 -3.8,-94 -5.4,-31 -14.8,-53.6 -26.3,-63.7 -4.4,-3.9 -9,-5.8 -13.7,-5.8s-9.3,2 -13.8,5.8l-49.7,43.8c-17.4,15.3 -23.4,64 -20.2,102 2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.4,4 9.1,6 13.8,6z"
+			android:fillColor="#585e62" />
+		<path
+			android:pathData="m738.9,699 l-49.7,43.8c-11.2,9.9 -17.8,47.4 -14.8,83.9 2,24.3 7.8,42 14.8,48.1l49.7,43.8c18.6,16.4 37.8,-19.4 42.8,-80.1s-6,-123.1 -24.6,-139.5c-6.2,-5.4 -12.5,-5 -18.2,0z"
+			android:fillColor="#35393b" />
+		<path
+			android:pathData="m848.6,451.4a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.4,249 306,326.1 306,326.1s306.6,-76.2 307,-325.2c0,-34.3 -5.5,-61.2 -10.6,-78.8z"
+			android:fillColor="#cfcfcf" />
+		<path
+			android:pathData="m552.3,808.9c-50.7,-15.9 -261.7,-93.3 -261.4,-279.5 0,-29.6 4.9,-52.4 9,-66.3a128.3,128.3 0,0 0,0.9 -70c-6.2,-22.6 -6.9,-47.1 -6.2,-65.3 40.5,-10.2 80.2,-15.4 118.4,-15.3 75.7,0.1 119.9,21 120.3,21.2l20.4,10.2 19.2,-10.3c0.1,0 44.4,-20.8 120,-20.6 38.2,0.1 77.9,5.3 118.4,15.7 0.7,18.1 -0.1,42.7 -6.4,65.3a128.3,128.3 0,0 0,0.7 70c4,13.9 8.8,36.7 8.8,66.3 -0.3,187.1 -211.3,263.1 -262.1,278.7z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m610.2,478.8a57.5,57.5 0,1 0,-70.2 55.9l-32.3,135.5 44.7,12.9 44.7,-12.7 -31.8,-135.6a57.5,57.5 0,0 0,44.9 -56z"
+			android:fillColor="#35393b" />
+		<path
+			android:pathData="m454.9,131.1a60.6,60.6 0,0 0,-60.6 60.6h121.3a60.6,60.6 0,0 0,-60.6 -60.6z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m642.4,131.1a60.6,60.6 0,0 0,-60.6 60.6h121.3a60.6,60.6 0,0 0,-60.6 -60.6z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="M483.2,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="M528.5,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="M573.8,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="M619.1,229.4m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+			android:fillColor="#49b04a" />
+	</group>
 </vector>
diff --git a/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml b/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
index 0607f6519..4fb4ba35e 100644
--- a/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
+++ b/presentation/src/main/res/drawable/ic_launcher_foreground_monochrome.xml
@@ -1,23 +1,24 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="0.05172973"
-      android:scaleY="0.05172973"
-      android:translateX="25.29"
-      android:translateY="29.480108">
-    <path
-        android:pathData="m877,689.3a51.6,51.6 0,0 0,-23.7 -5.8h-40.5c27.8,-41.7 46.3,-92.3 46.3,-153.2 0.1,-34.3 -5.4,-61.2 -10.5,-78.8a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.1,61.3 18.4,112.2 46.4,154.1h-41.3a51.6,51.6 0,0 0,-23.7 5.8c-19.8,10.1 -35.9,32.7 -45.3,63.7 -8.7,28.8 -11,62.1 -6.5,93.9 8.5,59.3 38.8,99.2 75.5,99.2h103.5v-0.1c4.4,-0.2 8.8,-2.2 12.9,-5.9l49.7,-43.8c10.2,-9.1 17.8,-32 20.2,-61.3a248,248 0,0 0,0.7 -25.9c61.4,33.1 113.8,46.2 113.8,46.2s52.5,-13 114.1,-46a245.8,245.8 0,0 0,0.7 25.7c2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.2,3.7 8.5,5.6 12.9,5.9v0.1h103.5c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-93.9 -9.4,-30.9 -25.5,-53.5 -45.4,-63.7zM404.2,881.4c-0.5,0.3 -25.9,22.9 -40.4,35.7a11.2,11.2 0,0 1,-17.4 -3.3c-21,-41.1 -23.3,-124.9 -8.4,-176.5 25.2,24.3 53.1,44.2 80.1,60.3 1.5,30.4 -4.3,78.1 -14,83.7zM597.1,670.3 L552.4,683 507.7,670.2 540,534.7a57.5,57.5 0,1 1,25.3 0zM758.5,913.8a11.2,11.2 0,0 1,-17.4 3.3c-14.5,-12.8 -39.9,-35.4 -40.4,-35.7 -9.6,-5.6 -15.5,-53.1 -14,-83.5 27.1,-16.1 55,-36 80.3,-60.2 14.8,51.6 12.5,135.1 -8.5,176.1z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m178.9,584.1 l20.6,-40.4a49.4,49.4 0,0 0,-0.5 -46l18.1,-35.3a74.8,74.8 0,0 0,16.4 -0.6c1.4,-6.4 2.9,-12.1 4.3,-16.9a63.6,63.6 0,0 0,0.6 -34.7c-9.9,-36.1 -9.5,-73.8 -7.7,-97.3a75.1,75.1 0,0 0,-68.6 119.1l-19.3,37.7a49.3,49.3 0,0 0,-36.5 26.3l-20.6,40.4a49.3,49.3 0,0 0,-0.5 43.9,82.8 82.8,0 0,0 -74.8,122.8 20,20 0,0 0,35 -19.3,42.8 42.8,0 1,1 42.2,21.8 20,20 0,0 0,2.2 39.9,21.8 21.8,0 0,0 2.3,-0.1 82.8,82.8 0,0 0,54 -135.7,49.3 49.3,0 0,0 32.8,-25.6z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m1099,619.4a82.9,82.9 0,0 0,-73.6 -45.1,49.3 49.3,0 0,0 -3,-37.9l-20.6,-40.4a49.3,49.3 0,0 0,-36.5 -26.3l-19.2,-37.7a75,75 0,0 0,-70.7 -118.8c1.7,23.4 2.1,61.6 -8,97.9a63.6,63.6 0,0 0,0.5 34.7c1.3,4.5 2.7,9.7 4,15.5a75.4,75.4 0,0 0,19.2 1l18.1,35.3a49.4,49.4 0,0 0,-0.5 46l20.6,40.4a49.2,49.2 0,0 0,29 24.6,82.8 82.8,0 0,0 57.8,130.7 22.1,22.1 0,0 0,2.3 0.1,20 20,0 0,0 2.2,-39.9 42.8,42.8 0,1 1,42.2 -21.8,20 20,0 1,0 35,19.3 82.8,82.8 0,0 0,1.3 -77.7z"
-        android:fillColor="#49b04a"/>
-    <path
-        android:pathData="m553.1,271.7c19,-7.6 67.6,-23.5 139.3,-23.5 39.7,0 80.5,4.9 122,14.5 -9.8,-133.1 -112.4,-262.7 -261.7,-262.7 -160.5,0 -252.7,129.2 -261.7,262.1 41.3,-9.5 81.9,-14.4 121.4,-14.4 72.5,0 121.5,16.2 140.7,24zM623.1,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM646.4,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.2a60.6,60.6 0,0 1,60.6 -60.6zM577.8,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM487.2,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM532.5,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM459,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.3a60.6,60.6 0,0 1,60.7 -60.6z"
-        android:fillColor="#49b04a"/>
-  </group>
+	android:width="108dp"
+	android:height="108dp"
+	android:viewportWidth="108"
+	android:viewportHeight="108">
+	<group
+		android:scaleX="0.05172973"
+		android:scaleY="0.05172973"
+		android:translateX="25.29"
+		android:translateY="29.480108">
+		<path
+			android:pathData="m877,689.3a51.6,51.6 0,0 0,-23.7 -5.8h-40.5c27.8,-41.7 46.3,-92.3 46.3,-153.2 0.1,-34.3 -5.4,-61.2 -10.5,-78.8a83.6,83.6 0,0 1,-0.6 -45.6c14.7,-53.1 5.1,-111.8 5.1,-111.8 -185.1,-57.8 -300.1,-0.5 -300.1,-0.5s-114.8,-57.6 -300,-0.4c0,0 -9.9,58.6 4.7,111.8a83.7,83.7 0,0 1,-0.7 45.6c-5.1,17.6 -10.7,44.5 -10.8,78.8 -0.1,61.3 18.4,112.2 46.4,154.1h-41.3a51.6,51.6 0,0 0,-23.7 5.8c-19.8,10.1 -35.9,32.7 -45.3,63.7 -8.7,28.8 -11,62.1 -6.5,93.9 8.5,59.3 38.8,99.2 75.5,99.2h103.5v-0.1c4.4,-0.2 8.8,-2.2 12.9,-5.9l49.7,-43.8c10.2,-9.1 17.8,-32 20.2,-61.3a248,248 0,0 0,0.7 -25.9c61.4,33.1 113.8,46.2 113.8,46.2s52.5,-13 114.1,-46a245.8,245.8 0,0 0,0.7 25.7c2.4,29.3 10,52.2 20.2,61.3l49.7,43.8c4.2,3.7 8.5,5.6 12.9,5.9v0.1h103.5c36.7,0 67,-39.8 75.5,-99.2 4.6,-31.8 2.3,-65.2 -6.5,-93.9 -9.4,-30.9 -25.5,-53.5 -45.4,-63.7zM404.2,881.4c-0.5,0.3 -25.9,22.9 -40.4,35.7a11.2,11.2 0,0 1,-17.4 -3.3c-21,-41.1 -23.3,-124.9 -8.4,-176.5 25.2,24.3 53.1,44.2 80.1,60.3 1.5,30.4 -4.3,78.1 -14,83.7zM597.1,670.3 L552.4,683 507.7,670.2 540,534.7a57.5,57.5 0,1 1,25.3 0zM758.5,913.8a11.2,11.2 0,0 1,-17.4 3.3c-14.5,-12.8 -39.9,-35.4 -40.4,-35.7 -9.6,-5.6 -15.5,-53.1 -14,-83.5 27.1,-16.1 55,-36 80.3,-60.2 14.8,51.6 12.5,135.1 -8.5,176.1z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m178.9,584.1 l20.6,-40.4a49.4,49.4 0,0 0,-0.5 -46l18.1,-35.3a74.8,74.8 0,0 0,16.4 -0.6c1.4,-6.4 2.9,-12.1 4.3,-16.9a63.6,63.6 0,0 0,0.6 -34.7c-9.9,-36.1 -9.5,-73.8 -7.7,-97.3a75.1,75.1 0,0 0,-68.6 119.1l-19.3,37.7a49.3,49.3 0,0 0,-36.5 26.3l-20.6,40.4a49.3,49.3 0,0 0,-0.5 43.9,82.8 82.8,0 0,0 -74.8,122.8 20,20 0,0 0,35 -19.3,42.8 42.8,0 1,1 42.2,21.8 20,20 0,0 0,2.2 39.9,21.8 21.8,0 0,0 2.3,-0.1 82.8,82.8 0,0 0,54 -135.7,49.3 49.3,0 0,0 32.8,-25.6z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m1099,619.4a82.9,82.9 0,0 0,-73.6 -45.1,49.3 49.3,0 0,0 -3,-37.9l-20.6,-40.4a49.3,49.3 0,0 0,-36.5 -26.3l-19.2,-37.7a75,75 0,0 0,-70.7 -118.8c1.7,23.4 2.1,61.6 -8,97.9a63.6,63.6 0,0 0,0.5 34.7c1.3,4.5 2.7,9.7 4,15.5a75.4,75.4 0,0 0,19.2 1l18.1,35.3a49.4,49.4 0,0 0,-0.5 46l20.6,40.4a49.2,49.2 0,0 0,29 24.6,82.8 82.8,0 0,0 57.8,130.7 22.1,22.1 0,0 0,2.3 0.1,20 20,0 0,0 2.2,-39.9 42.8,42.8 0,1 1,42.2 -21.8,20 20,0 1,0 35,19.3 82.8,82.8 0,0 0,1.3 -77.7z"
+			android:fillColor="#49b04a" />
+		<path
+			android:pathData="m553.1,271.7c19,-7.6 67.6,-23.5 139.3,-23.5 39.7,0 80.5,4.9 122,14.5 -9.8,-133.1 -112.4,-262.7 -261.7,-262.7 -160.5,0 -252.7,129.2 -261.7,262.1 41.3,-9.5 81.9,-14.4 121.4,-14.4 72.5,0 121.5,16.2 140.7,24zM623.1,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM646.4,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.2a60.6,60.6 0,0 1,60.6 -60.6zM577.8,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM487.2,216.9a11.5,11.5 0,1 1,11.5 -11.5,11.5 11.5,0 0,1 -11.5,11.5zM532.5,193.9a11.5,11.5 0,1 1,-11.5 11.5,11.5 11.5,0 0,1 11.6,-11.5zM459,107.1a60.6,60.6 0,0 1,60.6 60.6h-121.3a60.6,60.6 0,0 1,60.7 -60.6z"
+			android:fillColor="#49b04a" />
+	</group>
 </vector>
diff --git a/presentation/src/main/res/drawable/local_fs_vault.xml b/presentation/src/main/res/drawable/local_fs_vault.xml
index 28876ee61..8629f005a 100644
--- a/presentation/src/main/res/drawable/local_fs_vault.xml
+++ b/presentation/src/main/res/drawable/local_fs_vault.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM10,36.008a20.4,20.4 0,0 1,3.315 -9.108,16.8 16.8,0 0,1 5.49,-5.295l0.615,-0.345 -3.03,-5.115a0.765,0.765 0,0 1,0.255 -1.05,0.75 0.75,0 0,1 1.029,0.259l0.006,0.011 3.12,5.25a18.931,18.931 0,0 1,7.26 -1.35,18.3 18.3,0 0,1 7.125,1.35l3.1,-5.25a0.75,0.75 0,0 1,1.026 -0.27l0.024,0.015a0.765,0.765 0,0 1,0.24 1.05l-3.03,5.13 0.75,0.42a17.069,17.069 0,0 1,5.445 5.43,21.719 21.719,0 0,1 3.26,8.868zM19.75,27.788a1.5,1.5 0,1 0,1.5 1.5,1.5 1.5,0 0,0 -1.5,-1.5zM36.25,27.788a1.5,1.5 0,1 0,1.5 1.5,1.5 1.5,0 0,0 -1.5,-1.5z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM10,36.008a20.4,20.4 0,0 1,3.315 -9.108,16.8 16.8,0 0,1 5.49,-5.295l0.615,-0.345 -3.03,-5.115a0.765,0.765 0,0 1,0.255 -1.05,0.75 0.75,0 0,1 1.029,0.259l0.006,0.011 3.12,5.25a18.931,18.931 0,0 1,7.26 -1.35,18.3 18.3,0 0,1 7.125,1.35l3.1,-5.25a0.75,0.75 0,0 1,1.026 -0.27l0.024,0.015a0.765,0.765 0,0 1,0.24 1.05l-3.03,5.13 0.75,0.42a17.069,17.069 0,0 1,5.445 5.43,21.719 21.719,0 0,1 3.26,8.868zM19.75,27.788a1.5,1.5 0,1 0,1.5 1.5,1.5 1.5,0 0,0 -1.5,-1.5zM36.25,27.788a1.5,1.5 0,1 0,1.5 1.5,1.5 1.5,0 0,0 -1.5,-1.5z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/local_fs_vault_selected.xml b/presentation/src/main/res/drawable/local_fs_vault_selected.xml
index 9e6e392af..337d5a6e3 100644
--- a/presentation/src/main/res/drawable/local_fs_vault_selected.xml
+++ b/presentation/src/main/res/drawable/local_fs_vault_selected.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM46,36.008h-36a20.4,20.4 0,0 1,3.315 -9.108,16.8 16.8,0 0,1 5.49,-5.295l0.615,-0.345 -3.03,-5.115a0.765,0.765 0,0 1,0.255 -1.05,0.75 0.75,0 0,1 1.029,0.259l0.007,0.011 3.12,5.25a18.931,18.931 0,0 1,7.26 -1.35,18.3 18.3,0 0,1 7.125,1.35l3.105,-5.25a0.75,0.75 0,0 1,1.026 -0.27l0.024,0.015a0.765,0.765 0,0 1,0.24 1.05l-3.03,5.13 0.75,0.42a17.069,17.069 0,0 1,5.445 5.43,21.725 21.725,0 0,1 3.254,8.868zM34.75,29.288a1.5,1.5 0,1 0,1.5 -1.5,1.5 1.5,0 0,0 -1.5,1.5zM18.25,29.288a1.5,1.5 0,1 0,1.5 -1.5,1.5 1.5,0 0,0 -1.5,1.5z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM46,36.008h-36a20.4,20.4 0,0 1,3.315 -9.108,16.8 16.8,0 0,1 5.49,-5.295l0.615,-0.345 -3.03,-5.115a0.765,0.765 0,0 1,0.255 -1.05,0.75 0.75,0 0,1 1.029,0.259l0.007,0.011 3.12,5.25a18.931,18.931 0,0 1,7.26 -1.35,18.3 18.3,0 0,1 7.125,1.35l3.105,-5.25a0.75,0.75 0,0 1,1.026 -0.27l0.024,0.015a0.765,0.765 0,0 1,0.24 1.05l-3.03,5.13 0.75,0.42a17.069,17.069 0,0 1,5.445 5.43,21.725 21.725,0 0,1 3.254,8.868zM34.75,29.288a1.5,1.5 0,1 0,1.5 -1.5,1.5 1.5,0 0,0 -1.5,1.5zM18.25,29.288a1.5,1.5 0,1 0,1.5 -1.5,1.5 1.5,0 0,0 -1.5,1.5z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/onedrive_vault.xml b/presentation/src/main/res/drawable/onedrive_vault.xml
index 3441917f6..ad9607ac5 100644
--- a/presentation/src/main/res/drawable/onedrive_vault.xml
+++ b/presentation/src/main/res/drawable/onedrive_vault.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM46.387,34.345a7.765,7.765 0,0 1,-1.661 2.417,7.928 7.928,0 0,1 -2.448,1.639 7.485,7.485 0,0 1,-3 0.6h-20.778a9.242,9.242 0,0 1,-3.692 -0.742,9.691 9.691,0 0,1 -3.015,-2.015 9.559,9.559 0,0 1,-2.042 -2.973,9.161 9.161,0 0,1 -0.26,-6.59 9.7,9.7 0,0 1,1.365 -2.59,9.523 9.523,0 0,1 2.1,-2.07 8.937,8.937 0,0 1,4.055 -1.637q0.659,-0.095 1.363,-0.128h0.019a11.419,11.419 0,0 1,1.911 -2.208,12.127 12.127,0 0,1 2.375,-1.665 11.676,11.676 0,0 1,2.7 -1.043,11.877 11.877,0 0,1 2.921,-0.358 11.714,11.714 0,0 1,3.889 0.651,12.256 12.256,0 0,1 3.395,1.812 11.672,11.672 0,0 1,2.616 2.785,11.389 11.389,0 0,1 1.6,3.562 7.371,7.371 0,0 1,2.829 0.731,7.952 7.952,0 0,1 2.283,1.665 7.709,7.709 0,0 1,1.529 2.362,7.3 7.3,0 0,1 0.559,2.838 7.21,7.21 0,0 1,-0.613 2.957zM16.541,36.387a7.1,7.1 0,0 0,1.959 0.273h20.781a5.294,5.294 0,0 0,3.228 -1.081l-11.448,-6.755 -16.309,6.776a7.232,7.232 0,0 0,1.789 0.787zM18.407,22.6a6.639,6.639 0,0 0,-2.727 0.569,7.2 7.2,0 0,0 -3.748,3.771 6.675,6.675 0,0 0,-0.557 2.691,7.077 7.077,0 0,0 0.37,2.223 6.37,6.37 0,0 0,1.077 2.006l15.7,-6.536 -6.067,-3.588a8.355,8.355 0,0 0,-1.955 -0.836,7.545 7.545,0 0,0 -2.093,-0.3zM36,21.2a9.465,9.465 0,0 0,-2.088 -2.059,9.7 9.7,0 0,0 -2.625,-1.337 9.389,9.389 0,0 0,-2.986 -0.475,9.637 9.637,0 0,0 -3.99,0.849 8.983,8.983 0,0 0,-3.23 2.445,8.706 8.706,0 0,1 1.346,0.467 11.386,11.386 0,0 1,1.254 0.65l7.568,4.468 4.324,-1.8a8.864,8.864 0,0 1,0.863 -0.318,8.023 8.023,0 0,1 0.918,-0.23 8.985,8.985 0,0 0,-1.354 -2.66zM44.164,29.19a5.009,5.009 0,0 0,-1.252 -1.675,5.654 5.654,0 0,0 -1.846,-1.062 6.612,6.612 0,0 0,-2.226 -0.375,5.738 5.738,0 0,0 -1.327,0.156 10.68,10.68 0,0 0,-1.29 0.394q-0.63,0.237 -1.243,0.522t-1.2,0.539l10.279,6.078a5.2,5.2 0,0 0,0.575 -2.379,5.112 5.112,0 0,0 -0.473,-2.196z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM46.387,34.345a7.765,7.765 0,0 1,-1.661 2.417,7.928 7.928,0 0,1 -2.448,1.639 7.485,7.485 0,0 1,-3 0.6h-20.778a9.242,9.242 0,0 1,-3.692 -0.742,9.691 9.691,0 0,1 -3.015,-2.015 9.559,9.559 0,0 1,-2.042 -2.973,9.161 9.161,0 0,1 -0.26,-6.59 9.7,9.7 0,0 1,1.365 -2.59,9.523 9.523,0 0,1 2.1,-2.07 8.937,8.937 0,0 1,4.055 -1.637q0.659,-0.095 1.363,-0.128h0.019a11.419,11.419 0,0 1,1.911 -2.208,12.127 12.127,0 0,1 2.375,-1.665 11.676,11.676 0,0 1,2.7 -1.043,11.877 11.877,0 0,1 2.921,-0.358 11.714,11.714 0,0 1,3.889 0.651,12.256 12.256,0 0,1 3.395,1.812 11.672,11.672 0,0 1,2.616 2.785,11.389 11.389,0 0,1 1.6,3.562 7.371,7.371 0,0 1,2.829 0.731,7.952 7.952,0 0,1 2.283,1.665 7.709,7.709 0,0 1,1.529 2.362,7.3 7.3,0 0,1 0.559,2.838 7.21,7.21 0,0 1,-0.613 2.957zM16.541,36.387a7.1,7.1 0,0 0,1.959 0.273h20.781a5.294,5.294 0,0 0,3.228 -1.081l-11.448,-6.755 -16.309,6.776a7.232,7.232 0,0 0,1.789 0.787zM18.407,22.6a6.639,6.639 0,0 0,-2.727 0.569,7.2 7.2,0 0,0 -3.748,3.771 6.675,6.675 0,0 0,-0.557 2.691,7.077 7.077,0 0,0 0.37,2.223 6.37,6.37 0,0 0,1.077 2.006l15.7,-6.536 -6.067,-3.588a8.355,8.355 0,0 0,-1.955 -0.836,7.545 7.545,0 0,0 -2.093,-0.3zM36,21.2a9.465,9.465 0,0 0,-2.088 -2.059,9.7 9.7,0 0,0 -2.625,-1.337 9.389,9.389 0,0 0,-2.986 -0.475,9.637 9.637,0 0,0 -3.99,0.849 8.983,8.983 0,0 0,-3.23 2.445,8.706 8.706,0 0,1 1.346,0.467 11.386,11.386 0,0 1,1.254 0.65l7.568,4.468 4.324,-1.8a8.864,8.864 0,0 1,0.863 -0.318,8.023 8.023,0 0,1 0.918,-0.23 8.985,8.985 0,0 0,-1.354 -2.66zM44.164,29.19a5.009,5.009 0,0 0,-1.252 -1.675,5.654 5.654,0 0,0 -1.846,-1.062 6.612,6.612 0,0 0,-2.226 -0.375,5.738 5.738,0 0,0 -1.327,0.156 10.68,10.68 0,0 0,-1.29 0.394q-0.63,0.237 -1.243,0.522t-1.2,0.539l10.279,6.078a5.2,5.2 0,0 0,0.575 -2.379,5.112 5.112,0 0,0 -0.473,-2.196z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/onedrive_vault_selected.xml b/presentation/src/main/res/drawable/onedrive_vault_selected.xml
index 6908527fc..e7bb483c1 100644
--- a/presentation/src/main/res/drawable/onedrive_vault_selected.xml
+++ b/presentation/src/main/res/drawable/onedrive_vault_selected.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM46.443,28.551a7.721,7.721 0,0 0,-1.53 -2.362,7.947 7.947,0 0,0 -2.283,-1.665 7.371,7.371 0,0 0,-2.829 -0.731,11.389 11.389,0 0,0 -1.6,-3.562 11.672,11.672 0,0 0,-2.625 -2.781,12.256 12.256,0 0,0 -3.395,-1.812 11.714,11.714 0,0 0,-3.889 -0.651,11.877 11.877,0 0,0 -2.921,0.358 11.676,11.676 0,0 0,-2.7 1.043,12.127 12.127,0 0,0 -2.375,1.665 11.419,11.419 0,0 0,-1.911 2.208h-0.015q-0.7,0.034 -1.363,0.128a8.937,8.937 0,0 0,-4.055 1.637,9.523 9.523,0 0,0 -2.1,2.07 9.7,9.7 0,0 0,-1.365 2.59,9.162 9.162,0 0,0 0.26,6.59 9.559,9.559 0,0 0,2.043 2.973,9.691 9.691,0 0,0 3.015,2.015 9.242,9.242 0,0 0,3.692 0.742h20.784a7.485,7.485 0,0 0,3 -0.6,7.918 7.918,0 0,0 2.448,-1.639 7.758,7.758 0,0 0,1.661 -2.417,7.2 7.2,0 0,0 0.613,-2.957 7.311,7.311 0,0 0,-0.56 -2.842zM33.771,27.691q0.594,-0.256 1.205,-0.539t1.243,-0.522a10.68,10.68 0,0 1,1.29 -0.394,5.738 5.738,0 0,1 1.327,-0.156 6.612,6.612 0,0 1,2.226 0.375,5.654 5.654,0 0,1 1.846,1.062 5.008,5.008 0,0 1,1.252 1.675,5.115 5.115,0 0,1 0.464,2.2 5.2,5.2 0,0 1,-0.575 2.379zM35.571,24.413 L31.247,26.213 23.679,21.745a11.386,11.386 0,0 0,-1.254 -0.65,8.706 8.706,0 0,0 -1.346,-0.467 8.983,8.983 0,0 1,3.23 -2.445,9.637 9.637,0 0,1 3.99,-0.849 9.389,9.389 0,0 1,2.986 0.475,9.7 9.7,0 0,1 2.625,1.337 9.465,9.465 0,0 1,2.09 2.054,8.985 8.985,0 0,1 1.354,2.663 8.023,8.023 0,0 0,-0.918 0.23,8.864 8.864,0 0,0 -0.866,0.32zM28.52,27.325 L12.82,33.861a6.37,6.37 0,0 1,-1.077 -2.006,7.077 7.077,0 0,1 -0.371,-2.223 6.675,6.675 0,0 1,0.557 -2.691,7.2 7.2,0 0,1 3.748,-3.771 6.639,6.639 0,0 1,2.727 -0.569,7.545 7.545,0 0,1 2.1,0.294 8.355,8.355 0,0 1,1.948 0.842zM42.51,35.581a5.294,5.294 0,0 1,-3.228 1.081h-20.781a7.1,7.1 0,0 1,-1.959 -0.273,7.232 7.232,0 0,1 -1.789,-0.787l16.31,-6.774z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM46.443,28.551a7.721,7.721 0,0 0,-1.53 -2.362,7.947 7.947,0 0,0 -2.283,-1.665 7.371,7.371 0,0 0,-2.829 -0.731,11.389 11.389,0 0,0 -1.6,-3.562 11.672,11.672 0,0 0,-2.625 -2.781,12.256 12.256,0 0,0 -3.395,-1.812 11.714,11.714 0,0 0,-3.889 -0.651,11.877 11.877,0 0,0 -2.921,0.358 11.676,11.676 0,0 0,-2.7 1.043,12.127 12.127,0 0,0 -2.375,1.665 11.419,11.419 0,0 0,-1.911 2.208h-0.015q-0.7,0.034 -1.363,0.128a8.937,8.937 0,0 0,-4.055 1.637,9.523 9.523,0 0,0 -2.1,2.07 9.7,9.7 0,0 0,-1.365 2.59,9.162 9.162,0 0,0 0.26,6.59 9.559,9.559 0,0 0,2.043 2.973,9.691 9.691,0 0,0 3.015,2.015 9.242,9.242 0,0 0,3.692 0.742h20.784a7.485,7.485 0,0 0,3 -0.6,7.918 7.918,0 0,0 2.448,-1.639 7.758,7.758 0,0 0,1.661 -2.417,7.2 7.2,0 0,0 0.613,-2.957 7.311,7.311 0,0 0,-0.56 -2.842zM33.771,27.691q0.594,-0.256 1.205,-0.539t1.243,-0.522a10.68,10.68 0,0 1,1.29 -0.394,5.738 5.738,0 0,1 1.327,-0.156 6.612,6.612 0,0 1,2.226 0.375,5.654 5.654,0 0,1 1.846,1.062 5.008,5.008 0,0 1,1.252 1.675,5.115 5.115,0 0,1 0.464,2.2 5.2,5.2 0,0 1,-0.575 2.379zM35.571,24.413 L31.247,26.213 23.679,21.745a11.386,11.386 0,0 0,-1.254 -0.65,8.706 8.706,0 0,0 -1.346,-0.467 8.983,8.983 0,0 1,3.23 -2.445,9.637 9.637,0 0,1 3.99,-0.849 9.389,9.389 0,0 1,2.986 0.475,9.7 9.7,0 0,1 2.625,1.337 9.465,9.465 0,0 1,2.09 2.054,8.985 8.985,0 0,1 1.354,2.663 8.023,8.023 0,0 0,-0.918 0.23,8.864 8.864,0 0,0 -0.866,0.32zM28.52,27.325 L12.82,33.861a6.37,6.37 0,0 1,-1.077 -2.006,7.077 7.077,0 0,1 -0.371,-2.223 6.675,6.675 0,0 1,0.557 -2.691,7.2 7.2,0 0,1 3.748,-3.771 6.639,6.639 0,0 1,2.727 -0.569,7.545 7.545,0 0,1 2.1,0.294 8.355,8.355 0,0 1,1.948 0.842zM42.51,35.581a5.294,5.294 0,0 1,-3.228 1.081h-20.781a7.1,7.1 0,0 1,-1.959 -0.273,7.232 7.232,0 0,1 -1.789,-0.787l16.31,-6.774z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/pcloud_vault.xml b/presentation/src/main/res/drawable/pcloud_vault.xml
index ac96fe18d..49df941d7 100644
--- a/presentation/src/main/res/drawable/pcloud_vault.xml
+++ b/presentation/src/main/res/drawable/pcloud_vault.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM40.338,37.994v0.006h-21.774a8.514,8.514 0,0 1,-1.075 -16.965,11.4 11.4,0 0,0 -1.049,4.768c0,0.093 0.009,0.184 0.011,0.277a11.562,11.562 0,0 1,23.106 0.051c0,-0.109 0.01,-0.218 0.01,-0.328a11.279,11.279 0,0 0,-1.04 -4.752,4.8 4.8,0 0,1 2.807,9.033 4.854,4.854 0,0 0,2.507 -2.319,5.739 5.739,0 0,1 -3.503,10.229zM27.912,17.217a9.261,9.261 0,1 0,9.307 9.26,9.284 9.284,0 0,0 -9.307,-9.26zM27.912,34.529a8.066,8.066 0,1 1,8.106 -8.065,8.086 8.086,0 0,1 -8.11,8.065zM29.332,21.957h-3.843a1.3,1.3 0,0 0,-1.307 1.3v7.055a1.307,1.307 0,0 0,2.614 0v-1.5h2.532a3.425,3.425 0,1 0,0 -6.855zM29.342,26.397h-2.556v-2.025h2.553a1.013,1.013 0,1 1,-0.001 2.028z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM40.338,37.994v0.006h-21.774a8.514,8.514 0,0 1,-1.075 -16.965,11.4 11.4,0 0,0 -1.049,4.768c0,0.093 0.009,0.184 0.011,0.277a11.562,11.562 0,0 1,23.106 0.051c0,-0.109 0.01,-0.218 0.01,-0.328a11.279,11.279 0,0 0,-1.04 -4.752,4.8 4.8,0 0,1 2.807,9.033 4.854,4.854 0,0 0,2.507 -2.319,5.739 5.739,0 0,1 -3.503,10.229zM27.912,17.217a9.261,9.261 0,1 0,9.307 9.26,9.284 9.284,0 0,0 -9.307,-9.26zM27.912,34.529a8.066,8.066 0,1 1,8.106 -8.065,8.086 8.086,0 0,1 -8.11,8.065zM29.332,21.957h-3.843a1.3,1.3 0,0 0,-1.307 1.3v7.055a1.307,1.307 0,0 0,2.614 0v-1.5h2.532a3.425,3.425 0,1 0,0 -6.855zM29.342,26.397h-2.556v-2.025h2.553a1.013,1.013 0,1 1,-0.001 2.028z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/pcloud_vault_selected.xml b/presentation/src/main/res/drawable/pcloud_vault_selected.xml
index e64095db0..c61b05a4d 100644
--- a/presentation/src/main/res/drawable/pcloud_vault_selected.xml
+++ b/presentation/src/main/res/drawable/pcloud_vault_selected.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM43.84,27.769a4.854,4.854 0,0 1,-2.507 2.319,4.8 4.8,0 0,0 -2.807,-9.033 11.279,11.279 0,0 1,1.04 4.752c0,0.11 -0.006,0.219 -0.01,0.328a11.562,11.562 0,0 0,-23.106 -0.051c0,-0.093 -0.011,-0.184 -0.011,-0.277a11.4,11.4 0,0 1,1.049 -4.768,8.514 8.514,0 0,0 1.076,16.961h21.774v-0.01a5.739,5.739 0,0 0,3.502 -10.221zM27.912,35.738a9.261,9.261 0,1 1,9.307 -9.261,9.284 9.284,0 0,1 -9.307,9.261zM29.338,24.372h-2.552v2.028h2.552a1.013,1.013 0,1 0,0 -2.028zM27.908,18.398a8.066,8.066 0,1 0,8.106 8.066,8.087 8.087,0 0,0 -8.106,-8.064zM29.328,28.807h-2.528v1.5a1.307,1.307 0,0 1,-2.614 0v-7.055a1.3,1.3 0,0 1,1.307 -1.3h3.839a3.425,3.425 0,1 1,-0.004 6.855z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM43.84,27.769a4.854,4.854 0,0 1,-2.507 2.319,4.8 4.8,0 0,0 -2.807,-9.033 11.279,11.279 0,0 1,1.04 4.752c0,0.11 -0.006,0.219 -0.01,0.328a11.562,11.562 0,0 0,-23.106 -0.051c0,-0.093 -0.011,-0.184 -0.011,-0.277a11.4,11.4 0,0 1,1.049 -4.768,8.514 8.514,0 0,0 1.076,16.961h21.774v-0.01a5.739,5.739 0,0 0,3.502 -10.221zM27.912,35.738a9.261,9.261 0,1 1,9.307 -9.261,9.284 9.284,0 0,1 -9.307,9.261zM29.338,24.372h-2.552v2.028h2.552a1.013,1.013 0,1 0,0 -2.028zM27.908,18.398a8.066,8.066 0,1 0,8.106 8.066,8.087 8.087,0 0,0 -8.106,-8.064zM29.328,28.807h-2.528v1.5a1.307,1.307 0,0 1,-2.614 0v-7.055a1.3,1.3 0,0 1,1.307 -1.3h3.839a3.425,3.425 0,1 1,-0.004 6.855z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/s3_vault.xml b/presentation/src/main/res/drawable/s3_vault.xml
index 98f64a853..a0fec6dcb 100644
--- a/presentation/src/main/res/drawable/s3_vault.xml
+++ b/presentation/src/main/res/drawable/s3_vault.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM44.733,30.571a1.849,1.849 0,0 1,-1.469 0.5,9.127 9.127,0 0,1 -1.971,-0.275l-1.426,9.655c-0.077,2.304 -6.067,3.549 -11.705,3.549 -4.543,0 -11.737,-0.966 -11.816,-3.555l-3.3,-23.155 -0.056,-0.431c-0.003,-1.981 5.91,-4.859 15.175,-4.859s15.178,2.877 15.178,4.857l-0.061,0.453 -1.414,9.578c1.992,1.091 2.97,1.943 3.124,2.734a1.082,1.082 0,0 1,-0.259 0.949zM17.533,40.323a0.557,0.557 0,0 1,0.005 0.078c0,0.866 4.035,2.456 10.627,2.456 6.523,0 10.515,-1.59 10.515,-2.456a0.519,0.519 0,0 1,0.006 -0.081l1.451,-9.832a92.762,92.762 0,0 1,-11.119 -4.339,1.457 1.457,0 0,1 -0.909,0.321 1.374,1.374 0,1 1,1.428 -1.37v0.023a95.593,95.593 0,0 0,10.763 4.222l1.52,-10.274c-2.63,1.729 -8.265,2.643 -13.655,2.643s-11.043,-0.914 -13.665,-2.651zM42.153,17.1v-0.255c-0.044,-0.752 -4.545,-3.7 -13.988,-3.7s-13.945,2.95 -13.988,3.7v0.249c0.5,1.689 6.338,3.478 13.988,3.478s13.47,-1.784 13.988,-3.472zM41.689,28.108 L41.46,29.653c2,0.472 2.36,0.184 2.363,0.181s-0.023,-0.514 -2.134,-1.726z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM44.733,30.571a1.849,1.849 0,0 1,-1.469 0.5,9.127 9.127,0 0,1 -1.971,-0.275l-1.426,9.655c-0.077,2.304 -6.067,3.549 -11.705,3.549 -4.543,0 -11.737,-0.966 -11.816,-3.555l-3.3,-23.155 -0.056,-0.431c-0.003,-1.981 5.91,-4.859 15.175,-4.859s15.178,2.877 15.178,4.857l-0.061,0.453 -1.414,9.578c1.992,1.091 2.97,1.943 3.124,2.734a1.082,1.082 0,0 1,-0.259 0.949zM17.533,40.323a0.557,0.557 0,0 1,0.005 0.078c0,0.866 4.035,2.456 10.627,2.456 6.523,0 10.515,-1.59 10.515,-2.456a0.519,0.519 0,0 1,0.006 -0.081l1.451,-9.832a92.762,92.762 0,0 1,-11.119 -4.339,1.457 1.457,0 0,1 -0.909,0.321 1.374,1.374 0,1 1,1.428 -1.37v0.023a95.593,95.593 0,0 0,10.763 4.222l1.52,-10.274c-2.63,1.729 -8.265,2.643 -13.655,2.643s-11.043,-0.914 -13.665,-2.651zM42.153,17.1v-0.255c-0.044,-0.752 -4.545,-3.7 -13.988,-3.7s-13.945,2.95 -13.988,3.7v0.249c0.5,1.689 6.338,3.478 13.988,3.478s13.47,-1.784 13.988,-3.472zM41.689,28.108 L41.46,29.653c2,0.472 2.36,0.184 2.363,0.181s-0.023,-0.514 -2.134,-1.726z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/s3_vault_selected.xml b/presentation/src/main/res/drawable/s3_vault_selected.xml
index ae07a5a7e..b935b52a7 100644
--- a/presentation/src/main/res/drawable/s3_vault_selected.xml
+++ b/presentation/src/main/res/drawable/s3_vault_selected.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM41.46,29.653 L41.689,28.108c2.108,1.212 2.135,1.712 2.135,1.726s-0.363,0.291 -2.363,-0.181zM40.3,29.345a95.593,95.593 0,0 1,-10.769 -4.224c0,-0.008 0,-0.015 0,-0.023a1.432,1.432 0,1 0,-1.431 1.373,1.457 1.457,0 0,0 0.909,-0.321 92.762,92.762 0,0 0,11.119 4.339l-1.445,9.831a0.519,0.519 0,0 0,-0.006 0.081c0,0.866 -3.992,2.456 -10.515,2.456 -6.592,0 -10.627,-1.59 -10.627,-2.456a0.557,0.557 0,0 0,-0.005 -0.078l-3.03,-21.26c2.624,1.734 8.269,2.652 13.668,2.652s11.023,-0.915 13.652,-2.644zM14.174,16.845c0.043,-0.752 4.544,-3.7 13.988,-3.7s13.944,2.949 13.988,3.7v0.255c-0.518,1.686 -6.351,3.47 -13.988,3.47s-13.486,-1.79 -13.988,-3.478zM43.34,16.858c0,-1.98 -5.913,-4.857 -15.178,-4.857s-15.178,2.877 -15.178,4.857l0.056,0.431 3.3,23.155c0.084,2.59 7.278,3.556 11.822,3.556 5.638,0 11.628,-1.245 11.705,-3.553l1.426,-9.655a9.127,9.127 0,0 0,1.971 0.275,1.85 1.85,0 0,0 1.469,-0.5 1.081,1.081 0,0 0,0.259 -0.948c-0.154,-0.791 -1.132,-1.643 -3.123,-2.734l1.414,-9.578z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM41.46,29.653 L41.689,28.108c2.108,1.212 2.135,1.712 2.135,1.726s-0.363,0.291 -2.363,-0.181zM40.3,29.345a95.593,95.593 0,0 1,-10.769 -4.224c0,-0.008 0,-0.015 0,-0.023a1.432,1.432 0,1 0,-1.431 1.373,1.457 1.457,0 0,0 0.909,-0.321 92.762,92.762 0,0 0,11.119 4.339l-1.445,9.831a0.519,0.519 0,0 0,-0.006 0.081c0,0.866 -3.992,2.456 -10.515,2.456 -6.592,0 -10.627,-1.59 -10.627,-2.456a0.557,0.557 0,0 0,-0.005 -0.078l-3.03,-21.26c2.624,1.734 8.269,2.652 13.668,2.652s11.023,-0.915 13.652,-2.644zM14.174,16.845c0.043,-0.752 4.544,-3.7 13.988,-3.7s13.944,2.949 13.988,3.7v0.255c-0.518,1.686 -6.351,3.47 -13.988,3.47s-13.486,-1.79 -13.988,-3.478zM43.34,16.858c0,-1.98 -5.913,-4.857 -15.178,-4.857s-15.178,2.877 -15.178,4.857l0.056,0.431 3.3,23.155c0.084,2.59 7.278,3.556 11.822,3.556 5.638,0 11.628,-1.245 11.705,-3.553l1.426,-9.655a9.127,9.127 0,0 0,1.971 0.275,1.85 1.85,0 0,0 1.469,-0.5 1.081,1.081 0,0 0,0.259 -0.948c-0.154,-0.791 -1.132,-1.643 -3.123,-2.734l1.414,-9.578z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/webdav_vault.xml b/presentation/src/main/res/drawable/webdav_vault.xml
index d203134fc..0006a61a5 100644
--- a/presentation/src/main/res/drawable/webdav_vault.xml
+++ b/presentation/src/main/res/drawable/webdav_vault.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM43.884,37.026 L44.294,38.666h-4.922l-6.154,-20.512h3.824a13.4,13.4 0,0 1,0.278 2.872l-0.41,5.333h0.821l0.41,-5.333a13.574,13.574 0,0 0,-0.2 -2.872h0.2l4.1,13.948 4.1,-13.948h3.282zM31.577,12.821c-3.635,0 -6.738,2.095 -9.293,5.049a5.215,5.215 0,0 1,3.922 4.558l0.858,-2.633 -0.41,-1.641h4.923l6.154,20.512h-5.331l-0.4,-1.346a25.741,25.741 0,0 0,1.635 -2.346l1.231,0.821 -0.41,-3.282 -2.872,1.231 1.231,0.82s-0.415,0.67 -1.156,1.615l-0.485,-1.615h-5.341l-1.231,4.1h-3.692l1.118,-3.429a9.919,9.919 0,0 1,-4.906 3.237c0.858,2.3 2.355,3.885 4.609,3.885 4.428,0 8.131,-3.9 9.92,-6.18l0.342,1.141c-2.07,2.674 -5.9,6.68 -10.263,6.68 -2.887,0 -4.919,-2.159 -5.9,-5.343 -0.086,0 -0.171,0.009 -0.257,0.009h-8.2l4.927,-21.331h6.154a13.028,13.028 0,0 1,3.367 0.4c3.8,-4.22 7.788,-5.73 9.761,-5.73 4.445,0 5.9,3.512 6.363,6.154h-0.9c-0.493,-2.369 -1.832,-5.336 -5.468,-5.336zM30.346,31.282 L28.705,25.128 27.064,31.282zM18.446,20.616h-1.638l-3.282,14.769h1.708a21.99,21.99 0,0 1,2.394 -11.485,31.251 31.251,0 0,1 1.8,-3.085 2.47,2.47 0,0 0,-0.979 -0.199zM20.908,23.487a2.938,2.938 0,0 0,-1.01 -2.407c-0.674,1.046 -1.294,2.134 -1.862,3.228a20.362,20.362 0,0 0,-1.675 10.874c2.209,-1.075 4.547,-6.286 4.547,-10.054z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM28,4a24,24 0,1 0,24 24,24 24,0 0,0 -24,-24zM43.884,37.026 L44.294,38.666h-4.922l-6.154,-20.512h3.824a13.4,13.4 0,0 1,0.278 2.872l-0.41,5.333h0.821l0.41,-5.333a13.574,13.574 0,0 0,-0.2 -2.872h0.2l4.1,13.948 4.1,-13.948h3.282zM31.577,12.821c-3.635,0 -6.738,2.095 -9.293,5.049a5.215,5.215 0,0 1,3.922 4.558l0.858,-2.633 -0.41,-1.641h4.923l6.154,20.512h-5.331l-0.4,-1.346a25.741,25.741 0,0 0,1.635 -2.346l1.231,0.821 -0.41,-3.282 -2.872,1.231 1.231,0.82s-0.415,0.67 -1.156,1.615l-0.485,-1.615h-5.341l-1.231,4.1h-3.692l1.118,-3.429a9.919,9.919 0,0 1,-4.906 3.237c0.858,2.3 2.355,3.885 4.609,3.885 4.428,0 8.131,-3.9 9.92,-6.18l0.342,1.141c-2.07,2.674 -5.9,6.68 -10.263,6.68 -2.887,0 -4.919,-2.159 -5.9,-5.343 -0.086,0 -0.171,0.009 -0.257,0.009h-8.2l4.927,-21.331h6.154a13.028,13.028 0,0 1,3.367 0.4c3.8,-4.22 7.788,-5.73 9.761,-5.73 4.445,0 5.9,3.512 6.363,6.154h-0.9c-0.493,-2.369 -1.832,-5.336 -5.468,-5.336zM30.346,31.282 L28.705,25.128 27.064,31.282zM18.446,20.616h-1.638l-3.282,14.769h1.708a21.99,21.99 0,0 1,2.394 -11.485,31.251 31.251,0 0,1 1.8,-3.085 2.47,2.47 0,0 0,-0.979 -0.199zM20.908,23.487a2.938,2.938 0,0 0,-1.01 -2.407c-0.674,1.046 -1.294,2.134 -1.862,3.228a20.362,20.362 0,0 0,-1.675 10.874c2.209,-1.075 4.547,-6.286 4.547,-10.054z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/drawable/webdav_vault_selected.xml b/presentation/src/main/res/drawable/webdav_vault_selected.xml
index e7428f38f..0834fc71d 100644
--- a/presentation/src/main/res/drawable/webdav_vault_selected.xml
+++ b/presentation/src/main/res/drawable/webdav_vault_selected.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="56dp"
-    android:height="56dp"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-  <path
-      android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM43.884,37.026 L44.295,38.666h-4.923l-6.154,-20.512h3.824a13.4,13.4 0,0 1,0.278 2.872l-0.41,5.333h0.82l0.41,-5.333a13.574,13.574 0,0 0,-0.2 -2.872h0.2l4.1,13.948 4.1,-13.948h3.282zM37.042,18.154c-0.49,-2.366 -1.829,-5.333 -5.465,-5.333s-6.738,2.095 -9.293,5.049a5.215,5.215 0,0 1,3.922 4.558l0.858,-2.633 -0.41,-1.641h4.923l6.154,20.512h-5.331l-0.4,-1.346a25.741,25.741 0,0 0,1.635 -2.346l1.231,0.821 -0.41,-3.282 -2.872,1.231 1.231,0.82s-0.415,0.67 -1.156,1.615l-0.485,-1.615h-5.341l-1.231,4.1h-3.692l1.118,-3.429a9.919,9.919 0,0 1,-4.906 3.237c0.858,2.3 2.355,3.885 4.609,3.885 4.428,0 8.131,-3.9 9.92,-6.18l0.342,1.141c-2.07,2.674 -5.9,6.68 -10.263,6.68 -2.887,0 -4.919,-2.159 -5.9,-5.343 -0.086,0 -0.171,0.009 -0.257,0.009h-8.2l4.927,-21.331h6.154a13.028,13.028 0,0 1,3.367 0.4c3.8,-4.22 7.788,-5.73 9.761,-5.73 4.445,0 5.9,3.512 6.363,6.154h-0.9zM30.342,31.282 L28.701,25.128 27.06,31.282zM20.906,25.128v-1.641a2.938,2.938 0,0 0,-1.01 -2.407c-0.674,1.046 -1.294,2.134 -1.862,3.228a20.362,20.362 0,0 0,-1.675 10.874c2.214,-1.075 4.551,-6.282 4.551,-10.054zM18.444,20.616h-1.636l-3.282,14.769h1.708a21.99,21.99 0,0 1,2.394 -11.485,31.251 31.251,0 0,1 1.8,-3.085 2.47,2.47 0,0 0,-0.979 -0.199z"
-      android:fillColor="#49b04a"
-      android:fillType="evenOdd"/>
+	android:width="56dp"
+	android:height="56dp"
+	android:viewportWidth="56"
+	android:viewportHeight="56">
+	<path
+		android:pathData="m28,56a28,28 0,1 1,28 -28,28 28,0 0,1 -28,28zM43.884,37.026 L44.295,38.666h-4.923l-6.154,-20.512h3.824a13.4,13.4 0,0 1,0.278 2.872l-0.41,5.333h0.82l0.41,-5.333a13.574,13.574 0,0 0,-0.2 -2.872h0.2l4.1,13.948 4.1,-13.948h3.282zM37.042,18.154c-0.49,-2.366 -1.829,-5.333 -5.465,-5.333s-6.738,2.095 -9.293,5.049a5.215,5.215 0,0 1,3.922 4.558l0.858,-2.633 -0.41,-1.641h4.923l6.154,20.512h-5.331l-0.4,-1.346a25.741,25.741 0,0 0,1.635 -2.346l1.231,0.821 -0.41,-3.282 -2.872,1.231 1.231,0.82s-0.415,0.67 -1.156,1.615l-0.485,-1.615h-5.341l-1.231,4.1h-3.692l1.118,-3.429a9.919,9.919 0,0 1,-4.906 3.237c0.858,2.3 2.355,3.885 4.609,3.885 4.428,0 8.131,-3.9 9.92,-6.18l0.342,1.141c-2.07,2.674 -5.9,6.68 -10.263,6.68 -2.887,0 -4.919,-2.159 -5.9,-5.343 -0.086,0 -0.171,0.009 -0.257,0.009h-8.2l4.927,-21.331h6.154a13.028,13.028 0,0 1,3.367 0.4c3.8,-4.22 7.788,-5.73 9.761,-5.73 4.445,0 5.9,3.512 6.363,6.154h-0.9zM30.342,31.282 L28.701,25.128 27.06,31.282zM20.906,25.128v-1.641a2.938,2.938 0,0 0,-1.01 -2.407c-0.674,1.046 -1.294,2.134 -1.862,3.228a20.362,20.362 0,0 0,-1.675 10.874c2.214,-1.075 4.551,-6.282 4.551,-10.054zM18.444,20.616h-1.636l-3.282,14.769h1.708a21.99,21.99 0,0 1,2.394 -11.485,31.251 31.251,0 0,1 1.8,-3.085 2.47,2.47 0,0 0,-0.979 -0.199z"
+		android:fillColor="#49b04a"
+		android:fillType="evenOdd" />
 </vector>
diff --git a/presentation/src/main/res/layout/activity_create_vault.xml b/presentation/src/main/res/layout/activity_create_vault.xml
index 5b0218ee3..8744dcbb4 100644
--- a/presentation/src/main/res/layout/activity_create_vault.xml
+++ b/presentation/src/main/res/layout/activity_create_vault.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/activityRootView"
+	android:id="@+id/activity_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:fitsSystemWindows="true"
@@ -11,10 +11,12 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<include layout="@layout/toolbar_layout" />
+		<include layout="@layout/toolbar_layout"
+			android:id="@+id/mt_toolbar"/>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
-	<include layout="@layout/content_create_vault" />
+	<include layout="@layout/content_create_vault"
+		android:id="@+id/ll_content_create_vault"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/presentation/src/main/res/layout/activity_cryptomator_variants.xml b/presentation/src/main/res/layout/activity_cryptomator_variants.xml
index 20aa63398..e2b9c23c2 100644
--- a/presentation/src/main/res/layout/activity_cryptomator_variants.xml
+++ b/presentation/src/main/res/layout/activity_cryptomator_variants.xml
@@ -5,6 +5,7 @@
 	android:orientation="vertical">
 
 	<include
+		android:id="@+id/mt_toolbar"
 		layout="@layout/toolbar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content" />
@@ -17,7 +18,7 @@
 		<ScrollView
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_above="@+id/tvHint">
+			android:layout_above="@id/tv_hint">
 
 			<LinearLayout
 				android:layout_width="match_parent"
@@ -31,7 +32,7 @@
 					android:paddingBottom="16dp">
 
 					<TextView
-						android:id="@+id/tvWebsiteTitle"
+						android:id="@+id/tv_website_title"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:text="@string/screen_cryptomator_variants_website_title"
@@ -41,8 +42,8 @@
 					<LinearLayout
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_below="@+id/tvWebsiteTitle"
-						android:layout_toLeftOf="@id/btnInstallWebsiteVariant"
+						android:layout_below="@id/tv_website_title"
+						android:layout_toLeftOf="@id/btn_install_website_variant"
 						android:orientation="vertical">
 
 						<RelativeLayout
@@ -52,17 +53,17 @@
 							android:foreground="@drawable/item_browse_files_node_selector">
 
 							<ImageView
-								android:id="@+id/supportedWebsiteIcon"
+								android:id="@+id/supported_website_icon"
 								android:layout_width="@dimen/thumbnail_size"
 								android:layout_height="@dimen/thumbnail_size"
 								android:src="@drawable/ic_done_gray" />
 
 							<TextView
-								android:id="@+id/tvWebsiteSupported"
+								android:id="@+id/tv_website_supported"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
 								android:layout_centerVertical="true"
-								android:layout_toRightOf="@id/supportedWebsiteIcon" />
+								android:layout_toRightOf="@id/supported_website_icon" />
 
 						</RelativeLayout>
 
@@ -74,7 +75,7 @@
 					</LinearLayout>
 
 					<Button
-						android:id="@+id/btnInstallWebsiteVariant"
+						android:id="@+id/btn_install_website_variant"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_alignParentRight="true"
@@ -100,7 +101,7 @@
 					android:paddingBottom="16dp">
 
 					<TextView
-						android:id="@+id/tvLiteTitle"
+						android:id="@+id/tv_lite_title"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:text="@string/screen_cryptomator_variants_lite_title"
@@ -110,8 +111,8 @@
 					<LinearLayout
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_below="@+id/tvLiteTitle"
-						android:layout_toLeftOf="@id/btnInstallLiteVariant"
+						android:layout_below="@id/tv_lite_title"
+						android:layout_toLeftOf="@id/btn_install_lite_variant"
 						android:orientation="vertical">
 
 						<RelativeLayout
@@ -121,17 +122,17 @@
 							android:foreground="@drawable/item_browse_files_node_selector">
 
 							<ImageView
-								android:id="@+id/supportedLiteRepoIcon"
+								android:id="@+id/supported_lite_repo_icon"
 								android:layout_width="@dimen/thumbnail_size"
 								android:layout_height="@dimen/thumbnail_size"
 								android:src="@drawable/ic_done_gray" />
 
 							<TextView
-								android:id="@+id/tvLiteSupported"
+								android:id="@+id/tv_lite_supported"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
 								android:layout_centerVertical="true"
-								android:layout_toRightOf="@id/supportedLiteRepoIcon" />
+								android:layout_toRightOf="@id/supported_lite_repo_icon" />
 
 						</RelativeLayout>
 
@@ -142,17 +143,17 @@
 							android:foreground="@drawable/item_browse_files_node_selector">
 
 							<ImageView
-								android:id="@+id/unsupportedLiteRepoIcon"
+								android:id="@+id/unsupported_lite_repo_icon"
 								android:layout_width="@dimen/thumbnail_size"
 								android:layout_height="@dimen/thumbnail_size"
 								android:src="@drawable/ic_clear_gray" />
 
 							<TextView
-								android:id="@+id/tvLiteUnsupported"
+								android:id="@+id/tv_lite_unsupported"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
 								android:layout_centerVertical="true"
-								android:layout_toRightOf="@id/unsupportedLiteRepoIcon" />
+								android:layout_toRightOf="@id/unsupported_lite_repo_icon" />
 
 						</RelativeLayout>
 
@@ -164,7 +165,7 @@
 					</LinearLayout>
 
 					<Button
-						android:id="@+id/btnInstallLiteVariant"
+						android:id="@+id/btn_install_lite_variant"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_alignParentRight="true"
@@ -184,7 +185,7 @@
 
 				<!-- <f-droid-custom> -->
 				<TextView
-					android:id="@+id/tvFdroidTitle"
+					android:id="@+id/tv_fdroid_title"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/global_padding"
@@ -199,17 +200,17 @@
 					android:foreground="@drawable/item_browse_files_node_selector">
 
 					<ImageView
-						android:id="@+id/supportedFdroidCloudsIcon"
+						android:id="@+id/supported_fdroid_clouds_icon"
 						android:layout_width="@dimen/thumbnail_size"
 						android:layout_height="@dimen/thumbnail_size"
 						android:src="@drawable/ic_done_gray" />
 
 					<TextView
-						android:id="@+id/tvFdroidCustomSupported"
+						android:id="@+id/tv_fdroid_custom_supported"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_centerVertical="true"
-						android:layout_toRightOf="@id/supportedFdroidCloudsIcon" />
+						android:layout_toRightOf="@id/supported_fdroid_clouds_icon" />
 				</RelativeLayout>
 
 				<RelativeLayout
@@ -219,17 +220,17 @@
 					android:foreground="@drawable/item_browse_files_node_selector">
 
 					<ImageView
-						android:id="@+id/unsupportedCustomRepoIcon"
+						android:id="@+id/unsupported_custom_repo_icon"
 						android:layout_width="@dimen/thumbnail_size"
 						android:layout_height="@dimen/thumbnail_size"
 						android:src="@drawable/ic_clear_gray" />
 
 					<TextView
-						android:id="@+id/tvFdroidCustomUnsupported"
+						android:id="@+id/tv_fdroid_custom_unsupported"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_centerVertical="true"
-						android:layout_toRightOf="@id/unsupportedCustomRepoIcon" />
+						android:layout_toRightOf="@id/unsupported_custom_repo_icon" />
 				</RelativeLayout>
 
 				<TextView
@@ -244,15 +245,15 @@
 					android:layout_marginBottom="16dp">
 
 					<TextView
-						android:id="@+id/tvAddRepo"
+						android:id="@+id/tv_add_repo"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_centerVertical="true"
-						android:layout_toStartOf="@+id/btnAddRepo"
+						android:layout_toStartOf="@id/btn_add_repo"
 						android:text="@string/screen_cryptomator_variants_fdroid_add_repo_hint" />
 
 					<Button
-						android:id="@+id/btnAddRepo"
+						android:id="@+id/btn_add_repo"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_alignParentEnd="true"
@@ -271,15 +272,15 @@
 					android:foreground="@drawable/item_browse_files_node_selector">
 
 					<TextView
-						android:id="@+id/tvAskInstallApp"
+						android:id="@+id/tv_ask_install_app"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_centerVertical="true"
-						android:layout_toStartOf="@+id/btnInstallFDroidVariant"
+						android:layout_toStartOf="@id/btn_install_fdroid_variant"
 						android:text="@string/screen_cryptomator_variants_fdroid_install_hint" />
 
 					<Button
-						android:id="@+id/btnInstallFDroidVariant"
+						android:id="@+id/btn_install_fdroid_variant"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_alignParentEnd="true"
@@ -299,11 +300,11 @@
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="1dp"
-			android:layout_above="@+id/tvHint"
+			android:layout_above="@id/tv_hint"
 			android:background="@color/list_divider" />
 
 		<TextView
-			android:id="@+id/tvHint"
+			android:id="@+id/tv_hint"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentBottom="true"
diff --git a/presentation/src/main/res/layout/activity_empty.xml b/presentation/src/main/res/layout/activity_empty.xml
index 237cfa454..d1481a967 100644
--- a/presentation/src/main/res/layout/activity_empty.xml
+++ b/presentation/src/main/res/layout/activity_empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/coordinatorLayout"
+	android:id="@+id/coordinator_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="#00ffffff">
diff --git a/presentation/src/main/res/layout/activity_image_preview.xml b/presentation/src/main/res/layout/activity_image_preview.xml
index 24071d41b..3a13b9015 100644
--- a/presentation/src/main/res/layout/activity_image_preview.xml
+++ b/presentation/src/main/res/layout/activity_image_preview.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/activityRootView"
+	android:id="@+id/activity_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="@color/colorBlack">
 
 	<org.cryptomator.presentation.util.ViewPagerWorkaround
-		android:id="@+id/viewPager"
+		android:id="@+id/view_pager"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />
 
@@ -21,7 +21,7 @@
 		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
 	<RelativeLayout
-		android:id="@+id/controlView"
+		android:id="@+id/control_view"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_alignParentEnd="true"
@@ -33,25 +33,25 @@
 		android:padding="12dp">
 
 		<ImageView
-			android:id="@+id/deleteImage"
+			android:id="@+id/delete_image"
 			android:layout_width="24dp"
 			android:layout_height="24dp"
 			android:layout_marginEnd="@dimen/global_padding"
-			android:layout_toStartOf="@+id/shareImage"
+			android:layout_toStartOf="@id/share_image"
 			android:src="@drawable/ic_delete"
 			app:tint="#fff" />
 
 		<ImageView
-			android:id="@+id/shareImage"
+			android:id="@+id/share_image"
 			android:layout_width="24dp"
 			android:layout_height="24dp"
 			android:layout_marginEnd="@dimen/global_padding"
-			android:layout_toStartOf="@+id/exportImage"
+			android:layout_toStartOf="@id/export_image"
 			android:src="@drawable/ic_share"
 			app:tint="#fff" />
 
 		<ImageView
-			android:id="@+id/exportImage"
+			android:id="@+id/export_image"
 			android:layout_width="24dp"
 			android:layout_height="24dp"
 			android:layout_alignParentEnd="true"
diff --git a/presentation/src/main/res/layout/activity_layout.xml b/presentation/src/main/res/layout/activity_layout.xml
index dc7148301..2fbe1e4da 100644
--- a/presentation/src/main/res/layout/activity_layout.xml
+++ b/presentation/src/main/res/layout/activity_layout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/activityRootView"
+	android:id="@+id/activity_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -9,12 +9,14 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<include layout="@layout/toolbar_layout" />
+		<include
+			android:id="@+id/mt_toolbar"
+			layout="@layout/toolbar_layout" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
-		android:id="@+id/fragmentContainer"
+		android:id="@+id/fragment_container"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/presentation/src/main/res/layout/activity_layout_obscure_aware.xml b/presentation/src/main/res/layout/activity_layout_obscure_aware.xml
index e0bb41f2f..ec20ae69d 100644
--- a/presentation/src/main/res/layout/activity_layout_obscure_aware.xml
+++ b/presentation/src/main/res/layout/activity_layout_obscure_aware.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.cryptomator.presentation.ui.layout.ObscuredAwareCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/activityRootView"
+	android:id="@+id/activity_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -9,12 +9,14 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<include layout="@layout/toolbar_layout" />
+		<include
+			android:id="@+id/mt_toolbar"
+			layout="@layout/toolbar_layout" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
-		android:id="@+id/fragmentContainer"
+		android:id="@+id/fragment_container"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/presentation/src/main/res/layout/activity_licenses.xml b/presentation/src/main/res/layout/activity_licenses.xml
index 7e103eb1f..428d0932a 100644
--- a/presentation/src/main/res/layout/activity_licenses.xml
+++ b/presentation/src/main/res/layout/activity_licenses.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/activityRootView"
+	android:id="@+id/activity_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
 	<include
+		android:id="@+id/mt_toolbar"
 		layout="@layout/toolbar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content" />
 
 	<androidx.fragment.app.FragmentContainerView
-		android:id="@+id/licensesFragment"
+		android:id="@+id/licenses_fragment"
 		android:name="org.cryptomator.presentation.ui.fragment.LicensesFragment"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/presentation/src/main/res/layout/activity_settings.xml b/presentation/src/main/res/layout/activity_settings.xml
index c30c0d971..68c2d1b2e 100644
--- a/presentation/src/main/res/layout/activity_settings.xml
+++ b/presentation/src/main/res/layout/activity_settings.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/activityRootView"
+	android:id="@+id/activity_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
 	<include
+		android:id="@+id/mt_toolbar"
 		layout="@layout/toolbar_layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content" />
 
 	<androidx.fragment.app.FragmentContainerView
-		android:id="@+id/settingsFragment"
+		android:id="@+id/settings_fragment"
 		android:name="org.cryptomator.presentation.ui.fragment.SettingsFragment"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/presentation/src/main/res/layout/activity_unlock_vault.xml b/presentation/src/main/res/layout/activity_unlock_vault.xml
index fe197fdd9..7e70c63b9 100644
--- a/presentation/src/main/res/layout/activity_unlock_vault.xml
+++ b/presentation/src/main/res/layout/activity_unlock_vault.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/activityRootView"
+	android:id="@+id/activity_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
 	<androidx.fragment.app.FragmentContainerView
-		android:id="@+id/fragmentContainer"
+		android:id="@+id/fragment_container"
 		android:name="org.cryptomator.presentation.ui.fragment.UnlockVaultFragment"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/presentation/src/main/res/layout/content_create_vault.xml b/presentation/src/main/res/layout/content_create_vault.xml
index 7c13b5b72..232017853 100644
--- a/presentation/src/main/res/layout/content_create_vault.xml
+++ b/presentation/src/main/res/layout/content_create_vault.xml
@@ -18,7 +18,7 @@
 		android:layout_height="wrap_content">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/vaultNameEditText"
+			android:id="@+id/vault_name_edit_text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/screen_enter_vault_name_vault_label"
@@ -30,7 +30,7 @@
 	</com.google.android.material.textfield.TextInputLayout>
 
 	<Button
-		android:id="@+id/createVaultButton"
+		android:id="@+id/create_vault_button"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="16dp"
diff --git a/presentation/src/main/res/layout/dialog_app_update.xml b/presentation/src/main/res/layout/dialog_app_update.xml
index 5d9fa7761..9d818ef78 100644
--- a/presentation/src/main/res/layout/dialog_app_update.xml
+++ b/presentation/src/main/res/layout/dialog_app_update.xml
@@ -15,6 +15,7 @@
 			android:layout_marginBottom="@dimen/global_padding" />
 
 		<include
+			android:id="@+id/ll_dialog_progress"
 			layout="@layout/view_dialog_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -22,10 +23,11 @@
 			android:layout_marginTop="16dp" />
 
 		<include
+			android:id="@+id/ll_dialog_error"
 			layout="@layout/view_dialog_error"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/tv_message"
+			android:layout_below="@id/tv_message"
 			android:layout_marginTop="16dp" />
 
 	</RelativeLayout>
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml
index 809c7be9c..37bdc1741 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml
@@ -30,7 +30,7 @@
 				android:layout_centerVertical="true"
 				android:layout_marginStart="4dp"
 				android:layout_marginEnd="16dp"
-				android:layout_toEndOf="@+id/iv_cloud_image"
+				android:layout_toEndOf="@id/iv_cloud_image"
 				android:orientation="vertical">
 
 				<TextView
@@ -59,7 +59,7 @@
 			android:layout_height="1dp"
 			android:layout_alignParentBottom="true"
 			android:layout_marginBottom="16dp"
-			android:layout_toEndOf="@+id/iv_cloud_image"
+			android:layout_toEndOf="@id/iv_cloud_image"
 			android:background="@color/list_divider" />
 
 		<TextView
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml
index b6fb74789..215f6745d 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml
@@ -29,7 +29,7 @@
 				android:layout_centerVertical="true"
 				android:layout_marginStart="4dp"
 				android:layout_marginEnd="16dp"
-				android:layout_toEndOf="@+id/iv_file_image"
+				android:layout_toEndOf="@id/iv_file_image"
 				android:orientation="vertical">
 
 				<TextView
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml
index d4dc7aa24..2c063eba8 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml
@@ -31,7 +31,7 @@
 				android:layout_centerVertical="true"
 				android:layout_marginStart="4dp"
 				android:layout_marginEnd="16dp"
-				android:layout_toEndOf="@+id/iv_folder_image"
+				android:layout_toEndOf="@id/iv_folder_image"
 				android:orientation="vertical">
 
 				<TextView
diff --git a/presentation/src/main/res/layout/dialog_change_password.xml b/presentation/src/main/res/layout/dialog_change_password.xml
index ca623db35..de0d55f2b 100644
--- a/presentation/src/main/res/layout/dialog_change_password.xml
+++ b/presentation/src/main/res/layout/dialog_change_password.xml
@@ -29,7 +29,7 @@
 			android:id="@+id/til_new_password"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_password"
+			android:layout_below="@id/til_password"
 			app:passwordToggleEnabled="true">
 
 			<com.google.android.material.textfield.TextInputEditText
@@ -47,7 +47,7 @@
 			android:id="@+id/til_new_retype_password"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_new_password"
+			android:layout_below="@id/til_new_password"
 			app:passwordToggleEnabled="true">
 
 			<com.google.android.material.textfield.TextInputEditText
@@ -78,17 +78,19 @@
 			android:text="@string/screen_set_password_hint" />
 
 		<include
+			android:id="@+id/ll_dialog_progress"
 			layout="@layout/view_dialog_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/password_hint"
+			android:layout_below="@id/password_hint"
 			android:layout_marginTop="16dp" />
 
 		<include
+			android:id="@+id/ll_dialog_error"
 			layout="@layout/view_dialog_error"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/password_hint"
+			android:layout_below="@id/password_hint"
 			android:layout_marginTop="16dp" />
 
 	</RelativeLayout>
diff --git a/presentation/src/main/res/layout/dialog_create_folder.xml b/presentation/src/main/res/layout/dialog_create_folder.xml
index 2d3afcf25..d04d48707 100644
--- a/presentation/src/main/res/layout/dialog_create_folder.xml
+++ b/presentation/src/main/res/layout/dialog_create_folder.xml
@@ -25,6 +25,7 @@
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<include
+			android:id="@+id/ll_dialog_progress"
 			layout="@layout/view_dialog_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -32,6 +33,7 @@
 			android:layout_marginTop="16dp" />
 
 		<include
+			android:id="@+id/ll_dialog_error"
 			layout="@layout/view_dialog_error"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/presentation/src/main/res/layout/dialog_enter_license.xml b/presentation/src/main/res/layout/dialog_enter_license.xml
index 1a73afc11..87da9e78d 100644
--- a/presentation/src/main/res/layout/dialog_enter_license.xml
+++ b/presentation/src/main/res/layout/dialog_enter_license.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.cryptomator.presentation.ui.layout.ObscuredAwareDialogCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/dssialogRootView"
+	android:id="@+id/dssialog_root_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
@@ -37,17 +37,19 @@
 			</com.google.android.material.textfield.TextInputLayout>
 
 			<include
+				android:id="@+id/ll_dialog_progress"
 				layout="@layout/view_dialog_progress"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_below="@+id/til_license"
+				android:layout_below="@id/til_license"
 				android:layout_marginTop="16dp" />
 
 			<include
+				android:id="@+id/ll_dialog_error"
 				layout="@layout/view_dialog_error"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_below="@+id/til_license"
+				android:layout_below="@id/til_license"
 				android:layout_marginTop="16dp" />
 
 		</RelativeLayout>
diff --git a/presentation/src/main/res/layout/dialog_enter_password.xml b/presentation/src/main/res/layout/dialog_enter_password.xml
index be7b6c5d5..565f5cdb5 100644
--- a/presentation/src/main/res/layout/dialog_enter_password.xml
+++ b/presentation/src/main/res/layout/dialog_enter_password.xml
@@ -27,17 +27,19 @@
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<include
+			android:id="@+id/ll_dialog_progress"
 			layout="@layout/view_dialog_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_password"
+			android:layout_below="@id/til_password"
 			android:layout_marginTop="16dp" />
 
 		<include
+			android:id="@+id/ll_dialog_error"
 			layout="@layout/view_dialog_error"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_password"
+			android:layout_below="@id/til_password"
 			android:layout_marginTop="16dp" />
 
 	</RelativeLayout>
diff --git a/presentation/src/main/res/layout/dialog_file_name.xml b/presentation/src/main/res/layout/dialog_file_name.xml
index 90ef1d43b..de101d5e5 100644
--- a/presentation/src/main/res/layout/dialog_file_name.xml
+++ b/presentation/src/main/res/layout/dialog_file_name.xml
@@ -25,17 +25,19 @@
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<include
+			android:id="@+id/ll_dialog_progress"
 			layout="@layout/view_dialog_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_file_name"
+			android:layout_below="@id/til_file_name"
 			android:layout_marginTop="16dp" />
 
 		<include
+			android:id="@+id/ll_dialog_error"
 			layout="@layout/view_dialog_error"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_file_name"
+			android:layout_below="@id/til_file_name"
 			android:layout_marginTop="16dp" />
 	</RelativeLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/presentation/src/main/res/layout/dialog_generic_progress.xml b/presentation/src/main/res/layout/dialog_generic_progress.xml
index 5de63fe40..ca0ba2f94 100644
--- a/presentation/src/main/res/layout/dialog_generic_progress.xml
+++ b/presentation/src/main/res/layout/dialog_generic_progress.xml
@@ -9,6 +9,7 @@
 		android:padding="@dimen/activity_vertical_margin">
 
 		<include
+			android:id="@+id/ll_dialog_progress"
 			layout="@layout/view_dialog_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content" />
diff --git a/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml b/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml
index 10dcab1b3..60a26654a 100644
--- a/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml
+++ b/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml
@@ -29,7 +29,7 @@
 			style="?attr/borderlessButtonStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/tv_finger_print_text"
+			android:layout_below="@id/tv_finger_print_text"
 			android:layout_alignParentEnd="true"
 			android:text="@string/dialog_accept_ssl_certificate_details" />
 
diff --git a/presentation/src/main/res/layout/dialog_rename.xml b/presentation/src/main/res/layout/dialog_rename.xml
index e084294b1..4ceb124d0 100644
--- a/presentation/src/main/res/layout/dialog_rename.xml
+++ b/presentation/src/main/res/layout/dialog_rename.xml
@@ -24,17 +24,19 @@
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<include
+			android:id="@+id/ll_dialog_progress"
 			layout="@layout/view_dialog_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_rename"
+			android:layout_below="@id/til_rename"
 			android:layout_marginTop="16dp" />
 
 		<include
+			android:id="@+id/ll_dialog_error"
 			layout="@layout/view_dialog_error"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/til_rename"
+			android:layout_below="@id/til_rename"
 			android:layout_marginTop="16dp" />
 	</RelativeLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/presentation/src/main/res/layout/dialog_upload_loading.xml b/presentation/src/main/res/layout/dialog_upload_loading.xml
index 59e6cdea8..6cc5692a0 100644
--- a/presentation/src/main/res/layout/dialog_upload_loading.xml
+++ b/presentation/src/main/res/layout/dialog_upload_loading.xml
@@ -18,6 +18,7 @@
 			android:textSize="20sp" />
 
 		<include
+			android:id="@+id/ll_dialog_intermediate_progress"
 			layout="@layout/view_dialog_intermediate_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -25,6 +26,7 @@
 			android:layout_marginTop="16dp" />
 
 		<include
+			android:id="@+id/ll_dialog_error"
 			layout="@layout/view_dialog_error"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/presentation/src/main/res/layout/floating_action_button_layout.xml b/presentation/src/main/res/layout/floating_action_button_layout.xml
index 9e610e991..695f7886a 100644
--- a/presentation/src/main/res/layout/floating_action_button_layout.xml
+++ b/presentation/src/main/res/layout/floating_action_button_layout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/floatingActionButton"
+	android:id="@+id/floating_action_button"
 	android:layout_width="54dp"
 	android:layout_height="54dp"
 	android:layout_gravity="bottom|end"
diff --git a/presentation/src/main/res/layout/fragment_auto_upload_choose_vault.xml b/presentation/src/main/res/layout/fragment_auto_upload_choose_vault.xml
index 67d708906..f841a4741 100644
--- a/presentation/src/main/res/layout/fragment_auto_upload_choose_vault.xml
+++ b/presentation/src/main/res/layout/fragment_auto_upload_choose_vault.xml
@@ -10,7 +10,7 @@
 		<ScrollView
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_above="@+id/toolbar_bottom">
+			android:layout_above="@id/toolbar_bottom">
 
 			<LinearLayout
 				android:layout_width="match_parent"
@@ -18,7 +18,7 @@
 				android:orientation="vertical">
 
 				<androidx.recyclerview.widget.RecyclerView
-					android:id="@+id/locationsRecyclerView"
+					android:id="@+id/locations_recycler_view"
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
 					android:scrollbars="none" />
diff --git a/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml b/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml
index c0930487c..0b8a13407 100644
--- a/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml
+++ b/presentation/src/main/res/layout/fragment_browse_cloud_connections.xml
@@ -10,13 +10,16 @@
 		android:layout_height="match_parent">
 
 		<include
+			android:id="@+id/rv_cloud_connections"
 			layout="@layout/recycler_view_layout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:clipToPadding="true"
 			android:paddingBottom="88dp" />
 
-		<include layout="@layout/view_empty_cloud_connections" />
+		<include
+			android:id="@+id/rl_creation_hint"
+			layout="@layout/view_empty_cloud_connections" />
 
 		<RelativeLayout
 			android:id="@+id/toolbar_bottom"
@@ -36,6 +39,6 @@
 	<include
 		android:id="@+id/floating_action_button"
 		layout="@layout/floating_action_button_layout"
-		app:layout_anchor="@id/recyclerView" />
+		app:layout_anchor="@id/recycler_view" />
 
 </org.cryptomator.presentation.ui.layout.ArcAwareCoordinatorLayout>
diff --git a/presentation/src/main/res/layout/fragment_browse_files.xml b/presentation/src/main/res/layout/fragment_browse_files.xml
index 469d935b7..1d483da24 100644
--- a/presentation/src/main/res/layout/fragment_browse_files.xml
+++ b/presentation/src/main/res/layout/fragment_browse_files.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.cryptomator.presentation.ui.layout.SlidingCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/slidingCoordinatorLayout"
+	android:id="@+id/sliding_coordinator_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -11,12 +11,13 @@
 		android:layout_height="match_parent">
 
 		<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-			android:id="@+id/swipeRefreshLayout"
+			android:id="@+id/swipe_refresh_layout"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_above="@+id/toolbar_bottom">
+			android:layout_above="@id/toolbar_bottom">
 
 			<include
+				android:id="@+id/recycler_view_layout"
 				layout="@layout/recycler_view_layout"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
@@ -26,7 +27,9 @@
 
 		<include layout="@layout/view_retry" />
 
-		<include layout="@layout/view_empty_folder" />
+		<include
+			android:id="@+id/rl_view_empty_folder"
+			layout="@layout/view_empty_folder" />
 
 		<RelativeLayout
 			android:id="@+id/toolbar_bottom"
@@ -35,6 +38,7 @@
 			android:layout_alignParentBottom="true">
 
 			<include
+				android:id="@+id/choose_location_layout"
 				layout="@layout/view_browses_files_extra_text_and_button"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content" />
@@ -44,8 +48,9 @@
 	</RelativeLayout>
 
 	<include
+		android:id="@+id/floating_action_button"
 		layout="@layout/floating_action_button_layout"
 		android:visibility="gone"
-		app:layout_anchor="@id/recyclerView" />
+		app:layout_anchor="@id/recycler_view" />
 
 </org.cryptomator.presentation.ui.layout.SlidingCoordinatorLayout>
diff --git a/presentation/src/main/res/layout/fragment_choose_cloud_service.xml b/presentation/src/main/res/layout/fragment_choose_cloud_service.xml
index cc674652f..4b6ae891e 100644
--- a/presentation/src/main/res/layout/fragment_choose_cloud_service.xml
+++ b/presentation/src/main/res/layout/fragment_choose_cloud_service.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/rl_choose_cloud_service"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:id="@+id/rlChooseCloudService">
+	android:layout_height="match_parent">
 
-	<include layout="@layout/recycler_view_layout" />
+	<include
+		android:id="@+id/rv_choose_cloud_service"
+		layout="@layout/recycler_view_layout" />
 
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/fragment_cloud_settings.xml b/presentation/src/main/res/layout/fragment_cloud_settings.xml
index 79e40d8f9..f0998456c 100644
--- a/presentation/src/main/res/layout/fragment_cloud_settings.xml
+++ b/presentation/src/main/res/layout/fragment_cloud_settings.xml
@@ -3,6 +3,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<include layout="@layout/recycler_view_layout" />
+	<include
+		android:id="@+id/rv_cloud_settings"
+		layout="@layout/recycler_view_layout" />
 
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/fragment_image_preview.xml b/presentation/src/main/res/layout/fragment_image_preview.xml
index 1ee12dbfa..17ed10988 100644
--- a/presentation/src/main/res/layout/fragment_image_preview.xml
+++ b/presentation/src/main/res/layout/fragment_image_preview.xml
@@ -4,12 +4,12 @@
 	android:layout_height="match_parent">
 
 	<com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-		android:id="@+id/imageView"
+		android:id="@+id/image_view"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent" />
 
 	<ProgressBar
-		android:id="@+id/progressBar"
+		android:id="@+id/progress_bar"
 		style="?android:attr/progressBarStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/presentation/src/main/res/layout/fragment_set_password.xml b/presentation/src/main/res/layout/fragment_set_password.xml
index feeb13014..a94b17a58 100644
--- a/presentation/src/main/res/layout/fragment_set_password.xml
+++ b/presentation/src/main/res/layout/fragment_set_password.xml
@@ -12,7 +12,7 @@
 		app:passwordToggleEnabled="true">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/passwordEditText"
+			android:id="@+id/password_edit_text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/screen_set_password_password_label"
@@ -29,7 +29,7 @@
 		app:passwordToggleEnabled="true">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/passwordRetypedEditText"
+			android:id="@+id/password_retyped_edit_text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/screen_set_password_retype_password_label"
@@ -40,8 +40,9 @@
 
 	</com.google.android.material.textfield.TextInputLayout>
 
-
-	<include layout="@layout/view_password_strength_indicator" />
+	<include
+		android:id="@+id/ll_password_strength_indicator"
+		layout="@layout/view_password_strength_indicator" />
 
 	<TextView
 		android:layout_width="match_parent"
@@ -51,7 +52,7 @@
 		android:text="@string/screen_set_password_hint" />
 
 	<Button
-		android:id="@+id/createVaultButton"
+		android:id="@+id/create_vault_button"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="16dp"
diff --git a/presentation/src/main/res/layout/fragment_settings_biometric_auth.xml b/presentation/src/main/res/layout/fragment_settings_biometric_auth.xml
index c616abbfe..0076a444e 100644
--- a/presentation/src/main/res/layout/fragment_settings_biometric_auth.xml
+++ b/presentation/src/main/res/layout/fragment_settings_biometric_auth.xml
@@ -23,12 +23,12 @@
 				android:layout_alignParentStart="true"
 				android:layout_centerVertical="true"
 				android:layout_marginEnd="16dp"
-				android:layout_toStartOf="@+id/toggleBiometricAuth"
+				android:layout_toStartOf="@id/toggle_biometric_auth"
 				android:text="@string/screen_settings_activate_biometric_auth"
 				android:textSize="18sp" />
 
 			<Switch
-				android:id="@+id/toggleBiometricAuth"
+				android:id="@+id/toggle_biometric_auth"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentEnd="true"
@@ -48,12 +48,12 @@
 				android:layout_alignParentStart="true"
 				android:layout_centerVertical="true"
 				android:layout_marginEnd="16dp"
-				android:layout_toStartOf="@+id/toggleFaceUnlockConfirmation"
+				android:layout_toStartOf="@id/toggle_face_unlock_confirmation"
 				android:text="@string/screen_settings_confirm_face_unlock"
 				android:textSize="18sp" />
 
 			<Switch
-				android:id="@+id/toggleFaceUnlockConfirmation"
+				android:id="@+id/toggle_face_unlock_confirmation"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentEnd="true"
@@ -76,6 +76,7 @@
 
 		<include
 			layout="@layout/recycler_view_layout"
+			android:id="@+id/rv_vaults"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:clipToPadding="true" />
diff --git a/presentation/src/main/res/layout/fragment_setup_s3.xml b/presentation/src/main/res/layout/fragment_setup_s3.xml
index 661add9e8..b367613f3 100644
--- a/presentation/src/main/res/layout/fragment_setup_s3.xml
+++ b/presentation/src/main/res/layout/fragment_setup_s3.xml
@@ -14,7 +14,7 @@
 			android:layout_height="wrap_content">
 
 			<com.google.android.material.textfield.TextInputEditText
-				android:id="@+id/displayNameEditText"
+				android:id="@+id/display_name_edit_text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/screen_s3_settings_display_name_label"
@@ -36,7 +36,7 @@
 			android:layout_height="wrap_content">
 
 			<com.google.android.material.textfield.TextInputEditText
-				android:id="@+id/accessKeyEditText"
+				android:id="@+id/access_key_edit_text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/screen_s3_settings_access_key_label"
@@ -52,7 +52,7 @@
 			android:layout_height="wrap_content">
 
 			<com.google.android.material.textfield.TextInputEditText
-				android:id="@+id/secretKeyEditText"
+				android:id="@+id/secret_key_edit_text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/screen_s3_settings_secret_key_label"
@@ -68,7 +68,7 @@
 			android:layout_height="wrap_content">
 
 			<com.google.android.material.textfield.TextInputEditText
-				android:id="@+id/bucketEditText"
+				android:id="@+id/bucket_edit_text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/screen_s3_settings_bucket_label"
@@ -83,7 +83,7 @@
 			android:layout_height="wrap_content">
 
 			<com.google.android.material.textfield.TextInputEditText
-				android:id="@+id/endpointEditText"
+				android:id="@+id/endpoint_edit_text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/screen_s3_settings_endpoint_label"
@@ -98,7 +98,7 @@
 			android:layout_height="wrap_content">
 
 			<com.google.android.material.textfield.TextInputEditText
-				android:id="@+id/regionEditText"
+				android:id="@+id/region_edit_text"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:hint="@string/screen_s3_settings_region_label"
@@ -109,7 +109,7 @@
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<Button
-			android:id="@+id/createCloudButton"
+			android:id="@+id/create_cloud_button"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="16dp"
diff --git a/presentation/src/main/res/layout/fragment_setup_webdav.xml b/presentation/src/main/res/layout/fragment_setup_webdav.xml
index 8cffe1804..43cd360df 100644
--- a/presentation/src/main/res/layout/fragment_setup_webdav.xml
+++ b/presentation/src/main/res/layout/fragment_setup_webdav.xml
@@ -10,7 +10,7 @@
 		android:layout_height="wrap_content">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/urlPortEditText"
+			android:id="@+id/url_port_edit_text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/screen_webdav_settings_url_port_label"
@@ -35,7 +35,7 @@
 		android:layout_height="wrap_content">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/userNameEditText"
+			android:id="@+id/user_name_edit_text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/screen_webdav_settings_username_label"
@@ -50,7 +50,7 @@
 		android:layout_height="wrap_content">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/passwordEditText"
+			android:id="@+id/password_edit_text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:hint="@string/screen_webdav_settings_password_label"
@@ -62,7 +62,7 @@
 	</com.google.android.material.textfield.TextInputLayout>
 
 	<Button
-		android:id="@+id/createCloudButton"
+		android:id="@+id/create_cloud_button"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="16dp"
diff --git a/presentation/src/main/res/layout/fragment_shared_files.xml b/presentation/src/main/res/layout/fragment_shared_files.xml
index 3ba8057d7..c772389f7 100644
--- a/presentation/src/main/res/layout/fragment_shared_files.xml
+++ b/presentation/src/main/res/layout/fragment_shared_files.xml
@@ -10,7 +10,7 @@
 		<ScrollView
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_above="@+id/toolbar_bottom">
+			android:layout_above="@id/toolbar_bottom">
 
 			<LinearLayout
 				android:layout_width="match_parent"
@@ -28,7 +28,7 @@
 
 
 				<androidx.recyclerview.widget.RecyclerView
-					android:id="@+id/filesRecyclerView"
+					android:id="@+id/files_recycler_view"
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
 					android:scrollbars="none" />
@@ -43,7 +43,7 @@
 					android:textSize="16sp" />
 
 				<androidx.recyclerview.widget.RecyclerView
-					android:id="@+id/locationsRecyclerView"
+					android:id="@+id/locations_recycler_view"
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
 					android:scrollbars="none" />
diff --git a/presentation/src/main/res/layout/fragment_text_editor.xml b/presentation/src/main/res/layout/fragment_text_editor.xml
index ec31afe2e..5d74a1388 100644
--- a/presentation/src/main/res/layout/fragment_text_editor.xml
+++ b/presentation/src/main/res/layout/fragment_text_editor.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/coordinatorLayout"
+	android:id="@+id/coordinator_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
 	<ScrollView
-		android:id="@+id/textViewWrapper"
+		android:id="@+id/text_view_wrapper"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/textEditor"
+			android:id="@+id/text_editor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="top"
diff --git a/presentation/src/main/res/layout/fragment_vault_list.xml b/presentation/src/main/res/layout/fragment_vault_list.xml
index e27a6667f..8ba1a98ee 100644
--- a/presentation/src/main/res/layout/fragment_vault_list.xml
+++ b/presentation/src/main/res/layout/fragment_vault_list.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.cryptomator.presentation.ui.layout.ArcAwareCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/coordinatorLayout"
+	android:id="@+id/coordinator_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<include layout="@layout/recycler_view_layout" />
+	<include
+		android:id="@+id/rv_vaults"
+		layout="@layout/recycler_view_layout" />
 
-	<include layout="@layout/view_vault_creation_hint" />
+	<include
+		android:id="@+id/rl_creation_hint"
+		layout="@layout/view_vault_creation_hint" />
 
 	<include
 		android:id="@+id/floating_action_button"
 		layout="@layout/floating_action_button_layout"
-		app:layout_anchor="@id/recyclerView" />
+		app:layout_anchor="@id/recycler_view" />
 
 </org.cryptomator.presentation.ui.layout.ArcAwareCoordinatorLayout>
diff --git a/presentation/src/main/res/layout/item_biometric_auth_vault.xml b/presentation/src/main/res/layout/item_biometric_auth_vault.xml
index 4c2b68560..cfb05cfad 100644
--- a/presentation/src/main/res/layout/item_biometric_auth_vault.xml
+++ b/presentation/src/main/res/layout/item_biometric_auth_vault.xml
@@ -12,21 +12,21 @@
 		android:layout_marginStart="16dp" />
 
 	<TextView
-		android:id="@+id/vaultName"
+		android:id="@+id/vault_name"
 		style="@style/AppTheme.ListItemDarkTextColor"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="16dp"
-		android:layout_toStartOf="@id/toggleBiometricAuth"
-		android:layout_toEndOf="@+id/cloud"
+		android:layout_toStartOf="@id/toggle_biometric_auth"
+		android:layout_toEndOf="@id/cloud"
 		android:ellipsize="middle"
 		android:singleLine="true"
 		android:textSize="18sp" />
 
 	<Switch
-		android:id="@+id/toggleBiometricAuth"
+		android:id="@+id/toggle_biometric_auth"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentEnd="true"
@@ -37,7 +37,7 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/cloud"
+		android:layout_toEndOf="@id/cloud"
 		android:background="@color/list_divider" />
 
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml b/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml
index 445a210e6..e5a89beda 100644
--- a/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml
+++ b/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml
@@ -6,13 +6,14 @@
 	android:foreground="@drawable/item_browse_files_node_selector">
 
 	<ImageView
-		android:id="@+id/cloudImage"
+		android:id="@+id/cloud_image"
 		android:layout_width="@dimen/thumbnail_size"
 		android:layout_height="@dimen/thumbnail_size"
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp" />
 
 	<include
+		android:id="@+id/ll_cloudConnection_content"
 		layout="@layout/view_cloud_connection_content"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -20,8 +21,8 @@
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="16dp"
 		android:layout_marginEnd="16dp"
-		android:layout_toStartOf="@+id/settings"
-		android:layout_toEndOf="@id/cloudImage" />
+		android:layout_toStartOf="@id/settings"
+		android:layout_toEndOf="@id/cloud_image" />
 
 	<ImageView
 		android:id="@+id/settings"
@@ -37,7 +38,7 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toEndOf="@id/cloud_image"
 		android:background="@color/list_divider" />
 
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/item_browse_files_node.xml b/presentation/src/main/res/layout/item_browse_files_node.xml
index 9e2e4d3bd..a79841409 100644
--- a/presentation/src/main/res/layout/item_browse_files_node.xml
+++ b/presentation/src/main/res/layout/item_browse_files_node.xml
@@ -6,23 +6,25 @@
 	android:foreground="@drawable/item_browse_files_node_selector">
 
 	<ImageView
-		android:id="@+id/cloudNodeImage"
+		android:id="@+id/cloud_node_image"
 		android:layout_width="@dimen/thumbnail_size"
 		android:layout_height="@dimen/thumbnail_size"
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp" />
 
 	<include
+		android:id="@+id/ll_cloud_folder_content"
 		layout="@layout/view_cloud_folder_content"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="16dp"
-		android:layout_toStartOf="@+id/controls"
-		android:layout_toEndOf="@id/cloudNodeImage" />
+		android:layout_toStartOf="@id/controls"
+		android:layout_toEndOf="@id/cloud_node_image" />
 
 	<include
+		android:id="@+id/ll_cloud_file_content"
 		layout="@layout/view_cloud_file_content"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -30,8 +32,8 @@
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="16dp"
 		android:layout_marginEnd="16dp"
-		android:layout_toStartOf="@+id/controls"
-		android:layout_toEndOf="@id/cloudNodeImage" />
+		android:layout_toStartOf="@id/controls"
+		android:layout_toEndOf="@id/cloud_node_image" />
 
 	<RelativeLayout
 		android:id="@+id/controls"
@@ -48,7 +50,7 @@
 			android:src="@drawable/ic_expand_more" />
 
 		<CheckBox
-			android:id="@+id/itemCheckBox"
+			android:id="@+id/item_check_box"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:visibility="gone" />
@@ -60,7 +62,7 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/cloudNodeImage"
+		android:layout_toEndOf="@id/cloud_node_image"
 		android:background="@color/list_divider" />
 
 
diff --git a/presentation/src/main/res/layout/item_cloud.xml b/presentation/src/main/res/layout/item_cloud.xml
index af4afd5de..b6ce6f07e 100644
--- a/presentation/src/main/res/layout/item_cloud.xml
+++ b/presentation/src/main/res/layout/item_cloud.xml
@@ -5,7 +5,7 @@
 	android:background="?android:attr/selectableItemBackground">
 
 	<ImageView
-		android:id="@+id/cloudImage"
+		android:id="@+id/cloud_image"
 		android:layout_width="40dp"
 		android:layout_height="40dp"
 		android:layout_centerVertical="true"
@@ -17,11 +17,11 @@
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="16dp"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toEndOf="@id/cloud_image"
 		android:orientation="vertical">
 
 		<TextView
-			android:id="@+id/cloudName"
+			android:id="@+id/cloud_name"
 			style="@style/AppTheme.ListItemDarkTextColor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toEndOf="@id/cloud_image"
 		android:background="@color/list_divider" />
 
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/item_cloud_setting.xml b/presentation/src/main/res/layout/item_cloud_setting.xml
index 953870f4a..440f56e6e 100644
--- a/presentation/src/main/res/layout/item_cloud_setting.xml
+++ b/presentation/src/main/res/layout/item_cloud_setting.xml
@@ -5,7 +5,7 @@
 	android:background="?android:attr/selectableItemBackground">
 
 	<ImageView
-		android:id="@+id/cloudImage"
+		android:id="@+id/cloud_image"
 		android:layout_width="@dimen/thumbnail_size"
 		android:layout_height="@dimen/thumbnail_size"
 		android:layout_centerVertical="true"
@@ -17,11 +17,11 @@
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="16dp"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toEndOf="@id/cloud_image"
 		android:orientation="vertical">
 
 		<TextView
-			android:id="@+id/cloudName"
+			android:id="@+id/cloud_name"
 			style="@style/AppTheme.ListItemDarkTextColor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
 		<!-- using android:singleLine to fix https://code.google.com/p/android/issues/detail?id=33868 -->
 
 		<TextView
-			android:id="@+id/cloudUsername"
+			android:id="@+id/cloud_username"
 			style="@style/AppTheme.ListItemLightTextColor"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toEndOf="@id/cloud_image"
 		android:background="@color/list_divider" />
 
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/item_shareable_location.xml b/presentation/src/main/res/layout/item_shareable_location.xml
index 06ed8843e..41e3a4460 100644
--- a/presentation/src/main/res/layout/item_shareable_location.xml
+++ b/presentation/src/main/res/layout/item_shareable_location.xml
@@ -5,7 +5,7 @@
 	android:background="?android:attr/selectableItemBackground">
 
 	<ImageView
-		android:id="@+id/cloudImage"
+		android:id="@+id/cloud_image"
 		android:layout_width="@dimen/thumbnail_size"
 		android:layout_height="@dimen/thumbnail_size"
 		android:layout_centerVertical="true"
@@ -17,12 +17,12 @@
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="8dp"
-		android:layout_toStartOf="@+id/chooseFolderLocation"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toStartOf="@id/choose_folder_location"
+		android:layout_toEndOf="@id/cloud_image"
 		android:orientation="vertical">
 
 		<TextView
-			android:id="@+id/vaultName"
+			android:id="@+id/vault_name"
 			style="@style/AppTheme.ListItemDarkTextColor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
 		<!-- using android:singleLine to fix https://code.google.com/p/android/issues/detail?id=33868 -->
 
 		<TextView
-			android:id="@+id/chosenLocation"
+			android:id="@+id/chosen_location"
 			style="@style/AppTheme.ListItemLightTextColor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -42,18 +42,18 @@
 	</LinearLayout>
 
 	<Button
-		android:id="@+id/chooseFolderLocation"
+		android:id="@+id/choose_folder_location"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="8dp"
-		android:layout_toStartOf="@+id/selectedVault"
+		android:layout_toStartOf="@id/selected_vault"
 		android:minWidth="48dp"
 		android:minHeight="36dp"
 		android:text="&#8230;" />
 
 	<CheckBox
-		android:id="@+id/selectedVault"
+		android:id="@+id/selected_vault"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentEnd="true"
@@ -65,7 +65,7 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toEndOf="@id/cloud_image"
 		android:background="@color/list_divider" />
 
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/item_shared_files.xml b/presentation/src/main/res/layout/item_shared_files.xml
index 052388a49..158cd6c4a 100644
--- a/presentation/src/main/res/layout/item_shared_files.xml
+++ b/presentation/src/main/res/layout/item_shared_files.xml
@@ -14,7 +14,7 @@
 		app:startIconTint="@null">
 
 		<com.google.android.material.textfield.TextInputEditText
-			android:id="@+id/fileName"
+			android:id="@+id/file_name"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
@@ -28,6 +28,6 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/til_file_name"
+		android:layout_toEndOf="@id/til_file_name"
 		android:background="@color/list_divider" />
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/item_vault.xml b/presentation/src/main/res/layout/item_vault.xml
index 00ef7d2d1..f9a6a4903 100644
--- a/presentation/src/main/res/layout/item_vault.xml
+++ b/presentation/src/main/res/layout/item_vault.xml
@@ -6,7 +6,7 @@
 	android:background="?android:attr/selectableItemBackground">
 
 	<ImageView
-		android:id="@+id/cloudImage"
+		android:id="@+id/cloud_image"
 		android:layout_width="@dimen/thumbnail_size"
 		android:layout_height="@dimen/thumbnail_size"
 		android:layout_centerVertical="true"
@@ -18,12 +18,12 @@
 		android:layout_centerVertical="true"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="16dp"
-		android:layout_toStartOf="@+id/unlockedImage"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toStartOf="@id/unlocked_image"
+		android:layout_toEndOf="@id/cloud_image"
 		android:orientation="vertical">
 
 		<TextView
-			android:id="@+id/vaultName"
+			android:id="@+id/vault_name"
 			style="@style/AppTheme.ListItemDarkTextColor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
 		<!-- using android:singleLine to fix https://code.google.com/p/android/issues/detail?id=33868 -->
 
 		<TextView
-			android:id="@+id/vaultPath"
+			android:id="@+id/vault_path"
 			style="@style/AppTheme.ListItemLightTextColor"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -43,11 +43,11 @@
 	</LinearLayout>
 
 	<ImageView
-		android:id="@+id/unlockedImage"
+		android:id="@+id/unlocked_image"
 		android:layout_width="59dp"
 		android:layout_height="59dp"
 		android:layout_centerVertical="true"
-		android:layout_toStartOf="@+id/settings"
+		android:layout_toStartOf="@id/settings"
 		android:background="?android:attr/selectableItemBackground"
 		android:paddingStart="14dp"
 		android:paddingTop="10dp"
@@ -72,6 +72,6 @@
 		android:layout_height="1dp"
 		android:layout_alignParentBottom="true"
 		android:layout_marginStart="16dp"
-		android:layout_toEndOf="@+id/cloudImage"
+		android:layout_toEndOf="@id/cloud_image"
 		android:background="@color/list_divider" />
 </RelativeLayout>
diff --git a/presentation/src/main/res/layout/recycler_view_layout.xml b/presentation/src/main/res/layout/recycler_view_layout.xml
index 25dc1b95d..3a467dcf8 100644
--- a/presentation/src/main/res/layout/recycler_view_layout.xml
+++ b/presentation/src/main/res/layout/recycler_view_layout.xml
@@ -1,6 +1,6 @@
 <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/recyclerView"
+	android:id="@+id/recycler_view"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	app:fastScrollPopupBgColor="@color/colorPrimary"
diff --git a/presentation/src/main/res/layout/view_browses_files_extra_text_and_button.xml b/presentation/src/main/res/layout/view_browses_files_extra_text_and_button.xml
index 25663fad0..c08638ee6 100644
--- a/presentation/src/main/res/layout/view_browses_files_extra_text_and_button.xml
+++ b/presentation/src/main/res/layout/view_browses_files_extra_text_and_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/extraTextAndButtonLayout"
+	android:id="@+id/extra_text_and_button_layout"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:minHeight="?attr/actionBarSize"
@@ -10,22 +10,22 @@
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
 		android:layout_alignParentTop="true"
-		android:layout_toStartOf="@id/extraText"
+		android:layout_toStartOf="@id/extra_text"
 		android:background="@color/list_divider" />
 
 	<TextView
-		android:id="@+id/extraText"
+		android:id="@+id/extra_text"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
-		android:layout_toStartOf="@id/chooseLocationButton"
+		android:layout_toStartOf="@id/choose_location_button"
 		android:ellipsize="middle"
 		android:singleLine="true"
 		android:textSize="16sp" />
 	<!-- using android:singleLine to fix https://code.google.com/p/android/issues/detail?id=33868 -->
 
 	<Button
-		android:id="@+id/chooseLocationButton"
+		android:id="@+id/choose_location_button"
 		android:layout_width="wrap_content"
 		android:layout_height="35dp"
 		android:layout_alignParentEnd="true"
diff --git a/presentation/src/main/res/layout/view_cloud_connection_content.xml b/presentation/src/main/res/layout/view_cloud_connection_content.xml
index fcbdd6b2e..11d18180b 100644
--- a/presentation/src/main/res/layout/view_cloud_connection_content.xml
+++ b/presentation/src/main/res/layout/view_cloud_connection_content.xml
@@ -6,7 +6,7 @@
 	android:visibility="visible">
 
 	<TextView
-		android:id="@+id/cloudText"
+		android:id="@+id/cloud_text"
 		style="@style/AppTheme.ListItemDarkTextColor"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
 		android:layout_height="wrap_content">
 
 		<TextView
-			android:id="@+id/cloudSubText"
+			android:id="@+id/cloud_sub_text"
 			style="@style/AppTheme.ListItemLightTextColor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/presentation/src/main/res/layout/view_cloud_file_content.xml b/presentation/src/main/res/layout/view_cloud_file_content.xml
index e3decfc77..a08352e37 100644
--- a/presentation/src/main/res/layout/view_cloud_file_content.xml
+++ b/presentation/src/main/res/layout/view_cloud_file_content.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/cloudFileContent"
+	android:id="@+id/cloud_file_content"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	android:visibility="visible">
 
 	<TextView
-		android:id="@+id/cloudFileText"
+		android:id="@+id/cloud_file_text"
 		style="@style/AppTheme.ListItemDarkTextColor"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
 		android:layout_height="wrap_content">
 
 		<TextView
-			android:id="@+id/cloudFileSubText"
+			android:id="@+id/cloud_file_sub_text"
 			style="@style/AppTheme.ListItemLightTextColor"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -34,18 +34,19 @@
 		<!-- using android:singleLine to fix https://code.google.com/p/android/issues/detail?id=33868 -->
 
 		<LinearLayout
-			android:id="@+id/cloudFileProgress"
+			android:id="@+id/cloud_file_progress"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:visibility="gone">
 
 			<ImageView
-				android:id="@+id/progressIcon"
+				android:id="@+id/progress_icon"
 				android:layout_width="16dp"
 				android:layout_height="16dp"
 				app:tint="@color/textColorLight" />
 
 			<include
+				android:id="@+id/rl_cloud_file_progress"
 				layout="@layout/view_cloud_file_progress"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/presentation/src/main/res/layout/view_cloud_file_progress.xml b/presentation/src/main/res/layout/view_cloud_file_progress.xml
index 12a67a106..b9a38de63 100644
--- a/presentation/src/main/res/layout/view_cloud_file_progress.xml
+++ b/presentation/src/main/res/layout/view_cloud_file_progress.xml
@@ -4,7 +4,7 @@
 	android:layout_height="match_parent">
 
 	<ProgressBar
-		android:id="@+id/cloudFile"
+		android:id="@+id/cloud_file"
 		style="?android:attr/progressBarStyleHorizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
diff --git a/presentation/src/main/res/layout/view_cloud_folder_content.xml b/presentation/src/main/res/layout/view_cloud_folder_content.xml
index ebcf6f7c6..38c526fc8 100644
--- a/presentation/src/main/res/layout/view_cloud_folder_content.xml
+++ b/presentation/src/main/res/layout/view_cloud_folder_content.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/cloudFolderContent"
+	android:id="@+id/cloud_folder_content"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	android:visibility="gone">
 
 	<TextView
-		android:id="@+id/cloudFolderText"
+		android:id="@+id/cloud_folder_text"
 		style="@style/AppTheme.ListItemDarkTextColor"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
 	<!-- using android:singleLine to fix https://code.google.com/p/android/issues/detail?id=33868 -->
 
 	<TextView
-		android:id="@+id/cloudFolderActionText"
+		android:id="@+id/cloud_folder_action_text"
 		style="@style/AppTheme.ListItemLightTextColor"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
diff --git a/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml b/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml
index ffe04872f..65abf1da1 100644
--- a/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml
+++ b/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml
@@ -25,7 +25,7 @@
 			android:id="@+id/iv_progress_icon"
 			android:layout_width="16dp"
 			android:layout_height="16dp"
-			android:layout_below="@+id/tv_progress"
+			android:layout_below="@id/tv_progress"
 			app:tint="@color/textColorLight" />
 
 		<ProgressBar
@@ -33,9 +33,9 @@
 			style="?android:attr/progressBarStyleHorizontal"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@+id/tv_progress"
+			android:layout_below="@id/tv_progress"
 			android:layout_marginStart="8dp"
-			android:layout_toEndOf="@+id/iv_progress_icon"
+			android:layout_toEndOf="@id/iv_progress_icon"
 			android:max="100" />
 	</RelativeLayout>
 
diff --git a/presentation/src/main/res/layout/view_empty_cloud_connections.xml b/presentation/src/main/res/layout/view_empty_cloud_connections.xml
index 8b024477f..dbb2d8bcd 100644
--- a/presentation/src/main/res/layout/view_empty_cloud_connections.xml
+++ b/presentation/src/main/res/layout/view_empty_cloud_connections.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/rl_creation_hint"
+	android:id="@+id/creation_hint"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:visibility="gone">
diff --git a/presentation/src/main/res/layout/view_empty_folder.xml b/presentation/src/main/res/layout/view_empty_folder.xml
index ca235747b..9dd591723 100644
--- a/presentation/src/main/res/layout/view_empty_folder.xml
+++ b/presentation/src/main/res/layout/view_empty_folder.xml
@@ -1,5 +1,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/emptyFolderHint"
+	android:id="@+id/empty_folder_hint"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:visibility="gone">
diff --git a/presentation/src/main/res/layout/view_password_strength_indicator.xml b/presentation/src/main/res/layout/view_password_strength_indicator.xml
index 44a0828fa..9b57e8ac0 100644
--- a/presentation/src/main/res/layout/view_password_strength_indicator.xml
+++ b/presentation/src/main/res/layout/view_password_strength_indicator.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
+	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
 	<ProgressBar
-		android:id="@+id/progressBarPwStrengthIndicator"
+		android:id="@+id/pb_password_strength_indicator"
 		style="?android:progressBarStyleHorizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
 		tools:progress="0" />
 
 	<TextView
-		android:id="@+id/textViewPwStrengthIndicator"
+		android:id="@+id/tv_pw_strength_indicator"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content" />
 
diff --git a/presentation/src/main/res/layout/view_receive_save_button.xml b/presentation/src/main/res/layout/view_receive_save_button.xml
index dd1a9bbbc..fdf8751e5 100644
--- a/presentation/src/main/res/layout/view_receive_save_button.xml
+++ b/presentation/src/main/res/layout/view_receive_save_button.xml
@@ -8,11 +8,11 @@
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
 		android:layout_alignParentTop="true"
-		android:layout_toStartOf="@id/saveFiles"
+		android:layout_toStartOf="@id/save_files"
 		android:background="@color/list_divider" />
 
 	<Button
-		android:id="@+id/saveFiles"
+		android:id="@+id/save_files"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_alignParentEnd="true"
diff --git a/presentation/src/main/res/layout/view_retry.xml b/presentation/src/main/res/layout/view_retry.xml
index 3d7ba4caa..832175122 100644
--- a/presentation/src/main/res/layout/view_retry.xml
+++ b/presentation/src/main/res/layout/view_retry.xml
@@ -7,7 +7,7 @@
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_above="@+id/bt_retry"
+		android:layout_above="@id/bt_retry"
 		android:layout_centerHorizontal="true"
 		android:layout_centerVertical="true"
 		android:layout_marginBottom="20dp"
diff --git a/presentation/src/main/res/layout/view_vault_creation_hint.xml b/presentation/src/main/res/layout/view_vault_creation_hint.xml
index e31f3c655..6d6566d59 100644
--- a/presentation/src/main/res/layout/view_vault_creation_hint.xml
+++ b/presentation/src/main/res/layout/view_vault_creation_hint.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/rl_creation_hint"
+	android:id="@+id/creation_hint"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:visibility="gone">
diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 3723c8114..08ed78e31 100644
--- a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
+	<background android:drawable="@color/ic_launcher_background" />
+	<foreground android:drawable="@drawable/ic_launcher_foreground" />
+	<monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/presentation/src/main/res/values-ar-rSA/strings.xml b/presentation/src/main/res/values-ar-rSA/strings.xml
index f5120c8ed..2cf153996 100644
--- a/presentation/src/main/res/values-ar-rSA/strings.xml
+++ b/presentation/src/main/res/values-ar-rSA/strings.xml
@@ -66,7 +66,7 @@
 	<string name="screen_vault_list_vault_creation_hint">أنقر هنا لإنشاء خزينة جديدة</string>
 	<string name="screen_vault_list_change_password_successful">تم تغيير كلمة المرور بنجاح</string>
 	<!-- # screen: file browser -->
-	<string name="screen_file_browser_default_title">مخزن</string>
+	<string name="screen_file_browser_default_title">الخزينة</string>
 	<string name="screen_file_browser_add_existing_vault_extra_text">اختر مِلَفَ المفتاحِ الرئيسِ</string>
 	<string name="screen_file_browser_create_new_vault_button_text">ضع هنا</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">اسم المخزن: %1$s</string>
@@ -202,6 +202,8 @@
 	<string name="screen_settings_security_label">تلميحات الأمان</string>
 	<string name="screen_settings_section_version">الإصدارة</string>
 	<string name="screen_settings_advanced_settings">إعدادات متقدمة</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">العمل على فتح ملفات مايكروسوفت</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">فتح الملفات في تطبيقات مايكروسوفت مع السماح بالتعديل</string>
 	<string name="screen_settings_background_unlock_preparation_label">تسريع فتح القفل</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">تنزيل إعدادات المخزن في الخلفية أثناء مطالبته بإدخال كلمة المرور أو البصمة</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">أبقه فاتح</string>
@@ -232,7 +234,7 @@
 	<string name="screen_cryptomator_variants_website_description">تحتوي برامج ملكية خاصة.</string>
 	<string name="screen_cryptomator_variants_installation_hint">التبديل من أو إلى مستودع تطبيقات F-Droid الرئيسي يستلزم إعداد نسخة جديد من التطبيق.</string>
 	<!-- # dialogs -->
-	<string name="dialog_button_cancel">الغاء</string>
+	<string name="dialog_button_cancel">إلغاء</string>
 	<string name="dialog_enter_password_positive_button">افتح</string>
 	<string name="dialog_change_password_old_password_label">كلمة المرور القديمة</string>
 	<string name="dialog_change_password_new_password_label">كلمة المرور الجديدة</string>
@@ -309,6 +311,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">في هذا الوضع، يمكن كتابة البيانات الحساسة إلى ملف تسجيل على جهازك (على سبيل المثال أسماء الملفات والمسارات). كلمة المرور، ملفات تعريف الارتباط، إلخ. مستبعدة صراحة.\n\nتذكر تعطيل وضع التصحيح في أقرب وقت ممكن.</string>
 	<string name="dialog_debug_mode_disclaimer_title">انتباه</string>
 	<string name="dialog_debug_mode_positive_button">تفعيل</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">بسبب خطأ في تطبيقات مايكروسوفت، يجب مشاركة الملف المراد تعديله مع هذه التطبيقات في مجلد وسائط عام على جهازك. بعد استئناف Cryptomator ، يتم حذف هذا الملف مرة أخرى، ولكن Cryptomator لا يمكنه التأثير على ما حدث لهذا الملف في هذه الأثناء. تأكد من أنك على علم بهذا السلوك عند تفعيل هذا الخيار. سيتم تطبيق هذا فقط على ملفات مايكروسوفت.\n\nسيتم إعادة تشغيل Cryptomator بعد التفعيل.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">هذا الإعداد هو ميزة أمنية ويمنع التطبيقات الأخرى من استدراج المستخدمين لفعل أشياء لا يريدون القيام بها.\n\nبتعطيليها, أنت تؤكد أنك <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">على علم بالمخاطر</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">انتباه</string>
 	<string name="dialog_disable_app_obscured_positive_button">تعطيل</string>
@@ -353,6 +356,7 @@
 	<string name="dialog_pcloud_credentials_updated">إذا كنت ترغب في إضافة حساب pCloud جديد، انقر على هذا الرابط <a href="https://www.pcloud.com">www.pcloud. om</a>، ثم قم بتسجيل الخروج من الحساب الحالي و بعدها انقر مرة أخرى على \'+\' في هذا التطبيق لإنشاء اتصال سحابي جديد.</string>
 	<string name="permission_snackbar_auth_local_vault">Cryptomator يحتاج صلاحية الوصول إلي التخزين ليستطيع استعمال الخزائن المحلية</string>
 	<string name="permission_snackbar_auth_auto_upload">Cryptomator يحتاج صلاحية الوصول إلي التخزين ليستطيع تحميل الصور تلقائيا</string>
+	<string name="permission_snackbar_notifications">Cryptomator يحتاج إلى صَلاحِيَة إظهار الإشعارات لعرض حالة المخزن على سبيل المثال</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
@@ -396,6 +400,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">المجلد المحدد للرفع لم يعد متوفرًا. اذهب إلى الإعدادات واختيار واحد جديد</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">تم قفل المخزن اثناء الرفع، الرجاء قم بفتحه لمتابعة الرفع</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">المخزن المحدد للتحميل التلقائي لم يعد موجودا.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">انقر لتحديث المصادقة.</string>
 	<string name="notification_open_writable_file_title">فتح ملف قابل للكتابة</string>
 	<string name="notification_open_writable_file_message">تظل الخزنة مفتوحة حتى الانتهاء من التعديل</string>
 	<string name="notification_update_check_finished_latest">تم تثبيت آخر إصدارة</string>
diff --git a/presentation/src/main/res/values-ba-rRU/strings.xml b/presentation/src/main/res/values-ba-rRU/strings.xml
new file mode 100644
index 000000000..091efd01b
--- /dev/null
+++ b/presentation/src/main/res/values-ba-rRU/strings.xml
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<string name="share_with_label">Шифрла</string>
+	<!-- # error messages -->
+	<string name="error_generic">Хата килеп сыҡты</string>
+	<string name="error_authentication_failed">Аутентиклау хатаһы</string>
+	<string name="error_authentication_failed_re_authenticate">Аутентиклау хатаһы, %1$s менән инегеҙ</string>
+	<string name="error_no_network_connection">Селтәр бәйләнеше юҡ</string>
+	<string name="error_invalid_passphrase">Серһүҙ дөрөҫ түгел</string>
+	<string name="error_file_or_folder_exists">Файл йәки папка бар инде.</string>
+	<string name="error_vault_version_not_supported">Һаҡлағыстың терәкһеҙ версияһы: %1$s. Был һаҡлағыс Cryptomator-ҙың башҡа версияһы менән яһалған.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s файлы һаҡлағыс папкаһында юҡ. Файлдың болоттағы һаҡлағыс папкаһында булыуын тикшерегеҙ.</string>
+	<string name="error_vault_already_exists">Һаҡлаығыс бар инде.</string>
+	<string name="error_no_such_file">Файл юҡ.</string>
+	<string name="error_vault_has_been_locked">Һаҡлағыс бикләнгән.</string>
+	<string name="error_cloud_already_exists">Болот бар инде.</string>
+	<string name="error_activity_not_found">Был файлды аса алған ҡушымтаны күсереп алығыҙ.</string>
+	<string name="error_server_not_found">Сервер табылманы.</string>
+	<string name="error_device_policy_manager_not_found">Йыһаз көйләүҙәрен асығыҙ һәм экран биген ҡул менән көйләгеҙ</string>
+	<string name="error_export_illegal_file_name">Экспортлау уңышһыҙ булды. Файл исемдәренән махсус билдәләрҙе алып ташлағыҙ һәм яңынан экспортлап ҡарағыҙ.</string>
+	<string name="error_name_contains_invalid_characters">Махсус билдәләр булырға тейеш түгел.</string>
+	<string name="error_names_contains_invalid_characters">Файл исемдәрендә махсус билдәләр була алмай.</string>
+	<string name="error_vault_name_contains_invalid_characters">Һаҡлағыс исемендә махсус билдәләр була алмай.</string>
+	<string name="error_general_update">Яңыртыу тикшереүе уңышһыҙ булды. Дөйөм хата килеп сыҡты.</string>
+	<string name="error_hash_mismatch_update">Яңыртыу тикшереүе уңышһыҙ булды. Иҫәпләнгән хеш тейәлгән файл менән тап килмәй</string>
+	<string name="error_update_no_internet">Яңыртыу тикшереүе уңышһыҙ булды. Интернет бәйләнеше юҡ.</string>
+	<string name="error_failed_to_decrypt_webdav_password">WebDAV серһүҙ шифрын асып булманы. Зинһар, көйләүҙәрҙә ҡабаттан өҫтәгеҙ</string>
+	<string name="error_play_services_not_available">Google Play сервистары ҡуйылмаған</string>
+	<string name="error_biometric_auth_aborted">Биометрик аутентиклау өҙөлдө</string>
+	<string name="error_vault_version_mismatch">Тәғәйенләнгән %1$s версияһы %2$s версияһынан айырала</string>
+	<string name="error_vault_key_invalid">%1$s менән %2$s тап килмәй</string>
+	<string name="error_vault_config_loading">Һаҡлағыс конфигурацияһын йөкләгәндә дөйөм хата</string>
+	<string name="error_file_not_found_after_opening_using_3party">Cryptomator программаһына кире күскәндән һуң урындағы файл юҡ инде. Буласаҡ үҙгәрештәр кире болотҡа күсерелә алмай.</string>
+	<string name="error_no_such_bucket">Бындай bucket юҡ</string>
+	<string name="error_masterkey_location_not_supported">Ирекле Masterkey урыны терәкләнмәй</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">F-Droid ҡушымтаһы менән бәйләнешкә инеп булманы. Ҡуйылмағанмы?</string>
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Урындағы һаҡлағыс</string>
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<string name="permission_message_export_file">Файлдарҙы экспортлау өсөн Cryptomator-ға һаҡлағысҡа инеү рәхсәте кәрәк</string>
+	<string name="permission_message_upload_file">Файлдарҙы тейәү өсөн Cryptomator-ға һаҡлағысҡа инеү рәхсәте кәрәк</string>
+	<string name="permission_message_share_file">Файлдарҙы уртаҡлашыу өсөн Cryptomator-ға һаҡлағысҡа инеү рәхсәте кәрәк</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator был урынға инеү рөхсәтен юғалтҡан. Рөхсәтте тергеҙеү өсөн был папканы ҡабаттан һайлағыҙ.</string>
+	<string name="snack_bar_action_title_settings">Көйләүҙәр</string>
+	<string name="snack_bar_action_title_search">Эҙлә</string>
+	<string name="snack_bar_action_title_search_previous">Алдағы</string>
+	<string name="snack_bar_action_title_search_next">Киләһе</string>
+	<string name="snack_bar_action_title_sort">Теҙеү</string>
+	<string name="snack_bar_action_title_sort_az">А - Я</string>
+	<string name="snack_bar_action_title_sort_za">Я - А</string>
+	<string name="snack_bar_action_title_sort_newest">Яңылар тәүҙә</string>
+	<string name="snack_bar_action_title_sort_oldest">Иҫкеләр тәүҙә</string>
+	<string name="snack_bar_action_title_sort_biggest">Ҙурҙар тәүҙә</string>
+	<string name="snack_bar_action_title_sort_smallest">Бәләкәйҙәр тәүҙә</string>
+	<string name="snack_bar_cryptomator_variants_title">Артабан уҡыу</string>
+	<string name="snack_bar_cryptomator_variants_hint">Болот исемлектә юҡмы?</string>
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Cryptomator-ға өҫтә</string>
+	<string name="screen_vault_list_action_create_new_vault">Яңы һаҡлағыс яһау</string>
+	<string name="screen_vault_list_action_add_existing_vault">Булған һаҡлағыс өҫтәү</string>
+	<string name="screen_vault_list_vault_action_delete">Алып ташлау</string>
+	<string name="screen_vault_list_vault_creation_hint">Яңы һаҡлағыс яһау өсөн бында баҫығыҙ</string>
+	<string name="screen_vault_list_change_password_successful">Серһүҙ уңышлы үҙгәртелде</string>
+	<!-- # screen: file browser -->
+	<string name="screen_file_browser_default_title">Һаҡлағыс</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Masterkey файлын һайлағыҙ</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Бында ҡуйығыҙ</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Һаҡлағыс исеме: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="other">%2$d күсереләсәк урын</item>
+	</plurals>
+	<string name="screen_file_browser_move_button_text">Күсер</string>
+	<string name="screen_file_browser_msg_empty_folder">Буш папка</string>
+	<string name="screen_file_browser_file_info_label_date">%1$s элек үҙгәртелгән</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Уртаҡлашыу</string>
+	<string name="screen_file_browser_share_destination_title">Тәғәйен урын һайлау</string>
+	<string name="screen_file_browser_share_button_text">Һайла</string>
+	<string name="screen_file_browser_nothing_to_share">Уртаҡлашырлыҡ бер нәмә лә юҡ</string>
+	<string name="screen_file_browser_actions_title">%1$s каталогына өҫтәү</string>
+	<string name="screen_file_browser_action_create_folder">Папка өҫтәү</string>
+	<string name="screen_file_browser_action_create_new_text_file">Текст файлы өҫтәү</string>
+	<string name="screen_file_browser_action_upload_files">Файл тейәү</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Файлдар</string>
+	<string name="screen_file_browser_msg_file_exported">Файл экспортланды</string>
+	<string name="screen_file_browser_msg_files_exported">Файлдар экспортланды</string>
+	<string name="screen_file_browser_nothing_to_export">Экспортланасаҡ бер нәмә лә юҡ</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Күсереп алыу каталогын яһау булманы</string>
+	<string name="screen_file_browser_node_action_share">Уртаҡлаш</string>
+	<string name="screen_file_browser_node_action_rename">Исемен үҙгәрт</string>
+	<string name="screen_file_browser_node_action_edit_text">Төҙәт</string>
+	<string name="screen_file_browser_node_action_export">Экспортла</string>
+	<string name="screen_file_browser_node_action_delete">Юй</string>
+	<string name="screen_file_browser_node_action_open_with_text">Асыу өсөн&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Элементтар һайлағыҙ</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d һайланды</string>
+	<string name="screen_file_browser_select_items">Һайла</string>
+	<string name="screen_file_browser_select_all_items">Барыһын да һайла</string>
+	<string name="screen_file_browser_refresh_items">Яңырт</string>
+	<string name="screen_file_browser_no_connection_message">Бәйләнеш юҡ</string>
+	<string name="screen_file_browser_no_connection_button_text">Ҡабатла</string>
+	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Уңышлы һаҡланды</string>
+	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">%1$s һаҡланасаҡ урын&#8230;</string>
+	<string name="screen_share_files_content_text">текст</string>
+	<string name="screen_share_files_content_file">файл</string>
+	<string name="screen_share_files_content_files">файлдар</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Файл исемдәре ҡабатланмаҫҡа тейеш, дубликаттарҙың исемдәрен үҙгәртегеҙ.</string>
+	<string name="screen_share_files_section_location">Һаҡлау урыны</string>
+	<string name="screen_share_files_save_button_text">Һаҡла</string>
+	<string name="screen_share_files_msg_success">Шифрлау тамамланды</string>
+	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Болот хеҙмәте</string>
+	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">Урын һайлағыҙ</string>
+	<string name="screen_cloud_connections_no_connections">Урын өҫтәү өсөн бында баҫығыҙ</string>
+	<string name="screen_cloud_error_webdav_not_supported">Сервер WebDAV менән яраҡлы түгел</string>
+	<string name="screen_cloud_local_error_no_content_provider">Каталогтарҙы асыу терәге булған файл менеджеры табылманы</string>
+	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">URL</string>
+	<string name="screen_webdav_settings_username_label">Ҡулланыусы исеме</string>
+	<string name="screen_webdav_settings_password_label">Серһүҙ</string>
+	<string name="screen_webdav_settings_done_button_text">Бәйләнеш</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">URL буш була алмай.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">URL дөрөҫ түгел.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Ҡулланыусы исеме буш була алмай.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Серһүҙ буш була алмай.</string>
+	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Күренәсәк исем</string>
+	<string name="screen_s3_settings_access_key_label">Инеү асҡысы (Access Key)</string>
+	<string name="screen_s3_settings_secret_key_label">Серле асҡыс (Secret Key)</string>
+	<string name="screen_s3_settings_bucket_label">Булған кәрзин (Bucket)</string>
+	<string name="screen_s3_settings_endpoint_label">Ос нөктә (Endpoint)</string>
+	<string name="screen_s3_settings_region_label">Регион</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Күренәсәк исем юлы буш була алмай</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Инеү асҡысы юлы буш була алмай</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Серле асҡыс юлы буш була алмай</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Кәрзин юлы буш була алмай</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Ос нөктә йәки регион юлы буш була алмай</string>
+	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Һаҡлағыс исеме юлы буш була алмай.</string>
+	<string name="screen_enter_vault_name_vault_label">Һаҡлағыс исеме</string>
+	<string name="screen_enter_vault_name_button_text">Яһа</string>
+	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Серһүҙ ҡуйыу</string>
+	<string name="screen_set_password_msg_password_mismatch">Серһүҙ ҡабатлап яҙылған серһүҙ менән тап килмәй.</string>
+	<string name="screen_set_password_button_text">Башҡарылды</string>
+	<string name="screen_set_password_hint">МӨҺИМ: әгәр серһүҙҙе онотһағыҙ, уны тергеҙеү ысулы юҡ.</string>
+	<string name="screen_set_password_retype_password_label">Серһүҙҙе ҡабатлап яҙығыҙ</string>
+	<string name="screen_set_password_strength_indicator_0">Һаҡлағыс булдырыу өсөн бик көсһөҙ</string>
+	<string name="screen_set_password_strength_indicator_1">Көсһөҙ</string>
+	<string name="screen_set_password_strength_indicator_2">Уртаса</string>
+	<string name="screen_set_password_strength_indicator_3">Көслө</string>
+	<string name="screen_set_password_strength_indicator_4">Бик көслө</string>
+	<!-- ## screen: settings -->
+	<string name="screen_settings_section_general">Дөйөм</string>
+	<string name="screen_settings_cloud_settings_label">Болот хеҙмәттәре</string>
+	<string name="screen_settings_biometric_auth">Биометрик аутентиклау</string>
+	<string name="screen_settings_activate_biometric_auth">Биометрик аутентиклау ғәмәлдә</string>
+	<string name="screen_settings_confirm_face_unlock">Йөҙ менән асыу (булған осраҡта)</string>
+	<string name="screen_settings_block_app_when_obscured">Ҡушымта ябылған саҡта бикләү</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Яҙылғандарҙы тотоп алыуҙы һәм ялған арайөҙ күрһәтеүҙе тыйыу</string>
+	<string name="screen_settings_secure_screen">Скриншоттарҙы тыйыу</string>
+	<string name="screen_settings_secure_screen_summary">Ҡушымта эсендә һәм яңыраҡ ҡулланылғандар исемлегендә скриншоттарҙы тыйыу</string>
+	<string name="screen_settings_section_search">Эҙлә</string>
+	<string name="screen_settings_live_search">Тере эҙләү</string>
+	<string name="screen_settings_live_search_summary">Һорау яҙғанда эҙләү һөҙөмтәләрен яңыртып барыу</string>
+	<string name="screen_settings_glob_search">Glob ҡалыбы менән эҙләү</string>
+	<string name="screen_settings_glob_search_summary">Alice.*.jpg кеүек glob ҡалыбын ҡулланыу</string>
+	<string name="screen_settings_section_auto_lock">Автоматик бикләү</string>
+	<string name="screen_settings_auto_lock_timeout">Бикләү ваҡыты</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">Экран һүндерелгәндә</string>
+	<string name="screen_settings_section_auto_photo_upload">Автоматик фото тейәү</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Тейәү өсөн һаҡлағыс һайлау</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Ғәмәлдә</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Һүрәттәрҙе артҡы планда тотоп барырға һәм һаҡлағыс асылған ваҡытта тейәүҙе башларға</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Тиҙ тейәү</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Һаҡлағыс асыҡ саҡта тура тейәргә</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">WIFI аша ғына тейәү</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Видео тейәү</string>
+	<string name="screen_settings_auto_photo_upload_title">Автоматик тейәлгән файлдар урыны&#8230;</string>
+	<string name="screen_settings_website_label">Cryptomator сайты</string>
+	<string name="screen_settings_twitter_label">Twitter селтәрендә</string>
+	<string name="screen_settings_facebook_label">Facebook селтәрендә</string>
+	<string name="screen_settings_section_legal">Хоҡуҡи мәғлүмәт</string>
+	<string name="screen_settings_licenses_label">Рөхсәтнамәләр</string>
+	<string name="screen_settings_license_terms_label">Рөхсәтнамә шарттары</string>
+	<string name="screen_settings_section_support">Ярҙам</string>
+	<string name="screen_settings_contact_label">Ярҙам һорау</string>
+	<string name="screen_settings_debug_mode_label">Төҙөкләндереү режимы</string>
+	<string name="screen_settings_error_report_label">Журнал файлын ебәр</string>
+	<string name="screen_settings_error_report_failed">Ебәреү уңышһыҙ булды</string>
+	<string name="screen_settings_security_label">Хәүефһеҙлек кәңәштәре</string>
+	<string name="screen_settings_section_version">Версия</string>
+	<string name="screen_settings_advanced_settings">Өҫтәмә көйләүҙәр</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Microsoft файлдарын асыуҙың урау юлдары</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Microsoft ҡушымталарында файлдарҙы яҙыу рөхсәте менән асыу</string>
+	<string name="screen_settings_background_unlock_preparation_label">Бикте асыуҙы тиҙләтеү</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Серһүҙ йәки биометрик таныу һоралған ваҡытта һаҡлағыс конфигурацияһын артҡы планда күсереп алырға</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">Биге асыҡ килеш тот</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Файл төҙәткәндә һаҡлағысты асыҡ килеш тоторға</string>
+	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">OneDrive бәйләнештәре</string>
+	<string name="screen_cloud_settings_webdav_connections">WebDAV бәйләнештәре</string>
+	<string name="screen_cloud_settings_pcloud_connections">pCloud бәйләнештәре</string>
+	<string name="screen_cloud_settings_s3_connections">S3 бәйләнештәре</string>
+	<string name="screen_cloud_settings_local_storage_locations">Урындағы һаҡлау урындары</string>
+	<string name="screen_cloud_settings_log_in_to">Инеү</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Сығыу</string>
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s аутентикланманы.</string>
+	<string name="screen_update_pcloud_connections_title">pCloud иҫәп яҙыуы мәғлүмәттәрен яңыртыу</string>
+	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">Cryptomator варианттары</string>
+	<string name="screen_cryptomator_variants_lite_title">Төп F-Droid репозиторийы</string>
+	<string name="screen_cryptomator_variants_lite_description">API асҡыстары кәрәк булғанлыҡтан төшөрөп ҡалдырылды.</string>
+	<string name="screen_cryptomator_variants_lite_install">Ҡор</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Cryptomator F-Droid репозиторийы</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Проприетар бәйлелек булғанлыҡтан төшөрөп ҡалдырылды.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">F-Droid ҡушымтаһына Cryptomator репозиторийы өҫтәү.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo">Өҫтәү</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">F-Droid аша Cryptomator ҡуйыу.\n\"Табылманы\" хатаһы күренгән ваҡытта F-Droid синхронлашыуының тамамланғанын көтөгөҙ.</string>
+	<string name="screen_cryptomator_variants_website_title">Сайт</string>
+	<string name="screen_cryptomator_variants_website_description">Эсендә проприетар бәйлелектәр бар.</string>
+	<string name="screen_cryptomator_variants_installation_hint">Төп F-Droid репозиторийы вариантындан йәки вариантына күсер өсөн ҡушымтаны яңынан ҡуйыу кәрәк.</string>
+	<!-- # dialogs -->
+	<string name="dialog_button_cancel">Кире ал</string>
+	<string name="dialog_enter_password_positive_button">Биген ас</string>
+	<string name="dialog_change_password_old_password_label">Иҫке серһүҙ</string>
+	<string name="dialog_change_password_new_password_label">Яңы серһүҙ</string>
+	<string name="dialog_change_password">Серһүҙҙе үҙгәрт</string>
+	<string name="dialog_change_password_msg_old_password_empty">Иҫке серһүҙ буш була алмай.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Яңы серһүҙ буш була алмай.</string>
+	<string name="dialog_change_password_msg_password_mismatch">Яңы серһүҙ ҡабатлап яҙылған серһүҙ менән тап килмәй.</string>
+	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">%1$s һаҡлағысы табылманы</string>
+	<string name="dialog_vault_not_found_message">Һаҡлағыстың исеме үҙгәртелгән, күсерелгән йәки юйылған. Дауам итер өсөн уны исемлектән алып ташлағыҙ һәм яңынан өҫтәгеҙ. Хәҙер алып ташларғамы?</string>
+	<string name="dialog_vault_not_found_positive_button_text">Алып ташлау</string>
+	<string name="dialog_existing_file_title">Файл бар инде</string>
+	<string name="dialog_existing_file_positive_button">Алмаштыр</string>
+	<string name="dialog_existing_file_message">\'%1$s\' исемле файл бар инде.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Булғандарҙы үт</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Барыһын да алмаштыр</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Булғандарҙы алмаштыр</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Алмаштыр</string>
+	<string name="dialog_replace_msg_single_file_exists">\'%1$s\' исемле файл бар инде. Алмаштырырға теләйһегеҙме?</string>
+	<string name="dialog_replace_msg_all_files_exists">Бөтә файлдар ҙа бар инде. Уларҙы алмаштырырға теләйһегеҙме?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d файлдары бар инде. Уларҙы алмаштырырға теләйһегеҙме?</string>
+	<string name="dialog_replace_title_single_file_exists">Файлды алмаштырырғамы?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Файлдарҙы алмаштырырғамы?</string>
+	<string name="dialog_unable_to_share_title">Файлдарҙы уртаҡлашып булмай</string>
+	<string name="dialog_unable_to_share_message">Ҡоролған һаҡлағысығыҙ юҡ. Тәүҙә Cryptomator ҡушымтаһы менән яңы һаҡлағыс яһағыҙ.</string>
+	<string name="dialog_unable_to_share_positive_button">Ярай</string>
+	<string name="dialog_unable_to_share_negative_button">Яңы һаҡлағыс яһа</string>
+	<string name="dialog_filetype_not_supported_title">%1$s файлын асып булмай</string>
+	<string name="dialog_filetype_not_supported_message">Был файлды аса торған ҡушымта күсереп алығыҙ. Әллә йыһазығыҙға һаҡларға теләйһегеҙме?</string>
+	<string name="dialog_rename_vault_title">Һаҡлағыс исемен үҙгәртеү</string>
+	<string name="dialog_rename_node_folder_title">Папка исемен үҙгәртеү</string>
+	<string name="dialog_rename_node_file_title">Файл исемен үҙгәртеү</string>
+	<string name="dialog_unsaved_changes_title">Һаҡланмаған үҙгәртеүҙәрегеҙ бар</string>
+	<string name="dialog_unsaved_changes_message">Үҙгәртеүҙәрҙе һаҡламайынса сығырға теләйһегеҙме?</string>
+	<string name="dialog_unsaved_changes_discard">Һаҡламаҫҡа</string>
+	<string name="dialog_file_name_hint">Файл исеме</string>
+	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_delete_vault_message">Был һаҡлағысты ысындан алып ташларға теләйһегеҙме?</string>
+	<string name="dialog_delete_vault_hint">Был ғәмәл һаҡлағысты исемлектән генә алып ташлай, уны физик рәүештә юймай.</string>
+	<string name="dialog_upload_file_title">Тейәү&#8230;</string>
+	<string name="dialog_upload_file_remaining">%2$d файлдан %1$d файл</string>
+	<string name="dialog_export_file_title">Экспортлау (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Көтөгөҙ зинһар&#8230;</string>
+	<string name="dialog_progress_creating_folder">Папка яһау бара&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Текст файлы яһау бара&#8230;</string>
+	<string name="action_progress_authentication">Аутентиклау бара&#8230;</string>
+	<string name="action_progress_renaming">Исемен үҙгәртеү бара&#8230;</string>
+	<string name="action_progress_deleting">Юйыу бара&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Һаҡлағыстың биген сисеү бара&#8230;</string>
+	<string name="dialog_progress_change_password">Серһүҙҙе үҙгәртеү бара&#8230;</string>
+	<string name="dialog_progress_creating_vault">Һаҡлағыс яһау бара&#8230;</string>
+	<string name="dialog_progress_upload_file">Тейәү бара&#8230;</string>
+	<string name="dialog_progress_download_file">Күсереп алыу бара&#8230;</string>
+	<string name="dialog_progress_encryption">Шифрлау бара&#8230;</string>
+	<string name="dialog_progress_decryption">Шифрын асыу бара&#8230;</string>
+	<string name="action_progress_moving">Күсереү бара&#8230;</string>
+	<string name="dialog_lock_vault">Биклә</string>
+	<string name="dialog_accept_ssl_certificate_title">Ғәмәлдә булмаған SSL сертификаты</string>
+	<string name="dialog_accept_ssl_certificate_hint">SSL сертификаты ғәмәлдә түгел. Уға һәр хәлдә ышанырға теләйһегеҙме?</string>
+	<string name="dialog_accept_ssl_certificate_details">Тулыраҡ мәғлүмәт</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Хәүефһеҙлек рискы тыуҙырыуы ихтимал. Ни эшләгәнемде беләм.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Батарея оптималләштереүҙе һүндереү</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Артҡы планда эшләмәйенсә яңы һүрәттәр һәм видеолар алыу өсөн батарея оптималләштереүҙе һүндереү кәрәк. Ләкин борсолмағыҙ, %1$s күп энергия ҡулланмай.\n\nУны ҡулланыу өсөн, \'Оптималләштерелмәгән\' тигәнде \'Бөтә ҡушымталар\' тип үҙгәртегеҙ, %1$s тигәнде һайлағыҙ һәм ошо диалогта \'%2$s\' тигәнде ҡуйып, \'Оптималләштермәҫкә\' тигәнде һайлағыҙ.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Башҡаса һорамаҫҡамы?</string>
+	<string name="dialog_http_security_hint">HTTP ҡулланыу хәүефһеҙ түгел. Уның урынына HTTPS ҡулланырға кәңәш итәбеҙ. Хәүефтәрҙе белһәгеҙ, HTTP менән дауам итә алаһығыҙ.</string>
+	<string name="dialog_http_security_checkbox">HTTPS ҡулланыу</string>
+	<string name="dialog_http_security_title">HTTPS ҡулланырғамы?</string>
+	<string name="dialog_no_screen_lock_hint">Экран биге ҡуйылмаған. Иҫәп яҙмаһы мәғлүмәттәрен ышаныслы һаҡлар өсөн ҡалып йәки серһүҙ ҡуйығыҙ.</string>
+	<string name="dialog_no_screen_lock_title">Экран биге ҡуйырғамы?</string>
+	<string name="dialog_no_screen_lock_checkbox">Экран биге ҡуйыу</string>
+	<string name="dialog_no_biometric_auth_set_up_title">Системала нигеҙ аутентиклау ҡоролмаған</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Был хеҙмәттән файҙаланыу өсөн, кәм тигәндә, бер бармаҡ эҙен йәки йөҙҙө теркәгеҙ.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">Был режимда нескә мәғлүмәттәрҙең (мәҫәлән, файл исемдәре, юлдар) йыһаздың журнал файлына яҙылыуы ихтимал. Серһүҙҙәр, cookie-файлдар һ.б. тура алып ташлана.\n\nЯйлау (debug) режимын тиҙ арала ябырға онотмағыҙ.</string>
+	<string name="dialog_debug_mode_disclaimer_title">Иғтибар</string>
+	<string name="dialog_debug_mode_positive_button">Ғәмәлгә индер</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Microsoft ҡушымталарындағы хата арҡаһында, төҙәтеләсәк файл йыһазығыҙҙағы дөйөм медиа папкала был ҡушымталар араһында уртаҡлашылырға тейеш. Cryptomator кире асылғандан һуң, уртаҡ файл яңынан юйыла, әммә Cryptomator был файл менән ни булыуына йоғонто яһай алмай. Был параметрҙы активлаштырғанда был хәл тураһында белеүегеҙҙе тикшерегеҙ. Был Microsoft файл төрҙәренә генә ҡағыла.\n\nАктивлаштырғандан һуң Cryptomator яңынан асыла.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Был көйләү хәүефһеҙлек үҙенсәлеге булып тора һәм ҡулланыусыларҙы башҡа ҡушымталарҙан алдап, улар теләмәгән эштәрҙе эшләтеүҙән һаҡлай.\n\nҺүндергән ваҡытта <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">хәүеф-янауҙар тураһында</a> белеүегеҙҙе раҫлайһығыҙ.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Иғтибар</string>
+	<string name="dialog_disable_app_obscured_positive_button">Һүндер</string>
+	<string name="dialog_app_is_obscured_info_title">Ҡушымта йәшерелгән</string>
+	<string name="dialog_app_is_obscured_info_hint">Икенсе ҡушымта Cryptomator өҫтөндә нимәлер күрһәтә (мәҫәлән, зәңгәр яҡтылыҡ фильтры йәки төнгө режим ҡушымтаһы). Хәүефһеҙлек сәбәптәре буйынса Cryptomator һүндерелгән.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured"> Cryptomator нисек асыла</a></string>
+	<string name="dialog_app_is_obscured_info_neutral_button">Яп</string>
+	<string name="dialog_vaults_removed_during_migration_title">%1s болото өсөн һаҡлағыстарҙы яңынан өҫтәү</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Был ҡушымта версияһына күскәндә ҡушымтанан түбәндәге һаҡлағыстарҙы алып ташларға кәрәк:\n%2s \n\nБыл һаҡлағыстар болоттан түгел, ә тик ошо ҡушымтанан ғына алына. Уңайһыҙлыҡтар өсөн ғәфү итегеҙ һәм улар менән эшләүҙе дауам итер өсөн һаҡлағыстарҙы яңынан өҫтәгеҙ.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Һаҡлағыс болот бәйләнешенең тамыр папкаһы</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Яңы болот бәйләнеше булдырығыҙ, унда һаҡлағысҡа тамыр папка итеп өҫтәр өсөн был папканың кәмендә өҫ папкаһын һайлағыҙ.</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">Был көйләү хәүефһеҙлек үҙенсәлеге булып тора һәм ҡулланыусыларҙы башҡа ҡушымталарҙан алдап, улар теләмәгән эштәрҙе эшләтеүҙән һаҡлай.\n\nҺүндергән ваҡытта <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">хәүеф-янауҙар тураһында</a> белеүегеҙҙе раҫлайһығыҙ.</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_message">Был болот бәйләнешен ысындан алып ташларға теләйһегеҙме?</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_hint">Был ғәмәл болот бәйләнешен һәм был болоттың бөтә һаҡлағыстарын алып ташлай.</string>
+	<string name="dialog_confirm_delete_multiple_title">%1$d элементты юйырғамы?</string>
+	<string name="dialog_confirm_delete_multiple_message">Был элементтарҙы ысындан да юйырға теләйһегеҙме?</string>
+	<string name="dialog_confirm_delete_file_message">Был файлды ысындан да юйырға теләйһегеҙме?</string>
+	<string name="dialog_confirm_delete_folder_message">Был папканың бөтә эстәлеген юясаҡ. Был папканы ысындан да юйырға теләйһегеҙме?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">Биометрик аутентиклау үҙенсәлеге ябылған</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">Асҡыс ғәмәлдән сығарылғанға күрә, биометрик аутентиклау һүндерелгән. Яңынан активлаштырыу өсөн Cryptomator көйләүҙәрен асығыҙ.</string>
+	<string name="dialog_enter_license_title">Ғәмәлдә булған рөхсәтнамә яҙығыҙ</string>
+	<string name="dialog_enter_license_content">Google Play Store ҡулланмайынса Cryptomator ҡуйыуығыҙҙы асыҡланыҡ. <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a> сайтында һатып алып булған һәм ғәмәлдәге рөхсәтнамә яҙығыҙ.</string>
+	<string name="dialog_enter_license_not_valid_content">Бирелгән рөхсәтнамә ғәмәлдә түгел. Уны дөрөҫ яҙғанығыҙҙы тикшерегеҙ.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Бирелгән асҡыс — ярҙамсы сертификаты. Ғәмәлдә булған рөхсәтнамә яҙығыҙ.</string>
+	<string name="dialog_enter_license_no_content">Рөхсәтнамә яҙылмаған. Ғәмәлдә булған рөхсәтнамә яҙығыҙ.</string>
+	<string name="dialog_enter_license_decline_button">Сыҡ</string>
+	<string name="dialog_license_confirmation_title">Рөхсәтнамә раҫлау</string>
+	<string name="dialog_license_confirmation_message">Ғәмәлдәге рөхсәтнамә биргәнегеҙ өсөн рәхмәт %1$s.</string>
+	<string name="dialog_update_available_title">Яңыртыу бар</string>
+	<string name="dialog_update_available_message">Cryptomator-ҙы һуңғы версияға яңыртыу. ОК төймәһенә баҫҡандан һәм ҡушымта артҡы планда күсереп алынғандан һуң уны ҡуйыуығыҙҙы һораясаҡбыҙ.</string>
+	<string name="dialog_update_available_update">Хәҙер яңырт</string>
+	<string name="dialog_update_available_download_site">Күсереп алыу битен ас</string>
+	<string name="dialog_update_available_cancel">Аҙаҡтан</string>
+	<string name="dialog_download_update_title">Күсереп алыу бара</string>
+	<string name="dialog_download_update_message">Cryptomator-ҙың һуңғы версияһын күсереп алыу бара</string>
+	<string name="dialog_sym_link_title">Был папка символик һылтанма</string>
+	<string name="dialog_sym_link_message">Был символик һылтанма аша күсә алмайһығыҙ</string>
+	<string name="dialog_sym_link_back_button">Артҡа</string>
+	<string name="dialog_no_dir_file_title">Папканың эстәлеген күсереп алып булмай</string>
+	<string name="dialog_no_dir_file_message">\'%1$s\' болот папкаһының ғәмәлдәге каталог файлы юҡ. Бәлки, папка икенсе йыһызда эшләнгән һәм әлегә тулыһынса болотҡа синхронлашмағандыр. Түбәндәге файл бармы-юҡмы икәнлеген болотығыҙҙа тикшерегеҙ: \n%2$s</string>
+	<string name="dialog_no_more_images_to_display">Күрһәтерлек һүрәттәр юҡ&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">\'%1$s\' иҫәп яҙыуы мәғлүмәттәре яңыртылды</string>
+	<string name="dialog_pcloud_credentials_updated">Әгәр ҙә һеҙ яңы pCloud иҫәп яҙмаһы өҫтәргә ниәтләһәгеҙ, ошо url <a href="https://www.pcloud.com">www.pcloud.com</a> аша күсегеҙ, ағымдағы иҫәп яҙмаһынан сығығыҙ һәм яңы болот бәйләнеше булдырыу өсөн был ҡушымталағы \'+\' төймәһенә баҫығыҙ.</string>
+	<string name="permission_snackbar_auth_local_vault">Урындағы һаҡлағыстарҙы ҡулланыу өсөн Cryptomator-ға һаҡлағысҡа инеү рәхсәте кәрәк</string>
+	<string name="permission_snackbar_auth_auto_upload">Автоматик фото тейәү өсөн Cryptomator-ға һаҡлағысҡа инеү рәхсәте кәрәк</string>
+	<string name="permission_snackbar_notifications">Cryptomator-ға белдереү ебәреү хоҡуҡтары кәрәк. Мәҫәлән, һаҡлағыс торошо тураһында.</string>
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<string name="file_size_zero">0 кБ</string>
+	<string name="file_size_unit_bytes">байт</string>
+	<string name="file_size_unit_kilo_bytes">кБ</string>
+	<string name="file_size_unit_mega_bytes">МБ</string>
+	<string name="file_size_unit_giga_bytes">ГБ</string>
+	<string name="file_size_unit_tera_bytes">ТБ</string>
+	<!-- ## date helper -->
+	<string name="time_unit_seconds_sg">секунд</string>
+	<string name="time_unit_seconds_pl">секунд</string>
+	<string name="time_unit_minutes_sg">минут</string>
+	<string name="time_unit_minutes_pl">минут</string>
+	<string name="time_unit_hours_sg">сәғәт</string>
+	<string name="time_unit_hours_pl">сәғәт</string>
+	<string name="time_unit_days_sg">көн</string>
+	<string name="time_unit_days_pl">көн</string>
+	<string name="time_unit_weeks_sg">аҙна</string>
+	<string name="time_unit_weeks_pl">аҙна</string>
+	<string name="time_unit_months_sg">ай</string>
+	<string name="time_unit_months_pl">ай</string>
+	<string name="time_unit_years_sg">йыл</string>
+	<string name="time_unit_years_pl">йыл</string>
+	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">Биометрик инеү</string>
+	<string name="dialog_biometric_auth_message">Биометрик иҫәп яҙмаһын ҡулланып ин</string>
+	<string name="dialog_biometric_auth_use_password">Һаҡлағыс серһүҙен ҡуллан</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Файлдарҙы автоматик рәүештә тейәп булмай</string>
+	<!-- notification -->
+	<string name="notification_unlocked">Биге асыҡ һаҡлағыс: %1$d</string>
+	<string name="notification_timeout">%1$s эсендә автоматик бикләү</string>
+	<string name="notification_lock_all">Барыһын да биклә</string>
+	<string name="notification_cancel_auto_upload">Тейәүҙе туҡтат</string>
+	<string name="notification_auto_upload_title">Автоматик фото тейәү бара</string>
+	<string name="notification_auto_upload_message">%1d/%2d тейәлә</string>
+	<string name="notification_auto_upload_finished_title">Автоматик фото тейәү тамамланды</string>
+	<string name="notification_auto_upload_finished_message">Һаҡлағысҡа %1$d һүрәт тейәлде</string>
+	<string name="notification_auto_upload_failed_title">Автомат фото тейәү уңышһыҙ булды</string>
+	<string name="notification_auto_upload_failed_general_error">Тейәү ваҡытында дөйөм хата килеп сыҡты.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Тейәү өсөн һайланған папка хәҙер юҡ. Көйләүҙәргә барығыҙ һәм яңыһын һайлағыҙ</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Тейәү ваҡытында һаҡлағыс бикләнгән, дауам итеү өсөн һаҡлағысты яңынан асығыҙ</string>
+	<string name="notification_auto_upload_failed_due_to_vault_not_found">Автоматик тейәү өсөн һайланған папка хәҙер юҡ.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Аутентиклауҙы яңыртыу өсөн баҫығыҙ.</string>
+	<string name="notification_open_writable_file_title">Яҙып булған файл асыу</string>
+	<string name="notification_open_writable_file_message">Төҙәтеү тамамланғансы һаҡлаҡыс бикләнмәй ҡала</string>
+	<string name="notification_update_check_finished_latest">Һуңғы версия ҡуйылған</string>
+	<string name="notification_authenticating">Аутентиклау&#8230;</string>
+	<string name="screen_settings_lru_cache">Кэш</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Йыһазда шифрланған, һуңғы ваҡытта ҡулланылған файлдарҙы аҙаҡтан кире асҡанда ҡулланыр өсөн кэшларға</string>
+	<string name="screen_settings_lru_cache_size">Дөйөм кэш күләме</string>
+	<string name="screen_settings_clear_lru_cache_size">Кэшты таҙартыу</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">Үҙгәрештәр ҡушымтаны ҡайтанан эшләтеп ебәргәндә ҡулланыласаҡ</string>
+	<string name="screen_settings_license">Теркәлеүсе</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">Яңыртыу тикшереү интервалы</string>
+	<string name="screen_settings_check_updates">Яңыртыуҙарҙы тикшереү</string>
+	<string name="screen_settings_last_check_updates">Һуңғы тикшереү %1$s</string>
+	<string name="dialog_cache_size_title">Болот башына кэш күләме</string>
+	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">Шунда уҡ</string>
+	<string name="lock_timeout_1m">1 минут</string>
+	<string name="lock_timeout_2m">2 минут</string>
+	<string name="lock_timeout_5m">5 минут</string>
+	<string name="lock_timeout_10m">10 минут</string>
+	<string name="lock_timeout_never">Бер ҡасан да</string>
+	<!-- cache size names -->
+	<string name="cache_size_50m">50 МБ</string>
+	<string name="cache_size_100m">100 МБ</string>
+	<string name="cache_size_250m">250 МБ</string>
+	<string name="cache_size_500m">500 МБ</string>
+	<string name="cache_size_1000m">1 ГБ</string>
+	<string name="cache_size_5000m">5 ГБ</string>
+	<!-- screen scheme mode names -->
+	<string name="screen_settings_style_mode">Күренеш</string>
+	<string name="follow_system">Автоматик (систамалағы һымаҡ)</string>
+	<string name="light">Яҡты</string>
+	<string name="dark">Ҡараңғы</string>
+	<!-- update interval names -->
+	<string name="update_interval_1d">Көндә бер тапҡыр</string>
+</resources>
diff --git a/presentation/src/main/res/values-be-rBY/strings.xml b/presentation/src/main/res/values-be-rBY/strings.xml
index 6d5bcf37c..0f6a51758 100644
--- a/presentation/src/main/res/values-be-rBY/strings.xml
+++ b/presentation/src/main/res/values-be-rBY/strings.xml
@@ -17,8 +17,13 @@
 	<string name="error_server_not_found">Сэрвер ня знойдзены.</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Мясцовае сховішча</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="permission_message_export_file">Cryptomator патрэбны доступ да сховішча, каб экспартаваць файлы</string>
+	<string name="permission_message_upload_file">Cryptomator патрэбны доступ да сховішча, каб запампаваць файлы</string>
+	<string name="permission_message_share_file">Cryptomator патрэбны доступ да сховішча, каб абагуліць файлы</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator ня мае дазволу на доступ да гэтай мясцовасьці. Калі ласка, абяры гэту тэчку яшчэ раз, каб аднавіць дазвол.</string>
 	<string name="snack_bar_action_title_settings">Налады</string>
 	<string name="snack_bar_action_title_search">Шукаць</string>
 	<string name="snack_bar_action_title_search_previous">Папярэдні</string>
@@ -31,8 +36,10 @@
 	<string name="snack_bar_action_title_sort_biggest">Найбуйнейшыя спачатку</string>
 	<string name="snack_bar_action_title_sort_smallest">Найменшыя спачатку</string>
 	<string name="snack_bar_cryptomator_variants_title">Чытаць далей</string>
+	<string name="snack_bar_cryptomator_variants_hint">Воблаку ня мае ў сьпісе?</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Дадаць да Cryptomator</string>
 	<string name="screen_vault_list_action_create_new_vault">Стварыць новую скарбніцу</string>
 	<string name="screen_vault_list_action_add_existing_vault">Дадаць існуючую скрабніцу</string>
 	<string name="screen_vault_list_vault_action_delete">Выдаліць</string>
@@ -45,22 +52,37 @@
 	<string name="screen_file_browser_create_new_vault_extra_text">Імя скрабніцы: %1$s</string>
 	<string name="screen_file_browser_move_button_text">Перамясціць</string>
 	<string name="screen_file_browser_msg_empty_folder">Пустая тэчка</string>
+	<string name="screen_file_browser_file_info_label_date">зьменена %1$s таму</string>
 	<string name="screen_file_browser_share_intent_chooser_title">Абагуліць з</string>
 	<string name="screen_file_browser_share_destination_title">Абяры месцазнаходжанне</string>
 	<string name="screen_file_browser_share_button_text">Абраць</string>
 	<string name="screen_file_browser_nothing_to_share">Няма што абагуліць</string>
+	<string name="screen_file_browser_actions_title">Дадаць да %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Стварыць тэчку</string>
+	<string name="screen_file_browser_action_create_new_text_file">Стварыць тэкставы файл</string>
+	<string name="screen_file_browser_action_upload_files">Запампаваць файлы</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Файлы</string>
+	<string name="screen_file_browser_msg_file_exported">Файл экспартаваны</string>
+	<string name="screen_file_browser_msg_files_exported">Файлы экспартаваныя</string>
+	<string name="screen_file_browser_nothing_to_export">Няма чаго экспартаваць</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Не атрымалася стварыць тэчку для спамповак</string>
 	<string name="screen_file_browser_node_action_share">Абагуліць</string>
 	<string name="screen_file_browser_node_action_rename">Пераназваць</string>
 	<string name="screen_file_browser_node_action_edit_text">Рэдагаваць</string>
 	<string name="screen_file_browser_node_action_export">Экспартаваць</string>
 	<string name="screen_file_browser_node_action_delete">Выдаліць</string>
+	<string name="screen_file_browser_node_action_open_with_text">Адчыніць праз&#8230;</string>
 	<string name="screen_file_browser_selection_mode_title_zero_elements">Вылучыць элементы</string>
 	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d вылучана</string>
 	<string name="screen_file_browser_select_items">Вылучыць</string>
 	<string name="screen_file_browser_select_all_items">Вылучыць усё</string>
+	<string name="screen_file_browser_refresh_items">Абнавiць</string>
+	<string name="screen_file_browser_no_connection_message">Няма злучэння</string>
+	<string name="screen_file_browser_no_connection_button_text">Паспрабаваць ізноў</string>
 	<!-- ## screen: text editor -->
 	<string name="screen_text_editor_save_success">Паспяхова захавана</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">Захаваць %1$s у&#8230;</string>
 	<string name="screen_share_files_content_text">тэкст</string>
 	<string name="screen_share_files_content_file">файл</string>
 	<string name="screen_share_files_content_files">файлы</string>
diff --git a/presentation/src/main/res/values-bg-rBG/strings.xml b/presentation/src/main/res/values-bg-rBG/strings.xml
index 8e9075e87..4d9d552e9 100644
--- a/presentation/src/main/res/values-bg-rBG/strings.xml
+++ b/presentation/src/main/res/values-bg-rBG/strings.xml
@@ -1,43 +1,249 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
+	<string name="share_with_label">Шифроване</string>
 	<!-- # error messages -->
+	<string name="error_generic">Възникна грешка</string>
+	<string name="error_authentication_failed">Неуспешно удостоверяване</string>
+	<string name="error_authentication_failed_re_authenticate">Удостоверяването е неуспешно, влезте чрез %1$s</string>
+	<string name="error_no_network_connection">Няма връзка с мрежата</string>
+	<string name="error_invalid_passphrase">Грешна парола</string>
+	<string name="error_file_or_folder_exists">Файлът или папката вече съществува.</string>
+	<string name="error_vault_version_not_supported">Хранилище версия %1$s не се поддържа. Това хранилище е създадено с различна версия на Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Файлът %1$s липсва в папката на хранилището. Уверете се, че файлът се намира в папката на хранилището в облака.</string>
+	<string name="error_vault_already_exists">Хранилището вече съществува.</string>
+	<string name="error_no_such_file">Файлът не съществува.</string>
+	<string name="error_vault_has_been_locked">Хранилището е заключено.</string>
+	<string name="error_cloud_already_exists">Облакът вече съществува.</string>
+	<string name="error_activity_not_found">Изтеглете приложение, което може да отвори този файл.</string>
+	<string name="error_server_not_found">Сървърът не е намерен.</string>
+	<string name="error_device_policy_manager_not_found">Отворете настройките на устройството и ръчно задайте заключване на екрана</string>
+	<string name="error_export_illegal_file_name">Експортирането е неуспешно. Премахнете специалните знаци от имената на файловете и опитайте отново.</string>
+	<string name="error_name_contains_invalid_characters">Не са позволени специални знаци.</string>
+	<string name="error_names_contains_invalid_characters">Имената на файловете не трябва да съдържат специални знаци.</string>
+	<string name="error_vault_name_contains_invalid_characters">Имената на хранилищата не трябва да съдържат специални знаци.</string>
+	<string name="error_general_update">Неуспешна проверка за обновяване. Обща грешка.</string>
+	<string name="error_hash_mismatch_update">Неуспешна проверка за обновяване. Изчисленият хеш не съвпада с качения файл</string>
+	<string name="error_update_no_internet">Неуспешна проверка за обновяване. Няма връзка с интернет.</string>
+	<string name="error_failed_to_decrypt_webdav_password">Неуспешно декриптиране на паролата за WebDAV, добавете я отново от настройките</string>
+	<string name="error_play_services_not_available">Услугите на Google Play не са инсталирани</string>
+	<string name="error_biometric_auth_aborted">Биометричното удостоверяване е прекъснато</string>
+	<string name="error_vault_version_mismatch">Посочената версия в %1$s е различна от тази в %2$s</string>
+	<string name="error_vault_key_invalid">%1$s не съвпада с %2$s</string>
+	<string name="error_vault_config_loading">Обща грешка при зареждане на настройките на хранилището</string>
+	<string name="error_file_not_found_after_opening_using_3party">При връщане в Криптоматор местният файл вече не съществува. Евентуалните промени не могат да бъдат синхронизирани с облака.</string>
+	<string name="error_no_such_bucket">Не съществува такъв bucket</string>
+	<string name="error_masterkey_location_not_supported">Все още не се поддържа потребителско местоположение на главния ключ</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">Грешка при комуникацията с F-Droid. Приложението инсталирано ли е?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
+	<string name="cloud_names_local_storage">Местно хранилище</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="permission_message_export_file">За да експортира файлове Криптоматор иска достъп до местното хранилище</string>
+	<string name="permission_message_upload_file">За да качва файлове Криптоматор иска достъп до местното хранилище</string>
+	<string name="permission_message_share_file">За да споделя файлове Криптоматор иска достъп до местното хранилище</string>
+	<string name="permission_revoked_re_request_permission">Криптоматор е загубил достъпа до тук. За да го възстановите изберете папката отново.</string>
+	<string name="snack_bar_action_title_settings">Настройки</string>
+	<string name="snack_bar_action_title_search">Търсене</string>
+	<string name="snack_bar_action_title_search_previous">Назад</string>
 	<string name="snack_bar_action_title_search_next">Напред</string>
+	<string name="snack_bar_action_title_sort">Подредба</string>
+	<string name="snack_bar_action_title_sort_az">A - Я</string>
+	<string name="snack_bar_action_title_sort_za">Я - А</string>
+	<string name="snack_bar_action_title_sort_newest">Първо новите</string>
+	<string name="snack_bar_action_title_sort_oldest">Първо старите</string>
+	<string name="snack_bar_action_title_sort_biggest">Първо големите</string>
+	<string name="snack_bar_action_title_sort_smallest">Първо малките</string>
+	<string name="snack_bar_cryptomator_variants_title">Повече</string>
+	<string name="snack_bar_cryptomator_variants_hint">Облакът не е в списъка?</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Добавяне в Криптоматор</string>
+	<string name="screen_vault_list_action_create_new_vault">Ново хранилище</string>
+	<string name="screen_vault_list_action_add_existing_vault">Добавяне на съществуващо хранилище</string>
+	<string name="screen_vault_list_vault_action_delete">Премахване</string>
+	<string name="screen_vault_list_vault_creation_hint">Докоснете за създаване на хранилище</string>
+	<string name="screen_vault_list_change_password_successful">Паролата е сменена</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Хранилище</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Изберете файл на главен ключ</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Постави тук</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Име на хранилище: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="one">Преместване на %1$s в</item>
+		<item quantity="other">Преместване на %2$d елемента в</item>
+	</plurals>
+	<string name="screen_file_browser_move_button_text">Преместване</string>
+	<string name="screen_file_browser_msg_empty_folder">Празна папка</string>
+	<string name="screen_file_browser_file_info_label_date">променено преди %1$s</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Споделяне чрез</string>
+	<string name="screen_file_browser_share_destination_title">Избор на дестинация</string>
+	<string name="screen_file_browser_share_button_text">Избор</string>
+	<string name="screen_file_browser_nothing_to_share">Няма нищо за споделяне</string>
+	<string name="screen_file_browser_actions_title">Добавяне към %1$s</string>
+	<string name="screen_file_browser_action_create_folder">Нова папка</string>
+	<string name="screen_file_browser_action_create_new_text_file">Нов текстов файл</string>
+	<string name="screen_file_browser_action_upload_files">Качване на файлове</string>
+	<string name="screen_file_browser_upload_files_chooser_title">Файлове</string>
+	<string name="screen_file_browser_msg_file_exported">Файлът е експортиран</string>
+	<string name="screen_file_browser_msg_files_exported">Файловете са експортирани</string>
+	<string name="screen_file_browser_nothing_to_export">Няма нищо за експортиране</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Грешка при създаване на папка за изтегляне</string>
+	<string name="screen_file_browser_node_action_share">Споделяне</string>
+	<string name="screen_file_browser_node_action_rename">Преименуване</string>
+	<string name="screen_file_browser_node_action_edit_text">Редактиране</string>
+	<string name="screen_file_browser_node_action_export">Експортиране</string>
+	<string name="screen_file_browser_node_action_delete">Изтриване</string>
+	<string name="screen_file_browser_node_action_open_with_text">Отваряне чрез&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Избор на елементи</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d избрани</string>
+	<string name="screen_file_browser_select_items">Избиране</string>
+	<string name="screen_file_browser_select_all_items">Избиране всички</string>
+	<string name="screen_file_browser_refresh_items">Презареждане</string>
+	<string name="screen_file_browser_no_connection_message">Няма връзка</string>
+	<string name="screen_file_browser_no_connection_button_text">Повторен опит</string>
 	<!-- ## screen: text editor -->
+	<string name="screen_text_editor_save_success">Успешно запазено</string>
 	<!-- ## screen: share files -->
+	<string name="screen_share_files_title">Запазване на %1$s в&#8230;</string>
+	<string name="screen_share_files_content_text">текст</string>
+	<string name="screen_share_files_content_file">файл</string>
+	<string name="screen_share_files_content_files">файлове</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Имената трябва да са уникални, преименувайте повтарящите се.</string>
+	<string name="screen_share_files_section_location">Местоположение за запазване</string>
+	<string name="screen_share_files_save_button_text">Запазване</string>
+	<string name="screen_share_files_msg_success">Шифроването е завършено</string>
 	<!-- ## screen: choose cloud service -->
+	<string name="screen_choose_cloud_service_title">Облачна услуга</string>
 	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">Избор на местоположение</string>
+	<string name="screen_cloud_connections_no_connections">Докоснете за добавяне на местоположения</string>
+	<string name="screen_cloud_error_webdav_not_supported">Изглежда сървърът е несъвместим с WebDAV</string>
+	<string name="screen_cloud_local_error_no_content_provider">Не е намерено приложение за управлрние на файлове, което да отваря папки</string>
 	<!-- ## screen: webdav settings -->
+	<string name="screen_webdav_settings_url_port_label">URL</string>
+	<string name="screen_webdav_settings_username_label">Потребител</string>
+	<string name="screen_webdav_settings_password_label">Парола</string>
+	<string name="screen_webdav_settings_done_button_text">Свързване</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">Адресът не трябва да е празен.</string>
+	<string name="screen_webdav_settings_msg_url_is_invalid">Адресът е неприемлив.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Потребителят не трябва да е празен.</string>
+	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Паролата не трябва да е празна.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Показвано име</string>
+	<string name="screen_s3_settings_access_key_label">Ключ за достъп</string>
+	<string name="screen_s3_settings_secret_key_label">Таен ключ</string>
+	<string name="screen_s3_settings_bucket_label">Bucket</string>
+	<string name="screen_s3_settings_endpoint_label">Крайна точка</string>
+	<string name="screen_s3_settings_region_label">Регион</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Показваното име не трябва да е празно</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Ключът за достъп не трябва да е празен</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Тайният ключ не трябва да е празен</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Полето „Bucket“ не трябва да е празно</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Крайната точка или регионът не трябва да са празни</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">Името на хранилището не трябва да е празно.</string>
+	<string name="screen_enter_vault_name_vault_label">Име на хранилището</string>
+	<string name="screen_enter_vault_name_button_text">Създаване</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">Задаване на парола</string>
+	<string name="screen_set_password_msg_password_mismatch">Паролата и повторената парола не съвпадат.</string>
 	<string name="screen_set_password_button_text">Готово</string>
+	<string name="screen_set_password_hint">ВАЖНО: Ако забравите паролата няма начин да възстановите достъпа до данните.</string>
+	<string name="screen_set_password_retype_password_label">Въведете паролата отново</string>
+	<string name="screen_set_password_strength_indicator_0">Твърде слаба за да предпазва хранилище</string>
+	<string name="screen_set_password_strength_indicator_1">Слаба</string>
+	<string name="screen_set_password_strength_indicator_2">Задоволителна</string>
+	<string name="screen_set_password_strength_indicator_3">Добра</string>
+	<string name="screen_set_password_strength_indicator_4">Много добра</string>
 	<!-- ## screen: settings -->
+	<string name="screen_settings_section_general">Общи</string>
+	<string name="screen_settings_cloud_settings_label">Облачни услуги</string>
+	<string name="screen_settings_biometric_auth">Биометрично удостоверяване</string>
+	<string name="screen_settings_activate_biometric_auth">Биометрично удостоверяване</string>
+	<string name="screen_settings_confirm_face_unlock">Потвърждаване отключ. с лице (ако има)</string>
+	<string name="screen_settings_block_app_when_obscured">Възпрепятстване на припокриване</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Възпрепятства прехващането на въвежданото, показва лъжлив потребителски интерфейс</string>
+	<string name="screen_settings_secure_screen">Възпрепятстване на екранни снимки</string>
+	<string name="screen_settings_secure_screen_summary">Възпрепятства екранните снимки в списка с често използвани и в самото приложение</string>
+	<string name="screen_settings_section_search">Търсене</string>
+	<string name="screen_settings_live_search">Търсене на живо</string>
+	<string name="screen_settings_live_search_summary">Резултатите се обновяват докато въвеждате</string>
+	<string name="screen_settings_glob_search">Търсене чрез заместващи последователности</string>
+	<string name="screen_settings_glob_search_summary">Използва заместващи последователности като alice.*.jpg</string>
+	<string name="screen_settings_section_auto_lock">Автоматично заключване</string>
+	<string name="screen_settings_auto_lock_timeout">Заключване след</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">При изключен екран</string>
+	<string name="screen_settings_section_auto_photo_upload">Автоматично качване на снимки</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Избиране на хранилище</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Включване</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Прехваща изображения във фонов режим и при отключеане на хранилището започва да ги изпраща</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Качване незабавно</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Ако хранилището е отключено, качва незабавно</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Качване само през безжична мрежа</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Качване на видео</string>
+	<string name="screen_settings_auto_photo_upload_title">Запазване на качваните файлове в&#8230;</string>
+	<string name="screen_settings_website_label">Страница на Криптоматор</string>
+	<string name="screen_settings_twitter_label">Следвайте ни в X</string>
+	<string name="screen_settings_facebook_label">Харесайте ни във Фейсбук</string>
+	<string name="screen_settings_section_legal">Правни въпроси</string>
+	<string name="screen_settings_licenses_label">Лицензи</string>
+	<string name="screen_settings_license_terms_label">Лицензни условия</string>
+	<string name="screen_settings_section_support">Поддръжка</string>
+	<string name="screen_settings_contact_label">Получаване на помощ</string>
+	<string name="screen_settings_debug_mode_label">Режим за отстраняване на грешки</string>
+	<string name="screen_settings_error_report_label">Изпращане на дневника</string>
+	<string name="screen_settings_error_report_failed">Изпращането е неуспешно</string>
+	<string name="screen_settings_security_label">Съвети за сигурността</string>
+	<string name="screen_settings_section_version">Издание</string>
+	<string name="screen_settings_advanced_settings">Разширени настройки</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Заобиколен начин за отваряне на файлове на Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Отваряне на файлове в приложения на Microsoft с права за писане</string>
+	<string name="screen_settings_background_unlock_preparation_label">Ускоряване на отключването</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Файла с настройката на хранилището се изтегля във фонов режим още на екрана за парола или биометрично удостоверяване</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">Оставяне отключено</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Оставя хранилищата отключени докато има отворени файлове</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">Връзки с OneDrive</string>
+	<string name="screen_cloud_settings_webdav_connections">Връзки с WebDAV</string>
+	<string name="screen_cloud_settings_pcloud_connections">Връзки с pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">Връзки с S3</string>
+	<string name="screen_cloud_settings_local_storage_locations">Местоположения на местното хранилище</string>
+	<string name="screen_cloud_settings_log_in_to">Влизане</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Изход от</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s не може да бъде удостоветен.</string>
+	<string name="screen_update_pcloud_connections_title">Обновяване на даните за вход в pCloud</string>
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">Варианти на Криптоматор</string>
+	<string name="screen_cryptomator_variants_lite_title">Основно хранилище на F-Droid</string>
+	<string name="screen_cryptomator_variants_lite_install">Инсталиране</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Хранилище на Криптоматор за F-Droid</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Добавете хранилището на Криптоматор към F-Droid.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo">Добавяне</string>
+	<string name="screen_cryptomator_variants_website_title">Страница в интернет</string>
+	<string name="screen_cryptomator_variants_website_description">Съдържа собственически зависимости.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Отказ</string>
 	<string name="dialog_enter_password_positive_button">Отключване</string>
+	<string name="dialog_change_password_msg_old_password_empty">Старата парола не трябва да е празна.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Новата парола не трябва да е празна.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_positive_button_text">Премахване</string>
 	<string name="dialog_lock_vault">Заключване</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Поради дефект в приложенията на Microsoft, файлът, който трябва да бъде редактиран, трябва да бъде споделен с тези приложения в публична папка на вашето устройство. След възобновяване на работата на Cryptomator, публично достъпният файл се изтрива отново, но Cryptomator не може да повлияе на случващото се с файла междувременно. Преди да включите тук се уверете, че сте наясно с това поведение. Това ще се прилага само за файлове на Microsoft.\n\nСлед включване Cryptomator ще се рестартира.</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Затваряне</string>
 	<string name="dialog_sym_link_back_button">Назад</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
 	<!-- ## date helper -->
+	<string name="time_unit_minutes_pl">минути</string>
 	<!-- ## biometric authentication -->
 	<!-- notification -->
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Докоснете, за да презаредите удостоверяването.</string>
 	<!-- lock timeout names -->
 	<!-- cache size names -->
 	<!-- screen scheme mode names -->
diff --git a/presentation/src/main/res/values-ca-rES/strings.xml b/presentation/src/main/res/values-ca-rES/strings.xml
index 6eba8e0fb..25ae00989 100644
--- a/presentation/src/main/res/values-ca-rES/strings.xml
+++ b/presentation/src/main/res/values-ca-rES/strings.xml
@@ -198,6 +198,8 @@
 	<string name="screen_settings_security_label">Consells de seguretat</string>
 	<string name="screen_settings_section_version">Versió</string>
 	<string name="screen_settings_advanced_settings">Configuració avançada</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Solució alternativa per obrir fitxers de Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Obrir fitxers a Microsoft apps amb permís d\'escriptura</string>
 	<string name="screen_settings_background_unlock_preparation_label">Desbloqueja més ràpid</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Descarrega la configuració de la caixa forta de fons mentre es demana introduir la contrasenya o l\'autenticació biomètrica</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Manté desblocat</string>
@@ -304,6 +306,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">En aquest mode, informació sensible pot ser escrita en un arxiu de registre al teu dispositiu (per exemple, noms d\'arxius i rutes). Contrasenyes, galetes, etc. són explícitament excloses.\n\nRecorda desactivar el mode de depuració tan aviat com sigui possible.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Atenció</string>
 	<string name="dialog_debug_mode_positive_button">Activa</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">A causa d\'un error en les aplicacions de Microsoft, el fitxer que s\'editarà s\'ha de compartir amb aquestes aplicacions en una carpeta de mitjans públics al dispositiu. Quan es reprengui Cryptomator, el fitxer d\'accés públic s\'elimina novament, però Cryptomator no pot influir en el que va passar amb aquest fitxer mentrestant. Assegureu-vos de conèixer aquest comportament en activar aquesta opció. Això només s\'aplicarà als tipus de fitxers de Microsoft.\n\nCryptomator es reiniciarà després de l\'activació.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Aquesta configuració és una funció de seguretat i evita que altres aplicacions enganyin els usuaris perquè facin coses que no volen fer.\n\nEn desactivar-la, confirmeu que sou &lt;a href="https://docs.cryptomator.org". /en/1.6/android/settings/#block-app-when-obscured"&gt;conscient dels riscos&lt;/a&gt;.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Atenció</string>
 	<string name="dialog_disable_app_obscured_positive_button">Desactiva</string>
@@ -348,6 +351,7 @@
 	<string name="dialog_pcloud_credentials_updated">Si teníeu la intenció d\'afegir un compte de pCloud nou, toqueu aquest URL <a href="https://www.pcloud.com">www.pcloud.com</a>, tanqueu la sessió del compte actual i torneu a tocar el \"+\" d\'aquesta aplicació per crear una nova connexió al núvol.</string>
 	<string name="permission_snackbar_auth_local_vault">Cryptomator necessita accés a l\'emmagatzematge per a fer servir caixes fortes locals</string>
 	<string name="permission_snackbar_auth_auto_upload">Cryptomator necessita accés a l\'emmagatzematge per a la pujada de fotos automàtica</string>
+	<string name="permission_snackbar_notifications">Cryptomator necessita permís de notificacions per poder informar del seu estat, per exemple</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
@@ -391,6 +395,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">La carpeta seleccionada per a la pujada ja no està disponible. Ves a la configuració i selecciona una nova</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">La caixa forta s\'ha bloquejat durant la pujada, si us plau desbloqueja-la per a continuar</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">La caixa forta especificada per a la pujada automàtica ja no existeix.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Toqui per refrescar l\'autenticació.</string>
 	<string name="notification_open_writable_file_title">Obre fitxer editable</string>
 	<string name="notification_open_writable_file_message">La caixa forta seguirà desbloquejada fins que acabi l\'edició</string>
 	<string name="notification_update_check_finished_latest">La versió més recent s\'ha instal·lat</string>
diff --git a/presentation/src/main/res/values-cs-rCZ/strings.xml b/presentation/src/main/res/values-cs-rCZ/strings.xml
index 4e362ffcd..8af221d31 100644
--- a/presentation/src/main/res/values-cs-rCZ/strings.xml
+++ b/presentation/src/main/res/values-cs-rCZ/strings.xml
@@ -34,6 +34,7 @@
 	<string name="error_file_not_found_after_opening_using_3party">Místní soubor již není přítomen po přepnutí zpět na Cryptomator. Možné změny nelze promítnout zpět do cloudu.</string>
 	<string name="error_no_such_bucket">Bucket neexistuje</string>
 	<string name="error_masterkey_location_not_supported">Vlastní umístění hlavního klíče ještě není podporováno</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">Nepodařilo se komunikovat s aplikací F-Droid. Možná není nainstalována?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Místní úložiště</string>
@@ -199,6 +200,8 @@
 	<string name="screen_settings_security_label">Bezpečnostní rady</string>
 	<string name="screen_settings_section_version">Verze</string>
 	<string name="screen_settings_advanced_settings">Rozšířená nastavení</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Řešení otevírání souborů Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Otevřít soubory v aplikaci Microsoft s oprávněním k zápisu</string>
 	<string name="screen_settings_background_unlock_preparation_label">Urychlit odemknutí</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Stáhnout konfiguraci trezoru na pozadí při vyzvání k zadání hesla nebo biometrického ověření</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Ponechat odemčené</string>
@@ -217,10 +220,17 @@
 	<string name="screen_update_pcloud_connections_title">Aktualizovat přihlašovací údaje k pCloudu</string>
 	<!-- ## screen: cryptomator app variants -->
 	<string name="screen_cryptomator_variants_title">Varianty Cryptomatoru</string>
+	<string name="screen_cryptomator_variants_lite_title">Hlavní F-Droid repozitář</string>
+	<string name="screen_cryptomator_variants_lite_description">Vyloučeny, protože jsou vyžadovány API klíče.</string>
 	<string name="screen_cryptomator_variants_lite_install">Instalovat</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Cryptomator F-Droid repozitář</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Vyloučeno, protože obsahuje proprietární závislosti.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Přidat Cryptomator repozitář do aplikace F-Droid.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo">Přidat</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">Nainstalujte Cryptomator pomocí F-Droid.\nPokud není nalezena chyba, počkejte, až bude synchronizace F-Droid dokončena.</string>
 	<string name="screen_cryptomator_variants_website_title">Webová stránka</string>
 	<string name="screen_cryptomator_variants_website_description">Obsahuje vlastní závislosti.</string>
+	<string name="screen_cryptomator_variants_installation_hint">Přechod z nebo do hlavní varianty repozitáře F-Droid vyžaduje nové nastavení aplikace.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Zrušit</string>
 	<string name="dialog_enter_password_positive_button">Odemknout</string>
@@ -258,6 +268,7 @@
 	<string name="dialog_unsaved_changes_title">Máte neuložené změny</string>
 	<string name="dialog_unsaved_changes_message">Opravdu chcete skončit bez uložení?</string>
 	<string name="dialog_unsaved_changes_discard">Zahodit</string>
+	<string name="dialog_file_name_hint">Název souboru</string>
 	<string name="dialog_file_name_placeholder">text.txt</string>
 	<string name="dialog_delete_vault_message">Jste si jisti, že chcete odstranit tento trezor?</string>
 	<string name="dialog_delete_vault_hint">Tato akce odstraní trezor pouze z tohoto seznamu a neodstraní jej fyzicky.</string>
@@ -284,6 +295,7 @@
 	<string name="dialog_accept_ssl_certificate_details">Podrobnosti</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Toto by mohlo být bezpečnostní riziko. Vím, co dělám.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_title">Zakázat optimalizace výdrže baterie</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Abychom mohli načítat nové obrázky a videa, aniž by běžely na pozadí, musíme vypnout optimalizace baterie. Ale nebojte se, %1$s nespotřebovává mnoho energie.\n\nChcete-li ji použít, změňte možnost \"Neoptimalizovat\" na \"Všechny aplikace\", vyberte %1$s a po klepnutí na \"%2$s\" v tomto dialogovém okně vyberte možnost \"Neoptimalizovat\".</string>
 	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Příště se neptat?</string>
 	<string name="dialog_http_security_hint">Použití HTTP je nezabezpečené. Doporučujeme použít HTTPS. Pokud znáte rizika, můžete pokračovat s HTTP.</string>
 	<string name="dialog_http_security_checkbox">Změnit na HTTPS</string>
@@ -296,6 +308,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">V tomto režimu mohou být citlivé údaje zapsány do souboru protokolu na vašem zařízení (např. názvy souborů a cesty). Hesla, soubory cookie atd. jsou výslovně vyloučeny.\n\nNezapomeňte co nejdříve vypnout režim ladění.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Upozornění</string>
 	<string name="dialog_debug_mode_positive_button">Povolit</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Kvůli chybě v aplikacích společnosti Microsoft musí být upravovaný soubor sdílen s těmito aplikacemi ve veřejné složce médií v zařízení. Po obnovení činnosti aplikace Cryptomator se veřejně přístupný soubor opět odstraní, ale aplikace Cryptomator nemůže ovlivnit, co se s tímto souborem mezitím stalo. Při aktivaci této možnosti se ujistěte, že jste si tohoto chování vědomi. Toto se týká pouze typů souborů společnosti Microsoft.\n\nCryptomator se po aktivaci znovu spustí.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Toto nastavení je bezpečnostní funkce a brání ostatním aplikacím v tom, aby oklamaly uživatele dělat věci, se kterými nesouhlasí.\n\nZakázáním potvrzujete, že jste <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">si vědomi rizik</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Upozornění</string>
 	<string name="dialog_disable_app_obscured_positive_button">Zakázat</string>
@@ -337,8 +350,10 @@
 	<string name="dialog_no_dir_file_message">Složka v cloudu \'%1$s\' nemá adresářový soubor. Mohlo dojít k tomu, že složka byla vytvořena na jiném zařízení a ještě nebyla plně synchronizována s cloudem. Prosím zkontrolujte v cloudu, zda existuje následující soubor a není prázdný: \n%2$s</string>
 	<string name="dialog_no_more_images_to_display">Žádné další obrázky k zobrazení&#8230;</string>
 	<string name="dialog_pcloud_credentials_updated_title">Údaje o \'%1$s\' byly aktualizovány</string>
+	<string name="dialog_pcloud_credentials_updated">Pokud máte v úmyslu přidat nový účet na pCloud, klepněte na tuto url <a href="https://www.pcloud.com">www.pcloud. om</a>, odhlas jste se z aktuálního účtu a znovu klepněte na \'+\' v této aplikaci pro vytvoření nového cloudového připojení.</string>
 	<string name="permission_snackbar_auth_local_vault">Cryptomator potřebuje přístup k úložišti, aby mohl používat místní trezory</string>
 	<string name="permission_snackbar_auth_auto_upload">Cryptomator potřebuje přístup k úložišti pro automatické nahrávání fotek</string>
+	<string name="permission_snackbar_notifications">Cryptomator potřebuje oprávnění k oznámení. Například: zobrazení stavu trezoru</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
@@ -382,6 +397,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Vybraná složka pro nahrání již není k dispozici. Přejděte do nastavení a vyberte novou složku</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Během nahrávání došlo k uzamčení trezoru, pro pokračování trezor prosím znovu odemkněte</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Trezor určený pro automatické nahrávání již neexistuje.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Klepnutím obnovíte autentifikaci.</string>
 	<string name="notification_open_writable_file_title">Otevřít zapisovatelný soubor</string>
 	<string name="notification_open_writable_file_message">Trezor zůstane odemknutý dokud nejsou dokončené úpravy</string>
 	<string name="notification_update_check_finished_latest">Nainstalována aktuální verze</string>
diff --git a/presentation/src/main/res/values-da-rDK/strings.xml b/presentation/src/main/res/values-da-rDK/strings.xml
index ccc22b7f3..3a93cd166 100644
--- a/presentation/src/main/res/values-da-rDK/strings.xml
+++ b/presentation/src/main/res/values-da-rDK/strings.xml
@@ -31,7 +31,7 @@
 	<string name="error_vault_version_mismatch">Versionen angivet i %1$s er forskellig fra %2$s</string>
 	<string name="error_vault_key_invalid">%1$s matcher ikke med denne %2$s</string>
 	<string name="error_vault_config_loading">Generel fejl under indlæsning af boksens konfiguration</string>
-	<string name="error_file_not_found_after_opening_using_3party">Den lokale fil findes ikke længere, efter vi skiftede tilbage til Cryptomator. Ændringer kan ikke propageres tilbage til skyen.</string>
+	<string name="error_file_not_found_after_opening_using_3party">Den lokale fil findes ikke længere, efter vi skiftede tilbage til Cryptomator. Ændringer kan ikke tilbageføres til skyen.</string>
 	<string name="error_no_such_bucket">Bucket findes ikke</string>
 	<string name="error_masterkey_location_not_supported">Brugerdefineret hovednøgle-placering understøttes ikke endnu</string>
 	<string name="error_interact_with_fdroid_but_fdroid_missing">Kunne ikke kommunikere med F-Droid appen. Er den ikke installeret?</string>
@@ -76,7 +76,7 @@
 	</plurals>
 	<string name="screen_file_browser_move_button_text">Flyt</string>
 	<string name="screen_file_browser_msg_empty_folder">Tom mappe</string>
-	<string name="screen_file_browser_file_info_label_date">ændret %1$s siden</string>
+	<string name="screen_file_browser_file_info_label_date">ændret for %1$s siden</string>
 	<string name="screen_file_browser_share_intent_chooser_title">Del med</string>
 	<string name="screen_file_browser_share_destination_title">Vælg destination</string>
 	<string name="screen_file_browser_share_button_text">Vælg</string>
@@ -100,7 +100,7 @@
 	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d valgt</string>
 	<string name="screen_file_browser_select_items">Vælg</string>
 	<string name="screen_file_browser_select_all_items">Vælg alle</string>
-	<string name="screen_file_browser_refresh_items">Opdatér</string>
+	<string name="screen_file_browser_refresh_items">Genopfrisk</string>
 	<string name="screen_file_browser_no_connection_message">Ingen forbindelse</string>
 	<string name="screen_file_browser_no_connection_button_text">Prøv igen</string>
 	<!-- ## screen: text editor -->
@@ -115,7 +115,7 @@
 	<string name="screen_share_files_save_button_text">Gem</string>
 	<string name="screen_share_files_msg_success">Kryptering færdig</string>
 	<!-- ## screen: choose cloud service -->
-	<string name="screen_choose_cloud_service_title">Cloud-tjeneste</string>
+	<string name="screen_choose_cloud_service_title">Tjenester i skyen</string>
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">Vælg en placering</string>
 	<string name="screen_cloud_connections_no_connections">Tryk her for at tilføje placeringer</string>
@@ -175,7 +175,7 @@
 	<string name="screen_settings_section_auto_lock">Automatisk låsning</string>
 	<string name="screen_settings_auto_lock_timeout">Lås efter</string>
 	<string name="screen_settings_auto_lock_on_screen_lock">Når skærmen er slukket</string>
-	<string name="screen_settings_section_auto_photo_upload">Automatisk foto upload</string>
+	<string name="screen_settings_section_auto_photo_upload">Automatisk foto-upload</string>
 	<string name="screen_settings_section_auto_photo_upload_vault">Vælg boks til upload</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Aktivér</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Håndtér billeder i baggrunden og upload dem når den valgte boks er låst op</string>
@@ -183,7 +183,7 @@
 	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Upload direkte hvis boksen er låst op</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Upload kun ved hjælp af WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Upload videoer</string>
-	<string name="screen_settings_auto_photo_upload_title">Gem automatisk upload af filer i&#8230;</string>
+	<string name="screen_settings_auto_photo_upload_title">Gem automatisk uploadede filer i&#8230;</string>
 	<string name="screen_settings_website_label">Cryptomators hjemmeside</string>
 	<string name="screen_settings_twitter_label">Følg os på Twitter</string>
 	<string name="screen_settings_facebook_label">Synes godt om os på Facebook</string>
@@ -198,6 +198,8 @@
 	<string name="screen_settings_security_label">Sikkerhedstips</string>
 	<string name="screen_settings_section_version">Version</string>
 	<string name="screen_settings_advanced_settings">Avancerede indstillinger</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Alternativ løsning til at åbne Microsoft-filer</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Åbn filer i Microsoft-apps med skrivetilladelse</string>
 	<string name="screen_settings_background_unlock_preparation_label">Accelerér oplåsning</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Download boksens konfiguration i baggrunden, mens du indtaster adgangskoden eller angivet biometrisk information</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Hold oplåst</string>
@@ -223,7 +225,7 @@
 	<string name="screen_cryptomator_variants_fdroid_description">Udelukket, fordi det indeholder proprietære afhængigheder.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Tilføj Cryptomator-depotet til F-Droid appen.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo">Tilføj</string>
-	<string name="screen_cryptomator_variants_fdroid_install_hint">Installér Cryptomator ved hjælp af F-Droid.\nHvis fejlen \"ikke fundet\" vises, da vent indtil F-Droid-synkroniseringen er færdig.</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">Installér Cryptomator ved hjælp af F-Droid.\nHvis fejlen \"ikke fundet\" vises, vent da indtil F-Droid-synkroniseringen er færdig.</string>
 	<string name="screen_cryptomator_variants_website_title">Hjemmeside</string>
 	<string name="screen_cryptomator_variants_website_description">Indeholder proprietære afhængigheder.</string>
 	<string name="screen_cryptomator_variants_installation_hint">At skifte fra eller til det primære F-Droid depot, kræver en frisk opsætning af appen.</string>
@@ -304,6 +306,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">I denne tilstand kan følsomme data blive skrevet til en logfil på din enhed (f.eks. filnavne og stier). Adgangskoder, cookies osv. er udtrykkeligt udelukket.\n\nHusk at deaktivere fejlfindingstilstand så hurtigt som muligt.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Vigtigt</string>
 	<string name="dialog_debug_mode_positive_button">Aktivér</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">På grund af en fejl i Microsoft-apps skal den fil, der skal redigeres, deles med disse apps i en offentlig mediemappe på din enhed. Når Cryptomator genoptages, slettes den offentligt tilgængelige fil igen, men Cryptomator kan ikke påvirke, hvad der er sket med denne fil i mellemtiden. Sørg for, at du er opmærksom på denne adfærd, når du aktiverer denne indstilling. Dette gælder kun for Microsofts filtyper.\n\nCryptomator genstarter efter aktivering.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Denne indstilling er en sikkerhedsfunktion og forhindrer andre apps i at narre brugere til at gøre ting, de ikke ønsker at gøre.\n\nVed at deaktivere, bekræfter du, at du er <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">bekendt med de involverede ricisi</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Vigtigt</string>
 	<string name="dialog_disable_app_obscured_positive_button">Deaktivér</string>
@@ -312,8 +315,8 @@
 	<string name="dialog_app_is_obscured_info_neutral_button">Luk</string>
 	<string name="dialog_vaults_removed_during_migration_title">Tilføj venligst boksene til %1s skyen igen</string>
 	<string name="dialog_vaults_removed_during_migration_hint">Mens vi migrerer til denne app-version, skal vi fjerne følgende bokse fra appen:\n%2s \n\nDisse bokse fjernes ikke fra skyen, men kun fra denne app. Beklager ulejligheden! Tilføj venligst disse bokse igen for at fortsætte med at arbejde med dem.</string>
-	<string name="dialog_vault_is_root_folder_of_cloud_title">Boksen er rodmappen for cloudforbindelsen</string>
-	<string name="dialog_vault_is_root_folder_of_cloud_hint">For at tilføje denne boks, lav en ny forbindelse til skyen hvor du mindst vælger den overordnede mappe som din rod-mappe.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Boksen er rodmappen for denne forbindelse til skyen</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">For at tilføje denne boks, skal du lave en ny forbindelse til skyen hvor du som minimum vælger mappen over boksens mappe som din rod-mappe.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Denne indstilling er en sikkerhedsfunktion og forhindrer andre apps i at narre brugere til at gøre ting, de ikke ønsker at gøre.\n\nVed at deaktivere, bekræfter du, at du er <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">bekendt med de involverede ricisi</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Er du sikke på, at du vil fjerne denne forbindelse?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Denne handling vil fjerne forbindelsen og alle bokse i denne sky.</string>
@@ -379,7 +382,7 @@
 	<string name="dialog_biometric_auth_use_password">Brug kodeord til boksen</string>
 	<string name="dialog_unable_to_auto_upload_files_title">Kan ikke uploade filer automatisk</string>
 	<!-- notification -->
-	<string name="notification_unlocked">Boks låst op: %1$d</string>
+	<string name="notification_unlocked">Bokse låst op: %1$d</string>
 	<string name="notification_timeout">Låser automatisk om %1$s</string>
 	<string name="notification_lock_all">Lås alle</string>
 	<string name="notification_cancel_auto_upload">Annullér upload</string>
@@ -388,22 +391,23 @@
 	<string name="notification_auto_upload_finished_title">Automatisk upload af fotos færdig</string>
 	<string name="notification_auto_upload_finished_message">%1$d billeder uploadet til boksen</string>
 	<string name="notification_auto_upload_failed_title">Automatisk upload af fotos fejlede</string>
-	<string name="notification_auto_upload_failed_general_error">Der skete en fejl under uploaden.</string>
+	<string name="notification_auto_upload_failed_general_error">Der opstod en generel fejl under upload.</string>
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Den valgte upload-mappe er ikke længere tilgængelig. Gå til indstillinger og vælg en ny</string>
-	<string name="notification_auto_upload_failed_due_to_vault_locked">Boks låst under upload, genåbn venligst boks for at fortsætte</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Boks låst under upload, genåbn venligst boksen for at fortsætte</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Boks angivet til auto-upload findes ikke længere.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Tryk for at opdatere godkendelse.</string>
 	<string name="notification_open_writable_file_title">Åben fil med skriveadgang</string>
 	<string name="notification_open_writable_file_message">Boks forbliver låst op indtil du er færdig med redigeringen</string>
 	<string name="notification_update_check_finished_latest">Nyeste version er installeret</string>
 	<string name="notification_authenticating">Godkender&#8230;</string>
 	<string name="screen_settings_lru_cache">Cache</string>
-	<string name="screen_settings_lru_cache_toggle_summary">Gem nyligt tilgåede filer lokalt, i krypteret form, så de hurtigt kan åbnes igen senere</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Gem nyligt tilgåede filer i cachen, i krypteret form, så de hurtigt kan åbnes igen senere</string>
 	<string name="screen_settings_lru_cache_size">Total cachestørrelse</string>
 	<string name="screen_settings_clear_lru_cache_size">Tøm cache</string>
 	<string name="screen_settings_lru_cache_changed__restart_toast">Ændringerne bliver anvendt næste gang du genstarter appen</string>
 	<string name="screen_settings_license">Registreret til</string>
 	<string name="screen_settings_license_mail">%1$s</string>
-	<string name="dialog_settings_update_check_interval_title">Tjek for nye opdateringer</string>
+	<string name="dialog_settings_update_check_interval_title">Interval for tjek af nye opdateringer</string>
 	<string name="screen_settings_check_updates">Søg efter opdateringer</string>
 	<string name="screen_settings_last_check_updates">Seneste tjek %1$s</string>
 	<string name="dialog_cache_size_title">Cache størrelse pr. sky-tjeneste</string>
diff --git a/presentation/src/main/res/values-de-rDE/strings.xml b/presentation/src/main/res/values-de-rDE/strings.xml
index a53e2a328..4d27b9d5b 100644
--- a/presentation/src/main/res/values-de-rDE/strings.xml
+++ b/presentation/src/main/res/values-de-rDE/strings.xml
@@ -198,14 +198,14 @@
 	<string name="screen_settings_security_label">Sicherheitshinweise</string>
 	<string name="screen_settings_section_version">Version</string>
 	<string name="screen_settings_advanced_settings">Erweiterte Eigenschaften</string>
-	<string name="screen_settings_microsoft_apps_workaround_label">Workaround, um Microsoft Dateien zu öffnen</string>
-	<string name="screen_settings_microsoft_apps_workaround_summary">Dateien in Microsoft Apps mit Schreibberechtigung öffnen</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Workaround zum Öffnen von Microsoft-Dateien</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">In Microsoft-Apps Dateien mit Schreibberechtigung öffnen</string>
 	<string name="screen_settings_background_unlock_preparation_label">Entsperren beschleunigen</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Während der Passwort-Eingabe oder biometrische Authentifizierung, Tresor-Konfiguration im Hintergrund herunterladen</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Entsperrt bleiben</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Halte Tresore geöffnet während dem Editieren einer Datei</string>
 	<!-- ## screen: cloud settings -->
-	<string name="screen_cloud_settings_onedrive_connections">OneDrive Verbindungen</string>
+	<string name="screen_cloud_settings_onedrive_connections">OneDrive-Verbindungen</string>
 	<string name="screen_cloud_settings_webdav_connections">WebDAV-Verbindungen</string>
 	<string name="screen_cloud_settings_pcloud_connections">pCloud-Verbindungen</string>
 	<string name="screen_cloud_settings_s3_connections">S3-Verbindungen</string>
@@ -306,7 +306,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">In diesem Modus könnten sensible Daten in eine Log-Datei auf diesem Gerät geschrieben werden (z.B. Dateinamen und Pfade). Ausgeschlossen davon sind u.a. Passwörter und Cookies.\n\nDenke daran, den Debug-Modus so schnell wie möglich wieder zu deaktivieren.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Achtung</string>
 	<string name="dialog_debug_mode_positive_button">Aktivieren</string>
-	<string name="dialog_microsoft_workaround_disclaimer_hint">Wenn du eine Datei mit den Microsoft-Apps bearbeiten möchtest, muss diese Datei diesen Apps über einen öffentlichen Ordner auf deinem Gerät zur Verfügung gestellt werden. Dies liegt an einem Fehler in den Microsoft-Apps. Sobald Cryptomator fortgesetzt wird, wird die entsprechende öffentliche Datei wieder gelöscht. Cryptomator kann jedoch nicht beeinflussen, was in der Zwischenzeit mit dieser Datei passiert. Sei dir diesem Verhalten bewusst, wenn du diese Option aktivierst. Dies gilt nur für Microsoft Dateitypen.\n\nCryptomator wird nach der Aktivierung neu gestartet.</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Aufgrund eines Fehlers in Microsoft-Apps muss die zu bearbeitende Datei in einem öffentlichen Medienordner deines Gerät für diese Apps bereitgestellt werden. Nach dem Fortsetzen von Cryptomator wird die öffentlich zugängliche Datei wieder gelöscht; allerdings kann Cryptomator nicht beeinflussen, was in der Zwischenzeit mit dieser Datei geschehen ist. Achte beim Aktivieren dieser Option darauf, dass du dir dieses Verhaltens bewusst bist. Dies gilt nur für Microsoft-Dateitypen.\n\nCryptomator wird nach der Aktivierung neu gestartet.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Dies ist eine Sicherheitsfunktion und verhindert, dass andere Apps Nutzer dazu bringen, Dinge zu tun, die sie nicht tun wollen.\n\nDurch die Deaktivierung bestätigst du, dass du dich <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">der Risiken bewusst</a> bist.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Achtung</string>
 	<string name="dialog_disable_app_obscured_positive_button">Deaktivieren</string>
@@ -315,8 +315,8 @@
 	<string name="dialog_app_is_obscured_info_neutral_button">Schließen</string>
 	<string name="dialog_vaults_removed_during_migration_title">Bitte Tresore für die %1s-Cloud erneut hinzufügen</string>
 	<string name="dialog_vaults_removed_during_migration_hint">Während der Migration auf diese App-Version müssen wir folgende Tresore aus der App entfernen:\n%2s \n\nDiese Tresore werden nicht aus der Cloud entfernt, sondern nur aus dieser App. Entschuldigung für die Unannehmlichkeiten. Füge diese Tresore bitte erneut hinzu, um weiter mit ihnen zu arbeiten.</string>
-	<string name="dialog_vault_is_root_folder_of_cloud_title">Tresor ist das Wurzelverzeichnis der Cloud-Verbindung</string>
-	<string name="dialog_vault_is_root_folder_of_cloud_hint">Erstelle eine neue Cloud-Verbindung, wo du mindestens den übergeordneten Ordner dieses Tresors als Wurzelverzeichnis auswählst, um diesen Tresor hinzuzufügen.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Tresor ist Wurzelverzeichnis der Cloud-Verbindung</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Erstelle eine neue Cloud-Verbindung, bei der du mindestens den übergeordneten Ordner dieses Tresor-Ordners als Stammverzeichnis auswählst, um diesen Tresor hinzuzufügen.</string>
 	<string name="dialog_disable_secure_screen_disclaimer_hint">Dies ist eine Sicherheitsfunktion, die andere Anwendungen daran hindert, Nutzer zu ungewollten Aktionen zu verleiten.\n\nDurch Deaktivieren bestätigst du, dass du dir <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">der Risiken bewusst</a> bist.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Bist du dir sicher, dass du die Cloud-Verbindung entfernen möchtest?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Dieser Vorgang wird die Cloud-Verbindung und alle zugehörigen Tresore löschen.</string>
@@ -395,7 +395,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Der ausgewählte Ordner für den Upload ist nicht mehr verfügbar. Gehe zu den Einstellungen und wähle einen neuen Ordner aus</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Tresor wurde während dem Hochladen gesperrt, bitte Tresor erneut öffnen, um fortzufahren</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Der Tresor für den automatischen Upload existiert nicht mehr.</string>
-	<string name="notification_auto_upload_failed_due_to_authentication_problem">Tippen, um die Authentifizierung zu aktualisieren.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Antippen, um die Authentifizierung zu aktualisieren.</string>
 	<string name="notification_open_writable_file_title">Datei mit Schreibrechten geöffnet</string>
 	<string name="notification_open_writable_file_message">Tresor bleibt entsperrt, bis die Bearbeitung abgeschlossen wurde</string>
 	<string name="notification_update_check_finished_latest">Neueste Version installiert</string>
diff --git a/presentation/src/main/res/values-fa-rIR/strings.xml b/presentation/src/main/res/values-fa-rIR/strings.xml
index 18e6eb11e..860c8227b 100644
--- a/presentation/src/main/res/values-fa-rIR/strings.xml
+++ b/presentation/src/main/res/values-fa-rIR/strings.xml
@@ -131,13 +131,23 @@
 	<string name="screen_webdav_settings_msg_username_must_not_be_empty">نام کاربری نمی‌تواند خالی باشد.</string>
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">رمزعبور نمی‌تواند خالی باشد.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">نام</string>
 	<string name="screen_s3_settings_access_key_label">کلید دسترسی</string>
 	<string name="screen_s3_settings_secret_key_label">کلید مخفی</string>
+	<string name="screen_s3_settings_bucket_label">صندوقچه فعلی</string>
+	<string name="screen_s3_settings_endpoint_label">نقطه انتهایی</string>
 	<string name="screen_s3_settings_region_label">منطقه</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">نام نمی تواند خالی باشد</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">کلید دسترسی نمی تواند خالی باشد</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">مقدار کلید نمی تواند خالی باشد</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">مقدار صندوقچه نمی تواند خالی باشد</string>
 	<!-- ## screen: enter vault name -->
+	<string name="screen_enter_vault_name_msg_name_empty">نام صندوقچه نمیتواند خالی باشد.</string>
 	<string name="screen_enter_vault_name_vault_label">نام مخزن</string>
 	<string name="screen_enter_vault_name_button_text">ایجاد</string>
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_title">تنظیم رمز عبور</string>
+	<string name="screen_set_password_msg_password_mismatch">رمز عبور با تکرار آن مطابقت ندارد.</string>
 	<string name="screen_set_password_button_text">انجام شده</string>
 	<string name="screen_set_password_hint">مهم: اگر پسروردتان را از یاد ببرید، هیچ راهی برای بازگردانی اطلاعاتتان نیست.</string>
 	<string name="screen_set_password_retype_password_label">تکرار گذرواژه</string>
@@ -146,8 +156,12 @@
 	<string name="screen_set_password_strength_indicator_4">بسیار قوی</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">عمومی</string>
+	<string name="screen_settings_cloud_settings_label">سرویس های ابری</string>
 	<string name="screen_settings_biometric_auth">احراز هویت بیومتریک</string>
+	<string name="screen_settings_activate_biometric_auth">فعال سازی احراز هویت بیومتریک</string>
+	<string name="screen_settings_secure_screen">مسدود سازی عکس برداری از صفحه</string>
 	<string name="screen_settings_section_search">جستجو</string>
+	<string name="screen_settings_live_search">جستجوی زنده</string>
 	<string name="screen_settings_section_auto_lock">قفل کردن خودکار</string>
 	<string name="screen_settings_auto_lock_timeout">قفل کردن پس از</string>
 	<string name="screen_settings_auto_lock_on_screen_lock">وقتی صفحه خاموش است</string>
@@ -156,15 +170,41 @@
 	<string name="screen_settings_website_label">وب‌سایت کریپتوماتور</string>
 	<string name="screen_settings_twitter_label">ما را در توییتر دنبال کنید</string>
 	<string name="screen_settings_facebook_label">ما را در فیس بوک بپسندید</string>
+	<string name="screen_settings_section_legal">قوانین</string>
+	<string name="screen_settings_licenses_label">مجوزها</string>
+	<string name="screen_settings_section_support">پشتیبانی</string>
+	<string name="screen_settings_contact_label">درخواست کمک</string>
+	<string name="screen_settings_debug_mode_label">حالت عیب‌ یابی</string>
+	<string name="screen_settings_error_report_label">ارسال فایل گزارش</string>
+	<string name="screen_settings_error_report_failed">ارسال با خطا مواجه شد</string>
+	<string name="screen_settings_section_version">نسخه</string>
+	<string name="screen_settings_advanced_settings">تنظیمات پیشرفته</string>
 	<!-- ## screen: cloud settings -->
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_website_title">وب سایت</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">انصراف</string>
 	<string name="dialog_enter_password_positive_button">بازکردن قفل</string>
+	<string name="dialog_change_password_old_password_label">رمز عبور قدیمی</string>
+	<string name="dialog_change_password_new_password_label">رمز عبور جدید</string>
+	<string name="dialog_change_password">تغییر رمز عبور</string>
+	<string name="dialog_change_password_msg_old_password_empty">رمز عبور فعلی نمی‌تواند خالی باشد.</string>
+	<string name="dialog_change_password_msg_new_password_empty">رمز عبور جدید نمی‌تواند خالی باشد.</string>
+	<string name="dialog_change_password_msg_password_mismatch">رمز عبور جدید با تکرار آن مطابقت ندارد.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">خزانه %1$s پیدا نشد</string>
+	<string name="dialog_vault_not_found_message">نام خزانه تغییر پیدا کرده، منتقل شده یا حذف شده است. برای ادامه این خزانه را از لیست حذف کرده و دوباره اضافه کنید. اکنون حذف شود؟</string>
 	<string name="dialog_vault_not_found_positive_button_text">حذف</string>
+	<string name="dialog_existing_file_title">فایل هم اکنون وجود دارد</string>
+	<string name="dialog_existing_file_positive_button">جایگزین کردن</string>
+	<string name="dialog_existing_file_message">فایل با نام \'%1$s\' در حال حاضر وجود دارد.</string>
+	<string name="dialog_replace_positive_button_all_files_exist">جایگزین کردن همه</string>
+	<string name="dialog_replace_positive_button_single_file_exists">جایگزین کردن</string>
+	<string name="dialog_replace_title_single_file_exists">فایل جایگزین شود؟</string>
+	<string name="dialog_unsaved_changes_discard">صرف‌نظر کردن</string>
+	<string name="dialog_file_name_hint">نام فایل</string>
 	<string name="dialog_lock_vault">قفل</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">ببند</string>
 	<string name="dialog_sym_link_back_button">بازگشت</string>
diff --git a/presentation/src/main/res/values-fil-rPH/strings.xml b/presentation/src/main/res/values-fil-rPH/strings.xml
index d4fd1f183..d4c50596a 100644
--- a/presentation/src/main/res/values-fil-rPH/strings.xml
+++ b/presentation/src/main/res/values-fil-rPH/strings.xml
@@ -34,11 +34,16 @@
 	<string name="error_file_not_found_after_opening_using_3party">Ang lokal na file ay hindi na matagpuan pagkatapos lumipat sa Cryptomator. Maaaring hindi na ma-i upload pabalik sa cloud.</string>
 	<string name="error_no_such_bucket">Hindi matagpuan ang bucket na ito</string>
 	<string name="error_masterkey_location_not_supported">Hindi pa suportado ang custom Masterkey location</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">Nabigong makipag-ugnayan sa F-Droid app. Hindi naka-install?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Local storage</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="permission_message_export_file">Kailangan ng Cryptomator ng access sa storage para mag-export ng mga file</string>
+	<string name="permission_message_upload_file">Kailangan ng Cryptomator ng access sa storage para mag-upload ng mga file</string>
+	<string name="permission_message_share_file">Kailangan ng Cryptomator ng access sa storage para makapagbahagi ng mga file</string>
+	<string name="permission_revoked_re_request_permission">Nawalan ng pahintulot ang Cryptomator na i-access ang lokasyong ito. Mangyaring piliin muli ang folder na ito upang maibalik ang pahintulot.</string>
 	<string name="snack_bar_action_title_settings">Settings</string>
 	<string name="snack_bar_action_title_search">Hanapin</string>
 	<string name="snack_bar_action_title_search_previous">Nakaraan</string>
@@ -51,20 +56,27 @@
 	<string name="snack_bar_action_title_sort_biggest">Pinakamalaki muna</string>
 	<string name="snack_bar_action_title_sort_smallest">Pinakamaliit muna</string>
 	<string name="snack_bar_cryptomator_variants_title">Magbasa pa</string>
+	<string name="snack_bar_cryptomator_variants_hint">Wala si Cloud sa listahan?</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
 	<string name="screen_vault_list_actions_title">Idagdag sa Cryptomator</string>
 	<string name="screen_vault_list_action_create_new_vault">Gumawa ng bagong vault</string>
 	<string name="screen_vault_list_action_add_existing_vault">Magdagdag ng umiiral na vault</string>
 	<string name="screen_vault_list_vault_action_delete">Tanggalin</string>
+	<string name="screen_vault_list_vault_creation_hint">Mag-tap dito para gumawa ng bagong vault</string>
 	<string name="screen_vault_list_change_password_successful">Matagumpay na napalitan ang password</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Vault</string>
 	<string name="screen_file_browser_add_existing_vault_extra_text">Piliin ang masterkey file</string>
 	<string name="screen_file_browser_create_new_vault_button_text">Ilagay dito</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">Pangalan ng vault: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="one">Ilipat ang %1$s sa</item>
+		<item quantity="other">Ilipat ang %2$d item sa</item>
+	</plurals>
 	<string name="screen_file_browser_move_button_text">Ilipat</string>
 	<string name="screen_file_browser_msg_empty_folder">Walang laman na folder</string>
+	<string name="screen_file_browser_file_info_label_date">binago %1$s ang nakalipas</string>
 	<string name="screen_file_browser_share_intent_chooser_title">Ibahagi kay</string>
 	<string name="screen_file_browser_share_destination_title">Pumili ng destinasyon</string>
 	<string name="screen_file_browser_share_button_text">Pumili</string>
@@ -76,6 +88,8 @@
 	<string name="screen_file_browser_upload_files_chooser_title">Files</string>
 	<string name="screen_file_browser_msg_file_exported">Na-export na ang file</string>
 	<string name="screen_file_browser_msg_files_exported">Na-export na ang mga files</string>
+	<string name="screen_file_browser_nothing_to_export">Walang mai-export</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Nabigo ang paggawa ng direktoryo sa pag-download</string>
 	<string name="screen_file_browser_node_action_share">Ibahagi</string>
 	<string name="screen_file_browser_node_action_rename">Baguhin ang pangalan</string>
 	<string name="screen_file_browser_node_action_edit_text">I-edit</string>
@@ -104,7 +118,9 @@
 	<string name="screen_choose_cloud_service_title">Cloud service</string>
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">Piliin ang location</string>
+	<string name="screen_cloud_connections_no_connections">Mag-tap dito para magdagdag ng mga lokasyon</string>
 	<string name="screen_cloud_error_webdav_not_supported">Ang server na ito ay mukhang hindi tugma sa WebDAV</string>
+	<string name="screen_cloud_local_error_no_content_provider">Walang nakitang file manager na sumusuporta sa pagbubukas ng mga direktoryo</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Username</string>
@@ -115,8 +131,15 @@
 	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Hindi maaaring walang laman ang username.</string>
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Hindi maaaring walang laman ang password.</string>
 	<!-- ## screen: s3 settings -->
+	<string name="screen_s3_settings_display_name_label">Display Name</string>
 	<string name="screen_s3_settings_access_key_label">Access Key</string>
+	<string name="screen_s3_settings_secret_key_label">Lihim na Susi</string>
+	<string name="screen_s3_settings_bucket_label">Umiiral na Balde</string>
+	<string name="screen_s3_settings_endpoint_label">Endpoint</string>
 	<string name="screen_s3_settings_region_label">Rehiyon</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Hindi maaaring walang laman ang Display Name</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Hindi maaaring walang laman ang Access Key</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Hindi maaaring walang laman ang Secret Key</string>
 	<string name="screen_s3_settings_msg_bucket_not_empty">Hindi maaaring walang laman ang bucket</string>
 	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Hindi maaaring walang laman ang endpoint o ang rehiyon</string>
 	<!-- ## screen: enter vault name -->
@@ -138,30 +161,74 @@
 	<string name="screen_settings_section_general">Pangkalahatan</string>
 	<string name="screen_settings_cloud_settings_label">Cloud services</string>
 	<string name="screen_settings_biometric_auth">Biometric authentication</string>
+	<string name="screen_settings_activate_biometric_auth">I-activate ang biometric authentication</string>
+	<string name="screen_settings_confirm_face_unlock">Kumpirmahin ang face unlock (kung available)</string>
+	<string name="screen_settings_block_app_when_obscured">I-block ang app kapag nakakubli</string>
+	<string name="screen_settings_block_app_when_obscured_summary">I-block ang pagharang sa input at pagpapakita ng maling user interface</string>
+	<string name="screen_settings_secure_screen">I-block ang mga screenshot</string>
+	<string name="screen_settings_secure_screen_summary">I-block ang mga screenshot sa listahan ng mga kamakailan at sa loob ng app</string>
 	<string name="screen_settings_section_search">Hanapin</string>
+	<string name="screen_settings_live_search">Live na paghahanap</string>
+	<string name="screen_settings_live_search_summary">I-update ang mga resulta ng paghahanap habang ipinapasok ang query</string>
+	<string name="screen_settings_glob_search">Maghanap gamit ang glob pattern</string>
+	<string name="screen_settings_glob_search_summary">Gumamit ng glob pattern matching gaya ni alice.*.jpg</string>
+	<string name="screen_settings_section_auto_lock">Awtomatikong pag-lock</string>
 	<string name="screen_settings_auto_lock_timeout">I-lock pagkatapos ng</string>
 	<string name="screen_settings_auto_lock_on_screen_lock">Kapag ang screen ay disabled</string>
+	<string name="screen_settings_section_auto_photo_upload">Awtomatikong pag-upload ng larawan</string>
 	<string name="screen_settings_section_auto_photo_upload_vault">Pumili ng vault pang upload</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">I-activate</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Kumuha ng mga larawan sa background at kapag na-unlock na ang napiling vault, simulan ang pag-upload</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Mag-upload kaagad</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Direktang mag-upload kung naka-unlock ang vault</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Mag-upload lang gamit ang WIFI</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Mag-upload ng mga video</string>
+	<string name="screen_settings_auto_photo_upload_title">I-save ang awtomatikong pag-upload ng mga file sa&#8230;</string>
 	<string name="screen_settings_website_label">Website ng Cryptomator</string>
 	<string name="screen_settings_twitter_label">Sundan kami sa Twitter</string>
 	<string name="screen_settings_facebook_label">I-like kami sa Facebook</string>
 	<string name="screen_settings_section_legal">Ligal</string>
 	<string name="screen_settings_licenses_label">Mga Lisensya</string>
+	<string name="screen_settings_license_terms_label">Mga tuntunin sa lisensya</string>
 	<string name="screen_settings_section_support">Suporta</string>
 	<string name="screen_settings_contact_label">Humingi ng tulong</string>
 	<string name="screen_settings_debug_mode_label">Debug mode</string>
 	<string name="screen_settings_error_report_label">Ipadala ang log file</string>
+	<string name="screen_settings_error_report_failed">Hindi naipadala</string>
 	<string name="screen_settings_security_label">Mga pahiwatig ng seguridad</string>
 	<string name="screen_settings_section_version">Bersyon</string>
 	<string name="screen_settings_advanced_settings">Mga advanced na setting</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Workaround sa pagbubukas ng mga file ng Microsoft</string>
 	<string name="screen_settings_microsoft_apps_workaround_summary">Ibukas ang mga files sa Microsoft apps kasamang write permission</string>
 	<string name="screen_settings_background_unlock_preparation_label">Pabilisin ang pag-unlock</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">I-download ang vault config sa background habang sinenyasan na ilagay ang password o biometric auth</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">Panatilihing naka-unlock</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Panatilihing naka-unlock ang mga vault habang nag-e-edit ng mga file</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">Mga koneksyon sa OneDrive</string>
+	<string name="screen_cloud_settings_webdav_connections">Mga koneksyon sa WebDAV</string>
+	<string name="screen_cloud_settings_pcloud_connections">Mga koneksyon sa pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">Mga koneksyon sa S3</string>
+	<string name="screen_cloud_settings_local_storage_locations">Mga lokasyon ng lokal na imbakan</string>
+	<string name="screen_cloud_settings_log_in_to">Mag-log in sa</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Mag-sign out mula sa</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">Hindi ma-authenticate ang %1$s.</string>
+	<string name="screen_update_pcloud_connections_title">I-update ang mga kredensyal ng pCloud</string>
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">Mga variant ng Cryptomator</string>
+	<string name="screen_cryptomator_variants_lite_title">Pangunahing F-Droid Repository</string>
+	<string name="screen_cryptomator_variants_lite_description">Hindi kasama dahil nangangailangan sila ng mga API key.</string>
+	<string name="screen_cryptomator_variants_lite_install">I-install</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Cryptomator F-Droid Repository</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Hindi kasama dahil naglalaman ito ng mga pinagmamay-ariang dependency.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Magdagdag ng Cryptomator repository sa F-Droid app.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo">Idagdag</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">I-install ang Cryptomator gamit ang F-Droid.\nKung may ipinapakitang not found error, maghintay hanggang matapos ang F-Droid synchronization.</string>
 	<string name="screen_cryptomator_variants_website_title">Website</string>
+	<string name="screen_cryptomator_variants_website_description">Naglalaman ng pagmamay-ari na dependencies.</string>
+	<string name="screen_cryptomator_variants_installation_hint">Ang paglipat mula sa o sa pangunahing variant ng repository ng F-Droid ay nangangailangan ng bagong setup ng app.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Kanselahin</string>
 	<string name="dialog_enter_password_positive_button">I-unlock</string>
@@ -172,6 +239,8 @@
 	<string name="dialog_change_password_msg_new_password_empty">Hindi maaaring walang laman ang bagong password field.</string>
 	<string name="dialog_change_password_msg_password_mismatch">Hindi nagtugma ang bagong password sa ni-retype na password.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Hindi nahanap ang Vault %1$s</string>
+	<string name="dialog_vault_not_found_message">Ang vault ay pinalitan ng pangalan, inilipat o tinanggal. Alisin ang vault na ito sa listahan at idagdag itong muli upang magpatuloy. Alisin ngayon?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Tanggalin</string>
 	<string name="dialog_existing_file_title">Mayroon na ng file na ito</string>
 	<string name="dialog_existing_file_positive_button">Palitan</string>
@@ -182,37 +251,76 @@
 	<string name="dialog_replace_positive_button_single_file_exists">Palitan</string>
 	<string name="dialog_replace_msg_single_file_exists">Umiiral na ang file na may pangalang \'%1$s\'. Nais mo bang palitan ito?</string>
 	<string name="dialog_replace_msg_all_files_exists">Ang lahat ng files ay umiiral na. Nais mo bang palitan ang mga ito?</string>
+	<string name="dialog_replace_msg_some_files_exists">Umiiral na ang %1$d file. Gusto mo bang palitan sila?</string>
 	<string name="dialog_replace_title_single_file_exists">Palitan ang file?</string>
 	<string name="dialog_replace_title_multiple_files_exist">Palitan ang mga file?</string>
 	<string name="dialog_unable_to_share_title">Hindi kayang i-share ang mga files</string>
+	<string name="dialog_unable_to_share_message">Hindi ka pa nagse-set up ng anumang mga vault. Mangyaring lumikha muna ng bagong vault gamit ang Cryptomator app.</string>
 	<string name="dialog_unable_to_share_positive_button">OK</string>
 	<string name="dialog_unable_to_share_negative_button">Gumawa ng bagong vault</string>
+	<string name="dialog_filetype_not_supported_title">Hindi mabuksan ang %1$s</string>
 	<string name="dialog_filetype_not_supported_message">Mag-download ng app na kayang buksan ang file na ito o nais mo bang i-save sa iyong device?</string>
 	<string name="dialog_rename_vault_title">Palitan ang pangalan ng vault</string>
 	<string name="dialog_rename_node_folder_title">Palitan ang pangalan ng folder</string>
 	<string name="dialog_rename_node_file_title">Palitan ang pangalan ng file</string>
 	<string name="dialog_unsaved_changes_title">Mayroon kang hindi na i-save na pagbabago</string>
+	<string name="dialog_unsaved_changes_message">Gusto mo ba talagang umalis nang hindi nag-iipon?</string>
 	<string name="dialog_unsaved_changes_discard">Ibaliwala</string>
 	<string name="dialog_file_name_hint">Pangalan ng File</string>
+	<string name="dialog_file_name_placeholder">text.txt</string>
 	<string name="dialog_delete_vault_message">Sigurado ka ba na nais mong alisin ang vault?</string>
 	<string name="dialog_delete_vault_hint">Ang aksyon na ito ay aalisin lamang ang vault sa listahan at hindi ito buburahin.</string>
+	<string name="dialog_upload_file_title">Nag-a-upload ng&#8230;</string>
+	<string name="dialog_upload_file_remaining">File %1$d ng %2$d</string>
+	<string name="dialog_export_file_title">Ini-export (%1$d/%2$d)</string>
 	<string name="dialog_progress_please_wait">Pakihintay&#8230;</string>
+	<string name="dialog_progress_creating_folder">Lumilikha ng folder&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Paglikha ng text file&#8230;</string>
+	<string name="action_progress_authentication">Authentication&#8230;</string>
+	<string name="action_progress_renaming">Pagpapalit ng pangalan&#8230;</string>
+	<string name="action_progress_deleting">Tinatanggal ang&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Ina-unlock ang vault&#8230;</string>
+	<string name="dialog_progress_change_password">Pagpapalit ng password&#8230;</string>
+	<string name="dialog_progress_creating_vault">Paglikha ng vault&#8230;</string>
+	<string name="dialog_progress_upload_file">Nag-a-upload ng&#8230;</string>
+	<string name="dialog_progress_download_file">Nagda-download ng&#8230;</string>
 	<string name="dialog_progress_encryption">Ineencrypt&#8230;</string>
 	<string name="dialog_progress_decryption">Dinedecrypt&#8230;</string>
+	<string name="action_progress_moving">Gumagalaw&#8230;</string>
 	<string name="dialog_lock_vault">I-lock</string>
 	<string name="dialog_accept_ssl_certificate_title">Hindi wasto ang SSL certificate</string>
 	<string name="dialog_accept_ssl_certificate_hint">Hindi wasto ang SSL certificate. Nais mo paring pagkatiwalaan?</string>
 	<string name="dialog_accept_ssl_certificate_details">Mga detalye</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Maaaring panganib ito sa seguridad. Alam ko ang ginagawa ko.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Huwag paganahin ang mga pag-optimize ng baterya</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Upang makakuha ng mga bagong larawan at video nang hindi tumatakbo sa background, kailangan naming mag-opt-out mula sa mga pag-optimize ng baterya. Ngunit huwag mag-alala, hindi kumukonsumo ng maraming enerhiya ang %1$s.\n\nPara ilapat ito, palitan ang \'Hindi na-optimize\' sa \'Lahat ng app\', piliin ang %1$s at piliin ang \'Huwag mag-optimize\' pagkatapos mag-tap \'%2$s\' sa dialog na ito.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Huwag magtanong ulit?</string>
 	<string name="dialog_http_security_hint">Ang pag-gamit ng HTTP ay hindi ligtas. Kung alam mo ang mga panganib, maaari kang tumuloy gamit ang HTTP.</string>
 	<string name="dialog_http_security_checkbox">Gawing HTTPS</string>
 	<string name="dialog_http_security_title">Gamiting ang HTTPS?</string>
+	<string name="dialog_no_screen_lock_hint">Walang nakatakdang lock ng screen. Upang iimbak ang iyong mga kredensyal sa isang secure na paraan, magtakda ng isang pattern o password gamit ang OK.</string>
+	<string name="dialog_no_screen_lock_title">Itakda ang lock ng screen?</string>
+	<string name="dialog_no_screen_lock_checkbox">Itakda ang lock ng screen</string>
+	<string name="dialog_no_biometric_auth_set_up_title">Walang naka-set up na basic authentication sa system</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Mag-enroll ng kahit isang daliri/mukha para gamitin ang serbisyong ito.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">Sa mode na ito, maaaring isulat ang sensitibong data sa isang log file sa iyong device (hal., mga filename at path). Ang mga password, cookies, atbp. ay tahasang hindi kasama.\n\nTandaang i-disable ang debug mode sa lalong madaling panahon.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Atensyon</string>
 	<string name="dialog_debug_mode_positive_button">I-enable</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Dahil sa isang bug sa mga Microsoft app, ang file na ie-edit ay dapat na ibahagi sa mga app na ito sa isang pampublikong media folder sa iyong device. Pagkatapos maipagpatuloy ang Cryptomator, ang file na naa-access ng publiko ay tatanggalin muli, ngunit hindi maimpluwensyahan ng Cryptomator kung ano ang nangyari sa file na ito pansamantala. Tiyaking alam mo ang gawi na ito kapag ina-activate ang opsyong ito. Malalapat lang ito sa mga uri ng file ng Microsoft.\n\nMagre-restart ang Cryptomator pagkatapos ma-activate.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Ang setting na ito ay isang feature na panseguridad at pinipigilan ang iba pang app na linlangin ang mga user sa paggawa ng mga bagay na hindi nila gustong gawin.\n\nSa pamamagitan ng hindi pagpapagana, kinukumpirma mo na ikaw ay <a href="https://docs.cryptomator.org /en/1.6/android/settings/#block-app-when-obscured">alam sa mga panganib</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Atensyon</string>
+	<string name="dialog_disable_app_obscured_positive_button">Huwag paganahin</string>
+	<string name="dialog_app_is_obscured_info_title">Nakakubli ang app</string>
+	<string name="dialog_app_is_obscured_info_hint">Ang isa pang app ay nagpapakita ng isang bagay sa ibabaw ng Cryptomator (hal., isang asul na light filter o night mode app). Para sa mga kadahilanang pangseguridad, hindi pinagana ang Cryptomator.\n\n&lt;a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured"&gt;Paano i-enable ang Cryptomator&lt; /a&gt;</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Isara</string>
+	<string name="dialog_vaults_removed_during_migration_title">Mangyaring muling magdagdag ng mga vault para sa %1s cloud</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Habang lumilipat sa bersyon ng app na ito kailangan naming alisin ang mga sumusunod na vault sa app:\n%2s \n\nAng mga vault na iyon ay hindi inaalis sa cloud ngunit sa app na ito lang. Paumanhin para sa abala at mangyaring muling idagdag ang mga vault na ito upang magpatuloy sa pagtatrabaho sa kanila.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Ang Vault ay root folder ng koneksyon sa cloud</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Gumawa ng bagong koneksyon sa cloud kung saan pipiliin mo ang hindi bababa sa parent folder ng vault folder na ito bilang root directory para idagdag ang vault na ito.</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">Ang setting na ito ay isang feature na panseguridad at pinipigilan ang iba pang app na linlangin ang mga user sa paggawa ng mga bagay na hindi nila gustong gawin.\n\nSa pamamagitan ng hindi pagpapagana, kinukumpirma mo na ikaw ay <a href="https://docs.cryptomator.org /en/1.6/android/settings/#screen-security">alam sa mga panganib</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Sigurado ka bang gusto mong tanggalin itong cloud connection?</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_hint">Aalisin ng pagkilos na ito ang koneksyon sa cloud at lahat ng vault ng cloud na ito.</string>
+	<string name="dialog_confirm_delete_multiple_title">Tanggalin ang %1$d item?</string>
 	<string name="dialog_confirm_delete_multiple_message">Sigurado ka bang gusto mong burahin ang mga ito?</string>
 	<string name="dialog_confirm_delete_file_message">Sigurado ka bang gusto mong burahin ang file na ito?</string>
 	<string name="dialog_confirm_delete_folder_message">Buburahin nito ang lahat ng laman ng folder. Sigurado ka ba na gusto mong burahin ang folder na ito?</string>
@@ -221,14 +329,29 @@
 	<string name="dialog_enter_license_title">Magbigay ng wastong lisensya</string>
 	<string name="dialog_enter_license_content">Natuklasan namin na ang nakainstall mong Cryptomator ay hind nanggaling sa Google Play Store. Maaari lamang na magbigay ng wastong lisensya na mabibili sa <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">Ang lisensyang binigay ay hindi wasto. Siguraduhing tama ang iyong pagkakalagay.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Ang ibinigay na key ay isang desktop supporter certificate. Mangyaring magpasok ng wastong lisensya.</string>
+	<string name="dialog_enter_license_no_content">Walang ibinigay na lisensya. Mangyaring magpasok ng wastong lisensya.</string>
 	<string name="dialog_enter_license_decline_button">I-sara</string>
+	<string name="dialog_license_confirmation_title">Pagkumpirma ng lisensya</string>
 	<string name="dialog_license_confirmation_message">Salamat %1$s sa pagbigay ng wastong lisensya.</string>
+	<string name="dialog_update_available_title">Available ang update</string>
+	<string name="dialog_update_available_message">I-update ang Cryptomator sa pinakabagong bersyon. Sa pamamagitan ng pagpindot sa OK, ida-download namin ang app sa background at hihilingin sa iyo na i-install ito.</string>
 	<string name="dialog_update_available_update">I-update ngayon</string>
 	<string name="dialog_update_available_download_site">Pumunta sa download site</string>
 	<string name="dialog_update_available_cancel">Mamaya</string>
+	<string name="dialog_download_update_title">Tumatakbo ang pag-download</string>
+	<string name="dialog_download_update_message">Nagda-download ng pinakabagong bersyon ng Cryptomator</string>
 	<string name="dialog_sym_link_title">Ang folder na ito ay isang symbolic link</string>
 	<string name="dialog_sym_link_message">Hindi maaaring puntahan ang symbolic link na ito</string>
 	<string name="dialog_sym_link_back_button">Bumalik</string>
+	<string name="dialog_no_dir_file_title">Hindi ma-load ang mga nilalaman ng direktoryo</string>
+	<string name="dialog_no_dir_file_message">Walang wastong directory file ang cloud folder na \'%1$s\'. Maaaring ang folder ay ginawa sa ibang device at hindi pa ganap na naka-synchronize sa cloud. Pakisuri sa iyong cloud kung ang sumusunod na file ay umiiral at walang laman:\n%2$s</string>
+	<string name="dialog_no_more_images_to_display">Wala nang mga imaheng ipapakita&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">Na-update ang mga kredensyal ng \'%1$s\'</string>
+	<string name="dialog_pcloud_credentials_updated">Kung balak mong magdagdag ng bagong pCloud account, i-tap ang url na ito <a href="https://www.pcloud.com">www.pcloud.com</a>, mag-log out sa kasalukuyang account at mag-tap muli sa ang \'+\' sa app na ito upang lumikha ng bagong koneksyon sa ulap.</string>
+	<string name="permission_snackbar_auth_local_vault">Kailangan ng Cryptomator ng access sa storage para magamit ang mga lokal na vault</string>
+	<string name="permission_snackbar_auth_auto_upload">Kailangan ng Cryptomator ng access sa storage upang magamit ang awtomatikong pag-upload ng larawan</string>
+	<string name="permission_snackbar_notifications">Ang Cryptomator ay nangangailangan ng mga pahintulot sa abiso upang ipakita ang status ng vault halimbawa</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
@@ -257,18 +380,39 @@
 	<string name="dialog_biometric_auth_title">Biometric login</string>
 	<string name="dialog_biometric_auth_message">Mag-log in gamit ang iyong biometric credential</string>
 	<string name="dialog_biometric_auth_use_password">Gamitin ang vault password</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Hindi makapag-auto upload ng mga file</string>
 	<!-- notification -->
 	<string name="notification_unlocked">Vaults na na-unlock: %1$d</string>
 	<string name="notification_timeout">Autolock in %1$s</string>
 	<string name="notification_lock_all">I-lock lahat</string>
 	<string name="notification_cancel_auto_upload">Ikansela ang pag-upload</string>
+	<string name="notification_auto_upload_title">Tumatakbo ang awtomatikong pag-upload ng larawan</string>
 	<string name="notification_auto_upload_message">Uploading %1d/%2d</string>
+	<string name="notification_auto_upload_finished_title">Tumatakbo ang awtomatikong pag-upload ng larawan</string>
+	<string name="notification_auto_upload_finished_message">%1$d larawan ang na-upload sa vault</string>
+	<string name="notification_auto_upload_failed_title">Nabigo ang awtomatikong pag-upload ng larawan</string>
+	<string name="notification_auto_upload_failed_general_error">Naganap ang pangkalahatang error habang nag-a-upload.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Hindi na available ang napiling folder para sa pag-upload. Pumunta sa mga setting at pumili ng bago</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Naka-lock ang Vault habang nag-a-upload, mangyaring buksan muli ang vault upang magpatuloy</string>
+	<string name="notification_auto_upload_failed_due_to_vault_not_found">Ang Vault na tinukoy para sa awtomatikong pag-upload ay wala na.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">I-tap para i-refresh ang pagpapatotoo.</string>
+	<string name="notification_open_writable_file_title">Buksan ang nasusulat na file</string>
+	<string name="notification_open_writable_file_message">Nananatiling naka-unlock ang Vault hanggang matapos ang pag-edit</string>
 	<string name="notification_update_check_finished_latest">Naka-install ang pinakabagong bersyon</string>
+	<string name="notification_authenticating">Pagpapatunay ng&#8230;</string>
 	<string name="screen_settings_lru_cache">Cache</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Na-access kamakailan ng cache ang mga file na naka-encrypt nang lokal sa device para magamit muli sa ibang pagkakataon kapag muling binuksan</string>
 	<string name="screen_settings_lru_cache_size">Kabuuang laki ng cache</string>
 	<string name="screen_settings_clear_lru_cache_size">Linisin ang Cache</string>
 	<string name="screen_settings_lru_cache_changed__restart_toast">Ang mga pagbabago ay makikita pagkatapos ng pag-restart ng app</string>
+	<string name="screen_settings_license">Nakarehistro para sa</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">I-update ang agwat ng pagsusuri</string>
+	<string name="screen_settings_check_updates">Tingnan ang mga update</string>
+	<string name="screen_settings_last_check_updates">Huling pagtakbo %1$s</string>
+	<string name="dialog_cache_size_title">Laki ng cache sa bawat Cloud</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">Instant</string>
 	<string name="lock_timeout_1m">1 minuto</string>
 	<string name="lock_timeout_2m">2 minuto</string>
 	<string name="lock_timeout_5m">5 minuto</string>
diff --git a/presentation/src/main/res/values-fr-rFR/strings.xml b/presentation/src/main/res/values-fr-rFR/strings.xml
index a159f067c..eb9ee2b6b 100644
--- a/presentation/src/main/res/values-fr-rFR/strings.xml
+++ b/presentation/src/main/res/values-fr-rFR/strings.xml
@@ -9,7 +9,7 @@
 	<string name="error_no_network_connection">Pas de connexion au réseau</string>
 	<string name="error_invalid_passphrase">Mot de passe erroné</string>
 	<string name="error_file_or_folder_exists">Un fichier ou un dossier existe déjà.</string>
-	<string name="error_vault_version_not_supported">La version du coffre %1$s n\'est pas prise en charge. Ce coffre a été créé avec une version plus ancienne ou plus récente de Cryptomator.</string>
+	<string name="error_vault_version_not_supported">La version du coffre-fort %1$s n\'est pas prise en charge. Ce coffre-fort a été créé avec une version plus ancienne ou plus récente de Cryptomator.</string>
 	<string name="error_vault_config_file_missing_due_to_format_999">Le fichier %1$s est manquant dans le dossier contenant votre coffre. Assurez-vous que ce fichier existe dans le dossier contenant votre coffre dans le cloud.</string>
 	<string name="error_vault_already_exists">Le coffre-fort existe déjà.</string>
 	<string name="error_no_such_file">Le fichier n\'existe pas.</string>
@@ -24,9 +24,9 @@
 	<string name="error_vault_name_contains_invalid_characters">Le nom du coffre-fort ne peut pas contenir de caractères spéciaux.</string>
 	<string name="error_general_update">La vérification de la mise à jour a échoué. Une erreur générale s\'est produite.</string>
 	<string name="error_hash_mismatch_update">La vérification de la mise à jour a échoué. Le hachage calculé ne correspond pas au fichier téléchargé</string>
-	<string name="error_update_no_internet">La vérification de la mise à jour a échoué. Pas de connexion Internet.</string>
+	<string name="error_update_no_internet">La vérification de la mise à jour a échoué. Pas de connexion internet.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Échec lors du déchiffrement du mot de passe WebDAV, veuillez l\'ajouter une nouvelle fois dans les paramètres</string>
-	<string name="error_play_services_not_available">Les services Google Play ne sont pas installés</string>
+	<string name="error_play_services_not_available">Services Google Play non installés</string>
 	<string name="error_biometric_auth_aborted">Authentification biométrique avortée</string>
 	<string name="error_vault_version_mismatch">La version spécifiée dans %1$s est différente de %2$s</string>
 	<string name="error_vault_key_invalid">%1$s ne correspond pas à ce %2$s</string>
@@ -51,12 +51,12 @@
 	<string name="snack_bar_action_title_sort">Trier par</string>
 	<string name="snack_bar_action_title_sort_az">A - Z</string>
 	<string name="snack_bar_action_title_sort_za">Z - A</string>
-	<string name="snack_bar_action_title_sort_newest">Récent d\'abord</string>
+	<string name="snack_bar_action_title_sort_newest">Plus récent d\'abord</string>
 	<string name="snack_bar_action_title_sort_oldest">Ancien d\'abord</string>
-	<string name="snack_bar_action_title_sort_biggest">Taille décroissante</string>
-	<string name="snack_bar_action_title_sort_smallest">Taille croissante</string>
+	<string name="snack_bar_action_title_sort_biggest">Plus gros d\'abord</string>
+	<string name="snack_bar_action_title_sort_smallest">Plus petit d\'abord</string>
 	<string name="snack_bar_cryptomator_variants_title">En savoir plus</string>
-	<string name="snack_bar_cryptomator_variants_hint">Cloud absent de la liste ?</string>
+	<string name="snack_bar_cryptomator_variants_hint">Nuage absent de la liste ?</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
 	<string name="screen_vault_list_actions_title">Ajouter à Cryptomator</string>
@@ -198,8 +198,8 @@
 	<string name="screen_settings_security_label">Conseils de sécurité</string>
 	<string name="screen_settings_section_version">Version</string>
 	<string name="screen_settings_advanced_settings">Paramètres Avancés</string>
-	<string name="screen_settings_microsoft_apps_workaround_label">Solution d\'ouverture des fichiers Microsoft</string>
-	<string name="screen_settings_microsoft_apps_workaround_summary">Ouvrir les fichiers dans les applications Microsoft avec permission d\'écriture</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Méthode alternative d\'ouverture des fichiers Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Ouvrir les fichiers dans les appli Microsoft avec permission d\'écriture</string>
 	<string name="screen_settings_background_unlock_preparation_label">Accélérer le déverrouillage</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Téléchargez la configuration du coffre-fort en arrière-plan lorsque vous êtes invité à entrer le mot de passe ou l\'authentification biométrique</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Maintenir deverouillé</string>
@@ -222,10 +222,10 @@
 	<string name="screen_cryptomator_variants_lite_description">Exclues car elles nécessitent des clés d\'API.</string>
 	<string name="screen_cryptomator_variants_lite_install">Installer</string>
 	<string name="screen_cryptomator_variants_fdroid_title">Dépôt F-Droid de Cryptomator</string>
-	<string name="screen_cryptomator_variants_fdroid_description">Exclues car elles ont des dépendances propriétaires.</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Exclues car elles contiennent des dépendances propriétaires.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Ajouter le dépôt Cryptomator à l\'application F-Droid.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo">Ajouter</string>
-	<string name="screen_cryptomator_variants_fdroid_install_hint">Installez Cryptomator via F-Droid.\nSi une erreur \"introuvable\" (not found) apparaît, attendez que la synchronisation F-Droid s\'achève.</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">Installez Cryptomator via F-Droid.\nSi une erreur « introuvable » (not found) apparaît, attendez que la synchronisation F-Droid soit terminée.</string>
 	<string name="screen_cryptomator_variants_website_title">Site web</string>
 	<string name="screen_cryptomator_variants_website_description">Contient des dépendances propriétaires.</string>
 	<string name="screen_cryptomator_variants_installation_hint">Passer à la variante du dépôt F-Droid principal ou l\'abandonner nécessite une nouvelle configuration de l\'application.</string>
@@ -306,7 +306,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">Dans ce mode, les données sensibles peuvent être écrites dans un fichier journal sur votre appareil (par exemple, les noms de fichiers et les chemins d\'accès). Les mots de passe, cookies, etc. sont explicitement exclus.\n\nN\'oubliez pas de désactiver le mode de débogage dès que possible.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Avertissement</string>
 	<string name="dialog_debug_mode_positive_button">Activer</string>
-	<string name="dialog_microsoft_workaround_disclaimer_hint">En raison d\'un bug dans les applications Microsoft, le fichier à modifier doit être partagé avec ces applications dans un dossier média public sur votre appareil. Après le rechargement de Cryptomator, le fichier accessible au public est à nouveau supprimé, mais Cryptomator ne peut pas contrôler ce qui est arrivé à ce fichier entre-temps. Assurez-vous d\'être au courant de ce comportement lors de l\'activation de cette option. Cela ne s\'appliquera qu\'aux types de fichiers Microsoft.\n\nCryptomator redémarrera après l\'activation.</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">En raison d\'un bug dans les appli Microsoft, le fichier à modifier doit être partagé avec ces appli dans un dossier média public sur votre appareil. Après le rechargement de Cryptomator, le fichier accessible au public est à nouveau supprimé, mais Cryptomator ne peut pas contrôler ce qui est arrivé à ce fichier entre-temps. Assurez-vous d\'être au courant de ce comportement lors de l\'activation de cette option. Cela ne s\'appliquera qu\'aux types de fichiers Microsoft.\n\nCryptomator redémarrera après l\'activation.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Ce paramètre est une fonction de sécurité qui empêche d\'autres applications de tromper les utilisateurs en leur faisant faire des choses qu\'ils ne veulent pas faire.\n\nEn le désactivant, vous confirmez que vous êtes <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">conscients des risques</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Avertissement</string>
 	<string name="dialog_disable_app_obscured_positive_button">Désactiver</string>
diff --git a/presentation/src/main/res/values-hi-rIN/strings.xml b/presentation/src/main/res/values-hi-rIN/strings.xml
index 43b7ba7fb..ab8376dc1 100644
--- a/presentation/src/main/res/values-hi-rIN/strings.xml
+++ b/presentation/src/main/res/values-hi-rIN/strings.xml
@@ -28,9 +28,12 @@
 	<string name="error_failed_to_decrypt_webdav_password">WebDAV पासवर्ड को डिक्रिप्ट करने में विफल, कृपया सेटिंग्स में फिर से जोड़ें</string>
 	<string name="error_play_services_not_available">Google Play सेवाएं स्थापित नहीं हैं</string>
 	<string name="error_biometric_auth_aborted">बायोमेट्रिक प्रमाणीकरण निरस्त</string>
+	<string name="error_vault_version_mismatch">%1$s में निर्दिष्ट किया हुआ अनुवाद संख्या %2$s से भिन्न है |</string>
+	<string name="error_vault_key_invalid">%1$s इस %2$s से मेल नहीं खाता |</string>
 	<string name="error_vault_config_loading">वॉल्ट कॉन्फ़िगरेशन लोड करते समय सामान्य त्रुटि</string>
 	<string name="error_file_not_found_after_opening_using_3party">Cryptomator पर वापस जाने के बाद स्थानीय फ़ाइल अब मौजूद नहीं है। संभावित परिवर्तनों को वापस क्लाउड पर प्रचारित नहीं किया जा सकता है।</string>
 	<string name="error_no_such_bucket">ऐसी कोई बकेट नहीं है।</string>
+	<string name="error_masterkey_location_not_supported">व्यक्तिगत मास्टरकी स्थान का सपोर्ट अभीतक उपलब्ध नहीं हैं |</string>
 	<string name="error_interact_with_fdroid_but_fdroid_missing">F-Droid एप्लिकेशन के साथ संचार करने में विफल। स्थापित नहीं है?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
@@ -53,21 +56,25 @@
 	<string name="snack_bar_action_title_sort_biggest">सबसे बड़ा पहले</string>
 	<string name="snack_bar_action_title_sort_smallest">सबसे छोटा पहले</string>
 	<string name="snack_bar_cryptomator_variants_title">अधिक जानकारी के लिए पढ़ें ।</string>
+	<string name="snack_bar_cryptomator_variants_hint">क्लॉउड सूची में नहीं हैं |</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
 	<string name="screen_vault_list_actions_title">क्रिप्टोमेटर में जोड़ें</string>
 	<string name="screen_vault_list_action_create_new_vault">नयी वॉल्ट बनाए</string>
 	<string name="screen_vault_list_action_add_existing_vault">मौजूदा वॉल्ट ऐड करें</string>
 	<string name="screen_vault_list_vault_action_delete">हटाएँ</string>
+	<string name="screen_vault_list_vault_creation_hint">नया तिजोरी बनाने के लिए यहां टैप करें।</string>
 	<string name="screen_vault_list_change_password_successful">पासवर्ड सफलतापूर्वक बदला गया।</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">गुप्त तिजोरी</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">मास्टरकी फ़ाइल का चयन करें |</string>
 	<string name="screen_file_browser_create_new_vault_button_text">यहाँ रखें</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">वॉल्ट का नाम: %1$s</string>
 	<string name="screen_file_browser_move_button_text">मूव करें</string>
 	<string name="screen_file_browser_msg_empty_folder">खाली फ़ोल्डर</string>
 	<string name="screen_file_browser_file_info_label_date">%1$s पहले बदला गया</string>
 	<string name="screen_file_browser_share_intent_chooser_title">शेयर करे</string>
+	<string name="screen_file_browser_share_destination_title">स्थान का चुनाव करें |</string>
 	<string name="screen_file_browser_share_button_text">चुनें</string>
 	<string name="screen_file_browser_nothing_to_share">शेयर करने के लिए कुछ नहीं है</string>
 	<string name="screen_file_browser_actions_title">%1$s में डालें</string>
@@ -78,6 +85,7 @@
 	<string name="screen_file_browser_msg_file_exported">दस्तावेज निर्यात हुआ</string>
 	<string name="screen_file_browser_msg_files_exported">दस्तावेज निर्यात हुए</string>
 	<string name="screen_file_browser_nothing_to_export">निर्यात करने के लिए कुछ भी नहीं</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">डाउनलोड डिरेक्टररी बनाना विफल हुआ |</string>
 	<string name="screen_file_browser_node_action_share">साझा करें</string>
 	<string name="screen_file_browser_node_action_rename">नाम बदलें</string>
 	<string name="screen_file_browser_node_action_edit_text">संपादित करें</string>
@@ -105,11 +113,16 @@
 	<!-- ## screen: choose cloud service -->
 	<string name="screen_choose_cloud_service_title">क्लाउड सेवा</string>
 	<!-- ## screen: cloud connections -->
+	<string name="screen_cloud_connections_title">स्थान चुनें |</string>
+	<string name="screen_cloud_connections_no_connections">खाता खोलने के लिए यहाँ दबाएँ |</string>
+	<string name="screen_cloud_error_webdav_not_supported">सर्वर वेबडेव (WebDAV) के साथ अनुरूप नहीं है |</string>
+	<string name="screen_cloud_local_error_no_content_provider">ऐसा कोई फ़ाइल प्रबंधक नहीं मिला जो निर्देशिका खोलने का समर्थन करता हो</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">उपयोगकर्ता नाम</string>
 	<string name="screen_webdav_settings_password_label">पासवर्ड</string>
 	<string name="screen_webdav_settings_done_button_text">जुड़ें</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">यूआरएल (URL) खाली नहीं हो सकता</string>
 	<string name="screen_webdav_settings_msg_url_is_invalid">यूआरएल अमान्य है।</string>
 	<string name="screen_webdav_settings_msg_username_must_not_be_empty">यूजरनेम खाली नहीं रह सकता</string>
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">पासवर्ड खाली नहीं छोड़ा जा सकता</string>
@@ -121,6 +134,9 @@
 	<string name="screen_s3_settings_endpoint_label">एंडपॉइन्ट</string>
 	<string name="screen_s3_settings_region_label">क्षेत्र</string>
 	<string name="screen_s3_settings_msg_display_name_not_empty">प्रदर्शित नाम खाली नहीं रह सकता</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">एक्सेस कुंजी खाली नहीं हो सकती</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">गुप्त कुंजी खाली नहीं हो सकती</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">बाल्टी के गुण खाली नहीं हो सकती</string>
 	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">एंडपॉइन्ट या क्षेत्र खाली नहीं रह सकते</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">वॉल्ट का नाम खाली नहीं रह सकता।</string>
@@ -130,37 +146,140 @@
 	<string name="screen_set_password_title">पासवर्ड सेट करें</string>
 	<string name="screen_set_password_msg_password_mismatch">पासवर्ड दोबारा टाइप किये गए पासवर्ड से मेल नहीं खाता।</string>
 	<string name="screen_set_password_button_text">हो गया</string>
+	<string name="screen_set_password_hint">महत्वपूर्ण: यदि आप अपना पासवर्ड भूल जाते हैं, तो डेटा को पुनर्प्राप्त करने का कोई तरीका नहीं है</string>
+	<string name="screen_set_password_retype_password_label">पासवर्ड फिर से लिखें</string>
 	<string name="screen_set_password_strength_indicator_0">वॉल्ट बनाने के लिए बहुत कमज़ोर</string>
 	<string name="screen_set_password_strength_indicator_1">कमजोर</string>
 	<string name="screen_set_password_strength_indicator_2">बढ़िया</string>
 	<string name="screen_set_password_strength_indicator_3">मजबूत</string>
+	<string name="screen_set_password_strength_indicator_4">बहुत मजबूत</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">सामान्य</string>
 	<string name="screen_settings_cloud_settings_label">क्लाउड सेवाएं</string>
 	<string name="screen_settings_biometric_auth">बायोमेट्रिक प्रमाणीकरण</string>
+	<string name="screen_settings_activate_biometric_auth">बायोमेट्रिक प्रमाणीकरण सक्रिय करें</string>
+	<string name="screen_settings_confirm_face_unlock">फेस अनलॉक की पुष्टि करें (यदि उपलब्ध हो)</string>
+	<string name="screen_settings_block_app_when_obscured">अस्पष्ट होने पर आप्स को ब्लॉक करें</string>
+	<string name="screen_settings_block_app_when_obscured_summary">इनपुट को इंटरसेप्ट करने और ग़लत यूज़र इंटरफ़ेस प्रदर्शित करने से रोकें</string>
+	<string name="screen_settings_secure_screen">ब्लॉक स्क्रीनशॉट</string>
+	<string name="screen_settings_secure_screen_summary">हाल ही की सूची में और आप्स के अंदर स्क्रीनशॉट ब्लॉक करें</string>
 	<string name="screen_settings_section_search">खोज करें</string>
+	<string name="screen_settings_live_search">सीधा प्रसारित खोज</string>
+	<string name="screen_settings_live_search_summary">प्रश्न दर्ज करते समय खोज परिणाम अद्यतन (अपडेट) करें</string>
+	<string name="screen_settings_glob_search">ग्लोब (glob) पैटर्न का उपयोग करके खोजें</string>
+	<string name="screen_settings_glob_search_summary">ऐलिस.*.जेपिजे (alice.*.jpg) की तरह मेल खाने वाले ग्लोब पैटर्न का उपयोग करें</string>
+	<string name="screen_settings_section_auto_lock">ऑटोमाटिक लॉक करें</string>
+	<string name="screen_settings_auto_lock_timeout">बादमें लॉक करें</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">जब स्क्रीन अक्षम हो</string>
+	<string name="screen_settings_section_auto_photo_upload">ऑटोमाटिक फोटो अपलोड</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">अपलोड के लिए तिजोरी चुनें</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">सक्रिय</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">पृष्ठभूमि के प्रतिमा अधिकृत करें और तिजोरी को खोलने के बाद, अपलोड प्रारंभ करें</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">तुरंत अपलोड करें</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">यदि तिजोरी खुली है तो सीधे अपलोड करें</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">केवल वाईफ़ाई (WIFI) का उपयोग करके अपलोड करें</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">वीडियो अपलोड करें</string>
+	<string name="screen_settings_auto_photo_upload_title">अपने आप अपलोड हुए फ़ाइलें को &#8230; में जमा करे</string>
+	<string name="screen_settings_website_label">क्रिप्टोमेटर वेबसाइट</string>
 	<string name="screen_settings_twitter_label">हमें Twitter पर फॉलो करें</string>
 	<string name="screen_settings_facebook_label">हमें फ़ेसबुक पर लाइक करें</string>
+	<string name="screen_settings_section_legal">कानूनी</string>
+	<string name="screen_settings_licenses_label">लाइसेंस</string>
 	<string name="screen_settings_license_terms_label">लाइसेंस की शर्तें</string>
 	<string name="screen_settings_section_support">सहायता</string>
 	<string name="screen_settings_contact_label">सहायता माँगे</string>
 	<string name="screen_settings_debug_mode_label">डीबग मोड</string>
 	<string name="screen_settings_error_report_label">लॉग फ़ाइल भेजें</string>
+	<string name="screen_settings_error_report_failed">भेजने में विफल हुआ हैं |</string>
+	<string name="screen_settings_security_label">सुरक्षा के संकेत |</string>
 	<string name="screen_settings_section_version">संस्करण</string>
 	<string name="screen_settings_advanced_settings">एडवांस्ड सेटिंग्स</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">माइक्रोसॉफ्ट फ़ाइल खुलनेका वैकल्पिक हल |</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">फ़ाइलें को माइक्रोसॉ आप्स में लिखने के अनुमती के साथ खोले |</string>
+	<string name="screen_settings_background_unlock_preparation_label">अनलॉक में तेजी लाएं |</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">पासवर्ड या बायोमेट्रिक प्रमाण दर्ज करने के लिए संकेत देते समय पृष्ठभूमि में तिजोरी के कॉन्फ़िगरेशन को डाउनलोड करें</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">अनलॉक्ड रखें</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">फाइल्स एडिट करते वक़्त वॉल्ट अनलॉक्ड रखें</string>
 	<!-- ## screen: cloud settings -->
+	<string name="screen_cloud_settings_onedrive_connections">वनड्राइव (OneDrive) कनेक्शन</string>
+	<string name="screen_cloud_settings_webdav_connections">वेबडीएवी (WebDAV) कनेक्शन</string>
+	<string name="screen_cloud_settings_pcloud_connections">पीक्लाउड (pCloud) कनेक्शन</string>
+	<string name="screen_cloud_settings_s3_connections">S3 कनेक्शन</string>
+	<string name="screen_cloud_settings_local_storage_locations">स्थानीय जमा करने का स्थान</string>
+	<string name="screen_cloud_settings_log_in_to">में प्रवेश करें</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">से बाहर पढ़े</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s को प्रमाणित नहीं किया जा सका |</string>
+	<string name="screen_update_pcloud_connections_title">pCloud क्रेडेंशियल अपडेट करें</string>
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">क्रिप्टोमेटर के प्रकार</string>
+	<string name="screen_cryptomator_variants_lite_title">मुख्य F-Droid संग्रह</string>
+	<string name="screen_cryptomator_variants_lite_description">एपीआई की (API key) की आवश्यकता के कारण छोड़ा गया है |</string>
+	<string name="screen_cryptomator_variants_lite_install">इंस्टॉल करें</string>
+	<string name="screen_cryptomator_variants_fdroid_title">क्रिप्टोमेटर एफ-ड्रॉयड (F-Droid) संग्रह</string>
+	<string name="screen_cryptomator_variants_fdroid_description">मालिकाना निर्भरता के वजेसे छोड़ा गया हैं |</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">क्रिप्टोमेटर संग्रह F-Droid ऐप में जोड़ें |</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo">जोड़िये</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">F-Droid का उपयोग करके क्रिप्टोमेटर स्थापित करें।\nयदि कोई त्रुटि नहीं मिली, तो F-Droid सिंक्रनाइज़ेशन समाप्त होने तक प्रतीक्षा करें।</string>
+	<string name="screen_cryptomator_variants_website_title">वेबसाइट</string>
+	<string name="screen_cryptomator_variants_website_description">मालिकाना निर्भरताएँ शामिल हैं।</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">रद्द करें</string>
 	<string name="dialog_enter_password_positive_button">अनलॉक करें</string>
+	<string name="dialog_change_password_old_password_label">पुराना पासवर्ड</string>
+	<string name="dialog_change_password_new_password_label">नया पासवर्ड</string>
+	<string name="dialog_change_password">पासवर्ड बदलें</string>
+	<string name="dialog_change_password_msg_old_password_empty">पुराना पासवर्ड खाली नहीं हो सकता |</string>
+	<string name="dialog_change_password_msg_new_password_empty">नया पासवर्ड खाली नहीं हो सकता |</string>
+	<string name="dialog_change_password_msg_password_mismatch">नया पासवर्ड दोबारा टाइप किये गए पासवर्ड से मेल नहीं खाता।</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">तिजोरी %1$s नहीं मिली |</string>
+	<string name="dialog_vault_not_found_message">तिजोरी का नाम बदल दिया गया है, स्थानांतरित कर दिया गया है या हटा दिया गया है। इस वॉल्ट को सूची से हटाएं और आगे बढ़ने के लिए इसे फिर से जोड़ें। अभी हटाएं?</string>
 	<string name="dialog_vault_not_found_positive_button_text">हटाएँ</string>
+	<string name="dialog_existing_file_title">फ़ाइल पहले से ही मौजूद है</string>
+	<string name="dialog_existing_file_positive_button">फ़ाइलो को बदलें</string>
+	<string name="dialog_existing_file_message">\'%1$s\' नाम की फ़ाइल पहले से मौजूद है।</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">मौजूदा फ़ाइलो को छोड़ें</string>
+	<string name="dialog_replace_positive_button_all_files_exist">सभी फ़ाइलो को बदलें</string>
+	<string name="dialog_replace_positive_button_some_files_exist">मौजूदा फ़ाइलें बदलें</string>
+	<string name="dialog_replace_positive_button_single_file_exists">फ़ाइलो को बदलें</string>
+	<string name="dialog_replace_title_single_file_exists">फ़ाइल बदलें?</string>
+	<string name="dialog_replace_title_multiple_files_exist">फ़ाइलो को बदलें?</string>
+	<string name="dialog_unable_to_share_title">फ़ाइलो को साझा (share) करने में असमर्थ</string>
+	<string name="dialog_unable_to_share_message">आपने तिजोरी स्थापित नहीं की है | कृपया पहले क्रिप्टोमेटर आप्स से नयी तिजोरी बनाएं।</string>
+	<string name="dialog_unable_to_share_positive_button">ठीक है</string>
 	<string name="dialog_unable_to_share_negative_button">वॉल्ट बनाएं</string>
+	<string name="dialog_filetype_not_supported_title">%1$s फ़ाइल प्रकार खुल नहीं सका</string>
+	<string name="dialog_rename_vault_title">तिजोरी का नाम बदले</string>
+	<string name="dialog_rename_node_folder_title">फ़ोल्डर का नाम बदलें</string>
+	<string name="dialog_rename_node_file_title">फ़ाइल का नाम बदलें</string>
+	<string name="dialog_unsaved_changes_title">आपके पास नहीं सहेजे गए बदलाव हैं</string>
+	<string name="dialog_unsaved_changes_message">क्या आप सच में बिना सहेजे जाने ऐप्स बदं करना चाहते हे?</string>
+	<string name="dialog_unsaved_changes_discard">ख़ारिज करें</string>
+	<string name="dialog_file_name_hint">फ़ाइल का नाम</string>
+	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_delete_vault_message">क्या आप वाकई इस तिजोरी को हटाना चाहते हैं?</string>
+	<string name="dialog_delete_vault_hint">यह कार्रवाई केवल तिजोरी को इस सूची से हटाएगी, उसे भौतिक रूप से नहीं हटाएगी।</string>
+	<string name="dialog_upload_file_title">अपलोड हो रहा है&#8230;</string>
+	<string name="dialog_upload_file_remaining">%2$d का %1$d फाइल</string>
+	<string name="dialog_export_file_title">ऐप्स बाहर भेजने के लिए फाइल का नाम (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">कृपया प्रतीक्षा करे&#8230;</string>
+	<string name="dialog_progress_creating_folder">फ़ोल्डर बनाये&#8230;</string>
+	<string name="dialog_progress_creating_text_file">टेक्स्ट फ़ाइल बनाये&#8230;</string>
+	<string name="action_progress_authentication">प्रमाणीत करे&#8230;</string>
+	<string name="action_progress_renaming">नाम बदल रहा हैं&#8230;</string>
+	<string name="action_progress_deleting">हटाया जा रहा है&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">तिजोरी खुल रही है&#8230;</string>
+	<string name="dialog_progress_change_password">पासवर्ड बदल रहा है&#8230;</string>
+	<string name="dialog_progress_creating_vault">तिजोरी संस्थापित हो रही है&#8230;</string>
+	<string name="dialog_progress_upload_file">अपलोड हो रहा है&#8230;</string>
+	<string name="dialog_progress_download_file">डाउनलोड हो रहा है&#8230;</string>
+	<string name="dialog_progress_encryption">कूट लेखन (एन्क्रिप्ट) हो रहा है&#8230;</string>
+	<string name="dialog_progress_decryption">विकोड लेखन (डिक्रिप्ट) हो रहा है&#8230;</string>
 	<string name="dialog_lock_vault">लॉक करें</string>
+	<string name="dialog_http_security_checkbox">HTTPS में बदलें</string>
+	<string name="dialog_http_security_title">HTTPS का उपयोग करें?</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">बंद करें</string>
 	<string name="dialog_update_available_cancel">बाद में</string>
 	<string name="dialog_download_update_title">डाउनलोड चल रहा है।</string>
diff --git a/presentation/src/main/res/values-hu-rHU/strings.xml b/presentation/src/main/res/values-hu-rHU/strings.xml
index 0c6369eff..59aeb55cf 100644
--- a/presentation/src/main/res/values-hu-rHU/strings.xml
+++ b/presentation/src/main/res/values-hu-rHU/strings.xml
@@ -198,6 +198,8 @@
 	<string name="screen_settings_security_label">Biztonsági tippek</string>
 	<string name="screen_settings_section_version">Verzió</string>
 	<string name="screen_settings_advanced_settings">Speciális beállítások</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Megkerülés Microsoft-fájlok megnyitásával</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Fájlok megnyitása Microsoft-alkalmazásokban írási engedéllyel</string>
 	<string name="screen_settings_background_unlock_preparation_label">A feloldás felgyorsítása</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Trezor konfigurációjának letöltése a háttérben a jelszó/biometrikus hitelesítés megadása közben</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Feloldvatartás</string>
@@ -220,6 +222,13 @@
 	<string name="screen_cryptomator_variants_lite_description">Nincsenek benne, mert API kulcsokra van szükségük.</string>
 	<string name="screen_cryptomator_variants_lite_install">Telepítés</string>
 	<string name="screen_cryptomator_variants_fdroid_title">Cryptomator F-Droid tároló</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Kizárva, mert saját függőségeket tartalmaz.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">A Cryptomator tároló hozzáadása az F-Droid apphoz.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo">Hozzáadás</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">Cryptomator telepítése F-Droid segítségével.\nHa egy nem talált hiba jelenik meg, várjon amíg az F-Droid szinkronizáció befejeződik.</string>
+	<string name="screen_cryptomator_variants_website_title">Weboldal</string>
+	<string name="screen_cryptomator_variants_website_description">Zárt forráskódú függőségeket tartalmaz.</string>
+	<string name="screen_cryptomator_variants_installation_hint">Az alkalmazás fő F-Droid tároló verziójára vagy verziójáról váltáshoz szükséges az alkalmazás teljes újratelepítése.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Mégse</string>
 	<string name="dialog_enter_password_positive_button">Feloldás</string>
@@ -257,6 +266,7 @@
 	<string name="dialog_unsaved_changes_title">Nem mentett módosításai vannak</string>
 	<string name="dialog_unsaved_changes_message">Biztos, hogy mentés nélkül szeretne kilépni?</string>
 	<string name="dialog_unsaved_changes_discard">Elvetés</string>
+	<string name="dialog_file_name_hint">Fájlnév</string>
 	<string name="dialog_file_name_placeholder">text.txt</string>
 	<string name="dialog_delete_vault_message">Biztosan törli ezt a trezort?</string>
 	<string name="dialog_delete_vault_hint">Ez a művelet eltávolítja a tárolót a listáról, de fizikailag nem törli azt.</string>
@@ -283,6 +293,7 @@
 	<string name="dialog_accept_ssl_certificate_details">Részletek</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Ez biztonsági kockázatot jelent. Tudom, mit csinálok.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_title">Akkumulátor-optimalizálás kikapcsolása</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Az új képek és videók lekérdezéséhez anélkül, hogy a háttérben futna, ki kell kapcsolnunk az akkumulátor optimalizálását. De ne aggódj, a %1$s nem fogyaszt sok energiát.\n\nAz alkalmazáshoz állítsd át a \"Nem optimalizált\" opciót \"Minden alkalmazás\"-ra, válaszd ki a %1$s-t, és a \"%2$s\" megérintése után válaszd ki a \"Nem optimalizál\" opciót ebben a párbeszédpanelben.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Ne kérdezze újra</string>
 	<string name="dialog_http_security_hint">A HTTP használata nem biztonságos, helyette a HTTPS használata ajánlott. Ha ismeri a kockázatot, folytathatja HTTP-vel is.</string>
 	<string name="dialog_http_security_checkbox">Váltson HTTPS-re</string>
@@ -295,18 +306,33 @@
 	<string name="dialog_debug_mode_disclaimer_hint">Ebben a módban érzékeny adatok kerülhetnek az eszközön lévő naplófájlba (pl. fájlnevek és -útvonalak). Ez jelszavakra és sütikre nem vonatkozik.\n\n Ne felejtse el minél hamarabb kikapcsolni a fejlesztői módot.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Figyelem</string>
 	<string name="dialog_debug_mode_positive_button">Engedélyezés</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">A Microsoft-alkalmazások egy hibája miatt a szerkesztendő fájlt meg kell osztani ezekkel az alkalmazásokkal az eszközön lévő nyilvános médiamappában. Miután a Cryptomator végzett, a nyilvánosan elérhető fájl ismét törlődik, de a Cryptomatornak nincs befolyása arra, hogy mi történik időközben ezzel a fájlal. Győződj meg róla, hogy tisztában vagy ezzel a viselkedéssel, amikor bekapcsolod ezt az opciót. Ez csak a Microsoft fájltípusokra vonatkozik.\n\nAz bekapcsolás után a Cryptomator újraindul.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Figyelem</string>
 	<string name="dialog_disable_app_obscured_positive_button">Letiltás</string>
+	<string name="dialog_app_is_obscured_info_title">Az app el van takarva</string>
+	<string name="dialog_app_is_obscured_info_hint">Egy másik app megjelenít valamit a Cryptomator felett (pl. egy kékfény szűrő vagy éjszakai mód app). Biztonsági okokból a Cryptomator le van tiltva.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">Hogyan engedélyezze a Cryptomatort</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Bezár</string>
+	<string name="dialog_confirm_delete_multiple_title">Töröl %1$d elemet?</string>
 	<string name="dialog_confirm_delete_multiple_message">Biztosan törölni akarja ezeket az elemeket?</string>
 	<string name="dialog_confirm_delete_file_message">Biztosan törli ezt a fájlt?</string>
+	<string name="dialog_confirm_delete_folder_message">Ezzel a mappa teljes tartalma törlődik. Biztos, hogy törölni szeretné ezt a mappát?</string>
+	<string name="dialog_enter_license_title">Adjon meg egy érvényes licencet</string>
+	<string name="dialog_enter_license_content">Úgy érzékeltük, hogy a Cryptomatort a Google Play áruházon kívül telepítette. Adjon meg egy érvényes licencet, amit meg tud vásárolni itt: <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
+	<string name="dialog_enter_license_not_valid_content">A megadott licenc nem érvényes. Győződjön meg arról, hogy jól írta be.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">A megadott kulcs egy asztali támogatói igazolás. Kérem, adjon meg egy érvényes licencet.</string>
+	<string name="dialog_enter_license_no_content">Nincs licenc megadva. Kérem, adjon meg egy érvényes licencet.</string>
 	<string name="dialog_enter_license_decline_button">Kilépés</string>
+	<string name="dialog_license_confirmation_title">Licenc megerősítése</string>
+	<string name="dialog_license_confirmation_message">Köszönöm %1$s, hogy megadta érvényes licencét.</string>
 	<string name="dialog_update_available_title">Frissítés elérhető</string>
 	<string name="dialog_update_available_update">Frissítés most</string>
 	<string name="dialog_update_available_download_site">Ugrás a Letöltési oldalra</string>
 	<string name="dialog_update_available_cancel">Később</string>
 	<string name="dialog_download_update_title">Letöltés folyamatban</string>
+	<string name="dialog_sym_link_title">A mappa egy szimbolikus link</string>
 	<string name="dialog_sym_link_back_button">Vissza</string>
+	<string name="dialog_no_dir_file_title">Nem lehet betölteni a könyvtár tartalmát</string>
+	<string name="dialog_pcloud_credentials_updated">Ha új pCloud fiókot szeretne hozzáadni, koppintson erre az url-re: <a href="https://www.pcloud.com">www.pcloud.com</a>, jelentkezzen ki a jelenlegi fiókból és koppintson újra a \'+\' gombra az appban, hogy új felhő kapcsolatot létesítsen.</string>
 	<string name="permission_snackbar_auth_local_vault">A Cryptomatornak tárhely-hozzáférésre van szüksége a trezorok használatához</string>
 	<string name="permission_snackbar_auth_auto_upload">A Cryptomatornak tárhely-hozzáférésre van szüksége az automatikus fotófeltöltés használatához</string>
 	<!-- # error reports -->
@@ -352,6 +378,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">A feltöltésre kiválasztott mappa már nem elérhető. Menjen a beállításokhoz, és válasszon egy újat</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">A trezor zárolva lett a feltöltés során. A folytatáshoz nyissa meg újra</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Az automatikus feltöltéshez megadott tároló már nem létezik.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Koppintson a hitelesítés frissítéséhez.</string>
 	<string name="notification_open_writable_file_title">Írható fájl megnyitása</string>
 	<string name="notification_open_writable_file_message">A trezor a szerkesztés idejéig feloldva marad</string>
 	<string name="notification_update_check_finished_latest">A legfrissebb verzió van telepítve</string>
@@ -365,6 +392,8 @@
 	<string name="screen_settings_license_mail">%1$s</string>
 	<string name="dialog_settings_update_check_interval_title">Frissítések keresésése</string>
 	<string name="screen_settings_check_updates">Frissítések keresése</string>
+	<string name="screen_settings_last_check_updates">Utolsó keresés %1$s</string>
+	<string name="dialog_cache_size_title">Felhőnkénti gyorsítótár mérete</string>
 	<!-- lock timeout names -->
 	<string name="lock_timeout_instant">Azonnal</string>
 	<string name="lock_timeout_1m">1 perc</string>
diff --git a/presentation/src/main/res/values-in-rID/strings.xml b/presentation/src/main/res/values-in-rID/strings.xml
index ec0f5d21e..c87f6472b 100644
--- a/presentation/src/main/res/values-in-rID/strings.xml
+++ b/presentation/src/main/res/values-in-rID/strings.xml
@@ -20,7 +20,7 @@
 	<string name="error_device_policy_manager_not_found">Silakan buka pengaturan perangkat Anda dan atur kunci layar dengan tangan</string>
 	<string name="error_export_illegal_file_name">Ekspor gagal. Coba hapus karakter khusus dari nama file dan ekspor lagi.</string>
 	<string name="error_name_contains_invalid_characters">Tidak boleh mengandung karakter khusus.</string>
-	<string name="error_names_contains_invalid_characters">Nama file tidak boleh mengandung karakter khusus.</string>
+	<string name="error_names_contains_invalid_characters">Nama berkas tidak boleh mengandung karakter khusus.</string>
 	<string name="error_vault_name_contains_invalid_characters">Nama vault tidak boleh mengandung karakter khusus.</string>
 	<string name="error_general_update">Pemeriksaan pembaruan gagal. Terjadi kesalahan.</string>
 	<string name="error_hash_mismatch_update">Pemeriksaan pembaruan gagal. Hash yang dihitung tidak cocok dengan file yang diunggah</string>
@@ -34,6 +34,7 @@
 	<string name="error_file_not_found_after_opening_using_3party">File lokal sudah tidak tersedia setelah beralih kembali ke Cryptomator. Perubahan yang ada tidak dapat disimpan kembali ke cloud.</string>
 	<string name="error_no_such_bucket">Bucket tidak ada</string>
 	<string name="error_masterkey_location_not_supported">Lokasi Masterkey khusus belum didukung</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">Gagal berkomunikasi dengan aplikasi F-Droid. Belum dipasang?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Penyimpanan lokal</string>
@@ -54,12 +55,15 @@
 	<string name="snack_bar_action_title_sort_oldest">Terlama dulu</string>
 	<string name="snack_bar_action_title_sort_biggest">Terbesar dulu</string>
 	<string name="snack_bar_action_title_sort_smallest">Terkecil dulu</string>
+	<string name="snack_bar_cryptomator_variants_title">Baca lebih lanjut</string>
+	<string name="snack_bar_cryptomator_variants_hint">Cloud tidak ada di dalam daftar?</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
 	<string name="screen_vault_list_actions_title">Tambah ke Cryptomator</string>
 	<string name="screen_vault_list_action_create_new_vault">Buat vault baru</string>
 	<string name="screen_vault_list_action_add_existing_vault">Tambahkan vault yang sudah ada</string>
 	<string name="screen_vault_list_vault_action_delete">Hapus</string>
+	<string name="screen_vault_list_vault_creation_hint">Ketuk disini untuk membuat vault baru</string>
 	<string name="screen_vault_list_change_password_successful">Kasa Sandi berhasil diubah</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Vault</string>
@@ -113,6 +117,7 @@
 	<string name="screen_choose_cloud_service_title">Layanan Cloud</string>
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">Pilih lokasi</string>
+	<string name="screen_cloud_connections_no_connections">Ketuk disini untuk menambahkan lokasi</string>
 	<string name="screen_cloud_error_webdav_not_supported">Server tampaknya tidak kompatibel dengan WebDAV</string>
 	<string name="screen_cloud_local_error_no_content_provider">Tidak ditemukan file manager yang dapat membuka direktori ini</string>
 	<!-- ## screen: webdav settings -->
@@ -192,6 +197,8 @@
 	<string name="screen_settings_security_label">Petunjuk keamanan</string>
 	<string name="screen_settings_section_version">Versi</string>
 	<string name="screen_settings_advanced_settings">Pengaturan Lanjutan</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Solusi membuka berkas Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Buka file di aplikasi Microsoft dengan izin menulis</string>
 	<string name="screen_settings_background_unlock_preparation_label">Percepat buka kunci</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Unduh konfigurasi vault di latar belakang saat diminta memasukkan kata sandi atau otentikasi biometrik</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Biarkan tidak terkunci</string>
@@ -209,6 +216,18 @@
 	<string name="screen_authenticate_auth_authentication_failed">%1$s tidak dapat diautentikasi.</string>
 	<string name="screen_update_pcloud_connections_title">Perbarui kredensial pCloud</string>
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">Varian Cryptomator</string>
+	<string name="screen_cryptomator_variants_lite_title">Repositori Utama F-Droid</string>
+	<string name="screen_cryptomator_variants_lite_description">Dikecualikan karena mereka memerlukan kunci API.</string>
+	<string name="screen_cryptomator_variants_lite_install">Pasang</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Repositori Cryptomator F-Droid</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Dikecualikan karena mengandung dependensi hak milik.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Tambahkan repositori Cryptomator ke aplikasi F-Droid.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo">Tambah</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">Pasang Cryptomator menggunakan F-Droid.\nJika muncul error tidak ditemukan, tunggu hingga sinkronisasi F-Droid selesai.</string>
+	<string name="screen_cryptomator_variants_website_title">Situs Web</string>
+	<string name="screen_cryptomator_variants_website_description">Berisi dependensi hak milik.</string>
+	<string name="screen_cryptomator_variants_installation_hint">Beralih dari atau ke varian repositori utama F-Droid memerlukan pengaturan aplikasi yang baru.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Batalkan</string>
 	<string name="dialog_enter_password_positive_button">Buka Kunci</string>
@@ -246,6 +265,7 @@
 	<string name="dialog_unsaved_changes_title">Anda memiliki perubahan yang belum disimpan</string>
 	<string name="dialog_unsaved_changes_message">Apakah Anda yakin ingin keluar tanpa menyimpan?</string>
 	<string name="dialog_unsaved_changes_discard">Buang</string>
+	<string name="dialog_file_name_hint">Nama berkas</string>
 	<string name="dialog_file_name_placeholder">text.txt</string>
 	<string name="dialog_delete_vault_message">Apakah Anda yakin ingin menghapus vault ini?</string>
 	<string name="dialog_delete_vault_hint">Tindakan ini hanya akan menghapus vault dari daftar ini dan tidak menghapusnya secara fisik.</string>
@@ -272,6 +292,7 @@
 	<string name="dialog_accept_ssl_certificate_details">Rincian</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Ini bisa menjadi risiko keamanan. Saya tahu apa yang saya lakukan.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_title">Nonaktifkan optimalisasi baterai</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Untuk mengambil gambar dan video baru tanpa berjalan di latar belakang, kita perlu memilih untuk tidak ikut serta dalam pengoptimalan baterai. Namun jangan khawatir, %1$s tidak menghabiskan banyak energi.\n\nUntuk menerapkannya, ubah \'Tidak dioptimalkan\' menjadi \'Semua aplikasi\', pilih %1$s dan pilih \'Jangan optimalkan\' setelah mengetuk \'%2$s\' dalam dialog ini.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Jangan tanya lagi?</string>
 	<string name="dialog_http_security_hint">Penggunaan HTTP tidak aman. Kami menyarankan untuk menggunakan HTTPS sebagai gantinya. Jika Anda mengetahui risikonya, Anda dapat melanjutkan dengan HTTP.</string>
 	<string name="dialog_http_security_checkbox">Ubah ke HTTPS</string>
@@ -284,6 +305,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">Dalam mode ini, data sensitif dapat ditulis ke file log di perangkat Anda (misalnya, nama dan lokasi file). Kata sandi, cookie, dll secara eksplisit dikecualikan.\n\nJangan lupa untuk menonaktifkan mode debug sesegera mungkin.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Perhatian</string>
 	<string name="dialog_debug_mode_positive_button">Aktifkan</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Karena adanya bug pada aplikasi Microsoft, berkas yang akan diedit harus dibagikan dengan aplikasi ini di folder media publik di perangkat Anda. Setelah Cryptomator dilanjutkan, berkas yang dapat diakses publik akan dihapus lagi, namun Cryptomator tidak dapat memengaruhi apa yang terjadi pada berkas ini untuk sementara. Pastikan Anda mengetahui perilaku ini saat mengaktifkan opsi ini. Ini hanya berlaku untuk jenis berkas Microsoft.\n\nCryptomator akan dimulai ulang setelah aktivasi.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Pengaturan ini adalah fitur keamanan untuk mencegah aplikasi lain mengelabui pengguna melakukan hal-hal yang tidak ingin mereka lakukan.\n\nDengan menonaktifkan, Anda mengonfirmasi bahwa telah <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">menyadari akan bahaya tersebut</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Perhatian</string>
 	<string name="dialog_disable_app_obscured_positive_button">Matikan</string>
@@ -325,8 +347,10 @@
 	<string name="dialog_no_dir_file_message">Folder cloud \'%1$s\' tidak memiliki file direktori yang valid. Bisa jadi folder tersebut dibuat di perangkat lain dan belum sepenuhnya tersinkronisasi ke cloud. Harap periksa di cloud Anda jika file berikut ada dan tidak kosong:\n%2$s</string>
 	<string name="dialog_no_more_images_to_display">Tidak ada lagi gambar untuk ditampilkan&#8230;</string>
 	<string name="dialog_pcloud_credentials_updated_title">Kredensial \'%1$s\' diperbarui</string>
+	<string name="dialog_pcloud_credentials_updated">Jika Anda ingin menambahkan akun pCloud baru, ketuk url berikut <a href="https://www.pcloud.com">www.pcloud.com</a>, keluar dari akun saat ini kemudian ketuk tombol \'+\' lagi di aplikasi ini untuk membuat koneksi cloud baru.</string>
 	<string name="permission_snackbar_auth_local_vault">Cryptomator membutuhkan akses penyimpanan untuk menggunakan vault lokal</string>
 	<string name="permission_snackbar_auth_auto_upload">Cryptomator membutuhkan akses penyimpanan untuk menggunakan unggahan foto otomatis</string>
+	<string name="permission_snackbar_notifications">Cryptomator perlu izin pemberitahuan untuk menampilkan status brankas, misalnya</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
@@ -370,6 +394,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Folder yang dipilih untuk mengunggah tudak lagi tersedia. Buka pengaturan dan pilih yang baru</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Vault terkunci selama unggahan, silakan buka kembali vault untuk melanjutkan</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Vault yang ditentukan untuk unggah otomatis tidak ada lagi.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Ketuk untuk menyegarkan otentikasi.</string>
 	<string name="notification_open_writable_file_title">Buka file yang dapat ditulis</string>
 	<string name="notification_open_writable_file_message">Vault tetap tidak terkunci sampai selesai mengedit</string>
 	<string name="notification_update_check_finished_latest">Versi terbaru sudah terpasang</string>
diff --git a/presentation/src/main/res/values-it-rIT/strings.xml b/presentation/src/main/res/values-it-rIT/strings.xml
index 729d29fe8..80bd23dc9 100644
--- a/presentation/src/main/res/values-it-rIT/strings.xml
+++ b/presentation/src/main/res/values-it-rIT/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- # app -->
-	<string name="share_with_label">Crittografa</string>
+	<string name="share_with_label">Cripta</string>
 	<!-- # error messages -->
 	<string name="error_generic">Si è verificato un errore</string>
 	<string name="error_authentication_failed">Autenticazione non riuscita</string>
@@ -32,9 +32,9 @@
 	<string name="error_vault_key_invalid">%1$s non corrisponde a questo %2$s</string>
 	<string name="error_vault_config_loading">Errore generale durante il caricamento della configurazione della cassaforte</string>
 	<string name="error_file_not_found_after_opening_using_3party">Il file locale non è più presente dopo essere tornato a Cryptomator. Le eventuali modifiche non possono essere riprodotte nel cloud.</string>
-	<string name="error_no_such_bucket">Nessun secchio simile</string>
-	<string name="error_masterkey_location_not_supported">Posizione della Chiave Principale Personalizzata non ancora supportata</string>
-	<string name="error_interact_with_fdroid_but_fdroid_missing">Non sei riuscito a comunicare con l\'app F-Droid. Non installata?</string>
+	<string name="error_no_such_bucket">Nessun bucket di questo tipo</string>
+	<string name="error_masterkey_location_not_supported">Posizione personalizzata della Chiave Principale non ancora supportata</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">Impossibile comunicare con l\'app F-Droid. Forse non è installata?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Archivio locale</string>
@@ -198,6 +198,8 @@
 	<string name="screen_settings_security_label">Suggerimenti di sicurezza</string>
 	<string name="screen_settings_section_version">Versione</string>
 	<string name="screen_settings_advanced_settings">Impostazioni Avanzate</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Soluzione per aprire i file Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Apri file nelle app Microsoft con i permessi di scrittura</string>
 	<string name="screen_settings_background_unlock_preparation_label">Accelera sblocco</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Scarica la configurazione della cassaforte in background quando è stato richiesto di inserire la password o l\'autenticazione biometrica</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Mantieni sbloccato</string>
@@ -304,6 +306,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">In questa modalità, i dati sensibili possono essere scritti in un file di registro sul dispositivo (ad es. nomi di file e percorsi). Password, cookie, ecc. sono esplicitamente esclusi.\n\nRicorda di disabilitare la modalità di debug il prima possibile.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Attenzione</string>
 	<string name="dialog_debug_mode_positive_button">Abilita</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">A causa di un bug nelle applicazioni Microsoft, il file da modificare deve essere condiviso con queste applicazioni in una cartella pubblica sul tuo dispositivo. Dopo aver riavviato Cryptomator, il file accessibile pubblicamente viene nuovamente eliminato, ma Cryptomator non può controllare cosa sia successo a questo file nel frattempo. Assicurati di essere a conoscenza di questo comportamento quando attivi questa opzione. Questo si applica solo ai formati di file Microsoft.\n\nCryptomator si riavvia dopo l\'attivazione.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Questa impostazione è una funzione di sicurezza e impedisce ad altre applicazioni di ingannare gli utenti a fare cose che non sono in grado di fare.\n\nDisabilitando confermi di essere <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">a conoscenza dei rischi</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Attenzione</string>
 	<string name="dialog_disable_app_obscured_positive_button">Disabilita</string>
@@ -392,6 +395,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">La cartella selezionata per il caricamento non è più disponibile. Vai alle impostazioni e sceglierne una nuova</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Cassaforte bloccata durante il caricamento, riapri la cassaforte per continuare</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">La cassaforte specificata per il caricamento automatico non esiste più.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Tocca per aggiornare l\'autenticazione.</string>
 	<string name="notification_open_writable_file_title">Apri file scrivibile</string>
 	<string name="notification_open_writable_file_message">La cassaforte rimane sbloccata fino alla modifica completata</string>
 	<string name="notification_update_check_finished_latest">Ultima versione installata</string>
diff --git a/presentation/src/main/res/values-ja-rJP/strings.xml b/presentation/src/main/res/values-ja-rJP/strings.xml
index 615684d2e..ee47e937c 100644
--- a/presentation/src/main/res/values-ja-rJP/strings.xml
+++ b/presentation/src/main/res/values-ja-rJP/strings.xml
@@ -9,8 +9,8 @@
 	<string name="error_no_network_connection">ネットワーク接続がありません</string>
 	<string name="error_invalid_passphrase">パスワードが正しくありません</string>
 	<string name="error_file_or_folder_exists">ファイルかフォルダーが既に存在します。</string>
-	<string name="error_vault_version_not_supported">金庫のバージョン %1$s はサポートされていません。この金庫は、現在のものより古いか新しいバージョンの Cryptomator で作成されています。</string>
-	<string name="error_vault_config_file_missing_due_to_format_999">%1$s ファイルが金庫のフォルダーに見つかりませんでした。クラウドの金庫フォルダーにこのファイルが存在することをご確認ください。</string>
+	<string name="error_vault_version_not_supported">バージョン %1$s の金庫には対応していません。この金庫は、現在のものより古いか新しいバージョンの Cryptomator で作成されています。</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s ファイルが金庫のフォルダーに見つかりませんでした。クラウドの金庫フォルダーにこのファイルが存在することを確認してください。</string>
 	<string name="error_vault_already_exists">金庫が既に存在します。</string>
 	<string name="error_no_such_file">ファイルが存在しません。</string>
 	<string name="error_vault_has_been_locked">金庫が施錠されました。</string>
@@ -71,11 +71,11 @@
 	<string name="screen_file_browser_create_new_vault_button_text">ここにおく</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">金庫の名前: %1$s</string>
 	<plurals name="screen_file_browser_subtitle_move">
-		<item quantity="other">%2$d アイテムを移動する</item>
+		<item quantity="other">%2$d 件のアイテムを移動</item>
 	</plurals>
 	<string name="screen_file_browser_move_button_text">移動</string>
 	<string name="screen_file_browser_msg_empty_folder">空のフォルダー</string>
-	<string name="screen_file_browser_file_info_label_date">%1$s 前に編集</string>
+	<string name="screen_file_browser_file_info_label_date">%1$s前に編集</string>
 	<string name="screen_file_browser_share_intent_chooser_title">次で共有</string>
 	<string name="screen_file_browser_share_destination_title">保存先を選択</string>
 	<string name="screen_file_browser_share_button_text">選択</string>
@@ -125,7 +125,7 @@
 	<string name="screen_webdav_settings_username_label">ユーザー名</string>
 	<string name="screen_webdav_settings_password_label">パスワード</string>
 	<string name="screen_webdav_settings_done_button_text">接続</string>
-	<string name="screen_webdav_settings_msg_url_must_not_be_empty">URLは空にできません。</string>
+	<string name="screen_webdav_settings_msg_url_must_not_be_empty">URL は空にできません。</string>
 	<string name="screen_webdav_settings_msg_url_is_invalid">URL が無効です。</string>
 	<string name="screen_webdav_settings_msg_username_must_not_be_empty">ユーザー名は空にできません。</string>
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">パスワードは空にできません。</string>
@@ -178,7 +178,7 @@
 	<string name="screen_settings_section_auto_photo_upload_vault">アップロードする金庫を選択</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">有効</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">バックグラウンドで画像を取得し、選択された金庫が解錠されるとアップロードを開始します</string>
-	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">インスタントをアップロード</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">即時アップロード</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">金庫が解錠されているときに直接アップロード</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">WIFI を使用しているときのみアップロード</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">動画をアップロード</string>
@@ -197,6 +197,8 @@
 	<string name="screen_settings_security_label">セキュリティの心得</string>
 	<string name="screen_settings_section_version">バージョン</string>
 	<string name="screen_settings_advanced_settings">高度な設定</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Microsoft のファイルを開くための回避策</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">ファイルを Microsoft アプリから書き込み可能で開く</string>
 	<string name="screen_settings_background_unlock_preparation_label">高速な解錠</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">パスワードまたは生体による認証中に、バックグラウンドで金庫の設定をダウンロードします</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">解錠したままにする</string>
@@ -303,6 +305,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">このモードでは、デバイスのログファイルに機密情報が書き込まれることがあります(例: ファイル名やパス)。パスワードや cookie 等は除外されます。\n\n できるだけ早くデバッグ モードを無効化をすることを忘れないでください。</string>
 	<string name="dialog_debug_mode_disclaimer_title">注意</string>
 	<string name="dialog_debug_mode_positive_button">有効にする</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">このオプションを有効にする場合には以下の挙動を必ずご確認ください。Microsoft アプリのバグを回避するため、編集するファイルはデバイス上の公開メディアフォルダを通してアプリに共有する必要があります。編集を終えて Cryptomator に戻った際に公開メディアフォルダ上のファイルは削除されますが、その間ファイルは他アプリからもアクセス可能なままとなります。本回避策は Microsoft のファイルタイプのみに適用されます。\n\nオプションを有効化した後に Cryptomator は再起動します。</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">この設定は安全のための機能です。他のアプリがユーザーを騙してしまうことを防ぎます。\n\n無効にすることで、 <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">リスクを認識していること</a> に留意する必要があります。</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">注意</string>
 	<string name="dialog_disable_app_obscured_positive_button">無効</string>
@@ -362,8 +365,8 @@
 	<string name="time_unit_seconds_pl">秒</string>
 	<string name="time_unit_minutes_sg">分</string>
 	<string name="time_unit_minutes_pl">分</string>
-	<string name="time_unit_hours_sg">時</string>
-	<string name="time_unit_hours_pl">時</string>
+	<string name="time_unit_hours_sg">時間</string>
+	<string name="time_unit_hours_pl">時間</string>
 	<string name="time_unit_days_sg">日</string>
 	<string name="time_unit_days_pl">日</string>
 	<string name="time_unit_weeks_sg">週</string>
@@ -382,7 +385,7 @@
 	<string name="notification_timeout">%1$s で自動ロック</string>
 	<string name="notification_lock_all">すべて施錠</string>
 	<string name="notification_cancel_auto_upload">アップロードをキャンセル</string>
-	<string name="notification_auto_upload_title">写真を自動的にアップロードしています</string>
+	<string name="notification_auto_upload_title">写真の自動アップロード中</string>
 	<string name="notification_auto_upload_message">アップロード中 %1d/%2d</string>
 	<string name="notification_auto_upload_finished_title">写真の自動アップロードが完了しました</string>
 	<string name="notification_auto_upload_finished_message">%1$d 個の画像を金庫にアップロードしました</string>
@@ -391,9 +394,10 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">アップロード用として選択されたフォルダーを利用できません。設定に移動して新しいフォルダーを選択してください。</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">アップロード中は金庫が施錠されます。続けるには金庫を再度開いてください。</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">自動アップロードに設定された金庫が存在しません。</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">タップして認証を更新します。</string>
 	<string name="notification_open_writable_file_title">書き込み可能なファイルを開く</string>
 	<string name="notification_open_writable_file_message">編集が完了するまで金庫は施錠されます</string>
-	<string name="notification_update_check_finished_latest">最新バージョンがインストールされました</string>
+	<string name="notification_update_check_finished_latest">最新版がインストールされています</string>
 	<string name="notification_authenticating">認証中&#8230;</string>
 	<string name="screen_settings_lru_cache">キャッシュ</string>
 	<string name="screen_settings_lru_cache_toggle_summary">最近アクセスしたファイルを暗号化して端末のローカルにキャッシュし、後で再び開いたときに再利用することができます。</string>
diff --git a/presentation/src/main/res/values-ko-rKR/strings.xml b/presentation/src/main/res/values-ko-rKR/strings.xml
index 9f6dae088..2400549d3 100644
--- a/presentation/src/main/res/values-ko-rKR/strings.xml
+++ b/presentation/src/main/res/values-ko-rKR/strings.xml
@@ -17,19 +17,23 @@
 	<string name="error_cloud_already_exists">클라우드가 이미 존재합니다.</string>
 	<string name="error_activity_not_found">이 파일을 열 수 있는 애플리케이션을 다운로드해주세요.</string>
 	<string name="error_server_not_found">서버를 찾을 수 없습니다</string>
+	<string name="error_device_policy_manager_not_found">장치 설정을 열어 화면 잠금을 직접 설정하세요</string>
 	<string name="error_export_illegal_file_name">내보내기 실패. 파일명에서 특수문자를 없앤 뒤 다시 내보내기를 해보세요.</string>
 	<string name="error_name_contains_invalid_characters">특수문자는 포함할 수 없습니다.</string>
 	<string name="error_names_contains_invalid_characters">파일명에 특수 문자는 포함할 수 없습니다.</string>
 	<string name="error_vault_name_contains_invalid_characters">Vault 이름은 특수문자를 포함할 수 없습니다.</string>
-	<string name="error_general_update">업데이트 확인 실패. 에러가 발생했습니다.</string>
+	<string name="error_general_update">업데이트 확인 실패. 오류가 발생했습니다.</string>
 	<string name="error_hash_mismatch_update">업데이트 확인 실패. 업로드된 파일과 해쉬값이 일치하지 않습니다.</string>
 	<string name="error_update_no_internet">업데이트 확인 실패. 인터넷에 연결되지 않았습니다.</string>
 	<string name="error_failed_to_decrypt_webdav_password">WebDAV 비밀번호를 복호화하는데 실패했습니다. 다시 설정해주세요.</string>
 	<string name="error_play_services_not_available">Google Play 서비스가 설치되지 않았습니다</string>
 	<string name="error_biometric_auth_aborted">생체 인증 취소됨</string>
 	<string name="error_vault_version_mismatch">%1$s에 기록된 버전이 %2$s에 기록된 버전과 다릅니다</string>
+	<string name="error_vault_key_invalid">%1$s 및 이 %2$s 동일하지 않습니다</string>
 	<string name="error_vault_config_loading">Vault 설정을 불러오는 중 에러 발생</string>
+	<string name="error_file_not_found_after_opening_using_3party">로컬 파일은 Cryptomator로 돌아온 후 더 이상 존재하지 않습니다. 추가적인 수정 사항이 클라우드에 적용되지 않습니다.</string>
 	<string name="error_no_such_bucket">해당 버킷을 찾을 수 없습니다.</string>
+	<string name="error_masterkey_location_not_supported">사용자 지정이 가능한 마스터키 경로는 아직 지원하지 않습니다</string>
 	<string name="error_interact_with_fdroid_but_fdroid_missing">F-Droid 앱을 찾을 수 없습니다. 앱을 설치했는지 확인해주세요.</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
@@ -66,6 +70,9 @@
 	<string name="screen_file_browser_add_existing_vault_extra_text">마스터키 파일 선택</string>
 	<string name="screen_file_browser_create_new_vault_button_text">여기에 만들기</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">Vault 이름: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="other">%2$d 이동 위치</item>
+	</plurals>
 	<string name="screen_file_browser_move_button_text">이동</string>
 	<string name="screen_file_browser_msg_empty_folder">빈 폴더</string>
 	<string name="screen_file_browser_file_info_label_date">%1$s 전 변경됨</string>
@@ -102,6 +109,7 @@
 	<string name="screen_share_files_content_text">텍스트</string>
 	<string name="screen_share_files_content_file">파일</string>
 	<string name="screen_share_files_content_files">파일</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">파일 이름은 유일해야 합니다, 중복된 이름을 변경하세요.</string>
 	<string name="screen_share_files_section_location">저장 위치</string>
 	<string name="screen_share_files_save_button_text">저장</string>
 	<string name="screen_share_files_msg_success">암호화 완료</string>
@@ -109,7 +117,9 @@
 	<string name="screen_choose_cloud_service_title">클라우드 서비스</string>
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">위치 선택</string>
+	<string name="screen_cloud_connections_no_connections">여기를 탭하여 경로 위치 추가</string>
 	<string name="screen_cloud_error_webdav_not_supported">WebDAV가 지원되지 않는 서버입니다</string>
+	<string name="screen_cloud_local_error_no_content_provider">디렉토리를 열 수 있는 파일 관리자를 찾을 수 없습니다</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">사용자명</string>
@@ -123,11 +133,13 @@
 	<string name="screen_s3_settings_display_name_label">표시 이름</string>
 	<string name="screen_s3_settings_access_key_label">액세스 키</string>
 	<string name="screen_s3_settings_secret_key_label">비밀키</string>
+	<string name="screen_s3_settings_bucket_label">이미 존재하는 버킷</string>
 	<string name="screen_s3_settings_endpoint_label">엔드포인트</string>
 	<string name="screen_s3_settings_region_label">지역</string>
 	<string name="screen_s3_settings_msg_display_name_not_empty">표시 이름은 비워둘 수 없습니다</string>
 	<string name="screen_s3_settings_msg_access_key_not_empty">액세스 키를 입력해주세요</string>
 	<string name="screen_s3_settings_msg_secret_key_not_empty">비밀 키를 입력해주세요</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">버킷은 비어있을 수 없습니다</string>
 	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">엔드포인트 또는 지역은 비워둘 수 없습니다</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">Vault 이름을 입력해주세요.</string>
@@ -151,6 +163,7 @@
 	<string name="screen_settings_activate_biometric_auth">생체 인증 활성화</string>
 	<string name="screen_settings_confirm_face_unlock">얼굴인식 잠금해제 적용 (가능한 경우)</string>
 	<string name="screen_settings_block_app_when_obscured">타 앱이 화면을 가릴 경우 Cryptomator 비활성화</string>
+	<string name="screen_settings_block_app_when_obscured_summary">입력을 가로채는 것을 막고 가장된 유저 인터페이스를 표시합니다</string>
 	<string name="screen_settings_secure_screen">스크린샷 차단</string>
 	<string name="screen_settings_secure_screen_summary">최근 사용 목록과 앱 내부에서 스크린샷 차단</string>
 	<string name="screen_settings_section_search">검색</string>
@@ -164,10 +177,12 @@
 	<string name="screen_settings_section_auto_photo_upload">사진 자동 업로드</string>
 	<string name="screen_settings_section_auto_photo_upload_vault">업로드 할 Vault 선택</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">활성화</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">백그라운드에서 사진을 감지하고, 선택된 Vault가 잠금 해제될 시 업로드를 시작합니다</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">바로 업로드하기</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Vault가 잠금 해제되어 있을 때 바로 업로드하기</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Wi-Fi 상태에서만 업로드</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">동영상 업로드</string>
+	<string name="screen_settings_auto_photo_upload_title">자동 업로드 대상 파일 저장 위치&#8230;</string>
 	<string name="screen_settings_website_label">Cryptomator 웹사이트</string>
 	<string name="screen_settings_twitter_label">Twitter에서 팔로우하기</string>
 	<string name="screen_settings_facebook_label">Facebook에서 좋아요 누르기</string>
@@ -182,8 +197,12 @@
 	<string name="screen_settings_security_label">보안 힌트</string>
 	<string name="screen_settings_section_version">버전</string>
 	<string name="screen_settings_advanced_settings">고급 설정</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Microsoft 파일 열람을 시도하기</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">파일을 쓰기 권한과 함께 Microsoft 앱에서 열람합니다</string>
 	<string name="screen_settings_background_unlock_preparation_label">잠금해제 가속</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">비밀번호 입력 혹은 생체 인증을 진행하는 동안 백그라운드에서 Vault 설정을 다운로드합니다</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">잠금해제유지</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">파일을 편집하는 동안 Vault들을 잠금 해제 상태로 유지</string>
 	<!-- ## screen: cloud settings -->
 	<string name="screen_cloud_settings_onedrive_connections">OneDrive 연결</string>
 	<string name="screen_cloud_settings_webdav_connections">WebDAV 연결</string>
@@ -194,14 +213,21 @@
 	<string name="screen_cloud_settings_sign_out_from_cloud">로그아웃</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s 인증할 수 없습니다.</string>
 	<string name="screen_update_pcloud_connections_title">pCloud 자격증명 업데이트</string>
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">Cryptomator 종류</string>
 	<string name="screen_cryptomator_variants_lite_title">주 F-Droid 리포지토리</string>
 	<string name="screen_cryptomator_variants_lite_description">API키가 필요하므로 제외되었습니다.</string>
 	<string name="screen_cryptomator_variants_lite_install">설치</string>
 	<string name="screen_cryptomator_variants_fdroid_title">Cryptomator F-Droid 리포지토리</string>
+	<string name="screen_cryptomator_variants_fdroid_description">독점 의존성을 가지고 있어 제외되었습니다.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">F-Droid 앱에 Cryptomator 레포지토리를 추가합니다.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo">추가</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">F-Droid로 Cryptomator를 설치합니다.\n만약 찾을 수 없음 오류가 표시된다면, F-Droid 동기화가 완료될 시점까지 기다리세요.</string>
 	<string name="screen_cryptomator_variants_website_title">웹사이트</string>
+	<string name="screen_cryptomator_variants_website_description">독점 의존성을 포함합니다.</string>
+	<string name="screen_cryptomator_variants_installation_hint">F-Droid 레포지토리 판과 상호 전환하려면 앱의 완전한 재설정이 필요합니다.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">취소</string>
 	<string name="dialog_enter_password_positive_button">잠금해제</string>
@@ -222,6 +248,9 @@
 	<string name="dialog_replace_positive_button_all_files_exist">모두 바꾸기</string>
 	<string name="dialog_replace_positive_button_some_files_exist">중복 파일 덮어쓰기</string>
 	<string name="dialog_replace_positive_button_single_file_exists">교체</string>
+	<string name="dialog_replace_msg_single_file_exists">\'%1$s\' 이름을 가진 파일이 이미 존재합니다. 덮어쓸까요?</string>
+	<string name="dialog_replace_msg_all_files_exists">기존의 파일들이 이미 모두 존재합니다. 덮어쓸까요?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d 파일들이 이미 존재합니다. 덮어쓸까요?</string>
 	<string name="dialog_replace_title_single_file_exists">파일을 덮어쓰겠습니까?</string>
 	<string name="dialog_replace_title_multiple_files_exist">파일을 덮어쓰겠습니까?</string>
 	<string name="dialog_unable_to_share_title">파일을 공유할 수 없습니다</string>
@@ -239,12 +268,15 @@
 	<string name="dialog_file_name_hint">파일명</string>
 	<string name="dialog_file_name_placeholder">text.txt</string>
 	<string name="dialog_delete_vault_message">이 Vault를 정말로 제거하시겠습니까?</string>
+	<string name="dialog_delete_vault_hint">이 동작은 Vault를 이 리스트에서만 제거하며, 실제로 삭제하지는 않습니다.</string>
 	<string name="dialog_upload_file_title">&#8230; 업로드 중</string>
+	<string name="dialog_upload_file_remaining">파일 %2$d 중 %1$d</string>
 	<string name="dialog_export_file_title">내보내는중 (%1$d/%2$d)</string>
 	<string name="dialog_progress_please_wait">잠시 기다려주세요&#8230;</string>
 	<string name="dialog_progress_creating_folder">폴더 만드는 중&#8230;</string>
 	<string name="dialog_progress_creating_text_file">텍스트 파일 만드는 중&#8230;</string>
 	<string name="action_progress_authentication">인증 중&#8230;</string>
+	<string name="action_progress_renaming">이름 변경 중&#8230;</string>
 	<string name="action_progress_deleting">삭제 중&#8230;</string>
 	<string name="dialog_progress_unlocking_vault">Vault 잠금해제 중&#8230;</string>
 	<string name="dialog_progress_change_password">비밀번호 변경 중&#8230;</string>
@@ -259,36 +291,60 @@
 	<string name="dialog_accept_ssl_certificate_hint">SSL 인증서가 유효하지 않습니다. 인증서를 신뢰하고 계속 진행하겠습니까?</string>
 	<string name="dialog_accept_ssl_certificate_details">세부정보</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">이는 보안 문제를 야기할 수 있습니다. 나는 지금 나의 행동을 이해합니다.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">배터리 사용량 최적화 비활성화</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">백그라운드에서 실행하지 않고 새로운 사진과 영상을 가져오려면, 배터리 사용량 최적화에서 제외해야 합니다. 하지만 걱정하지 마세요, %1$s 많은 에너지를 소모하지 않습니다.\n\n적용하려면, 이 다이얼로그에서 \'%2$s\' 누른 후에 \'최적화되지 않음\'을 \'모든 앱\'으로 변경하고, %1$s 선택하여 \'최적화되지 않음\'을 고르세요.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">다시 묻지 않기</string>
 	<string name="dialog_http_security_hint">HTTP 사용은 안전하지 않습니다. HTTPS 사용을 권장합니다. HTTP 사용으로 야기될 문제를 숙지하고 있다면, HTTP를 사용할 수 있습니다.</string>
 	<string name="dialog_http_security_checkbox">HTTPS로 변경</string>
 	<string name="dialog_http_security_title">HTTPS를 사용하겠습니가?</string>
 	<string name="dialog_no_screen_lock_hint">화면 잠금 설정이 되어있지 않습니다. 자격증명을 안전하게 보호하기 위해 패턴이나 비밀번호를 설정하세요.</string>
 	<string name="dialog_no_screen_lock_title">화면 잠금 설정을 하시겠습니까?</string>
 	<string name="dialog_no_screen_lock_checkbox">화면 잠금 설정</string>
+	<string name="dialog_no_biometric_auth_set_up_title">시스템에 기본 인증이 설정되지 않았습니다</string>
+	<string name="dialog_no_biometric_auth_set_up_message">이 서비스를 사용하려면 최소한 하나의 지문/얼굴을 등록하세요.</string>
 	<string name="dialog_debug_mode_disclaimer_hint">이 모드에서는 민감한 정보들이 로그 파일로 기기에 기록될 수 있습니다.(파일명, 경로 등). 비밀번호, 쿠키 등의 정보는 예외입니다.\n\n 가능한 디버그 모드를 빨리 비활성화 하세요.</string>
 	<string name="dialog_debug_mode_disclaimer_title">주의</string>
 	<string name="dialog_debug_mode_positive_button">활성화</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Microsoft 앱의 버그로 인해, 편집할 파일이 장치의 공개 미디어 폴더에서 공유되어야 합니다. Cryptomator의 실행이 재개되면 이 공개 접근이 가능한 파일은 다시 삭제되나, Cryptomator는 해당 파일에 어떠한 일이 일어났는지 알 수 없습니다. 이 항목을 활성화할 경우 이러한 동작이 일어남을 숙지하세요. 이것은 Microsoft 파일 형식에만 적용됩니다. \n\n활성화 후 Cryptomator를 다시 시작합니다.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">이 설정은 보안 기능이며 다른 앱들이 사용자가 원하지 않는 행동을 하도록 속이는 것을 방지합니다.\n\n비활성화한다면, <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">위험성에 대해</a> 동의하는 것입니다.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">주의</string>
 	<string name="dialog_disable_app_obscured_positive_button">비활성화</string>
+	<string name="dialog_app_is_obscured_info_title">앱이 가려짐</string>
+	<string name="dialog_app_is_obscured_info_hint">다른 앱이 Cryptomator 위에 무언가를 표시하고 있습니다 (예: 블루 라이트 필터 혹은 야간 모드 앱 등). 보안을 위해, Cryptomator가 비활성화 되었습니다.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">Cryptomator를 활성화하는 방법</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">닫기</string>
+	<string name="dialog_vaults_removed_during_migration_title">Vault들을 %1s 클라우드를 사용하기 위해 다시 추가해야 함</string>
+	<string name="dialog_vaults_removed_during_migration_hint">이 버전의 앱으로 전환하기 위해 다음의 Vault들을 앱에서 제거해야 합니다:\n%2s \n\n이 Vault 들은 클라우드가 아닌 이 앱에서만 제거됩니다. 계속 사용하기 위해 이 Vault들을 다시 추가하세요.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Vault가 클라우드의 최상위 폴더임</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">이 Vault를 추가하려면, 최소한 이 Vault의 최상위 디렉토리 폴더의 상위 폴더에 새로운 클라우드 연결을 생성해야 합니다.</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">이 설정은 보안 기능이며 다른 앱들이 사용자가 원하지 않는 행동을 하도록 속이는 것을 방지합니다.\n\n비활성화한다면, <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">위험성에 대해</a> 동의하는 것입니다.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">정말 이 클라우드 연결을 삭제하시겠습니까?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">클라우드 연결과 이 클라우드의 Vault들이 삭제될 것입니다.</string>
 	<string name="dialog_confirm_delete_multiple_title">%1$d개의 파일을 삭제하시겠습니까?</string>
 	<string name="dialog_confirm_delete_multiple_message">정말 이 파일들을 삭제하시겠습니까?</string>
 	<string name="dialog_confirm_delete_file_message">정말 이 파일을 삭제하시겠습니까?</string>
+	<string name="dialog_confirm_delete_folder_message">폴더의 모든 하위 항목들을 삭제합니다. 그래도 이 폴더를 삭제할까요?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">생체 인증 기능이 비활성화됨</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">키가 유효하지 않게 되어, 생체 인증 기능이 비활성화 되었습니다. 다시 활성화하려면 Cryptomator 설정을 여세요.</string>
 	<string name="dialog_enter_license_title">유효한 라이선스를 입력하세요</string>
 	<string name="dialog_enter_license_content">Google Play 스토어를 이용하지 않고 Cryptomator가 설치되었음을 감지했습니다. 유효한 라이선스를 입력해주세요. 라이선스는 <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a>에서 구매가능합니다.</string>
 	<string name="dialog_enter_license_not_valid_content">입력된 라이선스는 유효하지 않습니다. 다시한번 확인해주세요.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">제공된 키는 데스크톱 판의 서포터 인증서입니다. 유효한 라이선스를 입력하세요.</string>
 	<string name="dialog_enter_license_no_content">라이선스가 입력되지 않았습니다. 유효한 라이선스를 입력해주세요.</string>
 	<string name="dialog_enter_license_decline_button">종료</string>
 	<string name="dialog_license_confirmation_title">라이선스 확인</string>
+	<string name="dialog_license_confirmation_message">%1$s님, 유효한 라이선스를 사용해 주셔서 감사합니다.</string>
 	<string name="dialog_update_available_title">업데이트가 출시되었습니다</string>
+	<string name="dialog_update_available_message">Cryptomator을 최신 버전으로 업데이트합니다. OK를 누르면 백그라운드에서 앱을 다운로드하고 설치를 요청합니다.</string>
 	<string name="dialog_update_available_update">지금 업데이트 하기</string>
 	<string name="dialog_update_available_download_site">다운로드 페이지로 가기</string>
 	<string name="dialog_update_available_cancel">다음에 하기</string>
 	<string name="dialog_download_update_title">다운로드중</string>
 	<string name="dialog_download_update_message">최신 버전의 Cryptomator 다운로드중</string>
+	<string name="dialog_sym_link_title">폴더가 심볼릭 링크임</string>
+	<string name="dialog_sym_link_message">이 심볼릭 링크를 탐색할 수 없습니다</string>
 	<string name="dialog_sym_link_back_button">이전</string>
+	<string name="dialog_no_dir_file_title">디렉토리의 내용을 불러올 수 없음</string>
+	<string name="dialog_no_dir_file_message">클라우드 폴더 \'%1$s\'에 유효한 디렉토리 파일이 없습니다. 이 폴더가 다른 장치에서 생성되었으며 클라우드에 아직 완전히 동기화가 되지 않았을 가능성이 있습니다. 다음 파일이 클라우드에 존재하고 비어있지 않은지 확인하세요:\n%2$s</string>
 	<string name="dialog_no_more_images_to_display">더 띄울 사진들이 없습니다.</string>
 	<string name="dialog_pcloud_credentials_updated_title">\'%1$s\' 자격증명 업데이트됨</string>
 	<string name="dialog_pcloud_credentials_updated">새 pCloud 계정을 추가하려면 이 링크 <a href="https://www.pcloud.com">www.pcloud.com</a>를 누르고, 현재 계정에서 로그아웃한 뒤 여기에서 \'+\'를 다시 눌러서 추가해주세요.</string>
@@ -338,6 +394,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">선택한 폴더로 더이상 업로드할 수 없습니다. 설정에서 새로 선택해주세요.</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">업로드중에 vault가 잠겼습니다. 해당 vault를 다시 열어주세요.</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">자동 업로드를 할 vault가 더이상 존재하지 않습니다.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">탭하여 인증을 다시 시도하세요.</string>
 	<string name="notification_open_writable_file_title">쓰기 가능한 파일 열림</string>
 	<string name="notification_open_writable_file_message">파일 수정이 완료될 때까지 Vault가 계속 잠금해제됩니다</string>
 	<string name="notification_update_check_finished_latest">최신 버전 설치됨</string>
@@ -354,6 +411,7 @@
 	<string name="screen_settings_last_check_updates">마지막 확인 %1$s</string>
 	<string name="dialog_cache_size_title">클라우드당 캐시 크기</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">즉시</string>
 	<string name="lock_timeout_1m">1분</string>
 	<string name="lock_timeout_2m">2분</string>
 	<string name="lock_timeout_5m">5분</string>
diff --git a/presentation/src/main/res/values-mk-rMK/strings.xml b/presentation/src/main/res/values-mk-rMK/strings.xml
index 02ca5ecd2..28b174773 100644
--- a/presentation/src/main/res/values-mk-rMK/strings.xml
+++ b/presentation/src/main/res/values-mk-rMK/strings.xml
@@ -6,9 +6,11 @@
 	<!-- ## cloud names -->
 	<!-- # permission -->
 	<!-- ## permission messages -->
+	<string name="snack_bar_action_title_search_next">Продолжи</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
 	<!-- # screen: file browser -->
+	<string name="screen_file_browser_default_title">Сеф</string>
 	<!-- ## screen: text editor -->
 	<!-- ## screen: share files -->
 	<!-- ## screen: choose cloud service -->
@@ -17,13 +19,19 @@
 	<!-- ## screen: s3 settings -->
 	<!-- ## screen: enter vault name -->
 	<!-- ## screen: set password -->
+	<string name="screen_set_password_button_text">Прифати</string>
 	<!-- ## screen: settings -->
 	<!-- ## screen: cloud settings -->
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
 	<!-- ## screen: cryptomator app variants -->
 	<!-- # dialogs -->
+	<string name="dialog_button_cancel">Откажи</string>
+	<string name="dialog_enter_password_positive_button">Отклучи</string>
 	<!-- Vault not found -->
+	<string name="dialog_lock_vault">Заклучи</string>
+	<string name="dialog_app_is_obscured_info_neutral_button">Затвори</string>
+	<string name="dialog_sym_link_back_button">Назад</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
diff --git a/presentation/src/main/res/values-mr-rIN/strings.xml b/presentation/src/main/res/values-mr-rIN/strings.xml
new file mode 100644
index 000000000..02ca5ecd2
--- /dev/null
+++ b/presentation/src/main/res/values-mr-rIN/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- # app -->
+	<!-- # error messages -->
+	<!-- # clouds -->
+	<!-- ## cloud names -->
+	<!-- # permission -->
+	<!-- ## permission messages -->
+	<!-- # screens -->
+	<!-- # screen: vault list -->
+	<!-- # screen: file browser -->
+	<!-- ## screen: text editor -->
+	<!-- ## screen: share files -->
+	<!-- ## screen: choose cloud service -->
+	<!-- ## screen: cloud connections -->
+	<!-- ## screen: webdav settings -->
+	<!-- ## screen: s3 settings -->
+	<!-- ## screen: enter vault name -->
+	<!-- ## screen: set password -->
+	<!-- ## screen: settings -->
+	<!-- ## screen: cloud settings -->
+	<!-- ## screen: licenses -->
+	<!-- ## screen: authenticate cloud -->
+	<!-- ## screen: cryptomator app variants -->
+	<!-- # dialogs -->
+	<!-- Vault not found -->
+	<!-- # error reports -->
+	<!-- # misc -->
+	<!-- ## file size helper -->
+	<!-- ## date helper -->
+	<!-- ## biometric authentication -->
+	<!-- notification -->
+	<!-- lock timeout names -->
+	<!-- cache size names -->
+	<!-- screen scheme mode names -->
+	<!-- update interval names -->
+</resources>
diff --git a/presentation/src/main/res/values-nb-rNO/strings.xml b/presentation/src/main/res/values-nb-rNO/strings.xml
index 593df4296..1f54449d8 100644
--- a/presentation/src/main/res/values-nb-rNO/strings.xml
+++ b/presentation/src/main/res/values-nb-rNO/strings.xml
@@ -198,12 +198,14 @@
 	<string name="screen_settings_security_label">Sikkerhetstips</string>
 	<string name="screen_settings_section_version">Versjon</string>
 	<string name="screen_settings_advanced_settings">Avanserte innstillinger</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">En mulig løsning for å åpne Microsoft-filer</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Åpne filer i Microsoft-apper med skrivetilgang</string>
 	<string name="screen_settings_background_unlock_preparation_label">Akselerer opplåsing</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Last ned hvelvkonfigurasjonen i bakgrunnen mens du blir bedt om å skrive inn passord eller biometrisk autentisering</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Behold ulåst</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Beholdt hvelvet opplåst mens du redigerer filer</string>
 	<!-- ## screen: cloud settings -->
-	<string name="screen_cloud_settings_onedrive_connections">OneDrive tilkoblinger</string>
+	<string name="screen_cloud_settings_onedrive_connections">OneDrive-tilkoblinger</string>
 	<string name="screen_cloud_settings_webdav_connections">WebDAV-tilkoblinger</string>
 	<string name="screen_cloud_settings_pcloud_connections">pCloud-tilkoblinger</string>
 	<string name="screen_cloud_settings_s3_connections">S3 tilkoblinger</string>
@@ -304,6 +306,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">I denne modusen kan sensitive data skrives til en loggfil på enheten (f.eks. filnavn og stier). Passord, cookies, etc. er eksplisitt ekskludert.\n\nHusk å deaktivere feilsøkingsmodus så snart som mulig.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Merk følgende</string>
 	<string name="dialog_debug_mode_positive_button">Aktiver</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">På grunn av en feil i Microsoft apper, filen som skal redigeres, må deles med disse appene i en offentlig mediemappe på enheten din. Når Cryptomator er gjenopptatt, slettes den offentlig tilgjengelige filen igjen, men Cryptomator kan ikke påvirke hva som har skjedd i mellomtiden. Pass på at du er klar over denne adferden når du aktiverer dette alternativet. Dette gjelder bare for Microsoft-filtyper.\n\nCryptomator starter på nytt etter aktivering.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Denne innstillingen er en sikkerhetsfunksjonalitet som hindrer andre app\'er fra å lure brukerne til å gjøre ting de ikke vil.\n\nVed å skru dette av, bekrefter du at du er <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">klar over risikoen</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Merk følgende</string>
 	<string name="dialog_disable_app_obscured_positive_button">Deaktiver</string>
@@ -392,6 +395,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Valgte mappe for opplasting er ikke tilgjengelig lenger. Gå til innstillinger og velg en ny</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Hvelvet ble låst under opplasting, åpne hvelvet på nytt for å fortsette</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Det angitte hvelvet for automatisk opplasting eksisterer ikke lenger.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Trykk for å oppdatere autentiseringen.</string>
 	<string name="notification_open_writable_file_title">Åpne skrivbar fil</string>
 	<string name="notification_open_writable_file_message">Hvelvet forblir opplåst til redigeringen er ferdig</string>
 	<string name="notification_update_check_finished_latest">Siste versjon er installert</string>
diff --git a/presentation/src/main/res/values-nl-rNL/strings.xml b/presentation/src/main/res/values-nl-rNL/strings.xml
index 6700c7c8e..3e7886e88 100644
--- a/presentation/src/main/res/values-nl-rNL/strings.xml
+++ b/presentation/src/main/res/values-nl-rNL/strings.xml
@@ -395,7 +395,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Geselecteerde map voor uploaden is niet meer beschikbaar. Ga naar instellingen en kies een nieuwe</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Kluis vergrendeld tijdens het uploaden, heropen de kluis om door te gaan</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">De gekozen kluis voor automatische upload bestaat niet meer.</string>
-	<string name="notification_auto_upload_failed_due_to_authentication_problem">Tik om de authenticatie te vernieuwen.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Aantikken om de authenticatie te vernieuwen.</string>
 	<string name="notification_open_writable_file_title">Open schrijfbaar bestand</string>
 	<string name="notification_open_writable_file_message">Kluis blijft ontgrendeld tot het bewerken voltooid is</string>
 	<string name="notification_update_check_finished_latest">Laatste versie geïnstalleerd</string>
diff --git a/presentation/src/main/res/values-pl-rPL/strings.xml b/presentation/src/main/res/values-pl-rPL/strings.xml
index d557ddfba..6b3e13bc3 100644
--- a/presentation/src/main/res/values-pl-rPL/strings.xml
+++ b/presentation/src/main/res/values-pl-rPL/strings.xml
@@ -200,6 +200,8 @@
 	<string name="screen_settings_security_label">Wskazówki bezpieczeństwa</string>
 	<string name="screen_settings_section_version">Wersja</string>
 	<string name="screen_settings_advanced_settings">Ustawienia zaawansowane</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Otwieranie plików Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Otwórz pliki w aplikacjach firmy Microsoft z uprawnieniami do zapisu</string>
 	<string name="screen_settings_background_unlock_preparation_label">Przyspiesz odblokowanie</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Pobierz konfigurację sejfu w tle, gdy zostaniesz poproszony o wprowadzenie hasła lub autoryzację biometryczną</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Zachowaj odblokowany</string>
@@ -306,6 +308,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">W tym trybie poufne dane mogą być zapisywane do pliku dziennika na urządzeniu (np. nazwy plików i ścieżki). Hasła, ciasteczka itp. są wykluczone.\n\nPamiętaj, aby wyłączyć tryb debugowania tak szybko, jak to możliwe.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Uwaga</string>
 	<string name="dialog_debug_mode_positive_button">Włącz</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Z powodu błędu w aplikacjach firmy Microsoft, plik do edycji musi być udostępniony tym aplikacjom w folderze mediów publicznych na Twoim urządzeniu. Po wznowieniu działania Cryptomator ponownie usuwa publicznie dostępny plik, ale Cryptomator nie może wpływać na to, co w międzyczasie stało się z tym plikiem. Upewnij się, że jesteś świadomy tego zachowania podczas aktywowania tej opcji. To będzie dotyczyć tylko typów plików firmy Microsoft.\n\nCryptomator uruchomi się ponownie po aktywacji.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">To ustawienie jest funkcją bezpieczeństwa i uniemożliwia innym aplikacjom oszukiwanie użytkowników.\n\nWyłączając je potwierdzasz, że jesteś <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">świadomy ryzyka</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Uwaga</string>
 	<string name="dialog_disable_app_obscured_positive_button">Wyłącz</string>
@@ -394,6 +397,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Wybrany folder do przesłania nie jest już dostępny. Przejdź do ustawień i wybierz nowy</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Sejf został zablokowany podczas przesyłania, otwórz go ponownie aby kontynuować</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Sejf wybrany do automatycznego wysyłania już nie istnieje.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Dotknij, aby odświeżyć uwierzytelnianie.</string>
 	<string name="notification_open_writable_file_title">Otwórz plik zapisywalny</string>
 	<string name="notification_open_writable_file_message">Sejf pozostaje odblokowany do czasu zakończenia edycji</string>
 	<string name="notification_update_check_finished_latest">Zainstalowano najnowszą wersję</string>
diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml
index 59c6f7556..258352634 100644
--- a/presentation/src/main/res/values-pt-rBR/strings.xml
+++ b/presentation/src/main/res/values-pt-rBR/strings.xml
@@ -32,7 +32,7 @@
 	<string name="error_vault_key_invalid">%1$s não coincide com este %2$s</string>
 	<string name="error_vault_config_loading">Erro geral ao carregar a configuração do cofre</string>
 	<string name="error_file_not_found_after_opening_using_3party">O arquivo local não está mais presente depois de voltar ao Cryptomator. Possíveis alterações não podem ser propagadas de volta para o provedor de nuvem.</string>
-	<string name="error_no_such_bucket">Não existe tal bucket no nome de domínio</string>
+	<string name="error_no_such_bucket">Bucket não encontrado</string>
 	<string name="error_masterkey_location_not_supported">Localização de Masterkey personalizada ainda não é suportada</string>
 	<string name="error_interact_with_fdroid_but_fdroid_missing">Falha na comunicação com o aplicativo F-Droid. Ele está instalado?</string>
 	<!-- # clouds -->
@@ -132,16 +132,16 @@
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">A senha não pode estar vazia.</string>
 	<!-- ## screen: s3 settings -->
 	<string name="screen_s3_settings_display_name_label">Nome de Exibição</string>
-	<string name="screen_s3_settings_access_key_label">Chave de acesso</string>
+	<string name="screen_s3_settings_access_key_label">Chave de Acesso</string>
 	<string name="screen_s3_settings_secret_key_label">Chave Secreta</string>
-	<string name="screen_s3_settings_bucket_label">Bucket do nome de domínio na URL existente</string>
+	<string name="screen_s3_settings_bucket_label">Bucket existente</string>
 	<string name="screen_s3_settings_endpoint_label">Endpoint</string>
 	<string name="screen_s3_settings_region_label">Região</string>
-	<string name="screen_s3_settings_msg_display_name_not_empty">O nome de exibição não pode estar em branco</string>
-	<string name="screen_s3_settings_msg_access_key_not_empty">Chave de acesso não pode estar em branco</string>
-	<string name="screen_s3_settings_msg_secret_key_not_empty">A chave secreta não pode estar em branco</string>
-	<string name="screen_s3_settings_msg_bucket_not_empty">Bucket do nome de domínio da URL não pode estar em branco</string>
-	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Endpoint ou Região não pode estar em branco</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Nome de Exibição não pode estar vazio</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Chave de Acesso não pode estar vazia</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Chave Secreta não pode estar vazia</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Bucket não pode estar vazio</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Endpoint e Região não podem estar vazios</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">O nome do cofre não pode estar em branco.</string>
 	<string name="screen_enter_vault_name_vault_label">Nome do cofre</string>
@@ -149,7 +149,7 @@
 	<!-- ## screen: set password -->
 	<string name="screen_set_password_title">Definir senha</string>
 	<string name="screen_set_password_msg_password_mismatch">A senha não coincide com a senha digitada.</string>
-	<string name="screen_set_password_button_text">Pronto</string>
+	<string name="screen_set_password_button_text">Concluído</string>
 	<string name="screen_set_password_hint">IMPORTANTE: Se você esquecer sua senha, não há como recuperar seus dados.</string>
 	<string name="screen_set_password_retype_password_label">Redigite a senha</string>
 	<string name="screen_set_password_strength_indicator_0">Senha muito fraca para criar um cofre</string>
@@ -180,7 +180,7 @@
 	<string name="screen_settings_section_auto_photo_upload_toggle">Ativar</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capture imagens em segundo plano e assim que o cofre selecionado for desbloqueado, inicie o upload</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Upload instantâneo</string>
-	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Envie diretamente se o cofre estiver desbloqueado</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Enviar imediatamente se o cofre estiver desbloqueado</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Fazer upload apenas usando o WIFI</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Upload de vídeos</string>
 	<string name="screen_settings_auto_photo_upload_title">Salvar upload automático de arquivos em&#8230;</string>
@@ -291,11 +291,11 @@
 	<string name="dialog_accept_ssl_certificate_title">Certificado SSL inválido</string>
 	<string name="dialog_accept_ssl_certificate_hint">O certificado SSL é inválido. Deseja confiar nele mesmo assim?</string>
 	<string name="dialog_accept_ssl_certificate_details">Detalhes</string>
-	<string name="dialog_accept_ssl_certificate_security_checkbox">Isto pode ser um risco para a segurança. Eu sei o que estou fazendo.</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Isto pode ser um risco de segurança. Eu sei o que estou fazendo.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_title">Desativar otimizações de bateria</string>
 	<string name="dialog_ask_ignore_battery_optimizations_hint">Para recuperar novas fotos e vídeos sem executar em segundo plano, precisamos desativar as otimizações de bateria. Mas não se preocupe, %1$s não consome muita energia.\n\nPara aplicar, altere \'Não otimizado\' para \'Todos os aplicativos\', selecione %1$s e escolha \'Não otimizar\' depois de tocar \'%2$s\' nesta caixa de diálogo.</string>
-	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Não pergunte novamente</string>
-	<string name="dialog_http_security_hint">O uso de HTTP é inseguro. Recomendamos a utilização de HTTPS. Se você souber os riscos, você pode continuar com o HTTP.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Não perguntar novamente?</string>
+	<string name="dialog_http_security_hint">O uso de HTTP é inseguro. Recomendamos utilizar HTTPS. Se você conhecer os riscos, pode continuar com HTTP.</string>
 	<string name="dialog_http_security_checkbox">Mudar para HTTPS</string>
 	<string name="dialog_http_security_title">Usar HTTPS?</string>
 	<string name="dialog_no_screen_lock_hint">Nenhum bloqueio de tela foi configurado. Para armazenar suas credenciais de forma segura, configure com OK um padrão ou senha.</string>
@@ -310,10 +310,10 @@
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Esta configuração é um recurso de segurança e impede que outros aplicativos induzam os usuários a fazer coisas que não devem fazer.\n\nAo desativar, você confirma que está <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">ciente dos riscos</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Atenção</string>
 	<string name="dialog_disable_app_obscured_positive_button">Desabilitar</string>
-	<string name="dialog_app_is_obscured_info_title">O aplicativo está escuro</string>
-	<string name="dialog_app_is_obscured_info_hint">Outro aplicativo está exibindo algo no topo do Cryptomator (por exemplo, um filtro de luz azul ou aplicativo de modo noturno). Por razões de segurança, o Cryptomator está desativado.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">Como ativar o Cryptomator</a></string>
+	<string name="dialog_app_is_obscured_info_title">O aplicativo está obscurecido</string>
+	<string name="dialog_app_is_obscured_info_hint">Outro aplicativo está exibindo algo sobre o Cryptomator (por exemplo, um filtro de luz azul ou aplicativo de modo noturno). Por motivo de segurança, o Cryptomator está desativado.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">Como ativar o Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Fechar</string>
-	<string name="dialog_vaults_removed_during_migration_title">Por favor, readicione cofres para %1s nuvem</string>
+	<string name="dialog_vaults_removed_during_migration_title">Por favor, readicione cofres para a nuvem %1s</string>
 	<string name="dialog_vaults_removed_during_migration_hint">Durante a migração para esta versão do aplicativo, precisamos remover os seguintes cofres do aplicativo:\n%2s \n\nEsses cofres não são removidos da nuvem, mas apenas deste aplicativo. Desculpe o incômodo e por favor adicione novamente estes cofres para continuar a trabalhar com eles.</string>
 	<string name="dialog_vault_is_root_folder_of_cloud_title">O cofre é a pasta raiz da conexão com a nuvem</string>
 	<string name="dialog_vault_is_root_folder_of_cloud_hint">Crie uma nova conexão com a nuvem onde você seleciona pelo menos a pasta principal desta pasta de cofre como o diretório raiz para adicionar este cofre.</string>
@@ -326,7 +326,7 @@
 	<string name="dialog_confirm_delete_folder_message">Isto irá apagar todo o conteúdo da pasta. Tem certeza que deseja excluir esta pasta?</string>
 	<string name="dialog_biometric_auth_key_invalidated_title">Recurso de autenticação biométrica desativado</string>
 	<string name="dialog_biometric_auth_key_invalidated_message">Como a chave foi invalidada, o recurso de autenticação biométrica foi desativado. Para reativar, abra as configurações do Cryptomator.</string>
-	<string name="dialog_enter_license_title">Fornecer uma licença válida</string>
+	<string name="dialog_enter_license_title">Forneça uma licença válida</string>
 	<string name="dialog_enter_license_content">Nós detectamos que você instalou o Cryptomator sem usar a Google Play Store. Forneça uma licença válida, que pode ser comprada em <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
 	<string name="dialog_enter_license_not_valid_content">A licença fornecida não é válida. Verifique se você digitou corretamente.</string>
 	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">A chave fornecida é um certificado de suporte da área de trabalho. Por favor, insira uma licença válida.</string>
@@ -371,14 +371,14 @@
 	<string name="time_unit_days_sg">dia</string>
 	<string name="time_unit_days_pl">dias</string>
 	<string name="time_unit_weeks_sg">semana</string>
-	<string name="time_unit_weeks_pl">Semanas</string>
+	<string name="time_unit_weeks_pl">semanas</string>
 	<string name="time_unit_months_sg">mês</string>
 	<string name="time_unit_months_pl">meses</string>
 	<string name="time_unit_years_sg">ano</string>
 	<string name="time_unit_years_pl">anos</string>
 	<!-- ## biometric authentication -->
 	<string name="dialog_biometric_auth_title">Acesso biométrico</string>
-	<string name="dialog_biometric_auth_message">Faça login usando suas credenciais biométricas</string>
+	<string name="dialog_biometric_auth_message">Desbloqueie usando credencial biométrica</string>
 	<string name="dialog_biometric_auth_use_password">Usar senha do cofre</string>
 	<string name="dialog_unable_to_auto_upload_files_title">Não foi possível carregar arquivos automaticamente</string>
 	<!-- notification -->
@@ -387,21 +387,21 @@
 	<string name="notification_lock_all">Bloquear todos</string>
 	<string name="notification_cancel_auto_upload">Cancelar upload</string>
 	<string name="notification_auto_upload_title">Upload automático de fotos em execução</string>
-	<string name="notification_auto_upload_message">Uploading %1d/%2d</string>
+	<string name="notification_auto_upload_message">Enviando %1d/%2d</string>
 	<string name="notification_auto_upload_finished_title">Upload automático de fotos concluído</string>
 	<string name="notification_auto_upload_finished_message">%1$d imagens enviadas para o cofre</string>
 	<string name="notification_auto_upload_failed_title">O upload automático de foto falhou</string>
 	<string name="notification_auto_upload_failed_general_error">Ocorreu um erro geral durante o upload.</string>
-	<string name="notification_auto_upload_failed_due_to_folder_not_exists">A pasta selecionada para envio não está mais disponível. Vá para configurações e escolha uma nova pasta</string>
-	<string name="notification_auto_upload_failed_due_to_vault_locked">Cofre trancado durante o upload, por favor reabra o cofre para continuar</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">A pasta escolhida para envio não está mais disponível. Vá até configurações e escolha uma nova pasta</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">O cofre foi bloqueado durante o upload, por favor desbloqueie o cofre para continuar</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">O cofre especificado para upload automático não existe mais.</string>
 	<string name="notification_auto_upload_failed_due_to_authentication_problem">Toque para atualizar a autenticação.</string>
 	<string name="notification_open_writable_file_title">Abrir arquivo gravável</string>
-	<string name="notification_open_writable_file_message">Cofre permanece desbloqueado até terminar de editar</string>
+	<string name="notification_open_writable_file_message">O cofre permanece desbloqueado até terminar de editar</string>
 	<string name="notification_update_check_finished_latest">Versão mais recente instalada</string>
 	<string name="notification_authenticating">Autenticando&#8230;</string>
 	<string name="screen_settings_lru_cache">Cache</string>
-	<string name="screen_settings_lru_cache_toggle_summary">Cache de arquivos acessados recentemente criptografados localmente no dispositivo para reutilização posterior quando reaberto</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Cache para arquivos acessados recentemente para reutilização posterior quando reabertos</string>
 	<string name="screen_settings_lru_cache_size">Tamanho total do cache</string>
 	<string name="screen_settings_clear_lru_cache_size">Limpar Cache</string>
 	<string name="screen_settings_lru_cache_changed__restart_toast">As alterações serão aplicadas na próxima reinicialização do aplicativo</string>
@@ -412,7 +412,7 @@
 	<string name="screen_settings_last_check_updates">Última execução %1$s</string>
 	<string name="dialog_cache_size_title">Tamanho do cache por provedor de nuvem</string>
 	<!-- lock timeout names -->
-	<string name="lock_timeout_instant">Instantâneo</string>
+	<string name="lock_timeout_instant">Instante</string>
 	<string name="lock_timeout_1m">1 minuto</string>
 	<string name="lock_timeout_2m">2 minutos</string>
 	<string name="lock_timeout_5m">5 minutos</string>
diff --git a/presentation/src/main/res/values-pt-rPT/strings.xml b/presentation/src/main/res/values-pt-rPT/strings.xml
index e4f248f9c..bfcf40a83 100644
--- a/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/presentation/src/main/res/values-pt-rPT/strings.xml
@@ -70,6 +70,10 @@
 	<string name="screen_file_browser_add_existing_vault_extra_text">Selecionar ficheiro MasterKey</string>
 	<string name="screen_file_browser_create_new_vault_button_text">Colocar aqui</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">Nome do cofre: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="one">Mover %1$s para</item>
+		<item quantity="other">Mover %2$d para</item>
+	</plurals>
 	<string name="screen_file_browser_move_button_text">Mover</string>
 	<string name="screen_file_browser_msg_empty_folder">Pasta vazia</string>
 	<string name="screen_file_browser_file_info_label_date">modificado %1$s atrás</string>
@@ -131,10 +135,13 @@
 	<string name="screen_s3_settings_access_key_label">Chave de acesso</string>
 	<string name="screen_s3_settings_secret_key_label">Chave Secreta</string>
 	<string name="screen_s3_settings_bucket_label">Compartimento existente</string>
+	<string name="screen_s3_settings_endpoint_label">URL</string>
 	<string name="screen_s3_settings_region_label">Região</string>
 	<string name="screen_s3_settings_msg_display_name_not_empty">O Nome não pode ser vazio</string>
 	<string name="screen_s3_settings_msg_access_key_not_empty">Chave de acesso não pode estar vazia</string>
 	<string name="screen_s3_settings_msg_secret_key_not_empty">A chave secreta não pode estar vazia</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Não pode estar vazio</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">URL ou região não podem estar vazios</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">O nome do cofre não pode estar vazio.</string>
 	<string name="screen_enter_vault_name_vault_label">Nome do cofre</string>
@@ -149,9 +156,37 @@
 	<string name="screen_set_password_strength_indicator_1">Fraca</string>
 	<string name="screen_set_password_strength_indicator_2">Razoável</string>
 	<string name="screen_set_password_strength_indicator_3">Forte</string>
+	<string name="screen_set_password_strength_indicator_4">Muito forte</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">Geral</string>
+	<string name="screen_settings_cloud_settings_label">Serviços na nuvem</string>
+	<string name="screen_settings_biometric_auth">Autenticação biométrica</string>
+	<string name="screen_settings_activate_biometric_auth">Ativar autenticação biométrica</string>
+	<string name="screen_settings_confirm_face_unlock">Confirmar desbloqueio facial (se disponível)</string>
+	<string name="screen_settings_block_app_when_obscured">Bloquear aplicação quando ocultado</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Bloquear a interceção da entrada e apresentar uma interface de utilizador falsa</string>
+	<string name="screen_settings_secure_screen">Bloquear capturas de ecrã</string>
+	<string name="screen_settings_secure_screen_summary">Bloquear capturas de ecrã na lista de recentes e dentro da aplicação</string>
 	<string name="screen_settings_section_search">Buscar</string>
+	<string name="screen_settings_live_search">Pesquisa em tempo real</string>
+	<string name="screen_settings_live_search_summary">Atualizar resultados de pesquisa ao inserir o texto</string>
+	<string name="screen_settings_glob_search">Pesquisar com padrão \"glob\"</string>
+	<string name="screen_settings_glob_search_summary">Usar padrão \"glob\" correspondente, como alice.*.jpg</string>
+	<string name="screen_settings_section_auto_lock">Bloqueio automático</string>
+	<string name="screen_settings_auto_lock_timeout">Bloquear após</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">Quando o ecrã estiver desativado</string>
+	<string name="screen_settings_section_auto_photo_upload">Upload de foto automático</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Escolha o cofre para upload</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Ativar</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Capturar imagens em segundo plano e assim que o cofre selecionado for desbloqueado, iniciar o envio</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Envio instantâneo</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Enviar diretamente se o cofre está desbloqueado</string>
+	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Enviar apenas usando WIFI</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Enviar vídeos</string>
+	<string name="screen_settings_auto_photo_upload_title">Guardar arquivos enviados automaticamente em&#8230;</string>
+	<string name="screen_settings_website_label">Site do Cryptomator</string>
+	<string name="screen_settings_twitter_label">Siga-nos no Twitter</string>
+	<string name="screen_settings_facebook_label">Siga-nos no Facebook</string>
 	<string name="screen_settings_section_legal">Informação Legal</string>
 	<string name="screen_settings_licenses_label">Licenças</string>
 	<string name="screen_settings_license_terms_label">Termos de aceitação</string>
@@ -163,39 +198,238 @@
 	<string name="screen_settings_security_label">Dicas de segurança</string>
 	<string name="screen_settings_section_version">Versão</string>
 	<string name="screen_settings_advanced_settings">Definições Avançadas</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Solução para a abertura de arquivos Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Abrir ficheiros em apps da Microsoft com permissão de gravação</string>
 	<string name="screen_settings_background_unlock_preparation_label">Desbloqueio acelerado</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Descarregar a configuração do cofre em segundo plano enquanto é solicitado para inserir a palavra-passe ou o reconhecimento biométrico</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Manter desbloqueado</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Mantenha cofres desbloqueados durante a edição de ficheiros</string>
 	<!-- ## screen: cloud settings -->
 	<string name="screen_cloud_settings_onedrive_connections">Conexões do OneDrive</string>
 	<string name="screen_cloud_settings_webdav_connections">Ligações WebDAV</string>
 	<string name="screen_cloud_settings_pcloud_connections">ligações pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">Ligações S3</string>
 	<string name="screen_cloud_settings_local_storage_locations">Local de armazenamento</string>
+	<string name="screen_cloud_settings_log_in_to">Iniciar sessão em</string>
+	<string name="screen_cloud_settings_sign_out_from_cloud">Terminar sessão em</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s não pôde ser autenticado.</string>
+	<string name="screen_update_pcloud_connections_title">Atualizar credenciais do pCloud</string>
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">Variantes do Cryptomator</string>
+	<string name="screen_cryptomator_variants_lite_title">Repositório principal no F-Droid</string>
+	<string name="screen_cryptomator_variants_lite_description">Excluídos porque requerem chaves API.</string>
+	<string name="screen_cryptomator_variants_lite_install">Instalar</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Repositório do Cryptomator no F-Droid</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Excluído porque contém dependências proprietárias.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Adicione repositório de Cryptomator ao aplicativo F-Droid.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo">Adicionar</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">Instalar o Cryptomator utilizando F-Droid.\nSe um erro de não encontrado for exibido, aguarde até que a sincronização do F-Droid termine.</string>
+	<string name="screen_cryptomator_variants_website_title">Página web</string>
+	<string name="screen_cryptomator_variants_website_description">Contém dependências proprietárias.</string>
+	<string name="screen_cryptomator_variants_installation_hint">Mudar de ou para a variante principal do repositório F-Droid requer uma nova configuração do aplicativo.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Cancelar</string>
 	<string name="dialog_enter_password_positive_button">Desbloquear</string>
+	<string name="dialog_change_password_old_password_label">Palavra-passe antiga</string>
+	<string name="dialog_change_password_new_password_label">Nova palavra-passe</string>
+	<string name="dialog_change_password">Alterar palavra-passe</string>
+	<string name="dialog_change_password_msg_old_password_empty">Palavra-passe antiga não pode estar vazia.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Nova palavra-passe não pode estar vazia.</string>
+	<string name="dialog_change_password_msg_password_mismatch">A nova palavra-passe não corresponde à digitada no outro campo.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Cofre %1$s não encontrado</string>
+	<string name="dialog_vault_not_found_message">O cofre foi renomeado, movido ou apagado. Remova este cofre da lista e adicione-o novamente para prosseguir. Remover agora?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Remover</string>
+	<string name="dialog_existing_file_title">O ficheiro já existe</string>
+	<string name="dialog_existing_file_positive_button">Substituir</string>
+	<string name="dialog_existing_file_message">Um ficheiro com o nome \'%1$s\' já existe.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Saltar existente</string>
+	<string name="dialog_replace_positive_button_all_files_exist">Substituir todos</string>
+	<string name="dialog_replace_positive_button_some_files_exist">Substituir existente</string>
+	<string name="dialog_replace_positive_button_single_file_exists">Substituir</string>
+	<string name="dialog_replace_msg_single_file_exists">Um ficheiro chamado \'%1$s\' já existe. Deseja substituí-lo?</string>
+	<string name="dialog_replace_msg_all_files_exists">Todos os ficheiros já existem. Quer substituí-los?</string>
+	<string name="dialog_replace_msg_some_files_exists">Já existem %1$d ficheiros. Quer substituí-los?</string>
+	<string name="dialog_replace_title_single_file_exists">Substituir ficheiro?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Substituir ficheiros?</string>
+	<string name="dialog_unable_to_share_title">Não foi possível partilhar os ficheiros</string>
+	<string name="dialog_unable_to_share_message">Você não configurou nenhum cofre. Por favor, crie primeiro um novo cofre com o aplicativo Cryptomator.</string>
+	<string name="dialog_unable_to_share_positive_button">OK</string>
+	<string name="dialog_unable_to_share_negative_button">Criar cofre</string>
+	<string name="dialog_filetype_not_supported_title">Não é possível abrir %1$s</string>
+	<string name="dialog_filetype_not_supported_message">Por favor, descarregar um aplicativo que pode abrir este arquivo ou você gostaria de salvar no seu dispositivo?</string>
+	<string name="dialog_rename_vault_title">Renomear cofre</string>
+	<string name="dialog_rename_node_folder_title">Renomear pasta</string>
+	<string name="dialog_rename_node_file_title">Renomear ficheiro</string>
+	<string name="dialog_unsaved_changes_title">Tem alterações não guardadas</string>
+	<string name="dialog_unsaved_changes_message">Deseja realmente sair sem guardar?</string>
+	<string name="dialog_unsaved_changes_discard">Descartar</string>
+	<string name="dialog_file_name_hint">Nome do ficheiro</string>
 	<string name="dialog_file_name_placeholder">texto.txt</string>
+	<string name="dialog_delete_vault_message">Tem a certeza que deseja remover este cofre?</string>
+	<string name="dialog_delete_vault_hint">Esta ação só vai remover o cofre desta lista e não excluí-lo fisicamente.</string>
+	<string name="dialog_upload_file_title">Enviando&#8230;</string>
+	<string name="dialog_upload_file_remaining">Ficheiro %1$d de %2$d</string>
+	<string name="dialog_export_file_title">Exportando (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Por favor, aguarde&#8230;</string>
+	<string name="dialog_progress_creating_folder">Criando pasta&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Criando ficheiro de texto&#8230;</string>
+	<string name="action_progress_authentication">Autenticação&#8230;</string>
+	<string name="action_progress_renaming">Renomeando&#8230;</string>
+	<string name="action_progress_deleting">Apagando&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Desbloqueando cofre&#8230;</string>
+	<string name="dialog_progress_change_password">Alterando palavra-passe&#8230;</string>
+	<string name="dialog_progress_creating_vault">Criando cofre&#8230;</string>
+	<string name="dialog_progress_upload_file">Enviando&#8230;</string>
+	<string name="dialog_progress_download_file">Descarregando&#8230;</string>
+	<string name="dialog_progress_encryption">Encriptando&#8230;</string>
+	<string name="dialog_progress_decryption">Desencriptando&#8230;</string>
+	<string name="action_progress_moving">Movendo&#8230;</string>
 	<string name="dialog_lock_vault">Bloquear</string>
+	<string name="dialog_accept_ssl_certificate_title">Certificado SSL inválido</string>
+	<string name="dialog_accept_ssl_certificate_hint">O certificado SSL é inválido. Deseja confiar nele mesmo assim?</string>
+	<string name="dialog_accept_ssl_certificate_details">Detalhes</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Isto pode ser um risco para a segurança. Sei o que estou a fazer.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_title">Desativar otimizações de bateria</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Para recuperar novas fotos e vídeos sem correr em segundo plano, precisamos desativar as optimizações de bateria. Não se preocupe, %1$s não consome muita energia.\n\n Para aplicá-lo, altere \'Não optimizado\' para \'Todos os aplicativos\', selecione %1$s e escolha \'Não optimizar\' após clicar em \'%2$s\' nesta caixa de diálogo.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Não perguntar novamente?</string>
+	<string name="dialog_http_security_hint">O uso de HTTP é inseguro. Recomendamos a utilização de HTTPS. Se você souber os riscos, você pode continuar com HTTP.</string>
+	<string name="dialog_http_security_checkbox">Alterar para HTTPS</string>
+	<string name="dialog_http_security_title">Usar HTTPS?</string>
+	<string name="dialog_no_screen_lock_hint">Não está configurado nenhum bloqueio de ecrã. Para armazenar as suas credenciais de uma forma segura, defina com OK um padrão ou senha.</string>
+	<string name="dialog_no_screen_lock_title">Configurar bloqueio de ecrã?</string>
+	<string name="dialog_no_screen_lock_checkbox">Definir bloqueio de ecrã</string>
+	<string name="dialog_no_biometric_auth_set_up_title">Nenhuma configuração de autenticação básica configurada no sistema</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Registar pelo menos um dedo/rosto para usar este serviço.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">Neste modo, dados confidenciais podem ser gravados num arquivo de registo alojado no seu dispositivo (por exemplo, nomes de arquivos e caminhos). Palavras-passe, cookies, etc. são explicitamente excluídos.\n\nLembre-se de desativar o modo de depuração o mais rápido possível.</string>
+	<string name="dialog_debug_mode_disclaimer_title">Atenção</string>
+	<string name="dialog_debug_mode_positive_button">Ativar</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Devido a um erro nas apps da Microsoft, o arquivo a ser editado deve ser partilhado com esses aplicativos numa pasta de média pública no seu dispositivo. Depois que o Cryptomator é retomado, o arquivo acessível ao público é apagado novamente, mas o Cryptomator não pode influenciar o que acontece a este arquivo, enquanto isso decore. Esteja ciente desse comportamento ao ativar esta opção. Isso só se aplicará aos tipos de arquivos da Microsoft.\n\nCryptomator reiniciará após a ativação.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Esta configuração é uma opção de segurança que previne outras apps de iludir os utilizadores a fazer coisas que não querem fazer.\n\nAo desativar, você confirma que está <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">ciente de todos os riscos</a>.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Atenção</string>
+	<string name="dialog_disable_app_obscured_positive_button">Desativar</string>
+	<string name="dialog_app_is_obscured_info_title">O aplicativo está obscurecido</string>
+	<string name="dialog_app_is_obscured_info_hint">Outro aplicativo está exibindo algo em cima do Cryptomator (por exemplo, um filtro de luz azul ou aplicativo de modo noturno). Por razões de segurança, o Cryptomator está desativado.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">Como ativar o Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Fechar</string>
+	<string name="dialog_vaults_removed_during_migration_title">Por favor, adicionar novamente os cofres para a nuvem %1s</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Durante a migração para esta versão do aplicativo, precisamos remover os seguintes cofres do aplicativo:\n%2s \n\nEsses cofres não são removidos da nuvem, somente deste aplicativo. Desculpe o inconveniente e por favor adicione novamente esses cofres para continuar a trabalhar com eles.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">O cofre é a pasta raiz da ligação com a nuvem</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Criar uma nova ligação com a nuvem onde deve selecionar pelo menos a pasta principal, desta pasta de cofre, como o diretório raiz para adicionar este cofre.</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">Esta configuração é uma opção de segurança que previne outras apps de iludir os utilizadores a fazer coisas que não querem fazer.\n\nAo desativar, você confirma que está <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">ciente de todos os riscos</a>.</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_message">Tem certeza de que deseja remover esta ligação com a nuvem?</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_hint">Esta ação removerá a ligação com a nuvem e todos os cofres desta nuvem.</string>
+	<string name="dialog_confirm_delete_multiple_title">Apagar %1$d ficheiros?</string>
+	<string name="dialog_confirm_delete_multiple_message">Tem a certeza que deseja eliminar estes ficheiros?</string>
+	<string name="dialog_confirm_delete_file_message">Temba certeza que deseja apagar este ficheiro?</string>
+	<string name="dialog_confirm_delete_folder_message">Isto irá apagar todo o conteúdo da pasta. Tem certeza que deseja apagar esta pasta?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">Autenticação biométrica desativada</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">Como a chave foi invalidada, o recurso de autenticação biométrica foi desativado. Para reativar, abra as configurações do Cryptomator.</string>
+	<string name="dialog_enter_license_title">Fornecer uma licença válida</string>
+	<string name="dialog_enter_license_content">Detectamos que instalou o Cryptomator sem usar a Google Play Store. Forneça uma licença válida que pode ser comprada em <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
+	<string name="dialog_enter_license_not_valid_content">A licença fornecida não é válida. Verifique se a digitou corretamente.</string>
 	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">A chave fornecida é um certificado de apoiante para computador/portátil. Por favor, insira uma licença válida.</string>
+	<string name="dialog_enter_license_no_content">Nenhuma licença fornecida. Por favor insira uma licença válida.</string>
+	<string name="dialog_enter_license_decline_button">Sair</string>
+	<string name="dialog_license_confirmation_title">Confirmação de licença</string>
+	<string name="dialog_license_confirmation_message">Obrigado %1$s por fornecer a sua licença válida.</string>
+	<string name="dialog_update_available_title">Atualização disponível</string>
+	<string name="dialog_update_available_message">Atualize o Cryptomator para a versão mais recente. Pressionando OK, vamos descarregar o aplicativo em segundo plano e pediremos que você o instale.</string>
+	<string name="dialog_update_available_update">Atualizar agora</string>
+	<string name="dialog_update_available_download_site">Ir para a página de transferências</string>
+	<string name="dialog_update_available_cancel">Mais tarde</string>
+	<string name="dialog_download_update_title">Descarga em execução</string>
+	<string name="dialog_download_update_message">Descarregando a versão mais recente do Cryptomator</string>
+	<string name="dialog_sym_link_title">A pasta é um link simbólico</string>
+	<string name="dialog_sym_link_message">Não é possível ir para este link simbólico</string>
 	<string name="dialog_sym_link_back_button">Anterior</string>
+	<string name="dialog_no_dir_file_title">Não foi possível carregar o conteúdo do diretório</string>
+	<string name="dialog_no_dir_file_message">A pasta na nuvem \'%1$s\' não tem um arquivo de diretório válido. A pasta pode ter sido criada em outro dispositivo e ainda não foi totalmente sincronizada com a nuvem. Por favor, verifique na sua nuvem se o seguinte arquivo existe e não está vazio:\n%2$s</string>
+	<string name="dialog_no_more_images_to_display">Sem mais imagens para exibir&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">Credenciais de \'%1$s\' atualizadas</string>
+	<string name="dialog_pcloud_credentials_updated">Se você pretendia adicionar uma nova conta pCloud, toque nesta ligação <a href="https://www.pcloud.com">www.pcloud. om</a>, saia da conta atual e toque novamente em \'+\' deste aplicativo para criar uma nova ligação com a nuvem.</string>
+	<string name="permission_snackbar_auth_local_vault">Cryptomator precisa de acesso ao armazenamento para usar cofres locais</string>
+	<string name="permission_snackbar_auth_auto_upload">Cryptomator precisa de acesso ao armazenamento para usar o envio automático de fotos</string>
+	<string name="permission_snackbar_notifications">O Cryptomator precisa de permissões de notificação para exibir, como exemplo, o estado do cofre</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
+	<string name="file_size_zero">Zero kB</string>
+	<string name="file_size_unit_bytes">bytes</string>
+	<string name="file_size_unit_kilo_bytes">kB</string>
+	<string name="file_size_unit_mega_bytes">MB</string>
+	<string name="file_size_unit_giga_bytes">GB</string>
+	<string name="file_size_unit_tera_bytes">TB</string>
 	<!-- ## date helper -->
+	<string name="time_unit_seconds_sg">segundo</string>
+	<string name="time_unit_seconds_pl">segundos</string>
+	<string name="time_unit_minutes_sg">minuto</string>
 	<string name="time_unit_minutes_pl">minutos</string>
+	<string name="time_unit_hours_sg">hora</string>
+	<string name="time_unit_hours_pl">horas</string>
+	<string name="time_unit_days_sg">dia</string>
+	<string name="time_unit_days_pl">dias</string>
+	<string name="time_unit_weeks_sg">semana</string>
+	<string name="time_unit_weeks_pl">semanas</string>
+	<string name="time_unit_months_sg">mês</string>
+	<string name="time_unit_months_pl">meses</string>
+	<string name="time_unit_years_sg">ano</string>
+	<string name="time_unit_years_pl">anos</string>
 	<!-- ## biometric authentication -->
+	<string name="dialog_biometric_auth_title">Acesso biométrico</string>
+	<string name="dialog_biometric_auth_message">Iniciar sessão utilizando as suas credenciais biométricas</string>
+	<string name="dialog_biometric_auth_use_password">Usar palavra-passe do cofre</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Não foi possível carregar arquivos automaticamente</string>
 	<!-- notification -->
+	<string name="notification_unlocked">Cofres desbloqueados: %1$d</string>
+	<string name="notification_timeout">Bloqueio automático em %1$s</string>
+	<string name="notification_lock_all">Bloquear todos</string>
+	<string name="notification_cancel_auto_upload">Cancelar envio</string>
+	<string name="notification_auto_upload_title">Envio de fotos automático em execução</string>
+	<string name="notification_auto_upload_message">Enviando %1d/%2d</string>
+	<string name="notification_auto_upload_finished_title">Envio de foto automático concluído</string>
+	<string name="notification_auto_upload_finished_message">%1$d imagens enviadas para o cofre</string>
+	<string name="notification_auto_upload_failed_title">Falha no envio automático de foto</string>
+	<string name="notification_auto_upload_failed_general_error">Ocorreu um erro geral durante o envio.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">A pasta selecionada para envio não está mais disponível. Vá para as configurações e escolha uma nova</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Cofre bloqueado durante o envio, por favor reabra o cofre para continuar</string>
+	<string name="notification_auto_upload_failed_due_to_vault_not_found">Cofre especificado para envio automático não existe mais.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Toque para atualizar a autenticação.</string>
+	<string name="notification_open_writable_file_title">Abrir arquivo gravável</string>
+	<string name="notification_open_writable_file_message">Cofre permanece desbloqueado até terminar de editar</string>
+	<string name="notification_update_check_finished_latest">Última versão instalada</string>
 	<string name="notification_authenticating">Autenticação&#8230;</string>
+	<string name="screen_settings_lru_cache">Cache</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Cache de arquivos acedidos recentemente, encriptados localmente no dispositivo para reutilização posterior quando reaberto</string>
+	<string name="screen_settings_lru_cache_size">Tamanho total do cache</string>
+	<string name="screen_settings_clear_lru_cache_size">Limpar cache</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">As alterações serão aplicadas na próxima inicialização do aplicativo</string>
+	<string name="screen_settings_license">Registado para</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">Intervalo de verificação de actualizações</string>
+	<string name="screen_settings_check_updates">Procurar actualizações</string>
+	<string name="screen_settings_last_check_updates">Última execução %1$s</string>
+	<string name="dialog_cache_size_title">Tamanho do cache por nuvem</string>
 	<!-- lock timeout names -->
+	<string name="lock_timeout_instant">Instantâneo</string>
+	<string name="lock_timeout_1m">1 minuto</string>
+	<string name="lock_timeout_2m">2 minutos</string>
+	<string name="lock_timeout_5m">5 minutos</string>
+	<string name="lock_timeout_10m">10 minutos</string>
+	<string name="lock_timeout_never">Nunca</string>
 	<!-- cache size names -->
+	<string name="cache_size_50m">50 MB</string>
+	<string name="cache_size_100m">100 MB</string>
+	<string name="cache_size_250m">250 MB</string>
+	<string name="cache_size_500m">500 MB</string>
+	<string name="cache_size_1000m">1 GB</string>
+	<string name="cache_size_5000m">5 GB</string>
 	<!-- screen scheme mode names -->
+	<string name="screen_settings_style_mode">Estilo</string>
+	<string name="follow_system">Automático (seguir sistema)</string>
+	<string name="light">Claro</string>
+	<string name="dark">Escuro</string>
 	<!-- update interval names -->
+	<string name="update_interval_1d">Uma vez por dia</string>
 </resources>
diff --git a/presentation/src/main/res/values-ro-rRO/strings.xml b/presentation/src/main/res/values-ro-rRO/strings.xml
index d45ac024a..1a690a810 100644
--- a/presentation/src/main/res/values-ro-rRO/strings.xml
+++ b/presentation/src/main/res/values-ro-rRO/strings.xml
@@ -26,7 +26,7 @@
 	<string name="error_hash_mismatch_update">Verificarea actualizării a eșuat. Hash-ul calculat nu se potrivește cu fișierul încărcat</string>
 	<string name="error_update_no_internet">Verificarea actualizării a eșuat. Nu există conexiune la internet.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Nu s-a reușit decriptarea parolei WebDAV, vă rugăm să o introduceți din nou în setări</string>
-	<string name="error_play_services_not_available">Google Play Services nu este instalat</string>
+	<string name="error_play_services_not_available">Serviciile Google Play nu sunt instalate</string>
 	<string name="error_biometric_auth_aborted">Autentificare biometrică anulată</string>
 	<string name="error_vault_version_mismatch">Versiunea specificată în %1$s este diferită de %2$s</string>
 	<string name="error_vault_key_invalid">%1$s nu se potrivește cu %2$s</string>
@@ -199,6 +199,8 @@
 	<string name="screen_settings_security_label">Indicații de securitate</string>
 	<string name="screen_settings_section_version">Versiune</string>
 	<string name="screen_settings_advanced_settings">Setări avansate</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Soluție pentru deschiderea fișierelor Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Deschide fișiere în aplicații Microsoft cu permisiune de scriere</string>
 	<string name="screen_settings_background_unlock_preparation_label">Accelerează deblocarea</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Descărcați configurarea seifului în fundal în timp ce vi se solicită introducerea parolei sau a autentificării biometrice</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Păstrați deblocat</string>
@@ -305,6 +307,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">În acest mod, datele sensibile pot fi scrise într-un fișier jurnal de pe dispozitivul dumneavoastră (de exemplu, nume de fișiere și căi de fișiere). Parolele, cookie-urile etc. sunt excluse în mod explicit.\n\nNu uitați să dezactivați modul de depanare cât mai curând posibil.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Atenție</string>
 	<string name="dialog_debug_mode_positive_button">Activează</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Din cauza unei erori în aplicațiile Microsoft, fișierul care urmează să fie editat trebuie să fie partajat cu aceste aplicații într-un folder media public de pe dispozitivul dvs. După ce Cryptomator este repornit, fişierul accesibil publicului este şters din nou, dar Cryptomator nu poate influenţa ceea ce s-a întâmplat cu acest fişier între timp. Asigurați-vă că sunteți conștient de acest comportament atunci când activați această opțiune. Acest comportament se aplica doar tipurilor de fișiere Microsoft.\n\nCryptomator va reporni după activare.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Această setare este o caracteristică de securitate și previne alte aplicații să păcălească utilizatorii să facă lucruri pe care nu ar trebui să le facă.\n\nPrin dezactivare, confirmați că sunteți <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">conștient de aceste riscuri</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Atenție</string>
 	<string name="dialog_disable_app_obscured_positive_button">Dezactivează</string>
@@ -349,6 +352,7 @@
 	<string name="dialog_pcloud_credentials_updated">Dacă doriți să adăugaţi un cont nou de tip pCloud, faceţi clic pe acest link <a href="https://www.pcloud.com">www.pcloud. om</a>, deconectați-vă de la contul curent, și faceți clic din nou pe \'+\' din această aplicație pentru a crea o nouă conexiune cloud.</string>
 	<string name="permission_snackbar_auth_local_vault">Cryptomator are nevoie de acces la stocare pentru a utiliza seifuri locale</string>
 	<string name="permission_snackbar_auth_auto_upload">Cryptomator are nevoie de acces la stocare pentru a folosi încărcarea automată a fotografiilor</string>
+	<string name="permission_snackbar_notifications">Cryptomator are nevoie de permisiuni de notificare pentru a afișa starea seifului de exemplu</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
@@ -392,6 +396,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Dosarul selectat pentru încărcare nu mai este disponibil. Mergeți la setări și alegeți unul nou</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Seif blocat în timpul încărcării, vă rugăm să redeschideți seiful pentru a continua</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Seiful ales pentru încărcare automată nu mai există.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Atingeți pentru a reîmprospăta autentificarea.</string>
 	<string name="notification_open_writable_file_title">Deschide fișier inscriptibil</string>
 	<string name="notification_open_writable_file_message">Seiful rămâne deblocat până la editarea finalizată</string>
 	<string name="notification_update_check_finished_latest">Ultima versiune instalată</string>
diff --git a/presentation/src/main/res/values-ru-rRU/strings.xml b/presentation/src/main/res/values-ru-rRU/strings.xml
index 5dc59559f..be07f00e8 100644
--- a/presentation/src/main/res/values-ru-rRU/strings.xml
+++ b/presentation/src/main/res/values-ru-rRU/strings.xml
@@ -9,7 +9,7 @@
 	<string name="error_no_network_connection">Нет подключения к сети</string>
 	<string name="error_invalid_passphrase">Неверный пароль</string>
 	<string name="error_file_or_folder_exists">Файл или папка уже существует.</string>
-	<string name="error_vault_version_not_supported">Версия хранилища %1$s не поддерживается. Это хранилище было создано либо в устаревшей, либо в более новой версии Cryptomator.</string>
+	<string name="error_vault_version_not_supported">Версия хранилища %1$s не поддерживается. Это хранилище было создано в устаревшей, или более новой версии Cryptomator.</string>
 	<string name="error_vault_config_file_missing_due_to_format_999">Файл %1$s отсутствует в папке хранилища. Убедитесь, что этот файл существует в папке хранилища в облаке.</string>
 	<string name="error_vault_already_exists">Хранилище уже существует.</string>
 	<string name="error_no_such_file">Файл не существует.</string>
@@ -20,12 +20,12 @@
 	<string name="error_device_policy_manager_not_found">Откройте настройки устройства и установите блокировку экрана вручную</string>
 	<string name="error_export_illegal_file_name">Ошибка экспорта. Попробуйте удалить спецсимволы из имён файлов и экспортировать снова.</string>
 	<string name="error_name_contains_invalid_characters">Не может содержать спецсимволы.</string>
-	<string name="error_names_contains_invalid_characters">В имени файла не может быть спецсимволов.</string>
-	<string name="error_vault_name_contains_invalid_characters">В имени хранилища не может быть спецсимволов.</string>
-	<string name="error_general_update">Не удалось проверить наличие обновления. Общая ошибка.</string>
-	<string name="error_hash_mismatch_update">Не удалось проверить обновление. Вычисленный хеш не соответствует отправленному файлу.</string>
+	<string name="error_names_contains_invalid_characters">Имена файлов не могут содержать специальные символы.</string>
+	<string name="error_vault_name_contains_invalid_characters">Имя хранилища не может содержать специальные символы.</string>
+	<string name="error_general_update">Ошибка проверки обновления. Общая ошибка.</string>
+	<string name="error_hash_mismatch_update">Ошибка проверки обновления. Вычисленный хэш не соответствует загруженному файлу</string>
 	<string name="error_update_no_internet">Ошибка проверки обновления. Нет подключения к Интернету.</string>
-	<string name="error_failed_to_decrypt_webdav_password">Не удалось расшифровать пароль WebDAV, добавьте его заново в настройках</string>
+	<string name="error_failed_to_decrypt_webdav_password">Не удалось расшифровать пароль WebDAV, пожалуйста, добавьте его заново в настройках</string>
 	<string name="error_play_services_not_available">Не установлены сервисы Google Play</string>
 	<string name="error_biometric_auth_aborted">Биометрическая аутентификация прервана</string>
 	<string name="error_vault_version_mismatch">Версия, указанная в %1$s, отличается от %2$s</string>
@@ -120,7 +120,7 @@
 	<string name="screen_choose_cloud_service_title">Облачный сервис</string>
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">Выберите место</string>
-	<string name="screen_cloud_connections_no_connections">Нажмите, чтобы добавить местоположения</string>
+	<string name="screen_cloud_connections_no_connections">Нажмите здесь, чтобы добавить местоположения</string>
 	<string name="screen_cloud_error_webdav_not_supported">Похоже, сервер не совместим с WebDAV</string>
 	<string name="screen_cloud_local_error_no_content_provider">Не найден файловый менеджер, поддерживающий открытие папок</string>
 	<!-- ## screen: webdav settings -->
diff --git a/presentation/src/main/res/values-sk-rSK/strings.xml b/presentation/src/main/res/values-sk-rSK/strings.xml
index ff734ea3b..ce615b4d8 100644
--- a/presentation/src/main/res/values-sk-rSK/strings.xml
+++ b/presentation/src/main/res/values-sk-rSK/strings.xml
@@ -200,6 +200,8 @@
 	<string name="screen_settings_security_label">Bezpečnostné tipy</string>
 	<string name="screen_settings_section_version">Verzia</string>
 	<string name="screen_settings_advanced_settings">Pokročilé nastavenia</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Obídenie otvorenia súborov Microsoftu</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Otvoriť súbory v Microsoft aplikáciách s právom zápisu</string>
 	<string name="screen_settings_background_unlock_preparation_label">Urýchliť odomknutie</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Stiahnuť konfiguráciu trezora na pozadí počas vyzvania na zadanie hesla alebo biometrickej autentikácie</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Držať odomknuté</string>
@@ -306,6 +308,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">V tomto móde, môžu byť zapisované citlivé dáta do logovacieho súboru na Vašom zariadení (ako napr. mená súborov a cesty). Heslá, cookies, a pod. sú explicitne vynechané.\n\nPamätajte na vypnutie debug módu ako najskôr to pôjde.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Upozornenie</string>
 	<string name="dialog_debug_mode_positive_button">Povoliť</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Kvôli chybe v aplikáciách spoločnosti Microsoft musí byť upravovaný súbor zdieľaný s týmito aplikáciami vo verejnom priečinku médií vo vašom zariadení. Po obnovení programu Cryptomator sa verejne prístupný súbor opäť odstráni, ale program Cryptomator nemôže ovplyvniť, čo sa s týmto súborom medzitým stalo. Pri aktivácii tejto možnosti sa uistite, že ste si vedomí tohto správania. Toto sa vzťahuje len na typy súborov spoločnosti Microsoft.\n\nCryptomator sa po aktivácii znovu spustí.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Toto nastavenie je bezpečnostná vlastnosť a chráni ostatné aplikácie pred klamaním užívateľov robiť veci, ktoré nechcú obiť.\n\nVypnutím súhlasíte, že &lt;a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured"&gt;ste si vedomí rizika.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Upozornenie</string>
 	<string name="dialog_disable_app_obscured_positive_button">Zakázať</string>
@@ -350,6 +353,7 @@
 	<string name="dialog_pcloud_credentials_updated">Ak zamýšľate pridať nový pCloud účet, kliknite na tento link <a href="https://www.pcloud.com">www.pcloud.com</a>, odhláste sa zo súčasného účtu a opätovne kliknite na \'+\' v tejto aplikácii pre vytvorenie nového cloudového pripojenia.</string>
 	<string name="permission_snackbar_auth_local_vault">Cryptomator potrebuje prístup k úložisku pre prácu s lokálnymi trezormy</string>
 	<string name="permission_snackbar_auth_auto_upload">Cryptomator potrebuje prístup k úložisku pre automatické nahrávanie fotografii</string>
+	<string name="permission_snackbar_notifications">Cryptomator potrebuje povolenie notifikácií, napríklad na zobrazenie stavu trezoru</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
diff --git a/presentation/src/main/res/values-sl-rSI/strings.xml b/presentation/src/main/res/values-sl-rSI/strings.xml
index 487d3659e..8fa5e57b8 100644
--- a/presentation/src/main/res/values-sl-rSI/strings.xml
+++ b/presentation/src/main/res/values-sl-rSI/strings.xml
@@ -283,7 +283,16 @@
 	<string name="dialog_accept_ssl_certificate_details">Podrobnosti</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">To bi bilo lahko nevarno. Vem kaj delam.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_title">Onemogoči optimizacije baterije</string>
+	<string name="dialog_http_security_title">Uporabi HTTPS?</string>
+	<string name="dialog_debug_mode_disclaimer_title">Pozor</string>
+	<string name="dialog_debug_mode_positive_button">Omogoči</string>
+	<string name="dialog_disable_app_obscured_disclaimer_title">Pozor</string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Zapri</string>
+	<string name="dialog_enter_license_decline_button">Izhod</string>
+	<string name="dialog_license_confirmation_title">Potrditev licence</string>
+	<string name="dialog_update_available_title">Posodobitev je na voljo</string>
+	<string name="dialog_update_available_update">Posodobi zdaj</string>
+	<string name="dialog_update_available_cancel">Pozneje</string>
 	<string name="dialog_sym_link_back_button">Nazaj</string>
 	<!-- # error reports -->
 	<!-- # misc -->
diff --git a/presentation/src/main/res/values-sv-rSE/strings.xml b/presentation/src/main/res/values-sv-rSE/strings.xml
index 8701c2630..a366ce3fd 100644
--- a/presentation/src/main/res/values-sv-rSE/strings.xml
+++ b/presentation/src/main/res/values-sv-rSE/strings.xml
@@ -198,6 +198,8 @@
 	<string name="screen_settings_security_label">Säkerhetstips</string>
 	<string name="screen_settings_section_version">Version</string>
 	<string name="screen_settings_advanced_settings">Avancerade inställningar</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Alternativt sätt att öppna Microsoft-filer</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Öppna filer i Microsoft-appar med skrivrättigheter</string>
 	<string name="screen_settings_background_unlock_preparation_label">Accelerera upplåsning</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Ladda ner valvkonfiguration i bakgrunden medan du uppmanas att låsa upp</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Behåll olåst</string>
@@ -304,6 +306,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">I detta läge kan känsliga data skrivas till en loggfil på din enhet (t.ex. filnamn och sökvägar). Lösenord, cookies etc. är uttryckligen uteslutna.\n\nKom ihåg att inaktivera felsökningsläge så snart som möjligt.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Observera</string>
 	<string name="dialog_debug_mode_positive_button">Aktivera</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">På grund av ett fel i Microsoft-appar, måste filen som ska redigeras delas med dessa appar i en offentlig mediemapp på din enhet. Efter att Cryptomator återupptas raderas den allmänt tillgängliga filen igen, men Cryptomator kan inte påverka vad som har hänt med filen under tiden. Det är viktigt att du är medveten om detta beteende när du aktiverar detta alternativ. Detta kommer endast att gälla för Microsoft filtyper.\n\nCryptomator startar om efter aktivering.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">Den här inställningen är en säkerhetsfunktion som hindrar andra appar från att lura användare att göra saker de inte vill.\n\nGenom att stänga av säkerhetsfunktionen bekräftar du att du är <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">medveten om riskerna</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Observera</string>
 	<string name="dialog_disable_app_obscured_positive_button">Inaktivera</string>
@@ -392,6 +395,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Vald mapp för uppladdning finns inte längre. Gå till inställningar och välj en ny</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">Valv låstes under uppladdningen, vänligen öppna valvet för att fortsätta</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Valvet som angets för automatisk uppladdning finns inte längre.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Tryck för att förnya inloggningen.</string>
 	<string name="notification_open_writable_file_title">Öppna skrivbar fil</string>
 	<string name="notification_open_writable_file_message">Valvet är upplåst till färdig redigering</string>
 	<string name="notification_update_check_finished_latest">Senaste versionen installerad</string>
diff --git a/presentation/src/main/res/values-ta-rIN/strings.xml b/presentation/src/main/res/values-ta-rIN/strings.xml
index 4cc00ea3c..7be6154a0 100644
--- a/presentation/src/main/res/values-ta-rIN/strings.xml
+++ b/presentation/src/main/res/values-ta-rIN/strings.xml
@@ -5,14 +5,29 @@
 	<!-- # error messages -->
 	<string name="error_generic">ஒரு பிழை ஏற்பட்டுள்ளது</string>
 	<string name="error_authentication_failed">அங்கீகரிப்பு தோல்வியுற்றது</string>
+	<string name="error_authentication_failed_re_authenticate">அங்கீகாரம் தோல்வியுற்றது, தயவுசெய்து %1$s பயன்படுத்தி உள்நுழையவும்</string>
 	<string name="error_no_network_connection">நெட்வொர்க் இணைப்பு இல்லை</string>
 	<string name="error_invalid_passphrase">தவறான கடவுச்சொல்</string>
+	<string name="error_file_or_folder_exists">ஏற்கனவே \'\' என்ற பெயரில் வெறெரு அரம் அல்லது கோப்புறை உள்ளது.</string>
+	<string name="error_vault_version_not_supported">%1$s என்ற பதிப்புரு கொண்ட பெட்டகம் ஆதரவற்றது. இப்பெட்டகம் பழைய அல்லது புதிய பதிப்புரு கொண்ட Cryptomator-ஆல் உருவாக்கபட்டது.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">%1$s என்ற பெயர் கொண்ட கோப்பு உமது vault folder-இல் காணவில்லை. இந்தக் கோப்பு மேகக்கணியில் இருப்பதை உறுதி செய்து கொள்ளவும்.</string>
 	<string name="error_vault_already_exists">பெட்டகம் ஏற்கனவே உள்ளது.</string>
 	<string name="error_no_such_file">கோப்பு இருப்பில் இல்லை.</string>
 	<string name="error_vault_has_been_locked">பெட்டகம் பூட்டப்பட்டுள்ளது.</string>
 	<string name="error_cloud_already_exists">மேகக்கணி ஏற்கனவே உள்ளது.</string>
 	<string name="error_activity_not_found">இந்தக் கோப்பைத் திறக்கக்கூடிய செயலியைப் பதிவிறக்கவும்.</string>
 	<string name="error_server_not_found">சேவையகம் காணப்படவில்லை.</string>
+	<string name="error_device_policy_manager_not_found">உங்கள் சாதன அமைப்புகளைத் திறந்து, திரைப் பூட்டைக் அமைக்கவும்</string>
+	<string name="error_export_illegal_file_name">ஏற்றுமதி தோல்வியடைந்தது. கோப்பு பெயர்களிலிருந்து சிறப்பு எழுத்துக்களை அகற்றி மீண்டும் ஏற்றுமதி செய்ய முயற்சிக்கவும்.</string>
+	<string name="error_name_contains_invalid_characters">சிறப்பு எழுத்துகள் இருக்க கூடாது.</string>
+	<string name="error_names_contains_invalid_characters">கோப்புகளின் பெயரில் சிறப்பு எழுத்துக்கள் இருக்க கூடாது.</string>
+	<string name="error_vault_name_contains_invalid_characters">பெட்டகத்தின் பெயரில் சிறப்பு எழுத்துக்கள் இருக்க கூடாது.</string>
+	<string name="error_general_update">புதுப்பிப்பு சரிபார்ப்பு தோல்வியடைந்தது. பொதுவான பிழை ஏற்பட்டது.</string>
+	<string name="error_update_no_internet">புதுப்பிப்பு சரிபார்ப்பு தோல்வியடைந்தது. இணைய இணைப்பு இல்லை.</string>
+	<string name="error_biometric_auth_aborted">உயிரியளவுகள் உறுதிசெய்தல் கைவிடப்பட்டது</string>
+	<string name="error_vault_config_loading">பெட்டகத்தின் உள்ளமைவை ஏற்றும்போது பொதுவான பிழை ஏற்பட்டது</string>
+	<string name="error_file_not_found_after_opening_using_3party">மீண்டும் Cryptomator-இற்கு மாறியபிறகு, உள்ளூர் கோப்பு இல்லை. சாத்தியமான மாற்றங்களை மீண்டும் மேகக்கணிக்கு பரப்ப முடியாது.</string>
+	<string name="error_no_such_bucket">இப்பெயருள்ள bucket இல்லை</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">அகச் சேமிப்பகம்</string>
diff --git a/presentation/src/main/res/values-tr-rTR/strings.xml b/presentation/src/main/res/values-tr-rTR/strings.xml
index feef68b01..b54907a3b 100644
--- a/presentation/src/main/res/values-tr-rTR/strings.xml
+++ b/presentation/src/main/res/values-tr-rTR/strings.xml
@@ -4,7 +4,7 @@
 	<string name="share_with_label">Şifrele</string>
 	<!-- # error messages -->
 	<string name="error_generic">Bir hata oluştu</string>
-	<string name="error_authentication_failed">Kimlik doğrulaması başarısız oldu</string>
+	<string name="error_authentication_failed">Kimlik doğrulama başarısız</string>
 	<string name="error_authentication_failed_re_authenticate">Kimlik doğrulama başarısız, lütfen %1$s kullanarak giriş yapınız</string>
 	<string name="error_no_network_connection">Ağ bağlantısı yok</string>
 	<string name="error_invalid_passphrase">Şifre hatalı</string>
@@ -12,13 +12,13 @@
 	<string name="error_vault_version_not_supported">%1$s kasa sürümü desteklenmiyor. Bu kasa, Cryptomator\'ın daha eski veya daha yeni bir sürümüyle oluşturuldu.</string>
 	<string name="error_vault_config_file_missing_due_to_format_999">Kasa klasörünüzde %1$s dosyası eksik. Bu dosyanın buluttaki kasa klasörünüzde bulunduğundan emin olun.</string>
 	<string name="error_vault_already_exists">Kasa zaten var.</string>
-	<string name="error_no_such_file">Dosya bulunmuyor.</string>
+	<string name="error_no_such_file">Dosya mevcut değil.</string>
 	<string name="error_vault_has_been_locked">Kasa kilitlendi.</string>
 	<string name="error_cloud_already_exists">Bulut zaten var.</string>
 	<string name="error_activity_not_found">Lütfen bu dosyayı açabilen bir uygulama edinin.</string>
 	<string name="error_server_not_found">Sunucu bulunamadı.</string>
 	<string name="error_device_policy_manager_not_found">Lütfen cihaz ayarlarınızı açın ve ekran kilidini elle ayarlayın</string>
-	<string name="error_export_illegal_file_name">Dışa aktarma başarısız oldu. Özel karakterleri dosya adlarından kaldırmayı ve tekrar dışa aktarmayı deneyin.</string>
+	<string name="error_export_illegal_file_name">Dışa aktarma başarısız oldu. Dosya adlarından özel karakterleri kaldırın ve dışa aktarmayı tekrar deneyin.</string>
 	<string name="error_name_contains_invalid_characters">Özel karakterler içeremez.</string>
 	<string name="error_names_contains_invalid_characters">Dosya adları özel karakterler içeremez.</string>
 	<string name="error_vault_name_contains_invalid_characters">Kasa adı özel karakterler içeremez.</string>
@@ -33,7 +33,7 @@
 	<string name="error_vault_config_loading">Cüzdan ayarlarını yüklerken genel hata</string>
 	<string name="error_file_not_found_after_opening_using_3party">Cryptomator geri döndükten sonra, lokal dosya artık mevcut olmaz. Muhtemel değişiklikler bulutta tekrar oluşturulamaz.</string>
 	<string name="error_no_such_bucket">Böyle bir kova yok</string>
-	<string name="error_masterkey_location_not_supported">Özel ana anahtar lokasyonu desteklenmiyor</string>
+	<string name="error_masterkey_location_not_supported">Özel ana anahtar konumu henüz desteklenmiyor</string>
 	<string name="error_interact_with_fdroid_but_fdroid_missing">F-Droid uygulamasıyla iletişim kurulamadı. Yüklü değil mi?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
@@ -51,10 +51,10 @@
 	<string name="snack_bar_action_title_sort">Sırala</string>
 	<string name="snack_bar_action_title_sort_az">A - Z</string>
 	<string name="snack_bar_action_title_sort_za">Z - A</string>
-	<string name="snack_bar_action_title_sort_newest">Önce en yenisi</string>
-	<string name="snack_bar_action_title_sort_oldest">Önce en eskisi</string>
-	<string name="snack_bar_action_title_sort_biggest">Önce en büyüğü</string>
-	<string name="snack_bar_action_title_sort_smallest">Önce en küçüğü</string>
+	<string name="snack_bar_action_title_sort_newest">Yeniden eskiye</string>
+	<string name="snack_bar_action_title_sort_oldest">Eskiden yeniye</string>
+	<string name="snack_bar_action_title_sort_biggest">Büyükten küçüğe</string>
+	<string name="snack_bar_action_title_sort_smallest">Küçükten büyüğe</string>
 	<string name="snack_bar_cryptomator_variants_title">Daha fazlasını oku</string>
 	<string name="snack_bar_cryptomator_variants_hint">Bulut listede yok mu?</string>
 	<!-- # screens -->
@@ -63,7 +63,7 @@
 	<string name="screen_vault_list_action_create_new_vault">Yeni kasa oluştur</string>
 	<string name="screen_vault_list_action_add_existing_vault">Mevcut kasayı ekle</string>
 	<string name="screen_vault_list_vault_action_delete">Kaldır</string>
-	<string name="screen_vault_list_vault_creation_hint">Kasa oluşturmak/eklemek için buraya dokunun</string>
+	<string name="screen_vault_list_vault_creation_hint">Yeni bir kasa oluşturmak için buraya dokunun</string>
 	<string name="screen_vault_list_change_password_successful">Şifre başarıyla değiştirildi</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Kasa</string>
@@ -110,7 +110,7 @@
 	<string name="screen_share_files_content_text">Metin</string>
 	<string name="screen_share_files_content_file">Dosya</string>
 	<string name="screen_share_files_content_files">Dosyalar</string>
-	<string name="screen_share_files_msg_filenames_must_be_unique">Dosya adları benzersiz olmalıdır, lütfen kopyaları yeniden adlandırın.</string>
+	<string name="screen_share_files_msg_filenames_must_be_unique">Dosya adları benzersiz olmalıdır, lütfen mükerrer olanları yeniden adlandırın.</string>
 	<string name="screen_share_files_section_location">Konumu kaydet</string>
 	<string name="screen_share_files_save_button_text">Kaydet</string>
 	<string name="screen_share_files_msg_success">Şifreleme tamamlandı</string>
@@ -255,7 +255,7 @@
 	<string name="dialog_replace_title_single_file_exists">Dosya değiştirilsin mi?</string>
 	<string name="dialog_replace_title_multiple_files_exist">Dosyalar değiştirilsin mi?</string>
 	<string name="dialog_unable_to_share_title">Dosyalar paylaşılamıyor</string>
-	<string name="dialog_unable_to_share_message">Daha önce herhangi bir kasa oluşturmadınız! Önce Cryptomator uygulamasıyla yeni bir kasa oluşturun lütfen.</string>
+	<string name="dialog_unable_to_share_message">Daha önce herhangi bir kasa oluşturmadınız! Lütfen önce Cryptomator uygulamasıyla yeni bir kasa oluşturun.</string>
 	<string name="dialog_unable_to_share_positive_button">Tamam</string>
 	<string name="dialog_unable_to_share_negative_button">Kasa oluştur</string>
 	<string name="dialog_filetype_not_supported_title">%1$s açılamıyor</string>
@@ -393,7 +393,7 @@
 	<string name="notification_auto_upload_failed_title">Otomatik fotoğraf yükleme başarısız oldu</string>
 	<string name="notification_auto_upload_failed_general_error">Yükleme sırasında genel hata oluştu.</string>
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Yükleme için seçilen klasör artık mevcut değil! Ayarlara gidin ve yeni bir tane seçin</string>
-	<string name="notification_auto_upload_failed_due_to_vault_locked">Kasa yükleme sırasında kilitlendi, devam etmek için kasayı yeniden açın lütfen</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Kasa yükleme sırasında kilitlendi, devam etmek için lütfen kasayı yeniden açın</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">Otomatik yükleme için belirtilen kasa artık mevcut değil.</string>
 	<string name="notification_auto_upload_failed_due_to_authentication_problem">Kimlik doğrulama işlemini yenilemek için dokun.</string>
 	<string name="notification_open_writable_file_title">Yazılabilir dosyayı aç</string>
diff --git a/presentation/src/main/res/values-uk-rUA/strings.xml b/presentation/src/main/res/values-uk-rUA/strings.xml
index c43dbbc5e..81dca82b6 100644
--- a/presentation/src/main/res/values-uk-rUA/strings.xml
+++ b/presentation/src/main/res/values-uk-rUA/strings.xml
@@ -3,38 +3,38 @@
 	<!-- # app -->
 	<string name="share_with_label">Зашифрувати</string>
 	<!-- # error messages -->
-	<string name="error_generic">Виникла помилка</string>
-	<string name="error_authentication_failed">Помилка автентифікації</string>
+	<string name="error_generic">Сталася помилка</string>
+	<string name="error_authentication_failed">Не вдалося пройти автентифікацію</string>
 	<string name="error_authentication_failed_re_authenticate">Помилка автентифікації, будь ласка, увійдіть за допомогою %1$s</string>
 	<string name="error_no_network_connection">Відсутнє з\'єднання з мережею</string>
 	<string name="error_invalid_passphrase">Невірний пароль</string>
-	<string name="error_file_or_folder_exists">Файл чи директорія вже існує.</string>
-	<string name="error_vault_version_not_supported">Версія сховища %1$s не підтримується. Це сховище було створено старішою або новішою версією Cryptomator.</string>
-	<string name="error_vault_config_file_missing_due_to_format_999">%1$s Файл відсутній у вашому сховищі. Переконайтеся, що цей файл існує у теці вашого сховища у хмарі.</string>
+	<string name="error_file_or_folder_exists">Файл чи папка вже існує.</string>
+	<string name="error_vault_version_not_supported">Сховище %1$s-ї версії не підтримується. Це сховище було створено старішою або новішою версією Cryptomator.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Файл %1$s відсутній у вашому сховищі. Переконайтеся, що цей файл існує у папці вашого сховища у хмарі.</string>
 	<string name="error_vault_already_exists">Сховище вже існує.</string>
 	<string name="error_no_such_file">Файлу не існує.</string>
 	<string name="error_vault_has_been_locked">Сховище було заблоковано.</string>
 	<string name="error_cloud_already_exists">Ця хмара вже використовується.</string>
 	<string name="error_activity_not_found">Будь ласка, завантажте додаток, що може відкрити цей файл.</string>
 	<string name="error_server_not_found">Сервер не знайдено.</string>
-	<string name="error_device_policy_manager_not_found">Відкрийте налаштування пристрою та встановіть блокування екрану вручну</string>
+	<string name="error_device_policy_manager_not_found">Відкрийте налаштування пристрою та вимкніть автоматичне блокування екрану</string>
 	<string name="error_export_illegal_file_name">Не вдалося виконати експорт. Спробуйте видалити спеціальні символи з імен файлів та експортувати знову.</string>
 	<string name="error_name_contains_invalid_characters">Не може містити спеціальні символи.</string>
 	<string name="error_names_contains_invalid_characters">Назва файлу не може містити спеціальні символи.</string>
 	<string name="error_vault_name_contains_invalid_characters">Назва сховища не може містити спеціальні символи.</string>
-	<string name="error_general_update">Помилка перевірки оновлення. Загальна помилка.</string>
-	<string name="error_hash_mismatch_update">Помилка перевірки оновлення. Хеш не збігається з завантаженим файлом</string>
+	<string name="error_general_update">Не вдалось перевірити наявність оновлення.</string>
+	<string name="error_hash_mismatch_update">Помилка оновлення. Розрахований хеш не відповідає вивантаженому файлу</string>
 	<string name="error_update_no_internet">Не вдалося перевірити оновлення. Немає з\'єднання з мережею.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Не вдалося розшифрувати пароль WebDAV, будь ласка, повторно додайте його в налаштування</string>
-	<string name="error_play_services_not_available">Google Play Services не встановлені</string>
-	<string name="error_biometric_auth_aborted">Біометрична автентифікація скасована</string>
-	<string name="error_vault_version_mismatch">Версія вказана в %1$s відрізняється від %2$s</string>
-	<string name="error_vault_key_invalid">%1$s не відповідає %2$s</string>
-	<string name="error_vault_config_loading">Загальна помилка при завантаженні конфігурації сховища</string>
-	<string name="error_file_not_found_after_opening_using_3party">Локальний файл більше не присутній посля повернення до Cryptomator. Можливі зміни не будуть застосовані до хмари.</string>
-	<string name="error_no_such_bucket">Відсутній бакет</string>
-	<string name="error_masterkey_location_not_supported">Користувацьке розташування Masterkey ще не підтримується</string>
-	<string name="error_interact_with_fdroid_but_fdroid_missing">Не вдалося зв\'язатися із застосунком F-Droid. Не встановлено?</string>
+	<string name="error_play_services_not_available">Сервіси Google Play не встановлено</string>
+	<string name="error_biometric_auth_aborted">Біометрична автентифікація перервана</string>
+	<string name="error_vault_version_mismatch">Версія вказана у %1$s відрізняється від %2$s</string>
+	<string name="error_vault_key_invalid">%1$s та %2$s не відповідають одне одному</string>
+	<string name="error_vault_config_loading">Помилка при завантаженні конфігурації сховища</string>
+	<string name="error_file_not_found_after_opening_using_3party">Локальний файл більше не існує після перепідключення до Cryptomator. Можливі зміни не можуть бути збережені у хмарі.</string>
+	<string name="error_no_such_bucket">Немає такого кошика (сховища)</string>
+	<string name="error_masterkey_location_not_supported">Користувацьке розташування універсального ключа ще не підтримується</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">Не вдалося зв\'язатися із застосунком F-Droid. Його встановлено?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Локальне сховище</string>
@@ -42,8 +42,8 @@
 	<!-- ## permission messages -->
 	<string name="permission_message_export_file">Cryptomator потребує доступу до сховища для експорту файлів</string>
 	<string name="permission_message_upload_file">Cryptomator потребує доступу до сховища для завантаження файлів</string>
-	<string name="permission_message_share_file">Cryptomator потребує доступу до сховища щоб ділитися файлами</string>
-	<string name="permission_revoked_re_request_permission">Криптоматор втратив дозвіл на доступ до цього розташування. Будь ласка, оберіть цю папку ще раз, щоб відновити дозвіл.</string>
+	<string name="permission_message_share_file">Cryptomator потребує доступу до сховища, щоб ділитися файлами</string>
+	<string name="permission_revoked_re_request_permission">Cryptomator втратив дозвіл на доступ до цього розташування. Будь ласка, оберіть цю папку ще раз, щоб відновити дозвіл.</string>
 	<string name="snack_bar_action_title_settings">Налаштування</string>
 	<string name="snack_bar_action_title_search">Пошук</string>
 	<string name="snack_bar_action_title_search_previous">Попередній</string>
@@ -51,19 +51,19 @@
 	<string name="snack_bar_action_title_sort">Сортування</string>
 	<string name="snack_bar_action_title_sort_az">А - Я</string>
 	<string name="snack_bar_action_title_sort_za">Я - А</string>
-	<string name="snack_bar_action_title_sort_newest">Спочатку новіші</string>
-	<string name="snack_bar_action_title_sort_oldest">Спочатку старіші</string>
-	<string name="snack_bar_action_title_sort_biggest">Спочатку найбільші</string>
+	<string name="snack_bar_action_title_sort_newest">Спершу новіші</string>
+	<string name="snack_bar_action_title_sort_oldest">Спершу старіші</string>
+	<string name="snack_bar_action_title_sort_biggest">Спершу найбільші</string>
 	<string name="snack_bar_action_title_sort_smallest">Спершу найменші</string>
 	<string name="snack_bar_cryptomator_variants_title">Детальніше</string>
-	<string name="snack_bar_cryptomator_variants_hint">Немає у списку?</string>
+	<string name="snack_bar_cryptomator_variants_hint">Хмара не у списку?</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
 	<string name="screen_vault_list_actions_title">Додати до Cryptomator</string>
 	<string name="screen_vault_list_action_create_new_vault">Створити нове сховище</string>
 	<string name="screen_vault_list_action_add_existing_vault">Додати існуюче сховище</string>
 	<string name="screen_vault_list_vault_action_delete">Прибрати</string>
-	<string name="screen_vault_list_vault_creation_hint">Натисніть тут, щоб створити новий vault</string>
+	<string name="screen_vault_list_vault_creation_hint">Натисніть тут, щоб створити нове сховище</string>
 	<string name="screen_vault_list_change_password_successful">Пароль успішно змінено</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Сховище</string>
@@ -71,33 +71,33 @@
 	<string name="screen_file_browser_create_new_vault_button_text">Розмістити тут</string>
 	<string name="screen_file_browser_create_new_vault_extra_text">Назва сховища: %1$s</string>
 	<plurals name="screen_file_browser_subtitle_move">
-		<item quantity="one">Перемістити %1$s у</item>
-		<item quantity="few">Перемістити %2$d елементи у</item>
-		<item quantity="many">Перемістити %2$d елементів у</item>
-		<item quantity="other">Перемістити %2$d елементів у</item>
+		<item quantity="one">Перемістити %1$s до</item>
+		<item quantity="few">Перемістити %2$d файли до</item>
+		<item quantity="many">Перемістити %2$d файлів до</item>
+		<item quantity="other">Перемістити %2$d файлів до</item>
 	</plurals>
 	<string name="screen_file_browser_move_button_text">Перемістити</string>
-	<string name="screen_file_browser_msg_empty_folder">Порожня тека</string>
+	<string name="screen_file_browser_msg_empty_folder">Порожня папка</string>
 	<string name="screen_file_browser_file_info_label_date">змінено %1$s тому</string>
-	<string name="screen_file_browser_share_intent_chooser_title">Поділитися за допомогою</string>
+	<string name="screen_file_browser_share_intent_chooser_title">Поділитися через</string>
 	<string name="screen_file_browser_share_destination_title">Оберіть призначення</string>
 	<string name="screen_file_browser_share_button_text">Оберіть</string>
-	<string name="screen_file_browser_nothing_to_share">Відсутні елементи для поширення</string>
+	<string name="screen_file_browser_nothing_to_share">Немає чим ділитись</string>
 	<string name="screen_file_browser_actions_title">Додати до %1$s</string>
-	<string name="screen_file_browser_action_create_folder">Створити теку</string>
+	<string name="screen_file_browser_action_create_folder">Створити папку</string>
 	<string name="screen_file_browser_action_create_new_text_file">Створити текстовий файл</string>
-	<string name="screen_file_browser_action_upload_files">Завантажити файли</string>
+	<string name="screen_file_browser_action_upload_files">Вивантажити файли</string>
 	<string name="screen_file_browser_upload_files_chooser_title">Файли</string>
 	<string name="screen_file_browser_msg_file_exported">Файл експортовано</string>
 	<string name="screen_file_browser_msg_files_exported">Файли експортовано</string>
-	<string name="screen_file_browser_nothing_to_export">Нічого експортувати</string>
-	<string name="screen_file_browser_msg_creating_download_dir_failed">Не вдалося створити каталог для завантажень</string>
+	<string name="screen_file_browser_nothing_to_export">Відсутні дані для експорту</string>
+	<string name="screen_file_browser_msg_creating_download_dir_failed">Не вдалося створити папку для завантажень</string>
 	<string name="screen_file_browser_node_action_share">Поділитись</string>
 	<string name="screen_file_browser_node_action_rename">Перейменувати</string>
 	<string name="screen_file_browser_node_action_edit_text">Редагувати</string>
-	<string name="screen_file_browser_node_action_export">Експорт</string>
+	<string name="screen_file_browser_node_action_export">Експортувати</string>
 	<string name="screen_file_browser_node_action_delete">Видалити</string>
-	<string name="screen_file_browser_node_action_open_with_text">Відкрити з&#8230;</string>
+	<string name="screen_file_browser_node_action_open_with_text">Відкрити за допомогою&#8230;</string>
 	<string name="screen_file_browser_selection_mode_title_zero_elements">Оберіть файли</string>
 	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">%1$d обрано</string>
 	<string name="screen_file_browser_select_items">Оберіть</string>
@@ -117,75 +117,75 @@
 	<string name="screen_share_files_save_button_text">Зберегти</string>
 	<string name="screen_share_files_msg_success">Шифрування завершено</string>
 	<!-- ## screen: choose cloud service -->
-	<string name="screen_choose_cloud_service_title">Хмарні служби</string>
+	<string name="screen_choose_cloud_service_title">Хмарна служба</string>
 	<!-- ## screen: cloud connections -->
-	<string name="screen_cloud_connections_title">Обрати місцерозташування</string>
+	<string name="screen_cloud_connections_title">Обрати розташування</string>
 	<string name="screen_cloud_connections_no_connections">Натисніть тут щоб додати нові розташування</string>
 	<string name="screen_cloud_error_webdav_not_supported">Схоже, сервер не сумісний з WebDAV</string>
-	<string name="screen_cloud_local_error_no_content_provider">Не знайдено менеджер файлів, який підтримує відкриття директорій</string>
+	<string name="screen_cloud_local_error_no_content_provider">Не знайдено менеджер файлів, який підтримує відкриття папок</string>
 	<!-- ## screen: webdav settings -->
-	<string name="screen_webdav_settings_url_port_label">Адреса посилання</string>
+	<string name="screen_webdav_settings_url_port_label">URL-посилання</string>
 	<string name="screen_webdav_settings_username_label">Ім\'я користувача</string>
 	<string name="screen_webdav_settings_password_label">Пароль</string>
 	<string name="screen_webdav_settings_done_button_text">Підключитися</string>
 	<string name="screen_webdav_settings_msg_url_must_not_be_empty">Посилання не може бути порожнім.</string>
 	<string name="screen_webdav_settings_msg_url_is_invalid">Неприпустима URL-адреса.</string>
-	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Поле для імені користувача не може бути порожнім.</string>
+	<string name="screen_webdav_settings_msg_username_must_not_be_empty">Поле імені користувача не може бути порожнім.</string>
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Пароль не може бути порожнім.</string>
 	<!-- ## screen: s3 settings -->
-	<string name="screen_s3_settings_display_name_label">Ім\'я для відображення</string>
+	<string name="screen_s3_settings_display_name_label">Публічне ім\'я</string>
 	<string name="screen_s3_settings_access_key_label">Ключ доступу</string>
 	<string name="screen_s3_settings_secret_key_label">Секретний ключ</string>
-	<string name="screen_s3_settings_bucket_label">Існуючий бакет</string>
-	<string name="screen_s3_settings_endpoint_label">Кінцева точка</string>
+	<string name="screen_s3_settings_bucket_label">Існуючий кошик</string>
+	<string name="screen_s3_settings_endpoint_label">Кінцева адреса з іменем хосту, портом і шляхом до кошика</string>
 	<string name="screen_s3_settings_region_label">Регіон</string>
-	<string name="screen_s3_settings_msg_display_name_not_empty">Ім\'я не може бути порожнім</string>
+	<string name="screen_s3_settings_msg_display_name_not_empty">Публічне ім\'я не може бути порожнім</string>
 	<string name="screen_s3_settings_msg_access_key_not_empty">Ключ доступу не може бути порожнім</string>
 	<string name="screen_s3_settings_msg_secret_key_not_empty">Секретний ключ не може бути порожнім</string>
-	<string name="screen_s3_settings_msg_bucket_not_empty">Бакет не може бути порожнім</string>
-	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Кінцева точка або регіон не можуть бути порожніми</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Кошик не може бути порожнім</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Кінцева адреса або регіон не можуть бути порожніми</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">Назва сховища не може бути порожньою.</string>
 	<string name="screen_enter_vault_name_vault_label">Назва сховища</string>
 	<string name="screen_enter_vault_name_button_text">Створити</string>
 	<!-- ## screen: set password -->
 	<string name="screen_set_password_title">Задати пароль</string>
-	<string name="screen_set_password_msg_password_mismatch">Пароль не збігається з введеним паролем.</string>
-	<string name="screen_set_password_button_text">Готово</string>
+	<string name="screen_set_password_msg_password_mismatch">Пароль не відповідає введеному.</string>
+	<string name="screen_set_password_button_text">Виконано</string>
 	<string name="screen_set_password_hint">ВАЖЛИВО: Якщо ви забудете пароль, то не зможете відновити дані.</string>
 	<string name="screen_set_password_retype_password_label">Введіть пароль ще раз</string>
 	<string name="screen_set_password_strength_indicator_0">Занадто слабкий пароль для створення сховища</string>
 	<string name="screen_set_password_strength_indicator_1">Слабкий</string>
-	<string name="screen_set_password_strength_indicator_2">Середній</string>
+	<string name="screen_set_password_strength_indicator_2">Посередній</string>
 	<string name="screen_set_password_strength_indicator_3">Надійний</string>
 	<string name="screen_set_password_strength_indicator_4">Дуже надійний</string>
 	<!-- ## screen: settings -->
 	<string name="screen_settings_section_general">Основні налаштування</string>
 	<string name="screen_settings_cloud_settings_label">Хмарні сервіси</string>
-	<string name="screen_settings_biometric_auth">Біометрична автентифікація</string>
-	<string name="screen_settings_activate_biometric_auth">Активувати біометричну автентифікацію</string>
+	<string name="screen_settings_biometric_auth">Біометрична авторизація</string>
+	<string name="screen_settings_activate_biometric_auth">Активувати біометричну авторизацію</string>
 	<string name="screen_settings_confirm_face_unlock">Підтвердити розблокування обличчям (якщо доступно)</string>
 	<string name="screen_settings_block_app_when_obscured">Блокувати програму при виникненні екрану</string>
-	<string name="screen_settings_block_app_when_obscured_summary">Блокувати перехоплення вводу й відображення інтерфейсу хибного ім\'я користувача</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Блокувати перехоплення вводу й показу хибного інтерфейсу користувача</string>
 	<string name="screen_settings_secure_screen">Блокувати знімки екрану</string>
-	<string name="screen_settings_secure_screen_summary">Блокувати знімки екрану в списку нещодавніх та в середині програми</string>
+	<string name="screen_settings_secure_screen_summary">Блокувати знімки екрану в списку нещодавніх та у додатку</string>
 	<string name="screen_settings_section_search">Пошук</string>
-	<string name="screen_settings_live_search">\"Живий\" пошук</string>
-	<string name="screen_settings_live_search_summary">Оновити результати пошуку при вході в запит</string>
+	<string name="screen_settings_live_search">Пошук в реальному часі</string>
+	<string name="screen_settings_live_search_summary">Оновити результати пошуку при введенні запиту</string>
 	<string name="screen_settings_glob_search">Пошук за допомогою глобального шаблону</string>
 	<string name="screen_settings_glob_search_summary">Використовувати шаблон, що відповідає аліасу.*.jpg</string>
 	<string name="screen_settings_section_auto_lock">Автоматичне блокування</string>
-	<string name="screen_settings_auto_lock_timeout">Блокувати після</string>
+	<string name="screen_settings_auto_lock_timeout">Блокувати через</string>
 	<string name="screen_settings_auto_lock_on_screen_lock">Коли екран вимкнено</string>
-	<string name="screen_settings_section_auto_photo_upload">Автоматичне завантаження фотографій</string>
-	<string name="screen_settings_section_auto_photo_upload_vault">Вибрати сховище для завантаження</string>
-	<string name="screen_settings_section_auto_photo_upload_toggle">Увімкнено</string>
-	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Захоплювати зображення у фоновому режимі і після розблокування вибраного сховища, почати завантаження</string>
+	<string name="screen_settings_section_auto_photo_upload">Автоматичне вивантаження фотографій</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Вибрати сховище для вивантаження</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle">Активне</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Утримувати зображення у фоновому режимі і після розблокування вибраного сховища почати вивантаження</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Вивантажити миттєво</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Вивантажувати, якщо сховище розблоковано</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Вивантажувати лише за допомогою Wi-Fi</string>
-	<string name="screen_settings_section_auto_photo_upload_including_videos">Завантажувати відео</string>
-	<string name="screen_settings_auto_photo_upload_title">Зберігати автозавантажені файли до&#8230;</string>
+	<string name="screen_settings_section_auto_photo_upload_including_videos">Вивантажувати відео</string>
+	<string name="screen_settings_auto_photo_upload_title">Зберігати автовивантажені файли до&#8230;</string>
 	<string name="screen_settings_website_label">Веб-сайт Cryptomator</string>
 	<string name="screen_settings_twitter_label">Стежте за нами у Twitter</string>
 	<string name="screen_settings_facebook_label">Вподобайте нас на Facebook</string>
@@ -194,12 +194,14 @@
 	<string name="screen_settings_license_terms_label">Ліцензійні умови</string>
 	<string name="screen_settings_section_support">Підтримка</string>
 	<string name="screen_settings_contact_label">Запит про допомогу</string>
-	<string name="screen_settings_debug_mode_label">Режим вiдладки</string>
+	<string name="screen_settings_debug_mode_label">Режим налагодження</string>
 	<string name="screen_settings_error_report_label">Надіслати файл журналу</string>
-	<string name="screen_settings_error_report_failed">Помилка надсилання</string>
+	<string name="screen_settings_error_report_failed">Не вдалося надіслати</string>
 	<string name="screen_settings_security_label">Поради з безпеки</string>
 	<string name="screen_settings_section_version">Версія</string>
 	<string name="screen_settings_advanced_settings">Розширені налаштування</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Альтернативний спосіб відкриття файлів Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Відкривати файли в додатках Microsoft з дозволом на запис</string>
 	<string name="screen_settings_background_unlock_preparation_label">Прискорити розблокування</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">Завантажити конфігурацію сховища у фоновому режимі під час вводу пароля або біометричної автентифікації</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">Залишати розблокованим</string>
@@ -207,21 +209,21 @@
 	<!-- ## screen: cloud settings -->
 	<string name="screen_cloud_settings_onedrive_connections">Підключення OneDrive</string>
 	<string name="screen_cloud_settings_webdav_connections">Підключення через WebDAV</string>
-	<string name="screen_cloud_settings_pcloud_connections">підключення до pCloud</string>
-	<string name="screen_cloud_settings_s3_connections">S3 підключення</string>
+	<string name="screen_cloud_settings_pcloud_connections">Підключення до pCloud</string>
+	<string name="screen_cloud_settings_s3_connections">S3-підключення</string>
 	<string name="screen_cloud_settings_local_storage_locations">Розташування локального сховища</string>
 	<string name="screen_cloud_settings_log_in_to">Увійти до</string>
 	<string name="screen_cloud_settings_sign_out_from_cloud">Вийти з</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
-	<string name="screen_authenticate_auth_authentication_failed">%1$s не може бути автентифіковано.</string>
+	<string name="screen_authenticate_auth_authentication_failed">%1$s не може бути авторизовано.</string>
 	<string name="screen_update_pcloud_connections_title">Оновити облікові дані pCloud</string>
 	<!-- ## screen: cryptomator app variants -->
 	<string name="screen_cryptomator_variants_title">Різновиди Cryptomator</string>
 	<string name="screen_cryptomator_variants_lite_title">Головний репозиторій F-Droid</string>
 	<string name="screen_cryptomator_variants_lite_description">Виключені, тому що потребують API ключі.</string>
 	<string name="screen_cryptomator_variants_lite_install">Встановити</string>
-	<string name="screen_cryptomator_variants_fdroid_title">Cryptomator F-Droid Репозиторій</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Репозиторій Cryptomator на F-Droid</string>
 	<string name="screen_cryptomator_variants_fdroid_description">Виключено, тому що він містить власні залежності.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Додати репозиторій Cryptomator у додаток F-Droid.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo">Додати</string>
@@ -232,16 +234,16 @@
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Скасувати</string>
 	<string name="dialog_enter_password_positive_button">Розблокувати</string>
-	<string name="dialog_change_password_old_password_label">Старий пароль</string>
+	<string name="dialog_change_password_old_password_label">Чинний пароль</string>
 	<string name="dialog_change_password_new_password_label">Новий пароль</string>
 	<string name="dialog_change_password">Змінити пароль</string>
-	<string name="dialog_change_password_msg_old_password_empty">Старий пароль не може бути порожнім.</string>
+	<string name="dialog_change_password_msg_old_password_empty">Чинний пароль не може бути порожнім.</string>
 	<string name="dialog_change_password_msg_new_password_empty">Новий пароль не може бути порожнім.</string>
 	<string name="dialog_change_password_msg_password_mismatch">Новий пароль не збігається з повторно введеним паролем.</string>
 	<!-- Vault not found -->
 	<string name="dialog_vault_not_found_title">Сховище %1$s не знайдено</string>
-	<string name="dialog_vault_not_found_message">Сховище було перейменовано, переміщено або видалено. Видаліть це сховище зі списку та додайте його знову, щоб продовжити. Видалити зараз?</string>
-	<string name="dialog_vault_not_found_positive_button_text">Прибрати</string>
+	<string name="dialog_vault_not_found_message">Сховище перейменоване, переміщене або видалене. Вилучіть це сховище зі списку та додайте його знову, щоб продовжити. Вилучити зараз?</string>
+	<string name="dialog_vault_not_found_positive_button_text">Вилучити</string>
 	<string name="dialog_existing_file_title">Файл вже існує</string>
 	<string name="dialog_existing_file_positive_button">Замінити</string>
 	<string name="dialog_existing_file_message">Файл з іменем \'%1$s\' вже існує.</string>
@@ -254,7 +256,7 @@
 	<string name="dialog_replace_msg_some_files_exists">%1$d файли вже існують. Бажаєте замінити їх?</string>
 	<string name="dialog_replace_title_single_file_exists">Замінити файл?</string>
 	<string name="dialog_replace_title_multiple_files_exist">Замінити файли?</string>
-	<string name="dialog_unable_to_share_title">Неможливо поширити файли</string>
+	<string name="dialog_unable_to_share_title">Неможливо поділитись файлами</string>
 	<string name="dialog_unable_to_share_message">Ви не налаштували жодного сховища. Спочатку створіть нове сховище за допомогою програми Cryptomator.</string>
 	<string name="dialog_unable_to_share_positive_button">Гаразд</string>
 	<string name="dialog_unable_to_share_negative_button">Створити сховище</string>
@@ -267,10 +269,10 @@
 	<string name="dialog_unsaved_changes_message">Ви справді хочете вийти без збереження?</string>
 	<string name="dialog_unsaved_changes_discard">Відхилити</string>
 	<string name="dialog_file_name_hint">Назва файлу</string>
-	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_file_name_placeholder">текст.txt</string>
 	<string name="dialog_delete_vault_message">Ви впевнені, що бажаєте видалити це сховище?</string>
 	<string name="dialog_delete_vault_hint">Ця дія тільки прибере сховище з цього списку, але не видалить його.</string>
-	<string name="dialog_upload_file_title">Завантаження&#8230;</string>
+	<string name="dialog_upload_file_title">Вивантаження&#8230;</string>
 	<string name="dialog_upload_file_remaining">Файл %1$d з %2$d</string>
 	<string name="dialog_export_file_title">Експорт (%1$d/%2$d)</string>
 	<string name="dialog_progress_please_wait">Будь ласка, зачекайте&#8230;</string>
@@ -282,44 +284,45 @@
 	<string name="dialog_progress_unlocking_vault">Розблокування сховища&#8230;</string>
 	<string name="dialog_progress_change_password">Зміна пароля&#8230;</string>
 	<string name="dialog_progress_creating_vault">Створення сховища&#8230;</string>
-	<string name="dialog_progress_upload_file">Завантаження&#8230;</string>
+	<string name="dialog_progress_upload_file">Вивантаження&#8230;</string>
 	<string name="dialog_progress_download_file">Завантаження&#8230;</string>
 	<string name="dialog_progress_encryption">Шифрування&#8230;</string>
 	<string name="dialog_progress_decryption">Розшифрування&#8230;</string>
 	<string name="action_progress_moving">Переміщення&#8230;</string>
-	<string name="dialog_lock_vault">Заблокувати</string>
+	<string name="dialog_lock_vault">Блокування</string>
 	<string name="dialog_accept_ssl_certificate_title">Неправильний SSL сертифікат</string>
 	<string name="dialog_accept_ssl_certificate_hint">Сертифікат SSL недійсний. Довіряти йому у будь-якому випадку?</string>
 	<string name="dialog_accept_ssl_certificate_details">Докладно</string>
 	<string name="dialog_accept_ssl_certificate_security_checkbox">Це може спричинити ризики безпеки. Я знаю, що роблю.</string>
-	<string name="dialog_ask_ignore_battery_optimizations_title">Вимкнути оптимізацію використання батареї</string>
-	<string name="dialog_ask_ignore_battery_optimizations_hint">Щоб отримувати нові зображення та відео без роботи у фоновому режимі, необхідно відключити оптимізацію заряду аккумулятора. Проте не хвилюйтесь, %1$s не споживає багато енергії.\n\nЩоб це зробити, змініть \"Додатки без оптимізації\" на \"Усі додатки\", оберіть %1$s і в цьому вікні оберіть \"Не оптимізувати\" після натискання \'%2$s\'.</string>
+	<string name="dialog_ask_ignore_battery_optimizations_title">Вимкніть оптимізацію використання батареї</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Щоб оновлювати зображення та відео без роботи у фоновому режимі, необхідно відключити оптимізацію споживання заряду аккумулятора для цього додатку. Проте не хвилюйтесь, %1$s не споживає багато енергії.\n\nЩоб це зробити, змініть \"Додатки без оптимізації\" на \"Усі додатки\", оберіть %1$s і встановіть \"Не оптимізувати\" після натискання \'%2$s\' в цьому вікні.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Не запитувати знову?</string>
 	<string name="dialog_http_security_hint">Використання HTTP небезпечне. Рекомендуємо замість цього використовувати HTTPS. Якщо ви усвідомлюєте ризики, ви можете продовжити з HTTP.</string>
 	<string name="dialog_http_security_checkbox">Змінити на HTTPS</string>
 	<string name="dialog_http_security_title">Використовувати HTTPS?</string>
-	<string name="dialog_no_screen_lock_hint">Не встановлено блокування екрану. Щоб надійно зберегти свої облікові дані, встановіть ключ чи пароль після натискання ОК.</string>
+	<string name="dialog_no_screen_lock_hint">Не встановлено блокування екрану. Щоб надійно зберегти свої облікові дані, встановіть пароль чи графічний ключ після натискання ОК.</string>
 	<string name="dialog_no_screen_lock_title">Встановити блокування екрану?</string>
 	<string name="dialog_no_screen_lock_checkbox">Встановлення блокування екрану</string>
 	<string name="dialog_no_biometric_auth_set_up_title">В системі не налаштовано базову автентифікацію</string>
-	<string name="dialog_no_biometric_auth_set_up_message">Встановіть як мінімум один відбиток/одне обличчя для використання цього сервісу.</string>
-	<string name="dialog_debug_mode_disclaimer_hint">У цьому режимі чутливі дані можуть бути записані в файл журналу на вашому пристрої (наприклад, імена файлів і шляхи). Паролі, файли cookie тощо не включаються.\n\nНе забудьте вимкнути режим налагодження за першої нагоди.</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Додайте щонайменше один відбиток пальця чи знімок обличчя для використання цього сервісу.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">У цьому режимі чутливі дані можуть бути записані в файл журналу на вашому пристрої (наприклад, імена файлів і шляхи). Але це не стосується паролів, файлів cookie тощо.\n\nНе забудьте вимкнути режим налагодження якнайшвидше.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Увага</string>
 	<string name="dialog_debug_mode_positive_button">Увімкнути</string>
-	<string name="dialog_disable_app_obscured_disclaimer_hint">Це налаштування пов\'язано із безпекою, і не дозволяє іншим додаткам вводити користувачів в оману та змушувати їх робити не те, чого вони хочуть.\n\nВідключаючи його, ви підтверджуєте, що <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">усвідомлюєте ризики</a>.</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Через помилку в додатках Microsoft, для редагування файлу, доступ до нього має бути надано таким додаткам у публічній папці на вашому пристрої. Після того, як Cryptomator припинить роботу - публічно доступний файл буде видалено, але водночас Cryptomator не впливає на те, що відбувалось з цим файлом, поки він є публічно доступним. Активовуючи цю опцію, ви маєте усвідомлювати наслідки таких дій з файлами. Її буде застосовано лише до типів файлів Microsoft.\n\nCryptomator буде перезавантажений після активації.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Це налаштування пов\'язане з безпекою, і не дозволяє іншим додаткам вводити користувачів в оману та змушувати їх робити те, чого вони не хочуть.\n\nВідключаючи його, ви підтверджуєте, що <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">усвідомлюєте ризики</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Увага</string>
 	<string name="dialog_disable_app_obscured_positive_button">Вимкнути</string>
-	<string name="dialog_app_is_obscured_info_title">Програму перекрито</string>
+	<string name="dialog_app_is_obscured_info_title">Інтерфейс додатка перекрито</string>
 	<string name="dialog_app_is_obscured_info_hint">Інший додаток відображає щось поверх Cryptomator (наприклад, фільтр синього світла або додаток нічного режиму). Cryptomator вимкнено з міркувань безпеки.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">Як увімкнути Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Закрити</string>
-	<string name="dialog_vaults_removed_during_migration_title">Будь ласка, знову додайте vaults для %1s хмари</string>
-	<string name="dialog_vaults_removed_during_migration_hint">Переходячи на цю версію додатка потрібно прибрати наступні сховища з додатка:\n%2s\n\nЦі сховища не видаляються з хмарного сховища, а лише прибираються з цього додатка. Перепрошуємо за незручності. Будь ласка, додайте ці сховища повторно, щоб продовжити роботу з ними.</string>
+	<string name="dialog_vaults_removed_during_migration_title">Будь ласка, знову додайте сховища з хмари для %1s</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Переходячи на цю версію додатка ми були змушені прибрати такі сховища з додатка:\n%2s\n\nЦі сховища не видаляються з хмари, а лише прибрано з цього додатка. Перепрошуємо за незручності. Будь ласка, додайте ці сховища повторно, щоб продовжити роботу з ними.</string>
 	<string name="dialog_vault_is_root_folder_of_cloud_title">Сховище є кореневим каталогом хмарного підключення</string>
-	<string name="dialog_vault_is_root_folder_of_cloud_hint">Для додавання цього сховища створіть нове хмарне підключення, в якому оберіть (принаймні) батьківський каталог цього сховища як кореневий каталог.</string>
-	<string name="dialog_disable_secure_screen_disclaimer_hint">Це налаштування пов\'язано із безпекою, і не дозволяє іншим додаткам вводити користувачів в оману та змушувати їх робити не те, чого вони хочуть.\n\nВідключаючи його, ви підтверджуєте, що <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">усвідомлюєте ризики</a>.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Для додавання цього сховища - створіть нове хмарне підключення, в якому оберіть в якості батьківського каталога цього сховища кореневий каталог або будь-яку іншу папку у хмарі.</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">Це налаштування пов\'язано із безпекою, і не дозволяє іншим додаткам вводити користувачів в оману та змушувати їх робити те, чого вони не хочуть.\n\nВідключаючи його, ви підтверджуєте, що <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">усвідомлюєте ризики</a>.</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_message">Ви дійсно хочете видалити це хмарне підключення?</string>
 	<string name="dialog_delete_cloud_connection_with_vaults_hint">Ця дія видалить підключення до хмари та всі сховища з цієї хмари.</string>
-	<string name="dialog_confirm_delete_multiple_title">Видалити %1$d об\'єкти?</string>
+	<string name="dialog_confirm_delete_multiple_title">Видалити %1$d об\'єкт(-и, -ів)?</string>
 	<string name="dialog_confirm_delete_multiple_message">Ви впевнені, що бажаєте видалити ці об\'єкти?</string>
 	<string name="dialog_confirm_delete_file_message">Ви впевнені, що бажаєте видалити цей файл?</string>
 	<string name="dialog_confirm_delete_folder_message">Це призведе до видалення усього вмісту директорії. Ви дійсно хочете видалити цю директорію?</string>
@@ -327,12 +330,12 @@
 	<string name="dialog_biometric_auth_key_invalidated_message">Оскільки ключ було анульовано, біометрична аутентифікація була деактивована. Для повторного увімкнення відкрийте налаштування Cryptomator.</string>
 	<string name="dialog_enter_license_title">Вкажіть дійсну ліцензію</string>
 	<string name="dialog_enter_license_content">Ми виявили, що ви встановили Cryptomator без використання Google Play Store. Надайте дійсну ліцензію, яку можна придбати на <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
-	<string name="dialog_enter_license_not_valid_content">Надана ліцензія недійсна. Переконайтеся, що ви ввели її правильно.</string>
-	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Наданий ключ - це сертифікат спонсора. Введіть дійсну ліцензію.</string>
-	<string name="dialog_enter_license_no_content">Немає ліцензії. Будь ласка, введіть дійсну ліцензію.</string>
+	<string name="dialog_enter_license_not_valid_content">Вказана ліцензія недійсна. Переконайтеся, що введено правильні дані.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Вказаний ключ призначений лише для комп\'ютерної версії (сертифікат спонсора). Будь ласка, вкажіть правильний ключ.</string>
+	<string name="dialog_enter_license_no_content">Відсутня ліцензія. Будь ласка, вкажіть ключ чинної ліцензії.</string>
 	<string name="dialog_enter_license_decline_button">Вийти</string>
-	<string name="dialog_license_confirmation_title">Підтвердження ліцензії</string>
-	<string name="dialog_license_confirmation_message">Дякую %1$s за надання дійсної ліцензії.</string>
+	<string name="dialog_license_confirmation_title">Ліцензію підтверджено</string>
+	<string name="dialog_license_confirmation_message">Дякуємо %1$s за надання Вашої чинної ліцензії.</string>
 	<string name="dialog_update_available_title">Доступне оновлення</string>
 	<string name="dialog_update_available_message">Оновіть Cryptomator до останньої версії. Натисніть ОК, щоб завантажити додаток у фоновому режимі, після чого з\'явиться запит на встановлення.</string>
 	<string name="dialog_update_available_update">Оновити зараз</string>
@@ -340,14 +343,14 @@
 	<string name="dialog_update_available_cancel">Пізніше</string>
 	<string name="dialog_download_update_title">Завантаження в процесі</string>
 	<string name="dialog_download_update_message">Завантаження останньої версії Cryptomator</string>
-	<string name="dialog_sym_link_title">Директорія - це символічне посилання</string>
+	<string name="dialog_sym_link_title">Папка є символічним посиланням</string>
 	<string name="dialog_sym_link_message">Ви не можете перейти за цим символічним посиланням</string>
 	<string name="dialog_sym_link_back_button">Назад</string>
-	<string name="dialog_no_dir_file_title">Не вдається завантажити вміст директорії</string>
-	<string name="dialog_no_dir_file_message">У хмарній директорії \'%1$s\' немає коректного файлу директорії. Можливо, директорія була створена на іншому пристрої та ще не повністю синхронізована із хмарним сховищем. Перевірте, чи існує у вашому хмарному сховищі цей файл та чи він не пустий:\n%2$s</string>
+	<string name="dialog_no_dir_file_title">Не вдається завантажити вміст папки</string>
+	<string name="dialog_no_dir_file_message">У хмарній папці \'%1$s\' немає коректного файлу директорії. Можливо, папка була створена на іншому пристрої та ще не повністю синхронізована із хмарним сховищем. Перевірте, чи існує у вашому хмарному сховищі цей файл та чи він не пустий:\n%2$s</string>
 	<string name="dialog_no_more_images_to_display">Зображень для показу більше немає&#8230;</string>
-	<string name="dialog_pcloud_credentials_updated_title">Дані облікового запису \'%1$s\' оновлено</string>
-	<string name="dialog_pcloud_credentials_updated">Якщо ви хочете додати новий обліковий запис pCloud, натисніть на цю адресу <a href="https://www.pcloud.com">www.pcloud. om</a>, вийдіть з поточного облікового запису та натисніть ще раз на \'+\' у цьому додатку, щоб створити нове хмарне підключення.</string>
+	<string name="dialog_pcloud_credentials_updated_title">Дані \'%1$s\' оновлено</string>
+	<string name="dialog_pcloud_credentials_updated">Якщо ви хочете додати новий обліковий запис pCloud, натисніть на цю адресу <a href="https://www.pcloud.com">www.pcloud.com</a>, вийдіть з поточного облікового запису та натисніть ще раз на \'+\' у цьому додатку, щоб створити нове хмарне підключення.</string>
 	<string name="permission_snackbar_auth_local_vault">Для використання локальних сховищ необхідно надати Cryptomator доступ до місця зберігання</string>
 	<string name="permission_snackbar_auth_auto_upload">Для автоматичного завантаження фото необхідно надати Cryptomator доступ до місця зберігання</string>
 	<string name="permission_snackbar_notifications">Для відображення статусу сховища необхідно надати Cryptomator дозвіл на сповіщення</string>
@@ -355,17 +358,17 @@
 	<!-- # misc -->
 	<!-- ## file size helper -->
 	<string name="file_size_zero">0 КБ</string>
-	<string name="file_size_unit_bytes">байти</string>
-	<string name="file_size_unit_kilo_bytes">кБ</string>
+	<string name="file_size_unit_bytes">байт</string>
+	<string name="file_size_unit_kilo_bytes">КБ</string>
 	<string name="file_size_unit_mega_bytes">МБ</string>
 	<string name="file_size_unit_giga_bytes">ГБ</string>
 	<string name="file_size_unit_tera_bytes">ТБ</string>
 	<!-- ## date helper -->
 	<string name="time_unit_seconds_sg">секунда</string>
 	<string name="time_unit_seconds_pl">секунд</string>
-	<string name="time_unit_minutes_sg">хвилину</string>
+	<string name="time_unit_minutes_sg">хвилина</string>
 	<string name="time_unit_minutes_pl">хвилин</string>
-	<string name="time_unit_hours_sg">годин</string>
+	<string name="time_unit_hours_sg">година</string>
 	<string name="time_unit_hours_pl">годин</string>
 	<string name="time_unit_days_sg">день</string>
 	<string name="time_unit_days_pl">днів</string>
@@ -379,7 +382,7 @@
 	<string name="dialog_biometric_auth_title">Біометричний вхід</string>
 	<string name="dialog_biometric_auth_message">Увійдіть, використовуючи ваші біометричні дані</string>
 	<string name="dialog_biometric_auth_use_password">Використовувати пароль сховища</string>
-	<string name="dialog_unable_to_auto_upload_files_title">Не вдалося автоматично завантажити файли</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Не вдалося автоматично вивантажити файли</string>
 	<!-- notification -->
 	<string name="notification_unlocked">Розблоковано сховищ: %1$d</string>
 	<string name="notification_timeout">Автоблокування через %1$s</string>
@@ -387,31 +390,32 @@
 	<string name="notification_cancel_auto_upload">Скасувати вивантаження</string>
 	<string name="notification_auto_upload_title">Автоматичне вивантаження фотографій в процесі</string>
 	<string name="notification_auto_upload_message">Вивантаження %1d/%2d</string>
-	<string name="notification_auto_upload_finished_title">Автозавантаження фото завершено</string>
-	<string name="notification_auto_upload_finished_message">%1$d зображення вивантажено до vault</string>
+	<string name="notification_auto_upload_finished_title">Автоматичне вивантаження фотографій завершено</string>
+	<string name="notification_auto_upload_finished_message">Зображення %1$d вивантажено до сховища</string>
 	<string name="notification_auto_upload_failed_title">Помилка при вивантаженні фотографій</string>
 	<string name="notification_auto_upload_failed_general_error">Виникла помилка під час вивантаження.</string>
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Вибрана тека для вивантаження більше недоступна. Перейдіть у налаштування для вибору іншої</string>
-	<string name="notification_auto_upload_failed_due_to_vault_locked">Vault заблоковано під час вивантаження, будь ласка, відкрийте vault знову, щоб продовжити</string>
-	<string name="notification_auto_upload_failed_due_to_vault_not_found">Vault, визначений для автоматичного вивантаження, більше не існує.</string>
-	<string name="notification_open_writable_file_title">Відкрити доступний для запису файл</string>
-	<string name="notification_open_writable_file_message">Сховище розблоковано до завершення редагування</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Сховище заблоковано під час вивантаження, будь ласка, відкрийте його знову, щоб продовжити</string>
+	<string name="notification_auto_upload_failed_due_to_vault_not_found">Сховище, визначене для автоматичного вивантаження, більше не існує.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Натисніть, щоб повторно авторизуватись.</string>
+	<string name="notification_open_writable_file_title">Відкрито файл</string>
+	<string name="notification_open_writable_file_message">Сховище залишатиметься розблокованим до завершення редагування</string>
 	<string name="notification_update_check_finished_latest">Встановлено найновішу версію</string>
-	<string name="notification_authenticating">Аутентифікація&#8230;</string>
+	<string name="notification_authenticating">Авторизація&#8230;</string>
 	<string name="screen_settings_lru_cache">Кеш</string>
-	<string name="screen_settings_lru_cache_toggle_summary">Кешувати зашифровані на пристрої нещодавні файли для подальшого використання при повторному відкритті</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Кешувати нещодавні файли в зашифрованому стані на пристрої для подальшого використання при повторному відкритті</string>
 	<string name="screen_settings_lru_cache_size">Загальний розмір кешу</string>
-	<string name="screen_settings_clear_lru_cache_size">Очистити кеш</string>
+	<string name="screen_settings_clear_lru_cache_size">Почистити кеш</string>
 	<string name="screen_settings_lru_cache_changed__restart_toast">Зміни наберуть чинності після перезапуску додатку</string>
-	<string name="screen_settings_license">Зареєстровано за</string>
+	<string name="screen_settings_license">Зареєстровано на</string>
 	<string name="screen_settings_license_mail">%1$s</string>
-	<string name="dialog_settings_update_check_interval_title">Інтервал перевірки оновлень</string>
+	<string name="dialog_settings_update_check_interval_title">Періодичність перевірки оновлень</string>
 	<string name="screen_settings_check_updates">Перевiрити наявнiсть оновлень</string>
-	<string name="screen_settings_last_check_updates">Останній запуск %1$s</string>
-	<string name="dialog_cache_size_title">Розмір кешу на кожне хмарне сховище</string>
+	<string name="screen_settings_last_check_updates">Востаннє перевірено %1$s</string>
+	<string name="dialog_cache_size_title">Розмір кешу на хмарне сховище</string>
 	<!-- lock timeout names -->
-	<string name="lock_timeout_instant">Миттєво</string>
-	<string name="lock_timeout_1m">1 хвилини</string>
+	<string name="lock_timeout_instant">Негайно</string>
+	<string name="lock_timeout_1m">1 хвилина</string>
 	<string name="lock_timeout_2m">2 хвилини</string>
 	<string name="lock_timeout_5m">5 хвилин</string>
 	<string name="lock_timeout_10m">10 хвилин</string>
@@ -425,7 +429,7 @@
 	<string name="cache_size_5000m">5 ГБ</string>
 	<!-- screen scheme mode names -->
 	<string name="screen_settings_style_mode">Стиль</string>
-	<string name="follow_system">Автоматичний (на основі системного)</string>
+	<string name="follow_system">Автоматично (системні налаштування)</string>
 	<string name="light">Світлий</string>
 	<string name="dark">Темний</string>
 	<!-- update interval names -->
diff --git a/presentation/src/main/res/values-vi-rVN/strings.xml b/presentation/src/main/res/values-vi-rVN/strings.xml
index f491ad157..6c9413d04 100644
--- a/presentation/src/main/res/values-vi-rVN/strings.xml
+++ b/presentation/src/main/res/values-vi-rVN/strings.xml
@@ -10,36 +10,45 @@
 	<string name="error_invalid_passphrase">Sai mật khẩu</string>
 	<string name="error_file_or_folder_exists">Tệp tin hoặc thư mục đã tồn tại.</string>
 	<string name="error_vault_version_not_supported">Phiên bản Vault %1$s không được hỗ trợ. Vault này đã được tạo bằng phiên bản Cryptomator cũ hơn hoặc mới hơn.</string>
+	<string name="error_vault_config_file_missing_due_to_format_999">Tệp %1$s bị thiếu trong thư mục vault của bạn. Đảm bảo rằng tệp này tồn tại trong thư mục vault của bạn trong đám mây.</string>
 	<string name="error_vault_already_exists">Vault đã tồn tại.</string>
 	<string name="error_no_such_file">Tệp tin không tồn tại.</string>
 	<string name="error_vault_has_been_locked">Vault đã khóa.</string>
+	<string name="error_cloud_already_exists">Đám mây đã tồn tại.</string>
 	<string name="error_activity_not_found">Hãy tải ứng dụng có thể mở được tệp tin này.</string>
 	<string name="error_server_not_found">Không tìm thấy máy chủ.</string>
 	<string name="error_device_policy_manager_not_found">Vui lòng mở cài đặt thiết bị của bạn và đặt khóa màn hình bằng tay</string>
 	<string name="error_export_illegal_file_name">Không xuất được. Cố gắng xóa các ký tự đặc biệt khỏi tên tệp và xuất lại.</string>
 	<string name="error_name_contains_invalid_characters">Không được chứa kí tự đặc biệt.</string>
 	<string name="error_names_contains_invalid_characters">Tên tệp tin không thể chứa ký tự đặc biệt.</string>
+	<string name="error_vault_name_contains_invalid_characters">Tên vault không được chứa các ký tự đặc biệt.</string>
 	<string name="error_general_update">Kiểm tra cập nhật không thành công. Đã xảy ra lỗi chung.</string>
+	<string name="error_hash_mismatch_update">Kiểm tra cập nhật không thành công. Hàm băm được tính toán không khớp với tệp đã tải lên</string>
 	<string name="error_update_no_internet">Kiểm tra cập nhật không thành công. Không có kết nối mạng.</string>
 	<string name="error_failed_to_decrypt_webdav_password">Giải mã mật khẩu WebDAV thất bại, vui lòng thêm lại vào cài đặt</string>
 	<string name="error_play_services_not_available">Dịch vụ Google Play chưa được cài đặt</string>
+	<string name="error_biometric_auth_aborted">Xác thực sinh trắc học bị huỷ bỏ</string>
 	<string name="error_vault_version_mismatch">Phiên bản được chỉ định trong %1$s khác với %2$s</string>
 	<string name="error_vault_key_invalid">%1$s không khớp với %2$s</string>
+	<string name="error_vault_config_loading">Lỗi không rõ khi tải cấu hình vault</string>
+	<string name="error_file_not_found_after_opening_using_3party">Tệp cục bộ không còn xuất hiện nữa sau khi chuyển về Cryptomator. Những thay đổi có thể xảy ra không thể được truyền trở lại đám mây.</string>
 	<string name="error_no_such_bucket">Không có vùng lưu trữ như vậy</string>
+	<string name="error_masterkey_location_not_supported">Vị trí tùy chọn của Khoá Chính chưa được hỗ trợ</string>
+	<string name="error_interact_with_fdroid_but_fdroid_missing">Không giao tiếp được với ứng dụng F-Droid. Chưa cài đặt?</string>
 	<!-- # clouds -->
 	<!-- ## cloud names -->
 	<string name="cloud_names_local_storage">Bộ nhớ cục bộ</string>
 	<!-- # permission -->
 	<!-- ## permission messages -->
-	<string name="permission_message_export_file">Cryptomator cần quyền truy cập bộ nhớ để xuất tệp</string>
-	<string name="permission_message_upload_file">Cryptomator cần quyền truy cập bộ nhớ tải tệp lên</string>
+	<string name="permission_message_export_file">Cryptomator cần truy cập nơi lưu trữ để xuất tệp</string>
+	<string name="permission_message_upload_file">Cryptomator cần quyền truy cập nơi lưu trữ để tải tệp lên</string>
 	<string name="permission_message_share_file">Cryptomator cần quyền truy cập bộ nhớ chia sẻ tệp</string>
 	<string name="permission_revoked_re_request_permission">Cryptomator đã mất quyền truy cập vào vị trí này. Vui lòng chọn lại thư mục này để khôi phục quyền.</string>
-	<string name="snack_bar_action_title_settings">Cài đặt</string>
+	<string name="snack_bar_action_title_settings">Các cài đặt</string>
 	<string name="snack_bar_action_title_search">Tìm kiếm</string>
-	<string name="snack_bar_action_title_search_previous">Quay lại</string>
-	<string name="snack_bar_action_title_search_next">Tiếp</string>
-	<string name="snack_bar_action_title_sort">Phân loại</string>
+	<string name="snack_bar_action_title_search_previous">Liền trước</string>
+	<string name="snack_bar_action_title_search_next">Tiếp sau</string>
+	<string name="snack_bar_action_title_sort">Sắp xếp</string>
 	<string name="snack_bar_action_title_sort_az">A - Z</string>
 	<string name="snack_bar_action_title_sort_za">Z - A</string>
 	<string name="snack_bar_action_title_sort_newest">Mới nhất trước</string>
@@ -47,16 +56,28 @@
 	<string name="snack_bar_action_title_sort_biggest">Lớn nhất trước</string>
 	<string name="snack_bar_action_title_sort_smallest">Nhỏ nhất trước</string>
 	<string name="snack_bar_cryptomator_variants_title">Xem thêm</string>
+	<string name="snack_bar_cryptomator_variants_hint">Đám mây không có trong danh sách?</string>
 	<!-- # screens -->
 	<!-- # screen: vault list -->
+	<string name="screen_vault_list_actions_title">Thêm vào Cryptomator</string>
+	<string name="screen_vault_list_action_create_new_vault">Tạo vault mới</string>
+	<string name="screen_vault_list_action_add_existing_vault">Thêm vault hiện có</string>
 	<string name="screen_vault_list_vault_action_delete">Xóa</string>
-	<string name="screen_vault_list_vault_creation_hint">Nhấn vào đây để tạo một cái mới</string>
+	<string name="screen_vault_list_vault_creation_hint">Nhấn vào đây để tạo một vault mới</string>
 	<string name="screen_vault_list_change_password_successful">Thay đổi mật khẩu thành công</string>
 	<!-- # screen: file browser -->
 	<string name="screen_file_browser_default_title">Vault</string>
+	<string name="screen_file_browser_add_existing_vault_extra_text">Chọn tệp khoá chính</string>
+	<string name="screen_file_browser_create_new_vault_button_text">Đặt ở đây</string>
+	<string name="screen_file_browser_create_new_vault_extra_text">Tên vault: %1$s</string>
+	<plurals name="screen_file_browser_subtitle_move">
+		<item quantity="other">Di chuyển %2$d mục tới</item>
+	</plurals>
 	<string name="screen_file_browser_move_button_text">Di chuyển</string>
 	<string name="screen_file_browser_msg_empty_folder">Thư mục trống</string>
+	<string name="screen_file_browser_file_info_label_date">đã sửa đổi %1$s trước</string>
 	<string name="screen_file_browser_share_intent_chooser_title">Chia sẻ với</string>
+	<string name="screen_file_browser_share_destination_title">Chọn điểm đến</string>
 	<string name="screen_file_browser_share_button_text">Chọn</string>
 	<string name="screen_file_browser_nothing_to_share">Không có gì để chia sẻ</string>
 	<string name="screen_file_browser_actions_title">Thêm vào %1$s</string>
@@ -73,6 +94,9 @@
 	<string name="screen_file_browser_node_action_edit_text">Chỉnh sửa</string>
 	<string name="screen_file_browser_node_action_export">Xuất</string>
 	<string name="screen_file_browser_node_action_delete">Xóa</string>
+	<string name="screen_file_browser_node_action_open_with_text">Mở bằng&#8230;</string>
+	<string name="screen_file_browser_selection_mode_title_zero_elements">Chọn các mục</string>
+	<string name="screen_file_browser_selection_mode_title_one_or_more_elements">Đã chọn %1$d</string>
 	<string name="screen_file_browser_select_items">Chọn</string>
 	<string name="screen_file_browser_select_all_items">Chọn tất cả</string>
 	<string name="screen_file_browser_refresh_items">Làm mới</string>
@@ -93,6 +117,9 @@
 	<string name="screen_choose_cloud_service_title">Dịch vụ đám mây</string>
 	<!-- ## screen: cloud connections -->
 	<string name="screen_cloud_connections_title">Chọn vị trí</string>
+	<string name="screen_cloud_connections_no_connections">Nhấn vào đây để thêm vị trí</string>
+	<string name="screen_cloud_error_webdav_not_supported">Máy chủ dường như không tương thích với WebDAV</string>
+	<string name="screen_cloud_local_error_no_content_provider">Không tìm thấy trình quản lý tệp nào hỗ trợ mở thư mục</string>
 	<!-- ## screen: webdav settings -->
 	<string name="screen_webdav_settings_url_port_label">URL</string>
 	<string name="screen_webdav_settings_username_label">Tên đăng nhập</string>
@@ -104,8 +131,16 @@
 	<string name="screen_webdav_settings_msg_password_must_not_be_empty">Mật khẩu không được để trống.</string>
 	<!-- ## screen: s3 settings -->
 	<string name="screen_s3_settings_display_name_label">Tên hiển thị</string>
+	<string name="screen_s3_settings_access_key_label">Khoá Truy cập</string>
+	<string name="screen_s3_settings_secret_key_label">Khoá Bí mật</string>
+	<string name="screen_s3_settings_bucket_label">Bucket Hiện có</string>
+	<string name="screen_s3_settings_endpoint_label">Điểm cuối</string>
 	<string name="screen_s3_settings_region_label">Khu vực</string>
 	<string name="screen_s3_settings_msg_display_name_not_empty">Tên hiển thị không được để trống</string>
+	<string name="screen_s3_settings_msg_access_key_not_empty">Khoá Truy cập không được để trống</string>
+	<string name="screen_s3_settings_msg_secret_key_not_empty">Khoá Bí mật không được để trống</string>
+	<string name="screen_s3_settings_msg_bucket_not_empty">Bucket không được để trống</string>
+	<string name="screen_s3_settings_msg_endpoint_and_region_not_empty">Điểm cuối hoặc Khu vực không được để trống</string>
 	<!-- ## screen: enter vault name -->
 	<string name="screen_enter_vault_name_msg_name_empty">Tên ault không thể để trống.</string>
 	<string name="screen_enter_vault_name_vault_label">Tên Vault</string>
@@ -113,7 +148,7 @@
 	<!-- ## screen: set password -->
 	<string name="screen_set_password_title">Đặt mật khẩu</string>
 	<string name="screen_set_password_msg_password_mismatch">Mật khẩu không khớp với mật khẩu đã nhập lại.</string>
-	<string name="screen_set_password_button_text">Xong</string>
+	<string name="screen_set_password_button_text">Hoàn thành</string>
 	<string name="screen_set_password_hint">QUAN TRỌNG: Nếu bạn quên mật khẩu, không có cách nào để khôi phục dữ liệu của bạn.</string>
 	<string name="screen_set_password_retype_password_label">Nhập lại mật khẩu</string>
 	<string name="screen_set_password_strength_indicator_0">Quá yếu để tạo vault</string>
@@ -127,88 +162,200 @@
 	<string name="screen_settings_biometric_auth">Xác thực sinh trắc học</string>
 	<string name="screen_settings_activate_biometric_auth">Kích hoạt xác thực sinh trắc học</string>
 	<string name="screen_settings_confirm_face_unlock">Xác nhận mở khóa bằng khuôn mặt (nếu có)</string>
+	<string name="screen_settings_block_app_when_obscured">Chặn ứng dụng khi bị che khuất</string>
+	<string name="screen_settings_block_app_when_obscured_summary">Ngăn chặn chặn đầu vào và hiển thị giao diện người dùng giả</string>
 	<string name="screen_settings_secure_screen">Chặn chụp màn hình</string>
 	<string name="screen_settings_secure_screen_summary">Chặn không cho chụp màn hình trong danh sách gần đây và bên trong ứng dụng</string>
 	<string name="screen_settings_section_search">Tìm kiếm</string>
 	<string name="screen_settings_live_search">Tìm kiếm trực tiếp</string>
 	<string name="screen_settings_live_search_summary">Cập nhật kết quả tìm kiếm trong khi nhập truy vấn</string>
+	<string name="screen_settings_glob_search">Tìm kiếm bằng mẫu glob</string>
+	<string name="screen_settings_glob_search_summary">Sử dụng khớp mẫu glob như anh.*.jpg</string>
 	<string name="screen_settings_section_auto_lock">Tự động khóa</string>
 	<string name="screen_settings_auto_lock_timeout">Khóa sau</string>
+	<string name="screen_settings_auto_lock_on_screen_lock">Khi màn hình bị tắt</string>
 	<string name="screen_settings_section_auto_photo_upload">Tự động tải ảnh lên</string>
+	<string name="screen_settings_section_auto_photo_upload_vault">Chọn vault để tải lên</string>
 	<string name="screen_settings_section_auto_photo_upload_toggle">Kích hoạt</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_summary">Chụp ảnh ở chế độ nền và sau khi vault đã chọn được mở khoá, hãy bắt đầu tải lên</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload">Tải lên ngay lập tức</string>
+	<string name="screen_settings_section_auto_photo_upload_toggle_instant_upload_summary">Tải lên trực tiếp nếu vault được mở khóa</string>
 	<string name="screen_settings_section_auto_photo_upload_only_wifi_toggle">Tải lên chỉ khi dùng W</string>
 	<string name="screen_settings_section_auto_photo_upload_including_videos">Tải lên video</string>
+	<string name="screen_settings_auto_photo_upload_title">Lưu tệp tải lên tự động vào&#8230;</string>
 	<string name="screen_settings_website_label">Cryptomator website</string>
 	<string name="screen_settings_twitter_label">Theo dõi trên Twitter</string>
 	<string name="screen_settings_facebook_label">Hãy like chúng tôi trên Facebook</string>
 	<string name="screen_settings_section_legal">Pháp lý</string>
 	<string name="screen_settings_licenses_label">Giấy phép</string>
+	<string name="screen_settings_license_terms_label">Điều khoản cấp phép</string>
 	<string name="screen_settings_section_support">Hỗ Trợ</string>
 	<string name="screen_settings_contact_label">Yêu cầu trợ giúp</string>
 	<string name="screen_settings_debug_mode_label">Chế độ gỡ lỗi</string>
+	<string name="screen_settings_error_report_label">Gửi tệp nhật ký</string>
 	<string name="screen_settings_error_report_failed">Gửi thất bại</string>
+	<string name="screen_settings_security_label">Gợi ý bảo mật</string>
 	<string name="screen_settings_section_version">Phiên bản</string>
 	<string name="screen_settings_advanced_settings">Cài đặt nâng cao</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">Giải pháp mở tệp Microsoft</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">Mở tệp trong ứng dụng Microsoft với quyền ghi</string>
+	<string name="screen_settings_background_unlock_preparation_label">Tăng tốc mở khoá</string>
+	<string name="screen_settings_background_unlock_preparation_label_summary">Tải xuống cấu hình vault trong nền khi được nhắc nhập mật khẩu hoặc xác thực sinh trắc học</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files">Giữ mở khóa</string>
+	<string name="screen_settings_keep_unlocked_while_editing_files_summary">Giữ cho vault được mở khoá trong khi chỉnh sửa tệp</string>
 	<!-- ## screen: cloud settings -->
 	<string name="screen_cloud_settings_onedrive_connections">Kết nối OneDrive</string>
 	<string name="screen_cloud_settings_webdav_connections">Kết nối WebDAV</string>
 	<string name="screen_cloud_settings_pcloud_connections">Kết nối pCloud</string>
 	<string name="screen_cloud_settings_s3_connections">Kết nối S3</string>
+	<string name="screen_cloud_settings_local_storage_locations">Vị trí lưu trữ cục bộ</string>
 	<string name="screen_cloud_settings_log_in_to">Đăng nhập vào</string>
 	<string name="screen_cloud_settings_sign_out_from_cloud">Đăng xuất từ</string>
 	<!-- ## screen: licenses -->
 	<!-- ## screen: authenticate cloud -->
+	<string name="screen_authenticate_auth_authentication_failed">%1$s không thể được xác thực.</string>
+	<string name="screen_update_pcloud_connections_title">Cập nhật thông tin đăng nhập pCloud</string>
 	<!-- ## screen: cryptomator app variants -->
+	<string name="screen_cryptomator_variants_title">Các biến thể của Cryptomator</string>
+	<string name="screen_cryptomator_variants_lite_title">Kho F-Droid Chính</string>
+	<string name="screen_cryptomator_variants_lite_description">Bị loại trừ vì chúng yêu cầu khoá API.</string>
 	<string name="screen_cryptomator_variants_lite_install">Cài đặt</string>
+	<string name="screen_cryptomator_variants_fdroid_title">Kho F-Droid Cryptomator</string>
+	<string name="screen_cryptomator_variants_fdroid_description">Bị loại trừ vì nó chứa các phụ thuộc độc quyền.</string>
+	<string name="screen_cryptomator_variants_fdroid_add_repo_hint">Thêm kho Cryptomator vào ứng dụng F-Droid.</string>
 	<string name="screen_cryptomator_variants_fdroid_add_repo">Thêm</string>
+	<string name="screen_cryptomator_variants_fdroid_install_hint">Cài đặt Cryptomator bằng F-Droid.\nNếu lỗi không tìm thấy hiển thị, hãy đợi cho đến khi quá trình đồng bộ hoá F-Droid kết thúc.</string>
 	<string name="screen_cryptomator_variants_website_title">Website</string>
+	<string name="screen_cryptomator_variants_website_description">Chứa các phụ thuộc độc quyền.</string>
+	<string name="screen_cryptomator_variants_installation_hint">Chuyển đổi từ hoặc đến biến thể trên kho F-Droid chính yêu cầu thiết lập lại ứng dụng.</string>
 	<!-- # dialogs -->
 	<string name="dialog_button_cancel">Hủy</string>
 	<string name="dialog_enter_password_positive_button">Mở khoá</string>
 	<string name="dialog_change_password_old_password_label">Mật khẩu cũ</string>
 	<string name="dialog_change_password_new_password_label">Mật khẩu mới</string>
 	<string name="dialog_change_password">Đổi mật khẩu</string>
+	<string name="dialog_change_password_msg_old_password_empty">Mật khẩu cũ không được để trống.</string>
+	<string name="dialog_change_password_msg_new_password_empty">Mật khẩu mới không được để trống.</string>
+	<string name="dialog_change_password_msg_password_mismatch">Mật khẩu mới không khớp với mật khẩu đã nhập lại.</string>
 	<!-- Vault not found -->
+	<string name="dialog_vault_not_found_title">Không tìm thấy vault %1$s</string>
+	<string name="dialog_vault_not_found_message">Vault đã bị đổi tên, di chuyển hoặc xoá. Xoá vault này khỏi danh sách và thêm lại để tiếp tục. Xoá ngay bây giờ?</string>
 	<string name="dialog_vault_not_found_positive_button_text">Xóa</string>
 	<string name="dialog_existing_file_title">Tệp tin đã tồn tại</string>
 	<string name="dialog_existing_file_positive_button">Thay thế</string>
+	<string name="dialog_existing_file_message">Tệp có tên \'%1$s\' đã tồn tại.</string>
+	<string name="dialog_replace_negative_button_at_least_two_but_not_all_files_exist">Bỏ qua đã tồn tại</string>
 	<string name="dialog_replace_positive_button_all_files_exist">Thay thế tất cả</string>
 	<string name="dialog_replace_positive_button_some_files_exist">Thay thế hiện có</string>
 	<string name="dialog_replace_positive_button_single_file_exists">Thay thế</string>
+	<string name="dialog_replace_msg_single_file_exists">Tệp có tên \'%1$s\' đã tồn tại. Bạn có muốn thay thế nó?</string>
+	<string name="dialog_replace_msg_all_files_exists">Tất cả các tệp đã tồn tại. Bạn có muốn thay thế chúng không?</string>
+	<string name="dialog_replace_msg_some_files_exists">%1$d tệp đã tồn tại. Bạn có muốn thay thế chúng không?</string>
 	<string name="dialog_replace_title_single_file_exists">Thay thế tệp tin?</string>
+	<string name="dialog_replace_title_multiple_files_exist">Thay thế tập tin?</string>
+	<string name="dialog_unable_to_share_title">Không thể chia sẻ tệp</string>
+	<string name="dialog_unable_to_share_message">Bạn chưa thiết lập bất kỳ vault nào. Trước tiên, hãy tạo một vault mới bằng ứng dụng Cryptomator.</string>
 	<string name="dialog_unable_to_share_positive_button">OK</string>
 	<string name="dialog_unable_to_share_negative_button">Tạo vault</string>
 	<string name="dialog_filetype_not_supported_title">Không thể mở %1$s</string>
+	<string name="dialog_filetype_not_supported_message">Vui lòng tải xuống một ứng dụng có thể mở tệp này hoặc bạn muốn lưu vào thiết bị của mình?</string>
 	<string name="dialog_rename_vault_title">Đổi tên vault</string>
+	<string name="dialog_rename_node_folder_title">Đổi tên thư mục</string>
 	<string name="dialog_rename_node_file_title">Đổi tên file</string>
 	<string name="dialog_unsaved_changes_title">Bạn chưa lưu thay đổi</string>
 	<string name="dialog_unsaved_changes_message">Bạn có thực sự muốn thoát mà không lưu?</string>
+	<string name="dialog_unsaved_changes_discard">Bỏ qua</string>
 	<string name="dialog_file_name_hint">Tên tệp</string>
 	<string name="dialog_file_name_placeholder">text.txt</string>
+	<string name="dialog_delete_vault_message">Bạn có chắc chắn muốn xoá vault này không?</string>
+	<string name="dialog_delete_vault_hint">Hành động này sẽ chỉ xoá vault khỏi danh sách này chứ không thực sự xoá nó.</string>
+	<string name="dialog_upload_file_title">Đang tải lên&#8230;</string>
+	<string name="dialog_upload_file_remaining">Tệp %1$d trên %2$d</string>
+	<string name="dialog_export_file_title">Đang xuất (%1$d/%2$d)</string>
+	<string name="dialog_progress_please_wait">Vui lòng chờ&#8230;</string>
+	<string name="dialog_progress_creating_folder">Đang tạo thư mục&#8230;</string>
+	<string name="dialog_progress_creating_text_file">Đang tạo tệp văn bản&#8230;</string>
+	<string name="action_progress_authentication">Xác thực&#8230;</string>
+	<string name="action_progress_renaming">Đang đổi tên&#8230;</string>
 	<string name="action_progress_deleting">Đang xóa&#8230;</string>
+	<string name="dialog_progress_unlocking_vault">Đang mở khoá vault&#8230;</string>
+	<string name="dialog_progress_change_password">Đang đổi mật khẩu&#8230;</string>
+	<string name="dialog_progress_creating_vault">Đang tạo vault&#8230;</string>
+	<string name="dialog_progress_upload_file">Đang tải lên&#8230;</string>
+	<string name="dialog_progress_download_file">Đang tải xuống&#8230;</string>
+	<string name="dialog_progress_encryption">Đang mã hoá&#8230;</string>
+	<string name="dialog_progress_decryption">Đang giải mã&#8230;</string>
+	<string name="action_progress_moving">Đang di chuyển&#8230;</string>
 	<string name="dialog_lock_vault">Khoá</string>
+	<string name="dialog_accept_ssl_certificate_title">Chứng chỉ SSL không hợp lệ</string>
+	<string name="dialog_accept_ssl_certificate_hint">Chứng chỉ SSL không hợp lệ. Bạn có muốn tin tưởng nó không?</string>
 	<string name="dialog_accept_ssl_certificate_details">Chi tiết</string>
+	<string name="dialog_accept_ssl_certificate_security_checkbox">Đây có thể là một rủi ro bảo mật. Tôi biết tôi đang làm gì.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_title">Tắt tối ưu pin</string>
+	<string name="dialog_ask_ignore_battery_optimizations_hint">Để truy xuất ảnh và video mới mà không chạy trong nền, chúng ta cần chọn không tham gia tối ưu hoá pin. Nhưng đừng lo, %1$s không tiêu tốn nhiều năng lượng.\n\nĐể áp dụng tính năng này, hãy thay đổi \'Không được tối ưu hoá \' thành \'Tất cả ứng dụng\', chọn %1$s và chọn \'Không tối ưu hoá\' sau khi nhấn vào \'%2$s\' trong hộp thoại này.</string>
 	<string name="dialog_ask_ignore_battery_optimizations_checkbox">Không hỏi lại?</string>
+	<string name="dialog_http_security_hint">Việc sử dụng HTTP không an toàn. Chúng tôi khuyên bạn nên sử dụng HTTPS để thay thế. Nếu bạn biết những rủi ro, bạn có thể tiếp tục với HTTP.</string>
 	<string name="dialog_http_security_checkbox">Chuyển sang HTTPS</string>
 	<string name="dialog_http_security_title">Dùng HTTPS?</string>
+	<string name="dialog_no_screen_lock_hint">Không có khoá màn hình nào được đặt. Để lưu trữ thông tin đăng nhập của bạn theo cách an toàn, hãy đặt một mẫu hình hoặc mật mã sau khi chọn OK.</string>
+	<string name="dialog_no_screen_lock_title">Đặt khoá màn hình?</string>
+	<string name="dialog_no_screen_lock_checkbox">Đặt khoá màn hình</string>
+	<string name="dialog_no_biometric_auth_set_up_title">Không có thiết lập xác thực cơ bản trong hệ thống</string>
+	<string name="dialog_no_biometric_auth_set_up_message">Đăng ký ít nhất một vân tay/khuôn mặt để sử dụng dịch vụ này.</string>
+	<string name="dialog_debug_mode_disclaimer_hint">Ở chế độ này, dữ liệu nhạy cảm có thể được ghi vào tệp nhật ký trên thiết bị của bạn (ví dụ: tên tệp và đường dẫn). Mật khẩu, cookie, v.v. được loại trừ rõ ràng.\n\nHãy nhớ tắt chế độ gỡ lỗi càng sớm càng tốt.</string>
 	<string name="dialog_debug_mode_disclaimer_title">Chú ý</string>
 	<string name="dialog_debug_mode_positive_button">Bật</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">Do lỗi trong các ứng dụng của Microsoft, tệp cần chỉnh sửa phải được chia sẻ với các ứng dụng này trong thư mục phương tiện công cộng trên thiết bị của bạn. Sau khi Cryptomator được tiếp tục, tệp có thể truy cập công khai sẽ bị xoá một lần nữa, nhưng Cryptomator không thể tác động đến những gì đã xảy ra với tệp này trong lúc ấy. Đảm bảo rằng bạn biết hành vi này khi kích hoạt tuỳ chọn này. Điều này sẽ chỉ áp dụng cho các loại tệp của Microsoft.\n\nCryptomator sẽ khởi động lại sau khi kích hoạt.</string>
+	<string name="dialog_disable_app_obscured_disclaimer_hint">Cài đặt này là một tính năng bảo mật và ngăn các ứng dụng khác lừa người dùng làm những việc mà họ không muốn làm.\n\nBằng việc tắt, bạn xác nhận rằng bạn <a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">biết các rủi ro</a>.</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">Chú ý</string>
 	<string name="dialog_disable_app_obscured_positive_button">Tắt</string>
+	<string name="dialog_app_is_obscured_info_title">Ứng dụng bị che khuất</string>
+	<string name="dialog_app_is_obscured_info_hint">Một ứng dụng khác đang hiển thị thứ gì đó phía trên Cryptomator (ví dụ: bộ lọc ánh sáng xanh hoặc ứng dụng chế độ ban đêm). Vì lý do bảo mật, Cryptomator bị tắt.\n\n<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">Cách bật Cryptomator</a></string>
 	<string name="dialog_app_is_obscured_info_neutral_button">Đóng</string>
+	<string name="dialog_vaults_removed_during_migration_title">Vui lòng thêm lại vault cho đám mây %1s</string>
+	<string name="dialog_vaults_removed_during_migration_hint">Trong khi nâng cấp sang phiên bản ứng dụng này, chúng tôi cần xoá các vault sau khỏi ứng dụng:\n%2s \n\nCác vault đó không bị xoá khỏi đám mây mà chỉ khỏi ứng dụng này. Xin lỗi vì sự bất tiện này và vui lòng thêm lại các vault này để tiếp tục làm việc với chúng.</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_title">Vault nằm ở thư mục gốc của kết nối đám mây</string>
+	<string name="dialog_vault_is_root_folder_of_cloud_hint">Tạo kết nối đám mây mới, nơi bạn tối thiểu chọn thư mục mẹ của thư mục vault này làm thư mục gốc, để thêm vault này.</string>
+	<string name="dialog_disable_secure_screen_disclaimer_hint">Cài đặt này là một tính năng bảo mật và ngăn các ứng dụng khác lừa người dùng làm những việc mà họ không muốn làm.\n\nBằng việc tắt, bạn xác nhận rằng bạn <a href="https://docs.cryptomator.org/en/1.6/android/settings/#screen-security">biết các rủi ro</a>.</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_message">Bạn có chắc chắn muốn xoá kết nối đám mây này không?</string>
+	<string name="dialog_delete_cloud_connection_with_vaults_hint">Hành động này sẽ xoá kết nối đám mây và tất cả các vault của đám mây này.</string>
+	<string name="dialog_confirm_delete_multiple_title">Xoá %1$d mục?</string>
+	<string name="dialog_confirm_delete_multiple_message">Bạn có chắc chắn muốn xoá các mục này không?</string>
 	<string name="dialog_confirm_delete_file_message">Bạn có chắc chắn muốn xóa file này?</string>
+	<string name="dialog_confirm_delete_folder_message">Thao tác này sẽ xoá tất cả nội dung của thư mục. Bạn có chắc chắn muốn xoá thư mục này?</string>
+	<string name="dialog_biometric_auth_key_invalidated_title">Đã tắt tính năng xác thực sinh trắc học</string>
+	<string name="dialog_biometric_auth_key_invalidated_message">Vì khoá đã bị vô hiệu nên tính năng xác thực sinh trắc học đã bị tắt. Để bật lại, hãy mở cài đặt Cryptomator.</string>
+	<string name="dialog_enter_license_title">Cung cấp giấy phép hợp lệ</string>
+	<string name="dialog_enter_license_content">Chúng tôi phát hiện ra rằng bạn đã cài đặt Cryptomator mà không sử dụng Cửa hàng Google Play. Cung cấp giấy phép hợp lệ, mà bạn có thể mua trên <a href="https://cryptomator.org/android/">https://cryptomator.org/android/</a></string>
+	<string name="dialog_enter_license_not_valid_content">Giấy phép được cung cấp không hợp lệ. Hãy chắc chắn rằng bạn đã nhập nó một cách chính xác.</string>
+	<string name="dialog_enter_license_not_valid_content_desktop_supporter_certificate">Khoá được cung cấp là chứng chỉ người hỗ trợ dành cho máy tính để bàn. Vui lòng nhập giấy phép hợp lệ.</string>
+	<string name="dialog_enter_license_no_content">Không có giấy phép được cung cấp. Vui lòng nhập giấy phép hợp lệ.</string>
 	<string name="dialog_enter_license_decline_button">Thoát</string>
+	<string name="dialog_license_confirmation_title">Xác nhận giấy phép</string>
+	<string name="dialog_license_confirmation_message">Cảm ơn %1$s đã cung cấp giấy phép hợp lệ của bạn.</string>
 	<string name="dialog_update_available_title">Đã có bản cập nhật</string>
+	<string name="dialog_update_available_message">Cập nhật Cryptomator lên phiên bản mới nhất. Bằng cách nhấn OK, chúng tôi sẽ tải xuống ứng dụng ở chế độ nền và sẽ yêu cầu bạn cài đặt ứng dụng đó.</string>
 	<string name="dialog_update_available_update">Cập nhật ngay</string>
 	<string name="dialog_update_available_download_site">Đến trang tải xuống</string>
 	<string name="dialog_update_available_cancel">Để sau</string>
 	<string name="dialog_download_update_title">Đang tải</string>
 	<string name="dialog_download_update_message">Đang tải phiên bản mới nhất của Cryptomator</string>
+	<string name="dialog_sym_link_title">Thư mục là một liên kết tượng trưng</string>
+	<string name="dialog_sym_link_message">Bạn không thể điều hướng vào liên kết tượng trưng này</string>
 	<string name="dialog_sym_link_back_button">Quay lại</string>
+	<string name="dialog_no_dir_file_title">Không thể tải nội dung của thư mục</string>
+	<string name="dialog_no_dir_file_message">Thư mục đám mây \'%1$s\' không có tệp thư mục hợp lệ. Có thể thư mục đã được tạo trên một thiết bị khác và chưa được đồng bộ hoá hoàn toàn với đám mây. Vui lòng kiểm tra trong đám mây của bạn rằng tệp sau tồn tại và không trống:\n%2$s</string>
+	<string name="dialog_no_more_images_to_display">Không còn hình ảnh để hiển thị&#8230;</string>
+	<string name="dialog_pcloud_credentials_updated_title">Đã cập nhật thông tin xác thực của \'%1$s\'</string>
+	<string name="dialog_pcloud_credentials_updated">Nếu bạn định thêm tài khoản pCloud mới, hãy nhấn vào url này <a href="https://www.pcloud.com">www.pcloud.com</a>, đăng xuất khỏi tài khoản hiện tại và nhấn lại vào \'+\' trong ứng dụng này để tạo kết nối đám mây mới.</string>
+	<string name="permission_snackbar_auth_local_vault">Cryptomator cần quyền truy cập bộ nhớ để sử dụng vault cục bộ</string>
+	<string name="permission_snackbar_auth_auto_upload">Cryptomator cần quyền truy cập bộ nhớ để sử dụng tính năng tự động tải ảnh lên</string>
+	<string name="permission_snackbar_notifications">Cryptomator cần quyền thông báo để hiển thị trạng thái vault chẳng hạn</string>
 	<!-- # error reports -->
 	<!-- # misc -->
 	<!-- ## file size helper -->
+	<string name="file_size_zero">0 kB</string>
+	<string name="file_size_unit_bytes">byte</string>
 	<string name="file_size_unit_kilo_bytes">kB</string>
 	<string name="file_size_unit_mega_bytes">MB</string>
 	<string name="file_size_unit_giga_bytes">GB</string>
@@ -230,12 +377,39 @@
 	<string name="time_unit_years_pl">năm</string>
 	<!-- ## biometric authentication -->
 	<string name="dialog_biometric_auth_title">Đăng nhập sinh trắc học</string>
+	<string name="dialog_biometric_auth_message">Đăng nhập bằng thông tin sinh trắc học của bạn</string>
+	<string name="dialog_biometric_auth_use_password">Sử dụng mật khẩu vault</string>
+	<string name="dialog_unable_to_auto_upload_files_title">Không thể tự động tải tệp lên</string>
 	<!-- notification -->
+	<string name="notification_unlocked">Vault đã được mở khoá: %1$d</string>
+	<string name="notification_timeout">Tự động khoá trong %1$s</string>
 	<string name="notification_lock_all">Khóa tất cả</string>
 	<string name="notification_cancel_auto_upload">Hủy tải lên</string>
+	<string name="notification_auto_upload_title">Tải ảnh tự động đang chạy</string>
+	<string name="notification_auto_upload_message">Đang tải lên %1d/%2d</string>
+	<string name="notification_auto_upload_finished_title">Đã hoàn tất tải ảnh tự động lên</string>
+	<string name="notification_auto_upload_finished_message">%1$d hình ảnh được tải lên vault</string>
+	<string name="notification_auto_upload_failed_title">Tự động tải ảnh lên không thành công</string>
+	<string name="notification_auto_upload_failed_general_error">Đã xảy ra lỗi không rõ trong quá trình tải lên.</string>
+	<string name="notification_auto_upload_failed_due_to_folder_not_exists">Thư mục đã chọn để tải lên không còn nữa. Chuyển đến cài đặt và chọn một cái mới</string>
+	<string name="notification_auto_upload_failed_due_to_vault_locked">Vault bị khoá trong khi tải lên, vui lòng mở lại vault để tiếp tục</string>
+	<string name="notification_auto_upload_failed_due_to_vault_not_found">Vault được chỉ định để tự động tải lên không còn tồn tại.</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">Nhấn để làm mới xác thực.</string>
+	<string name="notification_open_writable_file_title">Mở tệp có thể ghi</string>
+	<string name="notification_open_writable_file_message">Vault vẫn mở khoá cho đến khi chỉnh sửa xong</string>
+	<string name="notification_update_check_finished_latest">Phiên bản mới nhất được cài đặt</string>
+	<string name="notification_authenticating">Đang xác thực&#8230;</string>
 	<string name="screen_settings_lru_cache">Bộ nhớ cache</string>
+	<string name="screen_settings_lru_cache_toggle_summary">Lưu đệm các tệp được truy cập gần đây trong khi mã hoá cục bộ trên thiết bị để sử dụng lại sau này khi mở lại</string>
+	<string name="screen_settings_lru_cache_size">Tổng kích thước bộ đệm</string>
 	<string name="screen_settings_clear_lru_cache_size">Xóa bộ nhớ Cache</string>
+	<string name="screen_settings_lru_cache_changed__restart_toast">Các thay đổi sẽ được áp dụng vào lần tiếp theo ứng dụng khởi động lại</string>
+	<string name="screen_settings_license">Đăng ký cho</string>
+	<string name="screen_settings_license_mail">%1$s</string>
+	<string name="dialog_settings_update_check_interval_title">Khoảng thời gian kiểm tra cập nhật</string>
 	<string name="screen_settings_check_updates">Kiểm tra cập nhật</string>
+	<string name="screen_settings_last_check_updates">Lần chạy cuối %1$s</string>
+	<string name="dialog_cache_size_title">Kích thước bộ đệm trên mỗi đám mây</string>
 	<!-- lock timeout names -->
 	<string name="lock_timeout_1m">1 phút</string>
 	<string name="lock_timeout_2m">2 phút</string>
diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml
index d61c7a808..cadda576d 100644
--- a/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/presentation/src/main/res/values-zh-rCN/strings.xml
@@ -394,7 +394,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">所选文件夹无法再上传，请转到设置并选择一个新的文件夹</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">上传期间保险库锁定了，请重新打开保险库以继续</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">用于自动上传的指定保险库已不存在。</string>
-	<string name="notification_auto_upload_failed_due_to_authentication_problem">轻触刷新身份验证</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">轻触刷新身份验证。</string>
 	<string name="notification_open_writable_file_title">打开可写文件</string>
 	<string name="notification_open_writable_file_message">编辑期间保险库保持解锁</string>
 	<string name="notification_update_check_finished_latest">已安装最新版本</string>
diff --git a/presentation/src/main/res/values-zh-rHK/strings.xml b/presentation/src/main/res/values-zh-rHK/strings.xml
index 49ece676a..8ef5b828e 100644
--- a/presentation/src/main/res/values-zh-rHK/strings.xml
+++ b/presentation/src/main/res/values-zh-rHK/strings.xml
@@ -197,6 +197,8 @@
 	<string name="screen_settings_security_label">安全提示</string>
 	<string name="screen_settings_section_version">版本</string>
 	<string name="screen_settings_advanced_settings">進階設定</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">打開 Microsoft 檔案的解決方法</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">使用寫入權限在 Microsoft 應用程式中開啟檔案</string>
 	<string name="screen_settings_background_unlock_preparation_label">加速解鎖</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">在提示輸入密碼或進行生物識別驗證時，在背景下載加密庫設定</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">保持解鎖</string>
@@ -303,6 +305,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">在此模式下，敏感數據可能會寫入您設備上的日誌文件（例如文件名和路徑）。密碼、 cookies 等被明確排除在外。\n\n請記住盡快停用除錯模式。</string>
 	<string name="dialog_debug_mode_disclaimer_title">注意</string>
 	<string name="dialog_debug_mode_positive_button">啟用</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">由於 Microsoft 應用程式中的錯誤，必須將檔案分享到公用資料夾才能進行編輯。一旦 Cryptomator 繼續運作，可以公開存取的相應檔案將再次被刪除，但 Cryptomator 無法影響在此期間該檔案所發生的情況。請確保在啟用此選項時了解此行為。此問題僅適用於 Microsoft 文件類型。\n\n啟用該選項後，Cryptomator 將重新啟動。</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">此設定是一項安全功能，可防止其他應用程式誤導用戶錯誤地操作。\n\n如果停用這項功能，請確定你已經了解<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">風險</a>。</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">注意</string>
 	<string name="dialog_disable_app_obscured_positive_button">停用</string>
@@ -391,6 +394,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">已選擇的資料夾無法使用，請在設定重新選擇。</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">加密庫在上載期間鎖定，請解鎖加密庫以繼續上載。</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">指定自動上傳的加密庫已不存在。</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">輕觸更新身份驗證。</string>
 	<string name="notification_open_writable_file_title">開啟讀取的文件</string>
 	<string name="notification_open_writable_file_message">加密庫將在編輯期間保持解鎖狀態</string>
 	<string name="notification_update_check_finished_latest">已安裝最新版本</string>
diff --git a/presentation/src/main/res/values-zh-rTW/strings.xml b/presentation/src/main/res/values-zh-rTW/strings.xml
index 1b91cd93a..c59b814f4 100644
--- a/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/presentation/src/main/res/values-zh-rTW/strings.xml
@@ -197,6 +197,8 @@
 	<string name="screen_settings_security_label">安全提示</string>
 	<string name="screen_settings_section_version">版本</string>
 	<string name="screen_settings_advanced_settings">進階設定</string>
+	<string name="screen_settings_microsoft_apps_workaround_label">開啟 Microsoft 檔案的替代方案</string>
+	<string name="screen_settings_microsoft_apps_workaround_summary">使用寫入權限於 Microsoft 應用程式中開啟檔案</string>
 	<string name="screen_settings_background_unlock_preparation_label">加速解鎖</string>
 	<string name="screen_settings_background_unlock_preparation_label_summary">在提示輸入密碼或生物識別身份驗證時在後台下載保險庫配置</string>
 	<string name="screen_settings_keep_unlocked_while_editing_files">保持解鎖</string>
@@ -303,6 +305,7 @@
 	<string name="dialog_debug_mode_disclaimer_hint">在此模式下，敏感數據可能會寫入您設備上的日誌文件(例如文件名和路徑)。 密碼、cookies 等被明確排除在外。\n\n請記住盡快禁用調試模式。</string>
 	<string name="dialog_debug_mode_disclaimer_title">注意</string>
 	<string name="dialog_debug_mode_positive_button">啟用</string>
+	<string name="dialog_microsoft_workaround_disclaimer_hint">由於 Microsoft 應用程式中的錯誤，必須將檔案分享到公用資料夾才能進行編輯。一旦 Cryptomator 繼續運作，可以公開存取的相應檔案將再次被刪除，但 Cryptomator 無法影響在此期間該檔案所發生的情況。請確保在啟用此選項時了解此行為。此問題僅適用於 Microsoft 文件類型。\n\n啟用該選項後，Cryptomator 將重新啟動。</string>
 	<string name="dialog_disable_app_obscured_disclaimer_hint">此設定是一項安全功能，可防止其他應用程式欺騙用戶做他們不想做的事情。\n\n如果停用這項功能，請確定你已經<a href="https://docs.cryptomator.org/en/1.6/android/settings/#block-app-when-obscured">了解風險</a>。</string>
 	<string name="dialog_disable_app_obscured_disclaimer_title">注意</string>
 	<string name="dialog_disable_app_obscured_positive_button">停用</string>
@@ -391,6 +394,7 @@
 	<string name="notification_auto_upload_failed_due_to_folder_not_exists">您選擇的資料夾無法使用，請至設定重新選擇。</string>
 	<string name="notification_auto_upload_failed_due_to_vault_locked">加密檔案庫在上傳期間鎖定，請重新打開加密檔案庫後繼續</string>
 	<string name="notification_auto_upload_failed_due_to_vault_not_found">使用於自動上傳的加密檔案庫已不存在。</string>
+	<string name="notification_auto_upload_failed_due_to_authentication_problem">輕觸以更新身份驗證。</string>
 	<string name="notification_open_writable_file_title">開啟可讀寫檔案</string>
 	<string name="notification_open_writable_file_message">加密檔案庫將在編輯期間保持解鎖狀態</string>
 	<string name="notification_update_check_finished_latest">已安裝最新版本</string>
diff --git a/presentation/src/main/res/values/ic_launcher_background.xml b/presentation/src/main/res/values/ic_launcher_background.xml
index c5d5899fd..ea6a69e1f 100644
--- a/presentation/src/main/res/values/ic_launcher_background.xml
+++ b/presentation/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
+	<color name="ic_launcher_background">#FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/presentation/src/main/res/xml/licenses.xml b/presentation/src/main/res/xml/licenses.xml
index a3f346e3d..606e34fc1 100644
--- a/presentation/src/main/res/xml/licenses.xml
+++ b/presentation/src/main/res/xml/licenses.xml
@@ -148,6 +148,13 @@
 				android:action="android.intent.action.VIEW"
 				android:data="https://github.com/davemorrissey/subsampling-scale-image-view" />
 		</Preference>
+		<Preference
+			android:summary="Apache License v2"
+			android:title="Timber">
+			<intent
+				android:action="android.intent.action.VIEW"
+				android:data="https://github.com/JakeWharton/timber" />
+		</Preference>
 		<Preference
 			android:summary="Apache License v2"
 			android:title="Velocity (The Apache Software Foundation)">
diff --git a/presentation/src/main/res/xml/preferences.xml b/presentation/src/main/res/xml/preferences.xml
index 3c6fe0fd4..3a4fdaaa6 100644
--- a/presentation/src/main/res/xml/preferences.xml
+++ b/presentation/src/main/res/xml/preferences.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/activityRootView">
+	android:id="@+id/activity_root_view">
 
 	<PreferenceCategory
 		android:key="license"
@@ -174,18 +174,18 @@
 			android:summary="@string/screen_settings_microsoft_apps_workaround_summary"
 			android:title="@string/screen_settings_microsoft_apps_workaround_label" />
 
-		<SwitchPreference
-			android:defaultValue="true"
-			android:key="backgroundUnlockPreparation"
-			android:summary="@string/screen_settings_background_unlock_preparation_label_summary"
-			android:title="@string/screen_settings_background_unlock_preparation_label" />
-
 		<SwitchPreference
 			android:defaultValue="false"
 			android:key="keepUnlockedWhileEditing"
 			android:summary="@string/screen_settings_keep_unlocked_while_editing_files_summary"
 			android:title="@string/screen_settings_keep_unlocked_while_editing_files" />
 
+		<SwitchPreference
+			android:defaultValue="true"
+			android:key="backgroundUnlockPreparation"
+			android:summary="@string/screen_settings_background_unlock_preparation_label_summary"
+			android:title="@string/screen_settings_background_unlock_preparation_label" />
+
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/screen_settings_section_social">
diff --git a/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java b/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java
index 874b49ee9..a8bdc0199 100644
--- a/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java
+++ b/presentation/src/test/java/org/cryptomator/presentation/presenter/VaultListPresenterTest.java
@@ -1,11 +1,5 @@
 package org.cryptomator.presentation.presenter;
 
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static java.util.Arrays.asList;
-
 import android.app.Activity;
 
 import org.cryptomator.data.util.NetworkConnectionCheck;
@@ -44,6 +38,12 @@
 import java.util.Collections;
 import java.util.List;
 
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static java.util.Arrays.asList;
+
 public class VaultListPresenterTest {
 
 	private static final String A_NEW_VAULT_NAME = "Haribo";
diff --git a/settings.gradle b/settings.gradle
index cf7883a7d..326464e57 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1 @@
-include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util', ':pcloud-sdk-java-root', ':pcloud-sdk-java', ':subsampling-image-view'
-
-var libFolder = new File(rootDir, 'lib')
-
-project(':pcloud-sdk-java-root').projectDir = file(new File(libFolder, 'pcloud-sdk-java'))
-project(':pcloud-sdk-java').projectDir = file(new File(libFolder, 'pcloud-sdk-java/java-core'))
-project(':subsampling-image-view').projectDir = file(new File(libFolder, 'subsampling-scale-image-view/library'))
+include ':generator', ':presentation', ':generator-api', ':domain', ':data', ':util'
diff --git a/src/fdroid/fastlane/metadata/android/de-DE/changelogs/default.txt b/src/fdroid/fastlane/metadata/android/de-DE/changelogs/default.txt
index 1badea199..992a99407 100644
--- a/src/fdroid/fastlane/metadata/android/de-DE/changelogs/default.txt
+++ b/src/fdroid/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
-- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
-- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
-- Übersetzungen aktualisiert
\ No newline at end of file
+- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
+- Update auf die neueste Android-Version
+- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
+- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
+- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
diff --git a/src/fdroid/fastlane/metadata/android/en-US/changelogs/default.txt b/src/fdroid/fastlane/metadata/android/en-US/changelogs/default.txt
index 7854290b5..c12e16f1a 100644
--- a/src/fdroid/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/src/fdroid/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Add workaround for editing files in Microsoft Office apps
-- Add support for themed Cryptomator icon
-- Refresh stale authentication token during auto upload
-- Update translations
\ No newline at end of file
+- Preserve original file modification date during upload (if possible)
+- Update to latest Android version
+- Fix for uploading files larger than 2GB in WebDAV
+- Fix vault unlock on Samsung devices
+- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
diff --git a/src/fdroid/fastlane/metadata/android/fr-FR/changelogs/default.txt b/src/fdroid/fastlane/metadata/android/fr-FR/changelogs/default.txt
index 7854290b5..c12e16f1a 100644
--- a/src/fdroid/fastlane/metadata/android/fr-FR/changelogs/default.txt
+++ b/src/fdroid/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Add workaround for editing files in Microsoft Office apps
-- Add support for themed Cryptomator icon
-- Refresh stale authentication token during auto upload
-- Update translations
\ No newline at end of file
+- Preserve original file modification date during upload (if possible)
+- Update to latest Android version
+- Fix for uploading files larger than 2GB in WebDAV
+- Fix vault unlock on Samsung devices
+- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
diff --git a/src/lite/fastlane/metadata/android/de-DE/changelogs/default.txt b/src/lite/fastlane/metadata/android/de-DE/changelogs/default.txt
index 1badea199..992a99407 100644
--- a/src/lite/fastlane/metadata/android/de-DE/changelogs/default.txt
+++ b/src/lite/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
-- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
-- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
-- Übersetzungen aktualisiert
\ No newline at end of file
+- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
+- Update auf die neueste Android-Version
+- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
+- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
+- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
diff --git a/src/lite/fastlane/metadata/android/en-US/changelogs/default.txt b/src/lite/fastlane/metadata/android/en-US/changelogs/default.txt
index 7854290b5..c12e16f1a 100644
--- a/src/lite/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/src/lite/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Add workaround for editing files in Microsoft Office apps
-- Add support for themed Cryptomator icon
-- Refresh stale authentication token during auto upload
-- Update translations
\ No newline at end of file
+- Preserve original file modification date during upload (if possible)
+- Update to latest Android version
+- Fix for uploading files larger than 2GB in WebDAV
+- Fix vault unlock on Samsung devices
+- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
diff --git a/src/lite/fastlane/metadata/android/fr-FR/changelogs/default.txt b/src/lite/fastlane/metadata/android/fr-FR/changelogs/default.txt
index 7854290b5..c12e16f1a 100644
--- a/src/lite/fastlane/metadata/android/fr-FR/changelogs/default.txt
+++ b/src/lite/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Add workaround for editing files in Microsoft Office apps
-- Add support for themed Cryptomator icon
-- Refresh stale authentication token during auto upload
-- Update translations
\ No newline at end of file
+- Preserve original file modification date during upload (if possible)
+- Update to latest Android version
+- Fix for uploading files larger than 2GB in WebDAV
+- Fix vault unlock on Samsung devices
+- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
diff --git a/src/playstore/fastlane/metadata/android/de-DE/changelogs/default.txt b/src/playstore/fastlane/metadata/android/de-DE/changelogs/default.txt
index 1badea199..992a99407 100644
--- a/src/playstore/fastlane/metadata/android/de-DE/changelogs/default.txt
+++ b/src/playstore/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
-- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
-- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
-- Übersetzungen aktualisiert
\ No newline at end of file
+- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
+- Update auf die neueste Android-Version
+- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
+- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
+- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
diff --git a/src/playstore/fastlane/metadata/android/en-US/changelogs/default.txt b/src/playstore/fastlane/metadata/android/en-US/changelogs/default.txt
index 7854290b5..c12e16f1a 100644
--- a/src/playstore/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/src/playstore/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Add workaround for editing files in Microsoft Office apps
-- Add support for themed Cryptomator icon
-- Refresh stale authentication token during auto upload
-- Update translations
\ No newline at end of file
+- Preserve original file modification date during upload (if possible)
+- Update to latest Android version
+- Fix for uploading files larger than 2GB in WebDAV
+- Fix vault unlock on Samsung devices
+- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
diff --git a/src/playstore/fastlane/metadata/android/fr-FR/changelogs/default.txt b/src/playstore/fastlane/metadata/android/fr-FR/changelogs/default.txt
index 7854290b5..c12e16f1a 100644
--- a/src/playstore/fastlane/metadata/android/fr-FR/changelogs/default.txt
+++ b/src/playstore/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -1,4 +1,5 @@
-- Add workaround for editing files in Microsoft Office apps
-- Add support for themed Cryptomator icon
-- Refresh stale authentication token during auto upload
-- Update translations
\ No newline at end of file
+- Preserve original file modification date during upload (if possible)
+- Update to latest Android version
+- Fix for uploading files larger than 2GB in WebDAV
+- Fix vault unlock on Samsung devices
+- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
diff --git a/util/build.gradle b/util/build.gradle
index cf4659cff..0fe3afade 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -19,8 +19,8 @@ android {
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
 	}
 	packagingOptions {
 		jniLibs {
diff --git a/util/src/main/java/org/cryptomator/util/ExceptionUtil.java b/util/src/main/java/org/cryptomator/util/ExceptionUtil.java
index 3bb4d4131..446bddada 100644
--- a/util/src/main/java/org/cryptomator/util/ExceptionUtil.java
+++ b/util/src/main/java/org/cryptomator/util/ExceptionUtil.java
@@ -1,8 +1,6 @@
 package org.cryptomator.util;
 
-import com.google.common.base.Predicates;
-
-import com.google.common.base.Optional;
+import java.util.Optional;
 import java.util.function.Predicate;
 
 public class ExceptionUtil {
@@ -23,16 +21,16 @@ public static <T extends Throwable> Predicate<T> thatHasMessage(final String mes
 
 	public static <T extends Throwable> Optional<T> extract(final Throwable e, final Class<T> type, final Predicate<T> test) {
 		if (type.isInstance(e) && test.test(type.cast(e))) {
-			return Optional.fromNullable(type.cast(e));
+			return Optional.ofNullable(type.cast(e));
 		}
 		if (e.getCause() != null) {
 			return extract(e.getCause(), type, test);
 		}
-		return Optional.absent();
+		return Optional.empty();
 	}
 
 	public static <T extends Throwable> Optional<T> extract(final Throwable e, final Class<T> type) {
-		return extract(e, type, Predicates.alwaysTrue());
+		return extract(e, type, t -> true);
 	}
 
 	public static <T extends Throwable> boolean contains(Throwable e, Class<T> type) {
@@ -42,5 +40,4 @@ public static <T extends Throwable> boolean contains(Throwable e, Class<T> type)
 	public static <T extends Throwable> boolean contains(Throwable e, Class<T> type, Predicate<T> test) {
 		return extract(e, type, test).isPresent();
 	}
-
 }
diff --git a/util/src/main/java/org/cryptomator/util/NamedTimberLogger.kt b/util/src/main/java/org/cryptomator/util/NamedTimberLogger.kt
new file mode 100644
index 000000000..1b9c23aeb
--- /dev/null
+++ b/util/src/main/java/org/cryptomator/util/NamedTimberLogger.kt
@@ -0,0 +1,222 @@
+/*
+ * Parts of this file have been copied from the "timber" project by Jake Wharton, hosted on GitHub.
+ * The pertaining file can be found here: https://github.com/JakeWharton/timber/blob/9954d94abbaea9d003243be5b69f8ae0ffc0c99d/timber/src/main/java/timber/log/Timber.kt
+ *
+ * Copied elements include:
+ * - The head of all contained functions in the "NamedTimberLogger" class, but not the body
+ * - The first line of documentation of all contained functions in the "NamedTimberLogger" class
+ *
+ * The following notice ONLY applies to that particular source code. Unless stated otherwise,
+ * any other source code in this file or in this project is subject to the license of the project, which can be found in the "License" section of this project's README.
+ *
+ * ---
+ *
+ * Copyright 2013 Jake Wharton
+ * Use of this source code is governed by the Apache 2.0 license that can be found at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THIS FILE WAS CHANGED BY THE LICENSEE, I.E. IT CONTAINS CHANGES NOT MADE BY THE ORIGINAL CONTRIBUTORS LISTED ABOVE.
+ */
+package org.cryptomator.util
+
+import org.jetbrains.annotations.NonNls
+import timber.log.Timber
+
+fun Timber.Forest.named(tag: String): NamedTimberLogger {
+	return NamedTimberLogger(tag)
+}
+
+/**
+ * This class is a facade for the [companion object of Timber][Timber.Forest]
+ * that emits each message with this classes [tag] parameter.
+ */
+class NamedTimberLogger(private val tag: String) {
+
+	/** Log a verbose message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.v] with it.
+	 */
+	fun v(@NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.v(message, *args)
+	}
+
+	/** Log a verbose exception and a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.v] with it.
+	 */
+	fun v(t: Throwable?, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.v(t, message, *args)
+	}
+
+	/** Log a verbose exception.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.v] with it.
+	 */
+	fun v(t: Throwable?) {
+		Timber.tag(tag)
+		Timber.v(t)
+	}
+
+	/** Log a debug message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.d] with it.
+	 */
+	fun d(@NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.d(message, *args)
+	}
+
+	/** Log a debug exception and a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.d] with it.
+	 */
+	fun d(t: Throwable?, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.d(t, message, *args)
+	}
+
+	/** Log a debug exception.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.d] with it.
+	 */
+	fun d(t: Throwable?) {
+		Timber.tag(tag)
+		Timber.d(t)
+	}
+
+	/** Log an info message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.i] with it.
+	 */
+	fun i(@NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.i(message, *args)
+	}
+
+	/** Log an info exception and a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.i] with it.
+	 */
+	fun i(t: Throwable?, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.i(t, message, *args)
+	}
+
+	/** Log an info exception.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.i] with it.
+	 */
+	fun i(t: Throwable?) {
+		Timber.tag(tag)
+		Timber.i(t)
+	}
+
+	/** Log a warning message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.w] with it.
+	 */
+	fun w(@NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.w(message, *args)
+	}
+
+	/** Log a warning exception and a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.w] with it.
+	 */
+	fun w(t: Throwable?, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.w(t, message, *args)
+	}
+
+	/** Log a warning exception.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.w] with it.
+	 */
+	fun w(t: Throwable?) {
+		Timber.tag(tag)
+		Timber.w(t)
+	}
+
+	/** Log an error message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.e] with it.
+	 */
+	fun e(@NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.e(message, *args)
+	}
+
+	/** Log an error exception and a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.e] with it.
+	 */
+	fun e(t: Throwable?, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.e(t, message, *args)
+	}
+
+	/** Log an error exception.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.e] with it.
+	 */
+	fun e(t: Throwable?) {
+		Timber.tag(tag)
+		Timber.e(t)
+	}
+
+	/** Log an assert message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.wtf] with it.
+	 */
+	fun wtf(@NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.wtf(message, *args)
+	}
+
+	/** Log an assert exception and a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.wtf] with it.
+	 */
+	fun wtf(t: Throwable?, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.wtf(t, message, *args)
+	}
+
+	/** Log an assert exception.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.wtf] with it.
+	 */
+	fun wtf(t: Throwable?) {
+		Timber.tag(tag)
+		Timber.wtf(t)
+	}
+
+	/** Log at `priority` a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.log] with it.
+	 */
+	fun log(priority: Int, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.log(priority, message, *args)
+	}
+
+	/** Log at `priority` an exception and a message with optional format args.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.log] with it.
+	 */
+	fun log(priority: Int, t: Throwable?, @NonNls message: String?, vararg args: Any?) {
+		Timber.tag(tag)
+		Timber.log(priority, t, message, *args)
+	}
+
+	/** Log at `priority` an exception.
+	 *
+	 * This method uses this classes [tag] and calls [Timber.log] with it.
+	 */
+	fun log(priority: Int, t: Throwable?) {
+		Timber.tag(tag)
+		Timber.log(priority, t)
+	}
+}
\ No newline at end of file
diff --git a/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt b/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
index 229a43907..0847e17c8 100644
--- a/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
+++ b/util/src/main/java/org/cryptomator/util/SharedPreferencesHandler.kt
@@ -165,7 +165,7 @@ constructor(context: Context) : SharedPreferences.OnSharedPreferenceChangeListen
 		return defaultSharedPreferences.getValue(USE_LRU_CACHE, false)
 	}
 
-	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
 		if (LOCK_TIMEOUT == key) {
 			val lockTimeout = lockTimeout
 			lockTimeoutChangedListeners.keys.forEach { listener ->
diff --git a/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java b/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java
index 85e3ae147..c87e51108 100644
--- a/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java
+++ b/util/src/main/java/org/cryptomator/util/crypto/KeyStoreBuilder.java
@@ -25,9 +25,9 @@ private static KeyStore initializeKeyStore() {
 			keyStore.load(null);
 			return keyStore;
 		} catch (IOException //
-				| KeyStoreException //
-				| CertificateException //
-				| NoSuchAlgorithmException e) {
+				 | KeyStoreException //
+				 | CertificateException //
+				 | NoSuchAlgorithmException e) {
 			throw new RuntimeException(e);
 		}
 	}
@@ -94,9 +94,9 @@ private boolean doesKeyExist(String alias) {
 				keyStore.load(null);
 				isKeyStoreCertAliasExisted = keyStore.containsAlias(alias);
 			} catch (KeyStoreException //
-					| CertificateException //
-					| NoSuchAlgorithmException //
-					| IOException e) {
+					 | CertificateException //
+					 | NoSuchAlgorithmException //
+					 | IOException e) {
 				throw new RuntimeException(e);
 			}
 
diff --git a/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt b/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt
index d3fa5dc64..b3d2fbee3 100644
--- a/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt
+++ b/util/src/main/java/org/cryptomator/util/file/LruFileCacheUtil.kt
@@ -13,7 +13,6 @@ import java.nio.file.Files
 import java.nio.file.NoSuchFileException
 import java.nio.file.Path
 import java.nio.file.StandardCopyOption
-import java.util.Comparator
 import timber.log.Timber
 
 class LruFileCacheUtil(context: Context) {
diff --git a/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java b/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java
index 619dd9a19..4898c47aa 100644
--- a/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java
+++ b/util/src/test/java/org/cryptomator/util/matchers/OptionalMatchers.java
@@ -1,11 +1,11 @@
 package org.cryptomator.util.matchers;
 
+import com.google.common.base.Optional;
+
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
-import com.google.common.base.Optional;
-
 public class OptionalMatchers {
 
 	public static Matcher<Optional<?>> anEmptyOptional() {