diff --git a/build.gradle.kts b/build.gradle.kts
index 10fa1d62d..25a20fbdd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0-beta02")
+        classpath("com.android.tools.build:gradle:7.0.0-beta03")
         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/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 6867da985..fa4b840a2 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -13,7 +13,7 @@ object Versions {
     const val mockito = "3.9.0"
     const val androidx_test = "1.3.0"
     const val make_it_easy = "4.0.1"
-    const val hilt = "2.35.1"
+    const val hilt = "2.36"
     const val hilt_androidx = "1.0.0"
     const val lifecycle = "2.3.0"
     const val markwon = "4.6.2"
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 4236226cf..17694980f 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -1,11 +1,11 @@
-++--- androidx.databinding:viewbinding:7.0.0-beta02
+++--- androidx.databinding:viewbinding:7.0.0-beta03
 +|    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-++--- androidx.databinding:databinding-common:7.0.0-beta02
-++--- androidx.databinding:databinding-runtime:7.0.0-beta02
+++--- androidx.databinding:databinding-common:7.0.0-beta03
+++--- androidx.databinding:databinding-runtime:7.0.0-beta03
 +|    +--- 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-beta02
-+|    +--- androidx.databinding:viewbinding:7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-common:7.0.0-beta03
++|    +--- androidx.databinding:viewbinding:7.0.0-beta03 (*)
 +|    \--- 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-beta02
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
-+|    \--- androidx.databinding:databinding-common:7.0.0-beta02
-++--- androidx.databinding:databinding-ktx:7.0.0-beta02
+++--- androidx.databinding:databinding-adapters:7.0.0-beta03
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta03 (*)
++|    \--- androidx.databinding:databinding-common:7.0.0-beta03
+++--- androidx.databinding:databinding-ktx:7.0.0-beta03
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3
 +|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
@@ -93,7 +93,7 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta03 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
@@ -118,9 +118,9 @@
 +|         +--- 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-beta02
-+|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta02 (*)
-+|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta03
++|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta03 (*)
++|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta03 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*)
 +|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -216,12 +216,12 @@
 +|    +--- org.dmfs:lib-recur:0.11.4
 +|    |    \--- org.dmfs:rfc5545-datetime:0.2.4
 +|    \--- org.dmfs:jems:1.33
-++--- com.google.dagger:hilt-android:2.35.1
-+|    +--- com.google.dagger:dagger:2.35.1
+++--- com.google.dagger:hilt-android:2.36
++|    +--- com.google.dagger:dagger:2.36
 +|    |    \--- javax.inject:javax.inject:1
-+|    +--- com.google.dagger:dagger-lint-aar:2.35.1
-+|    +--- com.google.dagger:hilt-core:2.35.1
-+|    |    +--- com.google.dagger:dagger:2.35.1 (*)
++|    +--- com.google.dagger:dagger-lint-aar:2.36
++|    +--- com.google.dagger:hilt-core:2.36
++|    |    +--- com.google.dagger:dagger:2.36 (*)
 +|    |    \--- javax.inject:javax.inject:1
 +|    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -234,7 +234,7 @@
 ++--- androidx.hilt:hilt-work:1.0.0
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- androidx.hilt:hilt-common:1.0.0
-+|    |    \--- com.google.dagger:hilt-core:2.35 -> 2.35.1 (*)
++|    |    \--- com.google.dagger:hilt-core:2.35 -> 2.36 (*)
 +|    +--- androidx.work:work-runtime:2.3.4 -> 2.5.0
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*)
@@ -252,7 +252,7 @@
 +|    |    +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
-+|    \--- com.google.dagger:hilt-android:2.35 -> 2.35.1 (*)
++|    \--- com.google.dagger:hilt-android:2.35 -> 2.36 (*)
 ++--- androidx.fragment:fragment-ktx:1.3.2
 +|    +--- androidx.fragment:fragment:1.3.2 (*)
 +|    +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha08
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 4e4877847..13a6ed8ae 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -1,11 +1,11 @@
-++--- androidx.databinding:viewbinding:7.0.0-beta02
+++--- androidx.databinding:viewbinding:7.0.0-beta03
 +|    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-++--- androidx.databinding:databinding-common:7.0.0-beta02
