diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 42c862fd..0f8bb6df 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,10 +16,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Set up AdoptOpenJDK 16
-        uses: joschi/setup-jdk@v2.3.0
+      - name: Setup Eclipse Temurin OpenJDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 230cd753..d29dd248 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,10 +15,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Setup AdoptOpenJDK 16
-        uses: joschi/setup-jdk@v2.3.0
+      - name: Setup Eclipse Temurin OpenJDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build JAR dist files
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index b9010392..26f6d018 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -16,10 +16,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Setup AdoptOpenJDK 16
-        uses: joschi/setup-jdk@v2.3.0
+      - name: Setup Eclipse Temurin OpenJDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build JAR dist files
@@ -52,10 +53,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Setup AdoptOpenJDK 16
-        uses: joschi/setup-jdk@v2.3.0
+      - name: Setup Eclipse Temurin OpenJDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
       - name: Build JAR dist files
         env:
           WORKFLOW_RUN: ${{ github.run_number }}
@@ -80,10 +82,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Setup AdoptOpenJDK 16
-        uses: joschi/setup-jdk@v2.3.0
+      - name: Setup Eclipse Temurin OpenJDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 16
+          distribution: 'temurin'
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build JAR dist files
diff --git a/README.md b/README.md
index e9a5250f..fa3eca04 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ We need your help! HyperLap2D is a very large and complex project, if you have s
 
 #### Building from source
 
-HyperLap2D is developed using IntelliJ IDEA. Needs `Java 16`.
+HyperLap2D is developed using IntelliJ IDEA. Needs `Java 17`.
 
 1. Fork this repository
 2. Clone with `--recurse-submodules` flag
diff --git a/assets/plugins/plugin-9patch-0.1.0.jar b/assets/plugins/plugin-9patch-0.1.0.jar
index 00e0ab64..2b463da6 100644
Binary files a/assets/plugins/plugin-9patch-0.1.0.jar and b/assets/plugins/plugin-9patch-0.1.0.jar differ
diff --git a/assets/plugins/plugin-performance-0.1.0.jar b/assets/plugins/plugin-performance-0.1.0.jar
index 0b70e85a..42dea7c6 100644
Binary files a/assets/plugins/plugin-performance-0.1.0.jar and b/assets/plugins/plugin-performance-0.1.0.jar differ
diff --git a/assets/plugins/plugin-skin-composer-0.1.0.jar b/assets/plugins/plugin-skin-composer-0.1.0.jar
index 5ef5c7e6..a62166e2 100644
Binary files a/assets/plugins/plugin-skin-composer-0.1.0.jar and b/assets/plugins/plugin-skin-composer-0.1.0.jar differ
diff --git a/assets/plugins/plugin-tiled-0.1.0.jar b/assets/plugins/plugin-tiled-0.1.0.jar
index 20d98a96..631de437 100644
Binary files a/assets/plugins/plugin-tiled-0.1.0.jar and b/assets/plugins/plugin-tiled-0.1.0.jar differ
diff --git a/build.gradle b/build.gradle
index b519fa3f..a62f1dd5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -166,10 +166,11 @@ runtime {
             imageOptions += ["--icon", file("icons/icon.ico")]
             installerType = 'msi'
             installerOptions += ['--win-dir-chooser', '--win-menu', '--win-menu-group', 'HyperLap2D',
-                                 '--win-shortcut',  '--vendor', 'Red & Black Games',
+                                 '--win-shortcut', '--win-shortcut-prompt',  '--vendor', 'Red & Black Games',
                                  '--description', 'HyperLap2D Editor',
                                  '--temp', "$buildDir/installer",
-                                 '--win-upgrade-uuid', 'e5f64fb6-111f-41f3-8f33-03b90e1a3a32']
+                                 '--win-upgrade-uuid', 'e5f64fb6-111f-41f3-8f33-03b90e1a3a32',
+                                 "--icon", file("icons/icon.ico")]
             resourceDir = file("resources-windows")
         } else if (osName.contains('linux')) {
             imageOptions += ["--icon", file("icons/HyperLap2D.png")]
diff --git a/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java b/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java
index a4a1ee6a..e78d07e0 100644
--- a/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java
+++ b/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java
@@ -20,6 +20,6 @@ public class BootstrapInfoCommand extends SimpleCommand {
         HyperLog.info("GL version " + gl20.glGetString(GL20.GL_VERSION));
         HyperLog.info("Shaders version " + gl20.glGetString(GL20.GL_SHADING_LANGUAGE_VERSION));
 
-        HyperLog.info("JVM Version: " + System.getProperty("java.version"));
+        HyperLog.info("JVM Version: " + System.getProperty("java.version") + " (" + System.getProperty("java.vendor") + ")");
     }
 }