diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 983d62b..ef74b69 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,6 +10,10 @@ android {
     namespace = "com.shezik.drawanywhere"
     compileSdk = 36
 
+    lint {
+        disable += "NullSafeMutableLiveData"
+    }
+
     defaultConfig {
         applicationId = "com.shezik.drawanywhere"
         minSdk = 26
diff --git a/app/src/main/java/com/shezik/drawanywhere/StylusAwareDrawing.kt b/app/src/main/java/com/shezik/drawanywhere/StylusAwareDrawing.kt
index 667bcb1..d11c195 100644
--- a/app/src/main/java/com/shezik/drawanywhere/StylusAwareDrawing.kt
+++ b/app/src/main/java/com/shezik/drawanywhere/StylusAwareDrawing.kt
@@ -35,7 +35,7 @@ fun Modifier.stylusAwareDrawing(
         val initialEvent = awaitPointerEvent()
         val initialChange = initialEvent.changes.firstOrNull()
 
-        if (initialChange == null || !initialChange.pressed)
+        if (initialChange == null || !initialChange.pressed || initialChange.type != PointerType.Stylus)
             return@awaitEachGesture
 
         val strokeModifier = when {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c2716b3..a6d090f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-agp = "8.11.1"
+agp = "8.7.3"
 compose = "1.9.0"
 appcompat = "1.7.1"
 datastorePreferences = "1.1.7"
-kotlin = "2.2.10"
-coreKtx = "1.17.0"
+kotlin = "2.0.0"
+coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 composeBom = "2025.08.00"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 36e4933..7a19d7a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3d2c04e..dfc9504 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -24,7 +24,8 @@ include(":app")
 
 plugins {
     id("com.autonomousapps.build-health") version "2.19.0"
-    id("org.jetbrains.kotlin.jvm") version "2.2.10" apply false
-    id("com.android.application") version "8.11.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.10" apply false
-}
\ No newline at end of file
+    id("org.jetbrains.kotlin.jvm") version "2.0.0" apply false
+    id("com.android.application") version "8.7.3" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
+}
+