diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 02f3f0dc..4a78b013 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,9 +4,9 @@ plugins {
     id("org.jetbrains.kotlin.plugin.parcelize")
 }
 
-val composeMaterialVersion = "1.6.2"
-val composeMaterial3Version = "1.2.0"
-val composeCompilerVersion = "1.5.10"
+val composeMaterialVersion = "1.7.0-alpha07"
+val composeMaterial3Version = "1.3.0-alpha05"
+val composeCompilerVersion = "1.5.12"
 val lifecycleVersion = "2.7.0"
 val shizukuVersion = "13.1.5"
 
@@ -81,7 +81,7 @@ android.defaultConfig.buildConfigField("String[]", "LANGUAGES", "new String[]{${
 }}")
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.13.0")
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("androidx.compose.ui:ui:$composeMaterialVersion")
     implementation("androidx.compose.material:material:$composeMaterialVersion")
@@ -90,10 +90,10 @@ dependencies {
     implementation("androidx.compose.material3:material3-window-size-class:$composeMaterial3Version")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
-    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation("androidx.activity:activity-compose:1.9.0")
     implementation("androidx.navigation:navigation-compose:2.7.7")
-    implementation("io.insert-koin:koin-androidx-compose:3.5.3")
-    implementation("aliernfrog:top-toast-compose:2.0.0")
+    implementation("io.insert-koin:koin-androidx-compose:3.5.6")
+    implementation("aliernfrog:top-toast-compose:2.0.1-alpha01")
     implementation("com.lazygeniouz:dfc:1.0.8")
     implementation("dev.rikka.shizuku:api:$shizukuVersion")
     implementation("dev.rikka.shizuku:provider:$shizukuVersion")
diff --git a/app/src/main/java/com/aliernfrog/pftool/ui/component/AppModalBottomSheet.kt b/app/src/main/java/com/aliernfrog/pftool/ui/component/AppModalBottomSheet.kt
index 9e8d31c9..95729633 100644
--- a/app/src/main/java/com/aliernfrog/pftool/ui/component/AppModalBottomSheet.kt
+++ b/app/src/main/java/com/aliernfrog/pftool/ui/component/AppModalBottomSheet.kt
@@ -73,10 +73,7 @@ fun BaseModalBottomSheet(
         dragHandle = dragHandle,
         windowInsets = WindowInsets(0.dp)
     ) {
-        content(
-            // Adding top padding since Modifier.padding causes an offset on the bottom sheet
-            insetsViewModel.topPadding+insetsViewModel.bottomPadding
-        )
+        content(insetsViewModel.bottomPadding)
     }
 }
 
diff --git a/app/src/main/java/com/aliernfrog/pftool/ui/component/InsetsObserver.kt b/app/src/main/java/com/aliernfrog/pftool/ui/component/InsetsObserver.kt
index 4ebb977d..342d561d 100644
--- a/app/src/main/java/com/aliernfrog/pftool/ui/component/InsetsObserver.kt
+++ b/app/src/main/java/com/aliernfrog/pftool/ui/component/InsetsObserver.kt
@@ -26,8 +26,7 @@ fun InsetsObserver(
     Spacer(
         modifier = Modifier
             .onSizeChanged {
-                // no idea why height is doubled
-                insetsViewModel.topPadding = toDp(it.height/2)
+                insetsViewModel.topPadding = toDp(it.height)
             }
             .statusBarsPadding()
     )
diff --git a/app/src/main/java/com/aliernfrog/pftool/util/extension/Modifier.kt b/app/src/main/java/com/aliernfrog/pftool/util/extension/Modifier.kt
index 716711fd..c1da8446 100644
--- a/app/src/main/java/com/aliernfrog/pftool/util/extension/Modifier.kt
+++ b/app/src/main/java/com/aliernfrog/pftool/util/extension/Modifier.kt
@@ -4,9 +4,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.runtime.remember
+import androidx.compose.material3.ripple
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.draw.drawWithContent
@@ -21,8 +19,8 @@ fun Modifier.clickableWithColor(
     onClick: () -> Unit
 ): Modifier = composed {
     this.clickable(
-        interactionSource = remember { MutableInteractionSource() },
-        indication = rememberRipple(color = color),
+        interactionSource = null,
+        indication = ripple(color = color),
         onClick = onClick
     )
 }
@@ -34,8 +32,8 @@ fun Modifier.combinedClickableWithColor(
     onClick: () -> Unit
 ): Modifier = composed {
     this.combinedClickable(
-        interactionSource = remember { MutableInteractionSource() },
-        indication = rememberRipple(color = color),
+        interactionSource = null,
+        indication = ripple(color = color),
         onLongClick = onLongClick,
         onClick = onClick
     )
diff --git a/build.gradle.kts b/build.gradle.kts
index 4c63ac5e..0bb27157 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.application") version "8.2.2" apply false
-    id("com.android.library") version "8.2.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
-    id("org.jetbrains.kotlin.plugin.parcelize") version "1.9.22" apply false
+    id("com.android.application") version "8.3.2" apply false
+    id("com.android.library") version "8.3.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.23" apply false
+    id("org.jetbrains.kotlin.plugin.parcelize") version "1.9.23" apply false
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 049169f6..376d767b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu May 12 18:53:32 TRT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME