diff --git a/.sdkmanrc b/.sdkmanrc
index 533f355..169ac21 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.14.fx-zulu
+# java=17.0.14.fx-zulu
+java=23.0.2.fx-librca
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc..2733ed5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ksdtoolkit-core/build.gradle.kts b/ksdtoolkit-core/build.gradle.kts
index ca66244..4052c0c 100644
--- a/ksdtoolkit-core/build.gradle.kts
+++ b/ksdtoolkit-core/build.gradle.kts
@@ -5,8 +5,6 @@
  * @author [Krešimir Pripužić](mailto:kresimir.pripuzic@fer.hr)
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("org.jetbrains.kotlin.jvm")
 
@@ -20,32 +18,21 @@ tasks.withType<Jar> {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
 
     implementation("org.jetbrains.kotlin:kotlin-reflect")
 
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
-    implementation("org.hamcrest:hamcrest-all:1.3")
+    testImplementation("org.hamcrest:hamcrest:3.0")
 
-    implementation("ch.qos.logback:logback-classic:1.2.3")
-    implementation("ch.qos.logback:logback-core:1.2.3")
+    implementation("ch.qos.logback:logback-classic:1.5.18")
+    implementation("ch.qos.logback:logback-core:1.5.18")
 
-    implementation("org.slf4j:slf4j-api:1.7.30")
-}
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = "1.8"
-}
-
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
-    jvmTarget = "1.8"
+    implementation("org.slf4j:slf4j-api:2.0.17")
 }
 
 javafx {
-    version = "17.0.14"
     modules("javafx.controls", "javafx.fxml", "javafx.graphics", "javafx.swing")
 }
 
diff --git a/ksdtoolkit-core/src/test/kotlin/hr.unipu.ksdtoolkit/5_SimulationOutputsTest.kt b/ksdtoolkit-core/src/test/kotlin/hr.unipu.ksdtoolkit/5_SimulationOutputsTest.kt
index dc82f19..096e312 100644
--- a/ksdtoolkit-core/src/test/kotlin/hr.unipu.ksdtoolkit/5_SimulationOutputsTest.kt
+++ b/ksdtoolkit-core/src/test/kotlin/hr.unipu.ksdtoolkit/5_SimulationOutputsTest.kt
@@ -48,7 +48,7 @@ class `5_SimulationOutputsTest` {
         simulation.outputs {
             csvExporter = CsvExporter("output_data.csv", ";")
             pngExporter = PngExporter("output_chart.png")
-//            winSimulator = WinSimulator()
+            winSimulator = WinSimulator()
 
             // !!! Mobile simulator test has to be run from Android Test, because Java modules
             // cannot depend on Android modules (reverse is ok).
diff --git a/ksdtoolkit-webapp/build.gradle.kts b/ksdtoolkit-webapp/build.gradle.kts
index a882230..89fcd66 100644
--- a/ksdtoolkit-webapp/build.gradle.kts
+++ b/ksdtoolkit-webapp/build.gradle.kts
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("org.jetbrains.kotlin.jvm")
 
-    id("org.gretty") version "3.0.3"
+    id("org.gretty") version "3.1.0"
 
     id("com.devsoap.plugin.vaadin") version "2.0.0.beta2"
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f1f834f..4574df2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,12 +10,11 @@ pluginManagement {
     repositories {
         google()
         gradlePluginPortal()
-        jcenter()
         mavenLocal()
     }
 
-    val kotlinVersion = "1.4.20"
-    val androidGradlePluginVersion = "4.0.2"
+    val kotlinVersion = "2.1.10"
+    val androidGradlePluginVersion = "8.9"
 
     plugins {
         id("org.jetbrains.kotlin.jvm") version kotlinVersion apply false