diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 4b121e839..a99547eae 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="moduleKind" value="plain" />
+  </component>
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="11" />
   </component>
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.21" />
+  <component name="KotlinCommonCompilerArguments">
+    <option name="apiVersion" value="2.1" />
+    <option name="languageVersion" value="2.1" />
   </component>
-</project>
+  <component name="KotlinCompilerSettings">
+    <option name="additionalArguments" value="-Xwhen-guards" />
+  </component>
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="2.1.0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/beanshell/build.gradle.kts b/beanshell/build.gradle.kts
index ce7a83531..212f0aa7f 100644
--- a/beanshell/build.gradle.kts
+++ b/beanshell/build.gradle.kts
@@ -5,15 +5,6 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
 val serverMainClassName = "prog8lsp.MainKt"
 val applicationName = "prog8-beanshell"
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 4165a32e5..ab5bb0773 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,26 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("jvm") version "2.1.0"
 }
 
 allprojects {
+    apply(plugin="kotlin")
+
     repositories {
         mavenLocal()
         mavenCentral()
     }
+
+    kotlin {
+        compilerOptions {
+            freeCompilerArgs = listOf("-Xwhen-guards")
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
+
+    java {
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
+    }
 }
diff --git a/codeCore/build.gradle.kts b/codeCore/build.gradle.kts
index 214a080ba..411a9a92a 100644
--- a/codeCore/build.gradle.kts
+++ b/codeCore/build.gradle.kts
@@ -4,18 +4,9 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
 dependencies {
     // should have no dependencies to other modules
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
 }
 
diff --git a/codeGenCpu6502/build.gradle.kts b/codeGenCpu6502/build.gradle.kts
index 2f139ea43..dd22990f4 100644
--- a/codeGenCpu6502/build.gradle.kts
+++ b/codeGenCpu6502/build.gradle.kts
@@ -4,25 +4,15 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
-
 dependencies {
     implementation(project(":codeCore"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     // implementation "org.jetbrains.kotlin:kotlin-reflect"
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
 
     testImplementation("io.kotest:kotest-runner-junit5-jvm:5.9.1")
     testImplementation("io.kotest:kotest-framework-datatest:5.9.1")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
diff --git a/codeGenExperimental/build.gradle.kts b/codeGenExperimental/build.gradle.kts
index 6ec5eb4e3..8bf1d3295 100644
--- a/codeGenExperimental/build.gradle.kts
+++ b/codeGenExperimental/build.gradle.kts
@@ -4,21 +4,11 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
-
 dependencies {
     implementation(project(":codeCore"))
     implementation(project(":intermediate"))
     implementation(project(":codeGenIntermediate"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     // implementation "org.jetbrains.kotlin:kotlin-reflect"
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
 }
diff --git a/codeGenIntermediate/build.gradle.kts b/codeGenIntermediate/build.gradle.kts
index b38f0cdd8..dfcb064be 100644
--- a/codeGenIntermediate/build.gradle.kts
+++ b/codeGenIntermediate/build.gradle.kts
@@ -4,24 +4,16 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
 
 dependencies {
     implementation(project(":codeCore"))
     implementation(project(":intermediate"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     // implementation "org.jetbrains.kotlin:kotlin-reflect"
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
 
     testImplementation("io.kotest:kotest-runner-junit5-jvm:5.9.1")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
     testImplementation("io.kotest:kotest-framework-datatest:5.9.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/codeOptimizers/build.gradle.kts b/codeOptimizers/build.gradle.kts
index 6e414af2d..d411e3820 100644
--- a/codeOptimizers/build.gradle.kts
+++ b/codeOptimizers/build.gradle.kts
@@ -4,20 +4,10 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
-
 dependencies {
     implementation(project(":codeCore"))
     implementation(project(":compilerAst"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
     // implementation "org.jetbrains.kotlin:kotlin-reflect"
 }
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index fa70a5a73..3a3d3c26b 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -8,15 +8,6 @@ plugins {
     id("com.peterabeles.gversion") version "1.10.3"
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
 dependencies {
     implementation(project(":codeCore"))
     implementation(project(":codeOptimizers"))
@@ -27,7 +18,7 @@ dependencies {
     implementation(project(":virtualmachine"))
     // implementation(project(":beanshell"))
     implementation("org.antlr:antlr4-runtime:4.13.2")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     // implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlinx:kotlinx-cli:0.3.6")
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
@@ -36,7 +27,7 @@ dependencies {
     testImplementation(project(":intermediate"))
     testImplementation("io.kotest:kotest-runner-junit5-jvm:5.9.1")
     testImplementation("io.kotest:kotest-framework-datatest:5.9.1")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
diff --git a/compilerAst/build.gradle.kts b/compilerAst/build.gradle.kts
index 9ffc5fa38..f1fee396d 100644
--- a/compilerAst/build.gradle.kts
+++ b/compilerAst/build.gradle.kts
@@ -4,18 +4,9 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
 dependencies {
     implementation(project(":codeCore"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.antlr:antlr4-runtime:4.13.2")
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
     implementation(project(":parser"))
diff --git a/intermediate/build.gradle.kts b/intermediate/build.gradle.kts
index e0853bb99..b7d63b803 100644
--- a/intermediate/build.gradle.kts
+++ b/intermediate/build.gradle.kts
@@ -4,21 +4,12 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
-
 dependencies {
     implementation(project(":codeCore"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     testImplementation("io.kotest:kotest-runner-junit5-jvm:5.9.1")
     testImplementation("io.kotest:kotest-framework-datatest:5.9.1")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
diff --git a/parser/build.gradle.kts b/parser/build.gradle.kts
index 82ea36193..23d0d1971 100644
--- a/parser/build.gradle.kts
+++ b/parser/build.gradle.kts
@@ -5,11 +5,6 @@ plugins {
     id("java")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
 dependencies {
     antlr("org.antlr:antlr4:4.13.2")
     implementation("org.antlr:antlr4-runtime:4.13.2")
diff --git a/virtualmachine/build.gradle.kts b/virtualmachine/build.gradle.kts
index 0621ddd90..950af7d14 100644
--- a/virtualmachine/build.gradle.kts
+++ b/virtualmachine/build.gradle.kts
@@ -4,23 +4,15 @@ plugins {
     kotlin("jvm")
 }
 
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
 
 dependencies {
     implementation(project(":codeCore"))
     implementation(project(":intermediate"))
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    // implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0")
     testImplementation("io.kotest:kotest-runner-junit5-jvm:5.9.1")
     testImplementation("io.kotest:kotest-framework-datatest:5.9.1")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }