diff --git a/build.gradle.kts b/build.gradle.kts
index 986ddcd..54ed6ac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,11 +20,4 @@ plugins {
 
     // Kotlin serialization
     alias(libs.plugins.serialization) apply false
-
-    // Firebase crashlytics
-    alias(libs.plugins.firebaseCrashlytics) apply false
-
-    // Google services
-    alias(libs.plugins.googleServices) apply false
-
 }
\ No newline at end of file
diff --git a/consentium-ui/build.gradle.kts b/consentium-ui/build.gradle.kts
index b6a711b..070bc38 100644
--- a/consentium-ui/build.gradle.kts
+++ b/consentium-ui/build.gradle.kts
@@ -67,8 +67,6 @@ dependencies {
     implementation(libs.androidx.foundation.android)
     implementation(libs.androidx.ui.android)
     implementation(libs.androidx.foundation.layout.android)
-    implementation(libs.androidx.ui.tooling.preview.android)
-    implementation(libs.androidx.material3.android)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.activity.compose)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 87fb9f8..e010497 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,9 +23,6 @@ composeBom = "2024.11.00"
 # Timber
 timber = "5.0.1"
 
-# Material
-material = "1.12.0"
-
 # Serialization
 serialization = "2.0.0"
 jsonSerialization = "1.7.1"
@@ -75,7 +72,6 @@ runtimeAndroid = "1.7.6"
 foundationAndroid = "1.7.6"
 foundationLayoutAndroid = "1.7.5"
 uiAndroid = "1.7.5"
-uiToolingPreviewAndroid = "1.7.6"
 material3Android = "1.3.1"
 
 [libraries]
@@ -84,11 +80,14 @@ material3Android = "1.3.1"
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" }
+androidx-foundation-android = { group = "androidx.compose.foundation", name = "foundation-android", version.ref = "foundationAndroid" }
+androidx-foundation-layout-android = { group = "androidx.compose.foundation", name = "foundation-layout-android", version.ref = "foundationLayoutAndroid" }
+androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "uiAndroid" }
 
 # Lifecycle
 androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
-androidx-lifecycle-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" }
 
 # Hilt
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
@@ -100,22 +99,18 @@ timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 
 # Compose
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
-compose-ui = { module = "androidx.compose.ui:ui" }
-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
+compose-ui = { group = "androidx.compose.ui", name = "ui" }
+compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 
 # Material
-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
+compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 
 # Kotlin serizalization
 kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "jsonSerialization" }
 
 # Compose navigation
-androidx-navigation-common-ktx = { group = "androidx.navigation", name = "navigation-common-ktx", version.ref = "navigationCompose" }
-androidx-navigation-runtime-ktx = { group = "androidx.navigation", name = "navigation-runtime-ktx", version.ref = "navigationCompose" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
 
 # Preferences DataStore
@@ -142,13 +137,8 @@ matomo = { module = "com.github.matomo-org:matomo-sdk-android", version.ref = "m
 # Clarity
 clarity = { group = "com.microsoft.clarity", name = "clarity", version.ref = "clarityVersion" }
 
-# GA4 (Firebase Analytics)
+# GA4
 ga4 = { module = "com.google.firebase:firebase-analytics", version.ref = "ga4" }
-androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" }
-androidx-foundation-android = { group = "androidx.compose.foundation", name = "foundation-android", version.ref = "foundationAndroid" }
-androidx-foundation-layout-android = { group = "androidx.compose.foundation", name = "foundation-layout-android", version.ref = "foundationLayoutAndroid" }
-androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "uiAndroid" }
-androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }
 
 # Coil
 coil = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
@@ -162,8 +152,8 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization" }
-firebaseCrashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
-googleServices = { id = "com.google.gms.google-services", version.ref = "googleServicesPlugin" }
+firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
+google-services = { id = "com.google.gms.google-services", version.ref = "googleServicesPlugin" }
 
 [bundles]
 androidx = ["androidx-core-ktx", "androidx-activity-compose"]