diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4ce07fba79..24d6e741de 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,8 +7,6 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("kotlin-kapt")
-    id("kotlin-allopen")
-    id("kotlinx-serialization")
     id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
     id("android-app-dependencies")
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index 2f1a0b33d3..0adcca23ac 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -19,6 +19,7 @@ object Libs {
         const val serializationProtobuf = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$serialization"
         const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
         const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+        const val coroutinesRx3 = "org.jetbrains.kotlinx:kotlinx-coroutines-rx3:$coroutinesVersion"
         const val coroutinesGuava = "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutinesVersion"
         const val coroutinesPlayServices = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion"
         const val datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.1"
@@ -28,9 +29,12 @@ object Libs {
 
         const val core = "androidx.core:core-ktx:1.12.0"
         const val appCompat = "androidx.appcompat:appcompat:1.6.1"
+        const val activity = "androidx.activity:activity-ktx:1.8.0"
         const val preference = "androidx.preference:preference-ktx:1.2.1"
         const val workRuntimeKtx = "androidx.work:work-runtime-ktx:2.8.1"
         const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
+        const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+        const val gridLayout = "androidx.gridlayout:gridlayout:1.0.0"
 
         object Test {
 
@@ -41,6 +45,7 @@ object Libs {
         }
 
         object Room {
+
             private const val roomVersion = "2.5.2"
 
             const val room = "androidx.room:room-ktx:$roomVersion"
@@ -49,11 +54,14 @@ object Libs {
             const val rxJava3 = "androidx.room:room-rxjava3:$roomVersion"
             const val testing = "androidx.room:room-testing:$roomVersion"
         }
+
         object Wear {
 
             const val wear = "androidx.wear:wear:1.3.0"
             const val tiles = "androidx.wear.tiles:tiles:1.2.0"
         }
+
+        const val biometric = "androidx.biometric:biometric:1.1.0"
     }
 
     object Google {
@@ -63,6 +71,7 @@ object Libs {
 
                 const val measurementApi = "com.google.android.gms:play-services-measurement-api:21.3.0"
                 const val wearable = "com.google.android.gms:play-services-wearable:18.1.0"
+                const val location = "com.google.android.gms:play-services-location:21.0.1"
             }
 
             object Wearable {
@@ -70,10 +79,24 @@ object Libs {
                 const val wearable = "com.google.android.wearable:wearable:2.9.0"
                 const val wearableSupport = "com.google.android.support:wearable:2.9.0"
             }
+
+            const val material = "com.google.android.material:material:1.10.0"
+        }
+
+        object Firebase {
+
+            const val firebaseBom = "com.google.firebase:firebase-bom:32.3.1"
+            const val analytics = "com.google.firebase:firebase-analytics-ktx"
+            const val crashlytics = "com.google.firebase:firebase-crashlytics-ktx"
+            const val messaging = "com.google.firebase:firebase-messaging-ktx"
+            const val auth = "com.google.firebase:firebase-auth-ktx"
+            const val database = "com.google.firebase:firebase-database-ktx"
         }
 
         const val truth = "com.google.truth:truth:1.1.5"
         const val gson = "com.google.code.gson:gson:2.10.1"
+        const val guava = "com.google.guava:guava:32.1.3-jre"
+        const val tinkAndroid = "com.google.crypto.tink:tink-android:1.10.0"
     }
 
     object Dagger {
@@ -119,33 +142,46 @@ object Libs {
         const val kotlin = "org.mockito.kotlin:mockito-kotlin:5.1.0"
     }
 
+    object Squareup {
+        object Retrofit2 {
+
+            private const val retrofitVersion = "2.9.0"
+
+            const val retrofit = "com.squareup.retrofit2:retrofit:$retrofitVersion"
+            const val adapterRxJava3 = "com.squareup.retrofit2:adapter-rxjava3:$retrofitVersion"
+            const val converterGson = "com.squareup.retrofit2:converter-gson:$retrofitVersion"
+        }
+
+        object Okhttp3 {
+
+            private const val okhttpVersion = "4.11.0"
+
+            const val okhttp = "com.squareup.okhttp3:okhttp:$okhttpVersion"
+            const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$okhttpVersion"
+        }
+    }
+
+    object Mozilla {
+
+        const val rhino = "org.mozilla:rhino:1.7.14"
+    }
+
+    const val spongycastleCore = "com.madgag.spongycastle:core:1.58.0.0"
     const val androidSvg = "com.caverock:androidsvg:1.4"
-    const val joda = "net.danlew:android.joda:2.12.5"
+    const val jodaTimeAndroid = "net.danlew:android.joda:2.12.5"
+    const val jodaTime = "joda-time:joda-time:2.12.5"
     const val json = "org.json:json:20230618"
     const val jsonAssert = "org.skyscreamer:jsonassert:1.5.0"
 
     const val lifecycle = "2.6.2"
-    const val coroutines = "1.7.3"
-    const val activity = "1.8.0"
     const val fragmentktx = "1.6.1"
     const val ormLite = "4.46"
     const val nav = "2.7.4"
-    const val material = "1.10.0"
-    const val gridlayout = "1.0.0"
-    const val constraintlayout = "2.1.4"
-    const val preferencektx = "1.2.1"
-    const val commonslang3 = "3.13.0"
     const val commonscodec = "1.16.0"
-    const val guava = "32.1.3-jre"
-    const val work = "2.8.1"
-    const val tink = "1.10.0"
-    const val swipe = "1.1.0"
 
     const val junit = "4.13.2"
     const val mockito = "5.6.0"
     const val dexmaker = "1.2"
-    const val retrofit2 = "2.9.0"
-    const val okhttp3 = "4.11.0"
     const val byteBuddy = "1.12.8"
 
     const val androidx_junit = "1.1.5"
@@ -154,11 +190,6 @@ object Libs {
     const val rxandroidble = "1.12.1"
     const val replayshare = "2.2.0"
 
-    const val wearable = "2.9.0"
-    const val play_services_wearable = "18.1.0"
-    const val play_services_location = "21.0.1"
-    const val play_services_measurement = "21.3.0"
-
     const val kotlinx_datetime = "0.4.1"
     const val kotlinx_serialization = "1.6.0"
 
diff --git a/buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts b/buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts
index 6041077214..439fb3ed9e 100644
--- a/buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts
+++ b/buildSrc/src/main/kotlin/all-open-dependencies.gradle.kts
@@ -1,7 +1,5 @@
 plugins {
     id("com.android.library")
-    id("kotlin-android")
-    id("kotlin-kapt")
     id("kotlin-allopen")
 }
 
diff --git a/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts
index 32fb83ce04..4e6f9b7a76 100644
--- a/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts
+++ b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("kotlin-kapt")
 }
 
 android {
@@ -60,9 +59,4 @@ android {
         buildConfig = false
         viewBinding = true
     }
-}
-
-dependencies {
-    kapt(Libs.Dagger.androidProcessor)
-    kapt(Libs.Dagger.compiler)
-}
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/test-dependencies.gradle.kts b/buildSrc/src/main/kotlin/test-dependencies.gradle.kts
index 78272f8852..bd895eef5d 100644
--- a/buildSrc/src/main/kotlin/test-dependencies.gradle.kts
+++ b/buildSrc/src/main/kotlin/test-dependencies.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     testImplementation(Libs.json)
     testImplementation(Libs.Mockito.jupiter)
     testImplementation(Libs.Mockito.kotlin)
-    testImplementation(Libs.joda)
+    testImplementation(Libs.jodaTime)
     testImplementation(Libs.Google.truth)
     testImplementation(Libs.jsonAssert)
 
diff --git a/core/graphview/build.gradle.kts b/core/graphview/build.gradle.kts
index 256ed30a16..8a9f212ffd 100644
--- a/core/graphview/build.gradle.kts
+++ b/core/graphview/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     id("com.android.library")
     id("kotlin-android")
-    id("kotlin-kapt")
     id("android-module-dependencies")
 }
 
diff --git a/core/interfaces/build.gradle.kts b/core/interfaces/build.gradle.kts
index cc0fd15617..158b52a2a8 100644
--- a/core/interfaces/build.gradle.kts
+++ b/core/interfaces/build.gradle.kts
@@ -2,11 +2,9 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("kotlin-kapt")
-    //id("kotlin-allopen")
     id("kotlin-parcelize")
     id("kotlinx-serialization")
     id("android-module-dependencies")
-    id("all-open-dependencies")
     id("test-dependencies")
 }
 
@@ -25,7 +23,7 @@ dependencies {
 
     api(Libs.AndroidX.appCompat)
     api(Libs.AndroidX.preference)
-    api(Libs.joda)
+    api(Libs.jodaTimeAndroid)
 
     api(Libs.Dagger.androidSupport)
 
@@ -48,4 +46,8 @@ dependencies {
 
     // WorkerClasses
     api(Libs.AndroidX.workRuntimeKtx)
+
+    // TODO eliminate kapt from low level modules
+    kapt(Libs.Dagger.compiler)
+    kapt(Libs.Dagger.androidProcessor)
 }
\ No newline at end of file
diff --git a/core/main/build.gradle b/core/main/build.gradle
deleted file mode 100644
index ea5c49ec5b..0000000000
--- a/core/main/build.gradle
+++ /dev/null
@@ -1,41 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-parcelize'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-dependencies {
-    implementation project(':database:entities')
-    implementation project(':core:graphview')
-    implementation project(':core:interfaces')
-    implementation project(':core:ui')
-    implementation project(':core:utils')
-
-    testImplementation project(':shared:tests')
-    testImplementation project(':shared:impl')
-
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-
-    api "com.google.guava:guava:$guava_version"
-
-    api "androidx.activity:activity-ktx:$activity_version"
-    api "androidx.appcompat:appcompat:$appcompat_version"
-    api "com.google.android.material:material:$material_version"
-
-    api "com.google.dagger:dagger-android:$dagger_version"
-    api "com.google.dagger:dagger-android-support:$dagger_version"
-
-    //WorkManager
-    api "androidx.work:work-runtime-ktx:$work_version" // DataWorkerStorage
-}
-
-android {
-    namespace 'app.aaps.core.main'
-}
diff --git a/core/main/build.gradle.kts b/core/main/build.gradle.kts
new file mode 100644
index 0000000000..146ed375ba
--- /dev/null
+++ b/core/main/build.gradle.kts
@@ -0,0 +1,41 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("kotlin-parcelize")
+    id("android-module-dependencies")
+    id("all-open-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+android {
+    namespace = "app.aaps.core.main"
+}
+
+dependencies {
+    implementation(project(":database:entities"))
+    implementation(project(":core:graphview"))
+    implementation(project(":core:interfaces"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:utils"))
+
+    testImplementation(project(":shared:tests"))
+    testImplementation(project(":shared:impl"))
+
+    api(Libs.Kotlin.stdlibJdk8)
+    api(Libs.Google.Android.material)
+    api(Libs.Google.guava)
+    api(Libs.AndroidX.activity)
+    api(Libs.AndroidX.appCompat)
+
+    api(Libs.Dagger.android)
+    api(Libs.Dagger.androidSupport)
+
+    //WorkManager
+    api(Libs.AndroidX.workRuntimeKtx)  // DataWorkerStorage
+
+    kapt(Libs.Dagger.compiler)
+    kapt(Libs.Dagger.androidProcessor)
+}
\ No newline at end of file
diff --git a/core/nssdk/build.gradle b/core/nssdk/build.gradle
deleted file mode 100644
index a4fbc5a740..0000000000
--- a/core/nssdk/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlinx-serialization'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-
-android {
-    namespace 'app.aaps.core.nssdk'
-}
-
-dependencies {
-    api "com.squareup.retrofit2:retrofit:$retrofit2_version"
-    api "com.squareup.retrofit2:adapter-rxjava3:$retrofit2_version"
-    api "com.squareup.retrofit2:converter-gson:$retrofit2_version"
-    api "com.squareup.okhttp3:okhttp:$okhttp3_version"
-    api "com.squareup.okhttp3:logging-interceptor:$okhttp3_version"
-
-    api "com.google.code.gson:gson:$gson_version"
-
-    api "net.danlew:android.joda:$joda_version"
-
-    api "io.reactivex.rxjava3:rxjava:$rxjava_version"
-    api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
-    api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version"
-
-    api "androidx.core:core-ktx:$core_version"
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-rx3:$coroutines_version"
-
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version"
-}
diff --git a/core/nssdk/build.gradle.kts b/core/nssdk/build.gradle.kts
new file mode 100644
index 0000000000..45b53a5da8
--- /dev/null
+++ b/core/nssdk/build.gradle.kts
@@ -0,0 +1,31 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlinx-serialization")
+    id("android-module-dependencies")
+    id("test-dependencies")
+}
+
+android {
+    namespace = "app.aaps.core.nssdk"
+}
+
+dependencies {
+    api(Libs.Squareup.Retrofit2.retrofit)
+    api(Libs.Squareup.Retrofit2.adapterRxJava3)
+    api(Libs.Squareup.Retrofit2.converterGson)
+    api(Libs.Squareup.Okhttp3.okhttp)
+    api(Libs.Squareup.Okhttp3.loggingInterceptor)
+    api(Libs.Google.gson)
+    api(Libs.jodaTimeAndroid)
+    api(Libs.Rx.rxJava)
+    //api(Libs.Rx.rxAndroid)
+    api(Libs.Rx.rxKotlin)
+
+    api(Libs.AndroidX.core)
+    api(Libs.Kotlin.stdlibJdk8)
+    api(Libs.KotlinX.coroutinesCore)
+    api(Libs.KotlinX.coroutinesAndroid)
+    api(Libs.KotlinX.coroutinesRx3)
+    api(Libs.KotlinX.serializationJson)
+}
\ No newline at end of file
diff --git a/core/ui/build.gradle b/core/ui/build.gradle
deleted file mode 100644
index d5ed2279d6..0000000000
--- a/core/ui/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-
-android {
-    namespace 'app.aaps.core.ui'
-
-    buildFeatures {
-        viewBinding true
-    }
-}
-
-dependencies {
-
-    api "androidx.core:core-ktx:$core_version"
-    api "androidx.appcompat:appcompat:$appcompat_version"
-    api "androidx.preference:preference-ktx:$preferencektx_version"
-
-    api "com.google.android.material:material:$material_version"
-
-    api "com.google.dagger:dagger-android:$dagger_version"
-    api "com.google.dagger:dagger-android-support:$dagger_version"
-}
\ No newline at end of file
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
new file mode 100644
index 0000000000..0237acb232
--- /dev/null
+++ b/core/ui/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("android-module-dependencies")
+}
+
+android {
+    namespace = "app.aaps.core.ui"
+}
+
+dependencies {
+    api(Libs.AndroidX.core)
+    api(Libs.AndroidX.appCompat)
+    api(Libs.AndroidX.preference)
+
+    api(Libs.Google.Android.material)
+
+    api(Libs.Dagger.android)
+    api(Libs.Dagger.androidSupport)
+}
\ No newline at end of file
diff --git a/core/utils/build.gradle b/core/utils/build.gradle
deleted file mode 100644
index 5afcf3b70c..0000000000
--- a/core/utils/build.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-android {
-
-    namespace 'app.aaps.core.utils'
-}
-
-dependencies {
-
-    api "com.google.dagger:dagger-android:$dagger_version"
-    api "com.google.dagger:dagger-android-support:$dagger_version"
-
-    api "net.danlew:android.joda:$joda_version"
-
-    //Firebase
-    api platform('com.google.firebase:firebase-bom:32.3.1')
-    api "com.google.firebase:firebase-analytics-ktx"
-    api "com.google.firebase:firebase-crashlytics-ktx"
-    // StatsActivity not in use now
-    //    api "com.google.firebase:firebase-messaging-ktx"
-    //    api 'com.google.firebase:firebase-auth-ktx'
-    //    api 'com.google.firebase:firebase-database-ktx'
-
-    //CryptoUtil
-    api 'com.madgag.spongycastle:core:1.58.0.0'
-    api "com.google.crypto.tink:tink-android:$tink_version"
-
-    //WorkManager
-    api "androidx.work:work-runtime-ktx:$work_version" // DataWorkerStorage
-}
\ No newline at end of file
diff --git a/core/utils/build.gradle.kts b/core/utils/build.gradle.kts
new file mode 100644
index 0000000000..b747c2ec7e
--- /dev/null
+++ b/core/utils/build.gradle.kts
@@ -0,0 +1,39 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("kotlin-allopen")
+    id("android-module-dependencies")
+    id("all-open-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+android {
+    namespace = "app.aaps.core.utils"
+}
+
+dependencies {
+
+    api(Libs.jodaTimeAndroid)
+
+    //Firebase
+    api(platform(Libs.Google.Firebase.firebaseBom))
+    api(Libs.Google.Firebase.analytics)
+    api(Libs.Google.Firebase.crashlytics)
+    // StatsActivity not in use now
+    // api(Libs.Google.Firebase.messaging)
+    // api(Libs.Google.Firebase.auth)
+    // api(Libs.Google.Firebase.database)
+
+    //CryptoUtil
+    api(Libs.spongycastleCore)
+    api(Libs.Google.tinkAndroid)
+
+    //WorkManager
+    api(Libs.AndroidX.workRuntimeKtx) // DataWorkerStorage
+
+    api(Libs.Dagger.android)
+    api(Libs.Dagger.androidSupport)
+}
\ No newline at end of file
diff --git a/core/validators/build.gradle b/core/validators/build.gradle
deleted file mode 100644
index 7b98cfe3d3..0000000000
--- a/core/validators/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-android {
-    namespace 'app.aaps.core.validators'
-}
-
-
-dependencies {
-    implementation project(':core:interfaces')
-
-    api "com.google.dagger:dagger-android:$dagger_version"
-    api "com.google.dagger:dagger-android-support:$dagger_version"
-
-    api "com.google.android.material:material:$material_version"
-}
\ No newline at end of file
diff --git a/core/validators/build.gradle.kts b/core/validators/build.gradle.kts
new file mode 100644
index 0000000000..a9d7b72177
--- /dev/null
+++ b/core/validators/build.gradle.kts
@@ -0,0 +1,25 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("android-module-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+android {
+    namespace = "app.aaps.core.validators"
+}
+
+
+dependencies {
+    implementation(project(":core:interfaces"))
+
+    api(Libs.Dagger.android)
+    api(Libs.Dagger.androidSupport)
+    api(Libs.Google.Android.material)
+
+    kapt(Libs.Dagger.compiler)
+    kapt(Libs.Dagger.androidProcessor)
+}
\ No newline at end of file
diff --git a/database/entities/build.gradle.kts b/database/entities/build.gradle.kts
index 3831333d35..d2bb87a15b 100644
--- a/database/entities/build.gradle.kts
+++ b/database/entities/build.gradle.kts
@@ -2,9 +2,7 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
     id("kotlin-kapt")
-    id("kotlin-allopen")
     id("android-module-dependencies")
-    id("all-open-dependencies")
     id("test-dependencies")
 }
 
diff --git a/database/impl/build.gradle.kts b/database/impl/build.gradle.kts
index 08daa20c40..8186202d78 100644
--- a/database/impl/build.gradle.kts
+++ b/database/impl/build.gradle.kts
@@ -47,4 +47,6 @@ dependencies {
     api(Libs.Dagger.androidSupport)
 
     androidTestImplementation(Libs.AndroidX.Room.testing)
+
+    kapt(Libs.Dagger.compiler)
 }
\ No newline at end of file
diff --git a/implementation/build.gradle b/implementation/build.gradle
deleted file mode 100644
index 91e04b3be1..0000000000
--- a/implementation/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-android {
-    namespace 'app.aaps.implementation'
-}
-
-dependencies {
-    implementation project(':database:entities')
-    implementation project(':database:impl')
-    implementation project(':core:main')
-    implementation project(':core:graphview')
-    implementation project(':core:interfaces')
-    implementation project(':core:ui')
-    implementation project(':core:utils')
-
-    testImplementation project(':shared:tests')
-    testImplementation project(':plugins:aps')
-    testImplementation project(':pump:virtual')
-
-    // Protection
-    api 'androidx.biometric:biometric:1.1.0'
-}
\ No newline at end of file
diff --git a/implementation/build.gradle.kts b/implementation/build.gradle.kts
new file mode 100644
index 0000000000..83062288a5
--- /dev/null
+++ b/implementation/build.gradle.kts
@@ -0,0 +1,33 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("android-module-dependencies")
+    id("all-open-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+android {
+    namespace = "app.aaps.implementation"
+}
+
+dependencies {
+    implementation(project(":database:entities"))
+    implementation(project(":database:impl"))
+    implementation(project(":core:main"))
+    implementation(project(":core:graphview"))
+    implementation(project(":core:interfaces"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:utils"))
+
+    testImplementation(project(":shared:tests"))
+    testImplementation(project(":plugins:aps"))
+    testImplementation(project(":pump:virtual"))
+    // Protection
+    api(Libs.AndroidX.biometric)
+
+    kapt(Libs.Dagger.compiler)
+    kapt(Libs.Dagger.androidProcessor)
+}
\ No newline at end of file
diff --git a/insight/build.gradle b/insight/build.gradle
deleted file mode 100644
index 95fd95d085..0000000000
--- a/insight/build.gradle
+++ /dev/null
@@ -1,40 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-android {
-
-    namespace 'info.nightscout.androidaps.insight'
-    defaultConfig {
-        kapt {
-            arguments {
-                arg("room.incremental", "true")
-                arg("room.schemaLocation", "$projectDir/schemas")
-            }
-        }
-    }
-}
-
-dependencies {
-
-    implementation project(':core:interfaces')
-    implementation project(':core:main')
-    implementation project(':core:utils')
-    implementation project(':core:ui')
-    implementation project(':pump:pump-common')
-
-    api "androidx.room:room-ktx:$room_version"
-    api "androidx.room:room-runtime:$room_version"
-    api "androidx.room:room-rxjava3:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-
-    api "com.google.android.material:material:$material_version"
-}
\ No newline at end of file
diff --git a/insight/build.gradle.kts b/insight/build.gradle.kts
new file mode 100644
index 0000000000..f611ef6082
--- /dev/null
+++ b/insight/build.gradle.kts
@@ -0,0 +1,39 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("android-module-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+android {
+
+    namespace = "info.nightscout.androidaps.insight"
+    defaultConfig {
+        kapt {
+            arguments {
+                arg("room.incremental", "true")
+                arg("room.schemaLocation", "$projectDir/schemas")
+            }
+        }
+    }
+}
+
+dependencies {
+
+    implementation(project(":core:interfaces"))
+    implementation(project(":core:main"))
+    implementation(project(":core:utils"))
+    implementation(project(":core:ui"))
+    implementation(project(":pump:pump-common"))
+
+    api(Libs.Google.Android.material)
+    api(Libs.AndroidX.Room.room)
+    api(Libs.AndroidX.Room.runtime)
+    api(Libs.AndroidX.Room.rxJava3)
+
+    kapt(Libs.AndroidX.Room.compiler)
+    kapt(Libs.Dagger.compiler)
+    kapt(Libs.Dagger.androidProcessor)
+}
\ No newline at end of file
diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle
deleted file mode 100644
index 51bfc41d02..0000000000
--- a/plugins/aps/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-android {
-    namespace 'app.aaps.plugins.aps'
-}
-
-dependencies {
-    implementation project(':database:entities')
-    implementation project(':database:impl')
-    implementation project(':core:main')
-    implementation project(':core:interfaces')
-    implementation project(':core:nssdk')
-    implementation project(':core:utils')
-    implementation project(':core:ui')
-    implementation project(':core:validators')
-
-    testImplementation project(':pump:virtual')
-    testImplementation project(':shared:tests')
-
-    api "androidx.appcompat:appcompat:$appcompat_version"
-    api "androidx.swiperefreshlayout:swiperefreshlayout:$swipe_version"
-    api "androidx.gridlayout:gridlayout:$gridlayout_version"
-
-    // APS
-    api 'org.mozilla:rhino:1.7.14'
-}
\ No newline at end of file
diff --git a/plugins/aps/build.gradle.kts b/plugins/aps/build.gradle.kts
new file mode 100644
index 0000000000..4c9d8fa02c
--- /dev/null
+++ b/plugins/aps/build.gradle.kts
@@ -0,0 +1,36 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("android-module-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+android {
+    namespace = "app.aaps.plugins.aps"
+}
+
+dependencies {
+    implementation(project(":database:entities"))
+    implementation(project(":database:impl"))
+    implementation(project(":core:main"))
+    implementation(project(":core:interfaces"))
+    implementation(project(":core:nssdk"))
+    implementation(project(":core:utils"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:validators"))
+
+    testImplementation(project(":pump:virtual"))
+    testImplementation(project(":shared:tests"))
+
+    api(Libs.AndroidX.appCompat)
+    api(Libs.AndroidX.swipeRefreshLayout)
+    api(Libs.AndroidX.gridLayout)
+
+    // APS
+    api(Libs.Mozilla.rhino)
+
+    kapt(Libs.Dagger.androidProcessor)
+}
\ No newline at end of file
diff --git a/plugins/automation/build.gradle b/plugins/automation/build.gradle
deleted file mode 100644
index acf1ff0282..0000000000
--- a/plugins/automation/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-android {
-    namespace 'app.aaps.plugins.automation'
-}
-
-dependencies {
-    implementation project(':core:graphview')
-    implementation project(':core:interfaces')
-    implementation project(':core:main')
-    implementation project(':core:utils')
-    implementation project(':core:ui')
-    implementation project(':core:validators')
-    implementation project(':database:entities')
-    implementation project(':database:impl')
-
-    testImplementation project(':shared:tests')
-    testImplementation project(':shared:impl')
-    testImplementation project(':implementation')
-    testImplementation project(':plugins:main')
-
-    api "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
-    api "com.google.android.gms:play-services-location:$play_services_location_version"
-}
\ No newline at end of file
diff --git a/plugins/automation/build.gradle.kts b/plugins/automation/build.gradle.kts
new file mode 100644
index 0000000000..e58073ddfe
--- /dev/null
+++ b/plugins/automation/build.gradle.kts
@@ -0,0 +1,35 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("android-module-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+android {
+    namespace = "app.aaps.plugins.automation"
+}
+
+dependencies {
+    implementation(project(":core:graphview"))
+    implementation(project(":core:interfaces"))
+    implementation(project(":core:main"))
+    implementation(project(":core:utils"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:validators"))
+    implementation(project(":database:entities"))
+    implementation(project(":database:impl"))
+
+    testImplementation(project(":shared:tests"))
+    testImplementation(project(":shared:impl"))
+    testImplementation(project(":implementation"))
+    testImplementation(project(":plugins:main"))
+
+    api(Libs.AndroidX.constraintLayout)
+    api(Libs.Google.Android.PlayServices.location)
+
+    kapt(Libs.Dagger.compiler)
+    kapt(Libs.Dagger.androidProcessor)
+}
\ No newline at end of file
diff --git a/plugins/source/build.gradle b/plugins/source/build.gradle
deleted file mode 100644
index 96e0678b7f..0000000000
--- a/plugins/source/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-android {
-    namespace 'app.aaps.plugins.source'
-}
-
-
-dependencies {
-    implementation project(':shared:impl')
-    implementation project(':database:entities')
-    implementation project(':database:impl')
-    implementation project(':core:interfaces')
-    implementation project(':core:main')
-    implementation project(':core:nssdk')
-    implementation project(':core:ui')
-    implementation project(':core:utils')
-
-    testImplementation project(':shared:tests')
-}
\ No newline at end of file
diff --git a/plugins/source/build.gradle.kts b/plugins/source/build.gradle.kts
new file mode 100644
index 0000000000..6fdf1fce31
--- /dev/null
+++ b/plugins/source/build.gradle.kts
@@ -0,0 +1,30 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("android-module-dependencies")
+    id("test-dependencies")
+}
+
+apply(from = "${project.rootDir}/core/main/jacoco_global.gradle")
+
+android {
+    namespace = "app.aaps.plugins.source"
+}
+
+
+dependencies {
+    implementation(project(":database:entities"))
+    implementation(project(":database:impl"))
+    implementation(project(":shared:impl"))
+    implementation(project(":core:interfaces"))
+    implementation(project(":core:main"))
+    implementation(project(":core:nssdk"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:utils"))
+
+    testImplementation(project(":shared:tests"))
+
+    kapt(Libs.Dagger.compiler)
+    kapt(Libs.Dagger.androidProcessor)
+}
\ No newline at end of file