diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index 2d1f75b87..436959bee 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -1,11 +1,9 @@
-import android.annotation.SuppressLint
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -31,7 +29,6 @@ android {
         applicationId = "de.mm20.launcher2"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        @SuppressLint("HighAppVersionCode")
         versionCode = System.getenv("VERSION_CODE_OVERRIDE")?.toIntOrNull() ?: 2026012400
         versionName = "1.39.3"
         signingConfig = signingConfigs.getByName("debug")
@@ -49,12 +46,8 @@ android {
     buildTypes {
         release {
             applicationIdSuffix = ".release"
-
-            postprocessing {
-                isRemoveUnusedCode = true
-                isObfuscate = false
-                isOptimizeCode = true
-            }
+            isMinifyEnabled = false
+            isShrinkResources = false
         }
         debug {
             applicationIdSuffix = ".debug"
@@ -67,11 +60,8 @@ android {
             versionNameSuffix = "-${LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))}-nightly"
             signingConfig = signingConfigs.findByName("gh-actions")
 
-            postprocessing {
-                isRemoveUnusedCode = true
-                isObfuscate = false
-                isOptimizeCode = true
-            }
+            isMinifyEnabled = false
+            isShrinkResources = false
         }
 
         flavorDimensions += "variant"
@@ -100,6 +90,9 @@ android {
         abortOnError = false
     }
     namespace = "de.mm20.launcher2"
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 
diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts
index 9af7526cc..6751e07a8 100644
--- a/app/ui/build.gradle.kts
+++ b/app/ui/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
     alias(libs.plugins.kotlin.plugin.compose)
 }
@@ -60,6 +59,7 @@ android {
     buildFeatures {
         compose = true
         viewBinding = true
+        buildConfig = true
     }
 
     lint {
@@ -86,7 +86,6 @@ dependencies {
     implementation(libs.androidx.navigation3.ui)
     implementation(libs.androidx.compose.material3adaptive.navigation3)
 
-    implementation(libs.jsoup)
     implementation(libs.markdown)
 
     implementation(libs.accompanist.systemuicontroller)
@@ -107,8 +106,6 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodelcompose)
     implementation(libs.androidx.lifecycle.runtimecompose)
 
-    implementation(libs.jsoup)
-
     implementation(libs.koin.android)
     implementation(libs.koin.androidxcompose)
 
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt
deleted file mode 100644
index ceff45911..000000000
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package de.mm20.launcher2.ui.utils
-
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.BaselineShift
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.style.TextIndent
-import androidx.compose.ui.unit.em
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Element
-import org.jsoup.nodes.TextNode
-
-fun htmlToAnnotatedString(html: String): AnnotatedString {
-    val document = Jsoup.parse(html.replace("\n", ""))
-    return buildAnnotatedString {
-        addNodes(this, document)
-    }
-}
-
-private val blockElements = arrayOf("p", "h1", "h2", "h3", "h4", "h5", "h6", "li", "pre")
-
-private val inlineElements = arrayOf("i", "b", "strong", "em", "sup", "sub", "u", "s", "code", "br")
-
-/**
- * @param inParagraph: ParagraphStyles may not be nested, this parameter indicates if we are already inside a paragraph
- */
-private fun addNodes(builder: AnnotatedString.Builder, element: Element, inParagraph: Boolean = false) {
-    val tagName = element.tag().normalName()
-    when {
-        blockElements.contains(tagName) -> {
-            val spanStyle = SpanStyle(
-                fontSize = when (tagName) {
-                    "h1" -> 2.em
-                    "h2" -> 1.75.em
-                    "h3" -> 1.5.em
-                    "h4" -> 1.25.em
-                    "h5" -> 1.125.em
-                    "h6" -> 1.em
-                    else -> 1.em
-                },
-                fontWeight = if (tagName.matches(Regex("h[1-6]"))) FontWeight.Bold else FontWeight.Normal,
-                fontFamily = if (tagName == "pre") FontFamily.Monospace else null
-            )
-
-            if (!inParagraph) {
-                builder.withStyle(ParagraphStyle(
-                    textIndent = if (tagName == "li") TextIndent(0.em, 1.em) else TextIndent.None
-                )) {
-                    withStyle(
-                        spanStyle
-                    ) {
-                        if (tagName == "li") builder.append(" • ")
-                        children(builder, element, true)
-                    }
-                }
-            } else {
-                builder.append("\n")
-                builder.withStyle(
-                    spanStyle
-                ) {
-                    if (tagName == "li") builder.append(" • ")
-                    children(builder, element, true)
-                }
-            }
-        }
-        inlineElements.contains(tagName) -> {
-            builder.withStyle(
-                SpanStyle(
-                    fontStyle = if (tagName == "i" || tagName == "em") FontStyle.Italic else FontStyle.Normal,
-                    fontWeight = if (tagName == "b" || tagName == "strong") FontWeight.Bold else FontWeight.Normal,
-                    textDecoration = when (tagName) {
-                        "u" -> TextDecoration.Underline
-                        "s" -> TextDecoration.LineThrough
-                        else -> TextDecoration.None
-                    },
-                    baselineShift = when (tagName) {
-                        "sup" -> BaselineShift.Superscript
-                        "sub" -> BaselineShift.Subscript
-                        else -> BaselineShift.None
-                    },
-                    fontFamily = if (tagName == "code") FontFamily.Monospace else null
-                )
-            ) {
-                if(tagName == "br") builder.append("\n")
-                children(builder, element, inParagraph)
-            }
-        }
-        else -> {
-            children(builder, element, inParagraph)
-        }
-    }
-}
-
-private fun children(builder: AnnotatedString.Builder, element: Element, inParagraph: Boolean) {
-    for (node in element.childNodes()) {
-        if (node is TextNode) {
-            builder.append(node.text())
-        }
-        if (node is Element) {
-            addNodes(builder, node, inParagraph)
-        }
-    }
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 00108b63f..df089ac44 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.plugin.serialization) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.android.application) apply false
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index 7d82b64e7..9da6dcf3e 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
@@ -40,6 +39,9 @@ android {
         }
     }
     namespace = "de.mm20.launcher2.base"
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
diff --git a/core/compat/build.gradle.kts b/core/compat/build.gradle.kts
index 8a56e43f1..ef55e443d 100644
--- a/core/compat/build.gradle.kts
+++ b/core/compat/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/core/crashreporter/build.gradle.kts b/core/crashreporter/build.gradle.kts
index 4a7c1630d..9dfc55685 100644
--- a/core/crashreporter/build.gradle.kts
+++ b/core/crashreporter/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -35,6 +34,9 @@ android {
         }
     }
     namespace = "de.mm20.launcher2.crashreporter"
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
diff --git a/core/devicepose/build.gradle.kts b/core/devicepose/build.gradle.kts
index e13b03147..401cd31d4 100644
--- a/core/devicepose/build.gradle.kts
+++ b/core/devicepose/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/core/i18n/build.gradle.kts b/core/i18n/build.gradle.kts
index 00a40e73b..38b7e8443 100644
--- a/core/i18n/build.gradle.kts
+++ b/core/i18n/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/core/ktx/build.gradle.kts b/core/ktx/build.gradle.kts
index 6363d85e7..2921c4bf2 100644
--- a/core/ktx/build.gradle.kts
+++ b/core/ktx/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/core/permissions/build.gradle.kts b/core/permissions/build.gradle.kts
index 9034b3597..8dca79e3c 100644
--- a/core/permissions/build.gradle.kts
+++ b/core/permissions/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts
index 7fa188aee..39e0dbd99 100644
--- a/core/preferences/build.gradle.kts
+++ b/core/preferences/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/core/profiles/build.gradle.kts b/core/profiles/build.gradle.kts
index 0f1c853ac..fa6a04cbd 100644
--- a/core/profiles/build.gradle.kts
+++ b/core/profiles/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/core/shared/build.gradle.kts b/core/shared/build.gradle.kts
index 311508bfd..4ca08e99d 100644
--- a/core/shared/build.gradle.kts
+++ b/core/shared/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
     alias(libs.plugins.dokka)
     `maven-publish`
diff --git a/data/applications/build.gradle.kts b/data/applications/build.gradle.kts
index 5f5f5c3b7..2f2877443 100644
--- a/data/applications/build.gradle.kts
+++ b/data/applications/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/appshortcuts/build.gradle.kts b/data/appshortcuts/build.gradle.kts
index cbecc1215..8ec0f539b 100644
--- a/data/appshortcuts/build.gradle.kts
+++ b/data/appshortcuts/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts
index f5bee60af..aa593c4f1 100644
--- a/data/calculator/build.gradle.kts
+++ b/data/calculator/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/calendar/build.gradle.kts b/data/calendar/build.gradle.kts
index 48908b471..b79439b64 100644
--- a/data/calendar/build.gradle.kts
+++ b/data/calendar/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/data/contacts/build.gradle.kts b/data/contacts/build.gradle.kts
index f73a11166..d3de7a607 100644
--- a/data/contacts/build.gradle.kts
+++ b/data/contacts/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/currencies/build.gradle.kts b/data/currencies/build.gradle.kts
index a8ea492ff..677d3934a 100644
--- a/data/currencies/build.gradle.kts
+++ b/data/currencies/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts
index dffdb93eb..80af1485f 100644
--- a/data/customattrs/build.gradle.kts
+++ b/data/customattrs/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts
index 3dce9d3fd..706cca79b 100644
--- a/data/database/build.gradle.kts
+++ b/data/database/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.ksp)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts
index 2f4659fd8..45b133780 100644
--- a/data/files/build.gradle.kts
+++ b/data/files/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/data/i18n/build.gradle.kts b/data/i18n/build.gradle.kts
index 77b1ff922..3a54cae5e 100644
--- a/data/i18n/build.gradle.kts
+++ b/data/i18n/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/data/locations/build.gradle.kts b/data/locations/build.gradle.kts
index f6a48e44b..0a5b6ca27 100644
--- a/data/locations/build.gradle.kts
+++ b/data/locations/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/data/notifications/build.gradle.kts b/data/notifications/build.gradle.kts
index 64fb1a3fe..d09fc64da 100644
--- a/data/notifications/build.gradle.kts
+++ b/data/notifications/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/plugins/build.gradle.kts b/data/plugins/build.gradle.kts
index 919554790..8c29410b6 100644
--- a/data/plugins/build.gradle.kts
+++ b/data/plugins/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts
index 9bd1db64c..c870c08fc 100644
--- a/data/search-actions/build.gradle.kts
+++ b/data/search-actions/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/search-actions/consumer-rules.pro b/data/search-actions/consumer-rules.pro
index e69de29bb..d75e0cf3d 100644
--- a/data/search-actions/consumer-rules.pro
+++ b/data/search-actions/consumer-rules.pro
@@ -0,0 +1,3 @@
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn com.google.re2j.Matcher
+-dontwarn com.google.re2j.Pattern
\ No newline at end of file
diff --git a/data/searchable/build.gradle.kts b/data/searchable/build.gradle.kts
index 7dc3c4049..93626ab38 100644
--- a/data/searchable/build.gradle.kts
+++ b/data/searchable/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/themes/build.gradle.kts b/data/themes/build.gradle.kts
index dfbec098e..305ba51cc 100644
--- a/data/themes/build.gradle.kts
+++ b/data/themes/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/data/unitconverter/build.gradle.kts b/data/unitconverter/build.gradle.kts
index 0605375f7..29d76a7e5 100644
--- a/data/unitconverter/build.gradle.kts
+++ b/data/unitconverter/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts
index 75e90a594..7ca215696 100644
--- a/data/weather/build.gradle.kts
+++ b/data/weather/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/data/websites/build.gradle.kts b/data/websites/build.gradle.kts
index e798ce75a..260fb8706 100644
--- a/data/websites/build.gradle.kts
+++ b/data/websites/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/data/websites/consumer-rules.pro b/data/websites/consumer-rules.pro
index e69de29bb..d75e0cf3d 100644
--- a/data/websites/consumer-rules.pro
+++ b/data/websites/consumer-rules.pro
@@ -0,0 +1,3 @@
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn com.google.re2j.Matcher
+-dontwarn com.google.re2j.Pattern
\ No newline at end of file
diff --git a/data/widgets/build.gradle.kts b/data/widgets/build.gradle.kts
index 24a32d9f2..8374e1a3e 100644
--- a/data/widgets/build.gradle.kts
+++ b/data/widgets/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/data/wikipedia/build.gradle.kts b/data/wikipedia/build.gradle.kts
index 81f217c4b..b7b810482 100644
--- a/data/wikipedia/build.gradle.kts
+++ b/data/wikipedia/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/gradle.properties b/gradle.properties
index b5c2dbfa7..f4bd8df87 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,8 +18,5 @@ android.injected.testOnly=false
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
-android.enableR8.fullMode=false
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
 org.gradle.configuration-cache=true
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9c54b896a..074eb7ca3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ targetSdk = "36"
 pluginSdk = "2.2.0"
 
 gradle = "8.1.2"
-android-gradle-plugin = "8.13.2"
+android-gradle-plugin = "9.1.0"
 ksp-gradle-plugin = "2.3.4"
 
 kotlin = "2.3.20"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa0ed228f..39823f941 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Sun Feb 09 12:41:42 CET 2025
+#Sat Mar 28 15:03:15 CET 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/address-formatter/build.gradle.kts b/libs/address-formatter/build.gradle.kts
index afd8e23ce..08e575c84 100644
--- a/libs/address-formatter/build.gradle.kts
+++ b/libs/address-formatter/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/libs/material-color-utilities/build.gradle.kts b/libs/material-color-utilities/build.gradle.kts
index d720fc7c3..c1a1493b4 100644
--- a/libs/material-color-utilities/build.gradle.kts
+++ b/libs/material-color-utilities/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/libs/nextcloud/build.gradle.kts b/libs/nextcloud/build.gradle.kts
index f21cdfe8b..340985ef6 100644
--- a/libs/nextcloud/build.gradle.kts
+++ b/libs/nextcloud/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
     alias(libs.plugins.kotlin.plugin.compose)
 }
diff --git a/libs/owncloud/build.gradle.kts b/libs/owncloud/build.gradle.kts
index 0eb9b970e..cdde04943 100644
--- a/libs/owncloud/build.gradle.kts
+++ b/libs/owncloud/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
     alias(libs.plugins.kotlin.plugin.compose)
 }
diff --git a/libs/webdav/build.gradle.kts b/libs/webdav/build.gradle.kts
index 2a300e295..16c572533 100644
--- a/libs/webdav/build.gradle.kts
+++ b/libs/webdav/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/plugins/sdk/build.gradle.kts b/plugins/sdk/build.gradle.kts
index ce1e21753..8cdb0686e 100644
--- a/plugins/sdk/build.gradle.kts
+++ b/plugins/sdk/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
     alias(libs.plugins.dokka)
     `maven-publish`
diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts
index 6960a07f2..c8ba5ebfd 100644
--- a/services/accounts/build.gradle.kts
+++ b/services/accounts/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/backup/build.gradle.kts b/services/backup/build.gradle.kts
index 4b5c5306e..cc63d367b 100644
--- a/services/backup/build.gradle.kts
+++ b/services/backup/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/badges/build.gradle.kts b/services/badges/build.gradle.kts
index 3c1c83fd9..1d420a29f 100644
--- a/services/badges/build.gradle.kts
+++ b/services/badges/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
diff --git a/services/favorites/build.gradle.kts b/services/favorites/build.gradle.kts
index 0fc18c421..9e344ad7c 100644
--- a/services/favorites/build.gradle.kts
+++ b/services/favorites/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/feed/build.gradle.kts b/services/feed/build.gradle.kts
index 0804efac6..cde9c53cf 100644
--- a/services/feed/build.gradle.kts
+++ b/services/feed/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
@@ -38,6 +37,7 @@ android {
 
     buildFeatures {
         aidl = true
+        buildConfig = true
     }
 
     namespace = "de.mm20.launcher2.feed"
diff --git a/services/global-actions/build.gradle.kts b/services/global-actions/build.gradle.kts
index bbf5e8a70..e6beac0ff 100644
--- a/services/global-actions/build.gradle.kts
+++ b/services/global-actions/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/icons/build.gradle.kts b/services/icons/build.gradle.kts
index 7358e183a..4751f1009 100644
--- a/services/icons/build.gradle.kts
+++ b/services/icons/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -35,6 +34,9 @@ android {
         }
     }
     namespace = "de.mm20.launcher2.icons"
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
diff --git a/services/music/build.gradle.kts b/services/music/build.gradle.kts
index e0e96be5d..a5f12d2fc 100644
--- a/services/music/build.gradle.kts
+++ b/services/music/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/plugins/build.gradle.kts b/services/plugins/build.gradle.kts
index ab6a94d29..0d7a8475f 100644
--- a/services/plugins/build.gradle.kts
+++ b/services/plugins/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/search/build.gradle.kts b/services/search/build.gradle.kts
index a6e769d87..bedea2fb3 100644
--- a/services/search/build.gradle.kts
+++ b/services/search/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/search/consumer-rules.pro b/services/search/consumer-rules.pro
index e69de29bb..d75e0cf3d 100644
--- a/services/search/consumer-rules.pro
+++ b/services/search/consumer-rules.pro
@@ -0,0 +1,3 @@
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn com.google.re2j.Matcher
+-dontwarn com.google.re2j.Pattern
\ No newline at end of file
diff --git a/services/tags/build.gradle.kts b/services/tags/build.gradle.kts
index b5e24afae..580e32e7c 100644
--- a/services/tags/build.gradle.kts
+++ b/services/tags/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/services/widgets/build.gradle.kts b/services/widgets/build.gradle.kts
index d6fb16bf4..f22bdf12c 100644
--- a/services/widgets/build.gradle.kts
+++ b/services/widgets/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {