diff --git a/.fleet/receipt.json b/.fleet/receipt.json
deleted file mode 100644
index 58319d8..0000000
--- a/.fleet/receipt.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "spec": {
-        "template_id": "kmt",
-        "targets": {
-            "android": {
-                "ui": [
-                    "compose"
-                ]
-            },
-            "desktop": {
-                "ui": [
-                    "compose"
-                ]
-            }
-        }
-    },
-    "timestamp": "2024-04-29T06:04:57.807358293Z"
-}
\ No newline at end of file
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 5a60afa..7da9a9d 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -18,23 +17,6 @@ android {
         versionName = libs.versions.app.version.name.get()
     }
 
-    dependencies {
-        implementation(compose.components.resources)
-        implementation(compose.runtime)
-//        implementation(compose.foundation)
-        implementation(compose.material3)
-        implementation(compose.ui)
-        implementation(compose.components.resources)
-        implementation(libs.androidx.activity.compose)
-//        implementation(libs.compose.ui.text.googlefonts)
-        implementation(projects.commonUI)
-//        implementation(compose.components.uiToolingPreview)
-        implementation(libs.androidx.tooling.preview)
-
-        testImplementation(libs.kotlin.test)
-        testImplementation(libs.atrium)
-    }
-
     compileOptions {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get())
@@ -64,6 +46,20 @@ android {
 }
 
 dependencies {
+    implementation(compose.components.resources)
+    implementation(compose.runtime)
+    implementation(compose.material3)
+    implementation(compose.ui)
+    implementation(compose.components.resources)
+    implementation(libs.androidx.activity.compose)
+    implementation(projects.commonUI)
+    implementation(compose.components.uiToolingPreview)
+//    implementation(libs.androidx.tooling.preview)
+
     implementation(libs.androidx.core.ktx)
+
     debugImplementation(libs.androidx.tooling)
+
+    testImplementation(libs.kotlin.test)
+    testImplementation(libs.atrium)
 }
diff --git a/android/src/test/kotlin/ch/dissem/yaep/android/DummyTest.kt b/android/src/test/kotlin/ch/dissem/yaep/android/DummyTest.kt
deleted file mode 100644
index d3027d8..0000000
--- a/android/src/test/kotlin/ch/dissem/yaep/android/DummyTest.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package ch.dissem.yaep.android
-
-import ch.tutteli.atrium.api.fluent.en_GB.toEqual
-import ch.tutteli.atrium.api.verbs.expect
-import kotlin.test.Test
-
-class DummyTest {
-    @Test
-    fun `ensure some test is run`() {
-        expect(true).toEqual(true)
-    }
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index b6b0cc8..9a817b7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,13 @@ android.nonTransitiveRClass=true
 android.useAndroidX=true
 
 #MPP
-kotlin.mpp.androidSourceSetLayoutVersion=2
\ No newline at end of file
+kotlin.mpp.androidSourceSetLayoutVersion=2
+#android.defaults.buildfeatures.resvalues=true
+#android.enableAppCompileTimeRClass=false
+#android.usesSdkInManifest.disallowed=false
+#android.uniquePackageNames=false
+#android.dependency.useConstraints=true
+#android.r8.strictFullModeForKeepRules=false
+#android.r8.optimizedResourceShrinking=false
+#android.builtInKotlin=false
+#android.newDsl=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0e0db1f..a0ab6d5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 app-version-code = "1"
 app-version-name = "1.0.0"
-agp = "8.13.2"
+agp = "9.0.0"
 jdk = "21"
 android-compileSdk = "36"
 android-minSdk = "26"
 android-targetSdk = "36"
 androidx-activityCompose = "1.12.2"
-androidx-compose = "1.10.0"
-compose-plugin = "1.9.3"
+androidx-compose = "1.10.1"
+compose-plugin = "1.10.0"
 kotlin = "2.3.0"
 coreKtx = "1.17.0"
 atrium = "1.2.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4081da..19a6bde 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME