diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e03cf2ee..e9c5a255 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-compiler = "0.9.7"
+mustache = "0.9.7"
 guava = "33.1.0-android"
 jacksonCore = "2.12.7"
 jacksonDataformatYaml = "2.12.7"
@@ -44,7 +44,7 @@ junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 
 [libraries]
-compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "compiler" }
+mustache-compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "mustache" }
 gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-plugin" }
 
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
diff --git a/libs/address-formatter/build.gradle b/libs/address-formatter/build.gradle
deleted file mode 100644
index bc116657..00000000
--- a/libs/address-formatter/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-
-    compileSdk libs.versions.compileSdk.get().toInteger()
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    defaultConfig {
-        minSdk libs.versions.minSdk.get().toInteger()
-        versionCode 10
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    namespace "de.mm20.launcher2.lib.addressformatter"
-}
-
-dependencies {
-    implementation libs.jackson.core
-    implementation libs.jackson.dataformat.yaml
-    implementation libs.guava
-    implementation libs.compiler
-}
diff --git a/libs/address-formatter/build.gradle.kts b/libs/address-formatter/build.gradle.kts
new file mode 100644
index 00000000..ee414124
--- /dev/null
+++ b/libs/address-formatter/build.gradle.kts
@@ -0,0 +1,42 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+            )
+            consumerProguardFiles("proguard-rules.pro")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    namespace = "de.mm20.launcher2.addressformatter"
+}
+
+dependencies {
+    implementation(libs.jackson.core)
+    implementation(libs.jackson.dataformat.yaml)
+    implementation(libs.guava)
+    implementation(libs.mustache.compiler)
+}