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..37de89c 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,32 +17,13 @@ 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())
     }
 
     buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
+        release { }
 
         debug {
             enableAndroidTestCoverage = true
@@ -64,6 +44,18 @@ android {
 }
 
 dependencies {
+    implementation(projects.commonUI)
+    implementation(libs.compose.runtime)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.material3)
+    implementation(libs.compose.components.resources)
+    implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.core.ktx)
-    debugImplementation(libs.androidx.tooling)
+
+    implementation(libs.compose.ui.tooling.preview)
+
+    debugImplementation(libs.compose.ui.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/commonUI/build.gradle.kts b/commonUI/build.gradle.kts
index 2c83f77..274b438 100644
--- a/commonUI/build.gradle.kts
+++ b/commonUI/build.gradle.kts
@@ -22,13 +22,13 @@ kotlin {
         commonMain.dependencies {
             api(projects.domain)
 
-            implementation(compose.components.resources)
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.ui)
-            implementation(compose.components.uiToolingPreview)
+            implementation(libs.compose.components.resources)
+            implementation(libs.compose.runtime)
+            implementation(libs.compose.foundation)
+            implementation(libs.compose.ui)
+            implementation(libs.compose.ui.tooling.preview)
 
-            implementation(compose.material3)
+            implementation(libs.compose.material3)
 
             implementation(libs.bundles.logging)
         }
@@ -37,8 +37,7 @@ kotlin {
             implementation(libs.kotlin.test)
             implementation(libs.atrium)
 
-            @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
-            implementation(compose.uiTest)
+            implementation(libs.compose.ui.test)
         }
 
         jvmTest.dependencies {
@@ -46,7 +45,7 @@ kotlin {
         }
 
         androidMain.dependencies {
-            implementation(libs.androidx.compose.foundation)
+            implementation(libs.compose.foundation)
         }
     }
 }
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 9830edb..94fb0eb 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -12,14 +12,14 @@ kotlin {
 
     dependencies {
         implementation(compose.desktop.currentOs)
-        implementation(compose.material3)
-        implementation(compose.components.resources)
+        implementation(libs.compose.material3)
+        implementation(libs.compose.components.resources)
         implementation(projects.commonUI)
-        implementation(compose.components.uiToolingPreview)
+        implementation(libs.compose.ui.tooling.preview)
 
         testImplementation(libs.kotlin.test)
         testImplementation(libs.atrium)
-        testImplementation(compose.desktop.uiTestJUnit4)
+        testImplementation(libs.compose.ui.test.desktop)
         testImplementation(compose.desktop.currentOs)
     }
 }
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..88f4823 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,26 +1,28 @@
 [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"
 kotlin = "2.3.0"
-coreKtx = "1.17.0"
-atrium = "1.2.0"
 
 [libraries]
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
-androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
-androidx-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
-androidx-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose" }
-androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.12.2" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.17.0" }
 
-atrium = { module = "ch.tutteli.atrium:atrium-fluent", version.ref = "atrium" }
+compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version = "1.10.0" }
+compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version = "1.10.0" }
+compose-material3 = { module = "org.jetbrains.compose.material3:material3", version = "1.10.0-alpha05" }
+compose-ui = { module = "org.jetbrains.compose.ui:ui", version = "1.10.0" }
+compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version = "1.10.0" }
+compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version = "1.10.0" }
+compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version = "1.10.0" }
+compose-ui-test = { module = "org.jetbrains.compose.ui:ui-test", version = "1.10.0" }
+compose-ui-test-desktop = { module = "org.jetbrains.compose.ui:ui-test-desktop", version = "1.10.0" }
+
+atrium = { module = "ch.tutteli.atrium:atrium-fluent", version = "1.2.0" }
 
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 
@@ -37,7 +39,7 @@ android-library = { id = "com.android.kotlin.multiplatform.library", version.ref
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
+compose = { id = "org.jetbrains.compose", version = "1.10.0" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 sonarqube = { id = "org.sonarqube", version = "7.2.2.6593" }
 kotlin-kover = { id = "org.jetbrains.kotlinx.kover", version = "0.9.4" }
\ No newline at end of file
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