diff --git a/jdk.table.xml b/jdk.table.xml
index a1af54e..bdd0df2 100644
--- a/jdk.table.xml
+++ b/jdk.table.xml
@@ -1,173 +1,117 @@
 <application>
   <component name="ProjectJdkTable">
     <jdk version="2">
-      <name value="JDK" />
-      <type value="JavaSDK" />
-      <version value="Azul Zulu 13.0.14" />
-      <homePath value="$USER_HOME$/.jdks/azul-13.0.14" />
+      <name value="Android API 29 Platform" />
+      <type value="Android SDK" />
+      <homePath value="$USER_HOME$/Android/Sdk" />
       <roots>
         <annotationsPath>
           <root type="composite">
-            <root url="jar://$APPLICATION_HOME_DIR$/plugins/java/lib/resources/jdkAnnotations.jar!/" type="simple" />
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-29/data/annotations.zip!/" type="simple" />
           </root>
         </annotationsPath>
         <classPath>
           <root type="composite">
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.base" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.compiler" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.datatransfer" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.desktop" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.instrument" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.logging" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.management" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.management.rmi" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.naming" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.net.http" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.prefs" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.rmi" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.scripting" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.se" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.security.jgss" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.security.sasl" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.smartcardio" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.sql" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.sql.rowset" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.transaction.xa" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.xml" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/java.xml.crypto" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.accessibility" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.aot" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.attach" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.charsets" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.compiler" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.crypto.cryptoki" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.crypto.ec" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.dynalink" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.editpad" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.hotspot.agent" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.httpserver" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.internal.ed" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.internal.jvmstat" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.internal.le" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.internal.opt" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.internal.vm.ci" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.internal.vm.compiler" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.internal.vm.compiler.management" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jartool" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.javadoc" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jcmd" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jconsole" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jdeps" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jdi" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jdwp.agent" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jfr" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jlink" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jshell" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jsobject" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.jstatd" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.localedata" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.management" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.management.agent" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.management.jfr" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.naming.dns" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.naming.rmi" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.net" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.pack" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.rmic" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.scripting.nashorn" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.scripting.nashorn.shell" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.sctp" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.security.auth" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.security.jgss" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.unsupported" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.unsupported.desktop" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.xml.dom" type="simple" />
-            <root url="jrt://$USER_HOME$/.jdks/azul-13.0.14!/jdk.zipfs" type="simple" />
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-29/android.jar!/" type="simple" />
+            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-29/data/res" type="simple" />
           </root>
         </classPath>
         <javadocPath>
+          <root type="composite">
+            <root url="http://developer.android.com/reference/" type="simple" />
+          </root>
+        </javadocPath>
+        <sourcePath>
           <root type="composite" />
+        </sourcePath>
+      </roots>
+      <additional sdk="android-29" />
+    </jdk>
+    <jdk version="2">
+      <name value="Android API 31 Platform" />
+      <type value="Android SDK" />
+      <homePath value="$USER_HOME$/Android/Sdk" />
+      <roots>
+        <annotationsPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-31/data/annotations.zip!/" type="simple" />
+          </root>
+        </annotationsPath>
+        <classPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-31/android.jar!/" type="simple" />
+            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-31/data/res" type="simple" />
+          </root>
+        </classPath>
+        <javadocPath>
+          <root type="composite">
+            <root url="http://developer.android.com/reference/" type="simple" />
+          </root>
         </javadocPath>
         <sourcePath>
+          <root type="composite" />
+        </sourcePath>
+      </roots>
+      <additional sdk="android-31" />
+    </jdk>
+    <jdk version="2">
+      <name value="Android API 30 Platform" />
+      <type value="Android SDK" />
+      <homePath value="$USER_HOME$/Android/Sdk" />
+      <roots>
+        <annotationsPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-30/data/annotations.zip!/" type="simple" />
+          </root>
+        </annotationsPath>
+        <classPath>
           <root type="composite">
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.se" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.aot" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jdi" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jfr" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.net" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.rmi" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.sql" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.xml" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jcmd" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.pack" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.rmic" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.sctp" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.base" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jdeps" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jlink" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.zipfs" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.prefs" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.attach" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jshell" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jstatd" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.naming" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.editpad" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jartool" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.javadoc" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.xml.dom" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.desktop" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.logging" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.charsets" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.compiler" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.dynalink" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jconsole" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jsobject" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.compiler" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.net.http" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.crypto.ec" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.scripting" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.httpserver" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.jdwp.agent" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.localedata" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.management" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.naming.dns" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.naming.rmi" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.instrument" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.management" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.sql.rowset" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.xml.crypto" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.internal.ed" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.internal.le" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.unsupported" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.smartcardio" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.internal.opt" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.datatransfer" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.accessibility" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.hotspot.agent" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.security.auth" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.security.jgss" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.security.jgss" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.security.sasl" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.internal.vm.ci" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.management.jfr" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.management.rmi" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/java.transaction.xa" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.crypto.cryptoki" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.internal.jvmstat" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.management.agent" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.scripting.nashorn" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.unsupported.desktop" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.internal.vm.compiler" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.scripting.nashorn.shell" type="simple" />
-            <root url="jar://$USER_HOME$/.jdks/azul-13.0.14/lib/src.zip!/jdk.internal.vm.compiler.management" type="simple" />
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-30/android.jar!/" type="simple" />
+            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-30/data/res" type="simple" />
           </root>
+        </classPath>
+        <javadocPath>
+          <root type="composite">
+            <root url="http://developer.android.com/reference/" type="simple" />
+          </root>
+        </javadocPath>
+        <sourcePath>
+          <root type="composite" />
         </sourcePath>
       </roots>
+      <additional sdk="android-30" />
     </jdk>
     <jdk version="2">
-      <name value="jbr-21" />
+      <name value="Android API 33, extension level 3 Platform" />
+      <type value="Android SDK" />
+      <homePath value="$USER_HOME$/Android/Sdk" />
+      <roots>
+        <annotationsPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-33/data/annotations.zip!/" type="simple" />
+          </root>
+        </annotationsPath>
+        <classPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-33/android.jar!/" type="simple" />
+            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-33/data/res" type="simple" />
+          </root>
+        </classPath>
+        <javadocPath>
+          <root type="composite">
+            <root url="http://developer.android.com/reference/" type="simple" />
+          </root>
+        </javadocPath>
+        <sourcePath>
+          <root type="composite" />
+        </sourcePath>
+      </roots>
+      <additional sdk="android-33" />
+    </jdk>
+    <jdk version="2">
+      <name value="jbr-17" />
       <type value="JavaSDK" />
-      <version value="JetBrains Runtime 21.0.3" />
+      <version value="JetBrains Runtime 17.0.11" />
       <homePath value="$APPLICATION_HOME_DIR$/jbr" />
       <roots>
         <annotationsPath>
@@ -213,6 +157,8 @@
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.le" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.opt" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.vm.ci" type="simple" />
+            <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.vm.compiler" type="simple" />
+            <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.vm.compiler.management" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.jartool" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.javadoc" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.jcmd" type="simple" />
@@ -266,36 +212,9 @@
       </roots>
     </jdk>
     <jdk version="2">
-      <name value="Android API 34, extension level 7 Platform" />
-      <type value="Android SDK" />
-      <homePath value="$USER_HOME$/Android/Sdk" />
-      <roots>
-        <annotationsPath>
-          <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-34/data/annotations.zip!/" type="simple" />
-          </root>
-        </annotationsPath>
-        <classPath>
-          <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-34/android.jar!/" type="simple" />
-            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-34/data/res" type="simple" />
-          </root>
-        </classPath>
-        <javadocPath>
-          <root type="composite">
-            <root url="http://developer.android.com/reference/" type="simple" />
-          </root>
-        </javadocPath>
-        <sourcePath>
-          <root type="composite" />
-        </sourcePath>
-      </roots>
-      <additional sdk="android-34" />
-    </jdk>
-    <jdk version="2">
-      <name value="jbr-17" />
+      <name value="21" />
       <type value="JavaSDK" />
-      <version value="JetBrains Runtime 17.0.11" />
+      <version value="java version &quot;21.0.3&quot;" />
       <homePath value="$APPLICATION_HOME_DIR$/jbr" />
       <roots>
         <annotationsPath>
@@ -341,8 +260,6 @@
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.le" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.opt" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.vm.ci" type="simple" />
-            <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.vm.compiler" type="simple" />
-            <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.internal.vm.compiler.management" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.jartool" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.javadoc" type="simple" />
             <root url="jrt://$APPLICATION_HOME_DIR$/jbr!/jdk.jcmd" type="simple" />
@@ -369,182 +286,8 @@
           </root>
         </classPath>
         <javadocPath>
-          <root type="composite" />
-        </javadocPath>
-        <sourcePath>
-          <root type="composite" />
-        </sourcePath>
-      </roots>
-    </jdk>
-    <jdk version="2">
-      <name value="Android API 31 Platform" />
-      <type value="Android SDK" />
-      <homePath value="$USER_HOME$/Android/Sdk" />
-      <roots>
-        <annotationsPath>
           <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-31/data/annotations.zip!/" type="simple" />
-          </root>
-        </annotationsPath>
-        <classPath>
-          <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-31/android.jar!/" type="simple" />
-            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-31/data/res" type="simple" />
-          </root>
-        </classPath>
-        <javadocPath>
-          <root type="composite">
-            <root url="http://developer.android.com/reference/" type="simple" />
-          </root>
-        </javadocPath>
-        <sourcePath>
-          <root type="composite" />
-        </sourcePath>
-      </roots>
-      <additional sdk="android-31" />
-    </jdk>
-    <jdk version="2">
-      <name value="Android API 30 Platform" />
-      <type value="Android SDK" />
-      <homePath value="$USER_HOME$/Android/Sdk" />
-      <roots>
-        <annotationsPath>
-          <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-30/data/annotations.zip!/" type="simple" />
-          </root>
-        </annotationsPath>
-        <classPath>
-          <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-30/android.jar!/" type="simple" />
-            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-30/data/res" type="simple" />
-          </root>
-        </classPath>
-        <javadocPath>
-          <root type="composite">
-            <root url="http://developer.android.com/reference/" type="simple" />
-          </root>
-        </javadocPath>
-        <sourcePath>
-          <root type="composite" />
-        </sourcePath>
-      </roots>
-      <additional sdk="android-30" />
-    </jdk>
-    <jdk version="2">
-      <name value="Android API 33, extension level 3 Platform" />
-      <type value="Android SDK" />
-      <homePath value="$USER_HOME$/Android/Sdk" />
-      <roots>
-        <annotationsPath>
-          <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-33/data/annotations.zip!/" type="simple" />
-          </root>
-        </annotationsPath>
-        <classPath>
-          <root type="composite">
-            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-33/android.jar!/" type="simple" />
-            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-33/data/res" type="simple" />
-          </root>
-        </classPath>
-        <javadocPath>
-          <root type="composite">
-            <root url="http://developer.android.com/reference/" type="simple" />
-          </root>
-        </javadocPath>
-        <sourcePath>
-          <root type="composite" />
-        </sourcePath>
-      </roots>
-      <additional sdk="android-33" />
-    </jdk>
-    <jdk version="2">
-      <name value="17" />
-      <type value="JavaSDK" />
-      <version value="17.0.10" />
-      <homePath value="/usr/lib/jvm/java-17-openjdk-amd64" />
-      <roots>
-        <annotationsPath>
-          <root type="composite">
-            <root url="jar://$APPLICATION_HOME_DIR$/plugins/java/lib/resources/jdkAnnotations.jar!/" type="simple" />
-          </root>
-        </annotationsPath>
-        <classPath>
-          <root type="composite">
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.base" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.compiler" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.datatransfer" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.desktop" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.instrument" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.logging" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.management" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.management.rmi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.naming" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.net.http" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.prefs" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.rmi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.scripting" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.se" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.security.jgss" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.security.sasl" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.smartcardio" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.sql" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.sql.rowset" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.transaction.xa" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.xml" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/java.xml.crypto" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.accessibility" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.attach" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.charsets" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.compiler" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.crypto.cryptoki" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.crypto.ec" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.dynalink" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.editpad" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.hotspot.agent" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.httpserver" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.incubator.foreign" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.incubator.vector" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.internal.ed" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.internal.jvmstat" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.internal.le" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.internal.opt" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.internal.vm.ci" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.internal.vm.compiler" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.internal.vm.compiler.management" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jartool" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.javadoc" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jcmd" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jconsole" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jdeps" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jdi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jdwp.agent" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jfr" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jlink" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jpackage" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jshell" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jsobject" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.jstatd" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.localedata" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.management" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.management.agent" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.management.jfr" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.naming.dns" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.naming.rmi" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.net" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.nio.mapmode" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.random" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.sctp" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.security.auth" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.security.jgss" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.unsupported" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.unsupported.desktop" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.xml.dom" type="simple" />
-            <root url="jrt:///usr/lib/jvm/java-17-openjdk-amd64!/jdk.zipfs" type="simple" />
-          </root>
-        </classPath>
-        <javadocPath>
-          <root type="composite">
-            <root url="https://docs.oracle.com/en/java/javase/17/docs/api/" type="simple" />
+            <root url="https://docs.oracle.com/en/java/javase/21/docs/api/" type="simple" />
           </root>
         </javadocPath>
         <sourcePath>
@@ -553,9 +296,9 @@
       </roots>
     </jdk>
     <jdk version="2">
-      <name value="21" />
+      <name value="jbr-21" />
       <type value="JavaSDK" />
-      <version value="java version &quot;21.0.3&quot;" />
+      <version value="JetBrains Runtime 21.0.3" />
       <homePath value="$APPLICATION_HOME_DIR$/jbr" />
       <roots>
         <annotationsPath>
@@ -627,14 +370,66 @@
           </root>
         </classPath>
         <javadocPath>
+          <root type="composite" />
+        </javadocPath>
+        <sourcePath>
+          <root type="composite" />
+        </sourcePath>
+      </roots>
+    </jdk>
+    <jdk version="2">
+      <name value="Android API 34, extension level 7 Platform" />
+      <type value="Android SDK" />
+      <homePath value="$USER_HOME$/Android/Sdk" />
+      <roots>
+        <annotationsPath>
           <root type="composite">
-            <root url="https://docs.oracle.com/en/java/javase/21/docs/api/" type="simple" />
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-34/data/annotations.zip!/" type="simple" />
+          </root>
+        </annotationsPath>
+        <classPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-34/android.jar!/" type="simple" />
+            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-34/data/res" type="simple" />
+          </root>
+        </classPath>
+        <javadocPath>
+          <root type="composite" />
+        </javadocPath>
+        <sourcePath>
+          <root type="composite">
+            <root url="file://$USER_HOME$/Android/Sdk/sources/android-34" type="simple" />
+          </root>
+        </sourcePath>
+      </roots>
+      <additional sdk="android-34" />
+    </jdk>
+    <jdk version="2">
+      <name value="Android API 35 Platform" />
+      <type value="Android SDK" />
+      <homePath value="$USER_HOME$/Android/Sdk" />
+      <roots>
+        <annotationsPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-35/data/annotations.zip!/" type="simple" />
+          </root>
+        </annotationsPath>
+        <classPath>
+          <root type="composite">
+            <root url="jar://$USER_HOME$/Android/Sdk/platforms/android-35/android.jar!/" type="simple" />
+            <root url="file://$USER_HOME$/Android/Sdk/platforms/android-35/data/res" type="simple" />
+          </root>
+        </classPath>
+        <javadocPath>
+          <root type="composite">
+            <root url="http://developer.android.com/reference/" type="simple" />
           </root>
         </javadocPath>
         <sourcePath>
           <root type="composite" />
         </sourcePath>
       </roots>
+      <additional sdk="android-35" />
     </jdk>
   </component>
 </application>
\ No newline at end of file
diff --git a/laf.xml b/laf.xml
index 17008a7..f11a98f 100644
--- a/laf.xml
+++ b/laf.xml
@@ -1,6 +1,5 @@
 <application>
   <component name="LafManager">
-    <laf themeId="Darcula" />
     <lafs-to-previous-schemes>
       <laf-to-scheme laf="Darcula" scheme="My Vim dark " />
       <laf-to-scheme laf="ExperimentalDark" scheme="My Vim dark " />