diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 272f261b9..90e8126ce 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -86,7 +86,7 @@ dependencies {
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3.windowsizeclass)
-    implementation(libs.androidx.compose.ui)
+    implementation(compose.ui)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profile)
diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
index 8d932257b..ce704f4fd 100644
--- a/build-logic/plugins/build.gradle.kts
+++ b/build-logic/plugins/build.gradle.kts
@@ -11,6 +11,7 @@ repositories {
 dependencies {
     implementation(gradleApi())
     implementation(libs.android.gradlePlugin)
+    implementation(libs.jetbrains.compose.gradlePlugin)
     implementation(libs.jetbrains.kotlin.gradlePlugin)
     implementation(libs.ktlint.gradlePlugin)
     implementation(libs.detekt.gradlePlugin)
diff --git a/build-logic/plugins/src/main/kotlin/AndroidApplicationPlugin.kt b/build-logic/plugins/src/main/kotlin/AndroidApplicationPlugin.kt
index efb411fa5..ef2d83871 100644
--- a/build-logic/plugins/src/main/kotlin/AndroidApplicationPlugin.kt
+++ b/build-logic/plugins/src/main/kotlin/AndroidApplicationPlugin.kt
@@ -1,6 +1,5 @@
 
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import extensions.configureAndroidCompose
 import extensions.configureDesugaring
 import extensions.configureKotlinAndroid
 import org.gradle.api.Plugin
@@ -16,6 +15,7 @@ class AndroidApplicationPlugin: Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
+                apply("org.jetbrains.compose")
                 apply("kotlin-parcelize")
                 apply("com.google.gms.google-services")
                 apply("com.google.firebase.crashlytics")
@@ -23,7 +23,6 @@ class AndroidApplicationPlugin: Plugin<Project> {
             extensions.configure<BaseAppModuleExtension> {
                 configureKotlinAndroid(this)
                 configureDesugaring(this)
-                configureAndroidCompose(this)
                 defaultConfig.targetSdk = 34
             }
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
diff --git a/build-logic/plugins/src/main/kotlin/AndroidLibraryComposePlugin.kt b/build-logic/plugins/src/main/kotlin/AndroidLibraryComposePlugin.kt
index e6dc327f1..02e766874 100644
--- a/build-logic/plugins/src/main/kotlin/AndroidLibraryComposePlugin.kt
+++ b/build-logic/plugins/src/main/kotlin/AndroidLibraryComposePlugin.kt
@@ -1,10 +1,7 @@
 
-import com.android.build.gradle.LibraryExtension
-import extensions.configureAndroidCompose
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
 
@@ -13,9 +10,7 @@ class AndroidLibraryComposePlugin: Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
-            }
-            extensions.configure<LibraryExtension> {
-                configureAndroidCompose(this)
+                apply("org.jetbrains.compose")
             }
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
diff --git a/build-logic/plugins/src/main/kotlin/extensions/ComposeAndroid.kt b/build-logic/plugins/src/main/kotlin/extensions/ComposeAndroid.kt
deleted file mode 100644
index bfd9c9f07..000000000
--- a/build-logic/plugins/src/main/kotlin/extensions/ComposeAndroid.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package extensions
-
-import com.android.build.api.dsl.CommonExtension
-import org.gradle.api.Project
-import org.gradle.api.artifacts.VersionCatalogsExtension
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.getByType
-
-internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
-) {
-    val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
-    commonExtension.apply {
-        buildFeatures {
-            compose = true
-        }
-
-        composeOptions {
-            kotlinCompilerExtensionVersion = libs.findVersion("androidx-compose-compiler").get().toString()
-        }
-    }
-    dependencies {
-        add("debugImplementation", "androidx.customview:customview-poolingcontainer:1.0.0")
-        add("debugImplementation", "androidx.savedstate:savedstate-ktx:1.2.0")
-    }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 900d2579e..134fe50b1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,6 +26,7 @@ google-material = "1.11.0"
 google-mlkit-barcode-scanning = "17.2.0"
 google-services = "4.3.15"
 google-zxing = "3.5.1"
+jetbrains-compose = "1.6.0"
 jetbrains-kotlin = "1.9.22"
 jetbrains-kotlinx-collections = "0.3.6"
 jetbrains-kotlinx-coroutines = "1.7.3"
@@ -52,17 +53,12 @@ androidx-camera-camera2 = { group = "androidx.camera", name = "camera-camera2",
 androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycle", version.ref = "androidx-camera" }
 androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "androidx-camera" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" }
-androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }
-androidx-compose-icons = { group = "androidx.compose.material", name = "material-icons-extended" }
-androidx-compose-lifecycle = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose" }
-androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-material3-windowsizeclass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
 androidx-compose-material3-adaptive = { group = "androidx.compose.material3", name = "material3-adaptive", version = "1.0.0-alpha04" }
 androidx-compose-material3-adaptive-navigation-suite = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite", version = "1.0.0-alpha02" }
-androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime-livedata" }
-androidx-compose-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
-androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
+androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" }
+androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidx-navigation-compose" }
 androidx-profile = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidx-profile" }
 androidx-workmanager-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work" }
@@ -85,6 +81,7 @@ detekt-gradlePlugin = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gr
 
 font-awesome = { group = "br.com.devsrsouza.compose.icons.android", name = "font-awesome", version.ref = "font-awesome" }
 
+jetbrains-compose-gradlePlugin = { group = "org.jetbrains.compose", name = "compose-gradle-plugin", version.ref = "jetbrains-compose" }
 jetbrains-kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "jetbrains-kotlin" }
 jetbrains-kotlin-serialization-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "jetbrains-kotlin" }
 jetbrains-kotlinx-collections = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "jetbrains-kotlinx-collections" }
