diff --git a/.gitignore b/.gitignore
index c7fb9e3..031cff0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,11 @@
-*.iml
-.gradle
-/local.properties
 /.idea/
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
 /build
 /captures
-.externalNativeBuild
+/local.properties
 .cxx
+.DS_Store
+.externalNativeBuild
+.gradle
+.kotlin/
+*.iml
 local.properties
diff --git a/app/build.gradle b/app/build.gradle
index f09f254..da88e1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,7 @@ plugins {
     alias libs.plugins.android.application
     alias libs.plugins.hilt.android
     alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
     alias libs.plugins.ksp
 }
 
@@ -56,9 +57,6 @@ android {
         freeCompilerArgs += ["-Xstring-concat=inline"]
         jvmTarget = '17'
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/build.gradle b/build.gradle
index c34c8f6..091b6d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ plugins {
     alias libs.plugins.android.test apply false
     alias libs.plugins.hilt.android apply false
     alias libs.plugins.kotlin.android apply false
+    alias libs.plugins.kotlin.compose apply false
     alias libs.plugins.kotlin.parcelize apply false
     alias libs.plugins.ksp apply false
     alias libs.plugins.spotless
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae335bd..6b1b51d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,17 +16,16 @@ androidx-test-espresso = "3.5.1"
 androidx-test-junit = "1.1.5"
 coil = "2.5.0"
 compose-bom = "2024.09.02"
-compose-lib = "1.5.14"
 firebase-bom = "33.5.1"
 gson = "2.11.0"
 guava = "33.3.1-android"
 hilt = "2.48"
 junit = "4.13.2"
-kotlin = "1.9.24"
-ksp = "1.9.24-1.0.20"
+kotlin = "2.0.21"
+ksp = "2.0.21-1.0.26"
 lottie = "6.4.1"
 mvel2 = "2.4.15.Final"
-navi-alfred = "1.16.0"
+navi-alfred = "1.17.0"
 navigation-compose = "2.6.0"
 okhttp-bom = "4.12.0"
 retrofit = "2.11.0"
@@ -113,6 +112,7 @@ android-library = { id = "com.android.library", version.ref = "androidGradlePlug
 android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 maven-publish = { id = "maven-publish" }
diff --git a/navi-uitron/build.gradle b/navi-uitron/build.gradle
index 4188e05..ef41b2f 100644
--- a/navi-uitron/build.gradle
+++ b/navi-uitron/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     alias libs.plugins.android.library
     alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
     alias libs.plugins.kotlin.parcelize
     alias libs.plugins.maven.publish
     alias libs.plugins.ksp
@@ -33,9 +34,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
     kotlinOptions {
         freeCompilerArgs += ["-Xstring-concat=inline"]
         jvmTarget = '17'