diff --git a/build.gradle.kts b/build.gradle.kts
index d896b1df6..4274c166c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0-alpha12")
+        classpath("com.android.tools.build:gradle:7.0.0-alpha13")
         classpath("com.google.gms:google-services:4.3.5")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 2a1e68950..f9aa190ad 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -1,11 +1,11 @@
-++--- androidx.databinding:viewbinding:7.0.0-alpha12
+++--- androidx.databinding:viewbinding:7.0.0-alpha13
 +|    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-++--- androidx.databinding:databinding-common:7.0.0-alpha12
-++--- androidx.databinding:databinding-runtime:7.0.0-alpha12
+++--- androidx.databinding:databinding-common:7.0.0-alpha13
+++--- androidx.databinding:databinding-runtime:7.0.0-alpha13
 +|    +--- androidx.collection:collection:1.0.0 -> 1.1.0
 +|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-common:7.0.0-alpha12
-+|    +--- androidx.databinding:viewbinding:7.0.0-alpha12 (*)
++|    +--- androidx.databinding:databinding-common:7.0.0-alpha13
++|    +--- androidx.databinding:viewbinding:7.0.0-alpha13 (*)
 +|    \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1
 +|         +--- androidx.arch.core:core-runtime:2.1.0
 +|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -15,10 +15,10 @@
 +|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         +--- androidx.arch.core:core-common:2.1.0 (*)
 +|         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-++--- androidx.databinding:databinding-adapters:7.0.0-alpha12
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha12 (*)
-+|    \--- androidx.databinding:databinding-common:7.0.0-alpha12
-++--- androidx.databinding:databinding-ktx:7.0.0-alpha12
+++--- androidx.databinding:databinding-adapters:7.0.0-alpha13
++|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*)
++|    \--- androidx.databinding:databinding-common:7.0.0-alpha13
+++--- androidx.databinding:databinding-ktx:7.0.0-alpha13
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 +|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
@@ -93,11 +93,11 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.31 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
 +|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha12 (*)
-+|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30
-+|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.31 (*)
-+|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30
-+|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.31 (*)
++|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*)
++|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31
++|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*)
++|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31
++|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*)
 ++--- com.gitlab.abaker:dav4jvm:deb2c9aef8
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.31 (*)
 +|    \--- org.apache.commons:commons-lang3:3.8.1
@@ -107,7 +107,7 @@
 +|    |    +--- commons-codec:commons-codec:1.11
 +|    |    +--- org.apache.commons:commons-lang3:3.8.1
 +|    |    \--- org.apache.commons:commons-collections4:4.1
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.31 (*)
 +|    +--- com.sun.mail:android-mail:1.6.5
 +|    |    \--- com.sun.mail:android-activation:1.6.5
 +|    +--- commons-io:commons-io:2.6
@@ -118,10 +118,10 @@
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*)
 ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
-+|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha12
-+|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha12 (*)
-+|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha12 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*)
++|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha13
++|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha13 (*)
++|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha13 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.31 (*)
 +|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |    +--- androidx.core:core:1.5.0-rc01 (*)
@@ -351,7 +351,7 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.31 (*)
 +|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
 ++--- com.etesync:journalmanager:1.1.1
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.30 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.31 (*)
 +|    +--- com.madgag.spongycastle:core:1.54.0.0
 +|    +--- com.madgag.spongycastle:prov:1.54.0.0
 +|    |    \--- com.madgag.spongycastle:core:1.54.0.0
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 86231412d..72ede53fe 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -1,11 +1,11 @@
-++--- androidx.databinding:viewbinding:7.0.0-alpha12
+++--- androidx.databinding:viewbinding:7.0.0-alpha13
 +|    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-++--- androidx.databinding:databinding-common:7.0.0-alpha12
-++--- androidx.databinding:databinding-runtime:7.0.0-alpha12
+++--- androidx.databinding:databinding-common:7.0.0-alpha13
+++--- androidx.databinding:databinding-runtime:7.0.0-alpha13
 +|    +--- androidx.collection:collection:1.0.0 -> 1.1.0
 +|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-common:7.0.0-alpha12
-+|    +--- androidx.databinding:viewbinding:7.0.0-alpha12 (*)
++|    +--- androidx.databinding:databinding-common:7.0.0-alpha13
++|    +--- androidx.databinding:viewbinding:7.0.0-alpha13 (*)
 +|    \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.3.1
 +|         +--- androidx.arch.core:core-runtime:2.1.0
 +|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -15,10 +15,10 @@
 +|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         +--- androidx.arch.core:core-common:2.1.0 (*)
 +|         \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
-++--- androidx.databinding:databinding-adapters:7.0.0-alpha12
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha12 (*)
-+|    \--- androidx.databinding:databinding-common:7.0.0-alpha12
-++--- androidx.databinding:databinding-ktx:7.0.0-alpha12
+++--- androidx.databinding:databinding-adapters:7.0.0-alpha13
++|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*)
++|    \--- androidx.databinding:databinding-common:7.0.0-alpha13
+++--- androidx.databinding:databinding-ktx:7.0.0-alpha13
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 +|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
@@ -93,11 +93,11 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.31 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
 +|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha12 (*)
-+|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30
-+|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.31 (*)
-+|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30
-+|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.4.31 (*)
++|    +--- androidx.databinding:databinding-runtime:7.0.0-alpha13 (*)
++|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31
++|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*)
++|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31
++|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*)
 ++--- com.google.firebase:firebase-crashlytics:17.4.0
 +|    +--- com.google.android.datatransport:transport-api:2.2.1
 +|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -192,7 +192,7 @@
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |    +--- com.google.firebase:firebase-common:19.5.0 (*)
 +|    |    +--- com.google.firebase:firebase-components:16.1.0 (*)
-+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.30 (*)
++|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.31 (*)
 +|    +--- com.google.firebase:firebase-components:16.1.0 (*)
 +|    +--- com.google.firebase:firebase-config:20.0.4
 +|    |    +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.2.0 (*)
@@ -204,7 +204,7 @@
 +|    |    \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*)
 +|    +--- com.google.firebase:firebase-installations:16.3.5 (*)
 +|    +--- com.google.firebase:firebase-installations-interop:16.0.1 (*)
-+|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.30 (*)
++|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.31 (*)
 ++--- com.google.android.gms:play-services-location:18.0.0
 +|    +--- com.google.android.gms:play-services-base:17.5.0
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
@@ -230,7 +230,7 @@
 +|    |    +--- commons-codec:commons-codec:1.11
 +|    |    +--- org.apache.commons:commons-lang3:3.8.1
 +|    |    \--- org.apache.commons:commons-collections4:4.1
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.31 (*)
 +|    +--- com.sun.mail:android-mail:1.6.5
 +|    |    \--- com.sun.mail:android-activation:1.6.5
 +|    +--- commons-io:commons-io:2.6
@@ -241,10 +241,10 @@
 +|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|         \--- androidx.core:core:1.3.2 -> 1.5.0-rc01 (*)
 ++--- com.gitlab.bitfireAT:cert4android:26a91a729f
-+|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha12
-+|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha12 (*)
-+|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha12 (*)
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.30 (*)
++|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-alpha13
++|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-alpha13 (*)
++|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-alpha13 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.31 (*)
 +|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |    +--- androidx.core:core:1.5.0-rc01 (*)
@@ -465,7 +465,7 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.31 (*)
 +|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*)
 ++--- com.etesync:journalmanager:1.1.1
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.30 (*)
++|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.31 (*)
 +|    +--- com.madgag.spongycastle:core:1.54.0.0
 +|    +--- com.madgag.spongycastle:prov:1.54.0.0
 +|    |    \--- com.madgag.spongycastle:core:1.54.0.0