From ea9371dcc263c35bec859c86c9930963b774b12a Mon Sep 17 00:00:00 2001
From: Alex Simons <alexsimons9999@gmail.com>
Date: Fri, 29 Dec 2023 14:50:20 -0600
Subject: [PATCH 1/5] Initial 2023.3 build support.

---
 .idea/gradle.xml                              |  11 ++
 build.gradle.kts                              |   2 +-
 gradle.properties                             |  10 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../jetbrains/integrations/ErrorReporter.kt   |   8 --
 .../doki/icons/jetbrains/shared/functions.kt  |  12 ++
 .../svg/ComposedSVGColorizerProvider.kt       |  33 ++---
 .../jetbrains/svg/SVGColorizerProvider.kt     | 117 ++++++++----------
 .../icons/jetbrains/svg/SvgLoaderHacker.kt    |  19 ++-
 .../jetbrains/themes/IconThemeManager.kt      |  32 ++---
 10 files changed, 129 insertions(+), 117 deletions(-)
 create mode 100644 src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/functions.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4ab4e7b..94d3d52 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,17 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
+                <projects>
+                  <project path="$PROJECT_DIR$/buildSrc" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
+        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
diff --git a/build.gradle.kts b/build.gradle.kts
index 60ca10b..3b9ed3b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
   // Kotlin support
   kotlin("jvm") version "1.8.10"
   // Gradle IntelliJ Plugin
-  id("org.jetbrains.intellij") version "1.13.2"
+  id("org.jetbrains.intellij") version "1.16.1"
   // Gradle Changelog Plugin
   id("org.jetbrains.changelog") version "2.0.0"
   // Gradle Qodana Plugin
diff --git a/gradle.properties b/gradle.properties
index f2e4837..c905f46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,19 +5,19 @@ pluginName = Doki Theme Icons
 pluginVersion = 88.5-1.0.13
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 222
-pluginUntilBuild = 232.*
+pluginSinceBuild = 233.6745.305
+pluginUntilBuild = 233.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension
 platformType = IU
-platformVersion = 2022.3.2
+platformVersion = 2023.3.2
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = io.acari.DDLCTheme:88.3-1.8.0,Pythonid:223.8617.56
+platformPlugins = Pythonid:233.13135.103
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.5.1
+gradleVersion = 8.5
 
 # Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 # suppress inspection "UnusedProperty"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661..a595206 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-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt
index 406f9a6..16be778 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt
@@ -3,7 +3,6 @@ package io.unthrottled.doki.icons.jetbrains.integrations
 import com.google.gson.GsonBuilder
 import com.intellij.ide.IdeBundle
 import com.intellij.ide.nls.NlsMessages
-import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ApplicationNamesInfo
@@ -25,7 +24,6 @@ import io.unthrottled.doki.icons.jetbrains.tools.runSafely
 import java.awt.Component
 import java.lang.management.ManagementFactory
 import java.text.SimpleDateFormat
-import java.util.Arrays
 import java.util.Properties
 import java.util.stream.Collectors
 
@@ -100,7 +98,6 @@ class ErrorReporter : ErrorReportSubmitter() {
       setExtra("GC", getGC())
       setExtra("Memory", Runtime.getRuntime().maxMemory() / FileUtilRt.MEGABYTE)
       setExtra("Cores", Runtime.getRuntime().availableProcessors())
-      setExtra("Non-Bundled Plugins", getNonBundledPlugins())
       setExtra("Plugin Config", gson.toJson(Config.instance))
     }
   }
@@ -120,11 +117,6 @@ class ErrorReporter : ErrorReportSubmitter() {
     return IdeBundle.message("about.box.vm", vmVersion, vmVendor)
   }
 
-  private fun getNonBundledPlugins(): String {
-    return Arrays.stream(PluginManagerCore.getPlugins())
-      .filter { p -> !p.isBundled && p.isEnabled }
-      .map { p -> p.pluginId.idString }.collect(Collectors.joining(","))
-  }
 
   private fun getGC() = ManagementFactory.getGarbageCollectorMXBeans().stream()
     .map { it.name }.collect(Collectors.joining(","))
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/functions.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/functions.kt
new file mode 100644
index 0000000..fb3890d
--- /dev/null
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/functions.kt
@@ -0,0 +1,12 @@
+package io.unthrottled.doki.icons.jetbrains.shared
+
+fun toLongArray(bytArray: ByteArray): LongArray {
+  val digest = LongArray(bytArray.size)
+  bytArray.forEachIndexed { index, byte -> digest[index] = byte.toLong() }
+  return digest
+}
+fun toByteArray(longArray: LongArray): ByteArray {
+  val digest = ByteArray(longArray.size)
+  longArray.forEachIndexed { index, byte -> digest[index] = byte.toByte() }
+  return digest
+}
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ComposedSVGColorizerProvider.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ComposedSVGColorizerProvider.kt
index 410aa93..4db8ff3 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ComposedSVGColorizerProvider.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ComposedSVGColorizerProvider.kt
@@ -1,26 +1,19 @@
 package io.unthrottled.doki.icons.jetbrains.svg
 
-import com.intellij.util.SVGLoader
 import com.intellij.util.io.DigestUtil
+import io.unthrottled.doki.icons.jetbrains.shared.toByteArray
+import io.unthrottled.doki.icons.jetbrains.shared.toLongArray
 import io.unthrottled.doki.icons.jetbrains.themes.DokiThemePayload
 import io.unthrottled.doki.icons.jetbrains.tools.runSafelyWithResult
-import org.w3c.dom.Element
 
 class ComposedSVGColorizer(
   private val patchers: List<Patcher>
 ) : Patcher {
-  override fun patchColors(svg: Element) {
-    patchers.forEach {
-      it.patchColors(svg)
-    }
-  }
 
-  override fun digest(): ByteArray? {
-    val shaDigest = DigestUtil.sha512()
-    patchers.forEach { patchers ->
-      shaDigest.update(patchers.digest() ?: emptyByteArray)
+  override fun patchColors(attributes: MutableMap<String, String>) {
+    patchers.forEach {
+      it.patchColors(attributes)
     }
-    return shaDigest.digest()
   }
 }
 
@@ -39,12 +32,24 @@ class ComposedSVGColorizerProvider(
   )
     .distinct()
 
-  override fun forPath(path: String?): SVGLoader.SvgElementColorPatcher? =
+  private val digest: LongArray
+
+  init {
+    val shaDigest = DigestUtil.sha512()
+    patcherProviders.forEach { patchers ->
+      shaDigest.update(toByteArray(patchers.digest()))
+    }
+    digest = toLongArray(shaDigest.digest())
+  }
+
+  override fun digest(): LongArray = digest
+
+  override fun attributeForPath(path: String): Patcher =
     ComposedSVGColorizer(
       patcherProviders
         .mapNotNull { patcherProvider ->
           runSafelyWithResult({
-            patcherProvider.forPath(path)
+            patcherProvider.attributeForPath(path)
           }) {
             null
           }
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
index da2a8b0..4d7148b 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
@@ -4,14 +4,14 @@ import com.google.gson.reflect.TypeToken
 import com.intellij.openapi.util.text.Strings
 import com.intellij.ui.ColorUtil
 import com.intellij.ui.JBColor
-import com.intellij.util.SVGLoader
+import com.intellij.ui.svg.SvgAttributePatcher
+import io.unthrottled.doki.icons.jetbrains.shared.toLongArray
 import io.unthrottled.doki.icons.jetbrains.themes.DokiTheme
 import io.unthrottled.doki.icons.jetbrains.tools.AssetTools
 import io.unthrottled.doki.icons.jetbrains.tools.Logging
 import io.unthrottled.doki.icons.jetbrains.tools.logger
 import io.unthrottled.doki.icons.jetbrains.tools.toColor
 import io.unthrottled.doki.icons.jetbrains.tools.toHexString
-import org.w3c.dom.Element
 import java.awt.Color
 import kotlin.math.ceil
 
@@ -59,46 +59,36 @@ class SVGColorPaletteReplacer(private val dokiTheme: DokiTheme) : PatcherProvide
           .toHexString()
       }
 
-  override fun forPath(path: String?): SVGLoader.SvgElementColorPatcher? =
+  override fun attributeForPath(path: String): SvgAttributePatcher? =
     PalletPatcher(
-      (dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8),
       newPalette
     )
+
+  private val digest = toLongArray((dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8))
+  override fun digest(): LongArray = digest
 }
 
 class PalletPatcher(
-  private val digest: ByteArray,
   private val newPalette: Map<String, String>
-) : SVGLoader.SvgElementColorPatcher {
+) : Patcher {
 
   companion object {
     private const val HEX_STRING_LENGTH = 7
   }
-  override fun digest(): ByteArray? {
-    return digest
-  }
 
-  override fun patchColors(svg: Element) {
-    patchColorAttribute(svg, "fill")
-    patchColorAttribute(svg, "stop-color")
-    patchColorAttribute(svg, "stroke")
-    val nodes = svg.childNodes
-    val length = nodes.length
-    for (i in 0 until length) {
-      val item = nodes.item(i)
-      if (item is Element) {
-        patchColors(item)
-      }
-    }
+  override fun patchColors(attributes: MutableMap<String, String>) {
+    patchColorAttribute(attributes, "fill")
+    patchColorAttribute(attributes, "stop-color")
+    patchColorAttribute(attributes, "stroke")
   }
 
   @Suppress("MagicNumber") // cuz is majik
-  private fun patchColorAttribute(svg: Element, attrName: String) {
-    val color = svg.getAttribute(attrName)
-    val opacity = svg.getAttribute("$attrName-opacity")
+  private fun patchColorAttribute(attributes: MutableMap<String, String>, attrName: String) {
+    val color = attributes[attrName]
+    val opacity = attributes["$attrName-opacity"]
     if (!Strings.isEmpty(color)) {
       var alpha = 255
-      if (!Strings.isEmpty(opacity)) {
+      if (!opacity.isNullOrBlank()) {
         try {
           alpha = ceil((255f * opacity.toFloat()).toDouble()).toInt()
         } catch (ignore: Exception) {
@@ -113,12 +103,15 @@ class PalletPatcher(
         newColor = newPalette[key]
       }
       if (newColor != null) {
-        svg.setAttribute(attrName, newColor)
+        attributes[attrName] = newColor
       }
     }
   }
 
-  private fun toCanonicalColor(color: String): String {
+  private fun toCanonicalColor(color: String?): String? {
+    if (color.isNullOrBlank())
+      return color
+
     var s = color.lowercase()
     if (s.startsWith("#") && s.length < HEX_STRING_LENGTH) {
       s = "#" + ColorUtil.toHex(ColorUtil.fromHex(s))
@@ -128,78 +121,80 @@ class PalletPatcher(
 }
 
 class SVGColorizerProvider(private val dokiTheme: DokiTheme) : PatcherProvider {
-  override fun forPath(path: String?): SVGLoader.SvgElementColorPatcher? = SVGColorizer(dokiTheme)
+
+  override fun attributeForPath(path: String): SvgAttributePatcher? = SVGColorizer(dokiTheme)
+
+  private val digest =
+    toLongArray((dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8))
+
+  override fun digest(): LongArray = digest
 }
 
 class SVGColorizer(private val dokiTheme: DokiTheme) : Patcher {
-  override fun patchColors(svg: Element) {
+
+  override fun patchColors(attributes: MutableMap<String, String>) {
     patchChildren(
-      svg
+      attributes
     )
   }
 
   @Suppress("MagicNumber")
   private fun patchChildren(
-    svg: Element
+    attributes: MutableMap<String, String>
   ) {
-    patchAccent(svg.getAttribute("accentTint"), svg) {
+    patchAccent(attributes["accentTint"], attributes) {
       it.toHexString()
     }
-    patchAccent(svg.getAttribute("accentTintDarker"), svg) {
+    patchAccent(attributes["accentTintDarker"], attributes) {
       ColorUtil.darker(it, 1).toHexString()
     }
-    patchAccent(svg.getAttribute("accentTintDarkest"), svg) {
+    patchAccent(attributes["accentTintDarkest"], attributes) {
       ColorUtil.darker(it, 3).toHexString()
     }
-    patchAccent(svg.getAttribute("accentContrastTint"), svg) {
+    patchAccent(attributes["accentContrastTint"], attributes) {
       getIconAccentContrastColor().toHexString()
     }
-    patchAccent(svg.getAttribute("stopTint"), svg) {
+    patchAccent(attributes["stopTint"], attributes) {
       getThemedStopColor()
     }
 
-    val themedStartAttr = svg.getAttribute("themedStart")
-    val themedStopAttr = svg.getAttribute("themedStop")
-    val themedFillAttr = svg.getAttribute("themedFill")
+    val themedStartAttr = attributes["themedStart"]
+    val themedStopAttr = attributes["themedStop"]
+    val themedFillAttr = attributes["themedFill"]
     when {
       "true" == themedStartAttr -> {
         val themedStart = getThemedStartColor()
-        svg.setAttribute("stop-color", themedStart)
-        svg.setAttribute("fill", themedStart)
+        attributes["stop-color"] = themedStart
+        attributes["fill"] = themedStart
       }
 
       "true" == themedStopAttr -> {
         val themedStop = getThemedStopColor()
-        svg.setAttribute("stop-color", themedStop)
-        svg.setAttribute("fill", themedStop)
+        attributes["stop-color"] = themedStop
+        attributes["fill"] = themedStop
       }
 
       "true" == themedFillAttr -> {
         val themedStart = getThemedStartColor()
-        svg.setAttribute("fill", themedStart)
-        svg.setAttribute("stroke", themedStart)
-      }
-    }
-
-    val nodes = svg.childNodes
-    val length = nodes.length
-    for (i in 0 until length) {
-      val item = nodes.item(i)
-      if (item is Element) {
-        patchColors(item)
+        attributes["fill"] = themedStart
+        attributes["stroke"] = themedStart
       }
     }
   }
 
-  private fun patchAccent(attribute: String?, svg: Element, colorDecorator: (Color) -> String) {
+  private fun patchAccent(
+    attribute: String?,
+    attributes: MutableMap<String, String>,
+    colorDecorator: (Color) -> String
+  ) {
     when (attribute) {
-      "fill" -> svg.setAttribute("fill", colorDecorator(getAccentColor()))
-      "stroke" -> svg.setAttribute("stroke", colorDecorator(getAccentColor()))
+      "fill" -> attributes["fill"] = colorDecorator(getAccentColor())
+      "stroke" -> attributes["stroke"] = colorDecorator(getAccentColor())
       "both", "partialFill" -> {
         val accentColor = colorDecorator(getAccentColor())
-        svg.setAttribute("stroke", accentColor)
-        svg.setAttribute("stroke-opacity", if (attribute == "both") "1" else "0.25")
-        svg.setAttribute("fill", accentColor)
+        attributes["stroke"] = accentColor
+        attributes["stroke-opacity"] = if (attribute == "both") "1" else "0.25"
+        attributes["fill"] = accentColor
       }
     }
   }
@@ -215,6 +210,4 @@ class SVGColorizer(private val dokiTheme: DokiTheme) : Patcher {
 
   private fun getThemedStopColor() =
     JBColor.namedColor("Doki.stopColor", Color.CYAN).toHexString()
-
-  override fun digest(): ByteArray = (dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8)
 }
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt
index 5734240..17940b3 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt
@@ -1,27 +1,26 @@
 package io.unthrottled.doki.icons.jetbrains.svg
 
+import com.intellij.ui.svg.SvgAttributePatcher
 import com.intellij.util.SVGLoader
-import org.w3c.dom.Element
 import java.util.Optional
 
 typealias PatcherProvider = SVGLoader.SvgElementColorPatcherProvider
-typealias Patcher = SVGLoader.SvgElementColorPatcher
+typealias Patcher = SvgAttributePatcher
 
 object NoOptPatcher : Patcher {
-  override fun patchColors(svg: Element) {}
-  val byteArray = ByteArray(0)
-  override fun digest(): ByteArray {
-    return byteArray
-  }
 }
 
-val emptyByteArray = ByteArray(0)
+val emptyLongArray = LongArray(0)
 
 val noOptPatcherProvider = object : PatcherProvider {
 
-  override fun forPath(path: String?): SVGLoader.SvgElementColorPatcher {
+  override fun attributeForPath(path: String): SvgAttributePatcher {
     return NoOptPatcher
   }
+
+  override fun digest(): LongArray {
+    return emptyLongArray
+  }
 }
 
 object SvgLoaderHacker {
@@ -29,7 +28,7 @@ object SvgLoaderHacker {
   fun collectOtherPatcher(): PatcherProvider =
     Optional.ofNullable(
       SVGLoader::class.java.declaredFields
-        .firstOrNull { it.name == "ourColorPatcher" }
+        .firstOrNull { it.name == "colorPatcherProvider" }
     )
       .map { ourColorPatcherField ->
         ourColorPatcherField.isAccessible = true
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/themes/IconThemeManager.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/themes/IconThemeManager.kt
index 3fa9a07..7133093 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/themes/IconThemeManager.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/themes/IconThemeManager.kt
@@ -3,7 +3,8 @@ package io.unthrottled.doki.icons.jetbrains.themes
 import com.google.gson.reflect.TypeToken
 import com.intellij.ide.ui.LafManager
 import com.intellij.ide.ui.LafManagerListener
-import com.intellij.ide.ui.laf.UIThemeBasedLookAndFeelInfo
+import com.intellij.ide.ui.laf.UIThemeLookAndFeelInfo
+import com.intellij.ide.ui.laf.UIThemeLookAndFeelInfoImpl
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.util.SVGLoader
@@ -21,7 +22,6 @@ import io.unthrottled.doki.icons.jetbrains.tools.logger
 import io.unthrottled.doki.icons.jetbrains.tools.toOptional
 import java.util.EventListener
 import java.util.Optional
-import javax.swing.UIManager
 
 class DokiTheme(
   private val dokiThemeInformation: DokiThemeInformation,
@@ -86,7 +86,7 @@ class IconThemeManager : LafManagerListener, Disposable, IconConfigListener, Log
 
   val currentTheme: Optional<DokiThemePayload> =
     if (Config.instance.syncWithDokiTheme) {
-      mapLAFToDokiTheme(LafManager.getInstance().currentLookAndFeel)
+      mapLAFToDokiTheme(LafManager.getInstance().currentUIThemeLookAndFeel)
     } else {
       userSetTheme
     }.or {
@@ -94,7 +94,7 @@ class IconThemeManager : LafManagerListener, Disposable, IconConfigListener, Log
     }
   private val userSetTheme: Optional<DokiThemePayload>
     get() = LafManager.getInstance().installedLookAndFeels
-      .filterIsInstance<UIThemeBasedLookAndFeelInfo>()
+      .filterIsInstance<UIThemeLookAndFeelInfoImpl>()
       .firstOrNull {
         it.getId() == Config.instance.currentThemeId
       }.toOptional()
@@ -102,18 +102,18 @@ class IconThemeManager : LafManagerListener, Disposable, IconConfigListener, Log
         val themeId = it.getId()
         DokiThemePayload(
           themeMap[themeId] ?: error("Expecting theme with ID $themeId to be present"),
-          it.theme.colorPatcher
+          it.theme.colorPatcher ?: noOptPatcherProvider
         )
       }.or {
         val themeId = Config.instance.currentThemeId
         DokiThemePayload(
           themeMap[themeId] ?: error("Expecting theme with ID $themeId to be present"),
-          LafManager.getInstance().currentLookAndFeel
+          LafManager.getInstance().currentUIThemeLookAndFeel
             .toOptional()
-            .filter { it is UIThemeBasedLookAndFeelInfo }
+            .filter { it is UIThemeLookAndFeelInfoImpl }
             .map {
-              val uiTheme = it as UIThemeBasedLookAndFeelInfo
-              uiTheme.theme.colorPatcher
+              val uiTheme = it as UIThemeLookAndFeelInfoImpl
+              uiTheme.theme.colorPatcher ?: noOptPatcherProvider
             }.orElse(
               noOptPatcherProvider
             )
@@ -122,15 +122,15 @@ class IconThemeManager : LafManagerListener, Disposable, IconConfigListener, Log
   val allThemes: List<DokiTheme>
     get() = themeMap.values.toList()
 
-  private fun mapLAFToDokiTheme(currentLaf: UIManager.LookAndFeelInfo?): Optional<DokiThemePayload> {
+  private fun mapLAFToDokiTheme(currentLaf: UIThemeLookAndFeelInfo?): Optional<DokiThemePayload> {
     return currentLaf.toOptional()
-      .filter { it is UIThemeBasedLookAndFeelInfo }
-      .map { it as UIThemeBasedLookAndFeelInfo }
+      .filter { it is UIThemeLookAndFeelInfoImpl }
+      .map { it as UIThemeLookAndFeelInfoImpl }
       .filter { themeMap.containsKey(it.getId()) }
       .map {
         DokiThemePayload(
           themeMap[it.getId()]!!,
-          it.theme.colorPatcher
+          it.theme.colorPatcher ?: noOptPatcherProvider
         )
       }
   }
@@ -142,7 +142,7 @@ class IconThemeManager : LafManagerListener, Disposable, IconConfigListener, Log
   override fun lookAndFeelChanged(source: LafManager) {
     val messageBus = ApplicationManager.getApplication().messageBus
     if (Config.instance.syncWithDokiTheme) {
-      mapLAFToDokiTheme(source.currentLookAndFeel)
+      mapLAFToDokiTheme(source.currentUIThemeLookAndFeel)
         .map {
           Config.instance.currentThemeId = it.dokiTheme.id
           it
@@ -170,14 +170,14 @@ class IconThemeManager : LafManagerListener, Disposable, IconConfigListener, Log
     val currentThemeId = newState.currentThemeId
     if (previousState.currentThemeId != currentThemeId) {
       LafManager.getInstance().installedLookAndFeels
-        .filterIsInstance<UIThemeBasedLookAndFeelInfo>()
+        .filterIsInstance<UIThemeLookAndFeelInfoImpl>()
         .firstOrNull {
           it.getId() == currentThemeId
         }.toOptional()
         .flatMap { uiTheme ->
           getThemeById(currentThemeId)
             .map { dokiTheme ->
-              DokiThemePayload(dokiTheme, uiTheme.theme.colorPatcher)
+              DokiThemePayload(dokiTheme, uiTheme.theme.colorPatcher ?: noOptPatcherProvider)
             }
         }
         .ifPresent {

From 812296ec864ea1d2d55c090ccb93c539145e86fa Mon Sep 17 00:00:00 2001
From: Alex Simons <alexsimons9999@gmail.com>
Date: Fri, 29 Dec 2023 16:23:36 -0600
Subject: [PATCH 2/5] Restored icons on selection.

---
 .../doki/icons/jetbrains/listeners/ProjectListener.kt      | 7 ++++---
 .../doki/icons/jetbrains/svg/SVGColorizerProvider.kt       | 4 ++--
 .../doki/icons/jetbrains/svg/ThemedSVGManager.kt           | 5 ++++-
 src/main/resources/META-INF/plugin.xml                     | 1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/listeners/ProjectListener.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/listeners/ProjectListener.kt
index 8dec91b..079de01 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/listeners/ProjectListener.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/listeners/ProjectListener.kt
@@ -2,7 +2,7 @@ package io.unthrottled.doki.icons.jetbrains.listeners
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManagerListener
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 import io.unthrottled.doki.icons.jetbrains.PluginMaster
 import io.unthrottled.doki.icons.jetbrains.tools.Logging
 
@@ -14,8 +14,9 @@ internal class ProjectListener :
   }
 }
 
-internal class PluginPostStartUpActivity : StartupActivity {
-  override fun runActivity(project: Project) {
+internal class PluginPostStartUpActivity : ProjectActivity {
+
+  override suspend fun execute(project: Project) {
     PluginMaster.instance.handleProjectOpened(project)
   }
 }
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
index 4d7148b..f76649a 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
@@ -64,7 +64,7 @@ class SVGColorPaletteReplacer(private val dokiTheme: DokiTheme) : PatcherProvide
       newPalette
     )
 
-  private val digest = toLongArray((dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8))
+  private val digest = toLongArray(("pallet" + dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8))
   override fun digest(): LongArray = digest
 }
 
@@ -125,7 +125,7 @@ class SVGColorizerProvider(private val dokiTheme: DokiTheme) : PatcherProvider {
   override fun attributeForPath(path: String): SvgAttributePatcher? = SVGColorizer(dokiTheme)
 
   private val digest =
-    toLongArray((dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8))
+    toLongArray(("colorize" + dokiTheme.id + dokiTheme.version).toByteArray(Charsets.UTF_8))
 
   override fun digest(): LongArray = digest
 }
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ThemedSVGManager.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ThemedSVGManager.kt
index 567ab74..a237acb 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ThemedSVGManager.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ThemedSVGManager.kt
@@ -3,6 +3,7 @@ package io.unthrottled.doki.icons.jetbrains.svg
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.ui.svg.setSelectionColorPatcherProvider
 import com.intellij.util.SVGLoader
 import io.unthrottled.doki.icons.jetbrains.themes.DokiThemePayload
 import io.unthrottled.doki.icons.jetbrains.themes.IconThemeManager
@@ -29,8 +30,10 @@ class ThemedSVGManager : ThemeManagerListener, Disposable {
   }
 
   private fun activateTheme(currentTheme: DokiThemePayload) {
+    val svgPatcherProvider = ComposedSVGColorizerProviderFactory.createForTheme(currentTheme)
     SVGLoader.colorPatcherProvider =
-      ComposedSVGColorizerProviderFactory.createForTheme(currentTheme)
+      svgPatcherProvider
+    setSelectionColorPatcherProvider(svgPatcherProvider)
     SwingUtilities.invokeLater { ActionToolbarImpl.updateAllToolbarsImmediately() }
   }
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index a6e0fcb..4d444bc 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -11,6 +11,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <applicationConfigurable id="io.unthrottled.doki.icons.jetbrains.settings.ThemeSettings"
                              instance="io.unthrottled.doki.icons.jetbrains.settings.IconSettingsUI"
+                             displayName="Doki Theme Icons"
                              groupId="appearance"/>
     <applicationService serviceImplementation="io.unthrottled.doki.icons.jetbrains.config.Config"/>
     <applicationService serviceImplementation="io.unthrottled.doki.icons.jetbrains.themes.IconThemeManager"/>

From 9ffcfeeabd133ac8dd435d766f3d322b5cf3c3d5 Mon Sep 17 00:00:00 2001
From: Alex Simons <alexsimons9999@gmail.com>
Date: Fri, 29 Dec 2023 16:32:24 -0600
Subject: [PATCH 3/5] Praise Linter.

---
 gradle.properties                                              | 2 +-
 .../doki/icons/jetbrains/integrations/ErrorReporter.kt         | 1 -
 .../doki/icons/jetbrains/shared/{functions.kt => Functions.kt} | 0
 .../doki/icons/jetbrains/svg/SVGColorizerProvider.kt           | 3 ++-
 .../io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt | 3 +--
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/{functions.kt => Functions.kt} (100%)

diff --git a/gradle.properties b/gradle.properties
index c905f46..b1075ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@
 
 pluginGroup = io.unthrottled.doki.icons
 pluginName = Doki Theme Icons
-pluginVersion = 88.5-1.0.13
+pluginVersion = 88.5-1.1.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233.6745.305
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt
index 16be778..39ca0a7 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt
@@ -117,7 +117,6 @@ class ErrorReporter : ErrorReportSubmitter() {
     return IdeBundle.message("about.box.vm", vmVersion, vmVendor)
   }
 
-
   private fun getGC() = ManagementFactory.getGarbageCollectorMXBeans().stream()
     .map { it.name }.collect(Collectors.joining(","))
 
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/functions.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/Functions.kt
similarity index 100%
rename from src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/functions.kt
rename to src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/Functions.kt
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
index f76649a..5119c14 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SVGColorizerProvider.kt
@@ -109,8 +109,9 @@ class PalletPatcher(
   }
 
   private fun toCanonicalColor(color: String?): String? {
-    if (color.isNullOrBlank())
+    if (color.isNullOrBlank()) {
       return color
+    }
 
     var s = color.lowercase()
     if (s.startsWith("#") && s.length < HEX_STRING_LENGTH) {
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt
index 17940b3..8ffd9b9 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/SvgLoaderHacker.kt
@@ -7,8 +7,7 @@ import java.util.Optional
 typealias PatcherProvider = SVGLoader.SvgElementColorPatcherProvider
 typealias Patcher = SvgAttributePatcher
 
-object NoOptPatcher : Patcher {
-}
+object NoOptPatcher : Patcher
 
 val emptyLongArray = LongArray(0)
 

From 31541a143f978d1391d2a1663cc7b9db25a1ff69 Mon Sep 17 00:00:00 2001
From: Alex Simons <alexsimons9999@gmail.com>
Date: Fri, 29 Dec 2023 16:38:18 -0600
Subject: [PATCH 4/5] Updated documentation.

---
 CHANGELOG.md                                                 | 5 +++++
 RELEASE-NOTES.md                                             | 2 +-
 .../doki/icons/jetbrains/onboarding/UpdateNotification.kt    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f89bf0e..4a98798 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+## 88.5-1.1.0 [2023.3 Build Support]
+
+### Added
+- Initial 2023.3 build support.
+
 ## 88.5-1.0.13 [2023.2 Build Support]
 
 ### Added
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 75bf7b6..2677d6b 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,2 +1,2 @@
 ### Added
-- Initial 2023.2 build support.
+- Initial 2023.3 build support.
diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/onboarding/UpdateNotification.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/onboarding/UpdateNotification.kt
index 1530fd3..88680c0 100644
--- a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/onboarding/UpdateNotification.kt
+++ b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/onboarding/UpdateNotification.kt
@@ -20,7 +20,7 @@ private fun buildUpdateMessage(): String =
   """
       What's New?<br>
       <ul>
-        <li>Added initial 2023.2 build support.</li>
+        <li>Added initial 2023.3 build support.</li>
       </ul>
       <br>See the <a href="https://github.com/doki-theme/doki-theme-icons-jetbrains#documentation">documentation</a> for features, usages, and configurations.
       <br>The <a href="https://github.com/doki-theme/doki-theme-icons-jetbrains/blob/master/CHANGELOG.md">changelog</a> is available for more details.

From bb2b6b10e053628ea952abaa33431725c71225c4 Mon Sep 17 00:00:00 2001
From: Alex Simons <alexsimons9999@gmail.com>
Date: Fri, 29 Dec 2023 16:52:27 -0600
Subject: [PATCH 5/5] Bump lowest supported version.

---
 gradle.properties                      | 2 +-
 src/main/resources/META-INF/plugin.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b1075ae..777eb40 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ pluginName = Doki Theme Icons
 pluginVersion = 88.5-1.1.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 233.6745.305
+pluginSinceBuild = 233.8264.8
 pluginUntilBuild = 233.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 4d444bc..10f2132 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -4,6 +4,7 @@
   <name>Doki Theme Icons</name>
   <vendor>Unthrottled</vendor>
 
+  <idea-version since-build="233.8264.8"/>
   <depends>com.intellij.modules.platform</depends>
   <depends optional="true" config-file="io.unthrottled.doki.icons-io.unthrottled.doki.theme.xml">io.acari.DDLCTheme
   </depends>