diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c59cf6..aeb6c60 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,12 +47,12 @@ jobs:
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.0.4
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: zulu
-          java-version: 11
+          distribution: corretto
+          java-version: 17
 
       # Set environment variables
       - name: Export Properties
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index add5d95..63180ba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,12 +23,12 @@ jobs:
         with:
           ref: ${{ github.event.release.tag_name }}
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: zulu
-          java-version: 11
+          distribution: corretto
+          java-version: 17
 
       # Set environment variables
       - name: Export Properties
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
index 1e4456d..86242fa 100644
--- a/.github/workflows/run-ui-tests.yml
+++ b/.github/workflows/run-ui-tests.yml
@@ -35,12 +35,12 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v3
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java 17 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          distribution: zulu
-          java-version: 11
+          distribution: corretto
+          java-version: 17
 
       # Run IDEA prepared for UI testing
       - name: Run IDE
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 438d672..4159324 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,11 @@
 # RON Extended Support Changelog
 
 ## [Unreleased]
+### Fixed
+- Updated plugin to support new versions of IDE.
 
 ## [0.2.9]
-### Fixed
+### Fixed
 - Updated plugin to support new versions of IDE.
 
 ## [0.2.8]
diff --git a/build.gradle.kts b/build.gradle.kts
index 8693414..ff58dcb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,9 +6,9 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.7.10"
+    id("org.jetbrains.kotlin.jvm") version "1.7.22"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "1.8.0"
+    id("org.jetbrains.intellij") version "1.10.0"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
     id("org.jetbrains.changelog") version "1.3.1"
 }
@@ -21,11 +21,9 @@ repositories {
     mavenCentral()
 }
 
-// Set the JVM language level used to compile sources and generate files - Java 11 is required since 2020.3
+// Set the JVM language level used to build project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
+    jvmToolchain (17)
 }
 
 sourceSets["main"].java.srcDirs("src/main/gen")
diff --git a/gradle.properties b/gradle.properties
index 9e0cebc..53720c7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,13 +3,13 @@
 
 pluginGroup = com.github.madwareru.intellijronremix
 pluginName = RON Extended Support
-pluginVersion = 0.2.9
+pluginVersion = 0.2.10
 
-pluginSinceBuild = 213
-pluginUntilBuild = 222.*
+pluginSinceBuild = 223.0
+pluginUntilBuild = 223.*
 
 platformType = IC
-platformVersion = 2022.2
+platformVersion = 2022.3
 
 # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..249e583 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da9702f..2ec77e5 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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/com/github/madwareru/intellijronremix/ide/codeStyle/RONCodeStyleSettings.kt b/src/main/kotlin/com/github/madwareru/intellijronremix/ide/codeStyle/RONCodeStyleSettings.kt
index 68f82e4..b137cf6 100644
--- a/src/main/kotlin/com/github/madwareru/intellijronremix/ide/codeStyle/RONCodeStyleSettings.kt
+++ b/src/main/kotlin/com/github/madwareru/intellijronremix/ide/codeStyle/RONCodeStyleSettings.kt
@@ -3,7 +3,7 @@ package com.github.madwareru.intellijronremix.ide.codestyle
 import com.intellij.psi.codeStyle.CodeStyleSettings
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings
 
-class RONCodeStyleSettings(settings: CodeStyleSettings?) : CustomCodeStyleSettings(
+class RONCodeStyleSettings(settings: CodeStyleSettings) : CustomCodeStyleSettings(
     "RONCodeStyleSettings",
     settings
 )