diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8c3a84..00939bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
           signingKey: ${{ secrets.SIGNING_KEY }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: 36.0.0-rc1
+          buildToolsVersion: 36.0.0
 
       - name: List files
         run: ls app/build/outputs/apk/release
diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml
index b5654e6..5d69b21 100644
--- a/.github/workflows/playstore.yml
+++ b/.github/workflows/playstore.yml
@@ -73,7 +73,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: 36.0.0-rc1
+          BUILD_TOOLS_VERSION: 36.0.0
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 17f68e0..b504339 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -11,6 +11,6 @@
     <option name="languageVersion" value="2.1" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.1.0-RC2" />
+    <option name="version" value="2.1.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8352cba..9d6b878 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..16660f1
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d5b423e..996912f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -7,17 +7,17 @@ plugins {
 
 android {
     namespace = "de.dertyp7214.rboardpatcher"
-    compileSdkPreview = "Baklava"
-    buildToolsVersion = "36.0.0-rc1"
+    compileSdk = 36
+    buildToolsVersion = "36.0.0"
 
     buildFeatures.buildConfig = true
 
     defaultConfig {
         applicationId = "de.dertyp7214.rboardpatcher"
         minSdk = 23
-        targetSdk = 35
-        versionCode = 3302
-        versionName = "3.3"
+        targetSdk = 36
+        versionCode = 3401
+        versionName = "3.4"
 
         testInstrumentationRunner  = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index d686340..91ea4ab 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
     dependencies {
         classpath(libs.gradle)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "2.0.20"))
+        classpath(kotlin("gradle-plugin", version = "2.1.20"))
     }
 }
 
diff --git a/colorutilsc b/colorutilsc
index e09008d..ba0610b 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit e09008dfe95a440f378fc213ff20815396d296e7
+Subproject commit ba0610bb41b4bb48bd69e4b16940c98fb8f87abc
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 54d50c7..474085a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,22 +2,22 @@
 androidx-junit = "1.2.1"
 appcompat = "1.7.0"
 browser = "1.8.0"
-constraintlayout = "2.2.0"
-coreKtx = "1.15.0"
-desugar_jdk_libs_nio = "2.1.3"
+constraintlayout = "2.2.1"
+coreKtx = "1.16.0-beta01"
+desugar_jdk_libs_nio = "2.1.5"
 espressoCore = "3.6.1"
-gradle = "8.9.0-alpha03"
-gson = "2.11.0"
+gradle = "8.11.0-alpha02"
+gson = "2.12.1"
 junit = "4.13.2"
-kotlinreflect = "2.1.0-RC2"
-kotlinStdlib = "2.1.0-RC2"
-kotlinxCoroutinesAndroid = "1.9.0"
-kspPlugin = "2.1.0-RC2-1.0.28"
-material = "1.13.0-alpha08"
+kotlinreflect = "2.1.20"
+kotlinStdlib = "2.1.20"
+kotlinxCoroutinesAndroid = "1.10.1"
+kspPlugin = "2.1.20-1.0.31"
+material = "1.13.0-alpha11"
 preferenceKtx = "1.2.1"
 storage = "2.0.0"
-kotlin = "2.1.0-RC2"
-activity = "1.10.0-beta01"
+kotlin = "2.1.20"
+activity = "1.10.1"
 
 [libraries]
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d603e8f..71df9f8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 21 21:14:24 CET 2024
+#Thu Mar 20 14:39:28 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/rboardcomponents b/rboardcomponents
index f23f83d..3bebc8f 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit f23f83da287e34b6f75f90639e1e115de44141fb
+Subproject commit 3bebc8f5fe658fba77bc30d41c2ad67741390c74