-++--- androidx.databinding:databinding-runtime:7.0.0-beta02
+++--- androidx.databinding:databinding-common:7.0.0-beta03
+++--- androidx.databinding:databinding-runtime:7.0.0-beta03
 +|    +--- 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-beta02
-+|    +--- androidx.databinding:viewbinding:7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-common:7.0.0-beta03
++|    +--- androidx.databinding:viewbinding:7.0.0-beta03 (*)
 +|    \--- 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-beta02
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
-+|    \--- androidx.databinding:databinding-common:7.0.0-beta02
-++--- androidx.databinding:databinding-ktx:7.0.0-beta02
+++--- androidx.databinding:databinding-adapters:7.0.0-beta03
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta03 (*)
++|    \--- androidx.databinding:databinding-common:7.0.0-beta03
+++--- androidx.databinding:databinding-ktx:7.0.0-beta03
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3
 +|    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
@@ -93,7 +93,7 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.32 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.4.3 (*)
 +|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    +--- androidx.databinding:databinding-runtime:7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-runtime:7.0.0-beta03 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 (*)
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
@@ -244,9 +244,9 @@
 +|         +--- 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-beta02
-+|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta02 (*)
-+|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta02 (*)
++|    +--- androidx.databinding:databinding-common:4.1.1 -> 7.0.0-beta03
++|    +--- androidx.databinding:databinding-runtime:4.1.1 -> 7.0.0-beta03 (*)
++|    +--- androidx.databinding:databinding-adapters:4.1.1 -> 7.0.0-beta03 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.4.32 (*)
 +|    +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-rc01
 +|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -333,12 +333,12 @@
 +|    +--- org.dmfs:lib-recur:0.11.4
 +|    |    \--- org.dmfs:rfc5545-datetime:0.2.4
 +|    \--- org.dmfs:jems:1.33
-++--- com.google.dagger:hilt-android:2.35.1
-+|    +--- com.google.dagger:dagger:2.35.1
+++--- com.google.dagger:hilt-android:2.36
++|    +--- com.google.dagger:dagger:2.36
 +|    |    \--- javax.inject:javax.inject:1
-+|    +--- com.google.dagger:dagger-lint-aar:2.35.1
-+|    +--- com.google.dagger:hilt-core:2.35.1
-+|    |    +--- com.google.dagger:dagger:2.35.1 (*)
++|    +--- com.google.dagger:dagger-lint-aar:2.36
++|    +--- com.google.dagger:hilt-core:2.36
++|    |    +--- com.google.dagger:dagger:2.36 (*)
 +|    |    \--- javax.inject:javax.inject:1
 +|    +--- androidx.activity:activity:1.2.2 -> 1.3.0-alpha08 (*)
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@@ -351,7 +351,7 @@
 ++--- androidx.hilt:hilt-work:1.0.0
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- androidx.hilt:hilt-common:1.0.0
-+|    |    \--- com.google.dagger:hilt-core:2.35 -> 2.35.1 (*)
++|    |    \--- com.google.dagger:hilt-core:2.35 -> 2.36 (*)
 +|    +--- androidx.work:work-runtime:2.3.4 -> 2.5.0
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*)
@@ -369,7 +369,7 @@
 +|    |    +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.5.0-rc01 (*)
 +|    |    \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
-+|    \--- com.google.dagger:hilt-android:2.35 -> 2.35.1 (*)
++|    \--- com.google.dagger:hilt-android:2.35 -> 2.36 (*)
 ++--- androidx.fragment:fragment-ktx:1.3.2
 +|    +--- androidx.fragment:fragment:1.3.2 (*)
 +|    +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.0-alpha08