diff --git a/app/build.gradle b/app/build.gradle
index bc544ba6..f452cabe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,7 +33,7 @@ android {
         applicationId "net.pokeranalytics.android"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 112
+        versionCode 113
         versionName "5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -118,11 +118,14 @@ dependencies {
     // Billing / Subscriptions
     implementation 'com.android.billingclient:billing:3.0.1'
 
-    // Firebase
-    implementation 'com.google.firebase:firebase-core:17.5.0'
+    // Import the Firebase BoM
+    implementation platform('com.google.firebase:firebase-bom:25.12.0')
+    // Add the dependency for the Firebase SDK for Google Analytics
+    // When using the BoM, don't specify versions in Firebase dependencies
+    implementation 'com.google.firebase:firebase-analytics-ktx'
 
     // Add the Firebase Crashlytics SDK.
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
+    implementation 'com.google.firebase:firebase-crashlytics'
 
     // Logs
     implementation 'com.jakewharton.timber:timber:4.7.1'
diff --git a/app/google-services.json b/app/google-services.json
index 593ef318..3032eff2 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -8,28 +8,12 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:245968016816:android:47f8b4f74b1296b4",
+        "mobilesdk_app_id": "1:245968016816:android:e5597a41d79df0a31d7275",
         "android_client_info": {
           "package_name": "net.pokeranalytics.android"
         }
       },
       "oauth_client": [
-        {
-          "client_id": "245968016816-hhn8q9hij1njadqg7ut7p1e6pmu0vi5k.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "net.pokeranalytics.android",
-            "certificate_hash": "25d12647d4391ed03572882b546482746d2b302e"
-          }
-        },
-        {
-          "client_id": "245968016816-tr2mo4kbe1acn8u3ebbd9nk29iuk8fqr.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "net.pokeranalytics.android",
-            "certificate_hash": "e26278fa6db56acde23b0ff5981692f7f60408b9"
-          }
-        },
         {
           "client_id": "245968016816-756j040n0luup2nlfu9e49qm9jv0oih2.apps.googleusercontent.com",
           "client_type": 3
@@ -37,7 +21,7 @@
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyCXQK-w_eeUMI9hYRXKmTr6SH7QNq0xnh8"
+          "current_key": "AIzaSyDERILd3hSujwzqHcS4CyQjiDI7J6WvNZ4"
         }
       ],
       "services": {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9e9f4b95..1d655b84 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
 
         net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService$startGIFExport$1$c$1.invokeSuspend (ReplayExportService.java:88)
 
-        The temporary fix comes form here:
+        The temporary fix comes from here:
         https://medium.com/@sriramaripirala/android-10-open-failed-eacces-permission-denied-da8b630a89df
   -->
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
index f86c0d8e..82be34f4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
@@ -10,6 +10,7 @@ import androidx.core.view.isVisible
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.android.billingclient.api.Purchase
 import com.google.android.material.tabs.TabLayout
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import io.realm.RealmModel
 import io.realm.RealmResults
 import io.realm.Sort