diff --git a/theme-m3/event-list/event-list-feature/build.gradle.kts b/theme-m3/event-list/event-list-feature/build.gradle.kts
index 170518239..f3d9ae6d6 100644
--- a/theme-m3/event-list/event-list-feature/build.gradle.kts
+++ b/theme-m3/event-list/event-list-feature/build.gradle.kts
@@ -18,11 +18,11 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
     implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
diff --git a/theme-m3/event-list/event-list-ui/build.gradle.kts b/theme-m3/event-list/event-list-ui/build.gradle.kts
index 47607a70c..73980c778 100644
--- a/theme-m3/event-list/event-list-ui/build.gradle.kts
+++ b/theme-m3/event-list/event-list-ui/build.gradle.kts
@@ -12,9 +12,9 @@ dependencies {
     implementation(projects.shared.uiModels)
     implementation(projects.themeM3.style.theme)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
 
     implementation(libs.jetbrains.kotlinx.collections)
 }
diff --git a/theme-m3/infos/infos-feature/build.gradle.kts b/theme-m3/infos/infos-feature/build.gradle.kts
index 6965f7bed..713449c98 100644
--- a/theme-m3/infos/infos-feature/build.gradle.kts
+++ b/theme-m3/infos/infos-feature/build.gradle.kts
@@ -18,11 +18,11 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
     implementation(libs.richtext.commonmark)
 
     implementation(platform(libs.google.firebase.bom))
diff --git a/theme-m3/infos/infos-ui/build.gradle.kts b/theme-m3/infos/infos-ui/build.gradle.kts
index e9731a645..bfd40f67b 100644
--- a/theme-m3/infos/infos-ui/build.gradle.kts
+++ b/theme-m3/infos/infos-ui/build.gradle.kts
@@ -16,9 +16,9 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
     implementation(libs.richtext.commonmark)
 }
diff --git a/theme-m3/main/main/build.gradle.kts b/theme-m3/main/main/build.gradle.kts
index 56f9672c6..ec7d358c2 100644
--- a/theme-m3/main/main/build.gradle.kts
+++ b/theme-m3/main/main/build.gradle.kts
@@ -25,13 +25,14 @@ dependencies {
     implementation(libs.koin.androidx.compose)
 
     implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.windowsizeclass)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.navigation.suite)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.compose.runtime.livedata)
+    implementation(compose.preview)
+    implementation(compose.material3)
+    debugImplementation(compose.uiTooling)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.navigation.compose)
 
     implementation(libs.jetbrains.kotlinx.collections)
diff --git a/theme-m3/navigation/build.gradle.kts b/theme-m3/navigation/build.gradle.kts
index 5ae1833ed..738f5ac83 100644
--- a/theme-m3/navigation/build.gradle.kts
+++ b/theme-m3/navigation/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id("conferences4hall.android.library")
+    id("conferences4hall.android.library.compose")
     id("conferences4hall.quality")
 }
 
@@ -11,5 +12,5 @@ dependencies {
     implementation(projects.themeM3.style.theme)
 
     implementation(libs.androidx.annotation)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.materialIconsExtended)
 }
diff --git a/theme-m3/networking/networking-feature/build.gradle.kts b/theme-m3/networking/networking-feature/build.gradle.kts
index dec76f2bb..1aa0490c3 100644
--- a/theme-m3/networking/networking-feature/build.gradle.kts
+++ b/theme-m3/networking/networking-feature/build.gradle.kts
@@ -20,11 +20,11 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
     implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
diff --git a/theme-m3/networking/networking-screens/build.gradle.kts b/theme-m3/networking/networking-screens/build.gradle.kts
index 219d6d669..d76775207 100644
--- a/theme-m3/networking/networking-screens/build.gradle.kts
+++ b/theme-m3/networking/networking-screens/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
 }
diff --git a/theme-m3/networking/networking-ui/build.gradle.kts b/theme-m3/networking/networking-ui/build.gradle.kts
index 241da49d1..a076099dd 100644
--- a/theme-m3/networking/networking-ui/build.gradle.kts
+++ b/theme-m3/networking/networking-ui/build.gradle.kts
@@ -16,8 +16,8 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 }
diff --git a/theme-m3/partners/partners-feature/build.gradle.kts b/theme-m3/partners/partners-feature/build.gradle.kts
index 5354cb0f9..81744b25d 100644
--- a/theme-m3/partners/partners-feature/build.gradle.kts
+++ b/theme-m3/partners/partners-feature/build.gradle.kts
@@ -21,11 +21,12 @@ dependencies {
     implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(compose.preview)
+    implementation(compose.material3)
+    debugImplementation(compose.uiTooling)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
     implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
diff --git a/theme-m3/partners/partners-screens/build.gradle.kts b/theme-m3/partners/partners-screens/build.gradle.kts
index c0abf7faa..86d087664 100644
--- a/theme-m3/partners/partners-screens/build.gradle.kts
+++ b/theme-m3/partners/partners-screens/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
 }
diff --git a/theme-m3/partners/partners-ui/build.gradle.kts b/theme-m3/partners/partners-ui/build.gradle.kts
index 1f4ca8f6c..939df626c 100644
--- a/theme-m3/partners/partners-ui/build.gradle.kts
+++ b/theme-m3/partners/partners-ui/build.gradle.kts
@@ -16,10 +16,10 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 
     implementation(libs.coil.compose)
 }
diff --git a/theme-m3/schedules/schedules-feature/build.gradle.kts b/theme-m3/schedules/schedules-feature/build.gradle.kts
index 7fabdf582..1e39dd489 100644
--- a/theme-m3/schedules/schedules-feature/build.gradle.kts
+++ b/theme-m3/schedules/schedules-feature/build.gradle.kts
@@ -21,12 +21,13 @@ dependencies {
     implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.navigation.suite)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(compose.preview)
+    implementation(compose.material3)
+    debugImplementation(compose.uiTooling)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
     implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
diff --git a/theme-m3/schedules/schedules-screens/build.gradle.kts b/theme-m3/schedules/schedules-screens/build.gradle.kts
index cfd3b50eb..4e99056b4 100644
--- a/theme-m3/schedules/schedules-screens/build.gradle.kts
+++ b/theme-m3/schedules/schedules-screens/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
 }
diff --git a/theme-m3/schedules/schedules-ui/build.gradle.kts b/theme-m3/schedules/schedules-ui/build.gradle.kts
index a0e641199..de3076598 100644
--- a/theme-m3/schedules/schedules-ui/build.gradle.kts
+++ b/theme-m3/schedules/schedules-ui/build.gradle.kts
@@ -18,10 +18,11 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
+
     implementation(libs.richtext.commonmark)
     api(libs.openfeedback.m3)
 }
diff --git a/theme-m3/speakers/speakers-feature/build.gradle.kts b/theme-m3/speakers/speakers-feature/build.gradle.kts
index c4f3faacf..1fce51ebe 100644
--- a/theme-m3/speakers/speakers-feature/build.gradle.kts
+++ b/theme-m3/speakers/speakers-feature/build.gradle.kts
@@ -19,11 +19,12 @@ dependencies {
     implementation(libs.jetbrains.kotlinx.collections)
 
     implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.lifecycle)
-    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(compose.preview)
+    implementation(compose.material3)
+    debugImplementation(compose.uiTooling)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
     implementation(platform(libs.google.firebase.bom))
     implementation("com.google.firebase:firebase-crashlytics-ktx")
diff --git a/theme-m3/speakers/speakers-screens/build.gradle.kts b/theme-m3/speakers/speakers-screens/build.gradle.kts
index 640afef3b..eb24101e0 100644
--- a/theme-m3/speakers/speakers-screens/build.gradle.kts
+++ b/theme-m3/speakers/speakers-screens/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 
     implementation(libs.jetbrains.kotlinx.collections)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
 }
diff --git a/theme-m3/speakers/speakers-ui/build.gradle.kts b/theme-m3/speakers/speakers-ui/build.gradle.kts
index b348be530..6553d4066 100644
--- a/theme-m3/speakers/speakers-ui/build.gradle.kts
+++ b/theme-m3/speakers/speakers-ui/build.gradle.kts
@@ -13,10 +13,10 @@ dependencies {
     implementation(projects.themeM3.style.speakers)
     implementation(projects.themeM3.style.theme)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 
     implementation(libs.coil.compose)
 
diff --git a/theme-m3/style/networking/build.gradle.kts b/theme-m3/style/networking/build.gradle.kts
index 60b3f19ff..d05c1b512 100644
--- a/theme-m3/style/networking/build.gradle.kts
+++ b/theme-m3/style/networking/build.gradle.kts
@@ -11,8 +11,8 @@ android {
 dependencies {
     implementation(projects.themeM3.style.theme)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 }
diff --git a/theme-m3/style/partners/build.gradle.kts b/theme-m3/style/partners/build.gradle.kts
index fdda16119..e440cfd7f 100644
--- a/theme-m3/style/partners/build.gradle.kts
+++ b/theme-m3/style/partners/build.gradle.kts
@@ -11,10 +11,10 @@ android {
 dependencies {
     implementation(projects.themeM3.style.theme)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 
     implementation(libs.coil.compose)
 }
diff --git a/theme-m3/style/schedules/build.gradle.kts b/theme-m3/style/schedules/build.gradle.kts
index 42b99434f..6b968b014 100644
--- a/theme-m3/style/schedules/build.gradle.kts
+++ b/theme-m3/style/schedules/build.gradle.kts
@@ -12,10 +12,10 @@ dependencies {
     implementation(projects.themeM3.style.speakers)
     implementation(projects.themeM3.style.theme)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 
     implementation(libs.jetbrains.kotlinx.collections)
 }
diff --git a/theme-m3/style/speakers/build.gradle.kts b/theme-m3/style/speakers/build.gradle.kts
index 7c83665b0..449e03531 100644
--- a/theme-m3/style/speakers/build.gradle.kts
+++ b/theme-m3/style/speakers/build.gradle.kts
@@ -11,10 +11,10 @@ android {
 dependencies {
     implementation(projects.themeM3.style.theme)
 
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 
     implementation(libs.coil.compose)
 
diff --git a/theme-m3/style/theme/build.gradle.kts b/theme-m3/style/theme/build.gradle.kts
index 0f62be3b7..6ba36e4eb 100644
--- a/theme-m3/style/theme/build.gradle.kts
+++ b/theme-m3/style/theme/build.gradle.kts
@@ -9,10 +9,10 @@ android {
 }
 
 dependencies {
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.tooling)
-    implementation(libs.androidx.compose.icons)
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
 
     implementation(libs.google.accompanist.permissions)
     implementation(libs.google.accompanist.placeholder)
diff --git a/ui-camera/build.gradle.kts b/ui-camera/build.gradle.kts
index 273557c8f..3f316e8a8 100644
--- a/ui-camera/build.gradle.kts
+++ b/ui-camera/build.gradle.kts
@@ -9,9 +9,8 @@ android {
 }
 
 dependencies {
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.foundation.layout)
+    implementation(compose.ui)
+    implementation(compose.foundation)
 
     api(libs.google.mlkit.barcode.scanning)
     implementation(libs.androidx.camera.camera2)