diff --git a/.github/workflows/Action CI.yml b/.github/workflows/Action CI.yml
index 660498d..10d9f11 100644
--- a/.github/workflows/Action CI.yml	
+++ b/.github/workflows/Action CI.yml	
@@ -44,7 +44,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: '21'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index a1f2bd6..3d9a86c 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -21,8 +21,12 @@ val verName = "1.5.0"
 val verCode = getVersionCode()
 val xcf = XCFramework(appName + "Framework")
 
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 
     androidTarget()
 
@@ -167,6 +171,8 @@ compose.desktop {
 
         buildTypes.release.proguard {
             configurationFiles.from("proguard-rules-jvm.pro")
+            version.set("7.6.0")
+            optimize.set(false)
         }
 
         nativeDistributions {
diff --git a/gradle.properties b/gradle.properties
index 3b82012..b34ec79 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,13 @@
-kotlin.code.style=official
-xcodeproj=./iosApp
-#Gradle
-org.gradle.jvmargs=-Xmx8g
+# Gradle
+org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8
+org.gradle.parallel=true
 org.gradle.caching=true
+org.gradle.configureondemand=true
 # Android
-android.nonTransitiveRClass=true
 android.useAndroidX=true
-# K/JS & K/WASM
-org.jetbrains.compose.experimental.jscanvas.enabled=true
-org.jetbrains.compose.experimental.wasm.enabled=true
+android.nonTransitiveRClass=true
+# kotlin
+kotlin.code.style=official
 # MPP
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.enableCInteropCommonization=true
@@ -18,5 +17,8 @@ kotlin.incremental.useClasspathSnapshot=true
 # Native
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.useEmbeddableCompilerJar=true
+# Experimental
+org.jetbrains.compose.experimental.jscanvas.enabled=true
 # Xcode
 kotlin.apple.xcodeCompatibility.nowarn=true
+xcodeproj=./iosApp
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dc8ebf8..d8ea361 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -29,4 +29,8 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+}
+
 include(":composeApp")
\ No newline at end of file