diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b2fca34f3..46e7fc8c2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,8 +13,22 @@ plugins {
 repositories {
     mavenCentral()
     google()
-    maven(url = "https://jitpack.io")
-    jcenter()
+    maven {
+        url = uri("https://jitpack.io")
+        content {
+            includeGroup("com.gitlab.abaker")
+            includeModule("com.gitlab.bitfireAT", "cert4android")
+            includeModule("com.github.dmfs.opentasks", "opentasks-provider")
+            includeModule("com.github.QuadFlask", "colorpicker")
+        }
+    }
+    jcenter {
+        content {
+            includeModule("com.twofortyfouram", "android-plugin-api-for-locale")
+            includeModule("org.jetbrains.kotlinx", "kotlinx-collections-immutable-jvm")
+            includeModule("com.android.billingclient", "billing")
+        }
+    }
 }
 
 android {
@@ -212,7 +226,7 @@ dependencies {
     implementation("com.etesync:journalmanager:1.1.1")
     implementation("com.etebase:client:2.3.2")
     implementation("com.github.QuadFlask:colorpicker:0.0.15")
-    implementation("com.github.openid:AppAuth-Android:0.8.0")
+    implementation("net.openid:appauth:0.8.0")
     implementation("org.osmdroid:osmdroid-android:6.1.10@aar")
 
     implementation("androidx.compose.ui:ui:${Versions.compose}")
diff --git a/app/licenses.yml b/app/licenses.yml
index 5968b757e..de236a70d 100644
--- a/app/licenses.yml
+++ b/app/licenses.yml
@@ -757,8 +757,8 @@
   license: LGPL-3.0-only
   licenseUrl: https://spdx.org/licenses/LGPL-3.0-only.html
   url: https://www.etebase.com
-- artifact: com.github.openid:AppAuth-Android:+
-  name: AppAuth-Android
+- artifact: net.openid:appauth:+
+  name: appauth
   copyrightHolder: The AppAuth for Android Authors
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json
index 7316f9c2f..40dc659dc 100644
--- a/app/src/main/assets/licenses.json
+++ b/app/src/main/assets/licenses.json
@@ -1815,8 +1815,8 @@
     },
     {
       "artifactId": {
-        "name": "AppAuth-Android",
-        "group": "com.github.openid",
+        "name": "appauth",
+        "group": "net.openid",
         "version": "+"
       },
       "copyrightHolder": "The AppAuth for Android Authors",
@@ -1825,7 +1825,7 @@
       "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
       "normalizedLicense": "apache2",
       "url": "https://github.com/openid/AppAuth-Android",
-      "libraryName": "AppAuth-Android"
+      "libraryName": "appauth"
     },
     {
       "artifactId": {
diff --git a/build.gradle.kts b/build.gradle.kts
index 2648699e8..98f134ed5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,13 +2,12 @@ buildscript {
     repositories {
         mavenCentral()
         google()
-        jcenter()
     }
 
     dependencies {
         classpath("com.android.tools.build:gradle:7.0.0-alpha08")
         classpath("com.google.gms:google-services:4.3.5")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.0")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
     }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 1cb63ae21..12b70eddb 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -10,7 +10,7 @@ object Versions {
     const val analytics = "18.0.2"
     const val remote_config = "20.0.3"
     const val okhttp = "4.8.1"
-    const val flipper = "0.74.0"
+    const val flipper = "0.79.1"
     const val mockito = "3.8.0"
     const val androidx_test = "1.3.0"
     const val make_it_easy = "4.0.1"
diff --git a/deps_fdroid.txt b/deps_fdroid.txt
index 2c5d04da1..8789d6053 100644
--- a/deps_fdroid.txt
+++ b/deps_fdroid.txt
@@ -384,17 +384,17 @@
 +|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
 +|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*)
-++--- com.github.openid:AppAuth-Android:0.8.0
-+|    +--- androidx.browser:browser:1.2.0
-+|    |    +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*)
-+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-+|    |    +--- androidx.collection:collection:1.1.0 (*)
-+|    |    +--- androidx.concurrent:concurrent-futures:1.0.0
-+|    |    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+|    |    \--- androidx.interpolator:interpolator:1.0.0 (*)
-+|    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+++--- net.openid:appauth:0.8.0
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    \--- androidx.browser:browser:1.2.0
++|         +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|         +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
++|         +--- androidx.collection:collection:1.1.0 (*)
++|         +--- androidx.concurrent:concurrent-futures:1.0.0
++|         |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
++|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|         \--- androidx.interpolator:interpolator:1.0.0 (*)
 ++--- org.osmdroid:osmdroid-android:6.1.10
 ++--- androidx.compose.ui:ui:1.0.0-beta01
 +|    +--- androidx.compose.animation:animation-core:1.0.0-beta01
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index fe53f54a5..3df4c3d61 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -498,17 +498,17 @@
 +|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
 +|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*)
-++--- com.github.openid:AppAuth-Android:0.8.0
-+|    +--- androidx.browser:browser:1.2.0
-+|    |    +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*)
-+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-+|    |    +--- androidx.collection:collection:1.1.0 (*)
-+|    |    +--- androidx.concurrent:concurrent-futures:1.0.0
-+|    |    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
-+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
-+|    |    \--- androidx.interpolator:interpolator:1.0.0 (*)
-+|    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+++--- net.openid:appauth:0.8.0
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|    \--- androidx.browser:browser:1.2.0
++|         +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|         +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
++|         +--- androidx.collection:collection:1.1.0 (*)
++|         +--- androidx.concurrent:concurrent-futures:1.0.0
++|         |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
++|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
++|         \--- androidx.interpolator:interpolator:1.0.0 (*)
 ++--- org.osmdroid:osmdroid-android:6.1.10
 ++--- androidx.compose.ui:ui:1.0.0-beta01
 +|    +--- androidx.compose.animation:animation-core:1.0.0-beta01