diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 5fd7e8e9a..a8f0c582f 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -33,14 +33,15 @@
 +|              |         |         +--- org.jetbrains:annotations:23.0.0
 +|              |         |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 +|              |         |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (c)
-+|              |         |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (c)
-+|              |         |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 (c)
++|              |         |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 (c)
++|              |         |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (c)
 +|              |         |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 -> 2.0.0
 +|              |         |         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*)
 +|              |         |         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 2.0.0
 +|              |         |              +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*)
 +|              |         |              \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0
 +|              |         |                   \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*)
++|              |         +--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-livedata:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.1 (c)
@@ -52,8 +53,7 @@
 +|              |         +--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1 (c)
-+|              |         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
-+|              |         \--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
++|              |         \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
 +|              +--- androidx.profileinstaller:profileinstaller:1.3.1
 +|              |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|              |    +--- androidx.concurrent:concurrent-futures:1.1.0
@@ -96,6 +96,7 @@
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*)
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)
 +|    |         +--- androidx.lifecycle:lifecycle-common:2.8.1 (c)
++|    |         +--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-livedata:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.1 (c)
@@ -106,8 +107,7 @@
 +|    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1 (c)
-+|    |         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
-+|    |         \--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
++|    |         \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 -> 2.8.1
 +|    |    +--- androidx.arch.core:core-common:2.2.0 (*)
 +|    |    +--- androidx.arch.core:core-runtime:2.2.0 (*)
@@ -470,6 +470,7 @@
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.8.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-process:2.8.1 (c)
@@ -479,7 +480,6 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
 +|    +--- com.google.android.material:material:1.6.0 -> 1.12.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-bom:1.8.22
@@ -603,8 +603,8 @@
 +|    +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*)
 +|    \--- androidx.fragment:fragment:1.7.1 (c)
-++--- androidx.lifecycle:lifecycle-runtime-ktx:2.8.1 (*)
-++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1 (*)
+++--- androidx.lifecycle:lifecycle-runtime:2.8.1 (*)
+++--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (*)
 ++--- androidx.room:room-runtime:2.7.0-alpha03 (*)
 ++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha03
 +|    \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha03
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 980ea16f0..3c416fa5e 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -42,6 +42,7 @@
 +|              |         |              +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*)
 +|              |         |              \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0
 +|              |         |                   \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0 (*)
++|              |         +--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-livedata:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.1 (c)
@@ -53,8 +54,7 @@
 +|              |         +--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.1 (c)
 +|              |         +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1 (c)
-+|              |         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
-+|              |         \--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
++|              |         \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
 +|              +--- androidx.profileinstaller:profileinstaller:1.3.1
 +|              |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|              |    +--- androidx.concurrent:concurrent-futures:1.1.0
@@ -97,6 +97,7 @@
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*)
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)
 +|    |         +--- androidx.lifecycle:lifecycle-common:2.8.1 (c)
++|    |         +--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-livedata:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.1 (c)
@@ -107,8 +108,7 @@
 +|    |         +--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.1 (c)
 +|    |         +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1 (c)
-+|    |         +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
-+|    |         \--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
++|    |         \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
 +|    +--- androidx.lifecycle:lifecycle-livedata:2.6.1 -> 2.8.1
 +|    |    +--- androidx.arch.core:core-common:2.2.0 (*)
 +|    |    +--- androidx.arch.core:core-runtime:2.2.0 (*)
@@ -710,6 +710,7 @@
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-common:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.8.1 (c)
++|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata-ktx:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-process:2.8.1 (c)
@@ -719,7 +720,6 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.1 (c)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1 (c)
-+|    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.8.1 (c)
 +|    |    \--- androidx.lifecycle:lifecycle-common-java8:2.8.1 (c)
 +|    +--- com.google.android.material:material:1.6.0 -> 1.12.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-bom:1.8.22
@@ -834,8 +834,8 @@
 +|    +--- androidx.savedstate:savedstate-ktx:1.2.1 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.0 (*)
 +|    \--- androidx.fragment:fragment:1.7.1 (c)
-++--- androidx.lifecycle:lifecycle-runtime-ktx:2.8.1 (*)
-++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1 (*)
+++--- androidx.lifecycle:lifecycle-runtime:2.8.1 (*)
+++--- androidx.lifecycle:lifecycle-viewmodel:2.8.1 (*)
 ++--- androidx.room:room-runtime:2.7.0-alpha03 (*)
 ++--- androidx.sqlite:sqlite-bundled:2.5.0-alpha03
 +|    \--- androidx.sqlite:sqlite-bundled-android:2.5.0-alpha03
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 781293953..85679594a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -79,8 +79,8 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt" }
 androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt" }
 androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit" }
-androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
-androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }