diff --git a/app/build.gradle b/app/build.gradle
index 9a58f66..f1275df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.nitramite.apcupsdmonitor"
         minSdkVersion 22
         targetSdkVersion 35
-        versionCode 60
-        versionName "1.24.0" // Use Semver
+        versionCode 61
+        versionName "1.25.0" // Use Semver
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -39,23 +39,23 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.preference:preference:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     // Third party
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
-    implementation 'com.android.billingclient:billing:7.0.0'
+    implementation 'com.android.billingclient:billing:7.1.1'
     implementation 'com.wdullaer:swipeactionadapter:2.1.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'joda-time:joda-time:2.12.5'
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'joda-time:joda-time:2.13.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     // For the notifications
-    implementation 'com.google.firebase:firebase-messaging:24.0.0'
+    implementation 'com.google.firebase:firebase-messaging:24.0.3'
     // Tests
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.12.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0'
-    testImplementation 'org.json:json:20230618'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
+    testImplementation 'org.json:json:20240303'
     // Other
     implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.0.0'))
-    implementation('com.google.android.play:review:2.0.1')
+    implementation('com.google.android.play:review:2.0.2')
 }
diff --git a/app/src/main/res/layout/activity_main_menu.xml b/app/src/main/res/layout/activity_main_menu.xml
index b1c6be3..93fe9e2 100644
--- a/app/src/main/res/layout/activity_main_menu.xml
+++ b/app/src/main/res/layout/activity_main_menu.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     tools:context=".MainMenu">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_ups_editor.xml b/app/src/main/res/layout/activity_ups_editor.xml
index 127123e..99b6655 100644
--- a/app/src/main/res/layout/activity_ups_editor.xml
+++ b/app/src/main/res/layout/activity_ups_editor.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     tools:context=".UpsEditor">
 
 
diff --git a/app/src/main/res/layout/activity_ups_viewer.xml b/app/src/main/res/layout/activity_ups_viewer.xml
index 0ab02e7..dcd9e24 100644
--- a/app/src/main/res/layout/activity_ups_viewer.xml
+++ b/app/src/main/res/layout/activity_ups_viewer.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:fitsSystemWindows="true"
     tools:context=".UpsViewer">
 
 
diff --git a/build.gradle b/build.gradle
index f31ab83..a0cbeaf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.1'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath 'com.google.gms:google-services:4.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e95561f..8358dc3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip