Release version 1.6.0

.idea/runConfigurations/Delete_Finished_Icons.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Delete Finished Icons" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="deleteFinishedIcons" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

README.md

@@ -31,4 +31,3 @@ Note that the Project tool window is supposed to be purple, but it doesn't work
 * ![Yellow](https://placehold.it/15/F0A732/000000?text=+) **Editing / Hints** (Edit Source, Intention Bulb, Find In Selection)
 * ![Blue](https://placehold.it/15/3592C4/000000?text=+) **Movement / Layout** (Filter, Sort, Split, Expand, Collapse, Refresh)
 * ![Purple](https://placehold.it/15/B066B0/000000?text=+) **Special** (Save, Print, Download, Upload, Import, Export, Pin)
-

build.gradle.kts

@@ -1,21 +1,38 @@
+import java.io.FileFilter
+
 plugins {
 	java
-	idea
-	id("org.jetbrains.intellij") version "1.13.2"
+	id("org.jetbrains.intellij") version "1.15.0"
 }
 
 group = "com.chylex.intellij.coloredicons"
-version = "1.4"
+version = "1.6.0"
 
 repositories {
 	mavenCentral()
+	maven("https://www.jetbrains.com/intellij-repository/releases/")
 	maven("https://www.jetbrains.com/intellij-repository/snapshots/")
 }
 
 intellij {
 	type.set("IU")
-	version.set("2022.3.3")
+	version.set("242.20224-EAP-CANDIDATE-SNAPSHOT")
 	updateSinceUntilBuild.set(false)
+	
+	plugins.set(listOf(
+		"com.intellij.classic.ui:242.20224.22",    // https://plugins.jetbrains.com/plugin/24468-classic-ui/versions
+		"com.jetbrains.php:242.20224.44",          // https://plugins.jetbrains.com/plugin/6610-php/versions
+		"com.jetbrains.rust:242.1",                // https://plugins.jetbrains.com/plugin/22407-rust/versions
+		"org.intellij.scala:2024.2.11",            // https://plugins.jetbrains.com/plugin/1347-scala/versions
+		"org.jetbrains.plugins.go:242.20224.38",   // https://plugins.jetbrains.com/plugin/9568-go/versions
+		"org.jetbrains.plugins.ruby:242.20224.38", // https://plugins.jetbrains.com/plugin/1293-ruby/versions
+		"PythonCore:242.20224.38",                 // https://plugins.jetbrains.com/plugin/7322-python-community-edition/versions
+		"Pythonid:242.20224.38",                   // https://plugins.jetbrains.com/plugin/631-python/versions
+	))
+}
+
+tasks.patchPluginXml {
+	sinceBuild.set("242")
 }
 
 tasks.buildSearchableOptions {
@@ -46,12 +63,9 @@ dependencies {
 	"helpersImplementation"("commons-io:commons-io:2.11.0")
 	
 	if (System.getProperty("downloadExtraIDEs", "") == "true") {
-		"ides"("com.jetbrains.intellij.idea:ideaIU:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.clion:clion:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.goland:goland:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.phpstorm:phpstorm:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.pycharm:pycharmPY:LATEST-EAP-SNAPSHOT")
-		"ides"("com.jetbrains.intellij.rider:riderRD:2022.3-SNAPSHOT")
+		"ides"("com.jetbrains.intellij.idea:ideaIU:2023.3")
+		"ides"("com.jetbrains.intellij.clion:clion:2023.3")
+		"ides"("com.jetbrains.intellij.rider:riderRD:2023.3")
 	}
 }
 
@@ -69,9 +83,16 @@ fun getClassPathFolders(configuration: Configuration): List<String> {
 }
 
 createHelperTask("fixSVGs",                    main = "FixSVGs")
+createHelperTask("deleteFinishedIcons",        main = "DeleteFinishedIcons")
 createHelperTask("grabIconsFromInstalledIDEs", main = "GrabIcons\$FromInstalledIDEs")
-createHelperTask("grabIconsFromGradle",        main = "GrabIcons\$FromArgumentPaths") {
+createHelperTask("grabIconsFromGradle",        main = "GrabIcons\$FromArgumentPaths") { task ->
 	val ideLibraries = getClassPathFolders(project.configurations.getByName("ides"))
-	val downloadedPlugins = File(buildDir, "idea-sandbox/system/plugins").absolutePath
-	it.args = ideLibraries + downloadedPlugins
+	val downloadedPlugins = File(buildDir, "idea-sandbox/plugins").listFiles(FileFilter { it.isDirectory && it.name != rootProject.name })
+	
+	if (downloadedPlugins != null) {
+		task.args = ideLibraries + downloadedPlugins.map(File::getAbsolutePath)
+	}
+	else {
+		task.args = ideLibraries
+	}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

helpers/com/chylex/intellij/coloredicons/DeleteFinishedIcons.java

@@ -0,0 +1,50 @@
+package com.chylex.intellij.coloredicons;
+
+import org.apache.commons.io.FileUtils;
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Set;
+import static java.util.stream.Collectors.toSet;
+
+public final class DeleteFinishedIcons {
+	@SuppressWarnings("ResultOfMethodCallIgnored")
+	public static void main(final String[] args) {
+		final Path extractedRootPath = Path.of("./extracted");
+		final Path finishedRootPath = Path.of("./resources/icons");
+		
+		final Collection<File> extractedFiles = FileUtils.listFiles(extractedRootPath.toFile(), null, true);
+		final Collection<File> finishedFiles = FileUtils.listFiles(finishedRootPath.toFile(), null, true);
+		
+		System.out.println("Extracted files: " + extractedFiles.size());
+		System.out.println("Finished files: " + finishedFiles.size());
+		
+		final Set<String> finishedRelativePaths = finishedFiles.stream()
+			.map(file -> relativize(finishedRootPath, file))
+			.collect(toSet());
+		
+		int deleted = 0;
+		
+		for (final File extractedFile : extractedFiles) {
+			if (finishedRelativePaths.remove(relativize(extractedRootPath, extractedFile))) {
+				++deleted;
+				extractedFile.delete();
+			}
+		}
+		
+		System.out.println("Deleted files: " + deleted);
+		
+		if (!finishedRelativePaths.isEmpty()) {
+			System.out.println("Undeleted files: " + finishedRelativePaths.size());
+			System.out.println();
+			
+			finishedRelativePaths.stream()
+				.sorted()
+				.forEachOrdered(undeletedPath -> System.out.println("Undeleted file: " + undeletedPath));
+		}
+	}
+	
+	private static String relativize(final Path basePath, final File file) {
+		return basePath.relativize(file.toPath()).toString();
+	}
+}

helpers/com/chylex/intellij/coloredicons/GrabIcons.java

@@ -23,17 +23,34 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 abstract class GrabIcons {
-	private static final List<String> EXPECTED_VIEW_BOXES_LOWERCASE = List.of(
+	private static final List<String> EXPECTED_OLD_UI_VIEW_BOXES_LOWERCASE = List.of(
 		"viewbox=\"0 0 12 12\"",
+		"viewbox=\"0 0 13 13\"",
 		"viewbox=\"0 0 16 16\"",
-		"viewbox=\"0 0 13 13\""
+		"width=\"12\" height=\"12\"",
+		"width=\"13\" height=\"13\"",
+		"width=\"16\" height=\"16\""
 	);
 	
-	private static final List<String> EXPECTED_COLORS_LOWERCASE = List.of(
+	private static final List<String> EXPECTED_OLD_UI_COLORS_LOWERCASE = List.of(
 		"#afb1b3",
 		"#6e6e6e"
 	);
 	
+	private static final List<String> EXPECTED_NEW_UI_VIEW_BOXES_LOWERCASE = List.of(
+		"viewbox=\"0 0 14 14\"",
+		"viewbox=\"0 0 16 16\"",
+		"viewbox=\"0 0 20 20\"",
+		"width=\"14\" height=\"14\"",
+		"width=\"16\" height=\"16\"",
+		"width=\"20\" height=\"20\""
+	);
+	
+	private static final List<String> EXPECTED_NEW_UI_COLORS_LOWERCASE = List.of(
+		"#6c707e",
+		"#ced0d6"
+	);
+	
 	private static final boolean FLATTEN_ARCHIVE_PATHS = true;
 	private static final boolean FLATTEN_SVG_PATHS = false;
 	
@@ -191,7 +208,8 @@ abstract class GrabIcons {
 		final byte[] svgBytes = inputStream.readAllBytes();
 		final String svgText = new String(svgBytes, StandardCharsets.UTF_8);
 		
-		if (!isValidSVG(svgText)) {
+		if (!isValidSVG(svgText, EXPECTED_OLD_UI_VIEW_BOXES_LOWERCASE, EXPECTED_OLD_UI_COLORS_LOWERCASE) &&
+			!isValidSVG(svgText, EXPECTED_NEW_UI_VIEW_BOXES_LOWERCASE, EXPECTED_NEW_UI_COLORS_LOWERCASE)) {
 			return;
 		}
 		
@@ -218,16 +236,16 @@ abstract class GrabIcons {
 		++stats.uniqueSVGs;
 	}
 	
-	private static boolean isValidSVG(final String svg) {
+	private static boolean isValidSVG(final String svg, final List<String> expectedViewBoxes, final List<String> expectedColors) {
 		boolean hasExpectedViewBox = false;
 		boolean hasExpectedColor = false;
 		
 		for (final String line : svg.lines().map(line -> line.toLowerCase(Locale.ROOT)).toArray(String[]::new)) {
-			if (EXPECTED_VIEW_BOXES_LOWERCASE.stream().anyMatch(line::contains)) {
+			if (expectedViewBoxes.stream().anyMatch(line::contains)) {
 				hasExpectedViewBox = true;
 			}
 			
-			if (EXPECTED_COLORS_LOWERCASE.stream().anyMatch(line::contains)) {
+			if (expectedColors.stream().anyMatch(line::contains)) {
 				hasExpectedColor = true;
 			}
 			
@@ -256,40 +274,39 @@ abstract class GrabIcons {
 		}
 	}
 	
+	@SuppressWarnings("CallToSystemGetenv")
 	public static final class FromInstalledIDEs extends GrabIcons {
 		public static void main(final String[] args) throws IOException {
 			new FromInstalledIDEs().run();
 		}
 		
-		@SuppressWarnings("CallToSystemGetenv")
 		@Override
 		protected Stream<Path> findLibAndPluginFolders() {
+			return Stream.concat(findLibAndPluginFoldersFromOldToolbox(), findLibAndPluginFoldersFromNewToolbox()).filter(Files::isDirectory); // catches non-existent paths too
+		}
+		
+		private static Stream<Path> findLibAndPluginFoldersFromOldToolbox() {
+			System.out.println("Searching in %LOCALAPPDATA%\\JetBrains\\Toolbox\\apps...");
+			
 			final String localAppData = System.getenv("LOCALAPPDATA");
 			
 			if (localAppData == null) {
-				System.out.println("Missing %LOCALAPPDATA%, only Windows Vista or newer are supported.");
-				return null;
+				System.out.println("Found nothing, %LOCALAPPDATA% does not exist.");
+				return Stream.of();
 			}
 			
 			final Path toolboxAppsFolder = Paths.get(localAppData, "JetBrains", "Toolbox", "apps");
 			
 			if (!Files.exists(toolboxAppsFolder)) {
-				System.out.println("Missing JetBrains Toolbox installation folder at: " + toolboxAppsFolder);
-				return null;
+				System.out.println("Found nothing, old Toolbox installation folder does not exist.");
+				return Stream.of();
 			}
 			
-			return list(toolboxAppsFolder)
-				.filter(Files::isDirectory)
-				.flatMap(FromInstalledIDEs::getAppChannelFolders)
-				.flatMap(FromInstalledIDEs::getLibAndPluginsFolders);
-		}
-		
-		private static Stream<Path> getAppChannelFolders(final Path appFolder) {
-			return list(appFolder).filter(Files::isDirectory).filter(child -> getFileNameLowerCase(child).startsWith("ch-"));
-		}
-		
-		private static Stream<Path> getLibAndPluginsFolders(final Path channelFolder) {
-			return list(channelFolder).filter(Files::isDirectory).flatMap(child -> {
+			return listDirectories(toolboxAppsFolder)
+				.flatMap(FromInstalledIDEs::listDirectories)
+				.filter(child -> getFileNameLowerCase(child).startsWith("ch-"))
+				.flatMap(FromInstalledIDEs::listDirectories)
+				.flatMap(child -> {
 					final String name = getFileNameLowerCase(child);
 					
 					if (name.contains(".remove-")) {
@@ -301,12 +318,38 @@ abstract class GrabIcons {
 					else {
 						return Stream.of(child.resolve("lib"), child.resolve("plugins"));
 					}
-			}).filter(Files::isDirectory); // catches non-existent paths too
+				});
 		}
 		
-		private static Stream<Path> list(final Path parent) {
+		private static Stream<Path> findLibAndPluginFoldersFromNewToolbox() {
+			System.out.println("Searching in %LOCALAPPDATA%\\Programs...");
+			
+			final String localAppData = System.getenv("LOCALAPPDATA");
+			
+			if (localAppData == null) {
+				System.out.println("Found nothing, %LOCALAPPDATA% does not exist.");
+				return Stream.of();
+			}
+			
+			final Path programsFolder = Paths.get(localAppData, "Programs");
+			
+			if (!Files.exists(programsFolder)) {
+				System.out.println("Found nothing, Programs folder does not exist.");
+				return Stream.of();
+			}
+			
+			return listDirectories(programsFolder)
+				.filter(FromInstalledIDEs::matchesNewToolboxInstallation)
+				.flatMap(child -> Stream.of(child.resolve("lib"), child.resolve("plugins")));
+		}
+		
+		private static boolean matchesNewToolboxInstallation(final Path path) {
+			return Files.exists(path.resolve("product-info.json")) && Files.isDirectory(path.resolve("jbr"));
+		}
+		
+		private static Stream<Path> listDirectories(final Path parent) {
 			try {
-				return Files.list(parent);
+				return Files.list(parent).filter(Files::isDirectory);
 			} catch (final IOException e) {
 				e.printStackTrace();
 				return Stream.empty();

resources/META-INF/plugin.xml

@@ -9,6 +9,19 @@
   </description>
   
   <change-notes><![CDATA[
+    <b>Version 1.6.0</b>
+    <ul>
+      <li>Added dependency on the Classic UI plugin for 2024.2</li>
+    </ul>
+    <b>Version 1.5.1</b>
+    <ul>
+      <li>Fixed a random exception while loading the plugin</li>
+    </ul>
+    <b>Version 1.5</b>
+    <ul>
+      <li>Fixed tool window icons for 2023.3</li>
+      <li>Fixed exception when using the new UI</li>
+    </ul>
     <b>Version 1.4</b>
     <ul>
       <li>Added tool window icons for Bookmarks, Notifications, Dependencies, Scala, and more</li>
@@ -36,8 +49,8 @@
     </ul>
   ]]></change-notes>
   
-  <idea-version since-build="223.0" />
   <depends>com.intellij.modules.platform</depends>
+  <depends>com.intellij.classic.ui</depends>
   
   <application-components>
     <component>

resources/icons/icons/com/jetbrains/python/pythonPackages.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <path d="M6.5,0.375L12.625,3.778L6.5,7.181L0.375,3.778L6.5,0.375ZM11.4,5.819L12.625,6.5L6.5,9.903L0.375,6.5L1.6,5.819L6.5,8.542L11.4,5.819ZM11.4,8.542L12.625,9.222L6.5,12.625L0.375,9.222L1.6,8.542L6.5,11.264L11.4,8.542Z" style="fill:#389fd6;"/>
+</svg>

resources/icons/icons/com/jetbrains/python/pythonPackages_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <path d="M6.5,0.375L12.625,3.778L6.5,7.181L0.375,3.778L6.5,0.375ZM11.4,5.819L12.625,6.5L6.5,9.903L0.375,6.5L1.6,5.819L6.5,8.542L11.4,5.819ZM11.4,8.542L12.625,9.222L6.5,12.625L0.375,9.222L1.6,8.542L6.5,11.264L11.4,8.542Z" style="fill:#3592c4;"/>
+</svg>

resources/icons/rider/toolwindows/DotMemoryProfilingMonoTone.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <path d="M5.687,3.25C3.459,3.25 1.625,5.084 1.625,7.312C1.625,9.54 3.459,11.374 5.687,11.374C7.915,11.374 9.749,9.54 9.749,7.312L8.937,7.312C8.937,9.095 7.47,10.562 5.687,10.562C3.904,10.562 2.437,9.095 2.437,7.312C2.437,5.529 3.904,4.062 5.687,4.062L5.687,3.25Z" style="fill:#59a869;"/>
+    <path d="M11.375,6.5C11.375,3.826 9.174,1.625 6.5,1.625L6.5,6.5L11.375,6.5Z" style="fill:#59a869;"/>
+</svg>

resources/icons/rider/toolwindows/DotMemoryProfilingMonoTone_dark.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <path d="M5.688,3.25C5.687,3.25 5.687,3.25 5.686,3.25C3.457,3.25 1.623,5.084 1.623,7.313C1.623,9.542 3.457,11.376 5.686,11.376C7.915,11.376 9.749,9.542 9.749,7.313C9.749,7.313 9.749,7.312 9.749,7.312L8.937,7.312C8.937,9.095 7.47,10.562 5.687,10.562C3.904,10.562 2.437,9.095 2.437,7.312C2.437,5.529 3.904,4.062 5.687,4.062L5.687,3.25L5.688,3.25Z" style="fill:#499c54;"/>
+    <path d="M11.375,6.5C11.375,3.826 9.174,1.625 6.5,1.625L6.5,6.5L11.375,6.5Z" style="fill:#499c54;"/>
+</svg>

resources/icons/toolwindows/DotMemoryProfilingMonoTone.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13"><path fill="#6e6e6e" fill-rule="evenodd" d="M5.687 3.25a4.062 4.062 0 1 0 4.062 4.062h-.812a3.25 3.25 0 1 1-3.25-3.25V3.25Z"/><path fill="#6e6e6e" fill-rule="evenodd" d="M11.375 6.5A4.875 4.875 0 0 0 6.5 1.625V6.5h4.875Z"/></svg>

resources/icons/toolwindows/DotMemoryProfilingMonoTone_dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13"><path fill="#afb1b3" fill-rule="evenodd" d="M5.688 3.25a4.063 4.063 0 1 0 4.061 4.062h-.812a3.25 3.25 0 1 1-3.25-3.25V3.25Z"/><path fill="#afb1b3" fill-rule="evenodd" d="M11.375 6.5A4.875 4.875 0 0 0 6.5 1.625V6.5h4.875Z"/></svg>

resources/icons/toolwindows/toolWindowProfilerAndroid.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <g>
+        <path d="M10.362,4.567l-1.239,0c-0.303,-1.894 -1.944,-3.341 -3.924,-3.341c-2.194,0 -3.973,1.779 -3.973,3.973c0,2.195 1.779,3.974 3.973,3.974c0.275,0 0.542,-0.028 0.801,-0.081l0,1.247c-0.261,0.04 -0.528,0.061 -0.8,0.061c-2.872,0 -5.2,-2.328 -5.2,-5.2c0,-2.872 2.328,-5.2 5.2,-5.2c2.657,0 4.849,1.994 5.162,4.567Z" style="fill:#6e6e6e;"/>
+        <rect x="4.992" y="2.77" width="1" height="2.724" style="fill:#6e6e6e;"/>
+        <path d="M5.284,4.787l0.706,0.707l-1.924,1.926l-0.706,-0.708l1.924,-1.925Z" style="fill:#6e6e6e;"/>
+        <path d="M7,4.767l6,4l-6,4l0,-8Z" style="fill:#59a869;"/>
+    </g>
+</svg>

resources/icons/toolwindows/toolWindowProfilerAndroid_dark.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <g>
+        <path d="M10.362,4.567l-1.239,0c-0.303,-1.894 -1.944,-3.341 -3.924,-3.341c-2.194,0 -3.973,1.779 -3.973,3.973c0,2.195 1.779,3.974 3.973,3.974c0.275,0 0.542,-0.028 0.801,-0.081l0,1.247c-0.261,0.04 -0.528,0.061 -0.8,0.061c-2.872,0 -5.2,-2.328 -5.2,-5.2c0,-2.872 2.328,-5.2 5.2,-5.2c2.657,0 4.849,1.994 5.162,4.567Z" style="fill:#afb1b3;"/>
+        <rect x="4.992" y="2.77" width="1" height="2.724" style="fill:#afb1b3;"/>
+        <path d="M5.284,4.787l0.706,0.707l-1.924,1.926l-0.706,-0.708l1.924,-1.925Z" style="fill:#afb1b3;"/>
+        <path d="M7,4.767l6,4l-6,4l0,-8Z" style="fill:#499c54;"/>
+    </g>
+</svg>

resources/icons/toolwindows/toolWindowRunWithCoverage.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <path d="M7.5,6L13,9.5L7.5,13L7.5,6Z" style="fill:#59a869;"/>
+    <path d="M6.5,0.2L1.5,1.2L1.5,6.9C1.764,9.874 6.498,12.2 6.498,12.2L6.5,12.199L6.5,1.978L9.722,2.606L9.722,6.229L11.434,7.318C11.465,7.18 11.488,7.041 11.5,6.9L11.5,1.2L6.5,0.2Z" style="fill:#6e6e6e;fill-rule:nonzero;"/>
+</svg>

resources/icons/toolwindows/toolWindowRunWithCoverage_dark.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" viewBox="0 0 13 13">
+    <path d="M7.5,6L13,9.5L7.5,13L7.5,6Z" style="fill:#499c54;"/>
+    <path d="M6.5,0.2L1.5,1.2L1.5,6.9C1.764,9.874 6.498,12.2 6.498,12.2L6.5,12.199L6.5,1.978L9.722,2.606L9.722,6.229L11.434,7.318C11.465,7.18 11.488,7.041 11.5,6.9L11.5,1.2L6.5,0.2Z" style="fill:#afb1b3;fill-rule:nonzero;"/>
+</svg>

src/com/chylex/intellij/coloredicons/IconPatcher.java

@@ -1,199 +1,22 @@
 package com.chylex.intellij.coloredicons;
+import com.chylex.intellij.coloredicons.sets.OldUI;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.IconPathPatcher;
+import com.intellij.ui.NewUI;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.Map;
 
 public class IconPatcher extends IconPathPatcher {
 	private final ClassLoader classLoader = getClass().getClassLoader();
-	private final Map<String, String> iconPaths = new HashMap<>();
+	private final Map<String, String> iconPaths;
 	
 	public IconPatcher() {
-		addPathWithDark("actions/addList");
-		addPathWithDark("actions/AddMulticaret");
-		addPathWithDark("actions/back");
-		addPathWithDark("actions/buildAutoReloadChanges");
-		addPathWithDark("actions/cancel");
-		addPathWithDark("actions/CheckMulticaret");
-		addPathWithDark("actions/collapseall");
-		addPathWithDark("actions/download");
-		addPathWithDark("actions/dump");
-		addPathWithDark("actions/edit");
-		addPathWithDark("actions/editScheme");
-		addPathWithDark("actions/editSource");
-		addPathWithDark("actions/expandall");
-		addPathWithDark("actions/forward");
-		addPathWithDark("actions/inSelection");
-		addPathWithDark("actions/intentionBulbGrey");
-		addPathWithDark("actions/menu-saveall");
-		addPathWithDark("actions/newFolder");
-		addPathWithDark("actions/nextOccurence");
-		addPathWithDark("actions/openNewTab");
-		addPathWithDark("actions/prettyPrint");
-		addPathWithDark("actions/previousOccurence");
-		addPathWithDark("actions/realIntentionBulb");
-		addPathWithDark("actions/refactoringBulb"); // TODO not working
-		addPathWithDark("actions/refresh");
-		addPathWithDark("actions/RemoveMulticaret");
-		addPathWithDark("actions/rollback");
-		addPathWithDark("actions/show");
-		addPathWithDark("actions/showCode");
-		addPathWithDark("actions/showHiddens");
-		addPathWithDark("actions/splitHorizontally");
-		addPathWithDark("actions/splitVertically");
-		addPathWithDark("actions/swapPanels");
-		addPathWithDark("actions/synchronizeScrolling");
-		addPathWithDark("actions/syncPanels");
-		addPathWithDark("actions/toggleSoftWrap");
-		addPathWithDark("actions/unselectall");
-		addPathWithDark("actions/upload");
-		
-		addPathWithDark("codeStyle/AddNewSectionRule");
-		
-		addPathWithDark("diff/magicResolve");
-		addPathWithDark("diff/magicResolveToolbar");
-		
-		addPathWithDark("general/add");
-		addPathWithDark("general/addJdk");
-		addPathWithDark("general/autoscrollFromSource");
-		addPathWithDark("general/autoscrollToSource");
-		addPathWithDark("general/filter");
-		addPathWithDark("general/layout");
-		addPathWithDark("general/layoutEditorOnly");
-		addPathWithDark("general/layoutEditorPreview");
-		addPathWithDark("general/layoutPreviewOnly");
-		addPathWithDark("general/pin_tab");
-		addPathWithDark("general/print");
-		addPathWithDark("general/remove");
-		addPathWithDark("general/reset");
-		addPathWithDark("general/zoomIn");
-		addPathWithDark("general/zoomOut");
-		
-		addPathWithDark("graph/layout");
-		addPathWithDark("graph/zoomIn");
-		addPathWithDark("graph/zoomOut");
-		
-		addPathWithDark("hierarchy/class");
-		addPathWithDark("hierarchy/subtypes");
-		addPathWithDark("hierarchy/supertypes");
-		
-		addPathWithDark("icons/artifactSmall");
-		addPathWithDark("icons/cherryPick");
-		addPathWithDark("icons/CMakeToolWindow");
-		addPathWithDark("icons/ConcurrencyDiagramToolwindow");
-		addPathWithDark("icons/debug_listen_on");
-		addPathWithDark("icons/ejbToolWindow");
-		addPathWithDark("icons/gradleNavigate");
-		addPathWithDark("icons/IntelliSort");
-		addPathWithDark("icons/interTypes");
-		addPathWithDark("icons/javaeeToolWindow");
-		addPathWithDark("icons/jpaConsoleToolWindow");
-		addPathWithDark("icons/jpaToolWindow");
-		addPathWithDark("icons/makefileToolWindow");
-		addPathWithDark("icons/OpenTerminal_13x13");
-		addPathWithDark("icons/springToolWindow");
-		addPathWithDark("icons/toolWindowConsole");
-		addPathWithDark("icons/toolWindowDatabase");
-		addPathWithDark("icons/toolwindowDatabaseChanges");
-		addPathWithDark("icons/toolWindowDsm");
-		addPathWithDark("icons/toolwindowEndpoints");
-		addPathWithDark("icons/toolWindowGradle");
-		addPathWithDark("icons/toolWindowSQLGenerator");
-		addPathWithDark("icons/youTrack");
-		addPathWithDark("icons/buildTools/gulp_toolwindow");
-		addPathWithDark("icons/buildTools/grunt/grunt_toolwindow");
-		addPathWithDark("icons/buildTools/npm/npm_13");
-		addPathWithDark("icons/com/jetbrains/python/DataView");
-		addPathWithDark("icons/com/jetbrains/python/pythonConsoleToolWindow");
-		
-		addPathWithDark("images/toolWindowMaven");
-		addPathWithDark("images/transferToolWindow");
-		addPathWithDark("images/updateFolders");
-		addPathWithDark("images/webServerToolWindow");
-		
-		addPathWithDark("img/featureTrainerToolWindow");
-		
-		addPathWithDark("modules/addExcludedRoot");
-		
-		addPathWithDark("objectBrowser/sortByType");
-		addPathWithDark("objectBrowser/sorted");
-		addPathWithDark("objectBrowser/sortedByUsage");
-		addPathWithDark("objectBrowser/visibilitySort");
-		
-		addPathWithDark("org/jetbrains/plugins/github/pullRequestsToolWindow");
-		addPathWithDark("org/jetbrains/plugins/scala/images/sbtShellToolwin");
-		addPathWithDark("org/jetbrains/plugins/scala/images/sbtToolwin");
-		
-		addPathWithDark("resources/icons/bvToolWindow");
-		addPathWithDark("resources/icons/hibConsoleToolWindow");
-		
-		addPathWithDark("rider/toolWindows/toolWindowNuGet");
-		addPathWithDark("rider/toolWindows/toolWindowSolutionWideAnalysis");
-		addPathWithDark("rider/toolWindows/toolwindowStacktrace");
-		addPathWithDark("rider/toolWindows/toolWindowUnitTesting");
-		addPathWithDark("rider/toolWindows/toolWindowWPFPreview");
-		
-		addPathWithDark("runConfigurations/scroll_down");
-		addPathWithDark("runConfigurations/showIgnored");
-		addPathWithDark("runConfigurations/showPassed");
-		addPathWithDark("runConfigurations/sortbyDuration");
-		
-		addPathWithDark("toolbarDecorator/addBlankLine");
-		addPathWithDark("toolbarDecorator/addClass");
-		addPathWithDark("toolbarDecorator/addFolder");
-		addPathWithDark("toolbarDecorator/addIcon");
-		addPathWithDark("toolbarDecorator/addJira");
-		addPathWithDark("toolbarDecorator/addLink");
-		addPathWithDark("toolbarDecorator/addPattern");
-		addPathWithDark("toolbarDecorator/addRemoteDatasource");
-		addPathWithDark("toolbarDecorator/addYouTrack");
-		addPathWithDark("toolbarDecorator/export");
-		addPathWithDark("toolbarDecorator/import");
-		
-		addPathWithDark("toolwindows/documentation");
-		addPathWithDark("toolwindows/notifications");
-		addPathWithDark("toolwindows/notificationsNew");
-		addPathWithDark("toolwindows/notificationsNewImportant");
-		addPathWithDark("toolwindows/toolWindowAnalyzeDataflow");
-		addPathWithDark("toolwindows/toolWindowAnt");
-		addPathWithDark("toolwindows/toolWindowBookmarks");
-		addPathWithDark("toolwindows/toolWindowBuild");
-		addPathWithDark("toolwindows/toolWindowChanges");
-		addPathWithDark("toolwindows/toolWindowCommit");
-		addPathWithDark("toolwindows/toolWindowCoverage");
-		addPathWithDark("toolwindows/toolWindowDebugger");
-		addPathWithDark("toolwindows/toolWindowFavorites");
-		addPathWithDark("toolwindows/toolWindowFind");
-		addPathWithDark("toolwindows/toolWindowHierarchy");
-		addPathWithDark("toolwindows/toolWindowInspection");
-		addPathWithDark("toolwindows/toolWindowMessages");
-		addPathWithDark("toolwindows/toolWindowModuleDependencies");
-		addPathWithDark("toolwindows/toolWindowProfiler");
-		addPathWithDark("toolwindows/toolWindowProject");
-		addPathWithDark("toolwindows/toolWindowRun");
-		addPathWithDark("toolwindows/toolWindowServices");
-		addPathWithDark("toolwindows/toolWindowStructure");
-		addPathWithDark("toolwindows/toolWindowTodo");
-		addPathWithDark("toolwindows/webToolWindow");
-		
-		addPathWithDark("vcs/changelist");
-		addPathWithDark("vcs/history");
-		addPathWithDark("vcs/merge");
-		
-		addPathWithDark("toolWindowDotTrace");
-		addPathWithDark("toolWindowDPA");
-		addPathWithDark("toolwindowUnitTestCoverage");
-		
+		iconPaths = NewUI.isEnabled() ? Collections.emptyMap() : OldUI.getIconPaths();
 		IconLoader.installPathPatcher(this);
 	}
 	
-	private void addPathWithDark(final String path) {
-		iconPaths.put('/' + path + ".svg", "icons/" + path + ".svg");
-		iconPaths.put('/' + path + "_dark.svg", "icons/" + path + "_dark.svg");
-	}
-	
 	@Nullable
 	@Override
 	public String patchPath(@NotNull final String path, final ClassLoader classLoaderIgnore) {

src/com/chylex/intellij/coloredicons/sets/OldUI.java

@@ -0,0 +1,202 @@
+package com.chylex.intellij.coloredicons.sets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class OldUI {
+	
+	public static Map<String, String> getIconPaths() {
+		return new OldUI().getMap();
+	}
+	
+	private final Map<String, String> iconPaths = new HashMap<>();
+	
+	private OldUI() {
+		addPathWithDark("actions/addList");
+		addPathWithDark("actions/AddMulticaret");
+		addPathWithDark("actions/back");
+		addPathWithDark("actions/buildAutoReloadChanges");
+		addPathWithDark("actions/cancel");
+		addPathWithDark("actions/CheckMulticaret");
+		addPathWithDark("actions/collapseall");
+		addPathWithDark("actions/download");
+		addPathWithDark("actions/dump");
+		addPathWithDark("actions/edit");
+		addPathWithDark("actions/editScheme");
+		addPathWithDark("actions/editSource");
+		addPathWithDark("actions/expandall");
+		addPathWithDark("actions/forward");
+		addPathWithDark("actions/inSelection");
+		addPathWithDark("actions/intentionBulbGrey");
+		addPathWithDark("actions/menu-saveall");
+		addPathWithDark("actions/newFolder");
+		addPathWithDark("actions/nextOccurence");
+		addPathWithDark("actions/openNewTab");
+		addPathWithDark("actions/prettyPrint");
+		addPathWithDark("actions/previousOccurence");
+		addPathWithDark("actions/realIntentionBulb");
+		addPathWithDark("actions/refactoringBulb"); // TODO not working
+		addPathWithDark("actions/refresh");
+		addPathWithDark("actions/RemoveMulticaret");
+		addPathWithDark("actions/rollback");
+		addPathWithDark("actions/show");
+		addPathWithDark("actions/showCode");
+		addPathWithDark("actions/showHiddens");
+		addPathWithDark("actions/splitHorizontally");
+		addPathWithDark("actions/splitVertically");
+		addPathWithDark("actions/swapPanels");
+		addPathWithDark("actions/synchronizeScrolling");
+		addPathWithDark("actions/syncPanels");
+		addPathWithDark("actions/toggleSoftWrap");
+		addPathWithDark("actions/unselectall");
+		addPathWithDark("actions/upload");
+		
+		addPathWithDark("codeStyle/AddNewSectionRule");
+		
+		addPathWithDark("diff/magicResolve");
+		addPathWithDark("diff/magicResolveToolbar");
+		
+		addPathWithDark("general/add");
+		addPathWithDark("general/addJdk");
+		addPathWithDark("general/autoscrollFromSource");
+		addPathWithDark("general/autoscrollToSource");
+		addPathWithDark("general/filter");
+		addPathWithDark("general/layout");
+		addPathWithDark("general/layoutEditorOnly");
+		addPathWithDark("general/layoutEditorPreview");
+		addPathWithDark("general/layoutPreviewOnly");
+		addPathWithDark("general/pin_tab");
+		addPathWithDark("general/print");
+		addPathWithDark("general/remove");
+		addPathWithDark("general/reset");
+		addPathWithDark("general/zoomIn");
+		addPathWithDark("general/zoomOut");
+		
+		addPathWithDark("graph/layout");
+		addPathWithDark("graph/zoomIn");
+		addPathWithDark("graph/zoomOut");
+		
+		addPathWithDark("hierarchy/class");
+		addPathWithDark("hierarchy/subtypes");
+		addPathWithDark("hierarchy/supertypes");
+		
+		addPathWithDark("icons/artifactSmall");
+		addPathWithDark("icons/cherryPick");
+		addPathWithDark("icons/CMakeToolWindow");
+		addPathWithDark("icons/ConcurrencyDiagramToolwindow");
+		addPathWithDark("icons/debug_listen_on");
+		addPathWithDark("icons/ejbToolWindow");
+		addPathWithDark("icons/gradleNavigate");
+		addPathWithDark("icons/IntelliSort");
+		addPathWithDark("icons/interTypes");
+		addPathWithDark("icons/javaeeToolWindow");
+		addPathWithDark("icons/jpaConsoleToolWindow");
+		addPathWithDark("icons/jpaToolWindow");
+		addPathWithDark("icons/makefileToolWindow");
+		addPathWithDark("icons/OpenTerminal_13x13");
+		addPathWithDark("icons/springToolWindow");
+		addPathWithDark("icons/toolWindowConsole");
+		addPathWithDark("icons/toolWindowDatabase");
+		addPathWithDark("icons/toolwindowDatabaseChanges");
+		addPathWithDark("icons/toolWindowDsm");
+		addPathWithDark("icons/toolWindowEndpoints");
+		addPathWithDark("icons/toolWindowGradle");
+		addPathWithDark("icons/toolWindowSQLGenerator");
+		addPathWithDark("icons/youTrack");
+		addPathWithDark("icons/buildTools/gulp_toolwindow");
+		addPathWithDark("icons/buildTools/grunt/grunt_toolwindow");
+		addPathWithDark("icons/buildTools/npm/npm_13");
+		addPathWithDark("icons/com/jetbrains/python/DataView");
+		addPathWithDark("icons/com/jetbrains/python/pythonConsoleToolWindow");
+		addPathWithDark("icons/com/jetbrains/python/pythonPackages");
+		
+		addPathWithDark("images/toolWindowMaven");
+		addPathWithDark("images/transferToolWindow");
+		addPathWithDark("images/updateFolders");
+		addPathWithDark("images/webServerToolWindow");
+		
+		addPathWithDark("img/featureTrainerToolWindow");
+		
+		addPathWithDark("modules/addExcludedRoot");
+		
+		addPathWithDark("objectBrowser/sortByType");
+		addPathWithDark("objectBrowser/sorted");
+		addPathWithDark("objectBrowser/sortedByUsage");
+		addPathWithDark("objectBrowser/visibilitySort");
+		
+		addPathWithDark("org/jetbrains/plugins/github/pullRequestsToolWindow");
+		addPathWithDark("org/jetbrains/sbt/images/sbtShellToolwin");
+		addPathWithDark("org/jetbrains/sbt/images/sbtToolwin");
+		
+		addPathWithDark("resources/icons/bvToolWindow");
+		addPathWithDark("resources/icons/hibConsoleToolWindow");
+		
+		addPathWithDark("rider/toolwindows/DotMemoryProfilingMonoTone");
+		addPathWithDark("rider/toolwindows/toolWindowDPA");
+		addPathWithDark("rider/toolwindows/toolWindowDotTrace");
+		addPathWithDark("rider/toolwindows/toolWindowNuGet");
+		addPathWithDark("rider/toolwindows/toolWindowSolutionWideAnalysis");
+		addPathWithDark("rider/toolwindows/toolWindowUnitTesting");
+		addPathWithDark("rider/toolwindows/toolWindowWPFPreview");
+		addPathWithDark("rider/toolwindows/toolwindowStacktrace");
+		addPathWithDark("rider/toolwindows/toolwindowUnitTestCoverage");
+		
+		addPathWithDark("runConfigurations/scroll_down");
+		addPathWithDark("runConfigurations/showIgnored");
+		addPathWithDark("runConfigurations/showPassed");
+		addPathWithDark("runConfigurations/sortbyDuration");
+		
+		addPathWithDark("toolbarDecorator/addBlankLine");
+		addPathWithDark("toolbarDecorator/addClass");
+		addPathWithDark("toolbarDecorator/addFolder");
+		addPathWithDark("toolbarDecorator/addIcon");
+		addPathWithDark("toolbarDecorator/addJira");
+		addPathWithDark("toolbarDecorator/addLink");
+		addPathWithDark("toolbarDecorator/addPattern");
+		addPathWithDark("toolbarDecorator/addRemoteDatasource");
+		addPathWithDark("toolbarDecorator/addYouTrack");
+		addPathWithDark("toolbarDecorator/export");
+		addPathWithDark("toolbarDecorator/import");
+		
+		addPathWithDark("toolwindows/documentation");
+		addPathWithDark("toolwindows/notifications");
+		addPathWithDark("toolwindows/notificationsNew");
+		addPathWithDark("toolwindows/notificationsNewImportant");
+		addPathWithDark("toolwindows/toolWindowAnalyzeDataflow");
+		addPathWithDark("toolwindows/toolWindowAnt");
+		addPathWithDark("toolwindows/toolWindowBookmarks");
+		addPathWithDark("toolwindows/toolWindowBuild");
+		addPathWithDark("toolwindows/toolWindowChanges");
+		addPathWithDark("toolwindows/toolWindowCommit");
+		addPathWithDark("toolwindows/toolWindowCoverage");
+		addPathWithDark("toolwindows/toolWindowDebugger");
+		addPathWithDark("toolwindows/toolWindowFavorites");
+		addPathWithDark("toolwindows/toolWindowFind");
+		addPathWithDark("toolwindows/toolWindowHierarchy");
+		addPathWithDark("toolwindows/toolWindowInspection");
+		addPathWithDark("toolwindows/toolWindowMessages");
+		addPathWithDark("toolwindows/toolWindowModuleDependencies");
+		addPathWithDark("toolwindows/toolWindowProfiler");
+		addPathWithDark("toolwindows/toolWindowProfilerAndroid");
+		addPathWithDark("toolwindows/toolWindowProject");
+		addPathWithDark("toolwindows/toolWindowRun");
+		addPathWithDark("toolwindows/toolWindowRunWithCoverage");
+		addPathWithDark("toolwindows/toolWindowServices");
+		addPathWithDark("toolwindows/toolWindowStructure");
+		addPathWithDark("toolwindows/toolWindowTodo");
+		addPathWithDark("toolwindows/webToolWindow");
+		
+		addPathWithDark("vcs/changelist");
+		addPathWithDark("vcs/history");
+		addPathWithDark("vcs/merge");
+	}
+	
+	private Map<String, String> getMap() {
+		return iconPaths;
+	}
+	
+	private void addPathWithDark(final String path) {
+		iconPaths.put('/' + path + ".svg", "icons/" + path + ".svg");
+		iconPaths.put('/' + path + "_dark.svg", "icons/" + path + "_dark.svg");
+	}
+}