diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cb8c887..d1fcc92 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,14 +1,12 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import groovy.util.IndentPrinter
 import groovy.xml.MarkupBuilder
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.FileInputStream
 import java.io.StringWriter
 import java.util.Properties
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
 }
 
 val keystorePropertiesFile: File = rootProject.file("keystore.properties")
@@ -83,7 +81,9 @@ android {
     }
 
     namespace = "si.maev.twa"
-    compileSdk = 36
+    compileSdk {
+        version = release(36)
+    }
 
     defaultConfig {
         applicationId = "si.maev.twa"
@@ -204,11 +204,15 @@ android {
         null
     }
 
+    buildFeatures {
+        resValues = true
+    }
+
     buildTypes {
         release {
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
+//            proguardFiles(
+//                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+//            )
             ndk {
                 debugSymbolLevel = "FULL"
             }
@@ -225,12 +229,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_21
     }
 
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_21
-        }
-    }
-
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -239,9 +237,9 @@ android {
 }
 
 dependencies {
-    implementation("com.google.androidbrowserhelper:locationdelegation:1.1.2")
-//    implementation 'com.google.androidbrowserhelper:billing:1.0.0-alpha10'
-    implementation("com.google.androidbrowserhelper:androidbrowserhelper:2.7.0-alpha03") // Alpha version adds edge-to-edge support which removes a warning in Play console
+    implementation(libs.androidbrowserhelper)
+//    implementation(libs.androidbrowserhelper.billing)
+    implementation(libs.androidbrowserhelper.locationdelegation)
 }
 
 tasks.register("generateShortcutsFile") {
diff --git a/build.gradle.kts b/build.gradle.kts
index 3cfc33d..3756278 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
+    alias(libs.plugins.android.application) apply false
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3c5031e..20e2a01 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,8 +8,8 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..664d179
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,13 @@
+[versions]
+agp = "9.0.0"
+abh = "2.7.0-alpha03" # Alpha version adds edge-to-edge support which removes a warning in Play console
+#abhBilling = "1.1.0"
+abhLocationDelegation = "1.1.2"
+
+[libraries]
+androidbrowserhelper = { group = "com.google.androidbrowserhelper", name = "androidbrowserhelper", version.ref = "abh" }
+#androidbrowserhelper-billing = { group = "com.google.androidbrowserhelper", name = "billing", version.ref = "abhBilling" }
+androidbrowserhelper-locationdelegation = { group = "com.google.androidbrowserhelper", name = "locationdelegation", version.ref = "abhLocationDelegation" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6e6d574..acfbad7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,12 @@
 pluginManagement {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
         gradlePluginPortal()
     }