diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fe199db07b..7113cc0b1a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,6 @@
 accompanist-pager = "0.28.0"
 accompanist-permissions = "0.32.0"
 accompanist-systemuicontroller = "0.17.0"
-androidGradlePlugin = "8.2.0"
 android-exoplayer = "2.18.1"
 android-flexbox = "3.0.0"
 android-gms-playServicesAds = "22.0.0"
@@ -16,7 +15,7 @@ android-places = "2.6.0"
 android-play-core-ktx = "1.8.1"
 android-r8 = "8.2.33"
 android-supportAnnotations = "28.0.0"
-androidx-activityCompose = "1.7.2"
+androidGradlePlugin = "8.2.0"
 androidx-appcompat = "1.6.1"
 androidx-browser = "1.3.0"
 androidx-camera = "1.3.0-beta01"
@@ -34,7 +33,6 @@ androidx-multidex = "2.0.1"
 androidx-pagingCompose = "3.2.0"
 androidx-pagingRuntimeKtx = "3.1.1"
 androidx-preferenceKtx = "1.2.0"
-androidx-profileinstaller = "1.3.1"
 androidx-securityCryptoKtx = "1.1.0-alpha03"
 androidx-test-espresso = "3.5.0"
 androidx-test-junit = "1.1.5"
@@ -52,7 +50,7 @@ cashfree = "2.0.6"
 chucker = "4.0.0"
 coil = "2.5.0"
 compose-bom = "2023.10.01"
-compose-lib = '1.5.4'
+compose-lib = "1.5.4"
 delight-advancedWebView = "v3.0.0"
 digio = "v4.0.6"
 digitap = "1.3.9"
@@ -90,12 +88,10 @@ moengage-android-sdk = "12.6.02"
 moengage-inapp = "6.5.0"
 moengage-push-amp-plus = "6.2.1"
 moengage-rich-notification = "4.3.2"
-mvel2 = "2.4.15.Final"
 navi-alfred = "1.0.20"
-navi-uitron = "1.0.36-20231226.125934-32"
 navi-guarddog = "1.0.2"
+navi-uitron = "1.0.36-20231231.064732-41"
 navigation = "2.5.3"
-navigation-compose = "2.6.0"
 okhttp-bom = "4.11.0"
 otaliastudios-cameraview = "2.7.2"
 otpless = "1.1.4"
@@ -128,14 +124,14 @@ android-exoplayer-ui = { module = "com.google.android.exoplayer:exoplayer-ui", v
 
 android-flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "android-flexbox" }
 
-android-installreferrer = { module = "com.android.installreferrer:installreferrer", version.ref = "android-installreferrer" }
-
 android-gms-playServicesAds = { module = "com.google.android.gms:play-services-ads", version.ref = "android-gms-playServicesAds" }
 android-gms-playServicesAuth = { module = "com.google.android.gms:play-services-auth", version.ref = "android-gms-playServicesAuth" }
 android-gms-playServicesAuthApiPhone = { module = "com.google.android.gms:play-services-auth-api-phone", version.ref = "android-gms-playServicesAuthApiPhone" }
 android-gms-playServicesLocation = { module = "com.google.android.gms:play-services-location", version.ref = "android-gms-playServicesLocation" }
 android-gms-playServicesMaps = { module = "com.google.android.gms:play-services-maps", version.ref = "android-gms-playServicesMaps" }
 
+android-installreferrer = { module = "com.android.installreferrer:installreferrer", version.ref = "android-installreferrer" }
+
 android-material = { module = "com.google.android.material:material", version.ref = "android-material" }
 
 android-places = { module = "com.google.android.libraries.places:places", version.ref = "android-places" }
@@ -146,8 +142,6 @@ android-r8 = { module = "com.android.tools:r8", version.ref = "android-r8" }
 
 android-support-annotations = { module = "com.android.support:support-annotations", version.ref = "android-supportAnnotations" }
 
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
-
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
 
 androidx-browser = { module = "androidx.browser:browser", version.ref = "androidx-browser" }
@@ -162,11 +156,8 @@ androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref =
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
 androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
-androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
-androidx-compose-ui-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
 androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
-androidx-compose-ui-toolingPreview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" }
 
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
@@ -181,7 +172,6 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref
 androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "androidx-gridlayout" }
 
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" }
-androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" }
 androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" }
 
 androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "androidx-legacy-support-v4" }
@@ -193,7 +183,6 @@ androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-view
 
 androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "androidx-multidex" }
 
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
 androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
 androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
 
@@ -202,8 +191,6 @@ androidx-paging-runtime-ktx = { module = "androidx.paging:paging-runtime-ktx", v
 
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "androidx-preferenceKtx" }
 
-androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "androidx-profileinstaller" }
-
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "room" }
@@ -212,10 +199,10 @@ androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "
 
 androidx-security-crypto-ktx = { module = "androidx.security:security-crypto-ktx", version.ref = "androidx-securityCryptoKtx" }
 
-androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
 androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx-test-espresso" }
-androidx-test-espresso-web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx-test-espresso" }
+androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
 androidx-test-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx-test-espresso" }
+androidx-test-espresso-web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx-test-espresso" }
 androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
 androidx-test-monitor = { module = "androidx.test:monitor", version.ref = "androidx-test-monitor" }
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-rules" }
@@ -242,6 +229,7 @@ chucker-libraryNoOp = { module = "com.github.chuckerteam.chucker:library-no-op",
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 coil-test = { module = "io.coil-kt:coil-test", version.ref = "coil" }
 coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil" }
+
 dagger-hiltAndroid = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 dagger-hiltAndroidCompiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
 dagger-hiltAndroidTesting = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
@@ -260,9 +248,9 @@ facebook-shimmer = { module = "com.facebook.shimmer:shimmer", version.ref = "fac
 
 finarkein = { module = "io.finarkein.anubhav:sdk-core", version.ref = "finarkein" }
 
-firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
 firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
 firebase-auth = { module = "com.google.firebase:firebase-auth" }
+firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
 firebase-config = { module = "com.google.firebase:firebase-config" }
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 firebase-database = { module = "com.google.firebase:firebase-database" }
@@ -278,22 +266,22 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
 
-hms-videoView = { module = "live.100ms:video-view", version.ref = "hms" }
 hms-androidSdk = { module = "live.100ms:android-sdk", version.ref = "hms" }
+hms-videoView = { module = "live.100ms:video-view", version.ref = "hms" }
 
-hyperion-buildConfig = { module = "com.willowtreeapps.hyperion:hyperion-build-config", version.ref = "hyperion" }
 hyperion-attr = { module = "com.willowtreeapps.hyperion:hyperion-attr", version.ref = "hyperion" }
+hyperion-buildConfig = { module = "com.willowtreeapps.hyperion:hyperion-build-config", version.ref = "hyperion" }
 hyperion-core = { module = "com.willowtreeapps.hyperion:hyperion-core", version.ref = "hyperion" }
 hyperion-coreNoOp = { module = "com.willowtreeapps.hyperion:hyperion-core-no-op", version.ref = "hyperion" }
+hyperion-crash = { module = "com.willowtreeapps.hyperion:hyperion-crash", version.ref = "hyperion" }
+hyperion-disk = { module = "com.willowtreeapps.hyperion:hyperion-disk", version.ref = "hyperion" }
+hyperion-geigerCounter = { module = "com.willowtreeapps.hyperion:hyperion-geiger-counter", version.ref = "hyperion" }
+hyperion-measurement = { module = "com.willowtreeapps.hyperion:hyperion-measurement", version.ref = "hyperion" }
+hyperion-phoenix = { module = "com.willowtreeapps.hyperion:hyperion-phoenix", version.ref = "hyperion" }
+hyperion-recorder = { module = "com.willowtreeapps.hyperion:hyperion-recorder", version.ref = "hyperion" }
+hyperion-sharedPreferences = { module = "com.willowtreeapps.hyperion:hyperion-shared-preferences", version.ref = "hyperion" }
 hyperion-simpleItem = { module = "com.github.takahirom:Hyperion-Simple-Item", version.ref = "hyperionSimpleItem" }
 hyperion-timber = { module = "com.willowtreeapps.hyperion:hyperion-timber", version.ref = "hyperion" }
-hyperion-sharedPreferences = { module = "com.willowtreeapps.hyperion:hyperion-shared-preferences", version.ref = "hyperion" }
-hyperion-recorder = { module = "com.willowtreeapps.hyperion:hyperion-recorder", version.ref = "hyperion" }
-hyperion-phoenix = { module = "com.willowtreeapps.hyperion:hyperion-phoenix", version.ref = "hyperion" }
-hyperion-measurement = { module = "com.willowtreeapps.hyperion:hyperion-measurement", version.ref = "hyperion" }
-hyperion-geigerCounter = { module = "com.willowtreeapps.hyperion:hyperion-geiger-counter", version.ref = "hyperion" }
-hyperion-disk = { module = "com.willowtreeapps.hyperion:hyperion-disk", version.ref = "hyperion" }
-hyperion-crash = { module = "com.willowtreeapps.hyperion:hyperion-crash", version.ref = "hyperion" }
 
 jakewharton-timber = { module = "com.jakewharton.timber:timber", version.ref = "jakewharton-timber" }
 
@@ -304,15 +292,14 @@ joda-time = { module = "joda-time:joda-time", version.ref = "jodaTime" }
 
 junit = { module = "junit:junit", version.ref = "junit" }
 
-juspay-hypersdk-plugin = { module = "in.juspay:hypersdk.plugin", version.ref = "juspay-hypersdkPlugin" }
 juspay-googlePayClientApi = { module = "in.juspay:google-pay-client-api", version.ref = "juspay-googlePayClientApi" }
+juspay-hypersdk-plugin = { module = "in.juspay:hypersdk.plugin", version.ref = "juspay-hypersdkPlugin" }
 
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
 
 lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
-lottieCompose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" }
 
 masayukiSuda-easingInterpolator = { module = "com.github.MasayukiSuda:EasingInterpolator", version.ref = "masayukiSuda-easingInterpolator" }
 
@@ -325,8 +312,6 @@ moengage-inapp = { module = "com.moengage:inapp", version.ref = "moengage-inapp"
 moengage-push-amp-plus = { module = "com.moengage:push-amp-plus", version.ref = "moengage-push-amp-plus" }
 moengage-rich-notification = { module = "com.moengage:rich-notification", version.ref = "moengage-rich-notification" }
 
-mvel2 = { module = "org.mvel:mvel2", version.ref = "mvel2" }
-
 navi-alfred = { module = "com.navi.android:alfred", version.ref = "navi-alfred" }
 navi-guarddog = { module = "com.navi.android:guarddog", version.ref = "navi-guarddog" }
 navi-uitron = { module = "com.navi.medici:uitron", version.ref = "navi-uitron" }
@@ -354,9 +339,9 @@ razorpay = { module = "com.razorpay:checkout", version.ref = "razorpay" }
 
 restAssured = { module = "io.rest-assured:rest-assured", version.ref = "restAssured" }
 
-retrofit-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
 retrofit-converter-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" }
+retrofit-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 
 shawnLin-numberPicker = { module = "io.github.ShawnLin013:number-picker", version.ref = "shawnLin-numberPicker" }
 
@@ -374,7 +359,6 @@ zxing = { module = "com.google.zxing:core", version.ref = "zxing" }
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-dynamic-feature = { id = "com.android.dynamic-feature", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
-android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebase-perf" }
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }