diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9a29d6e4..d71aa566 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,6 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.ksp)
     alias(libs.plugins.oss.licenses)
 }
@@ -135,8 +136,19 @@ android {
         buildFeatures {
             viewBinding = true
             buildConfig = true
+            compose = true
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+    buildFeatures {
+        compose = true
+    }
 
     ksp {
         val location = "$projectDir/schemas"
@@ -145,6 +157,17 @@ android {
 }
 
 dependencies {
+    // Jetpack Compose
+    implementation(libs.bundles.compose)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.bundles.compose.debug)
+
+    // Navigation 3
+    implementation(libs.bundles.navigation3)
+
     // Standard Kotlin Libraries
     implementation(libs.kotlin.stdlib)
 
@@ -155,6 +178,7 @@ dependencies {
 
     // Data/Persistence (Room Bundle)
     implementation(libs.bundles.room)
+    debugImplementation(libs.androidx.ui.test.manifest)
     ksp(libs.room.compiler)
 
     // Networking/Parsing
@@ -168,7 +192,7 @@ dependencies {
     implementation(libs.bundles.lifecycle)
 
     // Dependency Injection
-    implementation(libs.koin)
+    implementation(libs.bundles.koin)
 
     
     // --- Testing ---
@@ -177,8 +201,9 @@ dependencies {
     testImplementation(libs.bundles.unit.test)
 
     // Android Instrumented Testing (Android Test Bundle)
+    androidTestImplementation(platform(libs.compose.bom))
     androidTestImplementation(libs.bundles.android.test)
     androidTestImplementation(libs.room.testing)
-    androidTestImplementation(libs.coroutines.test)
+    androidTestImplementation(libs.bundles.coroutines.test)
     androidTestImplementation(libs.truth) // Keeping truth explicit for androidTest, though it's in both bundles.
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2c896861..fc3da90e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,22 +17,26 @@
         tools:targetApi="33">
         <activity
             android:name=".ui.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/PasscodesTheme.Default">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name=".ui.PasswordManagerActivity" />
-        <activity android:name=".ui.SavePasswordActivity" />
-        <activity android:name=".ui.LoadPasswordActivity" />
-        <activity android:name=".ui.ViewPasswordActivity" />
-        <activity android:name=".ui.UpdatePasswordActivity" />
-        <activity android:name=".ui.SettingsActivity" />
-        <activity android:name=".ui.AboutUsActivity" />
-        <activity android:name=".ui.LicenseActivity" />
+        <activity
+            android:name=".oldui.MainActivity"
+            android:exported="true">
+        </activity>
+        <activity android:name=".oldui.PasswordManagerActivity" />
+        <activity android:name=".oldui.SavePasswordActivity" />
+        <activity android:name=".oldui.LoadPasswordActivity" />
+        <activity android:name=".oldui.ViewPasswordActivity" />
+        <activity android:name=".oldui.UpdatePasswordActivity" />
+        <activity android:name=".oldui.SettingsActivity" />
+        <activity android:name=".oldui.AboutUsActivity" />
+        <activity android:name=".oldui.LicenseActivity" />
         <activity android:name=".autofill.AutofillSettingsActivity" />
 
         <service
@@ -46,9 +50,9 @@
 
         <service
             android:name=".autofill.PasswordAutofillService"
+            android:exported="true"
             android:label="@string/app_name"
-            android:permission="android.permission.BIND_AUTOFILL_SERVICE"
-            android:exported="true">
+            android:permission="android.permission.BIND_AUTOFILL_SERVICE">
             <intent-filter>
                 <action android:name="android.service.autofill.AutofillService" />
             </intent-filter>
@@ -59,4 +63,4 @@
         </service>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/di/appModule.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/di/appModule.kt
index 04dc71b1..65f10a1c 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/di/appModule.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/di/appModule.kt
@@ -1,9 +1,9 @@
 package com.jeeldobariya.passcodes.di
 
-import com.jeeldobariya.passcodes.ui.LoadPasswordViewModel
-import com.jeeldobariya.passcodes.ui.SavePasswordViewModel
-import com.jeeldobariya.passcodes.ui.UpdatePasswordViewModel
-import com.jeeldobariya.passcodes.ui.ViewPasswordViewModel
+import com.jeeldobariya.passcodes.oldui.LoadPasswordViewModel
+import com.jeeldobariya.passcodes.oldui.SavePasswordViewModel
+import com.jeeldobariya.passcodes.oldui.UpdatePasswordViewModel
+import com.jeeldobariya.passcodes.oldui.ViewPasswordViewModel
 import com.jeeldobariya.passcodes.utils.Controller
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.dsl.viewModel
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/AboutUsActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/AboutUsActivity.kt
similarity index 97%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/AboutUsActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/AboutUsActivity.kt
index 8fb28137..c4ef8a2d 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/AboutUsActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/AboutUsActivity.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import android.content.Intent
 import android.os.Bundle
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LicenseActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LicenseActivity.kt
similarity index 96%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LicenseActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LicenseActivity.kt
index 7cb9ad01..d31bd781 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LicenseActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LicenseActivity.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import android.content.Intent
 import android.os.Bundle
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordAction.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordAction.kt
similarity index 69%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordAction.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordAction.kt
index 332a9995..ff18f46f 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordAction.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordAction.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 sealed interface LoadPasswordAction {
     data object RefreshPassword: LoadPasswordAction
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordActivity.kt
similarity index 96%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordActivity.kt
index 408e6ede..ef30c244 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordActivity.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import android.content.Intent
 import android.os.Bundle
@@ -8,7 +8,7 @@ import androidx.core.view.WindowCompat
 import com.jeeldobariya.passcodes.R
 import com.jeeldobariya.passcodes.database.Password
 import com.jeeldobariya.passcodes.databinding.ActivityLoadPasswordBinding
-import com.jeeldobariya.passcodes.ui.adapter.PasswordAdapter
+import com.jeeldobariya.passcodes.oldui.adapter.PasswordAdapter
 import com.jeeldobariya.passcodes.utils.CommonUtils
 import com.jeeldobariya.passcodes.utils.collectLatestLifecycleFlow
 import org.koin.androidx.viewmodel.ext.android.viewModel
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordState.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordState.kt
similarity index 81%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordState.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordState.kt
index f18b8942..e017cb43 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordState.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordState.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import com.jeeldobariya.passcodes.database.Password
 
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordViewModel.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordViewModel.kt
similarity index 96%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordViewModel.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordViewModel.kt
index 7d09adaa..28a50813 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/LoadPasswordViewModel.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/LoadPasswordViewModel.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/MainActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/MainActivity.kt
new file mode 100644
index 00000000..0c6a9fb1
--- /dev/null
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/MainActivity.kt
@@ -0,0 +1,80 @@
+package com.jeeldobariya.passcodes.oldui
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
+import androidx.lifecycle.lifecycleScope
+import com.jeeldobariya.passcodes.BuildConfig
+import com.jeeldobariya.passcodes.databinding.ActivityMainBinding
+import com.jeeldobariya.passcodes.utils.CommonUtils
+import com.jeeldobariya.passcodes.utils.UpdateChecker
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+// import com.jeeldobariya.passcodes.utils.Permissions
+
+class MainActivity : AppCompatActivity() {
+
+    // private lateinit var permissionsHandle: Permissions
+
+    private lateinit var binding: ActivityMainBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        CommonUtils.updateCurrTheme(this)
+        super.onCreate(savedInstanceState)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            UpdateChecker.checkVersion(this@MainActivity, BuildConfig.VERSION_NAME)
+        }
+
+        // Add event onclick listener
+        addOnClickListenerOnButton()
+
+        // Make window fullscreen
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        /* Comment the code as permission is not need to write into app data dir.
+            // Check and request permission when the app is first opened
+            permissionsHandle = Permissions(this)
+            if (!permissionsHandle.checkPermission()) permissionsHandle.requestPermission()
+        */
+    }
+
+    /* Comment the code as permission is not need to write into app data dir.
+        override fun onRequestPermissionsResult(
+            requestCode: Int, permissions: Array<String>, grantResults: IntArray
+        ) {
+            super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+            if (requestCode == Permissions.PERMISSION_REQUEST_CODE) {
+                if (permissionsHandle.isPermissionGranted(grantResults)) {
+                    // Permission has been granted
+                    Toast.makeText(this, getString(R.string.permission_granted), Toast.LENGTH_LONG).show()
+                } else {
+                    // Permission not granted
+                    Toast.makeText(this, getString(R.string.permission_denied), Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    */
+
+    // Added all the onclick event listeners
+    private fun addOnClickListenerOnButton() {
+        binding.passwordManagerBtn.setOnClickListener {
+            val passwordManagerIntent = Intent(this, PasswordManagerActivity::class.java)
+            startActivity(passwordManagerIntent)
+        }
+
+        binding.settingBtn.setOnClickListener {
+            val settingIntent = Intent(this, SettingsActivity::class.java)
+            startActivity(settingIntent)
+        }
+
+        binding.aboutUsBtn.setOnClickListener {
+            val aboutUsIntent = Intent(this, AboutUsActivity::class.java)
+            startActivity(aboutUsIntent)
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/PasswordManagerActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/PasswordManagerActivity.kt
similarity index 99%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/PasswordManagerActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/PasswordManagerActivity.kt
index e28777d2..f13ee291 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/PasswordManagerActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/PasswordManagerActivity.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import android.content.Intent
 import android.os.Bundle
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordAction.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordAction.kt
similarity index 90%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordAction.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordAction.kt
index 7bf6105d..14634ce5 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordAction.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordAction.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 sealed interface SavePasswordAction {
     data class OnChangeDomain(val newDomain: String): SavePasswordAction
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordActivity.kt
similarity index 98%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordActivity.kt
index a17990c8..9833cade 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordActivity.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordState.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordState.kt
similarity index 81%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordState.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordState.kt
index 01d1274c..8cd30a14 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordState.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordState.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 data class SavePasswordState(
     val domain: String = "",
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordViewModel.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordViewModel.kt
similarity index 97%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordViewModel.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordViewModel.kt
index 0fb9759e..2fce6577 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SavePasswordViewModel.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SavePasswordViewModel.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SettingsActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SettingsActivity.kt
similarity index 98%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SettingsActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SettingsActivity.kt
index ff164a16..76adb186 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/SettingsActivity.kt
@@ -1,6 +1,5 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
-import android.content.Context
 import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordAction.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordAction.kt
similarity index 91%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordAction.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordAction.kt
index 98fd3742..7ef3f60b 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordAction.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordAction.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 sealed interface UpdatePasswordAction {
     data class OnChangeDomain(val newDomain: String): UpdatePasswordAction
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordActivity.kt
similarity index 98%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordActivity.kt
index 172b5559..4824b8f6 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordActivity.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import android.app.AlertDialog
 import android.os.Bundle
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordState.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordState.kt
similarity index 82%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordState.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordState.kt
index 1b4cefaa..767dd9af 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordState.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordState.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 data class UpdatePasswordState(
     val domain: String = "",
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordViewModel.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordViewModel.kt
similarity index 98%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordViewModel.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordViewModel.kt
index 050d75ba..715a9b45 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/UpdatePasswordViewModel.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/UpdatePasswordViewModel.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordAction.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordAction.kt
similarity index 87%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordAction.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordAction.kt
index 7c71544f..e40b9a90 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordAction.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordAction.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 sealed interface ViewPasswordAction {
     data class LoadPassword(val passwordId: Int): ViewPasswordAction
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordActivity.kt
similarity index 98%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordActivity.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordActivity.kt
index e927e5d1..6244bcd5 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordActivity.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import android.app.AlertDialog
 import android.content.ClipData
@@ -10,7 +10,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
 import com.jeeldobariya.passcodes.R
 import com.jeeldobariya.passcodes.databinding.ActivityViewPasswordBinding
-import com.jeeldobariya.passcodes.flags.FeatureFlagManager
 import com.jeeldobariya.passcodes.utils.CommonUtils
 import com.jeeldobariya.passcodes.utils.collectLatestLifecycleFlow
 import kotlinx.coroutines.runBlocking
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordState.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordState.kt
similarity index 84%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordState.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordState.kt
index e5e7b099..3809af97 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordState.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordState.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 data class ViewPasswordState(
     val domain: String = "",
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordViewModel.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordViewModel.kt
similarity index 97%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordViewModel.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordViewModel.kt
index d27279e2..579365d7 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ViewPasswordViewModel.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/ViewPasswordViewModel.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui
+package com.jeeldobariya.passcodes.oldui
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/adapter/PasswordAdapter.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/adapter/PasswordAdapter.kt
similarity index 97%
rename from app/src/main/kotlin/com/jeeldobariya/passcodes/ui/adapter/PasswordAdapter.kt
rename to app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/adapter/PasswordAdapter.kt
index 3336e860..249fa700 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/adapter/PasswordAdapter.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/oldui/adapter/PasswordAdapter.kt
@@ -1,4 +1,4 @@
-package com.jeeldobariya.passcodes.ui.adapter
+package com.jeeldobariya.passcodes.oldui.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/MainActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/MainActivity.kt
index 1789a3f8..07c80f09 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/MainActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/MainActivity.kt
@@ -2,79 +2,84 @@ package com.jeeldobariya.passcodes.ui
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
-import androidx.lifecycle.lifecycleScope
-import com.jeeldobariya.passcodes.BuildConfig
-import com.jeeldobariya.passcodes.databinding.ActivityMainBinding
-import com.jeeldobariya.passcodes.utils.CommonUtils
-import com.jeeldobariya.passcodes.utils.UpdateChecker
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-// import com.jeeldobariya.passcodes.utils.Permissions
-
-class MainActivity : AppCompatActivity() {
-
-    // private lateinit var permissionsHandle: Permissions
-
-    private lateinit var binding: ActivityMainBinding
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
 
+class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        CommonUtils.updateCurrTheme(this)
         super.onCreate(savedInstanceState)
-        binding = ActivityMainBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        lifecycleScope.launch(Dispatchers.IO) {
-            UpdateChecker.checkVersion(this@MainActivity, BuildConfig.VERSION_NAME)
+        enableEdgeToEdge()
+        setContent {
+            PasscodesTheme {
+                MainScreen {
+                    val loginIntent = Intent(this@MainActivity, com.jeeldobariya.passcodes.oldui.MainActivity::class.java)
+                    startActivity(loginIntent)
+                }
+            }
         }
-
-        // Add event onclick listener
-        addOnClickListenerOnButton()
-
-        // Make window fullscreen
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
-        /* Comment the code as permission is not need to write into app data dir.
-            // Check and request permission when the app is first opened
-            permissionsHandle = Permissions(this)
-            if (!permissionsHandle.checkPermission()) permissionsHandle.requestPermission()
-        */
     }
+}
 
-    /* Comment the code as permission is not need to write into app data dir.
-        override fun onRequestPermissionsResult(
-            requestCode: Int, permissions: Array<String>, grantResults: IntArray
+@Composable
+fun MainScreen(navigateToOldUi: () -> Unit) {
+    Surface(
+        color = MaterialTheme.colorScheme.surface,
+        modifier = Modifier.fillMaxSize(),
+        tonalElevation = 5.dp
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(24.dp),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-            if (requestCode == Permissions.PERMISSION_REQUEST_CODE) {
-                if (permissionsHandle.isPermissionGranted(grantResults)) {
-                    // Permission has been granted
-                    Toast.makeText(this, getString(R.string.permission_granted), Toast.LENGTH_LONG).show()
-                } else {
-                    // Permission not granted
-                    Toast.makeText(this, getString(R.string.permission_denied), Toast.LENGTH_LONG).show()
-                }
+            Text("Passcodes", fontSize = 24.sp)
+            Text("You are on New Jetpack UI")
+
+            Spacer(Modifier.padding(12.dp))
+
+            Button(
+                onClick = navigateToOldUi
+            ) {
+                Text("Back To Old UI", fontSize = 20.sp)
+            }
+            Button(
+                onClick = navigateToOldUi
+            ) {
+                Text("Continue New UI", fontSize = 20.sp)
             }
-        }
-    */
 
-    // Added all the onclick event listeners
-    private fun addOnClickListenerOnButton() {
-        binding.passwordManagerBtn.setOnClickListener {
-            val passwordManagerIntent = Intent(this, PasswordManagerActivity::class.java)
-            startActivity(passwordManagerIntent)
-        }
+            Spacer(Modifier.padding(12.dp))
 
-        binding.settingBtn.setOnClickListener {
-            val settingIntent = Intent(this, SettingsActivity::class.java)
-            startActivity(settingIntent)
+            Text("Jetpack UI Is Under Development", fontSize = 6.sp)
         }
+    }
+}
 
-        binding.aboutUsBtn.setOnClickListener {
-            val aboutUsIntent = Intent(this, AboutUsActivity::class.java)
-            startActivity(aboutUsIntent)
+@Preview(showBackground = true)
+@Composable
+fun GreetingPreview() {
+    PasscodesTheme {
+        MainScreen {
+            Unit
         }
     }
 }
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Color.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Color.kt
new file mode 100644
index 00000000..4ed93138
--- /dev/null
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package com.jeeldobariya.passcodes.ui.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Theme.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Theme.kt
new file mode 100644
index 00000000..047c32fc
--- /dev/null
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Theme.kt
@@ -0,0 +1,57 @@
+package com.jeeldobariya.passcodes.ui.ui.theme
+
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+private val DarkColorScheme = darkColorScheme(
+    primary = Purple80,
+    secondary = PurpleGrey80,
+    tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+    primary = Purple40,
+    secondary = PurpleGrey40,
+    tertiary = Pink40
+
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+    */
+)
+
+@Composable
+fun PasscodesTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Type.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Type.kt
new file mode 100644
index 00000000..f456b139
--- /dev/null
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package com.jeeldobariya.passcodes.ui.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+    bodyLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp
+    )
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+    */
+)
diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml
index 21e2f66a..5800c4a9 100644
--- a/app/src/main/res/layout/activity_about_us.xml
+++ b/app/src/main/res/layout/activity_about_us.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorSurface"
-    tools:context=".ui.AboutUsActivity">
+    tools:context=".oldui.AboutUsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/topAppBar"
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 6817d801..f0fd632b 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:background="?attr/colorSurface"
     android:padding="16sp"
-    tools:context=".ui.LicenseActivity">
+    tools:context=".oldui.LicenseActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_load_password.xml b/app/src/main/res/layout/activity_load_password.xml
index 551a3b6f..02df075a 100644
--- a/app/src/main/res/layout/activity_load_password.xml
+++ b/app/src/main/res/layout/activity_load_password.xml
@@ -5,7 +5,7 @@
 	android:layout_height="match_parent"
 	android:gravity="center"
     android:orientation="vertical"
-	tools:context=".ui.LoadPasswordActivity"
+	tools:context=".oldui.LoadPasswordActivity"
 	android:padding="4sp" >
 
 	<com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 810ac809..19b40a2c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:gravity="center"
     android:orientation="vertical"
-    tools:context=".ui.MainActivity"
+    tools:context=".oldui.MainActivity"
     android:padding="4sp" >
 
     <ImageView
diff --git a/app/src/main/res/layout/activity_password_manager.xml b/app/src/main/res/layout/activity_password_manager.xml
index 00888c73..78b38b9d 100644
--- a/app/src/main/res/layout/activity_password_manager.xml
+++ b/app/src/main/res/layout/activity_password_manager.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:gravity="center"
     android:orientation="vertical"
-    tools:context=".ui.PasswordManagerActivity"
+    tools:context=".oldui.PasswordManagerActivity"
     android:padding="4sp" >
     
     <com.google.android.material.textview.MaterialTextView 
diff --git a/app/src/main/res/layout/activity_save_password.xml b/app/src/main/res/layout/activity_save_password.xml
index ccfded5e..b092f4ad 100644
--- a/app/src/main/res/layout/activity_save_password.xml
+++ b/app/src/main/res/layout/activity_save_password.xml
@@ -6,7 +6,7 @@
 	android:layout_height="match_parent"
 	android:gravity="center"
   android:orientation="vertical"
-	tools:context=".ui.SavePasswordActivity"
+	tools:context=".oldui.SavePasswordActivity"
   android:padding="4sp" >
   
   <LinearLayout
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 928a096e..05eb2d2f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="16dp"
-    tools:context=".ui.SettingsActivity">
+    tools:context=".oldui.SettingsActivity">
 
     <!-- Settings Headline -->
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/activity_update_password.xml b/app/src/main/res/layout/activity_update_password.xml
index 9cc95887..3713d5dc 100644
--- a/app/src/main/res/layout/activity_update_password.xml
+++ b/app/src/main/res/layout/activity_update_password.xml
@@ -5,7 +5,7 @@
 	android:layout_height="match_parent"
 	android:gravity="center"
   android:orientation="vertical"
-	tools:context=".ui.UpdatePasswordActivity"
+	tools:context=".oldui.UpdatePasswordActivity"
   android:padding="4sp" >
   
   <LinearLayout
diff --git a/app/src/main/res/layout/activity_view_password.xml b/app/src/main/res/layout/activity_view_password.xml
index 6bd93500..e5664129 100644
--- a/app/src/main/res/layout/activity_view_password.xml
+++ b/app/src/main/res/layout/activity_view_password.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:gravity="center"
     android:orientation="vertical"
-    tools:context=".ui.ViewPasswordActivity"
+    tools:context=".oldui.ViewPasswordActivity"
     android:padding="4sp">
     
   <LinearLayout
diff --git a/build.gradle.kts b/build.gradle.kts
index 92a2fdd2..81899815 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.oss.licenses) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9d85fa74..f964c6e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,6 +13,12 @@ espresso-core = "3.7.0"
 coroutines = "1.10.2"
 lifecycle = "2.9.4"
 koin = "4.1.1"
+composeBom = "2025.11.00"
+compose-activity = "1.11.0"
+compose-viewmodel = "2.9.4"
+nav3Core = "1.0.0-rc01"
+lifecycleViewmodelNav3 = "2.10.0-rc01"
+material3AdaptiveNav3 = "1.3.0-alpha03"
 
 # Plugin versions
 agp = "8.13.1"
@@ -21,56 +27,89 @@ ksp = "2.3.2"
 oss-license-plugin = "0.10.9" # Also update in settings.gradle.kts
 
 [libraries]
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+# Kotlin Std libs
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 
-material = { module = "com.google.android.material:material", version.ref = "material" }
-oss-license = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "oss-license" }
-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+# Jetpack Compose
+compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+compose-ui-material = { group = "androidx.compose.material3", name = "material3" }
+compose-ui-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+compose-ui-tooling-debug = { group = "androidx.compose.ui", name = "ui-tooling" }
+compose-activity = { group = "androidx.activity", name= "activity-compose", version.ref = "compose-activity" }
+compose-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "compose-viewmodel" }
+
+# Navigation 3
+androidx-navigation3-runtime = { group = "androidx.navigation3", name = "navigation3-runtime", version.ref = "nav3Core" }
+androidx-navigation3-ui = { group = "androidx.navigation3", name = "navigation3-ui", version.ref = "nav3Core" }
+androidx-lifecycle-viewmodel-navigation3 = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-navigation3", version.ref = "lifecycleViewmodelNav3" }
+androidx-material3-adaptive-navigation3 = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation3", version.ref = "material3AdaptiveNav3" }
+
+# Core Dependency
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+oss-license = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "oss-license" }
+appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 
 # Room
-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
-room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
 
 # Networking
-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp"}
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp"}
 
 # Coroutines
-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
+coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
+coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 
 # Android Lifecycle
-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
+lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
+lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 
 # Dependency Injection
-koin = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-# koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
+koin = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
+koin-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
 
-json = { module = "org.json:json", version.ref = "json" }
+json = { group = "org.json", name = "json", version.ref = "json" }
 
 # Testing
-junit = { module = "junit:junit", version.ref = "junit" }
-truth = { module = "com.google.truth:truth", version.ref = "truth" }
-androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
+androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
+espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+
 
 [bundles]
-# Grouping related Android Architecture Components
+# Grouping Jetpack Compose Dependencies
+compose = ["compose-ui-material", "compose-ui-preview", "compose-activity", "compose-viewmodel"]
+compose-debug = ["compose-ui-tooling-debug"]
+
+# Grouping Navigation 3 Dependencies
+navigation3 = ["androidx-navigation3-runtime", "androidx-navigation3-ui", "androidx-lifecycle-viewmodel-navigation3", "androidx-material3-adaptive-navigation3"]
+
+# Grouping Android Architecture Releated Components
 room = ["room-ktx", "room-testing"]
 lifecycle = ["lifecycle-runtime", "lifecycle-viewmodel"]
 
-# Grouping coroutines dependencies
+# Grouping Coroutines Dependencies
 coroutines = ["coroutines-core", "coroutines-android"]
-coroutines-test = ["coroutines-core", "coroutines-test"] # Core is often needed for testing
+coroutines-test = ["coroutines-core", "coroutines-test"]
+
+# Grouping Dependency Injection Dependencies
+koin = ["koin", "koin-compose"]
 
-# Grouping general test dependencies
+# Grouping General Test Dependencies
 unit-test = ["junit", "truth"]
 android-test = ["androidx-test-ext-junit", "espresso-core"]
 
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-plugin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 oss-licenses = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "oss-license-plugin" }