diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4c26fd7..30cb4bb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,6 +13,7 @@ detektGradlePlugin = "1.23.8"
 espresso = "3.7.0"
 junit = "4.13.2"
 kmpCompose = "1.10.0"
+kmpComposeMaterial3 = "1.9.0"
 koin = "4.1.1"
 kotlin = "2.3.0"
 kotlinter = "5.4.0"
@@ -21,6 +22,7 @@ ksp = "2.3.5"
 ktor = "3.4.0"
 leakCanary = "2.14"
 material = "1.13.0"
+materialIconsExtended = "1.7.3"
 material3Adaptive = "1.2.0"
 minSdk = "23"
 sqldelight = "2.2.1"
@@ -47,6 +49,14 @@ compose-ui = { group = "androidx.compose.ui", name = "ui" }
 compose-ui-test-junit = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 google-testparameterinjector = { module = "com.google.testparameterinjector:test-parameter-injector", version.ref = "testParameterInjector" }
+jetbrains-compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "kmpCompose" }
+jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "kmpCompose" }
+jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "kmpComposeMaterial3" }
+jetbrains-compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
+jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "kmpCompose" }
+jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "kmpCompose" }
+jetbrains-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "kmpCompose" }
+jetbrains-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "kmpCompose" }
 junit = { module = "junit:junit", version.ref = "junit" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 00fa246..28d90dd 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -14,6 +14,10 @@ plugins {
     alias(libs.plugins.kotlinx.serialization)
 }
 
+dependencies {
+    androidRuntimeClasspath(libs.jetbrains.compose.ui.tooling)
+}
+
 kotlin {
     androidLibrary {
         compileSdk = libs.versions.compileSdk.get().toInt()
@@ -42,12 +46,6 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
-            implementation(compose.components.uiToolingPreview)
             implementation(libs.androidx.datastore.preferences)
             implementation(libs.androidx.lifecycle.viewmodel)
             implementation(libs.androidx.lifecycle.runtime.compose)
@@ -57,6 +55,13 @@ kotlin {
             implementation(libs.coil.compose)
             implementation(libs.coil.ktor)
             implementation(libs.compose.material3.adaptive)
+            implementation(libs.jetbrains.compose.components.resources)
+            implementation(libs.jetbrains.compose.foundation)
+            implementation(libs.jetbrains.compose.material.icons.extended)
+            implementation(libs.jetbrains.compose.material3)
+            implementation(libs.jetbrains.compose.runtime)
+            implementation(libs.jetbrains.compose.ui)
+            implementation(libs.jetbrains.compose.ui.tooling.preview)
             implementation(libs.koin.core)
             implementation(libs.kotlinx.datetime)
             implementation(libs.ktor.client.content.negotiation)
diff --git a/shared/src/commonMain/kotlin/template/shared/App.kt b/shared/src/commonMain/kotlin/template/shared/App.kt
index 7983ee4..9393663 100644
--- a/shared/src/commonMain/kotlin/template/shared/App.kt
+++ b/shared/src/commonMain/kotlin/template/shared/App.kt
@@ -13,7 +13,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 import template.shared.ui.UiImage
 import template.shared.ui.components.ImageWrapper
 import template.shared.ui.theme.TemplateTheme