release 1.0-rc3

GitHub Actions: upload demo (was removed in previous commit)
dropped usage of bintray, jcenter and jfrog artifactory
2026-02-11 06:27:13 -06:00 · 2021-02-06 23:31:53 +01:00 · 2021-02-06 23:27:39 +01:00 · 2021-02-06 19:02:32 +01:00 · 2021-02-06 11:35:35 +01:00 · 2021-02-06 11:26:57 +01:00
70 changed files with 6161 additions and 5596 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,11 +99,11 @@ jobs:
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
          restore-keys: ${{ runner.os }}-gradle

-      - name: Publish snapshot to oss.jfrog.org
-        run: ./gradlew artifactoryPublish
+      - name: Publish snapshot to oss.sonatype.org
+        run: ./gradlew publish -Dorg.gradle.internal.publish.checksums.insecure=true
        env:
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_KEY:  ${{ secrets.BINTRAY_KEY }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}


  release:
@@ -135,8 +135,21 @@ jobs:
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
          restore-keys: ${{ runner.os }}-gradle

-      - name: Release a new stable version to bintray
-        run: ./gradlew bintrayUpload -Drelease=true
+      - name: Release a new stable version to Maven Central
+        run: ./gradlew publish :flatlaf-demo:build -Drelease=true
        env:
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_KEY:  ${{ secrets.BINTRAY_KEY }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          SIGNING_KEY:      ${{ secrets.SIGNING_KEY }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+
+      - name: Upload demo
+        uses: sebastianpopp/ftp-action@releases/v2
+        with:
+          host: ${{ secrets.FTP_SERVER }}
+          user: ${{ secrets.FTP_USERNAME }}
+          password: ${{ secrets.FTP_PASSWORD }}
+          forceSsl: true
+          localDir: "flatlaf-demo/build/libs"
+          remoteDir: "."
+          options: "--only-newer --no-recursion --verbose=1"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,25 @@
 FlatLaf Change Log
 ==================

+## 1.0-rc3
+
+#### New features and improvements
+
+- Extras:
+  - UI Inspector: Use HTML in tooltip. Display color value in same format as
+    used in FlatLaf properties files. Added color preview.
+
+#### Fixed bugs
+
+- Label and ToolTip: Fixed font sizes for `<code>`, `<kbd>`, `<big>`, `<small>`
+  and `<samp>` tags in HTML text.
+- Fixed color of `<address>` tag in HTML text.
+- IntelliJ Themes: Fixed table header background when dragging column in "Dark
+  Flat" and "Light Flat" themes.
+- CheckBox: Fixed background of check boxes in JIDE `CheckBoxTree`. (regression
+  in 1.0-rc2)
+
+
 ## 1.0-rc2

 #### New features and improvements
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Requires Java 8 or newer.
 Download
 --------

-FlatLaf binaries are available on **JCenter** and **Maven Central**.
+FlatLaf binaries are available on **Maven Central**.

 If you use Maven or Gradle, add a dependency with following coordinates to your
 build script:
@@ -48,16 +48,16 @@ build script:

 Otherwise download `flatlaf-<version>.jar` here:

-[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf)


 ### Snapshots

-FlatLaf snapshot binaries are available in
-[JFrog Artifactory](https://oss.jfrog.org/artifactory/oss-snapshot-local/com/formdev/).
-To access the latest snapshot, change the FlatLaf version(s) in the dependencies
+FlatLaf snapshot binaries are available on
+[Sonatype OSSRH](https://oss.sonatype.org/content/repositories/snapshots/com/formdev/flatlaf/).
+To access the latest snapshot, change the FlatLaf version in your dependencies
 to `<version>-SNAPSHOT` (e.g. `0.27-SNAPSHOT`) and add the repository
-`https://oss.jfrog.org/artifactory/oss-snapshot-local` to your build (see
+`https://oss.sonatype.org/content/repositories/snapshots/` to your build (see
 [Maven](https://maven.apache.org/guides/mini/guide-multiple-repositories.html)
 and
 [Gradle](https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:declaring_custom_repository)
@@ -87,22 +87,36 @@ Buzz
 - [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)


-Projects using FlatLaf
----------------------
+Applications using FlatLaf
+--------------------------

 - [Apache NetBeans](https://netbeans.apache.org/) 11.3 - IDE for Java, PHP, HTML
  and much more
 - [jclasslib bytecode viewer](https://github.com/ingokegel/jclasslib) 5.5
 - [KeyStore Explorer](https://keystore-explorer.org/) 5.4.3
- ![New](images/new.svg) [OWASP ZAP](https://www.zaproxy.org/) 2.10 - the worlds
-  most widely used web app scanner
- ![New](images/new.svg) [JOSM](https://josm.openstreetmap.de/) - an extensible
-  editor for [OpenStreetMap](https://www.openstreetmap.org/) (requires FlatLaf
-  JOSM plugin)
- [jAlbum](https://jalbum.net/) 21 (commercial) - creates photo album websites
- [XMLmind XML Editor](https://www.xmlmind.com/xmleditor/) 9.3 (commercial)
- [Total Validator](https://www.totalvalidator.com/) 15 (commercial) - checks
-  your website
+- ![New](images/new.svg) [DbVisualizer](https://www.dbvis.com/) 12.0
+  (**commercial**) - the universal database tool for developers, analysts and
+  DBAs
+- ![New](images/new.svg) [MagicPlot](https://magicplot.com/) 3.0
+  (**commercial**) - Software for nonlinear fitting, plotting and data analysis
+- ![New](images/new.svg)
+  [Thermo-Calc](https://thermocalc.com/products/thermo-calc/) 2021a
+  (**commercial**) - Thermodynamics and Properties Software
+- [OWASP ZAP](https://www.zaproxy.org/) 2.10 - the worlds most widely used web
+  app scanner
+- ![New](images/new.svg)
+  [Burp Suite Professional and Community Edition](https://portswigger.net/burp/pro)
+  2020.11.2 (**commercial**) - the leading software for web security testing
+- ![New](images/new.svg)
+  [BurpCustomizer](https://github.com/CoreyD97/BurpCustomizer) - adds more
+  FlatLaf themes to Burp Suite
+- [JOSM](https://josm.openstreetmap.de/) - an extensible editor for
+  [OpenStreetMap](https://www.openstreetmap.org/) (requires FlatLaf JOSM plugin)
+- [jAlbum](https://jalbum.net/) 21 (**commercial**) - creates photo album
+  websites
+- [XMLmind XML Editor](https://www.xmlmind.com/xmleditor/) 9.3 (**commercial**)
+- [Total Validator](https://www.totalvalidator.com/) 15 (**commercial**) -
+  checks your website
 - [j-lawyer](https://github.com/jlawyerorg/j-lawyer-org) - Kanzleisoftware
 - [MegaMek](https://github.com/MegaMek/megamek) v0.47.4 and
  [MekHQ](https://github.com/MegaMek/mekhq) v0.47.5 - a turn-based sci-fi board
@@ -116,32 +130,33 @@ Projects using FlatLaf
  gamepad mapping software
 - [SpringRemote](https://github.com/HaleyWang/SpringRemote) - remote Linux SSH
  connections manager
- ![New](images/new.svg) [jEnTunnel](https://github.com/ggrandes/jentunnel) -
-  manage SSH Tunnels made easy
+- [jEnTunnel](https://github.com/ggrandes/jentunnel) - manage SSH Tunnels made
+  easy
 - [mendelson AS2](https://sourceforge.net/projects/mec-as2/),
  [AS4](https://sourceforge.net/projects/mendelson-as4/) and
  [OFTP2](https://sourceforge.net/projects/mendelson-oftp2/) (open-source) and
  [mendelson AS2](https://mendelson-e-c.com/as2/),
  [AS4](https://mendelson-e-c.com/as4/) and
-  [OFTP2](https://mendelson-e-c.com/oftp2) (commercial)
+  [OFTP2](https://mendelson-e-c.com/oftp2) (**commercial**)
+- ![New](images/new.svg) [IGMAS+](https://www.gfz-potsdam.de/igmas) -
+  Interactive Gravity and Magnetic Application System
 - [MeteoInfo](https://github.com/meteoinfo/MeteoInfo) 2.2 - GIS and scientific
  computation environment for meteorological community
 - [lsfusion platform](https://github.com/lsfusion/platform) 4 - information
  systems development platform
- ![New](images/new.svg) [JPass](https://github.com/gaborbata/jpass) - password
-  manager with strong encryption
+- [JPass](https://github.com/gaborbata/jpass) - password manager with strong
+  encryption
 - [Jes - Die Java-EÜR](https://www.jes-eur.de)
 - [Mapton](https://mapton.org/) 2.0
  ([source code](https://github.com/trixon/mapton)) - some kind of map
  application (based on NetBeans platform)
 - [Pseudo Assembler IDE](https://github.com/tomasz-herman/PseudoAssemblerIDE) -
  IDE for Pseudo-Assembler
- ![New](images/new.svg) [Linotte](https://github.com/cpc6128/LangageLinotte)
-  3.1 - French programming language created to learn programming
- ![New](images/new.svg) [MEKA](https://github.com/Waikato/meka) 1.9.3 -
-  multi-label classifiers and evaluation procedures using the Weka machine
-  learning framework
- ![New](images/new.svg) [Shutter Encoder](https://www.shutterencoder.com/) 14.2
+- [Linotte](https://github.com/cpc6128/LangageLinotte) 3.1 - French programming
+  language created to learn programming
+- [MEKA](https://github.com/Waikato/meka) 1.9.3 - multi-label classifiers and
+  evaluation procedures using the Weka machine learning framework
+- [Shutter Encoder](https://www.shutterencoder.com/) 14.2
  ([source code](https://github.com/paulpacifico/shutter-encoder)) -
  professional video converter and compression tool (screenshots show **old**
  look)
@@ -149,15 +164,12 @@ Projects using FlatLaf
  sound files in time or frequency domain
 - [RemoteLight](https://github.com/Drumber/RemoteLight) - multifunctional LED
  control software
- ![New](images/new.svg)
-  [ThunderFocus](https://github.com/marcocipriani01/ThunderFocus) -
+- [ThunderFocus](https://github.com/marcocipriani01/ThunderFocus) -
  Arduino-based telescope focuser
- ![New](images/new.svg)
-  [Novel-Grabber](https://github.com/Flameish/Novel-Grabber) - download novels
+- [Novel-Grabber](https://github.com/Flameish/Novel-Grabber) - download novels
  from any webnovel and lightnovel site
- ![New](images/new.svg) [lectureStudio](https://www.lecturestudio.org/)
-  4.3.1060 - digitize your lectures with ease
- ![New](images/new.svg)
-  [Android Tool](https://github.com/fast-geek/Android-Tool) - makes popular adb
+- [lectureStudio](https://www.lecturestudio.org/) 4.3.1060 - digitize your
+  lectures with ease
+- [Android Tool](https://github.com/fast-geek/Android-Tool) - makes popular adb
  and fastboot commands easier to use
 - and more...
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,8 +14,8 @@
 * limitations under the License.
 */

-val releaseVersion = "1.0-rc2"
-val developmentVersion = "1.0-rc3-SNAPSHOT"
+val releaseVersion = "1.0-rc3"
+val developmentVersion = "1.0-rc4-SNAPSHOT"

 version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion

@@ -23,7 +23,7 @@ allprojects {
 	version = rootProject.version

 	repositories {
-		jcenter()
+		mavenCentral()
 	}
 }

@@ -40,17 +40,6 @@ println( "Java ${System.getProperty( "java.version" )}" )
 println()


-extra["bintray.user"] = System.getenv( "BINTRAY_USER" ) ?: System.getProperty( "bintray.user" )
-extra["bintray.key"]  = System.getenv( "BINTRAY_KEY" )  ?: System.getProperty( "bintray.key" )
-
-// if true, do not upload to bintray
-extra["bintray.dryRun"] = false
-
-// if true, uploaded artifacts are visible to all
-// if false, only visible to owner when logged into bintray
-extra["bintray.publish"] = false
-
-
 allprojects {
 	tasks {
 		withType<JavaCompile>().configureEach {
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -20,15 +20,5 @@ plugins {

 // required for kotlin-dsl or embedded-kotlin plugins
 repositories {
-	jcenter()
-}
-
-dependencies {
-	// NOTE: keep plugin versions in sync with settings.gradle.kts
-
-	// "com.jfrog.bintray" plugin
-	implementation( "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4" )
-
-	// "com.jfrog.artifactory" plugin
-	implementation( "org.jfrog.buildinfo:build-info-extractor-gradle:4.13.0" )
+	mavenCentral()
 }
--- a/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts
+++ b/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts
@@ -26,8 +26,7 @@ val extension = project.extensions.create<PublishExtension>( "flatlafPublish" )

 plugins {
 	`maven-publish`
-	id( "com.jfrog.bintray" )
-	id( "com.jfrog.artifactory" )
+	signing
 }

 publishing {
@@ -74,49 +73,40 @@ publishing {
 			}
 		}
 	}
-}

-bintray {
-	user = rootProject.extra["bintray.user"] as String?
-	key = rootProject.extra["bintray.key"] as String?
+	repositories {
+		maven {
+			name = "OSSRH"

-	setPublications( "maven" )
+			val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+			val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+			url = uri( if( java.lang.Boolean.getBoolean( "release" ) ) releasesRepoUrl else snapshotsRepoUrl )

-	with( pkg ) {
-		repo = "flatlaf"
-		afterEvaluate {
-			this@with.name = extension.artifactId
+			credentials {
+				// get from gradle.properties
+				val ossrhUsername: String? by project
+				val ossrhPassword: String? by project
+
+				username = System.getenv( "OSSRH_USERNAME" ) ?: ossrhUsername
+				password = System.getenv( "OSSRH_PASSWORD" ) ?: ossrhPassword
+			}
 		}
-		setLicenses( "Apache-2.0" )
-		vcsUrl = "https://github.com/JFormDesigner/FlatLaf"
-
-		with( version ) {
-			name = project.version.toString()
-		}
-
-		publish = rootProject.extra["bintray.publish"] as Boolean
-		dryRun = rootProject.extra["bintray.dryRun"] as Boolean
 	}
 }

-artifactory {
-	setContextUrl( "https://oss.jfrog.org" )
+signing {
+	// get from gradle.properties
+	val signingKey: String? by project
+	val signingPassword: String? by project

-	publish( closureOf<org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig> {
-		repository( delegateClosureOf<groovy.lang.GroovyObject> {
-			setProperty( "repoKey", "oss-snapshot-local" )
-			setProperty( "username", rootProject.extra["bintray.user"] as String? )
-			setProperty( "password", rootProject.extra["bintray.key"] as String? )
-		} )
+	val key = System.getenv( "SIGNING_KEY" ) ?: signingKey
+	val password = System.getenv( "SIGNING_PASSWORD" ) ?: signingPassword

-		defaults( delegateClosureOf<groovy.lang.GroovyObject> {
-			invokeMethod( "publications", "maven" )
-			setProperty( "publishArtifacts", true )
-			setProperty( "publishPom", true )
-		} )
-	} )
-
-	resolve( delegateClosureOf<org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig> {
-		setProperty( "repoKey", "jcenter" )
-	} )
+	useInMemoryPgpKeys( key, password )
+	sign( publishing.publications["maven"] )
+}
+
+// disable signing of snapshots
+tasks.withType<Sign>().configureEach {
+	onlyIf { java.lang.Boolean.getBoolean( "release" ) }
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
@@ -187,7 +187,7 @@ public interface FlatClientProperties
 	 * }</pre>
 	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JComponent}<br>
-	 * <strong>Value type</strong> {@link java.util.function.Predicate&lt;javax.swing.JComponent&gt;
+	 * <strong>Value type</strong> {@link java.util.function.Predicate}&lt;javax.swing.JComponent&gt;
 	 */
 	String COMPONENT_FOCUS_OWNER = "JComponent.focusOwner";

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -262,7 +262,7 @@ public abstract class FlatLaf
 			Color linkColor = defaults.getColor( "Component.linkColor" );
 			if( linkColor != null ) {
 				new HTMLEditorKit().getStyleSheet().addRule(
-					String.format( "a { color: #%06x; }", linkColor.getRGB() & 0xffffff ) );
+					String.format( "a, address { color: #%06x; }", linkColor.getRGB() & 0xffffff ) );
 			}
 		};

@@ -304,7 +304,7 @@ public abstract class FlatLaf
 		}

 		// restore default link color
-		new HTMLEditorKit().getStyleSheet().addRule( "a { color: blue; }" );
+		new HTMLEditorKit().getStyleSheet().addRule( "a, address { color: blue; }" );
 		postInitialization = null;

 		// restore enable/disable window decorations
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
@@ -72,6 +72,8 @@ class UIDefaultsLoader
 	private static final String OPTIONAL_PREFIX = "?";
 	private static final String WILDCARD_PREFIX = "*.";

+	private static int parseColorDepth;
+
 	static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons,
 		Properties additionalDefaults, boolean dark, UIDefaults defaults )
 	{
@@ -580,19 +582,27 @@ class UIDefaultsLoader
 		if( params.isEmpty() )
 			throw new IllegalArgumentException( "missing parameters in function '" + value + "'" );

-		switch( function ) {
-			case "rgb":			return parseColorRgbOrRgba( false, params, resolver, reportError );
-			case "rgba":		return parseColorRgbOrRgba( true, params, resolver, reportError );
-			case "hsl":			return parseColorHslOrHsla( false, params );
-			case "hsla":		return parseColorHslOrHsla( true, params );
-			case "lighten":		return parseColorHSLIncreaseDecrease( 2, true, params, resolver, reportError );
-			case "darken":		return parseColorHSLIncreaseDecrease( 2, false, params, resolver, reportError );
-			case "saturate":	return parseColorHSLIncreaseDecrease( 1, true, params, resolver, reportError );
-			case "desaturate":	return parseColorHSLIncreaseDecrease( 1, false, params, resolver, reportError );
-			case "fadein":		return parseColorHSLIncreaseDecrease( 3, true, params, resolver, reportError );
-			case "fadeout":		return parseColorHSLIncreaseDecrease( 3, false, params, resolver, reportError );
-			case "fade":		return parseColorFade( params, resolver, reportError );
-			case "spin":		return parseColorSpin( params, resolver, reportError );
+		if( parseColorDepth > 100 )
+			throw new IllegalArgumentException( "endless recursion in color function '" + value + "'" );
+
+		parseColorDepth++;
+		try {
+			switch( function ) {
+				case "rgb":			return parseColorRgbOrRgba( false, params, resolver, reportError );
+				case "rgba":		return parseColorRgbOrRgba( true, params, resolver, reportError );
+				case "hsl":			return parseColorHslOrHsla( false, params );
+				case "hsla":		return parseColorHslOrHsla( true, params );
+				case "lighten":		return parseColorHSLIncreaseDecrease( 2, true, params, resolver, reportError );
+				case "darken":		return parseColorHSLIncreaseDecrease( 2, false, params, resolver, reportError );
+				case "saturate":	return parseColorHSLIncreaseDecrease( 1, true, params, resolver, reportError );
+				case "desaturate":	return parseColorHSLIncreaseDecrease( 1, false, params, resolver, reportError );
+				case "fadein":		return parseColorHSLIncreaseDecrease( 3, true, params, resolver, reportError );
+				case "fadeout":		return parseColorHSLIncreaseDecrease( 3, false, params, resolver, reportError );
+				case "fade":		return parseColorFade( params, resolver, reportError );
+				case "spin":		return parseColorSpin( params, resolver, reportError );
+			}
+		} finally {
+			parseColorDepth--;
 		}

 		throw new IllegalArgumentException( "unknown color function '" + value + "'" );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java
@@ -22,6 +22,9 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -96,23 +99,37 @@ public class FlatLabelUI
 	}

 	/**
-	 * Checks whether text contains HTML headings and adds a special CSS rule to
-	 * re-calculate heading font sizes based on current component font size.
+	 * Checks whether text contains HTML tags that use "absolute-size" keywords
+	 * (e.g. "x-large") for font-size in default style sheet
+	 * (see javax/swing/text/html/default.css).
+	 * If yes, adds a special CSS rule (BASE_SIZE) to the HTML text, which
+	 * re-calculates font sizes based on current component font size.
 	 */
 	static void updateHTMLRenderer( JComponent c, String text, boolean always ) {
 		if( BasicHTML.isHTMLString( text ) &&
 			c.getClientProperty( "html.disable" ) != Boolean.TRUE &&
-			text.contains( "<h" ) &&
-			(text.contains( "<h1" ) || text.contains( "<h2" ) || text.contains( "<h3" ) ||
-			 text.contains( "<h4" ) || text.contains( "<h5" ) || text.contains( "<h6" )) )
+			needsFontBaseSize( text ) )
 		{
-			int headIndex = text.indexOf( "<head>" );
-
+			// BASE_SIZE rule is parsed in javax.swing.text.html.StyleSheet.addRule()
 			String style = "<style>BASE_SIZE " + c.getFont().getSize() + "</style>";
-			if( headIndex < 0 )
-				style = "<head>" + style + "</head>";

-			int insertIndex = headIndex >= 0 ? (headIndex + "<head>".length()) : "<html>".length();
+			String lowerText = text.toLowerCase();
+			int headIndex;
+			int styleIndex;
+
+			int insertIndex;
+			if( (headIndex = lowerText.indexOf( "<head>" )) >= 0 ) {
+				// there is a <head> tag --> insert after <head> tag
+				insertIndex = headIndex + "<head>".length();
+			} else if( (styleIndex = lowerText.indexOf( "<style>" )) >= 0 ) {
+				// there is a <style> tag --> insert before <style> tag
+				insertIndex = styleIndex;
+			} else {
+				// no <head> or <style> tag --> insert <head> tag after <html> tag
+				style = "<head>" + style + "</head>";
+				insertIndex = "<html>".length();
+			}
+
 			text = text.substring( 0, insertIndex )
 				+ style
 				+ text.substring( insertIndex );
@@ -122,6 +139,44 @@ public class FlatLabelUI
 		BasicHTML.updateRenderer( c, text );
 	}

+	private static Set<String> tagsUseFontSizeSet;
+
+	private static boolean needsFontBaseSize( String text ) {
+		if( tagsUseFontSizeSet == null ) {
+			// tags that use font-size in javax/swing/text/html/default.css
+			tagsUseFontSizeSet = new HashSet<>( Arrays.asList(
+				"h1", "h2", "h3", "h4", "h5", "h6", "code", "kbd", "big", "small", "samp" ) );
+		}
+
+		// search for tags in HTML text
+		int textLength = text.length();
+		for( int i = 6; i < textLength - 1; i++ ) {
+			if( text.charAt( i ) == '<' ) {
+				switch( text.charAt( i + 1 ) ) {
+					// first letters of tags in tagsUseFontSizeSet
+					case 'b': case 'B':
+					case 'c': case 'C':
+					case 'h': case 'H':
+					case 'k': case 'K':
+					case 's': case 'S':
+						int tagBegin = i + 1;
+						for( i += 2; i < textLength; i++ ) {
+							if( !Character.isLetterOrDigit( text.charAt( i ) ) ) {
+								String tag = text.substring( tagBegin, i ).toLowerCase();
+								if( tagsUseFontSizeSet.contains( tag ) )
+									return true;
+
+								break;
+							}
+						}
+						break;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	static Graphics createGraphicsHTMLTextYCorrection( Graphics g, JComponent c ) {
 		return (c.getClientProperty( BasicHTML.propertyKey ) != null)
 			? HiDPIUtils.createGraphicsTextYCorrection( (Graphics2D) g )
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java
@@ -123,7 +123,7 @@ public class FlatRadioButtonUI
 		// - if background was explicitly set to a non-UIResource color
 		if( !c.isOpaque() &&
 			((AbstractButton)c).isContentAreaFilled() &&
-			(c.getBackground() != defaultBackground) )
+			!defaultBackground.equals( c.getBackground() ) )
 		{
 			g.setColor( c.getBackground() );
 			g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolTipUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolTipUI.java
@@ -71,7 +71,7 @@ public class FlatToolTipUI
 		if( sharedPropertyChangedListener == null ) {
 			sharedPropertyChangedListener = e -> {
 				String name = e.getPropertyName();
-				if( name == "text" || name == "font" || name == "foreground" ) {
+				if( name == "tiptext" || name == "font" || name == "foreground" ) {
 					JToolTip toolTip = (JToolTip) e.getSource();
 					FlatLabelUI.updateHTMLRenderer( toolTip, toolTip.getTipText(), false );
 				}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java
@@ -128,6 +128,21 @@ public class ColorFunctions
 				? hsla[hslIndex] > 65
 				: hsla[hslIndex] < 35;
 		}
+
+		@Override
+		public String toString() {
+			String name;
+			switch( hslIndex ) {
+				case 0: name = "spin"; break;
+				case 1: name = increase ? "saturate" : "desaturate"; break;
+				case 2: name = increase ? "lighten" : "darken"; break;
+				case 3: name = increase ? "fadein" : "fadeout"; break;
+				default: throw new IllegalArgumentException();
+			}
+			return String.format( "%s(%.0f%%%s%s)", name, amount,
+				(relative ? " relative" : ""),
+				(autoInverse ? " autoInverse" : "") );
+		}
 	}

 	//---- class HSLIncreaseDecrease ------------------------------------------
@@ -148,5 +163,10 @@ public class ColorFunctions
 		public void apply( float[] hsla ) {
 			hsla[3] = clamp( amount );
 		}
+
+		@Override
+		public String toString() {
+			return String.format( "fade(%.0f%%)", amount );
+		}
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/DerivedColor.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/DerivedColor.java
@@ -59,4 +59,17 @@ public class DerivedColor
 	public ColorFunction[] getFunctions() {
 		return functions;
 	}
+
+	@Override
+	public String toString() {
+		StringBuilder buf = new StringBuilder();
+		buf.append( super.toString() );
+
+		for( ColorFunction function : functions ) {
+			buf.append( '\n' );
+			buf.append( function.toString() );
+		}
+
+		return buf.toString();
+	}
 }
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties
@@ -95,6 +95,8 @@ ToggleButton.endBackground = $ToggleButton.background
 [Cyan_light]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
 [Cyan_light]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL20

+[Dark_Flat_Theme]TableHeader.background = #3B3B3B
+
 [Dark_purple]Slider.focusedColor = fade($Component.focusColor,70%,derived)

 [Dracula]ProgressBar.selectionBackground = #fff
@@ -123,6 +125,8 @@ ToggleButton.endBackground = $ToggleButton.background
 [High_contrast]ToggleButton.disabledSelectedBackground = #444
 [High_contrast]ToggleButton.toolbar.selectedBackground = #fff

+[Light_Flat]TableHeader.background = #E5E5E9
+
 [Monocai]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
 [Monocai]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
@Monocai.acceleratorForeground = lazy(MenuItem.disabledForeground)
--- a/flatlaf-demo/build.gradle.kts
+++ b/flatlaf-demo/build.gradle.kts
@@ -16,15 +16,6 @@

 plugins {
 	`java-library`
-	id( "com.jfrog.bintray" )
-
-	// Although artifactory plugin is not used in this subproject, the plugin is required
-	// because otherwise gradle fails with following error:
-	//     Caused by: org.codehaus.groovy.runtime.typehandling.GroovyCastException:
-	//     Cannot cast object 'task ':bintrayUpload''
-	//     with class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask_Decorated'
-	//     to class 'com.jfrog.bintray.gradle.tasks.BintrayUploadTask'
-	id( "com.jfrog.artifactory" )
 }

 repositories {
@@ -68,24 +59,3 @@ tasks {
 		} )
 	}
 }
-
-bintray {
-	user = rootProject.extra["bintray.user"] as String?
-	key = rootProject.extra["bintray.key"] as String?
-
-	setConfigurations( "archives" )
-
-	with( pkg ) {
-		repo = "flatlaf"
-		name = "flatlaf-demo"
-		setLicenses( "Apache-2.0" )
-		vcsUrl = "https://github.com/JFormDesigner/FlatLaf"
-
-		with( version ) {
-			name = project.version.toString()
-		}
-
-		publish = rootProject.extra["bintray.publish"] as Boolean
-		dryRun = rootProject.extra["bintray.dryRun"] as Boolean
-	}
-}
--- a/flatlaf-extras/README.md
+++ b/flatlaf-extras/README.md
@@ -25,7 +25,7 @@ This sub-project provides some additional components and classes:
 Download
 --------

-FlatLaf Extras binaries are available on **JCenter** and **Maven Central**.
+FlatLaf Extras binaries are available on **Maven Central**.

 If you use Maven or Gradle, add a dependency with following coordinates to your
 build script:
@@ -36,11 +36,11 @@ build script:

 Otherwise download `flatlaf-extras-<version>.jar` here:

-[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf-extras/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf-extras/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-extras/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-extras)

 If SVG classes are used, `svgSalamander-<version>.jar` is also required:

-[![Download](https://api.bintray.com/packages/jformdesigner/svgSalamander/svgSalamander/images/download.svg)](https://bintray.com/jformdesigner/svgSalamander/svgSalamander/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/svgSalamander/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/svgSalamander)


 Tools
--- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatInspector.java
+++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatInspector.java
@@ -55,7 +55,6 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.LineBorder;
 import javax.swing.plaf.UIResource;
 import javax.swing.text.JTextComponent;
-import com.formdev.flatlaf.ui.FlatToolTipUI;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.UIScale;

@@ -365,12 +364,7 @@ public class FlatInspector
 		}

 		if( tip == null ) {
-			tip = new JToolTip() {
-				@Override
-				public void updateUI() {
-					setUI( FlatToolTipUI.createUI( this ) );
-				}
-			};
+			tip = new JToolTip();
 			rootPane.getLayeredPane().add( tip, TOOLTIP_LAYER );
 		} else
 			tip.setVisible( true );
@@ -397,15 +391,18 @@ public class FlatInspector
 	}

 	private static String buildToolTipText( Component c, int parentLevel ) {
+		StringBuilder buf = new StringBuilder( 1500 );
+		buf.append( "<html><style>" );
+		buf.append( "td { padding: 0 10 0 0; }" );
+		buf.append( "</style><table>" );
+
 		String name = c.getClass().getName();
 		name = name.substring( name.lastIndexOf( '.' ) + 1 );
-
-		String text =
-			"Class: " + name + " (" + c.getClass().getPackage().getName() + ")\n" +
-			"Size: " + c.getWidth() + ',' + c.getHeight() + "  @ " + c.getX() + ',' + c.getY() + '\n';
+		appendRow( buf, "Class", name + " (" + c.getClass().getPackage().getName() + ")" );
+		appendRow( buf, "Size", c.getWidth() + ", " + c.getHeight() + "&nbsp;&nbsp; @ " + c.getX() + ", " + c.getY() );

 		if( c instanceof Container )
-			text += "Insets: " + toString( ((Container)c).getInsets() ) + '\n';
+			appendRow( buf, "Insets", toString( ((Container)c).getInsets() ) );

 		Insets margin = null;
 		if( c instanceof AbstractButton )
@@ -418,28 +415,28 @@ public class FlatInspector
 			margin = ((JToolBar) c).getMargin();

 		if( margin != null )
-			text += "Margin: " + toString( margin ) + '\n';
+			appendRow( buf, "Margin", toString( margin ) );

 		Dimension prefSize = c.getPreferredSize();
 		Dimension minSize = c.getMinimumSize();
 		Dimension maxSize = c.getMaximumSize();
-		text += "Pref size: " + prefSize.width + ',' + prefSize.height + '\n' +
-			"Min size: " + minSize.width + ',' + minSize.height + '\n' +
-			"Max size: " + maxSize.width + ',' + maxSize.height + '\n';
+		appendRow( buf, "Pref size", prefSize.width + ", " + prefSize.height );
+		appendRow( buf, "Min size", minSize.width + ", " + minSize.height );
+		appendRow( buf, "Max size", maxSize.width + ", " + maxSize.height );

 		if( c instanceof JComponent )
-			text += "Border: " + toString( ((JComponent)c).getBorder() ) + '\n';
+			appendRow( buf, "Border", toString( ((JComponent)c).getBorder() ) );

-		text += "Background: " + toString( c.getBackground() ) + '\n' +
-			"Foreground: " + toString( c.getForeground() ) + '\n' +
-			"Font: " + toString( c.getFont() ) + '\n';
+		appendRow( buf, "Background", toString( c.getBackground() ) );
+		appendRow( buf, "Foreground", toString( c.getForeground() ) );
+		appendRow( buf, "Font", toString( c.getFont() ) );

 		if( c instanceof JComponent ) {
 			try {
 				Field f = JComponent.class.getDeclaredField( "ui" );
 				f.setAccessible( true );
 				Object ui = f.get( c );
-				text += "UI: " + (ui != null ? ui.getClass().getName() : "null") + '\n';
+				appendRow( buf, "UI", (ui != null ? ui.getClass().getName() : "null") );
 			} catch( NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex ) {
 				// ignore
 			}
@@ -448,34 +445,46 @@ public class FlatInspector
 		if( c instanceof Container ) {
 			LayoutManager layout = ((Container)c).getLayout();
 			if( layout != null )
-				text += "Layout: " + layout.getClass().getName() + '\n';
+				appendRow( buf, "Layout", layout.getClass().getName() );
 		}

-		text += "Enabled: " + c.isEnabled() + '\n';
-		text += "Opaque: " + c.isOpaque() + (c instanceof JComponent &&
-			FlatUIUtils.hasOpaqueBeenExplicitlySet( (JComponent) c ) ? " EXPLICIT" : "") + '\n';
+		appendRow( buf, "Enabled", String.valueOf( c.isEnabled() ) );
+		appendRow( buf, "Opaque", String.valueOf( c.isOpaque() )
+			+ (c instanceof JComponent && FlatUIUtils.hasOpaqueBeenExplicitlySet( (JComponent) c ) ? " EXPLICIT" : "") );
 		if( c instanceof AbstractButton )
-			text += "ContentAreaFilled: " + ((AbstractButton)c).isContentAreaFilled() + '\n';
-		text += "Focusable: " + c.isFocusable() + '\n';
-		text += "Left-to-right: " + c.getComponentOrientation().isLeftToRight() + '\n';
-		text += "Parent: " + (c.getParent() != null ? c.getParent().getClass().getName() : "null");
+			appendRow( buf, "ContentAreaFilled", String.valueOf( ((AbstractButton)c).isContentAreaFilled() ) );
+		appendRow( buf, "Focusable", String.valueOf( c.isFocusable() ) );
+		appendRow( buf, "Left-to-right", String.valueOf( c.getComponentOrientation().isLeftToRight() ) );
+		appendRow( buf, "Parent", (c.getParent() != null ? c.getParent().getClass().getName() : "null") );
+
+		buf.append( "<tr><td colspan=\"2\">" );
+		if( parentLevel > 0 )
+			buf.append( "<br>Parent level: " + parentLevel );

 		if( parentLevel > 0 )
-			text += "\n\nParent level: " + parentLevel;
-
-		if( parentLevel > 0 )
-			text += "\n(press Ctrl/Shift to increase/decrease level)";
+			buf.append( "<br>(press Ctrl/Shift to increase/decrease level)" );
 		else
-			text += "\n\n(press Ctrl key to inspect parent)";
+			buf.append( "<br>(press Ctrl key to inspect parent)" );

-		return text;
+		buf.append( "</td></tr>" );
+		buf.append( "</table></html>" );
+
+		return buf.toString();
+	}
+
+	private static void appendRow( StringBuilder buf, String key, String value ) {
+		buf.append( "<tr><td><b>" )
+			.append( key )
+			.append( ":</b></td><td>" )
+			.append( value )
+			.append( "</td></tr>" );
 	}

 	private static String toString( Insets insets ) {
 		if( insets == null )
 			return "null";

-		return insets.top + "," + insets.left + ',' + insets.bottom + ',' + insets.right
+		return insets.top + ", " + insets.left + ", " + insets.bottom + ", " + insets.right
 			+ (insets instanceof UIResource ? " UI" : "");
 	}

@@ -483,10 +492,29 @@ public class FlatInspector
 		if( c == null )
 			return "null";

-		String s = Long.toString( c.getRGB() & 0xffffffffl, 16 );
+		StringBuilder buf = new StringBuilder( 150 );
+
+		buf.append( "<tt>" ); // <tt> is similar to <code>, but uses same font size as body
+		buf.append( (c.getAlpha() != 255)
+			? String.format( "#%06x%02x", c.getRGB() & 0xffffff, (c.getRGB() >> 24) & 0xff )
+			: String.format( "#%06x", c.getRGB() & 0xffffff ) );
+		buf.append( "</tt>" );
+
 		if( c instanceof UIResource )
-			s += " UI";
-		return s;
+			buf.append( " UI" );
+
+		// color preview
+		buf.append( "&nbsp; &nbsp;" )
+			.append( "<span style=\"background: " )
+			.append( String.format( "#%06x", c.getRGB() & 0xffffff ) ) // Java CSS does not support alpha; see CSS.hexToColor()
+			.append( ";\">" )
+			.append( "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;" )
+			.append( "</span>" );
+
+		if( c.getAlpha() != 255 )
+			buf.append( " " ).append( Math.round( c.getAlpha() / 2.55f ) ).append( '%' );
+
+		return buf.toString();
 	}

 	private static String toString( Font f ) {
--- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java
+++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java
@@ -322,10 +322,11 @@ public class FlatUIDefaultsInspector
 				continue;

 			// resolve derived color
+			Object info = null;
 			if( value instanceof DerivedColor ) {
 				Color resolvedColor = resolveDerivedColor( defaults, (String) key, (DerivedColor) value, pBaseColor );
 				if( resolvedColor != value )
-					value = new Color[] { resolvedColor, pBaseColor[0], (Color) value };
+					info = new Color[] { resolvedColor, pBaseColor[0] };
 			}

 			// check whether key was overridden using UIManager.put(key,value)
@@ -334,7 +335,7 @@ public class FlatUIDefaultsInspector
 				lafValue = lafDefaults.get( key );

 			// add item
-			items.add( new Item( String.valueOf( key ), value, lafValue ) );
+			items.add( new Item( String.valueOf( key ), value, lafValue, info ) );
 		}

 		return items.toArray( new Item[items.size()] );
@@ -445,7 +446,7 @@ public class FlatUIDefaultsInspector
 		model.setFilter( item -> {
 			if( valueType != null &&
 				!valueType.equals( "(any)" ) &&
-				!valueType.equals( typeOfValue( item.value ) ) )
+				!typeOfValue( item.value ).startsWith( valueType ) )
 			  return false;

 			if( filters == null )
@@ -477,8 +478,13 @@ public class FlatUIDefaultsInspector
 			return "Boolean";
 		if( value instanceof Border )
 			return "Border";
-		if( value instanceof Color || value instanceof Color[] )
+		if( value instanceof Color ) {
+			if( ((Color)value).getAlpha() != 255 )
+				return "Color (\u03b1)";
+			if( value instanceof DerivedColor )
+				return "Color (\u0192)";
 			return "Color";
+		}
 		if( value instanceof Dimension )
 			return "Dimension";
 		if( value instanceof Float )
@@ -594,6 +600,8 @@ public class FlatUIDefaultsInspector
 					"Boolean",
 					"Border",
 					"Color",
+					"Color (\u03b1)",
+					"Color (\u0192)",
 					"Dimension",
 					"Float",
 					"Font",
@@ -669,24 +677,26 @@ public class FlatUIDefaultsInspector
 		final String key;
 		final Object value;
 		final Object lafValue;
+		final Object info;

 		private String valueStr;

-		Item( String key, Object value, Object lafValue ) {
+		Item( String key, Object value, Object lafValue, Object info ) {
 			this.key = key;
 			this.value = value;
 			this.lafValue = lafValue;
+			this.info = info;
 		}

 		String getValueAsString() {
 			if( valueStr == null )
-				valueStr = valueAsString( value );
+				valueStr = valueAsString( value, info );
 			return valueStr;
 		}

-		static String valueAsString( Object value ) {
-			if( value instanceof Color || value instanceof Color[] ) {
-				Color color = (value instanceof Color[]) ? ((Color[])value)[0] : (Color) value;
+		static String valueAsString( Object value, Object info ) {
+			if( value instanceof Color ) {
+				Color color = (info instanceof Color[]) ? ((Color[])info)[0] : (Color) value;
 				HSLColor hslColor = new HSLColor( color );
 				if( color.getAlpha() == 255 ) {
 					return String.format( "%-9s HSL %3d %3d %3d",
@@ -720,7 +730,7 @@ public class FlatUIDefaultsInspector
 				Border border = (Border) value;
 				if( border instanceof FlatLineBorder ) {
 					FlatLineBorder lineBorder = (FlatLineBorder) border;
-					return valueAsString( lineBorder.getUnscaledBorderInsets() )
+					return valueAsString( lineBorder.getUnscaledBorderInsets(), null )
 						+ "  " + color2hex( lineBorder.getLineColor() )
 						+ "  " + lineBorder.getLineThickness()
 						+ "    " + border.getClass().getName();
@@ -728,7 +738,7 @@ public class FlatUIDefaultsInspector
 					Insets insets = (border instanceof FlatEmptyBorder)
 						? ((FlatEmptyBorder)border).getUnscaledBorderInsets()
 						: ((EmptyBorder)border).getBorderInsets();
-					return valueAsString( insets ) + "    " + border.getClass().getName();
+					return valueAsString( insets, null ) + "    " + border.getClass().getName();
 				} else if( border instanceof FlatBorder || border instanceof FlatMarginBorder )
 					return border.getClass().getName();
 				else
@@ -991,7 +1001,7 @@ public class FlatUIDefaultsInspector
 			init( table, item.key, isSelected, row );

 			// reset background, foreground and icon
-			if( !(item.value instanceof Color) && !(item.value instanceof Color[]) ) {
+			if( !(item.value instanceof Color) ) {
 				setBackground( null );
 				setForeground( null );
 			}
@@ -1003,8 +1013,8 @@ public class FlatUIDefaultsInspector

 			super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );

-			if( item.value instanceof Color || item.value instanceof Color[] ) {
-				Color color = (item.value instanceof Color[]) ? ((Color[])item.value)[0] : (Color) item.value;
+			if( item.value instanceof Color ) {
+				Color color = (item.info instanceof Color[]) ? ((Color[])item.info)[0] : (Color) item.value;
 				boolean isDark = new HSLColor( color ).getLuminance() < 70 && color.getAlpha() >= 128;
 				setBackground( color );
 				setForeground( isDark ? Color.white : Color.black );
@@ -1019,7 +1029,7 @@ public class FlatUIDefaultsInspector
 				: String.valueOf( item.value );
 			if( item.lafValue != null ) {
 				toolTipText += "    \n\nLaF UI default value was overridden with UIManager.put(key,value):\n    "
-					+ Item.valueAsString( item.lafValue ) + "\n    " + String.valueOf( item.lafValue );
+					+ Item.valueAsString( item.lafValue, null ) + "\n    " + String.valueOf( item.lafValue );
 			}
 			setToolTipText( toolTipText );

@@ -1028,7 +1038,7 @@ public class FlatUIDefaultsInspector

 		@Override
 		protected void paintComponent( Graphics g ) {
-			if( item.value instanceof Color || item.value instanceof Color[] ) {
+			if( item.value instanceof Color ) {
 				int width = getWidth();
 				int height = getHeight();
 				Color background = getBackground();
@@ -1036,13 +1046,13 @@ public class FlatUIDefaultsInspector
 				// paint color
 				fillRect( g, background, 0, 0, width, height );

-				if( item.value instanceof Color[] ) {
+				if( item.info instanceof Color[] ) {
 					// paint base color
 					int width2 = height * 2;
-					fillRect( g, ((Color[])item.value)[1], width - width2, 0, width2, height );
+					fillRect( g, ((Color[])item.info)[1], width - width2, 0, width2, height );

 					// paint default color
-					Color defaultColor = ((Color[])item.value)[2];
+					Color defaultColor = (Color) item.value;
 					if( defaultColor != null && !defaultColor.equals( background ) ) {
 						int width3 = height / 2;
 						fillRect( g, defaultColor, width - width3, 0, width3, height );
--- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.jfd
+++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.jfd
@@ -42,6 +42,8 @@ new FormModel {
 						addElement( "Boolean" )
 						addElement( "Border" )
 						addElement( "Color" )
+						addElement( "Color (α)" )
+						addElement( "Color (ƒ)" )
 						addElement( "Dimension" )
 						addElement( "Float" )
 						addElement( "Font" )
--- a/flatlaf-intellij-themes/README.md
+++ b/flatlaf-intellij-themes/README.md
@@ -11,8 +11,7 @@ out.
 Download
 --------

-FlatLaf IntelliJ Themes Pack binaries are available on **JCenter** and **Maven
-Central**.
+FlatLaf IntelliJ Themes Pack binaries are available on **Maven Central**.

 If you use Maven or Gradle, add a dependency with following coordinates to your
 build script:
@@ -23,7 +22,7 @@ build script:

 Otherwise download `flatlaf-intellij-themes-<version>.jar` here:

-[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf-intellij-themes/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf-intellij-themes/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-intellij-themes/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-intellij-themes)


 How to use?
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json
@@ -4,22 +4,27 @@
  "author": "Zihan Ma",
  "editorScheme": "/themes/Dracula.xml",
  "colors": {
+    "accentColor": "#ff79c6",
+    "secondaryAccentColor": "#bd93f9",
    "primaryForeground": "#f8f8f2",
    "primaryBackground": "#414450",
-    "secondaryBackground": "#44475a",
+    "secondaryBackground": "#3a3d4c",
    "hoverBackground": "#282a36",
    "selectionBackground": "#6272a4",
    "selectionInactiveBackground": "#4e5a82",
    "borderColor": "#282a36",
-    "separatorColor": "#282a36"
+    "separatorColor": "#5d5e66"
  },
  "ui": {
    "*": {
      "arc": "7",
      "background": "primaryBackground",
+      "selectionForeground": "primaryForeground",
+      "selectionInactiveForeground": "primaryForeground",
      "selectionBackground": "selectionBackground",
      "selectionInactiveBackground": "selectionInactiveBackground",
      "inactiveBackground": "primaryBackground",
+      "disabledBackground": "primaryBackground",
      "borderColor": "borderColor",
      "separatorColor": "separatorColor"
    },
@@ -37,17 +42,18 @@
      "foreground": "primaryForeground",
      "startBorderColor": "selectionBackground",
      "endBorderColor": "selectionBackground",
-      "startBackground": "selectionBackground",
-      "endBackground": "selectionBackground",
-      "focusedBorderColor": "#bd93f9",
+      "startBackground": "#4f566d",
+      "endBackground": "#4f566d",
+      "focusedBorderColor": "secondaryAccentColor",
+      "disabledBorderColor": "#4f566d",
      "default": {
        "foreground": "primaryForeground",
        "startBackground": "selectionBackground",
        "endBackground": "selectionBackground",
-        "startBorderColor": "#bd93f9",
-        "endBorderColor": "#bd93f9",
-        "focusColor": "#bd93f9",
-        "focusedBorderColor": "#bd93f9"
+        "startBorderColor": "secondaryAccentColor",
+        "endBorderColor": "secondaryAccentColor",
+        "focusColor": "secondaryAccentColor",
+        "focusedBorderColor": "secondaryAccentColor"
      }
    },
    "Counter": {
@@ -55,27 +61,29 @@
      "background": "#2fc864"
    },
    "CheckBoxMenuItem": {
-      "acceleratorSelectionForeground": "#ff79c6"
+      "acceleratorSelectionForeground": "accentColor"
    },
    "ComboBox": {
-      "modifiedItemForeground": "#ff79c6",
+      "modifiedItemForeground": "accentColor",
      "ArrowButton": {
        "background": "secondaryBackground",
        "nonEditableBackground": "secondaryBackground",
-        "iconColor": "#bd93f9"
+        "disabledIconColor": "#576285",
+        "iconColor": "secondaryAccentColor"
      },
-      "selectionBackground": "#bd93f9",
+      "selectionBackground": "secondaryAccentColor",
      "nonEditableBackground": "secondaryBackground"
    },
    "CompletionPopup": {
      "selectionBackground": "selectionBackground",
      "selectionInactiveBackground": "selectionInactiveBackground",
-      "matchForeground": "#ff79c6"
+      "matchForeground": "accentColor"
    },
    "Component": {
-      "focusColor": "#bd93f9",
+      "focusColor": "secondaryAccentColor",
      "borderColor": "selectionBackground",
      "focusedBorderColor": "selectionBackground",
+      "disabledBorderColor": "selectionBackground",
      "errorFocusColor": "#ff5554",
      "inactiveErrorFocusColor": "#ff5554",
      "warningFocusColor": "#f1fa8c",
@@ -86,31 +94,30 @@
    },
    "Editor": {
      "background": "secondaryBackground",
-      "shortcutForeground": "#ff79c6"
+      "shortcutForeground": "accentColor"
    },
    "EditorTabs": {
      "background": "secondaryBackground",
-      "underlinedTabBackground": "#313341",
-      "underlineColor": "#bd93f9",
+      "underlinedTabBackground": "#292b38",
+      "underlineColor": "secondaryAccentColor",
      "underlineHeight": 2
    },
    "FileColor": {
-      "Blue": "#8be9fd",
-      "Green": "#63667E",
-      "Orange": "#ffb86c",
-      "Yellow": "secondaryBackground",
-      "Rose": "#ff79c6",
-      "Violet": "#bd93f9"
+      "Blue": "#344f54",
+      "Green": "#344535",
+      "Orange": "#533f30",
+      "Yellow": "#4f4b41",
+      "Rose": "#4c273c",
+      "Violet": "#382b4a"
    },
    "Label": {
-      "foreground": "primaryForeground",
      "errorForeground": "#ff5554"
    },
    "Link": {
-      "activeForeground": "#ff79c6",
-      "hoverForeground": "#ff79c6",
-      "visitedForeground": "#bd93f9",
-      "pressedForeground": "#bd93f9"
+      "activeForeground": "accentColor",
+      "hoverForeground": "accentColor",
+      "visitedForeground": "secondaryAccentColor",
+      "pressedForeground": "secondaryAccentColor"
    },
    "Notification": {
      "borderColor": "selectionBackground",
@@ -129,6 +136,9 @@
        "informativeBorderColor": "#50fa7b"
      }
    },
+    "PasswordField": {
+      "background": "secondaryBackground"
+    },
    "Plugins": {
      "SearchField": {
        "background": "secondaryBackground"
@@ -139,11 +149,11 @@
      "hoverBackground": "hoverBackground",
      "lightSelectionBackground": "hoverBackground",
      "Button": {
-        "installBorderColor": "#bd93f9",
-        "installForeground": "#bd93f9",
+        "installBorderColor": "secondaryAccentColor",
+        "installForeground": "secondaryAccentColor",
        "installBackground": "primaryBackground",
        "installFillForeground": "primaryBackground",
-        "installFillBackground": "#bd93f9",
+        "installFillBackground": "secondaryAccentColor",
        "installFocusedBackground": "primaryBackground",
        "updateBorderColor": "#5da3f4",
        "updateForeground": "primaryForeground",
@@ -159,9 +169,9 @@
      "failedColor": "#ff5554",
      "failedEndColor": "#ff5554",
      "trackColor": "selectionBackground",
-      "progressColor": "#ff79c6",
+      "progressColor": "accentColor",
      "indeterminateStartColor": "#93b8f9",
-      "indeterminateEndColor": "#bd93f9",
+      "indeterminateEndColor": "secondaryAccentColor",
      "passedColor": "#50fa7b",
      "passedEndColor": "#50fa7b"
    },
@@ -173,9 +183,9 @@
    },
    "ScrollBar": {
      "Mac": {
-        "hoverThumbColor": "#bd93f9",
+        "hoverThumbColor": "secondaryAccentColor",
        "Transparent": {
-          "hoverThumbColor": "#bd93f9"
+          "hoverThumbColor": "secondaryAccentColor"
        }
      }
    },
@@ -189,8 +199,8 @@
      }
    },
    "SearchMatch": {
-      "startBackground": "#ff79c6",
-      "endBackground": "#ff79c6"
+      "startBackground": "accentColor",
+      "endBackground": "accentColor"
    },
    "Separator": {
      "separatorColor": "separatorColor"
@@ -205,7 +215,7 @@
      "tabSelectionHeight": 1,
      "focusColor": "hoverBackground",
      "hoverColor": "hoverBackground",
-      "underlineColor": "#bd93f9",
+      "underlineColor": "secondaryAccentColor",
      "contentAreaColor": "hoverBackground"
    },
    "Table": {
@@ -215,6 +225,9 @@
    "TableHeader": {
      "bottomSeparatorColor": "separatorColor"
    },
+    "TextField": {
+      "background": "secondaryBackground"
+    },
    "ToggleButton": {
      "onBackground": "#50fa7b",
      "onForeground": "hoverBackground",
@@ -227,18 +240,18 @@
        "hoverBackground": "hoverBackground"
      },
      "Header": {
-        "background": "secondaryBackground",
+        "background": "#484c60",
        "inactiveBackground": "secondaryBackground"
      },
      "HeaderTab": {
-        "underlineColor": "#bd93f9",
-        "underlineHeight": 1,
-        "underlinedTabBackground": "#313341",
+        "underlineColor": "secondaryAccentColor",
+        "underlineHeight": 2,
+        "underlinedTabBackground": "#292b38",
        "underlinedTabInactiveBackground": "#313341"
      }
    },
    "Tree": {
-      "modifiedItemForeground": "#ff79c6",
+      "modifiedItemForeground": "accentColor",
      "selectionBackground": "selectionBackground",
      "selectionInactiveBackground": "selectionInactiveBackground"
    },
@@ -257,8 +270,8 @@
      "GitLog": {
        "headIconColor": "#f1fa8c",
        "localBranchIconColor": "#50fa7b",
-        "remoteBranchIconColor": "#bd93f9",
-        "tagIconColor": "#ff79c6",
+        "remoteBranchIconColor": "secondaryAccentColor",
+        "tagIconColor": "accentColor",
        "otherIconColor": "#8be9fd"
      },
      "Log": {
@@ -266,6 +279,9 @@
          "hoveredBackground": "selectionBackground",
          "currentBranchBackground": "secondaryBackground"
        }
+      },
+      "RefLabel": {
+        "foreground": "primaryForeground"
      }
    },
    "WelcomeScreen": {
@@ -303,10 +319,12 @@
      "Objects.Yellow": "#f1fa8c",
      "Objects.YellowDark": "#f1fa8c",
      "Objects.BlackText": "#282a35",
+      "Checkbox.Foreground.Selected.Dark": "#f8f8f2",
      "Checkbox.Border.Default.Dark": "#bd93f9",
      "Checkbox.Border.Selected.Dark": "#bd93f9",
+      "Checkbox.Border.Disabled.Dark": "#6272a4",
      "Checkbox.Background.Default.Dark": "#6272a4",
-      "Checkbox.Foreground.Selected.Dark": "#f8f8f2",
+      "Checkbox.Background.Disabled.Dark": "#414450",
      "Checkbox.Focus.Wide.Dark": "#bd93f9",
      "Checkbox.Focus.Thin.Selected.Dark": "#bd93f9",
      "Checkbox.Focus.Thin.Default.Dark": "#bd93f9"
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc
@@ -14,19 +14,19 @@
      "acceleratorSelectionForeground": "#8b9eb5",
      "background": "#2f343f",
      "borderColor": "#404552",
-      "disabledBackground": "#474B57",
+      "disabledBackground": "#37373d",
      "disabledForeground": "#D3DAE3",
      "disabledText": "#D3DAE3",
-      "focusColor": "#3F3F46",
+      "focusColor": "#393f4c",
      "focusedBorderColor": "#42A5F5",
      "foreground": "#D3DAE3",
-      "inactiveBackground": "#474B57",
+      "inactiveBackground": "#37373d",
      "inactiveForeground": "#8b9eb5",
      "infoForeground": "#8b9eb5",
-      "selectionBackground": "#8888FF",
-      "selectionBackgroundInactive": "#393f4c",
+      "selectionBackground": "#8888FF55",
+      "selectionBackgroundInactive": "#393f4c45",
      "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#393f4c",
+      "selectionInactiveBackground": "#393f4c45",
      "separatorColor": "#404552"
    },
    "activeCaption": "#2f343f",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#42A5F550"
    },
    "Autocomplete": {
-      "selectionBackground": "#8888FF"
+      "selectionBackground": "#8888FF55"
    },
    "Borders.ContrastBorderColor": "#2f343f",
    "Borders.color": "#404552",
@@ -60,7 +60,7 @@
      "disabledText": "#D3DAE3",
      "endBackground": "#383C4A",
      "endBorderColor": "#383C4A",
-      "focus": "#3F3F46",
+      "focus": "#393f4c",
      "focusedBorderColor": "#42A5F5",
      "foreground": "#8b9eb5",
      "highlight": "#FFFFFF",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#262b33",
-      "selectionBackground": "#8888FF"
+      "selectionBackground": "#8888FF55"
    },
    "CheckBox": {
      "background": "#2f343f",
@@ -95,14 +95,14 @@
      "disabledBackground": "#2f343f",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#D3DAE3",
      "AccessEnabled": {
        "accessDot": "#42A5F5",
-        "dropdownBorder": "#393f4c",
+        "dropdownBorder": "#393f4c45",
        "pillBackground": "$second"
      }
    },
@@ -125,14 +125,14 @@
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
      "modifiedItemForeground": "#42A5F5",
-      "nonEditableBackground": "#393f4c",
+      "nonEditableBackground": "#393f4c45",
      "padding": "5,5,5,5",
      "selectionBackground": "#41416A",
      "selectionForeground": "#FFFFFF"
    },
    "ComboPopup.border": "#404552",
    "CompletionPopup": {
-      "background": "#393f4c",
+      "background": "#393f4c45",
      "foreground": "#D3DAE3",
      "infoForeground": "#8b9eb5",
      "matchForeground": "#42A5F5",
@@ -141,14 +141,14 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#8b9eb5",
-      "selectionInactiveBackground": "#8888FF50",
-      "selectionBackground": "#8888FF80",
+      "selectionInactiveBackground": "#8888FF55",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#3F3F46",
+      "borderColor": "#393f4c",
      "disabledBorderColor": "#383C4A",
      "focusColor": "#42A5F5",
      "focusedBorderColor": "#42A5F5",
@@ -174,18 +174,18 @@
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#3F3F46",
-      "underlinedTabBackground": "#3F3F46"
+      "selectedBackground": "#393f4c",
+      "underlinedTabBackground": "#393f4c"
    },
    "DebuggerPopup": {
-      "borderColor": "#3F3F46"
+      "borderColor": "#393f4c"
    },
    "DefaultTabs": {
      "background": "#2f343f",
      "borderColor": "#2f343f",
      "hoverBackground": "#41416A",
      "hoverColor": "#262b33",
-      "hoverMaskColor": "#3F3F46",
+      "hoverMaskColor": "#393f4c",
      "inactiveColoredTabBackground": "#2f343f",
      "inactiveColoredFileBackground": "#383C4A",
      "inactiveUnderlineColor": "#42A5F5",
@@ -213,14 +213,14 @@
      "foreground": "#D3DAE3",
      "inactiveBackground": "#2f343f",
      "inactiveForeground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
-      "borderColor": "#393f4c",
-      "hoverBackground": "#3F3F46",
-      "hoverColor": "#3F3F46",
-      "hoverMaskColor": "#3F3F46",
+      "borderColor": "#393f4c45",
+      "hoverBackground": "#393f4c",
+      "hoverColor": "#393f4c",
+      "hoverMaskColor": "#393f4c",
      "inactiveMaskColor": "#2f343f",
      "inactiveColoredFileBackground": "#2f343f",
      "inactiveUnderlineColor": "#D3DAE3",
@@ -232,9 +232,9 @@
    },
    "EditorGroupsTabs": {
      "background": "#2f343f",
-      "borderColor": "#393f4c",
-      "hoverBackground": "#3F3F46",
-      "hoverColor": "#3F3F46",
+      "borderColor": "#393f4c45",
+      "hoverBackground": "#393f4c",
+      "hoverColor": "#393f4c",
      "inactiveUnderlineColor": "#42A5F5",
      "underlineColor": "#42A5F5",
      "underlinedTabBackground": "#41416A",
@@ -243,7 +243,7 @@
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#474B57",
+      "Yellow": "#37373d",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -289,7 +289,7 @@
      "shortcutForeground": "#8b9eb5"
    },
    "Hyperlink.linkColor": "#42A5F5",
-    "inactiveCaption": "#393f4c",
+    "inactiveCaption": "#393f4c45",
    "inactiveCaptionBorder": "#2f343f",
    "inactiveCaptionText": "#8b9eb5",
    "info": "#8b9eb5",
@@ -323,14 +323,14 @@
    },
    "link.foreground": "#42A5F5",
    "List": {
-      "background": "#393f4c",
+      "background": "#393f4c45",
      "foreground": "#D3DAE3",
-      "hoverBackground": "#08507C70",
+      "hoverBackground": "#09477170",
      "hoverInactiveBackground": "#41416A",
-      "selectionBackground": "#8888FF50",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#08507C70"
+      "selectionInactiveBackground": "#09477170"
    },
    "material": {
      "background": "#2f343f",
@@ -345,20 +345,20 @@
      "tagColor": "#8b9eb5"
    },
    "MemoryIndicator": {
-      "allocatedBackground": "#393f4c",
-      "usedColor": "#3F3F46",
-      "usedBackground": "#3F3F46"
+      "allocatedBackground": "#393f4c45",
+      "usedColor": "#393f4c",
+      "usedBackground": "#393f4c"
    },
    "Menu": {
      "acceleratorForeground": "#8b9eb5",
      "acceleratorSelectionForeground": "#FFFFFF",
      "background": "#2f343f",
      "border": "4,2,4,2",
-      "borderColor": "#393f4c",
-      "disabledBackground": "#393f4c",
+      "borderColor": "#393f4c45",
+      "disabledBackground": "#393f4c45",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#404552"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
      "highlight": "#2f343f",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "shadow": "#262b33"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#2f343f",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -433,9 +433,9 @@
      "foreground": "#D3DAE3"
    },
    "ParameterInfo": {
-      "background": "#393f4c",
+      "background": "#393f4c45",
      "borderColor": "#41416A",
-      "currentOverloadBackground": "#3F3F46",
+      "currentOverloadBackground": "#393f4c",
      "currentParameterForeground": "#42A5F5",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
@@ -454,19 +454,19 @@
    "Plugins": {
      "background": "#2f343f",
      "disabledForeground": "#D3DAE3",
-      "eapTagBackground": "#3F3F46",
-      "hoverBackground": "#08507C70",
+      "eapTagBackground": "#393f4c",
+      "hoverBackground": "#09477170",
      "lightSelectionBackground": "#41416A",
-      "paidTagBackground": "#3F3F46",
-      "selectionBackground": "#8888FF",
+      "paidTagBackground": "#393f4c",
+      "selectionBackground": "#8888FF55",
      "tagForeground": "#42A5F5",
-      "tagBackground": "#3F3F46",
-      "trialTagBackground": "#3F3F46",
+      "tagBackground": "#393f4c",
+      "trialTagBackground": "#393f4c",
      "Button": {
        "installBackground": "#383C4A",
        "installBorderColor": "#383C4A",
        "installForeground": "#D3DAE3",
-        "installFocusedBackground": "#3F3F46",
+        "installFocusedBackground": "#393f4c",
        "installFillForeground": "#D3DAE3",
        "installFillBackground": "#383C4A",
        "updateBackground": "#42A5F5",
@@ -478,7 +478,7 @@
        "borderColor": "#404552"
      },
      "SectionHeader": {
-        "background": "#393f4c",
+        "background": "#393f4c45",
        "foreground": "#D3DAE3"
      },
      "Tab": {
@@ -495,14 +495,14 @@
      },
      "borderColor": "#262b33",
      "inactiveBorderColor": "#2f343f",
-      "innerBorderColor": "#393f4c",
+      "innerBorderColor": "#393f4c45",
      "Header": {
        "activeBackground": "#2f343f",
        "inactiveBackground": "#262b33"
      },
      "paintBorder": true,
      "separatorForeground": "#D3DAE3",
-      "separatorColor": "#393f4c",
+      "separatorColor": "#393f4c45",
      "Toolbar": {
        "Floating.background": "#262b33",
        "background": "#262b33",
@@ -523,8 +523,8 @@
      "indeterminateEndColor": "#42A5F5",
      "indeterminateStartColor": "#42A5F5",
      "progressColor": "#42A5F5",
-      "selectionBackground": "#3F3F46",
-      "trackColor": "#3F3F46"
+      "selectionBackground": "#393f4c",
+      "trackColor": "#393f4c"
    },
    "PsiViewer": {
      "referenceHighlightColor": "#42A5F5"
@@ -541,7 +541,7 @@
      "disabledBackground": "#2f343f",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#404552",
@@ -566,7 +566,7 @@
          "trackColor": "#2f343f30"
        }
      },
-      "thumb": "#3F3F46",
+      "thumb": "#393f4c",
      "thumbBorderColor": "#42A5F570",
      "thumbColor": "#42A5F570",
      "trackColor": "#2f343f30",
@@ -599,7 +599,7 @@
      "Tab": {
        "active.foreground": "#FFFFFF",
        "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#3F3F46"
+        "selectedBackground": "#393f4c"
      }
    },
    "SearchMatch": {
@@ -617,9 +617,9 @@
      "Repeated.File.Foreground": "#D3DAE3"
    },
    "Separator": {
-      "background": "#393f4c",
-      "foreground": "#393f4c",
-      "separatorColor": "#393f4c"
+      "background": "#393f4c45",
+      "foreground": "#393f4c45",
+      "separatorColor": "#393f4c45"
    },
    "SidePanel": {
      "background": "#262b33"
@@ -630,13 +630,13 @@
      "buttonColor": "#42A5F5",
      "foreground": "#D3DAE3",
      "majorTickLength": 6,
-      "tickColor": "#393f4c",
+      "tickColor": "#393f4c45",
      "trackColor": "#41416A",
      "trackWidth": 7,
      "thumb": "#42A5F5"
    },
    "SpeedSearch": {
-      "background": "#3F3F46",
+      "background": "#393f4c",
      "borderColor": "#404552",
      "foreground": "#D3DAE3",
      "errorForeground": "#D3DAE3"
@@ -651,15 +651,15 @@
      "background": "#2f343f",
      "highlight": "#262b33"
    },
-    "SplitPaneDivider.draggingColor": "#393f4c",
+    "SplitPaneDivider.draggingColor": "#393f4c45",
    "StatusBar": {
      "borderColor": "#2f343f",
-      "hoverBackground": "#3F3F46",
+      "hoverBackground": "#393f4c",
      "LightEditBackground": "#41416A"
    },
    "TabbedPane": {
      "background": "#2f343f",
-      "contentAreaColor": "#3F3F46",
+      "contentAreaColor": "#393f4c",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#404552",
      "disabledForeground": "#D3DAE3",
@@ -669,7 +669,7 @@
      "fontSizeOffset": 0,
      "foreground": "#D3DAE3",
      "highlight": "#404552",
-      "hoverColor": "#3F3F46",
+      "hoverColor": "#393f4c",
      "labelShift": 0,
      "selectedForeground": "#FFFFFF",
      "selectedLabelShift": 0,
@@ -694,11 +694,11 @@
      "foreground": "#D3DAE3",
      "gridColor": "#2f343f",
      "highlightOuter": "#41416A",
-      "hoverBackground": "#08507C70",
+      "hoverBackground": "#09477170",
      "hoverInactiveBackground": "#41416A",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#8b9eb5",
-      "lightSelectionInactiveBackground": "#393f4c",
+      "lightSelectionInactiveBackground": "#393f4c45",
      "selectionBackground": "#41416A",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#41416A",
@@ -709,14 +709,14 @@
    "TableHeader": {
      "background": "#2f343f",
      "borderColor": "#2f343f",
-      "bottomSeparatorColor": "#393f4c",
+      "bottomSeparatorColor": "#393f4c45",
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
      "focusCellBackground": "#41416A",
      "focusCellForeground": "#FFFFFF",
      "height": 25,
-      "separatorColor": "#393f4c"
+      "separatorColor": "#393f4c45"
    },
    "text": "#8b9eb5",
    "textInactiveText": "#8b9eb5",
@@ -747,7 +747,7 @@
    },
    "TitlePane": {
      "background": "#262b33",
-      "Button.hoverBackground": "#3F3F46",
+      "Button.hoverBackground": "#393f4c",
      "inactiveBackground": "#2f343f",
      "infoForeground": "#8b9eb5",
      "inactiveInfoForeground": "#8b9eb5"
@@ -787,22 +787,22 @@
      },
      "Header": {
        "background": "#2f343f",
-        "borderColor": "#393f4c",
+        "borderColor": "#393f4c45",
        "inactiveBackground": "#2f343f"
      },
      "HeaderCloseButton": {
        "background": "#2f343f"
      },
      "HeaderTab": {
-        "borderColor": "#3F3F46",
-        "hoverBackground": "#3F3F46",
-        "hoverInactiveBackground": "#3F3F46",
+        "borderColor": "#393f4c",
+        "hoverBackground": "#393f4c",
+        "hoverInactiveBackground": "#393f4c",
        "inactiveUnderlineColor": "#42A5F5",
        "selectedBackground": "#262b33",
        "selectedInactiveBackground": "#262b33",
        "underlineColor": "#42A5F5",
        "underlinedTabBackground": "#41416A",
-        "underlinedTabInactiveBackground": "#393f4c",
+        "underlinedTabInactiveBackground": "#393f4c45",
        "underlinedTabForeground": "#FFFFFF",
        "underlinedTabInactiveForeground": "#D3DAE3"
      }
@@ -811,14 +811,14 @@
      "background": "#262b33",
      "foreground": "#8b9eb5",
      "hash": "#404552",
-      "hoverBackground": "#08507C70",
+      "hoverBackground": "#09477170",
      "hoverInactiveBackground": "#41416A",
      "modifiedItemForeground": "#42A5F5",
      "rowHeight": 28,
-      "selectionBackground": "#08507C70",
+      "selectionBackground": "#09477170",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#08507C70",
+      "selectionInactiveBackground": "#09477170",
      "textBackground": "#262b33"
    },
    "Tree.leftChildIndent": 10,
@@ -834,35 +834,35 @@
        "borderColor": "#404552",
        "background": "#2f343f",
        "foreground": "#D3DAE3",
-        "hoverBorderColor": "#3F3F46"
+        "hoverBorderColor": "#393f4c"
      },
      "Connector": {
        "borderColor": "#404552",
-        "hoverBorderColor": "#3F3F46"
+        "hoverBorderColor": "#393f4c"
      },
      "Canvas.background": "#262b33",
      "highStroke.foreground": "#D3DAE3",
      "Label.foreground": "#8b9eb5",
-      "List.selectionBackground": "#08507C70",
+      "List.selectionBackground": "#09477170",
      "motion": {
        "borderColor": "#404552",
        "Component.foreground": "#D3DAE3",
        "ConstraintSetText.foreground": "#8b9eb5",
-        "ConstraintSet.background": "#393f4c",
-        "CSPanel.SelectedFocusBackground": "#8888FF",
-        "CSPanel.SelectedBackground": "#08507C70",
+        "ConstraintSet.background": "#393f4c45",
+        "CSPanel.SelectedFocusBackground": "#8888FF55",
+        "CSPanel.SelectedBackground": "#09477170",
        "cs_FocusText.infoForeground": "#8b9eb5",
        "CursorTextColor.foreground": "#D3DAE3",
        "HoverColor.disabledBackground": "#D3DAE3",
        "motionGraph.background": "#2f343f",
        "Notification.background": "#262a33",
-        "ourAvg.background": "#393f4c",
-        "ourCS.background": "#393f4c",
+        "ourAvg.background": "#393f4c45",
+        "ourCS.background": "#393f4c45",
        "ourCS_Border.borderColor": "#404552",
        "ourCS_TextColor.foreground": "#8b9eb5",
        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#41416A",
-        "ourCS_SelectedBorder.pressedBorderColor": "#3F3F46",
+        "ourCS_SelectedBorder.pressedBorderColor": "#393f4c",
        "ourML_BarColor.separatorColor": "#404552",
        "PrimaryPanel.background": "#262b33",
        "SecondaryPanel.background": "#2f343f",
@@ -895,7 +895,7 @@
        "selectedBranchBackground": "#2f343f"
      },
      "GitCommits": {
-        "graphColor": "#3F3F46"
+        "graphColor": "#393f4c"
      },
      "GitLog": {
        "localBranchIconColor": "#42A5F5",
@@ -914,12 +914,12 @@
      },
      "Log": {
        "Commit.unmatchedForeground": "#8b9eb5",
-        "Commit.currentBranchBackground": "#393f4c",
-        "Commit.hoveredBackground": "#08507C70"
+        "Commit.currentBranchBackground": "#393f4c45",
+        "Commit.hoveredBackground": "#09477170"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
-        "backgroundBase": "#3F3F46"
+        "backgroundBase": "#393f4c"
      }
    },
    "Viewport": {
@@ -939,13 +939,13 @@
      "headerForeground": "#D3DAE3",
      "List.background": "#262b33",
      "separatorColor": "#404552",
-      "SidePanel.background": "#393f4c",
+      "SidePanel.background": "#393f4c45",
      "Projects": {
        "actions.background": "#262b33",
-        "actions.selectionBackground": "#3F3F46",
-        "background": "#393f4c",
-        "selectionBackground": "#8888FF",
-        "selectionInactiveBackground": "#393f4c"
+        "actions.selectionBackground": "#393f4c",
+        "background": "#393f4c45",
+        "selectionBackground": "#8888FF55",
+        "selectionInactiveBackground": "#393f4c45"
      }
    },
    "window": "#262b33",
@@ -968,14 +968,14 @@
      "Actions.Blue": "#7587A6",
      "Actions.Green": "#8F9D6A",
      "Actions.Grey": "#8b9eb5",
-      "Actions.GreyInline": "#747C84",
+      "Actions.GreyInline": "#747c84",
      "Actions.GreyInline.Dark": "#D3DAE3",
      "Actions.Red": "#CF6A4C",
      "Actions.Yellow": "#F9EE98",
      "Checkbox.Background.Default": "#262b33",
      "Checkbox.Background.Default.Dark": "#262b33",
-      "Checkbox.Background.Disabled": "#474B57",
-      "Checkbox.Background.Disabled.Dark": "#474B57",
+      "Checkbox.Background.Disabled": "#37373d",
+      "Checkbox.Background.Disabled.Dark": "#37373d",
      "Checkbox.Border.Default": "#404552",
      "Checkbox.Border.Default.Dark": "#404552",
      "Checkbox.Border.Disabled": "#D3DAE3",
@@ -994,7 +994,7 @@
      "Checkbox.Foreground.Selected.Dark": "#42A5F5",
      "Checkbox.Focus.Thin.Selected": "#D3DAE3",
      "Checkbox.Focus.Thin.Selected.Dark": "#D3DAE3",
-      "Objects.Grey": "#747C84",
+      "Objects.Grey": "#747c84",
      "Objects.Blue": "#7587A6",
      "Objects.RedStatus": "#CF6A4C",
      "Objects.Red": "#CF6A4C",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc
@@ -14,19 +14,19 @@
      "acceleratorSelectionForeground": "#8b9eb5",
      "background": "#2f343f",
      "borderColor": "#404552",
-      "disabledBackground": "#474B57",
+      "disabledBackground": "#37373d",
      "disabledForeground": "#D3DAE3",
      "disabledText": "#D3DAE3",
-      "focusColor": "#3F3F46",
+      "focusColor": "#393f4c",
      "focusedBorderColor": "#42A5F5",
      "foreground": "#D3DAE3",
-      "inactiveBackground": "#474B57",
+      "inactiveBackground": "#37373d",
      "inactiveForeground": "#8b9eb5",
      "infoForeground": "#8b9eb5",
-      "selectionBackground": "#8888FF",
-      "selectionBackgroundInactive": "#393f4c",
+      "selectionBackground": "#8888FF55",
+      "selectionBackgroundInactive": "#393f4c45",
      "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#393f4c",
+      "selectionInactiveBackground": "#393f4c45",
      "separatorColor": "#404552"
    },
    "activeCaption": "#2f343f",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#42A5F550"
    },
    "Autocomplete": {
-      "selectionBackground": "#8888FF"
+      "selectionBackground": "#8888FF55"
    },
    "Borders.ContrastBorderColor": "#2f343f",
    "Borders.color": "#404552",
@@ -60,7 +60,7 @@
      "disabledText": "#D3DAE3",
      "endBackground": "#383C4A",
      "endBorderColor": "#383C4A",
-      "focus": "#3F3F46",
+      "focus": "#393f4c",
      "focusedBorderColor": "#42A5F5",
      "foreground": "#8b9eb5",
      "highlight": "#FFFFFF",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#262b33",
-      "selectionBackground": "#8888FF"
+      "selectionBackground": "#8888FF55"
    },
    "CheckBox": {
      "background": "#2f343f",
@@ -95,14 +95,14 @@
      "disabledBackground": "#2f343f",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#D3DAE3",
      "AccessEnabled": {
        "accessDot": "#42A5F5",
-        "dropdownBorder": "#393f4c",
+        "dropdownBorder": "#393f4c45",
        "pillBackground": "$second"
      }
    },
@@ -125,14 +125,14 @@
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
      "modifiedItemForeground": "#42A5F5",
-      "nonEditableBackground": "#393f4c",
+      "nonEditableBackground": "#393f4c45",
      "padding": "5,5,5,5",
      "selectionBackground": "#41416A",
      "selectionForeground": "#FFFFFF"
    },
    "ComboPopup.border": "#404552",
    "CompletionPopup": {
-      "background": "#393f4c",
+      "background": "#393f4c45",
      "foreground": "#D3DAE3",
      "infoForeground": "#8b9eb5",
      "matchForeground": "#42A5F5",
@@ -141,14 +141,14 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#8b9eb5",
-      "selectionInactiveBackground": "#8888FF50",
-      "selectionBackground": "#8888FF80",
+      "selectionInactiveBackground": "#8888FF55",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#3F3F46",
+      "borderColor": "#393f4c",
      "disabledBorderColor": "#383C4A",
      "focusColor": "#42A5F5",
      "focusedBorderColor": "#42A5F5",
@@ -174,18 +174,18 @@
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#3F3F46",
-      "underlinedTabBackground": "#3F3F46"
+      "selectedBackground": "#393f4c",
+      "underlinedTabBackground": "#393f4c"
    },
    "DebuggerPopup": {
-      "borderColor": "#3F3F46"
+      "borderColor": "#393f4c"
    },
    "DefaultTabs": {
      "background": "#2f343f",
      "borderColor": "#2f343f",
      "hoverBackground": "#41416A",
      "hoverColor": "#2f343f",
-      "hoverMaskColor": "#3F3F46",
+      "hoverMaskColor": "#393f4c",
      "inactiveColoredTabBackground": "#2f343f",
      "inactiveColoredFileBackground": "#383C4A",
      "inactiveUnderlineColor": "#42A5F5",
@@ -213,14 +213,14 @@
      "foreground": "#D3DAE3",
      "inactiveBackground": "#2f343f",
      "inactiveForeground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
-      "borderColor": "#393f4c",
-      "hoverBackground": "#3F3F46",
-      "hoverColor": "#3F3F46",
-      "hoverMaskColor": "#3F3F46",
+      "borderColor": "#393f4c45",
+      "hoverBackground": "#393f4c",
+      "hoverColor": "#393f4c",
+      "hoverMaskColor": "#393f4c",
      "inactiveMaskColor": "#2f343f",
      "inactiveColoredFileBackground": "#2f343f",
      "inactiveUnderlineColor": "#D3DAE3",
@@ -232,9 +232,9 @@
    },
    "EditorGroupsTabs": {
      "background": "#2f343f",
-      "borderColor": "#393f4c",
-      "hoverBackground": "#3F3F46",
-      "hoverColor": "#3F3F46",
+      "borderColor": "#393f4c45",
+      "hoverBackground": "#393f4c",
+      "hoverColor": "#393f4c",
      "inactiveUnderlineColor": "#42A5F5",
      "underlineColor": "#42A5F5",
      "underlinedTabBackground": "#41416A",
@@ -243,7 +243,7 @@
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#474B57",
+      "Yellow": "#37373d",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -289,7 +289,7 @@
      "shortcutForeground": "#8b9eb5"
    },
    "Hyperlink.linkColor": "#42A5F5",
-    "inactiveCaption": "#393f4c",
+    "inactiveCaption": "#393f4c45",
    "inactiveCaptionBorder": "#2f343f",
    "inactiveCaptionText": "#8b9eb5",
    "info": "#8b9eb5",
@@ -323,14 +323,14 @@
    },
    "link.foreground": "#42A5F5",
    "List": {
-      "background": "#393f4c",
+      "background": "#393f4c45",
      "foreground": "#D3DAE3",
-      "hoverBackground": "#08507C70",
+      "hoverBackground": "#09477170",
      "hoverInactiveBackground": "#41416A",
-      "selectionBackground": "#8888FF50",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#08507C70"
+      "selectionInactiveBackground": "#09477170"
    },
    "material": {
      "background": "#2f343f",
@@ -345,20 +345,20 @@
      "tagColor": "#8b9eb5"
    },
    "MemoryIndicator": {
-      "allocatedBackground": "#393f4c",
-      "usedColor": "#3F3F46",
-      "usedBackground": "#3F3F46"
+      "allocatedBackground": "#393f4c45",
+      "usedColor": "#393f4c",
+      "usedBackground": "#393f4c"
    },
    "Menu": {
      "acceleratorForeground": "#8b9eb5",
      "acceleratorSelectionForeground": "#FFFFFF",
      "background": "#2f343f",
      "border": "4,2,4,2",
-      "borderColor": "#393f4c",
-      "disabledBackground": "#393f4c",
+      "borderColor": "#393f4c45",
+      "disabledBackground": "#393f4c45",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#404552"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
      "highlight": "#2f343f",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF",
      "shadow": "#2f343f"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#2f343f",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -433,9 +433,9 @@
      "foreground": "#D3DAE3"
    },
    "ParameterInfo": {
-      "background": "#393f4c",
+      "background": "#393f4c45",
      "borderColor": "#41416A",
-      "currentOverloadBackground": "#3F3F46",
+      "currentOverloadBackground": "#393f4c",
      "currentParameterForeground": "#42A5F5",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
@@ -454,19 +454,19 @@
    "Plugins": {
      "background": "#2f343f",
      "disabledForeground": "#D3DAE3",
-      "eapTagBackground": "#3F3F46",
-      "hoverBackground": "#08507C70",
+      "eapTagBackground": "#393f4c",
+      "hoverBackground": "#09477170",
      "lightSelectionBackground": "#41416A",
-      "paidTagBackground": "#3F3F46",
-      "selectionBackground": "#8888FF",
+      "paidTagBackground": "#393f4c",
+      "selectionBackground": "#8888FF55",
      "tagForeground": "#42A5F5",
-      "tagBackground": "#3F3F46",
-      "trialTagBackground": "#3F3F46",
+      "tagBackground": "#393f4c",
+      "trialTagBackground": "#393f4c",
      "Button": {
        "installBackground": "#383C4A",
        "installBorderColor": "#383C4A",
        "installForeground": "#D3DAE3",
-        "installFocusedBackground": "#3F3F46",
+        "installFocusedBackground": "#393f4c",
        "installFillForeground": "#D3DAE3",
        "installFillBackground": "#383C4A",
        "updateBackground": "#42A5F5",
@@ -478,7 +478,7 @@
        "borderColor": "#404552"
      },
      "SectionHeader": {
-        "background": "#393f4c",
+        "background": "#393f4c45",
        "foreground": "#D3DAE3"
      },
      "Tab": {
@@ -495,14 +495,14 @@
      },
      "borderColor": "#262b33",
      "inactiveBorderColor": "#2f343f",
-      "innerBorderColor": "#393f4c",
+      "innerBorderColor": "#393f4c45",
      "Header": {
        "activeBackground": "#2f343f",
        "inactiveBackground": "#262b33"
      },
      "paintBorder": true,
      "separatorForeground": "#D3DAE3",
-      "separatorColor": "#393f4c",
+      "separatorColor": "#393f4c45",
      "Toolbar": {
        "Floating.background": "#262b33",
        "background": "#262b33",
@@ -523,8 +523,8 @@
      "indeterminateEndColor": "#42A5F5",
      "indeterminateStartColor": "#42A5F5",
      "progressColor": "#42A5F5",
-      "selectionBackground": "#3F3F46",
-      "trackColor": "#3F3F46"
+      "selectionBackground": "#393f4c",
+      "trackColor": "#393f4c"
    },
    "PsiViewer": {
      "referenceHighlightColor": "#42A5F5"
@@ -541,7 +541,7 @@
      "disabledBackground": "#2f343f",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
-      "selectionBackground": "#8888FF",
+      "selectionBackground": "#8888FF55",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#404552",
@@ -566,7 +566,7 @@
          "trackColor": "#2f343f30"
        }
      },
-      "thumb": "#3F3F46",
+      "thumb": "#393f4c",
      "thumbBorderColor": "#42A5F570",
      "thumbColor": "#42A5F570",
      "trackColor": "#2f343f30",
@@ -599,7 +599,7 @@
      "Tab": {
        "active.foreground": "#FFFFFF",
        "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#3F3F46"
+        "selectedBackground": "#393f4c"
      }
    },
    "SearchMatch": {
@@ -617,9 +617,9 @@
      "Repeated.File.Foreground": "#D3DAE3"
    },
    "Separator": {
-      "background": "#393f4c",
-      "foreground": "#393f4c",
-      "separatorColor": "#393f4c"
+      "background": "#393f4c45",
+      "foreground": "#393f4c45",
+      "separatorColor": "#393f4c45"
    },
    "SidePanel": {
      "background": "#2f343f"
@@ -630,13 +630,13 @@
      "buttonColor": "#42A5F5",
      "foreground": "#D3DAE3",
      "majorTickLength": 6,
-      "tickColor": "#393f4c",
+      "tickColor": "#393f4c45",
      "trackColor": "#41416A",
      "trackWidth": 7,
      "thumb": "#42A5F5"
    },
    "SpeedSearch": {
-      "background": "#3F3F46",
+      "background": "#393f4c",
      "borderColor": "#404552",
      "foreground": "#D3DAE3",
      "errorForeground": "#D3DAE3"
@@ -651,15 +651,15 @@
      "background": "#2f343f",
      "highlight": "#2f343f"
    },
-    "SplitPaneDivider.draggingColor": "#393f4c",
+    "SplitPaneDivider.draggingColor": "#393f4c45",
    "StatusBar": {
      "borderColor": "#2f343f",
-      "hoverBackground": "#3F3F46",
+      "hoverBackground": "#393f4c",
      "LightEditBackground": "#41416A"
    },
    "TabbedPane": {
      "background": "#2f343f",
-      "contentAreaColor": "#3F3F46",
+      "contentAreaColor": "#393f4c",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#404552",
      "disabledForeground": "#D3DAE3",
@@ -669,7 +669,7 @@
      "fontSizeOffset": 0,
      "foreground": "#D3DAE3",
      "highlight": "#404552",
-      "hoverColor": "#3F3F46",
+      "hoverColor": "#393f4c",
      "labelShift": 0,
      "selectedForeground": "#FFFFFF",
      "selectedLabelShift": 0,
@@ -694,11 +694,11 @@
      "foreground": "#D3DAE3",
      "gridColor": "#2f343f",
      "highlightOuter": "#41416A",
-      "hoverBackground": "#08507C70",
+      "hoverBackground": "#09477170",
      "hoverInactiveBackground": "#41416A",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#8b9eb5",
-      "lightSelectionInactiveBackground": "#393f4c",
+      "lightSelectionInactiveBackground": "#393f4c45",
      "selectionBackground": "#41416A",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#41416A",
@@ -709,14 +709,14 @@
    "TableHeader": {
      "background": "#2f343f",
      "borderColor": "#2f343f",
-      "bottomSeparatorColor": "#393f4c",
+      "bottomSeparatorColor": "#393f4c45",
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#D3DAE3",
      "foreground": "#D3DAE3",
      "focusCellBackground": "#41416A",
      "focusCellForeground": "#FFFFFF",
      "height": 25,
-      "separatorColor": "#393f4c"
+      "separatorColor": "#393f4c45"
    },
    "text": "#8b9eb5",
    "textInactiveText": "#8b9eb5",
@@ -747,7 +747,7 @@
    },
    "TitlePane": {
      "background": "#262b33",
-      "Button.hoverBackground": "#3F3F46",
+      "Button.hoverBackground": "#393f4c",
      "inactiveBackground": "#2f343f",
      "infoForeground": "#8b9eb5",
      "inactiveInfoForeground": "#8b9eb5"
@@ -787,22 +787,22 @@
      },
      "Header": {
        "background": "#2f343f",
-        "borderColor": "#393f4c",
+        "borderColor": "#393f4c45",
        "inactiveBackground": "#2f343f"
      },
      "HeaderCloseButton": {
        "background": "#2f343f"
      },
      "HeaderTab": {
-        "borderColor": "#3F3F46",
-        "hoverBackground": "#3F3F46",
-        "hoverInactiveBackground": "#3F3F46",
+        "borderColor": "#393f4c",
+        "hoverBackground": "#393f4c",
+        "hoverInactiveBackground": "#393f4c",
        "inactiveUnderlineColor": "#42A5F5",
        "selectedBackground": "#262b33",
        "selectedInactiveBackground": "#262b33",
        "underlineColor": "#42A5F5",
        "underlinedTabBackground": "#41416A",
-        "underlinedTabInactiveBackground": "#393f4c",
+        "underlinedTabInactiveBackground": "#393f4c45",
        "underlinedTabForeground": "#FFFFFF",
        "underlinedTabInactiveForeground": "#D3DAE3"
      }
@@ -811,14 +811,14 @@
      "background": "#2f343f",
      "foreground": "#8b9eb5",
      "hash": "#404552",
-      "hoverBackground": "#08507C70",
+      "hoverBackground": "#09477170",
      "hoverInactiveBackground": "#41416A",
      "modifiedItemForeground": "#42A5F5",
      "rowHeight": 28,
-      "selectionBackground": "#08507C70",
+      "selectionBackground": "#09477170",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#08507C70",
+      "selectionInactiveBackground": "#09477170",
      "textBackground": "#2f343f"
    },
    "Tree.leftChildIndent": 10,
@@ -834,35 +834,35 @@
        "borderColor": "#404552",
        "background": "#2f343f",
        "foreground": "#D3DAE3",
-        "hoverBorderColor": "#3F3F46"
+        "hoverBorderColor": "#393f4c"
      },
      "Connector": {
        "borderColor": "#404552",
-        "hoverBorderColor": "#3F3F46"
+        "hoverBorderColor": "#393f4c"
      },
      "Canvas.background": "#262b33",
      "highStroke.foreground": "#D3DAE3",
      "Label.foreground": "#8b9eb5",
-      "List.selectionBackground": "#08507C70",
+      "List.selectionBackground": "#09477170",
      "motion": {
        "borderColor": "#404552",
        "Component.foreground": "#D3DAE3",
        "ConstraintSetText.foreground": "#8b9eb5",
-        "ConstraintSet.background": "#393f4c",
-        "CSPanel.SelectedFocusBackground": "#8888FF",
-        "CSPanel.SelectedBackground": "#08507C70",
+        "ConstraintSet.background": "#393f4c45",
+        "CSPanel.SelectedFocusBackground": "#8888FF55",
+        "CSPanel.SelectedBackground": "#09477170",
        "cs_FocusText.infoForeground": "#8b9eb5",
        "CursorTextColor.foreground": "#D3DAE3",
        "HoverColor.disabledBackground": "#D3DAE3",
        "motionGraph.background": "#2f343f",
        "Notification.background": "#262a33",
-        "ourAvg.background": "#393f4c",
-        "ourCS.background": "#393f4c",
+        "ourAvg.background": "#393f4c45",
+        "ourCS.background": "#393f4c45",
        "ourCS_Border.borderColor": "#404552",
        "ourCS_TextColor.foreground": "#8b9eb5",
        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#41416A",
-        "ourCS_SelectedBorder.pressedBorderColor": "#3F3F46",
+        "ourCS_SelectedBorder.pressedBorderColor": "#393f4c",
        "ourML_BarColor.separatorColor": "#404552",
        "PrimaryPanel.background": "#262b33",
        "SecondaryPanel.background": "#2f343f",
@@ -895,7 +895,7 @@
        "selectedBranchBackground": "#2f343f"
      },
      "GitCommits": {
-        "graphColor": "#3F3F46"
+        "graphColor": "#393f4c"
      },
      "GitLog": {
        "localBranchIconColor": "#42A5F5",
@@ -914,12 +914,12 @@
      },
      "Log": {
        "Commit.unmatchedForeground": "#8b9eb5",
-        "Commit.currentBranchBackground": "#393f4c",
-        "Commit.hoveredBackground": "#08507C70"
+        "Commit.currentBranchBackground": "#393f4c45",
+        "Commit.hoveredBackground": "#09477170"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
-        "backgroundBase": "#3F3F46"
+        "backgroundBase": "#393f4c"
      }
    },
    "Viewport": {
@@ -939,13 +939,13 @@
      "headerForeground": "#D3DAE3",
      "List.background": "#262b33",
      "separatorColor": "#404552",
-      "SidePanel.background": "#393f4c",
+      "SidePanel.background": "#393f4c45",
      "Projects": {
        "actions.background": "#262b33",
-        "actions.selectionBackground": "#3F3F46",
-        "background": "#393f4c",
-        "selectionBackground": "#8888FF",
-        "selectionInactiveBackground": "#393f4c"
+        "actions.selectionBackground": "#393f4c",
+        "background": "#393f4c45",
+        "selectionBackground": "#8888FF55",
+        "selectionInactiveBackground": "#393f4c45"
      }
    },
    "window": "#2f343f",
@@ -968,14 +968,14 @@
      "Actions.Blue": "#7587A6",
      "Actions.Green": "#8F9D6A",
      "Actions.Grey": "#8b9eb5",
-      "Actions.GreyInline": "#747C84",
+      "Actions.GreyInline": "#747c84",
      "Actions.GreyInline.Dark": "#D3DAE3",
      "Actions.Red": "#CF6A4C",
      "Actions.Yellow": "#F9EE98",
      "Checkbox.Background.Default": "#262b33",
      "Checkbox.Background.Default.Dark": "#262b33",
-      "Checkbox.Background.Disabled": "#474B57",
-      "Checkbox.Background.Disabled.Dark": "#474B57",
+      "Checkbox.Background.Disabled": "#37373d",
+      "Checkbox.Background.Disabled.Dark": "#37373d",
      "Checkbox.Border.Default": "#404552",
      "Checkbox.Border.Default.Dark": "#404552",
      "Checkbox.Border.Disabled": "#D3DAE3",
@@ -994,7 +994,7 @@
      "Checkbox.Foreground.Selected.Dark": "#42A5F5",
      "Checkbox.Focus.Thin.Selected": "#D3DAE3",
      "Checkbox.Focus.Thin.Selected.Dark": "#D3DAE3",
-      "Objects.Grey": "#747C84",
+      "Objects.Grey": "#747c84",
      "Objects.Blue": "#7587A6",
      "Objects.RedStatus": "#CF6A4C",
      "Objects.Red": "#CF6A4C",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
@@ -23,7 +23,7 @@
      "inactiveBackground": "#3c4150",
      "inactiveForeground": "#979FAD",
      "infoForeground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionBackgroundInactive": "#2F333D",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#2F333D",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#2979ff50"
    },
    "Autocomplete": {
-      "selectionBackground": "#3A3F4B"
+      "selectionBackground": "#4D515D"
    },
    "Borders.ContrastBorderColor": "#282C34",
    "Borders.color": "#282C34",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#21252B",
-      "selectionBackground": "#3A3F4B"
+      "selectionBackground": "#4D515D"
    },
    "CheckBox": {
      "background": "#282C34",
@@ -95,7 +95,7 @@
      "disabledBackground": "#282C34",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#979FAD",
-      "selectionInactiveBackground": "#3A3F4B50",
-      "selectionBackground": "#3A3F4B80",
+      "selectionInactiveBackground": "#4D515D",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -166,7 +166,7 @@
      "Variables": {
        "collectingDataForeground": "#979FAD",
        "changedValueForeground": "#2979ff",
-        "errorMessageForeground": "#F07178",
+        "errorMessageForeground": "#e06c75",
        "evaluatingExpressionForeground": "#979FAD",
        "exceptionForeground": "#E5C17C",
        "modifyingValueForeground": "#2979ff",
@@ -213,7 +213,7 @@
      "foreground": "#979FAD",
      "inactiveBackground": "#282C34",
      "inactiveForeground": "#6B727D",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#2F333D",
      "foreground": "#979FAD",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "hoverInactiveBackground": "#383E49",
-      "selectionBackground": "#3A3F4B50",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B70"
+      "selectionInactiveBackground": "#3A3F4B80"
    },
    "material": {
      "background": "#282C34",
@@ -358,7 +358,7 @@
      "disabledBackground": "#2F333D",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#282C34"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
      "highlight": "#282C34",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "shadow": "#21252B"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#282C34",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#282C34",
      "disabledForeground": "#6B727D",
      "eapTagBackground": "#383D48",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "lightSelectionBackground": "#383E49",
      "paidTagBackground": "#383D48",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "tagForeground": "#2979ff",
      "tagBackground": "#383D48",
      "trialTagBackground": "#383D48",
@@ -541,7 +541,7 @@
      "disabledBackground": "#282C34",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#282C34",
@@ -694,7 +694,7 @@
      "foreground": "#979FAD",
      "gridColor": "#282C34",
      "highlightOuter": "#383E49",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "hoverInactiveBackground": "#383E49",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#979FAD",
@@ -811,14 +811,14 @@
      "background": "#21252B",
      "foreground": "#979FAD",
      "hash": "#282C34",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "hoverInactiveBackground": "#383E49",
      "modifiedItemForeground": "#2979ff",
      "rowHeight": 28,
-      "selectionBackground": "#3A3F4B70",
+      "selectionBackground": "#3A3F4B80",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B70",
+      "selectionInactiveBackground": "#3A3F4B80",
      "textBackground": "#21252B"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#21252B",
      "highStroke.foreground": "#979FAD",
      "Label.foreground": "#979FAD",
-      "List.selectionBackground": "#3A3F4B70",
+      "List.selectionBackground": "#3A3F4B80",
      "motion": {
        "borderColor": "#282C34",
        "Component.foreground": "#979FAD",
        "ConstraintSetText.foreground": "#979FAD",
        "ConstraintSet.background": "#2F333D",
-        "CSPanel.SelectedFocusBackground": "#3A3F4B",
-        "CSPanel.SelectedBackground": "#3A3F4B70",
+        "CSPanel.SelectedFocusBackground": "#4D515D",
+        "CSPanel.SelectedBackground": "#3A3F4B80",
        "cs_FocusText.infoForeground": "#979FAD",
        "CursorTextColor.foreground": "#979FAD",
        "HoverColor.disabledBackground": "#6B727D",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#979FAD",
        "Commit.currentBranchBackground": "#2F333D",
-        "Commit.hoveredBackground": "#3A3F4B70"
+        "Commit.hoveredBackground": "#3A3F4B80"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#21252B",
        "actions.selectionBackground": "#383D48",
        "background": "#2F333D",
-        "selectionBackground": "#3A3F4B",
+        "selectionBackground": "#4D515D",
        "selectionInactiveBackground": "#2F333D"
      }
    },
@@ -970,7 +970,7 @@
      "Actions.Grey": "#979FAD",
      "Actions.GreyInline": "#59626F",
      "Actions.GreyInline.Dark": "#979FAD",
-      "Actions.Red": "#F07178",
+      "Actions.Red": "#e06c75",
      "Actions.Yellow": "#E5C17C",
      "Checkbox.Background.Default": "#21252B",
      "Checkbox.Background.Default.Dark": "#21252B",
@@ -996,8 +996,8 @@
      "Checkbox.Focus.Thin.Selected.Dark": "#979FAD",
      "Objects.Grey": "#59626F",
      "Objects.Blue": "#61AEEF",
-      "Objects.RedStatus": "#F07178",
-      "Objects.Red": "#F07178",
+      "Objects.RedStatus": "#e06c75",
+      "Objects.Red": "#e06c75",
      "Objects.Pink": "#C679DD",
      "Objects.Yellow": "#E5C17C",
      "Objects.Green": "#98C379",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
@@ -23,7 +23,7 @@
      "inactiveBackground": "#3c4150",
      "inactiveForeground": "#979FAD",
      "infoForeground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionBackgroundInactive": "#2F333D",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#2F333D",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#2979ff50"
    },
    "Autocomplete": {
-      "selectionBackground": "#3A3F4B"
+      "selectionBackground": "#4D515D"
    },
    "Borders.ContrastBorderColor": "#282C34",
    "Borders.color": "#282C34",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#21252B",
-      "selectionBackground": "#3A3F4B"
+      "selectionBackground": "#4D515D"
    },
    "CheckBox": {
      "background": "#282C34",
@@ -95,7 +95,7 @@
      "disabledBackground": "#282C34",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#979FAD",
-      "selectionInactiveBackground": "#3A3F4B50",
-      "selectionBackground": "#3A3F4B80",
+      "selectionInactiveBackground": "#4D515D",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -166,7 +166,7 @@
      "Variables": {
        "collectingDataForeground": "#979FAD",
        "changedValueForeground": "#2979ff",
-        "errorMessageForeground": "#F07178",
+        "errorMessageForeground": "#e06c75",
        "evaluatingExpressionForeground": "#979FAD",
        "exceptionForeground": "#E5C17C",
        "modifyingValueForeground": "#2979ff",
@@ -213,7 +213,7 @@
      "foreground": "#979FAD",
      "inactiveBackground": "#282C34",
      "inactiveForeground": "#6B727D",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#2F333D",
      "foreground": "#979FAD",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "hoverInactiveBackground": "#383E49",
-      "selectionBackground": "#3A3F4B50",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B70"
+      "selectionInactiveBackground": "#3A3F4B80"
    },
    "material": {
      "background": "#282C34",
@@ -358,7 +358,7 @@
      "disabledBackground": "#2F333D",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#282C34"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
      "highlight": "#282C34",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF",
      "shadow": "#282C34"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#282C34",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#282C34",
      "disabledForeground": "#6B727D",
      "eapTagBackground": "#383D48",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "lightSelectionBackground": "#383E49",
      "paidTagBackground": "#383D48",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "tagForeground": "#2979ff",
      "tagBackground": "#383D48",
      "trialTagBackground": "#383D48",
@@ -541,7 +541,7 @@
      "disabledBackground": "#282C34",
      "disabledForeground": "#6B727D",
      "foreground": "#979FAD",
-      "selectionBackground": "#3A3F4B",
+      "selectionBackground": "#4D515D",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#282C34",
@@ -694,7 +694,7 @@
      "foreground": "#979FAD",
      "gridColor": "#282C34",
      "highlightOuter": "#383E49",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "hoverInactiveBackground": "#383E49",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#979FAD",
@@ -811,14 +811,14 @@
      "background": "#282C34",
      "foreground": "#979FAD",
      "hash": "#282C34",
-      "hoverBackground": "#3A3F4B70",
+      "hoverBackground": "#3A3F4B80",
      "hoverInactiveBackground": "#383E49",
      "modifiedItemForeground": "#2979ff",
      "rowHeight": 28,
-      "selectionBackground": "#3A3F4B70",
+      "selectionBackground": "#3A3F4B80",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B70",
+      "selectionInactiveBackground": "#3A3F4B80",
      "textBackground": "#282C34"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#21252B",
      "highStroke.foreground": "#979FAD",
      "Label.foreground": "#979FAD",
-      "List.selectionBackground": "#3A3F4B70",
+      "List.selectionBackground": "#3A3F4B80",
      "motion": {
        "borderColor": "#282C34",
        "Component.foreground": "#979FAD",
        "ConstraintSetText.foreground": "#979FAD",
        "ConstraintSet.background": "#2F333D",
-        "CSPanel.SelectedFocusBackground": "#3A3F4B",
-        "CSPanel.SelectedBackground": "#3A3F4B70",
+        "CSPanel.SelectedFocusBackground": "#4D515D",
+        "CSPanel.SelectedBackground": "#3A3F4B80",
        "cs_FocusText.infoForeground": "#979FAD",
        "CursorTextColor.foreground": "#979FAD",
        "HoverColor.disabledBackground": "#6B727D",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#979FAD",
        "Commit.currentBranchBackground": "#2F333D",
-        "Commit.hoveredBackground": "#3A3F4B70"
+        "Commit.hoveredBackground": "#3A3F4B80"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#21252B",
        "actions.selectionBackground": "#383D48",
        "background": "#2F333D",
-        "selectionBackground": "#3A3F4B",
+        "selectionBackground": "#4D515D",
        "selectionInactiveBackground": "#2F333D"
      }
    },
@@ -970,7 +970,7 @@
      "Actions.Grey": "#979FAD",
      "Actions.GreyInline": "#59626F",
      "Actions.GreyInline.Dark": "#979FAD",
-      "Actions.Red": "#F07178",
+      "Actions.Red": "#e06c75",
      "Actions.Yellow": "#E5C17C",
      "Checkbox.Background.Default": "#21252B",
      "Checkbox.Background.Default.Dark": "#21252B",
@@ -996,8 +996,8 @@
      "Checkbox.Focus.Thin.Selected.Dark": "#979FAD",
      "Objects.Grey": "#59626F",
      "Objects.Blue": "#61AEEF",
-      "Objects.RedStatus": "#F07178",
-      "Objects.Red": "#F07178",
+      "Objects.RedStatus": "#e06c75",
+      "Objects.Red": "#e06c75",
      "Objects.Pink": "#C679DD",
      "Objects.Yellow": "#E5C17C",
      "Objects.Green": "#98C379",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula
@@ -14,29 +14,29 @@
      "acceleratorSelectionForeground": "#6272A4",
      "background": "#282A36",
      "borderColor": "#21222C",
-      "disabledBackground": "#34353D",
+      "disabledBackground": "#313341",
      "disabledForeground": "#6272A4",
      "disabledText": "#6272A4",
-      "focusColor": "#44475a",
-      "focusedBorderColor": "#9580ff",
+      "focusColor": "#6272A4",
+      "focusedBorderColor": "#FF79C5",
      "foreground": "#F8F8F2",
-      "inactiveBackground": "#34353D",
+      "inactiveBackground": "#313341",
      "inactiveForeground": "#6272A4",
      "infoForeground": "#6272A4",
      "selectionBackground": "#44475A",
      "selectionBackgroundInactive": "#282A36",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "selectionInactiveBackground": "#282A36",
      "separatorColor": "#21222C"
    },
    "activeCaption": "#282A36",
    "ActionButton": {
-      "hoverBackground": "#9580ff50",
-      "hoverBorderColor": "#9580ff50",
+      "hoverBackground": "#FF79C550",
+      "hoverBorderColor": "#FF79C550",
      "hoverSeparatorColor": "#393C4B",
-      "focusedBorderColor": "#9580ff50",
-      "pressedBackground": "#9580ff50",
-      "pressedBorderColor": "#9580ff50"
+      "focusedBorderColor": "#FF79C550",
+      "pressedBackground": "#FF79C550",
+      "pressedBorderColor": "#FF79C550"
    },
    "Autocomplete": {
      "selectionBackground": "#44475A"
@@ -49,9 +49,9 @@
      "default": {
        "endBackground": "#44475A",
        "endBorderColor": "#44475A",
-        "foreground": "#8BE9FD",
-        "focusColor": "#9580ff",
-        "focusedBorderColor": "#9580ff",
+        "foreground": "#FFFFFF",
+        "focusColor": "#FF79C5",
+        "focusedBorderColor": "#FF79C5",
        "shadowColor": "#44475A",
        "startBackground": "#44475A",
        "startBorderColor": "#44475A"
@@ -60,13 +60,13 @@
      "disabledText": "#6272A4",
      "endBackground": "#393C4B",
      "endBorderColor": "#393C4B",
-      "focus": "#44475a",
-      "focusedBorderColor": "#9580ff",
+      "focus": "#6272A4",
+      "focusedBorderColor": "#FF79C5",
      "foreground": "#6272A4",
-      "highlight": "#FFFFFF",
+      "highlight": "#8BE9FD",
      "mt.background": "#393C4B",
      "mt.foreground": "#6272A4",
-      "mt.selectedForeground": "#FFFFFF",
+      "mt.selectedForeground": "#8BE9FD",
      "mt.selection.color1": "#44475A",
      "mt.selection.color2": "#44475A",
      "startBackground": "#393C4B",
@@ -86,7 +86,7 @@
      "background": "#282A36",
      "disabledText": "#6272A4",
      "foreground": "#F8F8F2",
-      "select": "#9580ff"
+      "select": "#FF79C5"
    },
    "CheckBoxMenuItem": {
      "acceleratorForeground": "#6272A4",
@@ -96,12 +96,12 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#F8F8F2",
      "AccessEnabled": {
-        "accessDot": "#9580ff",
+        "accessDot": "#FF79C5",
        "dropdownBorder": "#282A36",
        "pillBackground": "$second"
      }
@@ -121,78 +121,78 @@
      },
      "background": "#191A21",
      "buttonBackground": "#393C4B",
-      "darcula.hoveredArrowButtonForeground": "#9580ff",
+      "darcula.hoveredArrowButtonForeground": "#FF79C5",
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
-      "modifiedItemForeground": "#9580ff",
+      "modifiedItemForeground": "#FF79C5",
      "nonEditableBackground": "#282A36",
      "padding": "5,5,5,5",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "ComboPopup.border": "#21222C",
    "CompletionPopup": {
      "background": "#282A36",
      "foreground": "#F8F8F2",
      "infoForeground": "#6272A4",
-      "matchForeground": "#9580ff",
-      "matchSelectionForeground": "#9580ff",
+      "matchForeground": "#FF79C5",
+      "matchSelectionForeground": "#FF79C5",
      "nonFocusedState": "false",
-      "selectedGrayedForeground": "#FFFFFF",
-      "selectionGrayForeground": "#FFFFFF",
+      "selectedGrayedForeground": "#8BE9FD",
+      "selectionGrayForeground": "#8BE9FD",
      "selectionInactiveInfoForeground": "#6272A4",
-      "selectionInactiveBackground": "#44475A50",
-      "selectionBackground": "#44475A80",
-      "selectionForeground": "#FFFFFF",
-      "selectionInfoForeground": "#FFFFFF"
+      "selectionInactiveBackground": "#44475A",
+      "selectionBackground": "#44475A",
+      "selectionForeground": "#8BE9FD",
+      "selectionInfoForeground": "#8BE9FD"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#44475a",
+      "borderColor": "#6272A4",
      "disabledBorderColor": "#393C4B",
-      "focusColor": "#9580ff",
-      "focusedBorderColor": "#9580ff",
-      "hoverIconColor": "#9580ff",
+      "focusColor": "#FF79C5",
+      "focusedBorderColor": "#FF79C5",
+      "hoverIconColor": "#FF79C5",
      "infoForeground": "#6272A4",
      "iconColor": "#F8F8F2"
    },
    "control": "#282A36",
    "controlText": "#6272A4",
    "Counter": {
-      "background": "#9580ff",
-      "foreground": "#FFFFFF"
+      "background": "#FF79C5",
+      "foreground": "#8BE9FD"
    },
    "Debugger": {
      "Variables": {
        "collectingDataForeground": "#6272A4",
-        "changedValueForeground": "#9580ff",
-        "errorMessageForeground": "#8BE9FD",
+        "changedValueForeground": "#FF79C5",
+        "errorMessageForeground": "#f780bf",
        "evaluatingExpressionForeground": "#6272A4",
-        "exceptionForeground": "#50FA7B",
-        "modifyingValueForeground": "#9580ff",
-        "valueForeground": "#9580ff"
+        "exceptionForeground": "#8aff80",
+        "modifyingValueForeground": "#FF79C5",
+        "valueForeground": "#FF79C5"
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#44475a",
-      "underlinedTabBackground": "#44475a"
+      "selectedBackground": "#6272A4",
+      "underlinedTabBackground": "#6272A4"
    },
    "DebuggerPopup": {
-      "borderColor": "#44475a"
+      "borderColor": "#6272A4"
    },
    "DefaultTabs": {
      "background": "#282A36",
      "borderColor": "#282A36",
      "hoverBackground": "#44475A",
      "hoverColor": "#191A21",
-      "hoverMaskColor": "#44475a",
+      "hoverMaskColor": "#6272A4",
      "inactiveColoredTabBackground": "#282A36",
      "inactiveColoredFileBackground": "#393C4B",
-      "inactiveUnderlineColor": "#9580ff",
+      "inactiveUnderlineColor": "#FF79C5",
      "inactiveMaskColor": "#191A21",
-      "underlineColor": "#9580ff",
+      "underlineColor": "#FF79C5",
      "underlinedTabBackground": "#44475A",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#8BE9FD"
    },
    "Desktop.background": "#282A36",
    "DialogWrapper.southPanelBackground": "#282A36",
@@ -209,41 +209,41 @@
    },
    "EditorPane": {
      "background": "#191A21",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveBackground": "#282A36",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
      "borderColor": "#282A36",
-      "hoverBackground": "#44475a",
-      "hoverColor": "#44475a",
-      "hoverMaskColor": "#44475a",
+      "hoverBackground": "#6272A4",
+      "hoverColor": "#6272A4",
+      "hoverMaskColor": "#6272A4",
      "inactiveMaskColor": "#282A36",
      "inactiveColoredFileBackground": "#282A36",
      "inactiveUnderlineColor": "#6272A4",
      "selectedForeground": "#F8F8F2",
      "selectedBackground": "#44475A",
-      "underlineColor": "#9580ff",
+      "underlineColor": "#FF79C5",
      "underlinedTabBackground": "#44475A",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#8BE9FD"
    },
    "EditorGroupsTabs": {
      "background": "#282A36",
      "borderColor": "#282A36",
-      "hoverBackground": "#44475a",
-      "hoverColor": "#44475a",
-      "inactiveUnderlineColor": "#9580ff",
-      "underlineColor": "#9580ff",
+      "hoverBackground": "#6272A4",
+      "hoverColor": "#6272A4",
+      "inactiveUnderlineColor": "#FF79C5",
+      "underlineColor": "#FF79C5",
      "underlinedTabBackground": "#44475A",
      "underlinedTabForeground": "#F8F8F2"
    },
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#34353D",
+      "Yellow": "#313341",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -261,11 +261,11 @@
    "Focus.color": "#21222C",
    "FormattedTextField": {
      "background": "#191A21",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveBackground": "#393C4B",
      "inactiveForeground": "#6272A4",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
      "selectionBackground": "#44475A"
    },
    "GotItTooltip.borderColor": "#1D2228",
@@ -288,7 +288,7 @@
      "infoForeground": "#6272A4",
      "shortcutForeground": "#6272A4"
    },
-    "Hyperlink.linkColor": "#9580ff",
+    "Hyperlink.linkColor": "#FF79C5",
    "inactiveCaption": "#282A36",
    "inactiveCaptionBorder": "#282A36",
    "inactiveCaptionText": "#6272A4",
@@ -311,26 +311,26 @@
      "disabledText": "#6272A4",
      "foreground": "#F8F8F2",
      "infoForeground": "#6272A4",
-      "selectedForeground": "#8BE9FD",
+      "selectedForeground": "#FFFFFF",
      "selectedDisabledForeground": "#F8F8F2"
    },
    "Link": {
-      "activeForeground": "#9580ff",
-      "hoverForeground": "#9580ff",
-      "pressedForeground": "#9580ff",
+      "activeForeground": "#FF79C5",
+      "hoverForeground": "#FF79C5",
+      "pressedForeground": "#FF79C5",
      "secondaryForeground": "#6272A4",
-      "visitedForeground": "#9580ff"
+      "visitedForeground": "#FF79C5"
    },
-    "link.foreground": "#9580ff",
+    "link.foreground": "#FF79C5",
    "List": {
      "background": "#282A36",
      "foreground": "#F8F8F2",
-      "hoverBackground": "#44475A70",
+      "hoverBackground": "#44475A50",
      "hoverInactiveBackground": "#44475A",
-      "selectionBackground": "#44475A50",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#8BE9FD",
-      "selectionInactiveBackground": "#44475A70"
+      "selectionBackground": "#44475A",
+      "selectionForeground": "#8BE9FD",
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#44475A50"
    },
    "material": {
      "background": "#282A36",
@@ -339,19 +339,19 @@
      "foreground": "#F8F8F2",
      "mergeCommits": "#393C4B",
      "primaryColor": "#6272A4",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "tab.backgroundColor": "#282A36",
-      "tab.borderColor": "#9580ff",
+      "tab.borderColor": "#FF79C5",
      "tagColor": "#6272A4"
    },
    "MemoryIndicator": {
      "allocatedBackground": "#282A36",
-      "usedColor": "#44475a",
-      "usedBackground": "#44475a"
+      "usedColor": "#6272A4",
+      "usedBackground": "#6272A4"
    },
    "Menu": {
      "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#8BE9FD",
      "background": "#282A36",
      "border": "4,2,4,2",
      "borderColor": "#282A36",
@@ -359,7 +359,7 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "separatorColor": "#21222C"
    },
    "MenuBar": {
@@ -370,19 +370,19 @@
      "foreground": "#F8F8F2",
      "highlight": "#282A36",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "shadow": "#191A21"
    },
    "MenuItem": {
      "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#8BE9FD",
      "border": "4,2,4,2",
      "background": "#282A36",
      "disabledBackground": "#282A36",
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#8BE9FD"
    },
    "NavBar": {
      "arrowColor": "#F8F8F2",
@@ -396,7 +396,7 @@
        "background": "#191A21"
      }
    },
-    "NewPSD.warning": "#9580ff",
+    "NewPSD.warning": "#FF79C5",
    "Notification": {
      "background": "#1D2228",
      "borderColor": "#1D2228",
@@ -425,7 +425,7 @@
    },
    "Outline": {
      "color": "#393C4B",
-      "focusedColor": "#9580ff",
+      "focusedColor": "#FF79C5",
      "disabledColor": "#6272A4"
    },
    "Panel": {
@@ -435,8 +435,8 @@
    "ParameterInfo": {
      "background": "#282A36",
      "borderColor": "#44475A",
-      "currentOverloadBackground": "#44475a",
-      "currentParameterForeground": "#9580ff",
+      "currentOverloadBackground": "#6272A4",
+      "currentParameterForeground": "#FF79C5",
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "infoForeground": "#6272A4",
@@ -444,32 +444,32 @@
    },
    "PasswordField": {
      "background": "#191A21",
-      "capsLockIconColor": "#9580ff",
-      "caretForeground": "#9580ff",
+      "capsLockIconColor": "#FF79C5",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "Plugins": {
      "background": "#282A36",
      "disabledForeground": "#6272A4",
-      "eapTagBackground": "#44475a",
-      "hoverBackground": "#44475A70",
+      "eapTagBackground": "#6272A4",
+      "hoverBackground": "#44475A50",
      "lightSelectionBackground": "#44475A",
-      "paidTagBackground": "#44475a",
+      "paidTagBackground": "#6272A4",
      "selectionBackground": "#44475A",
-      "tagForeground": "#9580ff",
-      "tagBackground": "#44475a",
-      "trialTagBackground": "#44475a",
+      "tagForeground": "#FF79C5",
+      "tagBackground": "#6272A4",
+      "trialTagBackground": "#6272A4",
      "Button": {
        "installBackground": "#393C4B",
        "installBorderColor": "#393C4B",
        "installForeground": "#F8F8F2",
-        "installFocusedBackground": "#44475a",
+        "installFocusedBackground": "#6272A4",
        "installFillForeground": "#6272A4",
        "installFillBackground": "#393C4B",
-        "updateBackground": "#9580ff",
+        "updateBackground": "#FF79C5",
        "updateBorderColor": "#393C4B",
        "updateForeground": "#F8F8F2"
      },
@@ -483,7 +483,7 @@
      },
      "Tab": {
        "hoverBackground": "#44475A",
-        "selectedForeground": "#FFFFFF",
+        "selectedForeground": "#8BE9FD",
        "selectedBackground": "#44475A"
      }
    },
@@ -491,7 +491,7 @@
      "Advertiser": {
        "background": "#282A36",
        "borderColor": "#282A36",
-        "foreground": "#9580ff"
+        "foreground": "#FF79C5"
      },
      "borderColor": "#191A21",
      "inactiveBorderColor": "#282A36",
@@ -519,15 +519,15 @@
    "PopupMenuSeparator.stripeIndent": 5,
    "ProgressBar": {
      "background": "#282A36",
-      "foreground": "#9580ff",
-      "indeterminateEndColor": "#9580ff",
-      "indeterminateStartColor": "#9580ff",
-      "progressColor": "#9580ff",
-      "selectionBackground": "#44475a",
-      "trackColor": "#44475a"
+      "foreground": "#FF79C5",
+      "indeterminateEndColor": "#FF79C5",
+      "indeterminateStartColor": "#FF79C5",
+      "progressColor": "#FF79C5",
+      "selectionBackground": "#6272A4",
+      "trackColor": "#6272A4"
    },
    "PsiViewer": {
-      "referenceHighlightColor": "#9580ff"
+      "referenceHighlightColor": "#FF79C5"
    },
    "RadioButton": {
      "background": "#282A36",
@@ -542,40 +542,40 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#8BE9FD"
    },
    "ScreenView.borderColor": "#21222C",
    "ScrollBar": {
      "background": "#282A36",
-      "hoverThumbBorderColor": "#9580ff",
-      "hoverThumbColor": "#9580ff",
+      "hoverThumbBorderColor": "#FF79C5",
+      "hoverThumbColor": "#FF79C5",
      "hoverTrackColor": "#282A3630",
      "Mac": {
-        "hoverThumbBorderColor": "#9580ff",
-        "hoverThumbColor": "#9580ff",
+        "hoverThumbBorderColor": "#FF79C5",
+        "hoverThumbColor": "#FF79C5",
        "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#9580ff70",
-        "thumbColor": "#9580ff70",
+        "thumbBorderColor": "#FF79C570",
+        "thumbColor": "#FF79C570",
        "trackColor": "#282A3630",
        "Transparent": {
-          "hoverThumbBorderColor": "#9580ff",
-          "hoverThumbColor": "#9580ff",
+          "hoverThumbBorderColor": "#FF79C5",
+          "hoverThumbColor": "#FF79C5",
          "hoverTrackColor": "#282A3630",
-          "thumbBorderColor": "#9580ff70",
-          "thumbColor": "#9580ff70",
+          "thumbBorderColor": "#FF79C570",
+          "thumbColor": "#FF79C570",
          "trackColor": "#282A3630"
        }
      },
-      "thumb": "#44475a",
-      "thumbBorderColor": "#9580ff70",
-      "thumbColor": "#9580ff70",
+      "thumb": "#6272A4",
+      "thumbBorderColor": "#FF79C570",
+      "thumbColor": "#FF79C570",
      "trackColor": "#282A3630",
      "Transparent": {
-        "hoverThumbBorderColor": "#9580ff",
-        "hoverThumbColor": "#9580ff",
+        "hoverThumbBorderColor": "#FF79C5",
+        "hoverThumbColor": "#FF79C5",
        "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#9580ff70",
-        "thumbColor": "#9580ff70",
+        "thumbBorderColor": "#FF79C570",
+        "thumbColor": "#FF79C570",
        "trackColor": "#282A3630"
      }
    },
@@ -597,16 +597,16 @@
        "infoForeground": "#6272A4"
      },
      "Tab": {
-        "active.foreground": "#8BE9FD",
-        "selectedForeground": "#8BE9FD",
-        "selectedBackground": "#44475a"
+        "active.foreground": "#FFFFFF",
+        "selectedForeground": "#FFFFFF",
+        "selectedBackground": "#6272A4"
      }
    },
    "SearchMatch": {
-      "endBackground": "#9580ff",
-      "startBackground": "#9580ff",
-      "endColor": "#9580ff",
-      "startColor": "#9580ff"
+      "endBackground": "#FF79C5",
+      "startBackground": "#FF79C5",
+      "endColor": "#FF79C5",
+      "startColor": "#FF79C5"
    },
    "SearchField.errorBackground": "#1D2228",
    "SearchOption": {
@@ -626,17 +626,17 @@
    },
    "Slider": {
      "background": "#282A36",
-      "buttonBorderColor": "#9580ff",
-      "buttonColor": "#9580ff",
+      "buttonBorderColor": "#FF79C5",
+      "buttonColor": "#FF79C5",
      "foreground": "#F8F8F2",
      "majorTickLength": 6,
      "tickColor": "#282A36",
      "trackColor": "#44475A",
      "trackWidth": 7,
-      "thumb": "#9580ff"
+      "thumb": "#FF79C5"
    },
    "SpeedSearch": {
-      "background": "#44475a",
+      "background": "#6272A4",
      "borderColor": "#21222C",
      "foreground": "#F8F8F2",
      "errorForeground": "#F8F8F2"
@@ -645,7 +645,7 @@
      "background": "#282A36",
      "border": "3,3,3,3",
      "foreground": "#F8F8F2",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "SplitPane": {
      "background": "#282A36",
@@ -654,12 +654,12 @@
    "SplitPaneDivider.draggingColor": "#282A36",
    "StatusBar": {
      "borderColor": "#282A36",
-      "hoverBackground": "#44475a",
+      "hoverBackground": "#6272A4",
      "LightEditBackground": "#44475A"
    },
    "TabbedPane": {
      "background": "#282A36",
-      "contentAreaColor": "#44475a",
+      "contentAreaColor": "#6272A4",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#21222C",
      "disabledForeground": "#6272A4",
@@ -669,16 +669,16 @@
      "fontSizeOffset": 0,
      "foreground": "#F8F8F2",
      "highlight": "#21222C",
-      "hoverColor": "#44475a",
+      "hoverColor": "#6272A4",
      "labelShift": 0,
-      "selectedForeground": "#8BE9FD",
+      "selectedForeground": "#FFFFFF",
      "selectedLabelShift": 0,
      "selectedTabPadInsets": "0,0,0,0",
      "tabsOverlapBorder": true,
      "tabHeight": 32,
      "tabInsets": "5,10,5,10",
      "tabSelectionHeight": 2,
-      "underlineColor": "#9580ff"
+      "underlineColor": "#FF79C5"
    },
    "TabbedPane.mt.tab.background": "#191A21",
    "Table": {
@@ -687,22 +687,22 @@
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
      "disabledForeground": "#6272A4",
-      "dropLineColor": "#9580ff",
-      "dropLineShortColor": "#9580ff",
+      "dropLineColor": "#FF79C5",
+      "dropLineShortColor": "#FF79C5",
      "focusCellBackground": "#44475A",
-      "focusCellForeground": "#8BE9FD",
+      "focusCellForeground": "#FFFFFF",
      "foreground": "#F8F8F2",
      "gridColor": "#282A36",
      "highlightOuter": "#44475A",
-      "hoverBackground": "#44475A70",
+      "hoverBackground": "#44475A50",
      "hoverInactiveBackground": "#44475A",
-      "lightSelectionForeground": "#8BE9FD",
+      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#6272A4",
      "lightSelectionInactiveBackground": "#282A36",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#44475A",
-      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#8BE9FD",
      "sortIconColor": "#F8F8F2",
      "stripeColor": "#191A21"
    },
@@ -714,7 +714,7 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "focusCellBackground": "#44475A",
-      "focusCellForeground": "#8BE9FD",
+      "focusCellForeground": "#FFFFFF",
      "height": 25,
      "separatorColor": "#282A36"
    },
@@ -723,31 +723,31 @@
    "textText": "#6272A4",
    "TextArea": {
      "background": "#191A21",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "TextField": {
      "background": "#191A21",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "TextPane": {
      "background": "#191A21",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "TitlePane": {
      "background": "#191A21",
-      "Button.hoverBackground": "#44475a",
+      "Button.hoverBackground": "#6272A4",
      "inactiveBackground": "#282A36",
      "infoForeground": "#6272A4",
      "inactiveInfoForeground": "#6272A4"
@@ -760,8 +760,8 @@
      "foreground": "#F8F8F2",
      "offForeground": "#282A36",
      "offBackground": "#282A36",
-      "onBackground": "#9580ff",
-      "onForeground": "#9580ff"
+      "onBackground": "#FF79C5",
+      "onForeground": "#FF79C5"
    },
    "ToolBar": {
      "background": "#191A21",
@@ -782,7 +782,7 @@
    "ToolWindow": {
      "Button": {
        "hoverBackground": "#44475A",
-        "selectedForeground": "#8BE9FD",
+        "selectedForeground": "#FFFFFF",
        "selectedBackground": "#191A21"
      },
      "Header": {
@@ -794,16 +794,16 @@
        "background": "#282A36"
      },
      "HeaderTab": {
-        "borderColor": "#44475a",
-        "hoverBackground": "#44475a",
-        "hoverInactiveBackground": "#44475a",
-        "inactiveUnderlineColor": "#9580ff",
+        "borderColor": "#6272A4",
+        "hoverBackground": "#6272A4",
+        "hoverInactiveBackground": "#6272A4",
+        "inactiveUnderlineColor": "#FF79C5",
        "selectedBackground": "#191A21",
        "selectedInactiveBackground": "#191A21",
-        "underlineColor": "#9580ff",
+        "underlineColor": "#FF79C5",
        "underlinedTabBackground": "#44475A",
        "underlinedTabInactiveBackground": "#282A36",
-        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabForeground": "#8BE9FD",
        "underlinedTabInactiveForeground": "#F8F8F2"
      }
    },
@@ -811,14 +811,14 @@
      "background": "#191A21",
      "foreground": "#6272A4",
      "hash": "#21222C",
-      "hoverBackground": "#44475A70",
+      "hoverBackground": "#44475A50",
      "hoverInactiveBackground": "#44475A",
-      "modifiedItemForeground": "#9580ff",
+      "modifiedItemForeground": "#FF79C5",
      "rowHeight": 28,
-      "selectionBackground": "#44475A70",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#44475A70",
+      "selectionBackground": "#44475A50",
+      "selectionForeground": "#8BE9FD",
+      "selectionInactiveForeground": "#8BE9FD",
+      "selectionInactiveBackground": "#44475A50",
      "textBackground": "#191A21"
    },
    "Tree.leftChildIndent": 10,
@@ -834,23 +834,23 @@
        "borderColor": "#21222C",
        "background": "#282A36",
        "foreground": "#F8F8F2",
-        "hoverBorderColor": "#44475a"
+        "hoverBorderColor": "#6272A4"
      },
      "Connector": {
        "borderColor": "#21222C",
-        "hoverBorderColor": "#44475a"
+        "hoverBorderColor": "#6272A4"
      },
      "Canvas.background": "#191A21",
      "highStroke.foreground": "#F8F8F2",
      "Label.foreground": "#6272A4",
-      "List.selectionBackground": "#44475A70",
+      "List.selectionBackground": "#44475A50",
      "motion": {
        "borderColor": "#21222C",
        "Component.foreground": "#F8F8F2",
        "ConstraintSetText.foreground": "#6272A4",
        "ConstraintSet.background": "#282A36",
        "CSPanel.SelectedFocusBackground": "#44475A",
-        "CSPanel.SelectedBackground": "#44475A70",
+        "CSPanel.SelectedBackground": "#44475A50",
        "cs_FocusText.infoForeground": "#6272A4",
        "CursorTextColor.foreground": "#F8F8F2",
        "HoverColor.disabledBackground": "#6272A4",
@@ -860,9 +860,9 @@
        "ourCS.background": "#282A36",
        "ourCS_Border.borderColor": "#21222C",
        "ourCS_TextColor.foreground": "#6272A4",
-        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#8BE9FD",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#44475A",
-        "ourCS_SelectedBorder.pressedBorderColor": "#44475a",
+        "ourCS_SelectedBorder.pressedBorderColor": "#6272A4",
        "ourML_BarColor.separatorColor": "#21222C",
        "PrimaryPanel.background": "#191A21",
        "SecondaryPanel.background": "#282A36",
@@ -879,7 +879,7 @@
        "background": "#282A36",
        "borderColor": "#21222C",
        "foreground": "#F8F8F2",
-        "selectedForeground": "#FFFFFF"
+        "selectedForeground": "#8BE9FD"
      },
      "Preview.background": "#282A36",
      "stroke.acceleratorForeground": "#6272A4"
@@ -895,17 +895,17 @@
        "selectedBranchBackground": "#282A36"
      },
      "GitCommits": {
-        "graphColor": "#44475a"
+        "graphColor": "#6272A4"
      },
      "GitLog": {
-        "localBranchIconColor": "#9580ff",
+        "localBranchIconColor": "#FF79C5",
        "otherIconColor": "#6272A4",
        "remoteBranchIconColor": "#F8F8F2",
        "tagIconColor": "#6272A4"
      },
      "HgLog": {
-        "branchIconColor": "#9580ff",
-        "bookmarkIconColor": "#8BE9FD",
+        "branchIconColor": "#FF79C5",
+        "bookmarkIconColor": "#FFFFFF",
        "closedBranchIconColor": "#6272A4",
        "localTagIconColor": "#6272A4",
        "mqTagIconColor": "#6272A4",
@@ -915,11 +915,11 @@
      "Log": {
        "Commit.unmatchedForeground": "#6272A4",
        "Commit.currentBranchBackground": "#282A36",
-        "Commit.hoveredBackground": "#44475A70"
+        "Commit.hoveredBackground": "#44475A50"
      },
      "RefLabel": {
-        "foreground": "#8BE9FD",
-        "backgroundBase": "#44475a"
+        "foreground": "#FFFFFF",
+        "backgroundBase": "#6272A4"
      }
    },
    "Viewport": {
@@ -942,7 +942,7 @@
      "SidePanel.background": "#282A36",
      "Projects": {
        "actions.background": "#191A21",
-        "actions.selectionBackground": "#44475a",
+        "actions.selectionBackground": "#6272A4",
        "background": "#282A36",
        "selectionBackground": "#44475A",
        "selectionInactiveBackground": "#282A36"
@@ -958,53 +958,53 @@
      "#43494A": "#191A21",
      "#6B6B6B": "#6272A4",
      "#A7A7A7": "#282A36",
-      "#3D6185": "#9580ff",
-      "#466D94": "#9580ff",
+      "#3D6185": "#FF79C5",
+      "#466D94": "#FF79C5",
      "#3C3F41": "#282A36",
      "#545556": "#6272A4",
      "#606060": "#6272A4",
      "#9AA7B0": "#F8F8F2",
-      "#675133": "#9580ff",
-      "Actions.Blue": "#50FA78",
-      "Actions.Green": "#F1FA8C",
+      "#675133": "#FF79C5",
+      "Actions.Blue": "#8aff80",
+      "Actions.Green": "#feff80",
      "Actions.Grey": "#6272A4",
      "Actions.GreyInline": "#6272A4",
      "Actions.GreyInline.Dark": "#F8F8F2",
-      "Actions.Red": "#8BE9FD",
-      "Actions.Yellow": "#50FA7B",
+      "Actions.Red": "#f780bf",
+      "Actions.Yellow": "#8aff80",
      "Checkbox.Background.Default": "#191A21",
      "Checkbox.Background.Default.Dark": "#191A21",
-      "Checkbox.Background.Disabled": "#34353D",
-      "Checkbox.Background.Disabled.Dark": "#34353D",
+      "Checkbox.Background.Disabled": "#313341",
+      "Checkbox.Background.Disabled.Dark": "#313341",
      "Checkbox.Border.Default": "#21222C",
      "Checkbox.Border.Default.Dark": "#21222C",
      "Checkbox.Border.Disabled": "#6272A4",
      "Checkbox.Border.Disabled.Dark": "#6272A4",
-      "Checkbox.Focus.Thin.Default": "#9580ff",
-      "Checkbox.Focus.Thin.Default.Dark": "#9580ff",
-      "Checkbox.Focus.Wide": "#9580ff",
-      "Checkbox.Focus.Wide.Dark": "#9580ff",
+      "Checkbox.Focus.Thin.Default": "#FF79C5",
+      "Checkbox.Focus.Thin.Default.Dark": "#FF79C5",
+      "Checkbox.Focus.Wide": "#FF79C5",
+      "Checkbox.Focus.Wide.Dark": "#FF79C5",
      "Checkbox.Foreground.Disabled": "#6272A4",
      "Checkbox.Foreground.Disabled.Dark": "#6272A4",
-      "Checkbox.Background.Selected": "#9580ff",
+      "Checkbox.Background.Selected": "#FF79C5",
      "Checkbox.Background.Selected.Dark": "#282A36",
-      "Checkbox.Border.Selected": "#9580ff",
-      "Checkbox.Border.Selected.Dark": "#9580ff",
-      "Checkbox.Foreground.Selected": "#9580ff",
-      "Checkbox.Foreground.Selected.Dark": "#9580ff",
+      "Checkbox.Border.Selected": "#FF79C5",
+      "Checkbox.Border.Selected.Dark": "#FF79C5",
+      "Checkbox.Foreground.Selected": "#FF79C5",
+      "Checkbox.Foreground.Selected.Dark": "#FF79C5",
      "Checkbox.Focus.Thin.Selected": "#F8F8F2",
      "Checkbox.Focus.Thin.Selected.Dark": "#F8F8F2",
      "Objects.Grey": "#6272A4",
-      "Objects.Blue": "#50FA78",
-      "Objects.RedStatus": "#8BE9FD",
-      "Objects.Red": "#8BE9FD",
-      "Objects.Pink": "#FF79C6",
-      "Objects.Yellow": "#50FA7B",
-      "Objects.Green": "#F1FA8C",
-      "Objects.Purple": "#FF79C6",
+      "Objects.Blue": "#8aff80",
+      "Objects.RedStatus": "#f780bf",
+      "Objects.Red": "#f780bf",
+      "Objects.Pink": "#f780bf",
+      "Objects.Yellow": "#8aff80",
+      "Objects.Green": "#feff80",
+      "Objects.Purple": "#f780bf",
      "Objects.BlackText": "#F8F8F2",
-      "Objects.YellowDark": "#BD93F9",
-      "Objects.GreenAndroid": "#F1FA8C"
+      "Objects.YellowDark": "#9580ff",
+      "Objects.GreenAndroid": "#feff80"
    }
  }
 }
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json
@@ -14,29 +14,29 @@
      "acceleratorSelectionForeground": "#6272A4",
      "background": "#282A36",
      "borderColor": "#21222C",
-      "disabledBackground": "#34353D",
+      "disabledBackground": "#313341",
      "disabledForeground": "#6272A4",
      "disabledText": "#6272A4",
-      "focusColor": "#44475a",
-      "focusedBorderColor": "#9580ff",
+      "focusColor": "#6272A4",
+      "focusedBorderColor": "#FF79C5",
      "foreground": "#F8F8F2",
-      "inactiveBackground": "#34353D",
+      "inactiveBackground": "#313341",
      "inactiveForeground": "#6272A4",
      "infoForeground": "#6272A4",
      "selectionBackground": "#44475A",
      "selectionBackgroundInactive": "#282A36",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "selectionInactiveBackground": "#282A36",
      "separatorColor": "#21222C"
    },
    "activeCaption": "#282A36",
    "ActionButton": {
-      "hoverBackground": "#9580ff50",
-      "hoverBorderColor": "#9580ff50",
+      "hoverBackground": "#FF79C550",
+      "hoverBorderColor": "#FF79C550",
      "hoverSeparatorColor": "#393C4B",
-      "focusedBorderColor": "#9580ff50",
-      "pressedBackground": "#9580ff50",
-      "pressedBorderColor": "#9580ff50"
+      "focusedBorderColor": "#FF79C550",
+      "pressedBackground": "#FF79C550",
+      "pressedBorderColor": "#FF79C550"
    },
    "Autocomplete": {
      "selectionBackground": "#44475A"
@@ -49,9 +49,9 @@
      "default": {
        "endBackground": "#44475A",
        "endBorderColor": "#44475A",
-        "foreground": "#8BE9FD",
-        "focusColor": "#9580ff",
-        "focusedBorderColor": "#9580ff",
+        "foreground": "#FFFFFF",
+        "focusColor": "#FF79C5",
+        "focusedBorderColor": "#FF79C5",
        "shadowColor": "#44475A",
        "startBackground": "#44475A",
        "startBorderColor": "#44475A"
@@ -60,13 +60,13 @@
      "disabledText": "#6272A4",
      "endBackground": "#393C4B",
      "endBorderColor": "#393C4B",
-      "focus": "#44475a",
-      "focusedBorderColor": "#9580ff",
+      "focus": "#6272A4",
+      "focusedBorderColor": "#FF79C5",
      "foreground": "#6272A4",
-      "highlight": "#FFFFFF",
+      "highlight": "#8BE9FD",
      "mt.background": "#393C4B",
      "mt.foreground": "#6272A4",
-      "mt.selectedForeground": "#FFFFFF",
+      "mt.selectedForeground": "#8BE9FD",
      "mt.selection.color1": "#44475A",
      "mt.selection.color2": "#44475A",
      "startBackground": "#393C4B",
@@ -86,7 +86,7 @@
      "background": "#282A36",
      "disabledText": "#6272A4",
      "foreground": "#F8F8F2",
-      "select": "#9580ff"
+      "select": "#FF79C5"
    },
    "CheckBoxMenuItem": {
      "acceleratorForeground": "#6272A4",
@@ -96,12 +96,12 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#F8F8F2",
      "AccessEnabled": {
-        "accessDot": "#9580ff",
+        "accessDot": "#FF79C5",
        "dropdownBorder": "#282A36",
        "pillBackground": "$second"
      }
@@ -121,78 +121,78 @@
      },
      "background": "#282A36",
      "buttonBackground": "#393C4B",
-      "darcula.hoveredArrowButtonForeground": "#9580ff",
+      "darcula.hoveredArrowButtonForeground": "#FF79C5",
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
-      "modifiedItemForeground": "#9580ff",
+      "modifiedItemForeground": "#FF79C5",
      "nonEditableBackground": "#282A36",
      "padding": "5,5,5,5",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "ComboPopup.border": "#21222C",
    "CompletionPopup": {
      "background": "#282A36",
      "foreground": "#F8F8F2",
      "infoForeground": "#6272A4",
-      "matchForeground": "#9580ff",
-      "matchSelectionForeground": "#9580ff",
+      "matchForeground": "#FF79C5",
+      "matchSelectionForeground": "#FF79C5",
      "nonFocusedState": "false",
-      "selectedGrayedForeground": "#FFFFFF",
-      "selectionGrayForeground": "#FFFFFF",
+      "selectedGrayedForeground": "#8BE9FD",
+      "selectionGrayForeground": "#8BE9FD",
      "selectionInactiveInfoForeground": "#6272A4",
-      "selectionInactiveBackground": "#44475A50",
-      "selectionBackground": "#44475A80",
-      "selectionForeground": "#FFFFFF",
-      "selectionInfoForeground": "#FFFFFF"
+      "selectionInactiveBackground": "#44475A",
+      "selectionBackground": "#44475A",
+      "selectionForeground": "#8BE9FD",
+      "selectionInfoForeground": "#8BE9FD"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#44475a",
+      "borderColor": "#6272A4",
      "disabledBorderColor": "#393C4B",
-      "focusColor": "#9580ff",
-      "focusedBorderColor": "#9580ff",
-      "hoverIconColor": "#9580ff",
+      "focusColor": "#FF79C5",
+      "focusedBorderColor": "#FF79C5",
+      "hoverIconColor": "#FF79C5",
      "infoForeground": "#6272A4",
      "iconColor": "#F8F8F2"
    },
    "control": "#282A36",
    "controlText": "#6272A4",
    "Counter": {
-      "background": "#9580ff",
-      "foreground": "#FFFFFF"
+      "background": "#FF79C5",
+      "foreground": "#8BE9FD"
    },
    "Debugger": {
      "Variables": {
        "collectingDataForeground": "#6272A4",
-        "changedValueForeground": "#9580ff",
-        "errorMessageForeground": "#8BE9FD",
+        "changedValueForeground": "#FF79C5",
+        "errorMessageForeground": "#f780bf",
        "evaluatingExpressionForeground": "#6272A4",
-        "exceptionForeground": "#50FA7B",
-        "modifyingValueForeground": "#9580ff",
-        "valueForeground": "#9580ff"
+        "exceptionForeground": "#8aff80",
+        "modifyingValueForeground": "#FF79C5",
+        "valueForeground": "#FF79C5"
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#44475a",
-      "underlinedTabBackground": "#44475a"
+      "selectedBackground": "#6272A4",
+      "underlinedTabBackground": "#6272A4"
    },
    "DebuggerPopup": {
-      "borderColor": "#44475a"
+      "borderColor": "#6272A4"
    },
    "DefaultTabs": {
      "background": "#282A36",
      "borderColor": "#282A36",
      "hoverBackground": "#44475A",
      "hoverColor": "#282A36",
-      "hoverMaskColor": "#44475a",
+      "hoverMaskColor": "#6272A4",
      "inactiveColoredTabBackground": "#282A36",
      "inactiveColoredFileBackground": "#393C4B",
-      "inactiveUnderlineColor": "#9580ff",
+      "inactiveUnderlineColor": "#FF79C5",
      "inactiveMaskColor": "#282A36",
-      "underlineColor": "#9580ff",
+      "underlineColor": "#FF79C5",
      "underlinedTabBackground": "#44475A",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#8BE9FD"
    },
    "Desktop.background": "#282A36",
    "DialogWrapper.southPanelBackground": "#282A36",
@@ -209,41 +209,41 @@
    },
    "EditorPane": {
      "background": "#282A36",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveBackground": "#282A36",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
      "borderColor": "#282A36",
-      "hoverBackground": "#44475a",
-      "hoverColor": "#44475a",
-      "hoverMaskColor": "#44475a",
+      "hoverBackground": "#6272A4",
+      "hoverColor": "#6272A4",
+      "hoverMaskColor": "#6272A4",
      "inactiveMaskColor": "#282A36",
      "inactiveColoredFileBackground": "#282A36",
      "inactiveUnderlineColor": "#6272A4",
      "selectedForeground": "#F8F8F2",
      "selectedBackground": "#44475A",
-      "underlineColor": "#9580ff",
+      "underlineColor": "#FF79C5",
      "underlinedTabBackground": "#44475A",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#8BE9FD"
    },
    "EditorGroupsTabs": {
      "background": "#282A36",
      "borderColor": "#282A36",
-      "hoverBackground": "#44475a",
-      "hoverColor": "#44475a",
-      "inactiveUnderlineColor": "#9580ff",
-      "underlineColor": "#9580ff",
+      "hoverBackground": "#6272A4",
+      "hoverColor": "#6272A4",
+      "inactiveUnderlineColor": "#FF79C5",
+      "underlineColor": "#FF79C5",
      "underlinedTabBackground": "#44475A",
      "underlinedTabForeground": "#F8F8F2"
    },
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#34353D",
+      "Yellow": "#313341",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -261,11 +261,11 @@
    "Focus.color": "#21222C",
    "FormattedTextField": {
      "background": "#282A36",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveBackground": "#393C4B",
      "inactiveForeground": "#6272A4",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
      "selectionBackground": "#44475A"
    },
    "GotItTooltip.borderColor": "#1D2228",
@@ -288,7 +288,7 @@
      "infoForeground": "#6272A4",
      "shortcutForeground": "#6272A4"
    },
-    "Hyperlink.linkColor": "#9580ff",
+    "Hyperlink.linkColor": "#FF79C5",
    "inactiveCaption": "#282A36",
    "inactiveCaptionBorder": "#282A36",
    "inactiveCaptionText": "#6272A4",
@@ -311,26 +311,26 @@
      "disabledText": "#6272A4",
      "foreground": "#F8F8F2",
      "infoForeground": "#6272A4",
-      "selectedForeground": "#8BE9FD",
+      "selectedForeground": "#FFFFFF",
      "selectedDisabledForeground": "#F8F8F2"
    },
    "Link": {
-      "activeForeground": "#9580ff",
-      "hoverForeground": "#9580ff",
-      "pressedForeground": "#9580ff",
+      "activeForeground": "#FF79C5",
+      "hoverForeground": "#FF79C5",
+      "pressedForeground": "#FF79C5",
      "secondaryForeground": "#6272A4",
-      "visitedForeground": "#9580ff"
+      "visitedForeground": "#FF79C5"
    },
-    "link.foreground": "#9580ff",
+    "link.foreground": "#FF79C5",
    "List": {
      "background": "#282A36",
      "foreground": "#F8F8F2",
-      "hoverBackground": "#44475A70",
+      "hoverBackground": "#44475A50",
      "hoverInactiveBackground": "#44475A",
-      "selectionBackground": "#44475A50",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#8BE9FD",
-      "selectionInactiveBackground": "#44475A70"
+      "selectionBackground": "#44475A",
+      "selectionForeground": "#8BE9FD",
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#44475A50"
    },
    "material": {
      "background": "#282A36",
@@ -339,19 +339,19 @@
      "foreground": "#F8F8F2",
      "mergeCommits": "#393C4B",
      "primaryColor": "#6272A4",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "tab.backgroundColor": "#282A36",
-      "tab.borderColor": "#9580ff",
+      "tab.borderColor": "#FF79C5",
      "tagColor": "#6272A4"
    },
    "MemoryIndicator": {
      "allocatedBackground": "#282A36",
-      "usedColor": "#44475a",
-      "usedBackground": "#44475a"
+      "usedColor": "#6272A4",
+      "usedBackground": "#6272A4"
    },
    "Menu": {
      "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#8BE9FD",
      "background": "#282A36",
      "border": "4,2,4,2",
      "borderColor": "#282A36",
@@ -359,7 +359,7 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "separatorColor": "#21222C"
    },
    "MenuBar": {
@@ -370,19 +370,19 @@
      "foreground": "#F8F8F2",
      "highlight": "#282A36",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#8BE9FD",
      "shadow": "#282A36"
    },
    "MenuItem": {
      "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#8BE9FD",
      "border": "4,2,4,2",
      "background": "#282A36",
      "disabledBackground": "#282A36",
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#8BE9FD"
    },
    "NavBar": {
      "arrowColor": "#F8F8F2",
@@ -396,7 +396,7 @@
        "background": "#282A36"
      }
    },
-    "NewPSD.warning": "#9580ff",
+    "NewPSD.warning": "#FF79C5",
    "Notification": {
      "background": "#1D2228",
      "borderColor": "#1D2228",
@@ -425,7 +425,7 @@
    },
    "Outline": {
      "color": "#393C4B",
-      "focusedColor": "#9580ff",
+      "focusedColor": "#FF79C5",
      "disabledColor": "#6272A4"
    },
    "Panel": {
@@ -435,8 +435,8 @@
    "ParameterInfo": {
      "background": "#282A36",
      "borderColor": "#44475A",
-      "currentOverloadBackground": "#44475a",
-      "currentParameterForeground": "#9580ff",
+      "currentOverloadBackground": "#6272A4",
+      "currentParameterForeground": "#FF79C5",
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "infoForeground": "#6272A4",
@@ -444,32 +444,32 @@
    },
    "PasswordField": {
      "background": "#282A36",
-      "capsLockIconColor": "#9580ff",
-      "caretForeground": "#9580ff",
+      "capsLockIconColor": "#FF79C5",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "Plugins": {
      "background": "#282A36",
      "disabledForeground": "#6272A4",
-      "eapTagBackground": "#44475a",
-      "hoverBackground": "#44475A70",
+      "eapTagBackground": "#6272A4",
+      "hoverBackground": "#44475A50",
      "lightSelectionBackground": "#44475A",
-      "paidTagBackground": "#44475a",
+      "paidTagBackground": "#6272A4",
      "selectionBackground": "#44475A",
-      "tagForeground": "#9580ff",
-      "tagBackground": "#44475a",
-      "trialTagBackground": "#44475a",
+      "tagForeground": "#FF79C5",
+      "tagBackground": "#6272A4",
+      "trialTagBackground": "#6272A4",
      "Button": {
        "installBackground": "#393C4B",
        "installBorderColor": "#393C4B",
        "installForeground": "#F8F8F2",
-        "installFocusedBackground": "#44475a",
+        "installFocusedBackground": "#6272A4",
        "installFillForeground": "#6272A4",
        "installFillBackground": "#393C4B",
-        "updateBackground": "#9580ff",
+        "updateBackground": "#FF79C5",
        "updateBorderColor": "#393C4B",
        "updateForeground": "#F8F8F2"
      },
@@ -483,7 +483,7 @@
      },
      "Tab": {
        "hoverBackground": "#44475A",
-        "selectedForeground": "#FFFFFF",
+        "selectedForeground": "#8BE9FD",
        "selectedBackground": "#44475A"
      }
    },
@@ -491,7 +491,7 @@
      "Advertiser": {
        "background": "#282A36",
        "borderColor": "#282A36",
-        "foreground": "#9580ff"
+        "foreground": "#FF79C5"
      },
      "borderColor": "#191A21",
      "inactiveBorderColor": "#282A36",
@@ -519,15 +519,15 @@
    "PopupMenuSeparator.stripeIndent": 5,
    "ProgressBar": {
      "background": "#282A36",
-      "foreground": "#9580ff",
-      "indeterminateEndColor": "#9580ff",
-      "indeterminateStartColor": "#9580ff",
-      "progressColor": "#9580ff",
-      "selectionBackground": "#44475a",
-      "trackColor": "#44475a"
+      "foreground": "#FF79C5",
+      "indeterminateEndColor": "#FF79C5",
+      "indeterminateStartColor": "#FF79C5",
+      "progressColor": "#FF79C5",
+      "selectionBackground": "#6272A4",
+      "trackColor": "#6272A4"
    },
    "PsiViewer": {
-      "referenceHighlightColor": "#9580ff"
+      "referenceHighlightColor": "#FF79C5"
    },
    "RadioButton": {
      "background": "#282A36",
@@ -542,40 +542,40 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#8BE9FD"
    },
    "ScreenView.borderColor": "#21222C",
    "ScrollBar": {
      "background": "#282A36",
-      "hoverThumbBorderColor": "#9580ff",
-      "hoverThumbColor": "#9580ff",
+      "hoverThumbBorderColor": "#FF79C5",
+      "hoverThumbColor": "#FF79C5",
      "hoverTrackColor": "#282A3630",
      "Mac": {
-        "hoverThumbBorderColor": "#9580ff",
-        "hoverThumbColor": "#9580ff",
+        "hoverThumbBorderColor": "#FF79C5",
+        "hoverThumbColor": "#FF79C5",
        "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#9580ff70",
-        "thumbColor": "#9580ff70",
+        "thumbBorderColor": "#FF79C570",
+        "thumbColor": "#FF79C570",
        "trackColor": "#282A3630",
        "Transparent": {
-          "hoverThumbBorderColor": "#9580ff",
-          "hoverThumbColor": "#9580ff",
+          "hoverThumbBorderColor": "#FF79C5",
+          "hoverThumbColor": "#FF79C5",
          "hoverTrackColor": "#282A3630",
-          "thumbBorderColor": "#9580ff70",
-          "thumbColor": "#9580ff70",
+          "thumbBorderColor": "#FF79C570",
+          "thumbColor": "#FF79C570",
          "trackColor": "#282A3630"
        }
      },
-      "thumb": "#44475a",
-      "thumbBorderColor": "#9580ff70",
-      "thumbColor": "#9580ff70",
+      "thumb": "#6272A4",
+      "thumbBorderColor": "#FF79C570",
+      "thumbColor": "#FF79C570",
      "trackColor": "#282A3630",
      "Transparent": {
-        "hoverThumbBorderColor": "#9580ff",
-        "hoverThumbColor": "#9580ff",
+        "hoverThumbBorderColor": "#FF79C5",
+        "hoverThumbColor": "#FF79C5",
        "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#9580ff70",
-        "thumbColor": "#9580ff70",
+        "thumbBorderColor": "#FF79C570",
+        "thumbColor": "#FF79C570",
        "trackColor": "#282A3630"
      }
    },
@@ -597,16 +597,16 @@
        "infoForeground": "#6272A4"
      },
      "Tab": {
-        "active.foreground": "#8BE9FD",
-        "selectedForeground": "#8BE9FD",
-        "selectedBackground": "#44475a"
+        "active.foreground": "#FFFFFF",
+        "selectedForeground": "#FFFFFF",
+        "selectedBackground": "#6272A4"
      }
    },
    "SearchMatch": {
-      "endBackground": "#9580ff",
-      "startBackground": "#9580ff",
-      "endColor": "#9580ff",
-      "startColor": "#9580ff"
+      "endBackground": "#FF79C5",
+      "startBackground": "#FF79C5",
+      "endColor": "#FF79C5",
+      "startColor": "#FF79C5"
    },
    "SearchField.errorBackground": "#1D2228",
    "SearchOption": {
@@ -626,17 +626,17 @@
    },
    "Slider": {
      "background": "#282A36",
-      "buttonBorderColor": "#9580ff",
-      "buttonColor": "#9580ff",
+      "buttonBorderColor": "#FF79C5",
+      "buttonColor": "#FF79C5",
      "foreground": "#F8F8F2",
      "majorTickLength": 6,
      "tickColor": "#282A36",
      "trackColor": "#44475A",
      "trackWidth": 7,
-      "thumb": "#9580ff"
+      "thumb": "#FF79C5"
    },
    "SpeedSearch": {
-      "background": "#44475a",
+      "background": "#6272A4",
      "borderColor": "#21222C",
      "foreground": "#F8F8F2",
      "errorForeground": "#F8F8F2"
@@ -645,7 +645,7 @@
      "background": "#282A36",
      "border": "3,3,3,3",
      "foreground": "#F8F8F2",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "SplitPane": {
      "background": "#282A36",
@@ -654,12 +654,12 @@
    "SplitPaneDivider.draggingColor": "#282A36",
    "StatusBar": {
      "borderColor": "#282A36",
-      "hoverBackground": "#44475a",
+      "hoverBackground": "#6272A4",
      "LightEditBackground": "#44475A"
    },
    "TabbedPane": {
      "background": "#282A36",
-      "contentAreaColor": "#44475a",
+      "contentAreaColor": "#6272A4",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#21222C",
      "disabledForeground": "#6272A4",
@@ -669,16 +669,16 @@
      "fontSizeOffset": 0,
      "foreground": "#F8F8F2",
      "highlight": "#21222C",
-      "hoverColor": "#44475a",
+      "hoverColor": "#6272A4",
      "labelShift": 0,
-      "selectedForeground": "#8BE9FD",
+      "selectedForeground": "#FFFFFF",
      "selectedLabelShift": 0,
      "selectedTabPadInsets": "0,0,0,0",
      "tabsOverlapBorder": true,
      "tabHeight": 32,
      "tabInsets": "5,10,5,10",
      "tabSelectionHeight": 2,
-      "underlineColor": "#9580ff"
+      "underlineColor": "#FF79C5"
    },
    "TabbedPane.mt.tab.background": "#282A36",
    "Table": {
@@ -687,22 +687,22 @@
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
      "disabledForeground": "#6272A4",
-      "dropLineColor": "#9580ff",
-      "dropLineShortColor": "#9580ff",
+      "dropLineColor": "#FF79C5",
+      "dropLineShortColor": "#FF79C5",
      "focusCellBackground": "#44475A",
-      "focusCellForeground": "#8BE9FD",
+      "focusCellForeground": "#FFFFFF",
      "foreground": "#F8F8F2",
      "gridColor": "#282A36",
      "highlightOuter": "#44475A",
-      "hoverBackground": "#44475A70",
+      "hoverBackground": "#44475A50",
      "hoverInactiveBackground": "#44475A",
-      "lightSelectionForeground": "#8BE9FD",
+      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#6272A4",
      "lightSelectionInactiveBackground": "#282A36",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#44475A",
-      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#8BE9FD",
      "sortIconColor": "#F8F8F2",
      "stripeColor": "#191A21"
    },
@@ -714,7 +714,7 @@
      "disabledForeground": "#6272A4",
      "foreground": "#F8F8F2",
      "focusCellBackground": "#44475A",
-      "focusCellForeground": "#8BE9FD",
+      "focusCellForeground": "#FFFFFF",
      "height": 25,
      "separatorColor": "#282A36"
    },
@@ -723,31 +723,31 @@
    "textText": "#6272A4",
    "TextArea": {
      "background": "#282A36",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "TextField": {
      "background": "#282A36",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "TextPane": {
      "background": "#282A36",
-      "caretForeground": "#9580ff",
+      "caretForeground": "#FF79C5",
      "foreground": "#F8F8F2",
      "inactiveForeground": "#6272A4",
      "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
    },
    "TitlePane": {
      "background": "#191A21",
-      "Button.hoverBackground": "#44475a",
+      "Button.hoverBackground": "#6272A4",
      "inactiveBackground": "#282A36",
      "infoForeground": "#6272A4",
      "inactiveInfoForeground": "#6272A4"
@@ -760,8 +760,8 @@
      "foreground": "#F8F8F2",
      "offForeground": "#282A36",
      "offBackground": "#282A36",
-      "onBackground": "#9580ff",
-      "onForeground": "#9580ff"
+      "onBackground": "#FF79C5",
+      "onForeground": "#FF79C5"
    },
    "ToolBar": {
      "background": "#282A36",
@@ -782,7 +782,7 @@
    "ToolWindow": {
      "Button": {
        "hoverBackground": "#44475A",
-        "selectedForeground": "#8BE9FD",
+        "selectedForeground": "#FFFFFF",
        "selectedBackground": "#191A21"
      },
      "Header": {
@@ -794,16 +794,16 @@
        "background": "#282A36"
      },
      "HeaderTab": {
-        "borderColor": "#44475a",
-        "hoverBackground": "#44475a",
-        "hoverInactiveBackground": "#44475a",
-        "inactiveUnderlineColor": "#9580ff",
+        "borderColor": "#6272A4",
+        "hoverBackground": "#6272A4",
+        "hoverInactiveBackground": "#6272A4",
+        "inactiveUnderlineColor": "#FF79C5",
        "selectedBackground": "#191A21",
        "selectedInactiveBackground": "#191A21",
-        "underlineColor": "#9580ff",
+        "underlineColor": "#FF79C5",
        "underlinedTabBackground": "#44475A",
        "underlinedTabInactiveBackground": "#282A36",
-        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabForeground": "#8BE9FD",
        "underlinedTabInactiveForeground": "#F8F8F2"
      }
    },
@@ -811,14 +811,14 @@
      "background": "#282A36",
      "foreground": "#6272A4",
      "hash": "#21222C",
-      "hoverBackground": "#44475A70",
+      "hoverBackground": "#44475A50",
      "hoverInactiveBackground": "#44475A",
-      "modifiedItemForeground": "#9580ff",
+      "modifiedItemForeground": "#FF79C5",
      "rowHeight": 28,
-      "selectionBackground": "#44475A70",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#44475A70",
+      "selectionBackground": "#44475A50",
+      "selectionForeground": "#8BE9FD",
+      "selectionInactiveForeground": "#8BE9FD",
+      "selectionInactiveBackground": "#44475A50",
      "textBackground": "#282A36"
    },
    "Tree.leftChildIndent": 10,
@@ -834,23 +834,23 @@
        "borderColor": "#21222C",
        "background": "#282A36",
        "foreground": "#F8F8F2",
-        "hoverBorderColor": "#44475a"
+        "hoverBorderColor": "#6272A4"
      },
      "Connector": {
        "borderColor": "#21222C",
-        "hoverBorderColor": "#44475a"
+        "hoverBorderColor": "#6272A4"
      },
      "Canvas.background": "#191A21",
      "highStroke.foreground": "#F8F8F2",
      "Label.foreground": "#6272A4",
-      "List.selectionBackground": "#44475A70",
+      "List.selectionBackground": "#44475A50",
      "motion": {
        "borderColor": "#21222C",
        "Component.foreground": "#F8F8F2",
        "ConstraintSetText.foreground": "#6272A4",
        "ConstraintSet.background": "#282A36",
        "CSPanel.SelectedFocusBackground": "#44475A",
-        "CSPanel.SelectedBackground": "#44475A70",
+        "CSPanel.SelectedBackground": "#44475A50",
        "cs_FocusText.infoForeground": "#6272A4",
        "CursorTextColor.foreground": "#F8F8F2",
        "HoverColor.disabledBackground": "#6272A4",
@@ -860,9 +860,9 @@
        "ourCS.background": "#282A36",
        "ourCS_Border.borderColor": "#21222C",
        "ourCS_TextColor.foreground": "#6272A4",
-        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#8BE9FD",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#44475A",
-        "ourCS_SelectedBorder.pressedBorderColor": "#44475a",
+        "ourCS_SelectedBorder.pressedBorderColor": "#6272A4",
        "ourML_BarColor.separatorColor": "#21222C",
        "PrimaryPanel.background": "#191A21",
        "SecondaryPanel.background": "#282A36",
@@ -879,7 +879,7 @@
        "background": "#282A36",
        "borderColor": "#21222C",
        "foreground": "#F8F8F2",
-        "selectedForeground": "#FFFFFF"
+        "selectedForeground": "#8BE9FD"
      },
      "Preview.background": "#282A36",
      "stroke.acceleratorForeground": "#6272A4"
@@ -895,17 +895,17 @@
        "selectedBranchBackground": "#282A36"
      },
      "GitCommits": {
-        "graphColor": "#44475a"
+        "graphColor": "#6272A4"
      },
      "GitLog": {
-        "localBranchIconColor": "#9580ff",
+        "localBranchIconColor": "#FF79C5",
        "otherIconColor": "#6272A4",
        "remoteBranchIconColor": "#F8F8F2",
        "tagIconColor": "#6272A4"
      },
      "HgLog": {
-        "branchIconColor": "#9580ff",
-        "bookmarkIconColor": "#8BE9FD",
+        "branchIconColor": "#FF79C5",
+        "bookmarkIconColor": "#FFFFFF",
        "closedBranchIconColor": "#6272A4",
        "localTagIconColor": "#6272A4",
        "mqTagIconColor": "#6272A4",
@@ -915,11 +915,11 @@
      "Log": {
        "Commit.unmatchedForeground": "#6272A4",
        "Commit.currentBranchBackground": "#282A36",
-        "Commit.hoveredBackground": "#44475A70"
+        "Commit.hoveredBackground": "#44475A50"
      },
      "RefLabel": {
-        "foreground": "#8BE9FD",
-        "backgroundBase": "#44475a"
+        "foreground": "#FFFFFF",
+        "backgroundBase": "#6272A4"
      }
    },
    "Viewport": {
@@ -942,7 +942,7 @@
      "SidePanel.background": "#282A36",
      "Projects": {
        "actions.background": "#191A21",
-        "actions.selectionBackground": "#44475a",
+        "actions.selectionBackground": "#6272A4",
        "background": "#282A36",
        "selectionBackground": "#44475A",
        "selectionInactiveBackground": "#282A36"
@@ -958,53 +958,53 @@
      "#43494A": "#191A21",
      "#6B6B6B": "#6272A4",
      "#A7A7A7": "#282A36",
-      "#3D6185": "#9580ff",
-      "#466D94": "#9580ff",
+      "#3D6185": "#FF79C5",
+      "#466D94": "#FF79C5",
      "#3C3F41": "#282A36",
      "#545556": "#6272A4",
      "#606060": "#6272A4",
      "#9AA7B0": "#F8F8F2",
-      "#675133": "#9580ff",
-      "Actions.Blue": "#50FA78",
-      "Actions.Green": "#F1FA8C",
+      "#675133": "#FF79C5",
+      "Actions.Blue": "#8aff80",
+      "Actions.Green": "#feff80",
      "Actions.Grey": "#6272A4",
      "Actions.GreyInline": "#6272A4",
      "Actions.GreyInline.Dark": "#F8F8F2",
-      "Actions.Red": "#8BE9FD",
-      "Actions.Yellow": "#50FA7B",
+      "Actions.Red": "#f780bf",
+      "Actions.Yellow": "#8aff80",
      "Checkbox.Background.Default": "#191A21",
      "Checkbox.Background.Default.Dark": "#191A21",
-      "Checkbox.Background.Disabled": "#34353D",
-      "Checkbox.Background.Disabled.Dark": "#34353D",
+      "Checkbox.Background.Disabled": "#313341",
+      "Checkbox.Background.Disabled.Dark": "#313341",
      "Checkbox.Border.Default": "#21222C",
      "Checkbox.Border.Default.Dark": "#21222C",
      "Checkbox.Border.Disabled": "#6272A4",
      "Checkbox.Border.Disabled.Dark": "#6272A4",
-      "Checkbox.Focus.Thin.Default": "#9580ff",
-      "Checkbox.Focus.Thin.Default.Dark": "#9580ff",
-      "Checkbox.Focus.Wide": "#9580ff",
-      "Checkbox.Focus.Wide.Dark": "#9580ff",
+      "Checkbox.Focus.Thin.Default": "#FF79C5",
+      "Checkbox.Focus.Thin.Default.Dark": "#FF79C5",
+      "Checkbox.Focus.Wide": "#FF79C5",
+      "Checkbox.Focus.Wide.Dark": "#FF79C5",
      "Checkbox.Foreground.Disabled": "#6272A4",
      "Checkbox.Foreground.Disabled.Dark": "#6272A4",
-      "Checkbox.Background.Selected": "#9580ff",
+      "Checkbox.Background.Selected": "#FF79C5",
      "Checkbox.Background.Selected.Dark": "#282A36",
-      "Checkbox.Border.Selected": "#9580ff",
-      "Checkbox.Border.Selected.Dark": "#9580ff",
-      "Checkbox.Foreground.Selected": "#9580ff",
-      "Checkbox.Foreground.Selected.Dark": "#9580ff",
+      "Checkbox.Border.Selected": "#FF79C5",
+      "Checkbox.Border.Selected.Dark": "#FF79C5",
+      "Checkbox.Foreground.Selected": "#FF79C5",
+      "Checkbox.Foreground.Selected.Dark": "#FF79C5",
      "Checkbox.Focus.Thin.Selected": "#F8F8F2",
      "Checkbox.Focus.Thin.Selected.Dark": "#F8F8F2",
      "Objects.Grey": "#6272A4",
-      "Objects.Blue": "#50FA78",
-      "Objects.RedStatus": "#8BE9FD",
-      "Objects.Red": "#8BE9FD",
-      "Objects.Pink": "#FF79C6",
-      "Objects.Yellow": "#50FA7B",
-      "Objects.Green": "#F1FA8C",
-      "Objects.Purple": "#FF79C6",
+      "Objects.Blue": "#8aff80",
+      "Objects.RedStatus": "#f780bf",
+      "Objects.Red": "#f780bf",
+      "Objects.Pink": "#f780bf",
+      "Objects.Yellow": "#8aff80",
+      "Objects.Green": "#feff80",
+      "Objects.Purple": "#f780bf",
      "Objects.BlackText": "#F8F8F2",
-      "Objects.YellowDark": "#BD93F9",
-      "Objects.GreenAndroid": "#F1FA8C"
+      "Objects.YellowDark": "#9580ff",
+      "Objects.GreenAndroid": "#feff80"
    }
  }
 }
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub
@@ -2,7 +2,7 @@
  "name": "GitHub Contrast",
  "dark": false,
  "author": "Mallowigi",
-  "editorScheme": "/colors/GitHub (Material).xml",
+  "editorScheme": "/colors/GitHub.xml",
  "emptyFrameBackground": {
    "anchor": "center",
    "image": "/walls/github.svg",
@@ -14,32 +14,32 @@
      "acceleratorSelectionForeground": "#292D31",
      "background": "#F7F8FA",
      "borderColor": "#DFE1E4",
-      "disabledBackground": "#FDFDFD",
-      "disabledForeground": "#6C737C",
-      "disabledText": "#6C737C",
+      "disabledBackground": "#dcdcdc",
+      "disabledForeground": "#9ba0a3",
+      "disabledText": "#9ba0a3",
      "focusColor": "#CCE5FF",
      "focusedBorderColor": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveBackground": "#FDFDFD",
+      "inactiveBackground": "#dcdcdc",
      "inactiveForeground": "#292D31",
      "infoForeground": "#292D31",
-      "selectionBackground": "#3A66D1",
-      "selectionBackgroundInactive": "#F7F8FA",
-      "selectionForeground": "#111111",
-      "selectionInactiveBackground": "#F7F8FA",
+      "selectionBackground": "#3A66D150",
+      "selectionBackgroundInactive": "#F3f3f3",
+      "selectionForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#F3f3f3",
      "separatorColor": "#DFE1E4"
    },
    "activeCaption": "#F7F8FA",
    "ActionButton": {
      "hoverBackground": "#79CB6050",
      "hoverBorderColor": "#79CB6050",
-      "hoverSeparatorColor": "#F1F3F6",
+      "hoverSeparatorColor": "#edf1f5",
      "focusedBorderColor": "#79CB6050",
      "pressedBackground": "#79CB6050",
      "pressedBorderColor": "#79CB6050"
    },
    "Autocomplete": {
-      "selectionBackground": "#3A66D1"
+      "selectionBackground": "#3A66D150"
    },
    "Borders.ContrastBorderColor": "#F7F8FA",
    "Borders.color": "#DFE1E4",
@@ -56,22 +56,22 @@
        "startBackground": "#cce5ff",
        "startBorderColor": "#cce5ff"
      },
-      "disabledBorderColor": "#F1F3F6",
-      "disabledText": "#6C737C",
-      "endBackground": "#F1F3F6",
-      "endBorderColor": "#F1F3F6",
+      "disabledBorderColor": "#edf1f5",
+      "disabledText": "#9ba0a3",
+      "endBackground": "#edf1f5",
+      "endBorderColor": "#edf1f5",
      "focus": "#CCE5FF",
      "focusedBorderColor": "#79CB60",
      "foreground": "#292D31",
-      "highlight": "#111111",
-      "mt.background": "#F1F3F6",
+      "highlight": "#FFFFFF",
+      "mt.background": "#edf1f5",
      "mt.foreground": "#292D31",
-      "mt.selectedForeground": "#111111",
+      "mt.selectedForeground": "#FFFFFF",
      "mt.selection.color1": "#cce5ff",
      "mt.selection.color2": "#cce5ff",
-      "startBackground": "#F1F3F6",
-      "startBorderColor": "#F1F3F6",
-      "shadowColor": "#F1F3F6",
+      "startBackground": "#edf1f5",
+      "startBorderColor": "#edf1f5",
+      "shadowColor": "#edf1f5",
      "shadowWidth": 0
    },
    "Canvas": {
@@ -79,12 +79,12 @@
      "Tooltip.background": "#DFECFE"
    },
    "Content": {
-      "background": "#FFFFFF",
-      "selectionBackground": "#3A66D1"
+      "background": "#fafbfc",
+      "selectionBackground": "#3A66D150"
    },
    "CheckBox": {
      "background": "#F7F8FA",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168",
      "select": "#79CB60"
    },
@@ -93,16 +93,16 @@
      "acceleratorSelectionForeground": "#292D31",
      "background": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
+      "selectionBackground": "#3A66D150",
      "selectionForeground": "#111111"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#5B6168",
      "AccessEnabled": {
        "accessDot": "#79CB60",
-        "dropdownBorder": "#F7F8FA",
+        "dropdownBorder": "#F3f3f3",
        "pillBackground": "$second"
      }
    },
@@ -111,45 +111,45 @@
      "foreground": "#5B6168",
      "swatchesDefaultRecentColor": "#5B6168"
    },
-    "ComboBoxButton.background": "#F1F3F6",
+    "ComboBoxButton.background": "#edf1f5",
    "ComboBox": {
      "ArrowButton": {
-        "background": "#F1F3F6",
-        "disabledIconColor": "#6C737C",
+        "background": "#edf1f5",
+        "disabledIconColor": "#9ba0a3",
        "iconColor": "#5B6168",
        "nonEditableBackground": "#F7F8FA"
      },
-      "background": "#FFFFFF",
-      "buttonBackground": "#F1F3F6",
+      "background": "#fafbfc",
+      "buttonBackground": "#edf1f5",
      "darcula.hoveredArrowButtonForeground": "#79CB60",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "modifiedItemForeground": "#79CB60",
-      "nonEditableBackground": "#F7F8FA",
+      "nonEditableBackground": "#F3f3f3",
      "padding": "5,5,5,5",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "ComboPopup.border": "#DFE1E4",
    "CompletionPopup": {
-      "background": "#F7F8FA",
+      "background": "#F3f3f3",
      "foreground": "#5B6168",
      "infoForeground": "#292D31",
      "matchForeground": "#79CB60",
      "matchSelectionForeground": "#79CB60",
      "nonFocusedState": "false",
-      "selectedGrayedForeground": "#111111",
-      "selectionGrayForeground": "#111111",
+      "selectedGrayedForeground": "#FFFFFF",
+      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#292D31",
      "selectionInactiveBackground": "#3A66D150",
-      "selectionBackground": "#3A66D180",
-      "selectionForeground": "#111111",
-      "selectionInfoForeground": "#111111"
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF",
+      "selectionInfoForeground": "#FFFFFF"
    },
    "Component": {
      "arc": 4,
      "borderColor": "#CCE5FF",
-      "disabledBorderColor": "#F1F3F6",
+      "disabledBorderColor": "#edf1f5",
      "focusColor": "#79CB60",
      "focusedBorderColor": "#79CB60",
      "hoverIconColor": "#79CB60",
@@ -160,7 +160,7 @@
    "controlText": "#292D31",
    "Counter": {
      "background": "#79CB60",
-      "foreground": "#111111"
+      "foreground": "#FFFFFF"
    },
    "Debugger": {
      "Variables": {
@@ -184,15 +184,15 @@
      "background": "#F7F8FA",
      "borderColor": "#F7F8FA",
      "hoverBackground": "#cce5ff",
-      "hoverColor": "#FFFFFF",
+      "hoverColor": "#fafbfc",
      "hoverMaskColor": "#CCE5FF",
      "inactiveColoredTabBackground": "#F7F8FA",
-      "inactiveColoredFileBackground": "#F1F3F6",
+      "inactiveColoredFileBackground": "#edf1f5",
      "inactiveUnderlineColor": "#79CB60",
-      "inactiveMaskColor": "#FFFFFF",
+      "inactiveMaskColor": "#fafbfc",
      "underlineColor": "#79CB60",
      "underlinedTabBackground": "#cce5ff",
-      "underlinedTabForeground": "#111111"
+      "underlinedTabForeground": "#FFFFFF"
    },
    "Desktop.background": "#F7F8FA",
    "DialogWrapper.southPanelBackground": "#F7F8FA",
@@ -203,36 +203,36 @@
      "areaForeground": "#5B6168"
    },
    "Editor": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "foreground": "#5B6168",
      "shortcutForeground": "#292D31"
    },
    "EditorPane": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
      "inactiveBackground": "#F7F8FA",
-      "inactiveForeground": "#6C737C",
-      "selectionBackground": "#3A66D1",
+      "inactiveForeground": "#9ba0a3",
+      "selectionBackground": "#3A66D150",
      "selectionForeground": "#111111"
    },
    "EditorTabs": {
-      "borderColor": "#F7F8FA",
+      "borderColor": "#F3f3f3",
      "hoverBackground": "#CCE5FF",
      "hoverColor": "#CCE5FF",
      "hoverMaskColor": "#CCE5FF",
      "inactiveMaskColor": "#F7F8FA",
      "inactiveColoredFileBackground": "#F7F8FA",
-      "inactiveUnderlineColor": "#6C737C",
+      "inactiveUnderlineColor": "#9ba0a3",
      "selectedForeground": "#5B6168",
      "selectedBackground": "#cce5ff",
      "underlineColor": "#79CB60",
      "underlinedTabBackground": "#cce5ff",
-      "underlinedTabForeground": "#111111"
+      "underlinedTabForeground": "#FFFFFF"
    },
    "EditorGroupsTabs": {
      "background": "#F7F8FA",
-      "borderColor": "#F7F8FA",
+      "borderColor": "#F3f3f3",
      "hoverBackground": "#CCE5FF",
      "hoverColor": "#CCE5FF",
      "inactiveUnderlineColor": "#79CB60",
@@ -243,7 +243,7 @@
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#FDFDFD",
+      "Yellow": "#dcdcdc",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -260,11 +260,11 @@
    },
    "Focus.color": "#DFE1E4",
    "FormattedTextField": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveBackground": "#F1F3F6",
-      "inactiveForeground": "#6C737C",
+      "inactiveBackground": "#edf1f5",
+      "inactiveForeground": "#9ba0a3",
      "selectionForeground": "#111111",
      "selectionBackground": "#cce5ff"
    },
@@ -279,7 +279,7 @@
    },
    "HeaderColor": {
      "active": "#F7F8FA",
-      "inactive": "#FFFFFF"
+      "inactive": "#fafbfc"
    },
    "HelpTooltip": {
      "background": "#F7F8FA",
@@ -289,7 +289,7 @@
      "shortcutForeground": "#292D31"
    },
    "Hyperlink.linkColor": "#79CB60",
-    "inactiveCaption": "#F7F8FA",
+    "inactiveCaption": "#F3f3f3",
    "inactiveCaptionBorder": "#F7F8FA",
    "inactiveCaptionText": "#292D31",
    "info": "#292D31",
@@ -306,9 +306,9 @@
    },
    "Label": {
      "background": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "disabledShadow": "#F7F8FA",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168",
      "infoForeground": "#292D31",
      "selectedForeground": "#111111",
@@ -323,66 +323,66 @@
    },
    "link.foreground": "#79CB60",
    "List": {
-      "background": "#F7F8FA",
+      "background": "#F3f3f3",
      "foreground": "#5B6168",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "hoverInactiveBackground": "#cce5ff",
      "selectionBackground": "#3A66D150",
-      "selectionForeground": "#111111",
+      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#111111",
-      "selectionInactiveBackground": "#3A66D170"
+      "selectionInactiveBackground": "#3A66D1"
    },
    "material": {
      "background": "#F7F8FA",
      "branchColor": "#5B6168",
-      "contrast": "#FFFFFF",
+      "contrast": "#fafbfc",
      "foreground": "#5B6168",
-      "mergeCommits": "#F1F3F6",
+      "mergeCommits": "#edf1f5",
      "primaryColor": "#292D31",
-      "selectionForeground": "#111111",
+      "selectionForeground": "#FFFFFF",
      "tab.backgroundColor": "#F7F8FA",
      "tab.borderColor": "#79CB60",
      "tagColor": "#292D31"
    },
    "MemoryIndicator": {
-      "allocatedBackground": "#F7F8FA",
+      "allocatedBackground": "#F3f3f3",
      "usedColor": "#CCE5FF",
      "usedBackground": "#CCE5FF"
    },
    "Menu": {
      "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#111111",
+      "acceleratorSelectionForeground": "#FFFFFF",
      "background": "#F7F8FA",
      "border": "4,2,4,2",
-      "borderColor": "#F7F8FA",
-      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "borderColor": "#F3f3f3",
+      "disabledBackground": "#F3f3f3",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111",
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF",
      "separatorColor": "#DFE1E4"
    },
    "MenuBar": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "borderColor": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "highlight": "#F7F8FA",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111",
-      "shadow": "#FFFFFF"
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF",
+      "shadow": "#fafbfc"
    },
    "MenuItem": {
      "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#111111",
+      "acceleratorSelectionForeground": "#FFFFFF",
      "border": "4,2,4,2",
      "background": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111"
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
      "arrowColor": "#5B6168",
@@ -393,7 +393,7 @@
        "background": "#F7F8FA"
      },
      "SearchField": {
-        "background": "#FFFFFF"
+        "background": "#fafbfc"
      }
    },
    "NewPSD.warning": "#79CB60",
@@ -404,9 +404,9 @@
      "errorBorderColor": "#DFECFE",
      "foreground": "#5B6168",
      "MoreButton": {
-        "background": "#F1F3F6",
+        "background": "#edf1f5",
        "foreground": "#5B6168",
-        "innerBorderColor": "#F1F3F6"
+        "innerBorderColor": "#edf1f5"
      },
      "ToolWindow": {
        "errorBackground": "#DFECFE",
@@ -424,66 +424,66 @@
      "messageForeground": "#5B6168"
    },
    "Outline": {
-      "color": "#F1F3F6",
+      "color": "#edf1f5",
      "focusedColor": "#79CB60",
-      "disabledColor": "#6C737C"
+      "disabledColor": "#9ba0a3"
    },
    "Panel": {
      "background": "#F7F8FA",
      "foreground": "#5B6168"
    },
    "ParameterInfo": {
-      "background": "#F7F8FA",
+      "background": "#F3f3f3",
      "borderColor": "#cce5ff",
      "currentOverloadBackground": "#CCE5FF",
      "currentParameterForeground": "#79CB60",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "infoForeground": "#292D31",
      "lineSeparatorColor": "#cce5ff"
    },
    "PasswordField": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "capsLockIconColor": "#79CB60",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "Plugins": {
      "background": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "eapTagBackground": "#CCE5FF",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "lightSelectionBackground": "#cce5ff",
      "paidTagBackground": "#CCE5FF",
-      "selectionBackground": "#3A66D1",
+      "selectionBackground": "#3A66D150",
      "tagForeground": "#79CB60",
      "tagBackground": "#CCE5FF",
      "trialTagBackground": "#CCE5FF",
      "Button": {
-        "installBackground": "#F1F3F6",
-        "installBorderColor": "#F1F3F6",
+        "installBackground": "#edf1f5",
+        "installBorderColor": "#edf1f5",
        "installForeground": "#5B6168",
        "installFocusedBackground": "#CCE5FF",
-        "installFillForeground": "#6C737C",
-        "installFillBackground": "#F1F3F6",
+        "installFillForeground": "#9ba0a3",
+        "installFillBackground": "#edf1f5",
        "updateBackground": "#79CB60",
-        "updateBorderColor": "#F1F3F6",
+        "updateBorderColor": "#edf1f5",
        "updateForeground": "#5B6168"
      },
      "SearchField": {
-        "background": "#FFFFFF",
+        "background": "#fafbfc",
        "borderColor": "#DFE1E4"
      },
      "SectionHeader": {
-        "background": "#F7F8FA",
+        "background": "#F3f3f3",
        "foreground": "#5B6168"
      },
      "Tab": {
        "hoverBackground": "#cce5ff",
-        "selectedForeground": "#111111",
+        "selectedForeground": "#FFFFFF",
        "selectedBackground": "#cce5ff"
      }
    },
@@ -493,20 +493,20 @@
        "borderColor": "#F7F8FA",
        "foreground": "#79CB60"
      },
-      "borderColor": "#FFFFFF",
+      "borderColor": "#fafbfc",
      "inactiveBorderColor": "#F7F8FA",
-      "innerBorderColor": "#F7F8FA",
+      "innerBorderColor": "#F3f3f3",
      "Header": {
        "activeBackground": "#F7F8FA",
-        "inactiveBackground": "#FFFFFF"
+        "inactiveBackground": "#fafbfc"
      },
      "paintBorder": true,
      "separatorForeground": "#5B6168",
-      "separatorColor": "#F7F8FA",
+      "separatorColor": "#F3f3f3",
      "Toolbar": {
-        "Floating.background": "#FFFFFF",
-        "background": "#FFFFFF",
-        "borderColor": "#FFFFFF"
+        "Floating.background": "#fafbfc",
+        "background": "#fafbfc",
+        "borderColor": "#fafbfc"
      }
    },
    "PopupMenu": {
@@ -531,7 +531,7 @@
    },
    "RadioButton": {
      "background": "#F7F8FA",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168"
    },
    "RadioButtonMenuItem": {
@@ -539,10 +539,10 @@
      "acceleratorSelectionForeground": "#292D31",
      "background": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111"
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#DFE1E4",
    "ScrollBar": {
@@ -581,7 +581,7 @@
    },
    "SearchEverywhere": {
      "Advertiser": {
-        "background": "#FFFFFF",
+        "background": "#fafbfc",
        "foreground": "#292D31"
      },
      "Header": {
@@ -593,7 +593,7 @@
      },
      "SearchField": {
        "background": "#F7F8FA",
-        "borderColor": "#FFFFFF",
+        "borderColor": "#fafbfc",
        "infoForeground": "#292D31"
      },
      "Tab": {
@@ -617,12 +617,12 @@
      "Repeated.File.Foreground": "#5B6168"
    },
    "Separator": {
-      "background": "#F7F8FA",
-      "foreground": "#F7F8FA",
-      "separatorColor": "#F7F8FA"
+      "background": "#F3f3f3",
+      "foreground": "#F3f3f3",
+      "separatorColor": "#F3f3f3"
    },
    "SidePanel": {
-      "background": "#FFFFFF"
+      "background": "#fafbfc"
    },
    "Slider": {
      "background": "#F7F8FA",
@@ -630,7 +630,7 @@
      "buttonColor": "#79CB60",
      "foreground": "#5B6168",
      "majorTickLength": 6,
-      "tickColor": "#F7F8FA",
+      "tickColor": "#F3f3f3",
      "trackColor": "#cce5ff",
      "trackWidth": 7,
      "thumb": "#79CB60"
@@ -649,9 +649,9 @@
    },
    "SplitPane": {
      "background": "#F7F8FA",
-      "highlight": "#FFFFFF"
+      "highlight": "#fafbfc"
    },
-    "SplitPaneDivider.draggingColor": "#F7F8FA",
+    "SplitPaneDivider.draggingColor": "#F3f3f3",
    "StatusBar": {
      "borderColor": "#F7F8FA",
      "hoverBackground": "#CCE5FF",
@@ -662,8 +662,8 @@
      "contentAreaColor": "#CCE5FF",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#DFE1E4",
-      "disabledForeground": "#6C737C",
-      "disabledUnderlineColor": "#6C737C",
+      "disabledForeground": "#9ba0a3",
+      "disabledUnderlineColor": "#9ba0a3",
      "focus": "#cce5ff",
      "focusColor": "#cce5ff",
      "fontSizeOffset": 0,
@@ -680,13 +680,13 @@
      "tabSelectionHeight": 2,
      "underlineColor": "#79CB60"
    },
-    "TabbedPane.mt.tab.background": "#FFFFFF",
+    "TabbedPane.mt.tab.background": "#fafbfc",
    "Table": {
-      "alternativeRowBackground": "#FFFFFF",
+      "alternativeRowBackground": "#fafbfc",
      "background": "#F7F8FA",
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "dropLineColor": "#79CB60",
      "dropLineShortColor": "#79CB60",
      "focusCellBackground": "#cce5ff",
@@ -694,59 +694,59 @@
      "foreground": "#5B6168",
      "gridColor": "#F7F8FA",
      "highlightOuter": "#cce5ff",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "hoverInactiveBackground": "#cce5ff",
      "lightSelectionForeground": "#111111",
      "lightSelectionInactiveForeground": "#292D31",
-      "lightSelectionInactiveBackground": "#F7F8FA",
+      "lightSelectionInactiveBackground": "#F3f3f3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111",
      "selectionInactiveBackground": "#cce5ff",
-      "selectionInactiveForeground": "#111111",
+      "selectionInactiveForeground": "#FFFFFF",
      "sortIconColor": "#5B6168",
-      "stripeColor": "#FFFFFF"
+      "stripeColor": "#fafbfc"
    },
    "TableHeader": {
      "background": "#F7F8FA",
      "borderColor": "#F7F8FA",
-      "bottomSeparatorColor": "#F7F8FA",
+      "bottomSeparatorColor": "#F3f3f3",
      "cellBorder": "4,0,4,0",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "focusCellBackground": "#cce5ff",
      "focusCellForeground": "#111111",
      "height": 25,
-      "separatorColor": "#F7F8FA"
+      "separatorColor": "#F3f3f3"
    },
    "text": "#292D31",
    "textInactiveText": "#292D31",
    "textText": "#292D31",
    "TextArea": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "TextField": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "TextPane": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "TitlePane": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "Button.hoverBackground": "#CCE5FF",
      "inactiveBackground": "#F7F8FA",
      "infoForeground": "#292D31",
@@ -754,9 +754,9 @@
    },
    "TitledBorder.titleColor": "#5B6168",
    "ToggleButton": {
-      "borderColor": "#F1F3F6",
+      "borderColor": "#edf1f5",
      "buttonColor": "#5B6168",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168",
      "offForeground": "#F7F8FA",
      "offBackground": "#F7F8FA",
@@ -764,7 +764,7 @@
      "onForeground": "#79CB60"
    },
    "ToolBar": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "borderHandleColor": "#292D31",
      "floatingForeground": "#292D31",
      "foreground": "#5B6168"
@@ -783,11 +783,11 @@
      "Button": {
        "hoverBackground": "#cce5ff",
        "selectedForeground": "#111111",
-        "selectedBackground": "#FFFFFF"
+        "selectedBackground": "#fafbfc"
      },
      "Header": {
        "background": "#F7F8FA",
-        "borderColor": "#F7F8FA",
+        "borderColor": "#F3f3f3",
        "inactiveBackground": "#F7F8FA"
      },
      "HeaderCloseButton": {
@@ -798,34 +798,34 @@
        "hoverBackground": "#CCE5FF",
        "hoverInactiveBackground": "#CCE5FF",
        "inactiveUnderlineColor": "#79CB60",
-        "selectedBackground": "#FFFFFF",
-        "selectedInactiveBackground": "#FFFFFF",
+        "selectedBackground": "#fafbfc",
+        "selectedInactiveBackground": "#fafbfc",
        "underlineColor": "#79CB60",
        "underlinedTabBackground": "#cce5ff",
-        "underlinedTabInactiveBackground": "#F7F8FA",
-        "underlinedTabForeground": "#111111",
+        "underlinedTabInactiveBackground": "#F3f3f3",
+        "underlinedTabForeground": "#FFFFFF",
        "underlinedTabInactiveForeground": "#5B6168"
      }
    },
    "Tree": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "foreground": "#292D31",
      "hash": "#DFE1E4",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "hoverInactiveBackground": "#cce5ff",
      "modifiedItemForeground": "#79CB60",
      "rowHeight": 28,
-      "selectionBackground": "#3A66D170",
-      "selectionForeground": "#111111",
-      "selectionInactiveForeground": "#111111",
-      "selectionInactiveBackground": "#3A66D170",
-      "textBackground": "#FFFFFF"
+      "selectionBackground": "#3A66D1",
+      "selectionForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#3A66D1",
+      "textBackground": "#fafbfc"
    },
    "Tree.leftChildIndent": 10,
    "Tree.rightChildIndent": 5,
    "UIDesigner": {
      "Activity.borderColor": "#DFE1E4",
-      "Canvas.background": "#FFFFFF",
+      "Canvas.background": "#fafbfc",
      "ColorPicker": {
        "background": "#F7F8FA",
        "foreground": "#5B6168"
@@ -840,34 +840,34 @@
        "borderColor": "#DFE1E4",
        "hoverBorderColor": "#CCE5FF"
      },
-      "Canvas.background": "#FFFFFF",
+      "Canvas.background": "#fafbfc",
      "highStroke.foreground": "#5B6168",
      "Label.foreground": "#292D31",
-      "List.selectionBackground": "#3A66D170",
+      "List.selectionBackground": "#3A66D1",
      "motion": {
        "borderColor": "#DFE1E4",
        "Component.foreground": "#5B6168",
        "ConstraintSetText.foreground": "#292D31",
-        "ConstraintSet.background": "#F7F8FA",
-        "CSPanel.SelectedFocusBackground": "#3A66D1",
-        "CSPanel.SelectedBackground": "#3A66D170",
+        "ConstraintSet.background": "#F3f3f3",
+        "CSPanel.SelectedFocusBackground": "#3A66D150",
+        "CSPanel.SelectedBackground": "#3A66D1",
        "cs_FocusText.infoForeground": "#292D31",
        "CursorTextColor.foreground": "#5B6168",
-        "HoverColor.disabledBackground": "#6C737C",
+        "HoverColor.disabledBackground": "#9ba0a3",
        "motionGraph.background": "#F7F8FA",
        "Notification.background": "#DFECFE",
-        "ourAvg.background": "#F7F8FA",
-        "ourCS.background": "#F7F8FA",
+        "ourAvg.background": "#F3f3f3",
+        "ourCS.background": "#F3f3f3",
        "ourCS_Border.borderColor": "#DFE1E4",
        "ourCS_TextColor.foreground": "#292D31",
-        "ourCS_SelectedFocusBackground.selectionForeground": "#111111",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#cce5ff",
        "ourCS_SelectedBorder.pressedBorderColor": "#CCE5FF",
        "ourML_BarColor.separatorColor": "#DFE1E4",
-        "PrimaryPanel.background": "#FFFFFF",
+        "PrimaryPanel.background": "#fafbfc",
        "SecondaryPanel.background": "#F7F8FA",
        "SecondaryPanel.header.foreground": "#292D31",
-        "SecondaryPanel.header.background": "#FFFFFF",
+        "SecondaryPanel.header.background": "#fafbfc",
        "timeLine.disabledBorderColor": "#DFE1E4"
      },
      "Panel": {
@@ -879,7 +879,7 @@
        "background": "#F7F8FA",
        "borderColor": "#DFE1E4",
        "foreground": "#5B6168",
-        "selectedForeground": "#111111"
+        "selectedForeground": "#FFFFFF"
      },
      "Preview.background": "#F7F8FA",
      "stroke.acceleratorForeground": "#292D31"
@@ -906,7 +906,7 @@
      "HgLog": {
        "branchIconColor": "#79CB60",
        "bookmarkIconColor": "#111111",
-        "closedBranchIconColor": "#6C737C",
+        "closedBranchIconColor": "#9ba0a3",
        "localTagIconColor": "#292D31",
        "mqTagIconColor": "#292D31",
        "tagIconColor": "#292D31",
@@ -914,8 +914,8 @@
      },
      "Log": {
        "Commit.unmatchedForeground": "#292D31",
-        "Commit.currentBranchBackground": "#F7F8FA",
-        "Commit.hoveredBackground": "#3A66D170"
+        "Commit.currentBranchBackground": "#F3f3f3",
+        "Commit.hoveredBackground": "#3A66D1"
      },
      "RefLabel": {
        "foreground": "#111111",
@@ -923,46 +923,46 @@
      }
    },
    "Viewport": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "foreground": "#5B6168"
    },
    "WelcomeScreen": {
      "AssociatedComponent.background": "#F7F8FA",
      "background": "#F7F8FA",
      "borderColor": "#F7F8FA",
-      "captionBackground": "#FFFFFF",
+      "captionBackground": "#fafbfc",
      "captionForeground": "#5B6168",
      "Details.background": "#F7F8FA",
-      "footerBackground": "#FFFFFF",
+      "footerBackground": "#fafbfc",
      "footerForeground": "#5B6168",
      "headerBackground": "#F7F8FA",
      "headerForeground": "#5B6168",
-      "List.background": "#FFFFFF",
+      "List.background": "#fafbfc",
      "separatorColor": "#DFE1E4",
-      "SidePanel.background": "#F7F8FA",
+      "SidePanel.background": "#F3f3f3",
      "Projects": {
-        "actions.background": "#FFFFFF",
+        "actions.background": "#fafbfc",
        "actions.selectionBackground": "#CCE5FF",
-        "background": "#F7F8FA",
-        "selectionBackground": "#3A66D1",
-        "selectionInactiveBackground": "#F7F8FA"
+        "background": "#F3f3f3",
+        "selectionBackground": "#3A66D150",
+        "selectionInactiveBackground": "#F3f3f3"
      }
    },
-    "window": "#FFFFFF",
+    "window": "#fafbfc",
    "windowBorder": "#DFE1E4",
    "windowText": "#292D31",
    "Window.border": "#DFE1E4"
  },
  "icons": {
    "ColorPalette": {
-      "#43494A": "#FFFFFF",
+      "#43494A": "#fafbfc",
      "#6B6B6B": "#292D31",
      "#A7A7A7": "#F7F8FA",
      "#3D6185": "#79CB60",
      "#466D94": "#79CB60",
      "#3C3F41": "#F7F8FA",
-      "#545556": "#6C737C",
-      "#606060": "#6C737C",
+      "#545556": "#9ba0a3",
+      "#606060": "#9ba0a3",
      "#9AA7B0": "#5B6168",
      "#675133": "#79CB60",
      "Actions.Blue": "#6F42C1",
@@ -972,20 +972,20 @@
      "Actions.GreyInline.Dark": "#5B6168",
      "Actions.Red": "#22863A",
      "Actions.Yellow": "#6F42C1",
-      "Checkbox.Background.Default": "#FFFFFF",
-      "Checkbox.Background.Default.Dark": "#FFFFFF",
-      "Checkbox.Background.Disabled": "#FDFDFD",
-      "Checkbox.Background.Disabled.Dark": "#FDFDFD",
+      "Checkbox.Background.Default": "#fafbfc",
+      "Checkbox.Background.Default.Dark": "#fafbfc",
+      "Checkbox.Background.Disabled": "#dcdcdc",
+      "Checkbox.Background.Disabled.Dark": "#dcdcdc",
      "Checkbox.Border.Default": "#DFE1E4",
      "Checkbox.Border.Default.Dark": "#DFE1E4",
-      "Checkbox.Border.Disabled": "#6C737C",
-      "Checkbox.Border.Disabled.Dark": "#6C737C",
+      "Checkbox.Border.Disabled": "#9ba0a3",
+      "Checkbox.Border.Disabled.Dark": "#9ba0a3",
      "Checkbox.Focus.Thin.Default": "#79CB60",
      "Checkbox.Focus.Thin.Default.Dark": "#79CB60",
      "Checkbox.Focus.Wide": "#79CB60",
      "Checkbox.Focus.Wide.Dark": "#79CB60",
-      "Checkbox.Foreground.Disabled": "#6C737C",
-      "Checkbox.Foreground.Disabled.Dark": "#6C737C",
+      "Checkbox.Foreground.Disabled": "#9ba0a3",
+      "Checkbox.Foreground.Disabled.Dark": "#9ba0a3",
      "Checkbox.Background.Selected": "#79CB60",
      "Checkbox.Background.Selected.Dark": "#F7F8FA",
      "Checkbox.Border.Selected": "#79CB60",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json
@@ -2,7 +2,7 @@
  "name": "GitHub",
  "dark": false,
  "author": "Mallowigi",
-  "editorScheme": "/colors/GitHub (Material).xml",
+  "editorScheme": "/colors/GitHub.xml",
  "emptyFrameBackground": {
    "anchor": "center",
    "image": "/walls/github.svg",
@@ -14,32 +14,32 @@
      "acceleratorSelectionForeground": "#292D31",
      "background": "#F7F8FA",
      "borderColor": "#DFE1E4",
-      "disabledBackground": "#FDFDFD",
-      "disabledForeground": "#6C737C",
-      "disabledText": "#6C737C",
+      "disabledBackground": "#dcdcdc",
+      "disabledForeground": "#9ba0a3",
+      "disabledText": "#9ba0a3",
      "focusColor": "#CCE5FF",
      "focusedBorderColor": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveBackground": "#FDFDFD",
+      "inactiveBackground": "#dcdcdc",
      "inactiveForeground": "#292D31",
      "infoForeground": "#292D31",
-      "selectionBackground": "#3A66D1",
-      "selectionBackgroundInactive": "#F7F8FA",
-      "selectionForeground": "#111111",
-      "selectionInactiveBackground": "#F7F8FA",
+      "selectionBackground": "#3A66D150",
+      "selectionBackgroundInactive": "#F3f3f3",
+      "selectionForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#F3f3f3",
      "separatorColor": "#DFE1E4"
    },
    "activeCaption": "#F7F8FA",
    "ActionButton": {
      "hoverBackground": "#79CB6050",
      "hoverBorderColor": "#79CB6050",
-      "hoverSeparatorColor": "#F1F3F6",
+      "hoverSeparatorColor": "#edf1f5",
      "focusedBorderColor": "#79CB6050",
      "pressedBackground": "#79CB6050",
      "pressedBorderColor": "#79CB6050"
    },
    "Autocomplete": {
-      "selectionBackground": "#3A66D1"
+      "selectionBackground": "#3A66D150"
    },
    "Borders.ContrastBorderColor": "#F7F8FA",
    "Borders.color": "#DFE1E4",
@@ -56,22 +56,22 @@
        "startBackground": "#cce5ff",
        "startBorderColor": "#cce5ff"
      },
-      "disabledBorderColor": "#F1F3F6",
-      "disabledText": "#6C737C",
-      "endBackground": "#F1F3F6",
-      "endBorderColor": "#F1F3F6",
+      "disabledBorderColor": "#edf1f5",
+      "disabledText": "#9ba0a3",
+      "endBackground": "#edf1f5",
+      "endBorderColor": "#edf1f5",
      "focus": "#CCE5FF",
      "focusedBorderColor": "#79CB60",
      "foreground": "#292D31",
-      "highlight": "#111111",
-      "mt.background": "#F1F3F6",
+      "highlight": "#FFFFFF",
+      "mt.background": "#edf1f5",
      "mt.foreground": "#292D31",
-      "mt.selectedForeground": "#111111",
+      "mt.selectedForeground": "#FFFFFF",
      "mt.selection.color1": "#cce5ff",
      "mt.selection.color2": "#cce5ff",
-      "startBackground": "#F1F3F6",
-      "startBorderColor": "#F1F3F6",
-      "shadowColor": "#F1F3F6",
+      "startBackground": "#edf1f5",
+      "startBorderColor": "#edf1f5",
+      "shadowColor": "#edf1f5",
      "shadowWidth": 0
    },
    "Canvas": {
@@ -79,12 +79,12 @@
      "Tooltip.background": "#DFECFE"
    },
    "Content": {
-      "background": "#FFFFFF",
-      "selectionBackground": "#3A66D1"
+      "background": "#fafbfc",
+      "selectionBackground": "#3A66D150"
    },
    "CheckBox": {
      "background": "#F7F8FA",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168",
      "select": "#79CB60"
    },
@@ -93,16 +93,16 @@
      "acceleratorSelectionForeground": "#292D31",
      "background": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
+      "selectionBackground": "#3A66D150",
      "selectionForeground": "#111111"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#5B6168",
      "AccessEnabled": {
        "accessDot": "#79CB60",
-        "dropdownBorder": "#F7F8FA",
+        "dropdownBorder": "#F3f3f3",
        "pillBackground": "$second"
      }
    },
@@ -111,45 +111,45 @@
      "foreground": "#5B6168",
      "swatchesDefaultRecentColor": "#5B6168"
    },
-    "ComboBoxButton.background": "#F1F3F6",
+    "ComboBoxButton.background": "#edf1f5",
    "ComboBox": {
      "ArrowButton": {
-        "background": "#F1F3F6",
-        "disabledIconColor": "#6C737C",
+        "background": "#edf1f5",
+        "disabledIconColor": "#9ba0a3",
        "iconColor": "#5B6168",
        "nonEditableBackground": "#F7F8FA"
      },
      "background": "#F7F8FA",
-      "buttonBackground": "#F1F3F6",
+      "buttonBackground": "#edf1f5",
      "darcula.hoveredArrowButtonForeground": "#79CB60",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "modifiedItemForeground": "#79CB60",
-      "nonEditableBackground": "#F7F8FA",
+      "nonEditableBackground": "#F3f3f3",
      "padding": "5,5,5,5",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "ComboPopup.border": "#DFE1E4",
    "CompletionPopup": {
-      "background": "#F7F8FA",
+      "background": "#F3f3f3",
      "foreground": "#5B6168",
      "infoForeground": "#292D31",
      "matchForeground": "#79CB60",
      "matchSelectionForeground": "#79CB60",
      "nonFocusedState": "false",
-      "selectedGrayedForeground": "#111111",
-      "selectionGrayForeground": "#111111",
+      "selectedGrayedForeground": "#FFFFFF",
+      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#292D31",
      "selectionInactiveBackground": "#3A66D150",
-      "selectionBackground": "#3A66D180",
-      "selectionForeground": "#111111",
-      "selectionInfoForeground": "#111111"
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF",
+      "selectionInfoForeground": "#FFFFFF"
    },
    "Component": {
      "arc": 4,
      "borderColor": "#CCE5FF",
-      "disabledBorderColor": "#F1F3F6",
+      "disabledBorderColor": "#edf1f5",
      "focusColor": "#79CB60",
      "focusedBorderColor": "#79CB60",
      "hoverIconColor": "#79CB60",
@@ -160,7 +160,7 @@
    "controlText": "#292D31",
    "Counter": {
      "background": "#79CB60",
-      "foreground": "#111111"
+      "foreground": "#FFFFFF"
    },
    "Debugger": {
      "Variables": {
@@ -187,12 +187,12 @@
      "hoverColor": "#F7F8FA",
      "hoverMaskColor": "#CCE5FF",
      "inactiveColoredTabBackground": "#F7F8FA",
-      "inactiveColoredFileBackground": "#F1F3F6",
+      "inactiveColoredFileBackground": "#edf1f5",
      "inactiveUnderlineColor": "#79CB60",
      "inactiveMaskColor": "#F7F8FA",
      "underlineColor": "#79CB60",
      "underlinedTabBackground": "#cce5ff",
-      "underlinedTabForeground": "#111111"
+      "underlinedTabForeground": "#FFFFFF"
    },
    "Desktop.background": "#F7F8FA",
    "DialogWrapper.southPanelBackground": "#F7F8FA",
@@ -212,27 +212,27 @@
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
      "inactiveBackground": "#F7F8FA",
-      "inactiveForeground": "#6C737C",
-      "selectionBackground": "#3A66D1",
+      "inactiveForeground": "#9ba0a3",
+      "selectionBackground": "#3A66D150",
      "selectionForeground": "#111111"
    },
    "EditorTabs": {
-      "borderColor": "#F7F8FA",
+      "borderColor": "#F3f3f3",
      "hoverBackground": "#CCE5FF",
      "hoverColor": "#CCE5FF",
      "hoverMaskColor": "#CCE5FF",
      "inactiveMaskColor": "#F7F8FA",
      "inactiveColoredFileBackground": "#F7F8FA",
-      "inactiveUnderlineColor": "#6C737C",
+      "inactiveUnderlineColor": "#9ba0a3",
      "selectedForeground": "#5B6168",
      "selectedBackground": "#cce5ff",
      "underlineColor": "#79CB60",
      "underlinedTabBackground": "#cce5ff",
-      "underlinedTabForeground": "#111111"
+      "underlinedTabForeground": "#FFFFFF"
    },
    "EditorGroupsTabs": {
      "background": "#F7F8FA",
-      "borderColor": "#F7F8FA",
+      "borderColor": "#F3f3f3",
      "hoverBackground": "#CCE5FF",
      "hoverColor": "#CCE5FF",
      "inactiveUnderlineColor": "#79CB60",
@@ -243,7 +243,7 @@
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#FDFDFD",
+      "Yellow": "#dcdcdc",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -263,8 +263,8 @@
      "background": "#F7F8FA",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveBackground": "#F1F3F6",
-      "inactiveForeground": "#6C737C",
+      "inactiveBackground": "#edf1f5",
+      "inactiveForeground": "#9ba0a3",
      "selectionForeground": "#111111",
      "selectionBackground": "#cce5ff"
    },
@@ -279,7 +279,7 @@
    },
    "HeaderColor": {
      "active": "#F7F8FA",
-      "inactive": "#FFFFFF"
+      "inactive": "#fafbfc"
    },
    "HelpTooltip": {
      "background": "#F7F8FA",
@@ -289,7 +289,7 @@
      "shortcutForeground": "#292D31"
    },
    "Hyperlink.linkColor": "#79CB60",
-    "inactiveCaption": "#F7F8FA",
+    "inactiveCaption": "#F3f3f3",
    "inactiveCaptionBorder": "#F7F8FA",
    "inactiveCaptionText": "#292D31",
    "info": "#292D31",
@@ -306,9 +306,9 @@
    },
    "Label": {
      "background": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "disabledShadow": "#F7F8FA",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168",
      "infoForeground": "#292D31",
      "selectedForeground": "#111111",
@@ -323,66 +323,66 @@
    },
    "link.foreground": "#79CB60",
    "List": {
-      "background": "#F7F8FA",
+      "background": "#F3f3f3",
      "foreground": "#5B6168",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "hoverInactiveBackground": "#cce5ff",
      "selectionBackground": "#3A66D150",
-      "selectionForeground": "#111111",
+      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#111111",
-      "selectionInactiveBackground": "#3A66D170"
+      "selectionInactiveBackground": "#3A66D1"
    },
    "material": {
      "background": "#F7F8FA",
      "branchColor": "#5B6168",
-      "contrast": "#FFFFFF",
+      "contrast": "#fafbfc",
      "foreground": "#5B6168",
-      "mergeCommits": "#F1F3F6",
+      "mergeCommits": "#edf1f5",
      "primaryColor": "#292D31",
-      "selectionForeground": "#111111",
+      "selectionForeground": "#FFFFFF",
      "tab.backgroundColor": "#F7F8FA",
      "tab.borderColor": "#79CB60",
      "tagColor": "#292D31"
    },
    "MemoryIndicator": {
-      "allocatedBackground": "#F7F8FA",
+      "allocatedBackground": "#F3f3f3",
      "usedColor": "#CCE5FF",
      "usedBackground": "#CCE5FF"
    },
    "Menu": {
      "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#111111",
+      "acceleratorSelectionForeground": "#FFFFFF",
      "background": "#F7F8FA",
      "border": "4,2,4,2",
-      "borderColor": "#F7F8FA",
-      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "borderColor": "#F3f3f3",
+      "disabledBackground": "#F3f3f3",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111",
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF",
      "separatorColor": "#DFE1E4"
    },
    "MenuBar": {
      "background": "#F7F8FA",
      "borderColor": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "highlight": "#F7F8FA",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111",
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF",
      "shadow": "#F7F8FA"
    },
    "MenuItem": {
      "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#111111",
+      "acceleratorSelectionForeground": "#FFFFFF",
      "border": "4,2,4,2",
      "background": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111"
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
      "arrowColor": "#5B6168",
@@ -404,9 +404,9 @@
      "errorBorderColor": "#DFECFE",
      "foreground": "#5B6168",
      "MoreButton": {
-        "background": "#F1F3F6",
+        "background": "#edf1f5",
        "foreground": "#5B6168",
-        "innerBorderColor": "#F1F3F6"
+        "innerBorderColor": "#edf1f5"
      },
      "ToolWindow": {
        "errorBackground": "#DFECFE",
@@ -424,20 +424,20 @@
      "messageForeground": "#5B6168"
    },
    "Outline": {
-      "color": "#F1F3F6",
+      "color": "#edf1f5",
      "focusedColor": "#79CB60",
-      "disabledColor": "#6C737C"
+      "disabledColor": "#9ba0a3"
    },
    "Panel": {
      "background": "#F7F8FA",
      "foreground": "#5B6168"
    },
    "ParameterInfo": {
-      "background": "#F7F8FA",
+      "background": "#F3f3f3",
      "borderColor": "#cce5ff",
      "currentOverloadBackground": "#CCE5FF",
      "currentParameterForeground": "#79CB60",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "infoForeground": "#292D31",
      "lineSeparatorColor": "#cce5ff"
@@ -447,30 +447,30 @@
      "capsLockIconColor": "#79CB60",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "Plugins": {
      "background": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "eapTagBackground": "#CCE5FF",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "lightSelectionBackground": "#cce5ff",
      "paidTagBackground": "#CCE5FF",
-      "selectionBackground": "#3A66D1",
+      "selectionBackground": "#3A66D150",
      "tagForeground": "#79CB60",
      "tagBackground": "#CCE5FF",
      "trialTagBackground": "#CCE5FF",
      "Button": {
-        "installBackground": "#F1F3F6",
-        "installBorderColor": "#F1F3F6",
+        "installBackground": "#edf1f5",
+        "installBorderColor": "#edf1f5",
        "installForeground": "#5B6168",
        "installFocusedBackground": "#CCE5FF",
-        "installFillForeground": "#6C737C",
-        "installFillBackground": "#F1F3F6",
+        "installFillForeground": "#9ba0a3",
+        "installFillBackground": "#edf1f5",
        "updateBackground": "#79CB60",
-        "updateBorderColor": "#F1F3F6",
+        "updateBorderColor": "#edf1f5",
        "updateForeground": "#5B6168"
      },
      "SearchField": {
@@ -478,12 +478,12 @@
        "borderColor": "#DFE1E4"
      },
      "SectionHeader": {
-        "background": "#F7F8FA",
+        "background": "#F3f3f3",
        "foreground": "#5B6168"
      },
      "Tab": {
        "hoverBackground": "#cce5ff",
-        "selectedForeground": "#111111",
+        "selectedForeground": "#FFFFFF",
        "selectedBackground": "#cce5ff"
      }
    },
@@ -493,20 +493,20 @@
        "borderColor": "#F7F8FA",
        "foreground": "#79CB60"
      },
-      "borderColor": "#FFFFFF",
+      "borderColor": "#fafbfc",
      "inactiveBorderColor": "#F7F8FA",
-      "innerBorderColor": "#F7F8FA",
+      "innerBorderColor": "#F3f3f3",
      "Header": {
        "activeBackground": "#F7F8FA",
-        "inactiveBackground": "#FFFFFF"
+        "inactiveBackground": "#fafbfc"
      },
      "paintBorder": true,
      "separatorForeground": "#5B6168",
-      "separatorColor": "#F7F8FA",
+      "separatorColor": "#F3f3f3",
      "Toolbar": {
-        "Floating.background": "#FFFFFF",
-        "background": "#FFFFFF",
-        "borderColor": "#FFFFFF"
+        "Floating.background": "#fafbfc",
+        "background": "#fafbfc",
+        "borderColor": "#fafbfc"
      }
    },
    "PopupMenu": {
@@ -531,7 +531,7 @@
    },
    "RadioButton": {
      "background": "#F7F8FA",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168"
    },
    "RadioButtonMenuItem": {
@@ -539,10 +539,10 @@
      "acceleratorSelectionForeground": "#292D31",
      "background": "#F7F8FA",
      "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#111111"
+      "selectionBackground": "#3A66D150",
+      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#DFE1E4",
    "ScrollBar": {
@@ -581,7 +581,7 @@
    },
    "SearchEverywhere": {
      "Advertiser": {
-        "background": "#FFFFFF",
+        "background": "#fafbfc",
        "foreground": "#292D31"
      },
      "Header": {
@@ -593,7 +593,7 @@
      },
      "SearchField": {
        "background": "#F7F8FA",
-        "borderColor": "#FFFFFF",
+        "borderColor": "#fafbfc",
        "infoForeground": "#292D31"
      },
      "Tab": {
@@ -617,9 +617,9 @@
      "Repeated.File.Foreground": "#5B6168"
    },
    "Separator": {
-      "background": "#F7F8FA",
-      "foreground": "#F7F8FA",
-      "separatorColor": "#F7F8FA"
+      "background": "#F3f3f3",
+      "foreground": "#F3f3f3",
+      "separatorColor": "#F3f3f3"
    },
    "SidePanel": {
      "background": "#F7F8FA"
@@ -630,7 +630,7 @@
      "buttonColor": "#79CB60",
      "foreground": "#5B6168",
      "majorTickLength": 6,
-      "tickColor": "#F7F8FA",
+      "tickColor": "#F3f3f3",
      "trackColor": "#cce5ff",
      "trackWidth": 7,
      "thumb": "#79CB60"
@@ -651,7 +651,7 @@
      "background": "#F7F8FA",
      "highlight": "#F7F8FA"
    },
-    "SplitPaneDivider.draggingColor": "#F7F8FA",
+    "SplitPaneDivider.draggingColor": "#F3f3f3",
    "StatusBar": {
      "borderColor": "#F7F8FA",
      "hoverBackground": "#CCE5FF",
@@ -662,8 +662,8 @@
      "contentAreaColor": "#CCE5FF",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#DFE1E4",
-      "disabledForeground": "#6C737C",
-      "disabledUnderlineColor": "#6C737C",
+      "disabledForeground": "#9ba0a3",
+      "disabledUnderlineColor": "#9ba0a3",
      "focus": "#cce5ff",
      "focusColor": "#cce5ff",
      "fontSizeOffset": 0,
@@ -682,11 +682,11 @@
    },
    "TabbedPane.mt.tab.background": "#F7F8FA",
    "Table": {
-      "alternativeRowBackground": "#FFFFFF",
+      "alternativeRowBackground": "#fafbfc",
      "background": "#F7F8FA",
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "dropLineColor": "#79CB60",
      "dropLineShortColor": "#79CB60",
      "focusCellBackground": "#cce5ff",
@@ -694,29 +694,29 @@
      "foreground": "#5B6168",
      "gridColor": "#F7F8FA",
      "highlightOuter": "#cce5ff",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "hoverInactiveBackground": "#cce5ff",
      "lightSelectionForeground": "#111111",
      "lightSelectionInactiveForeground": "#292D31",
-      "lightSelectionInactiveBackground": "#F7F8FA",
+      "lightSelectionInactiveBackground": "#F3f3f3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111",
      "selectionInactiveBackground": "#cce5ff",
-      "selectionInactiveForeground": "#111111",
+      "selectionInactiveForeground": "#FFFFFF",
      "sortIconColor": "#5B6168",
-      "stripeColor": "#FFFFFF"
+      "stripeColor": "#fafbfc"
    },
    "TableHeader": {
      "background": "#F7F8FA",
      "borderColor": "#F7F8FA",
-      "bottomSeparatorColor": "#F7F8FA",
+      "bottomSeparatorColor": "#F3f3f3",
      "cellBorder": "4,0,4,0",
-      "disabledForeground": "#6C737C",
+      "disabledForeground": "#9ba0a3",
      "foreground": "#5B6168",
      "focusCellBackground": "#cce5ff",
      "focusCellForeground": "#111111",
      "height": 25,
-      "separatorColor": "#F7F8FA"
+      "separatorColor": "#F3f3f3"
    },
    "text": "#292D31",
    "textInactiveText": "#292D31",
@@ -725,7 +725,7 @@
      "background": "#F7F8FA",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
@@ -733,7 +733,7 @@
      "background": "#F7F8FA",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
@@ -741,12 +741,12 @@
      "background": "#F7F8FA",
      "caretForeground": "#79CB60",
      "foreground": "#5B6168",
-      "inactiveForeground": "#6C737C",
+      "inactiveForeground": "#9ba0a3",
      "selectionBackground": "#cce5ff",
      "selectionForeground": "#111111"
    },
    "TitlePane": {
-      "background": "#FFFFFF",
+      "background": "#fafbfc",
      "Button.hoverBackground": "#CCE5FF",
      "inactiveBackground": "#F7F8FA",
      "infoForeground": "#292D31",
@@ -754,9 +754,9 @@
    },
    "TitledBorder.titleColor": "#5B6168",
    "ToggleButton": {
-      "borderColor": "#F1F3F6",
+      "borderColor": "#edf1f5",
      "buttonColor": "#5B6168",
-      "disabledText": "#6C737C",
+      "disabledText": "#9ba0a3",
      "foreground": "#5B6168",
      "offForeground": "#F7F8FA",
      "offBackground": "#F7F8FA",
@@ -783,11 +783,11 @@
      "Button": {
        "hoverBackground": "#cce5ff",
        "selectedForeground": "#111111",
-        "selectedBackground": "#FFFFFF"
+        "selectedBackground": "#fafbfc"
      },
      "Header": {
        "background": "#F7F8FA",
-        "borderColor": "#F7F8FA",
+        "borderColor": "#F3f3f3",
        "inactiveBackground": "#F7F8FA"
      },
      "HeaderCloseButton": {
@@ -798,12 +798,12 @@
        "hoverBackground": "#CCE5FF",
        "hoverInactiveBackground": "#CCE5FF",
        "inactiveUnderlineColor": "#79CB60",
-        "selectedBackground": "#FFFFFF",
-        "selectedInactiveBackground": "#FFFFFF",
+        "selectedBackground": "#fafbfc",
+        "selectedInactiveBackground": "#fafbfc",
        "underlineColor": "#79CB60",
        "underlinedTabBackground": "#cce5ff",
-        "underlinedTabInactiveBackground": "#F7F8FA",
-        "underlinedTabForeground": "#111111",
+        "underlinedTabInactiveBackground": "#F3f3f3",
+        "underlinedTabForeground": "#FFFFFF",
        "underlinedTabInactiveForeground": "#5B6168"
      }
    },
@@ -811,21 +811,21 @@
      "background": "#F7F8FA",
      "foreground": "#292D31",
      "hash": "#DFE1E4",
-      "hoverBackground": "#3A66D170",
+      "hoverBackground": "#3A66D1",
      "hoverInactiveBackground": "#cce5ff",
      "modifiedItemForeground": "#79CB60",
      "rowHeight": 28,
-      "selectionBackground": "#3A66D170",
-      "selectionForeground": "#111111",
-      "selectionInactiveForeground": "#111111",
-      "selectionInactiveBackground": "#3A66D170",
+      "selectionBackground": "#3A66D1",
+      "selectionForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#3A66D1",
      "textBackground": "#F7F8FA"
    },
    "Tree.leftChildIndent": 10,
    "Tree.rightChildIndent": 5,
    "UIDesigner": {
      "Activity.borderColor": "#DFE1E4",
-      "Canvas.background": "#FFFFFF",
+      "Canvas.background": "#fafbfc",
      "ColorPicker": {
        "background": "#F7F8FA",
        "foreground": "#5B6168"
@@ -840,34 +840,34 @@
        "borderColor": "#DFE1E4",
        "hoverBorderColor": "#CCE5FF"
      },
-      "Canvas.background": "#FFFFFF",
+      "Canvas.background": "#fafbfc",
      "highStroke.foreground": "#5B6168",
      "Label.foreground": "#292D31",
-      "List.selectionBackground": "#3A66D170",
+      "List.selectionBackground": "#3A66D1",
      "motion": {
        "borderColor": "#DFE1E4",
        "Component.foreground": "#5B6168",
        "ConstraintSetText.foreground": "#292D31",
-        "ConstraintSet.background": "#F7F8FA",
-        "CSPanel.SelectedFocusBackground": "#3A66D1",
-        "CSPanel.SelectedBackground": "#3A66D170",
+        "ConstraintSet.background": "#F3f3f3",
+        "CSPanel.SelectedFocusBackground": "#3A66D150",
+        "CSPanel.SelectedBackground": "#3A66D1",
        "cs_FocusText.infoForeground": "#292D31",
        "CursorTextColor.foreground": "#5B6168",
-        "HoverColor.disabledBackground": "#6C737C",
+        "HoverColor.disabledBackground": "#9ba0a3",
        "motionGraph.background": "#F7F8FA",
        "Notification.background": "#DFECFE",
-        "ourAvg.background": "#F7F8FA",
-        "ourCS.background": "#F7F8FA",
+        "ourAvg.background": "#F3f3f3",
+        "ourCS.background": "#F3f3f3",
        "ourCS_Border.borderColor": "#DFE1E4",
        "ourCS_TextColor.foreground": "#292D31",
-        "ourCS_SelectedFocusBackground.selectionForeground": "#111111",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#cce5ff",
        "ourCS_SelectedBorder.pressedBorderColor": "#CCE5FF",
        "ourML_BarColor.separatorColor": "#DFE1E4",
-        "PrimaryPanel.background": "#FFFFFF",
+        "PrimaryPanel.background": "#fafbfc",
        "SecondaryPanel.background": "#F7F8FA",
        "SecondaryPanel.header.foreground": "#292D31",
-        "SecondaryPanel.header.background": "#FFFFFF",
+        "SecondaryPanel.header.background": "#fafbfc",
        "timeLine.disabledBorderColor": "#DFE1E4"
      },
      "Panel": {
@@ -879,7 +879,7 @@
        "background": "#F7F8FA",
        "borderColor": "#DFE1E4",
        "foreground": "#5B6168",
-        "selectedForeground": "#111111"
+        "selectedForeground": "#FFFFFF"
      },
      "Preview.background": "#F7F8FA",
      "stroke.acceleratorForeground": "#292D31"
@@ -906,7 +906,7 @@
      "HgLog": {
        "branchIconColor": "#79CB60",
        "bookmarkIconColor": "#111111",
-        "closedBranchIconColor": "#6C737C",
+        "closedBranchIconColor": "#9ba0a3",
        "localTagIconColor": "#292D31",
        "mqTagIconColor": "#292D31",
        "tagIconColor": "#292D31",
@@ -914,8 +914,8 @@
      },
      "Log": {
        "Commit.unmatchedForeground": "#292D31",
-        "Commit.currentBranchBackground": "#F7F8FA",
-        "Commit.hoveredBackground": "#3A66D170"
+        "Commit.currentBranchBackground": "#F3f3f3",
+        "Commit.hoveredBackground": "#3A66D1"
      },
      "RefLabel": {
        "foreground": "#111111",
@@ -930,22 +930,22 @@
      "AssociatedComponent.background": "#F7F8FA",
      "background": "#F7F8FA",
      "borderColor": "#F7F8FA",
-      "captionBackground": "#FFFFFF",
+      "captionBackground": "#fafbfc",
      "captionForeground": "#5B6168",
      "Details.background": "#F7F8FA",
-      "footerBackground": "#FFFFFF",
+      "footerBackground": "#fafbfc",
      "footerForeground": "#5B6168",
      "headerBackground": "#F7F8FA",
      "headerForeground": "#5B6168",
-      "List.background": "#FFFFFF",
+      "List.background": "#fafbfc",
      "separatorColor": "#DFE1E4",
-      "SidePanel.background": "#F7F8FA",
+      "SidePanel.background": "#F3f3f3",
      "Projects": {
-        "actions.background": "#FFFFFF",
+        "actions.background": "#fafbfc",
        "actions.selectionBackground": "#CCE5FF",
-        "background": "#F7F8FA",
-        "selectionBackground": "#3A66D1",
-        "selectionInactiveBackground": "#F7F8FA"
+        "background": "#F3f3f3",
+        "selectionBackground": "#3A66D150",
+        "selectionInactiveBackground": "#F3f3f3"
      }
    },
    "window": "#F7F8FA",
@@ -955,14 +955,14 @@
  },
  "icons": {
    "ColorPalette": {
-      "#43494A": "#FFFFFF",
+      "#43494A": "#fafbfc",
      "#6B6B6B": "#292D31",
      "#A7A7A7": "#F7F8FA",
      "#3D6185": "#79CB60",
      "#466D94": "#79CB60",
      "#3C3F41": "#F7F8FA",
-      "#545556": "#6C737C",
-      "#606060": "#6C737C",
+      "#545556": "#9ba0a3",
+      "#606060": "#9ba0a3",
      "#9AA7B0": "#5B6168",
      "#675133": "#79CB60",
      "Actions.Blue": "#6F42C1",
@@ -972,20 +972,20 @@
      "Actions.GreyInline.Dark": "#5B6168",
      "Actions.Red": "#22863A",
      "Actions.Yellow": "#6F42C1",
-      "Checkbox.Background.Default": "#FFFFFF",
-      "Checkbox.Background.Default.Dark": "#FFFFFF",
-      "Checkbox.Background.Disabled": "#FDFDFD",
-      "Checkbox.Background.Disabled.Dark": "#FDFDFD",
+      "Checkbox.Background.Default": "#fafbfc",
+      "Checkbox.Background.Default.Dark": "#fafbfc",
+      "Checkbox.Background.Disabled": "#dcdcdc",
+      "Checkbox.Background.Disabled.Dark": "#dcdcdc",
      "Checkbox.Border.Default": "#DFE1E4",
      "Checkbox.Border.Default.Dark": "#DFE1E4",
-      "Checkbox.Border.Disabled": "#6C737C",
-      "Checkbox.Border.Disabled.Dark": "#6C737C",
+      "Checkbox.Border.Disabled": "#9ba0a3",
+      "Checkbox.Border.Disabled.Dark": "#9ba0a3",
      "Checkbox.Focus.Thin.Default": "#79CB60",
      "Checkbox.Focus.Thin.Default.Dark": "#79CB60",
      "Checkbox.Focus.Wide": "#79CB60",
      "Checkbox.Focus.Wide.Dark": "#79CB60",
-      "Checkbox.Foreground.Disabled": "#6C737C",
-      "Checkbox.Foreground.Disabled.Dark": "#6C737C",
+      "Checkbox.Foreground.Disabled": "#9ba0a3",
+      "Checkbox.Foreground.Disabled.Dark": "#9ba0a3",
      "Checkbox.Background.Selected": "#79CB60",
      "Checkbox.Background.Selected.Dark": "#F7F8FA",
      "Checkbox.Border.Selected": "#79CB60",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -23,7 +23,7 @@
      "inactiveBackground": "#323232",
      "inactiveForeground": "#727272",
      "infoForeground": "#727272",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionBackgroundInactive": "#292929",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#292929",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#FF980050"
    },
    "Autocomplete": {
-      "selectionBackground": "#353535"
+      "selectionBackground": "#404040"
    },
    "Borders.ContrastBorderColor": "#212121",
    "Borders.color": "#292929",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#1A1A1A",
-      "selectionBackground": "#353535"
+      "selectionBackground": "#404040"
    },
    "CheckBox": {
      "background": "#212121",
@@ -95,7 +95,7 @@
      "disabledBackground": "#212121",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#727272",
-      "selectionInactiveBackground": "#35353550",
-      "selectionBackground": "#35353580",
+      "selectionInactiveBackground": "#404040",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -213,7 +213,7 @@
      "foreground": "#B0BEC5",
      "inactiveBackground": "#212121",
      "inactiveForeground": "#474747",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#292929",
      "foreground": "#B0BEC5",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "hoverInactiveBackground": "#323232",
-      "selectionBackground": "#35353550",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#32323270"
+      "selectionInactiveBackground": "#323232C0"
    },
    "material": {
      "background": "#212121",
@@ -358,7 +358,7 @@
      "disabledBackground": "#292929",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#292929"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
      "highlight": "#212121",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "shadow": "#1A1A1A"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#212121",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#212121",
      "disabledForeground": "#474747",
      "eapTagBackground": "#3F3F3F",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "lightSelectionBackground": "#323232",
      "paidTagBackground": "#3F3F3F",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "tagForeground": "#FF9800",
      "tagBackground": "#3F3F3F",
      "trialTagBackground": "#3F3F3F",
@@ -541,7 +541,7 @@
      "disabledBackground": "#212121",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#292929",
@@ -694,7 +694,7 @@
      "foreground": "#B0BEC5",
      "gridColor": "#212121",
      "highlightOuter": "#323232",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "hoverInactiveBackground": "#323232",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#727272",
@@ -811,14 +811,14 @@
      "background": "#1A1A1A",
      "foreground": "#727272",
      "hash": "#292929",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "hoverInactiveBackground": "#323232",
      "modifiedItemForeground": "#FF9800",
      "rowHeight": 28,
-      "selectionBackground": "#32323270",
+      "selectionBackground": "#323232C0",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#32323270",
+      "selectionInactiveBackground": "#323232C0",
      "textBackground": "#1A1A1A"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#1A1A1A",
      "highStroke.foreground": "#B0BEC5",
      "Label.foreground": "#727272",
-      "List.selectionBackground": "#32323270",
+      "List.selectionBackground": "#323232C0",
      "motion": {
        "borderColor": "#292929",
        "Component.foreground": "#B0BEC5",
        "ConstraintSetText.foreground": "#727272",
        "ConstraintSet.background": "#292929",
-        "CSPanel.SelectedFocusBackground": "#353535",
-        "CSPanel.SelectedBackground": "#32323270",
+        "CSPanel.SelectedFocusBackground": "#404040",
+        "CSPanel.SelectedBackground": "#323232C0",
        "cs_FocusText.infoForeground": "#727272",
        "CursorTextColor.foreground": "#B0BEC5",
        "HoverColor.disabledBackground": "#474747",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#727272",
        "Commit.currentBranchBackground": "#292929",
-        "Commit.hoveredBackground": "#32323270"
+        "Commit.hoveredBackground": "#323232C0"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#1A1A1A",
        "actions.selectionBackground": "#3F3F3F",
        "background": "#292929",
-        "selectionBackground": "#353535",
+        "selectionBackground": "#404040",
        "selectionInactiveBackground": "#292929"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -23,7 +23,7 @@
      "inactiveBackground": "#323232",
      "inactiveForeground": "#727272",
      "infoForeground": "#727272",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionBackgroundInactive": "#292929",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#292929",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#FF980050"
    },
    "Autocomplete": {
-      "selectionBackground": "#353535"
+      "selectionBackground": "#404040"
    },
    "Borders.ContrastBorderColor": "#212121",
    "Borders.color": "#292929",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#1A1A1A",
-      "selectionBackground": "#353535"
+      "selectionBackground": "#404040"
    },
    "CheckBox": {
      "background": "#212121",
@@ -95,7 +95,7 @@
      "disabledBackground": "#212121",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#727272",
-      "selectionInactiveBackground": "#35353550",
-      "selectionBackground": "#35353580",
+      "selectionInactiveBackground": "#404040",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -213,7 +213,7 @@
      "foreground": "#B0BEC5",
      "inactiveBackground": "#212121",
      "inactiveForeground": "#474747",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#292929",
      "foreground": "#B0BEC5",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "hoverInactiveBackground": "#323232",
-      "selectionBackground": "#35353550",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#32323270"
+      "selectionInactiveBackground": "#323232C0"
    },
    "material": {
      "background": "#212121",
@@ -358,7 +358,7 @@
      "disabledBackground": "#292929",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#292929"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
      "highlight": "#212121",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF",
      "shadow": "#212121"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#212121",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#212121",
      "disabledForeground": "#474747",
      "eapTagBackground": "#3F3F3F",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "lightSelectionBackground": "#323232",
      "paidTagBackground": "#3F3F3F",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "tagForeground": "#FF9800",
      "tagBackground": "#3F3F3F",
      "trialTagBackground": "#3F3F3F",
@@ -541,7 +541,7 @@
      "disabledBackground": "#212121",
      "disabledForeground": "#474747",
      "foreground": "#B0BEC5",
-      "selectionBackground": "#353535",
+      "selectionBackground": "#404040",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#292929",
@@ -694,7 +694,7 @@
      "foreground": "#B0BEC5",
      "gridColor": "#212121",
      "highlightOuter": "#323232",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "hoverInactiveBackground": "#323232",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#727272",
@@ -811,14 +811,14 @@
      "background": "#212121",
      "foreground": "#727272",
      "hash": "#292929",
-      "hoverBackground": "#32323270",
+      "hoverBackground": "#323232C0",
      "hoverInactiveBackground": "#323232",
      "modifiedItemForeground": "#FF9800",
      "rowHeight": 28,
-      "selectionBackground": "#32323270",
+      "selectionBackground": "#323232C0",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#32323270",
+      "selectionInactiveBackground": "#323232C0",
      "textBackground": "#212121"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#1A1A1A",
      "highStroke.foreground": "#B0BEC5",
      "Label.foreground": "#727272",
-      "List.selectionBackground": "#32323270",
+      "List.selectionBackground": "#323232C0",
      "motion": {
        "borderColor": "#292929",
        "Component.foreground": "#B0BEC5",
        "ConstraintSetText.foreground": "#727272",
        "ConstraintSet.background": "#292929",
-        "CSPanel.SelectedFocusBackground": "#353535",
-        "CSPanel.SelectedBackground": "#32323270",
+        "CSPanel.SelectedFocusBackground": "#404040",
+        "CSPanel.SelectedBackground": "#323232C0",
        "cs_FocusText.infoForeground": "#727272",
        "CursorTextColor.foreground": "#B0BEC5",
        "HoverColor.disabledBackground": "#474747",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#727272",
        "Commit.currentBranchBackground": "#292929",
-        "Commit.hoveredBackground": "#32323270"
+        "Commit.hoveredBackground": "#323232C0"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#1A1A1A",
        "actions.selectionBackground": "#3F3F3F",
        "background": "#292929",
-        "selectionBackground": "#353535",
+        "selectionBackground": "#404040",
        "selectionInactiveBackground": "#292929"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -23,7 +23,7 @@
      "inactiveBackground": "#292D3E",
      "inactiveForeground": "#4B526D",
      "infoForeground": "#4B526D",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionBackgroundInactive": "#181A1F",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#181A1F",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#84ffff50"
    },
    "Autocomplete": {
-      "selectionBackground": "#232632"
+      "selectionBackground": "#717CB480"
    },
    "Borders.ContrastBorderColor": "#0F111A",
    "Borders.color": "#0F111A",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#090B10",
-      "selectionBackground": "#232632"
+      "selectionBackground": "#717CB480"
    },
    "CheckBox": {
      "background": "#0F111A",
@@ -95,7 +95,7 @@
      "disabledBackground": "#0F111A",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#4B526D",
-      "selectionInactiveBackground": "#23263250",
-      "selectionBackground": "#23263280",
+      "selectionInactiveBackground": "#717CB480",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -213,7 +213,7 @@
      "foreground": "#8F93A2",
      "inactiveBackground": "#0F111A",
      "inactiveForeground": "#464B5D",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#181A1F",
      "foreground": "#8F93A2",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "hoverInactiveBackground": "#1A1C25",
-      "selectionBackground": "#23263250",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB416"
+      "selectionInactiveBackground": "#717CB430"
    },
    "material": {
      "background": "#0F111A",
@@ -358,7 +358,7 @@
      "disabledBackground": "#181A1F",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#0F111A"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
      "highlight": "#0F111A",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "shadow": "#090B10"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#0F111A",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#0F111A",
      "disabledForeground": "#464B5D",
      "eapTagBackground": "#1F2233",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "lightSelectionBackground": "#1A1C25",
      "paidTagBackground": "#1F2233",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "tagForeground": "#84ffff",
      "tagBackground": "#1F2233",
      "trialTagBackground": "#1F2233",
@@ -541,7 +541,7 @@
      "disabledBackground": "#0F111A",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#0F111A",
@@ -694,7 +694,7 @@
      "foreground": "#8F93A2",
      "gridColor": "#0F111A",
      "highlightOuter": "#1A1C25",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "hoverInactiveBackground": "#1A1C25",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#4B526D",
@@ -811,14 +811,14 @@
      "background": "#090B10",
      "foreground": "#4B526D",
      "hash": "#0F111A",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "hoverInactiveBackground": "#1A1C25",
      "modifiedItemForeground": "#84ffff",
      "rowHeight": 28,
-      "selectionBackground": "#717CB416",
+      "selectionBackground": "#717CB430",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB416",
+      "selectionInactiveBackground": "#717CB430",
      "textBackground": "#090B10"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#090B10",
      "highStroke.foreground": "#8F93A2",
      "Label.foreground": "#4B526D",
-      "List.selectionBackground": "#717CB416",
+      "List.selectionBackground": "#717CB430",
      "motion": {
        "borderColor": "#0F111A",
        "Component.foreground": "#8F93A2",
        "ConstraintSetText.foreground": "#4B526D",
        "ConstraintSet.background": "#181A1F",
-        "CSPanel.SelectedFocusBackground": "#232632",
-        "CSPanel.SelectedBackground": "#717CB416",
+        "CSPanel.SelectedFocusBackground": "#717CB480",
+        "CSPanel.SelectedBackground": "#717CB430",
        "cs_FocusText.infoForeground": "#4B526D",
        "CursorTextColor.foreground": "#8F93A2",
        "HoverColor.disabledBackground": "#464B5D",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#4B526D",
        "Commit.currentBranchBackground": "#181A1F",
-        "Commit.hoveredBackground": "#717CB416"
+        "Commit.hoveredBackground": "#717CB430"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#090B10",
        "actions.selectionBackground": "#1F2233",
        "background": "#181A1F",
-        "selectionBackground": "#232632",
+        "selectionBackground": "#717CB480",
        "selectionInactiveBackground": "#181A1F"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -23,7 +23,7 @@
      "inactiveBackground": "#292D3E",
      "inactiveForeground": "#4B526D",
      "infoForeground": "#4B526D",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionBackgroundInactive": "#181A1F",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#181A1F",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#84ffff50"
    },
    "Autocomplete": {
-      "selectionBackground": "#232632"
+      "selectionBackground": "#717CB480"
    },
    "Borders.ContrastBorderColor": "#0F111A",
    "Borders.color": "#0F111A",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#090B10",
-      "selectionBackground": "#232632"
+      "selectionBackground": "#717CB480"
    },
    "CheckBox": {
      "background": "#0F111A",
@@ -95,7 +95,7 @@
      "disabledBackground": "#0F111A",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#4B526D",
-      "selectionInactiveBackground": "#23263250",
-      "selectionBackground": "#23263280",
+      "selectionInactiveBackground": "#717CB480",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -213,7 +213,7 @@
      "foreground": "#8F93A2",
      "inactiveBackground": "#0F111A",
      "inactiveForeground": "#464B5D",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#181A1F",
      "foreground": "#8F93A2",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "hoverInactiveBackground": "#1A1C25",
-      "selectionBackground": "#23263250",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB416"
+      "selectionInactiveBackground": "#717CB430"
    },
    "material": {
      "background": "#0F111A",
@@ -358,7 +358,7 @@
      "disabledBackground": "#181A1F",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#0F111A"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
      "highlight": "#0F111A",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF",
      "shadow": "#0F111A"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#0F111A",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#0F111A",
      "disabledForeground": "#464B5D",
      "eapTagBackground": "#1F2233",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "lightSelectionBackground": "#1A1C25",
      "paidTagBackground": "#1F2233",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "tagForeground": "#84ffff",
      "tagBackground": "#1F2233",
      "trialTagBackground": "#1F2233",
@@ -541,7 +541,7 @@
      "disabledBackground": "#0F111A",
      "disabledForeground": "#464B5D",
      "foreground": "#8F93A2",
-      "selectionBackground": "#232632",
+      "selectionBackground": "#717CB480",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#0F111A",
@@ -694,7 +694,7 @@
      "foreground": "#8F93A2",
      "gridColor": "#0F111A",
      "highlightOuter": "#1A1C25",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "hoverInactiveBackground": "#1A1C25",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#4B526D",
@@ -811,14 +811,14 @@
      "background": "#0F111A",
      "foreground": "#4B526D",
      "hash": "#0F111A",
-      "hoverBackground": "#717CB416",
+      "hoverBackground": "#717CB430",
      "hoverInactiveBackground": "#1A1C25",
      "modifiedItemForeground": "#84ffff",
      "rowHeight": 28,
-      "selectionBackground": "#717CB416",
+      "selectionBackground": "#717CB430",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB416",
+      "selectionInactiveBackground": "#717CB430",
      "textBackground": "#0F111A"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#090B10",
      "highStroke.foreground": "#8F93A2",
      "Label.foreground": "#4B526D",
-      "List.selectionBackground": "#717CB416",
+      "List.selectionBackground": "#717CB430",
      "motion": {
        "borderColor": "#0F111A",
        "Component.foreground": "#8F93A2",
        "ConstraintSetText.foreground": "#4B526D",
        "ConstraintSet.background": "#181A1F",
-        "CSPanel.SelectedFocusBackground": "#232632",
-        "CSPanel.SelectedBackground": "#717CB416",
+        "CSPanel.SelectedFocusBackground": "#717CB480",
+        "CSPanel.SelectedBackground": "#717CB430",
        "cs_FocusText.infoForeground": "#4B526D",
        "CursorTextColor.foreground": "#8F93A2",
        "HoverColor.disabledBackground": "#464B5D",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#4B526D",
        "Commit.currentBranchBackground": "#181A1F",
-        "Commit.hoveredBackground": "#717CB416"
+        "Commit.hoveredBackground": "#717CB430"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#090B10",
        "actions.selectionBackground": "#1F2233",
        "background": "#181A1F",
-        "selectionBackground": "#232632",
+        "selectionBackground": "#717CB480",
        "selectionInactiveBackground": "#181A1F"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -14,19 +14,19 @@
      "acceleratorSelectionForeground": "#94A7B0",
      "background": "#FAFAFA",
      "borderColor": "#d3e1e8",
-      "disabledBackground": "#eae8e8",
+      "disabledBackground": "#CCD7DA50",
      "disabledForeground": "#D2D4D5",
      "disabledText": "#D2D4D5",
      "focusColor": "#E7E7E8",
      "focusedBorderColor": "#00BCD4",
      "foreground": "#546E7A",
-      "inactiveBackground": "#eae8e8",
+      "inactiveBackground": "#CCD7DA50",
      "inactiveForeground": "#94A7B0",
      "infoForeground": "#94A7B0",
-      "selectionBackground": "#80CBC4",
-      "selectionBackgroundInactive": "#eae8e8",
+      "selectionBackground": "#80CBC440",
+      "selectionBackgroundInactive": "#FFFFFF",
      "selectionForeground": "#546e7a",
-      "selectionInactiveBackground": "#eae8e8",
+      "selectionInactiveBackground": "#FFFFFF",
      "separatorColor": "#d3e1e8"
    },
    "activeCaption": "#FAFAFA",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#00BCD450"
    },
    "Autocomplete": {
-      "selectionBackground": "#80CBC4"
+      "selectionBackground": "#80CBC440"
    },
    "Borders.ContrastBorderColor": "#FAFAFA",
    "Borders.color": "#d3e1e8",
@@ -49,7 +49,7 @@
      "default": {
        "endBackground": "#E7E7E8",
        "endBorderColor": "#E7E7E8",
-        "foreground": "#546e7a",
+        "foreground": "#272727",
        "focusColor": "#00BCD4",
        "focusedBorderColor": "#00BCD4",
        "shadowColor": "#E7E7E8",
@@ -79,8 +79,8 @@
      "Tooltip.background": "#eae8e8"
    },
    "Content": {
-      "background": "#F4F4F4",
-      "selectionBackground": "#80CBC4"
+      "background": "#EEEEEE",
+      "selectionBackground": "#80CBC440"
    },
    "CheckBox": {
      "background": "#FAFAFA",
@@ -95,14 +95,14 @@
      "disabledBackground": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
-      "selectionForeground": "#546e7a"
+      "selectionBackground": "#80CBC440",
+      "selectionForeground": "#272727"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#546E7A",
      "AccessEnabled": {
        "accessDot": "#00BCD4",
-        "dropdownBorder": "#eae8e8",
+        "dropdownBorder": "#FFFFFF",
        "pillBackground": "$second"
      }
    },
@@ -119,20 +119,20 @@
        "iconColor": "#546E7A",
        "nonEditableBackground": "#FAFAFA"
      },
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "buttonBackground": "#F3F4F5",
      "darcula.hoveredArrowButtonForeground": "#00BCD4",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
      "modifiedItemForeground": "#00BCD4",
-      "nonEditableBackground": "#eae8e8",
+      "nonEditableBackground": "#FFFFFF",
      "padding": "5,5,5,5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "ComboPopup.border": "#d3e1e8",
    "CompletionPopup": {
-      "background": "#eae8e8",
+      "background": "#FFFFFF",
      "foreground": "#546E7A",
      "infoForeground": "#94A7B0",
      "matchForeground": "#00BCD4",
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#546e7a",
      "selectionGrayForeground": "#546e7a",
      "selectionInactiveInfoForeground": "#94A7B0",
-      "selectionInactiveBackground": "#80CBC450",
-      "selectionBackground": "#80CBC480",
+      "selectionInactiveBackground": "#80CBC440",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
      "selectionInfoForeground": "#546e7a"
    },
@@ -184,12 +184,12 @@
      "background": "#FAFAFA",
      "borderColor": "#FAFAFA",
      "hoverBackground": "#E7E7E8",
-      "hoverColor": "#F4F4F4",
+      "hoverColor": "#EEEEEE",
      "hoverMaskColor": "#E7E7E8",
      "inactiveColoredTabBackground": "#FAFAFA",
      "inactiveColoredFileBackground": "#F3F4F5",
      "inactiveUnderlineColor": "#00BCD4",
-      "inactiveMaskColor": "#F4F4F4",
+      "inactiveMaskColor": "#EEEEEE",
      "underlineColor": "#00BCD4",
      "underlinedTabBackground": "#E7E7E8",
      "underlinedTabForeground": "#546e7a"
@@ -203,21 +203,21 @@
      "areaForeground": "#546E7A"
    },
    "Editor": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "foreground": "#546E7A",
      "shortcutForeground": "#94A7B0"
    },
    "EditorPane": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "caretForeground": "#00BCD4",
      "foreground": "#546E7A",
      "inactiveBackground": "#FAFAFA",
      "inactiveForeground": "#D2D4D5",
-      "selectionBackground": "#80CBC4",
-      "selectionForeground": "#546e7a"
+      "selectionBackground": "#80CBC440",
+      "selectionForeground": "#272727"
    },
    "EditorTabs": {
-      "borderColor": "#eae8e8",
+      "borderColor": "#FFFFFF",
      "hoverBackground": "#E7E7E8",
      "hoverColor": "#E7E7E8",
      "hoverMaskColor": "#E7E7E8",
@@ -232,7 +232,7 @@
    },
    "EditorGroupsTabs": {
      "background": "#FAFAFA",
-      "borderColor": "#eae8e8",
+      "borderColor": "#FFFFFF",
      "hoverBackground": "#E7E7E8",
      "hoverColor": "#E7E7E8",
      "inactiveUnderlineColor": "#00BCD4",
@@ -243,7 +243,7 @@
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#eae8e8",
+      "Yellow": "#CCD7DA50",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -260,12 +260,12 @@
    },
    "Focus.color": "#d3e1e8",
    "FormattedTextField": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "caretForeground": "#00BCD4",
      "foreground": "#546E7A",
      "inactiveBackground": "#F3F4F5",
      "inactiveForeground": "#D2D4D5",
-      "selectionForeground": "#546e7a",
+      "selectionForeground": "#272727",
      "selectionBackground": "#E7E7E8"
    },
    "GotItTooltip.borderColor": "#eae8e8",
@@ -279,7 +279,7 @@
    },
    "HeaderColor": {
      "active": "#FAFAFA",
-      "inactive": "#F4F4F4"
+      "inactive": "#EEEEEE"
    },
    "HelpTooltip": {
      "background": "#FAFAFA",
@@ -289,7 +289,7 @@
      "shortcutForeground": "#94A7B0"
    },
    "Hyperlink.linkColor": "#00BCD4",
-    "inactiveCaption": "#eae8e8",
+    "inactiveCaption": "#FFFFFF",
    "inactiveCaptionBorder": "#FAFAFA",
    "inactiveCaptionText": "#94A7B0",
    "info": "#94A7B0",
@@ -311,7 +311,7 @@
      "disabledText": "#D2D4D5",
      "foreground": "#546E7A",
      "infoForeground": "#94A7B0",
-      "selectedForeground": "#546e7a",
+      "selectedForeground": "#272727",
      "selectedDisabledForeground": "#546E7A"
    },
    "Link": {
@@ -323,19 +323,19 @@
    },
    "link.foreground": "#00BCD4",
    "List": {
-      "background": "#eae8e8",
+      "background": "#FFFFFF",
      "foreground": "#546E7A",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "hoverInactiveBackground": "#E7E7E8",
-      "selectionBackground": "#80CBC450",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
-      "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC480"
+      "selectionInactiveForeground": "#272727",
+      "selectionInactiveBackground": "#80CBC440"
    },
    "material": {
      "background": "#FAFAFA",
      "branchColor": "#546E7A",
-      "contrast": "#F4F4F4",
+      "contrast": "#EEEEEE",
      "foreground": "#546E7A",
      "mergeCommits": "#F3F4F5",
      "primaryColor": "#94A7B0",
@@ -345,7 +345,7 @@
      "tagColor": "#94A7B0"
    },
    "MemoryIndicator": {
-      "allocatedBackground": "#eae8e8",
+      "allocatedBackground": "#FFFFFF",
      "usedColor": "#E7E7E8",
      "usedBackground": "#E7E7E8"
    },
@@ -354,24 +354,24 @@
      "acceleratorSelectionForeground": "#546e7a",
      "background": "#FAFAFA",
      "border": "4,2,4,2",
-      "borderColor": "#eae8e8",
-      "disabledBackground": "#eae8e8",
+      "borderColor": "#FFFFFF",
+      "disabledBackground": "#FFFFFF",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
      "separatorColor": "#d3e1e8"
    },
    "MenuBar": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "borderColor": "#FAFAFA",
      "disabledBackground": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
      "highlight": "#FAFAFA",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
-      "shadow": "#F4F4F4"
+      "shadow": "#EEEEEE"
    },
    "MenuItem": {
      "acceleratorForeground": "#94A7B0",
@@ -381,7 +381,7 @@
      "disabledBackground": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a"
    },
    "NavBar": {
@@ -393,7 +393,7 @@
        "background": "#FAFAFA"
      },
      "SearchField": {
-        "background": "#F4F4F4"
+        "background": "#EEEEEE"
      }
    },
    "NewPSD.warning": "#00BCD4",
@@ -433,7 +433,7 @@
      "foreground": "#546E7A"
    },
    "ParameterInfo": {
-      "background": "#eae8e8",
+      "background": "#FFFFFF",
      "borderColor": "#E7E7E8",
      "currentOverloadBackground": "#E7E7E8",
      "currentParameterForeground": "#00BCD4",
@@ -443,22 +443,22 @@
      "lineSeparatorColor": "#E7E7E8"
    },
    "PasswordField": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "capsLockIconColor": "#00BCD4",
      "caretForeground": "#00BCD4",
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "Plugins": {
      "background": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "eapTagBackground": "#E7E7E8",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "lightSelectionBackground": "#E7E7E8",
      "paidTagBackground": "#E7E7E8",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "tagForeground": "#00BCD4",
      "tagBackground": "#E7E7E8",
      "trialTagBackground": "#E7E7E8",
@@ -474,11 +474,11 @@
        "updateForeground": "#546E7A"
      },
      "SearchField": {
-        "background": "#F4F4F4",
+        "background": "#EEEEEE",
        "borderColor": "#d3e1e8"
      },
      "SectionHeader": {
-        "background": "#eae8e8",
+        "background": "#FFFFFF",
        "foreground": "#546E7A"
      },
      "Tab": {
@@ -493,20 +493,20 @@
        "borderColor": "#FAFAFA",
        "foreground": "#00BCD4"
      },
-      "borderColor": "#F4F4F4",
+      "borderColor": "#EEEEEE",
      "inactiveBorderColor": "#FAFAFA",
-      "innerBorderColor": "#eae8e8",
+      "innerBorderColor": "#FFFFFF",
      "Header": {
        "activeBackground": "#FAFAFA",
-        "inactiveBackground": "#F4F4F4"
+        "inactiveBackground": "#EEEEEE"
      },
      "paintBorder": true,
      "separatorForeground": "#546E7A",
-      "separatorColor": "#eae8e8",
+      "separatorColor": "#FFFFFF",
      "Toolbar": {
-        "Floating.background": "#F4F4F4",
-        "background": "#F4F4F4",
-        "borderColor": "#F4F4F4"
+        "Floating.background": "#EEEEEE",
+        "background": "#EEEEEE",
+        "borderColor": "#EEEEEE"
      }
    },
    "PopupMenu": {
@@ -541,7 +541,7 @@
      "disabledBackground": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a"
    },
    "ScreenView.borderColor": "#d3e1e8",
@@ -581,7 +581,7 @@
    },
    "SearchEverywhere": {
      "Advertiser": {
-        "background": "#F4F4F4",
+        "background": "#EEEEEE",
        "foreground": "#94A7B0"
      },
      "Header": {
@@ -593,12 +593,12 @@
      },
      "SearchField": {
        "background": "#FAFAFA",
-        "borderColor": "#F4F4F4",
+        "borderColor": "#EEEEEE",
        "infoForeground": "#94A7B0"
      },
      "Tab": {
-        "active.foreground": "#546e7a",
-        "selectedForeground": "#546e7a",
+        "active.foreground": "#272727",
+        "selectedForeground": "#272727",
        "selectedBackground": "#E7E7E8"
      }
    },
@@ -617,12 +617,12 @@
      "Repeated.File.Foreground": "#546E7A"
    },
    "Separator": {
-      "background": "#eae8e8",
-      "foreground": "#eae8e8",
-      "separatorColor": "#eae8e8"
+      "background": "#FFFFFF",
+      "foreground": "#FFFFFF",
+      "separatorColor": "#FFFFFF"
    },
    "SidePanel": {
-      "background": "#F4F4F4"
+      "background": "#EEEEEE"
    },
    "Slider": {
      "background": "#FAFAFA",
@@ -630,7 +630,7 @@
      "buttonColor": "#00BCD4",
      "foreground": "#546E7A",
      "majorTickLength": 6,
-      "tickColor": "#eae8e8",
+      "tickColor": "#FFFFFF",
      "trackColor": "#E7E7E8",
      "trackWidth": 7,
      "thumb": "#00BCD4"
@@ -645,13 +645,13 @@
      "background": "#FAFAFA",
      "border": "3,3,3,3",
      "foreground": "#546E7A",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "SplitPane": {
      "background": "#FAFAFA",
-      "highlight": "#F4F4F4"
+      "highlight": "#EEEEEE"
    },
-    "SplitPaneDivider.draggingColor": "#eae8e8",
+    "SplitPaneDivider.draggingColor": "#FFFFFF",
    "StatusBar": {
      "borderColor": "#FAFAFA",
      "hoverBackground": "#E7E7E8",
@@ -671,7 +671,7 @@
      "highlight": "#d3e1e8",
      "hoverColor": "#E7E7E8",
      "labelShift": 0,
-      "selectedForeground": "#546e7a",
+      "selectedForeground": "#272727",
      "selectedLabelShift": 0,
      "selectedTabPadInsets": "0,0,0,0",
      "tabsOverlapBorder": true,
@@ -680,9 +680,9 @@
      "tabSelectionHeight": 2,
      "underlineColor": "#00BCD4"
    },
-    "TabbedPane.mt.tab.background": "#F4F4F4",
+    "TabbedPane.mt.tab.background": "#EEEEEE",
    "Table": {
-      "alternativeRowBackground": "#F4F4F4",
+      "alternativeRowBackground": "#EEEEEE",
      "background": "#FAFAFA",
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
@@ -690,63 +690,63 @@
      "dropLineColor": "#00BCD4",
      "dropLineShortColor": "#00BCD4",
      "focusCellBackground": "#E7E7E8",
-      "focusCellForeground": "#546e7a",
+      "focusCellForeground": "#272727",
      "foreground": "#546E7A",
      "gridColor": "#FAFAFA",
      "highlightOuter": "#E7E7E8",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "hoverInactiveBackground": "#E7E7E8",
-      "lightSelectionForeground": "#546e7a",
+      "lightSelectionForeground": "#272727",
      "lightSelectionInactiveForeground": "#94A7B0",
-      "lightSelectionInactiveBackground": "#eae8e8",
+      "lightSelectionInactiveBackground": "#FFFFFF",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a",
+      "selectionForeground": "#272727",
      "selectionInactiveBackground": "#E7E7E8",
      "selectionInactiveForeground": "#546e7a",
      "sortIconColor": "#546E7A",
-      "stripeColor": "#F4F4F4"
+      "stripeColor": "#EEEEEE"
    },
    "TableHeader": {
      "background": "#FAFAFA",
      "borderColor": "#FAFAFA",
-      "bottomSeparatorColor": "#eae8e8",
+      "bottomSeparatorColor": "#FFFFFF",
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
      "focusCellBackground": "#E7E7E8",
-      "focusCellForeground": "#546e7a",
+      "focusCellForeground": "#272727",
      "height": 25,
-      "separatorColor": "#eae8e8"
+      "separatorColor": "#FFFFFF"
    },
    "text": "#94A7B0",
    "textInactiveText": "#94A7B0",
    "textText": "#94A7B0",
    "TextArea": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "caretForeground": "#00BCD4",
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "TextField": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "caretForeground": "#00BCD4",
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "TextPane": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "caretForeground": "#00BCD4",
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "TitlePane": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "Button.hoverBackground": "#E7E7E8",
      "inactiveBackground": "#FAFAFA",
      "infoForeground": "#94A7B0",
@@ -764,7 +764,7 @@
      "onForeground": "#00BCD4"
    },
    "ToolBar": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "borderHandleColor": "#94A7B0",
      "floatingForeground": "#94A7B0",
      "foreground": "#546E7A"
@@ -782,12 +782,12 @@
    "ToolWindow": {
      "Button": {
        "hoverBackground": "#E7E7E8",
-        "selectedForeground": "#546e7a",
-        "selectedBackground": "#F4F4F4"
+        "selectedForeground": "#272727",
+        "selectedBackground": "#EEEEEE"
      },
      "Header": {
        "background": "#FAFAFA",
-        "borderColor": "#eae8e8",
+        "borderColor": "#FFFFFF",
        "inactiveBackground": "#FAFAFA"
      },
      "HeaderCloseButton": {
@@ -798,34 +798,34 @@
        "hoverBackground": "#E7E7E8",
        "hoverInactiveBackground": "#E7E7E8",
        "inactiveUnderlineColor": "#00BCD4",
-        "selectedBackground": "#F4F4F4",
-        "selectedInactiveBackground": "#F4F4F4",
+        "selectedBackground": "#EEEEEE",
+        "selectedInactiveBackground": "#EEEEEE",
        "underlineColor": "#00BCD4",
        "underlinedTabBackground": "#E7E7E8",
-        "underlinedTabInactiveBackground": "#eae8e8",
+        "underlinedTabInactiveBackground": "#FFFFFF",
        "underlinedTabForeground": "#546e7a",
        "underlinedTabInactiveForeground": "#546E7A"
      }
    },
    "Tree": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "foreground": "#94A7B0",
      "hash": "#d3e1e8",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "hoverInactiveBackground": "#E7E7E8",
      "modifiedItemForeground": "#00BCD4",
      "rowHeight": 28,
-      "selectionBackground": "#80CBC480",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
      "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC480",
-      "textBackground": "#F4F4F4"
+      "selectionInactiveBackground": "#80CBC440",
+      "textBackground": "#EEEEEE"
    },
    "Tree.leftChildIndent": 10,
    "Tree.rightChildIndent": 5,
    "UIDesigner": {
      "Activity.borderColor": "#d3e1e8",
-      "Canvas.background": "#F4F4F4",
+      "Canvas.background": "#EEEEEE",
      "ColorPicker": {
        "background": "#FAFAFA",
        "foreground": "#546E7A"
@@ -840,34 +840,34 @@
        "borderColor": "#d3e1e8",
        "hoverBorderColor": "#E7E7E8"
      },
-      "Canvas.background": "#F4F4F4",
+      "Canvas.background": "#EEEEEE",
      "highStroke.foreground": "#546E7A",
      "Label.foreground": "#94A7B0",
-      "List.selectionBackground": "#80CBC480",
+      "List.selectionBackground": "#80CBC440",
      "motion": {
        "borderColor": "#d3e1e8",
        "Component.foreground": "#546E7A",
        "ConstraintSetText.foreground": "#94A7B0",
-        "ConstraintSet.background": "#eae8e8",
-        "CSPanel.SelectedFocusBackground": "#80CBC4",
-        "CSPanel.SelectedBackground": "#80CBC480",
+        "ConstraintSet.background": "#FFFFFF",
+        "CSPanel.SelectedFocusBackground": "#80CBC440",
+        "CSPanel.SelectedBackground": "#80CBC440",
        "cs_FocusText.infoForeground": "#94A7B0",
        "CursorTextColor.foreground": "#546E7A",
        "HoverColor.disabledBackground": "#D2D4D5",
        "motionGraph.background": "#FAFAFA",
        "Notification.background": "#eae8e8",
-        "ourAvg.background": "#eae8e8",
-        "ourCS.background": "#eae8e8",
+        "ourAvg.background": "#FFFFFF",
+        "ourCS.background": "#FFFFFF",
        "ourCS_Border.borderColor": "#d3e1e8",
        "ourCS_TextColor.foreground": "#94A7B0",
        "ourCS_SelectedFocusBackground.selectionForeground": "#546e7a",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#E7E7E8",
        "ourCS_SelectedBorder.pressedBorderColor": "#E7E7E8",
        "ourML_BarColor.separatorColor": "#d3e1e8",
-        "PrimaryPanel.background": "#F4F4F4",
+        "PrimaryPanel.background": "#EEEEEE",
        "SecondaryPanel.background": "#FAFAFA",
        "SecondaryPanel.header.foreground": "#94A7B0",
-        "SecondaryPanel.header.background": "#F4F4F4",
+        "SecondaryPanel.header.background": "#EEEEEE",
        "timeLine.disabledBorderColor": "#d3e1e8"
      },
      "Panel": {
@@ -905,7 +905,7 @@
      },
      "HgLog": {
        "branchIconColor": "#00BCD4",
-        "bookmarkIconColor": "#546e7a",
+        "bookmarkIconColor": "#272727",
        "closedBranchIconColor": "#D2D4D5",
        "localTagIconColor": "#94A7B0",
        "mqTagIconColor": "#94A7B0",
@@ -914,48 +914,48 @@
      },
      "Log": {
        "Commit.unmatchedForeground": "#94A7B0",
-        "Commit.currentBranchBackground": "#eae8e8",
-        "Commit.hoveredBackground": "#80CBC480"
+        "Commit.currentBranchBackground": "#FFFFFF",
+        "Commit.hoveredBackground": "#80CBC440"
      },
      "RefLabel": {
-        "foreground": "#546e7a",
+        "foreground": "#272727",
        "backgroundBase": "#E7E7E8"
      }
    },
    "Viewport": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "foreground": "#546E7A"
    },
    "WelcomeScreen": {
      "AssociatedComponent.background": "#FAFAFA",
      "background": "#FAFAFA",
      "borderColor": "#FAFAFA",
-      "captionBackground": "#F4F4F4",
+      "captionBackground": "#EEEEEE",
      "captionForeground": "#546E7A",
      "Details.background": "#FAFAFA",
-      "footerBackground": "#F4F4F4",
+      "footerBackground": "#EEEEEE",
      "footerForeground": "#546E7A",
      "headerBackground": "#FAFAFA",
      "headerForeground": "#546E7A",
-      "List.background": "#F4F4F4",
+      "List.background": "#EEEEEE",
      "separatorColor": "#d3e1e8",
-      "SidePanel.background": "#eae8e8",
+      "SidePanel.background": "#FFFFFF",
      "Projects": {
-        "actions.background": "#F4F4F4",
+        "actions.background": "#EEEEEE",
        "actions.selectionBackground": "#E7E7E8",
-        "background": "#eae8e8",
-        "selectionBackground": "#80CBC4",
-        "selectionInactiveBackground": "#eae8e8"
+        "background": "#FFFFFF",
+        "selectionBackground": "#80CBC440",
+        "selectionInactiveBackground": "#FFFFFF"
      }
    },
-    "window": "#F4F4F4",
+    "window": "#EEEEEE",
    "windowBorder": "#d3e1e8",
    "windowText": "#94A7B0",
    "Window.border": "#d3e1e8"
  },
  "icons": {
    "ColorPalette": {
-      "#43494A": "#F4F4F4",
+      "#43494A": "#EEEEEE",
      "#6B6B6B": "#94A7B0",
      "#A7A7A7": "#FAFAFA",
      "#3D6185": "#00BCD4",
@@ -972,10 +972,10 @@
      "Actions.GreyInline.Dark": "#546E7A",
      "Actions.Red": "#E53935",
      "Actions.Yellow": "#F6A434",
-      "Checkbox.Background.Default": "#F4F4F4",
-      "Checkbox.Background.Default.Dark": "#F4F4F4",
-      "Checkbox.Background.Disabled": "#eae8e8",
-      "Checkbox.Background.Disabled.Dark": "#eae8e8",
+      "Checkbox.Background.Default": "#EEEEEE",
+      "Checkbox.Background.Default.Dark": "#EEEEEE",
+      "Checkbox.Background.Disabled": "#CCD7DA50",
+      "Checkbox.Background.Disabled.Dark": "#CCD7DA50",
      "Checkbox.Border.Default": "#d3e1e8",
      "Checkbox.Border.Default.Dark": "#d3e1e8",
      "Checkbox.Border.Disabled": "#D2D4D5",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -14,19 +14,19 @@
      "acceleratorSelectionForeground": "#94A7B0",
      "background": "#FAFAFA",
      "borderColor": "#d3e1e8",
-      "disabledBackground": "#eae8e8",
+      "disabledBackground": "#CCD7DA50",
      "disabledForeground": "#D2D4D5",
      "disabledText": "#D2D4D5",
      "focusColor": "#E7E7E8",
      "focusedBorderColor": "#00BCD4",
      "foreground": "#546E7A",
-      "inactiveBackground": "#eae8e8",
+      "inactiveBackground": "#CCD7DA50",
      "inactiveForeground": "#94A7B0",
      "infoForeground": "#94A7B0",
-      "selectionBackground": "#80CBC4",
-      "selectionBackgroundInactive": "#eae8e8",
+      "selectionBackground": "#80CBC440",
+      "selectionBackgroundInactive": "#FFFFFF",
      "selectionForeground": "#546e7a",
-      "selectionInactiveBackground": "#eae8e8",
+      "selectionInactiveBackground": "#FFFFFF",
      "separatorColor": "#d3e1e8"
    },
    "activeCaption": "#FAFAFA",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#00BCD450"
    },
    "Autocomplete": {
-      "selectionBackground": "#80CBC4"
+      "selectionBackground": "#80CBC440"
    },
    "Borders.ContrastBorderColor": "#FAFAFA",
    "Borders.color": "#d3e1e8",
@@ -49,7 +49,7 @@
      "default": {
        "endBackground": "#E7E7E8",
        "endBorderColor": "#E7E7E8",
-        "foreground": "#546e7a",
+        "foreground": "#272727",
        "focusColor": "#00BCD4",
        "focusedBorderColor": "#00BCD4",
        "shadowColor": "#E7E7E8",
@@ -79,8 +79,8 @@
      "Tooltip.background": "#eae8e8"
    },
    "Content": {
-      "background": "#F4F4F4",
-      "selectionBackground": "#80CBC4"
+      "background": "#EEEEEE",
+      "selectionBackground": "#80CBC440"
    },
    "CheckBox": {
      "background": "#FAFAFA",
@@ -95,14 +95,14 @@
      "disabledBackground": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
-      "selectionForeground": "#546e7a"
+      "selectionBackground": "#80CBC440",
+      "selectionForeground": "#272727"
    },
    "CodeWithMe": {
      "Avatar.foreground": "#546E7A",
      "AccessEnabled": {
        "accessDot": "#00BCD4",
-        "dropdownBorder": "#eae8e8",
+        "dropdownBorder": "#FFFFFF",
        "pillBackground": "$second"
      }
    },
@@ -125,14 +125,14 @@
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
      "modifiedItemForeground": "#00BCD4",
-      "nonEditableBackground": "#eae8e8",
+      "nonEditableBackground": "#FFFFFF",
      "padding": "5,5,5,5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "ComboPopup.border": "#d3e1e8",
    "CompletionPopup": {
-      "background": "#eae8e8",
+      "background": "#FFFFFF",
      "foreground": "#546E7A",
      "infoForeground": "#94A7B0",
      "matchForeground": "#00BCD4",
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#546e7a",
      "selectionGrayForeground": "#546e7a",
      "selectionInactiveInfoForeground": "#94A7B0",
-      "selectionInactiveBackground": "#80CBC450",
-      "selectionBackground": "#80CBC480",
+      "selectionInactiveBackground": "#80CBC440",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
      "selectionInfoForeground": "#546e7a"
    },
@@ -213,11 +213,11 @@
      "foreground": "#546E7A",
      "inactiveBackground": "#FAFAFA",
      "inactiveForeground": "#D2D4D5",
-      "selectionBackground": "#80CBC4",
-      "selectionForeground": "#546e7a"
+      "selectionBackground": "#80CBC440",
+      "selectionForeground": "#272727"
    },
    "EditorTabs": {
-      "borderColor": "#eae8e8",
+      "borderColor": "#FFFFFF",
      "hoverBackground": "#E7E7E8",
      "hoverColor": "#E7E7E8",
      "hoverMaskColor": "#E7E7E8",
@@ -232,7 +232,7 @@
    },
    "EditorGroupsTabs": {
      "background": "#FAFAFA",
-      "borderColor": "#eae8e8",
+      "borderColor": "#FFFFFF",
      "hoverBackground": "#E7E7E8",
      "hoverColor": "#E7E7E8",
      "inactiveUnderlineColor": "#00BCD4",
@@ -243,7 +243,7 @@
    "FileColor": {
      "Green": "#387002",
      "Blue": "#004BA0",
-      "Yellow": "#eae8e8",
+      "Yellow": "#CCD7DA50",
      "Orange": "#B53D00",
      "Violet": "#4D2C91",
      "Rose": "#A00037"
@@ -265,7 +265,7 @@
      "foreground": "#546E7A",
      "inactiveBackground": "#F3F4F5",
      "inactiveForeground": "#D2D4D5",
-      "selectionForeground": "#546e7a",
+      "selectionForeground": "#272727",
      "selectionBackground": "#E7E7E8"
    },
    "GotItTooltip.borderColor": "#eae8e8",
@@ -279,7 +279,7 @@
    },
    "HeaderColor": {
      "active": "#FAFAFA",
-      "inactive": "#F4F4F4"
+      "inactive": "#EEEEEE"
    },
    "HelpTooltip": {
      "background": "#FAFAFA",
@@ -289,7 +289,7 @@
      "shortcutForeground": "#94A7B0"
    },
    "Hyperlink.linkColor": "#00BCD4",
-    "inactiveCaption": "#eae8e8",
+    "inactiveCaption": "#FFFFFF",
    "inactiveCaptionBorder": "#FAFAFA",
    "inactiveCaptionText": "#94A7B0",
    "info": "#94A7B0",
@@ -311,7 +311,7 @@
      "disabledText": "#D2D4D5",
      "foreground": "#546E7A",
      "infoForeground": "#94A7B0",
-      "selectedForeground": "#546e7a",
+      "selectedForeground": "#272727",
      "selectedDisabledForeground": "#546E7A"
    },
    "Link": {
@@ -323,19 +323,19 @@
    },
    "link.foreground": "#00BCD4",
    "List": {
-      "background": "#eae8e8",
+      "background": "#FFFFFF",
      "foreground": "#546E7A",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "hoverInactiveBackground": "#E7E7E8",
-      "selectionBackground": "#80CBC450",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
-      "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC480"
+      "selectionInactiveForeground": "#272727",
+      "selectionInactiveBackground": "#80CBC440"
    },
    "material": {
      "background": "#FAFAFA",
      "branchColor": "#546E7A",
-      "contrast": "#F4F4F4",
+      "contrast": "#EEEEEE",
      "foreground": "#546E7A",
      "mergeCommits": "#F3F4F5",
      "primaryColor": "#94A7B0",
@@ -345,7 +345,7 @@
      "tagColor": "#94A7B0"
    },
    "MemoryIndicator": {
-      "allocatedBackground": "#eae8e8",
+      "allocatedBackground": "#FFFFFF",
      "usedColor": "#E7E7E8",
      "usedBackground": "#E7E7E8"
    },
@@ -354,11 +354,11 @@
      "acceleratorSelectionForeground": "#546e7a",
      "background": "#FAFAFA",
      "border": "4,2,4,2",
-      "borderColor": "#eae8e8",
-      "disabledBackground": "#eae8e8",
+      "borderColor": "#FFFFFF",
+      "disabledBackground": "#FFFFFF",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
      "separatorColor": "#d3e1e8"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
      "highlight": "#FAFAFA",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
      "shadow": "#FAFAFA"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a"
    },
    "NavBar": {
@@ -433,7 +433,7 @@
      "foreground": "#546E7A"
    },
    "ParameterInfo": {
-      "background": "#eae8e8",
+      "background": "#FFFFFF",
      "borderColor": "#E7E7E8",
      "currentOverloadBackground": "#E7E7E8",
      "currentParameterForeground": "#00BCD4",
@@ -449,16 +449,16 @@
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "Plugins": {
      "background": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "eapTagBackground": "#E7E7E8",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "lightSelectionBackground": "#E7E7E8",
      "paidTagBackground": "#E7E7E8",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "tagForeground": "#00BCD4",
      "tagBackground": "#E7E7E8",
      "trialTagBackground": "#E7E7E8",
@@ -478,7 +478,7 @@
        "borderColor": "#d3e1e8"
      },
      "SectionHeader": {
-        "background": "#eae8e8",
+        "background": "#FFFFFF",
        "foreground": "#546E7A"
      },
      "Tab": {
@@ -493,20 +493,20 @@
        "borderColor": "#FAFAFA",
        "foreground": "#00BCD4"
      },
-      "borderColor": "#F4F4F4",
+      "borderColor": "#EEEEEE",
      "inactiveBorderColor": "#FAFAFA",
-      "innerBorderColor": "#eae8e8",
+      "innerBorderColor": "#FFFFFF",
      "Header": {
        "activeBackground": "#FAFAFA",
-        "inactiveBackground": "#F4F4F4"
+        "inactiveBackground": "#EEEEEE"
      },
      "paintBorder": true,
      "separatorForeground": "#546E7A",
-      "separatorColor": "#eae8e8",
+      "separatorColor": "#FFFFFF",
      "Toolbar": {
-        "Floating.background": "#F4F4F4",
-        "background": "#F4F4F4",
-        "borderColor": "#F4F4F4"
+        "Floating.background": "#EEEEEE",
+        "background": "#EEEEEE",
+        "borderColor": "#EEEEEE"
      }
    },
    "PopupMenu": {
@@ -541,7 +541,7 @@
      "disabledBackground": "#FAFAFA",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
-      "selectionBackground": "#80CBC4",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a"
    },
    "ScreenView.borderColor": "#d3e1e8",
@@ -581,7 +581,7 @@
    },
    "SearchEverywhere": {
      "Advertiser": {
-        "background": "#F4F4F4",
+        "background": "#EEEEEE",
        "foreground": "#94A7B0"
      },
      "Header": {
@@ -593,12 +593,12 @@
      },
      "SearchField": {
        "background": "#FAFAFA",
-        "borderColor": "#F4F4F4",
+        "borderColor": "#EEEEEE",
        "infoForeground": "#94A7B0"
      },
      "Tab": {
-        "active.foreground": "#546e7a",
-        "selectedForeground": "#546e7a",
+        "active.foreground": "#272727",
+        "selectedForeground": "#272727",
        "selectedBackground": "#E7E7E8"
      }
    },
@@ -617,9 +617,9 @@
      "Repeated.File.Foreground": "#546E7A"
    },
    "Separator": {
-      "background": "#eae8e8",
-      "foreground": "#eae8e8",
-      "separatorColor": "#eae8e8"
+      "background": "#FFFFFF",
+      "foreground": "#FFFFFF",
+      "separatorColor": "#FFFFFF"
    },
    "SidePanel": {
      "background": "#FAFAFA"
@@ -630,7 +630,7 @@
      "buttonColor": "#00BCD4",
      "foreground": "#546E7A",
      "majorTickLength": 6,
-      "tickColor": "#eae8e8",
+      "tickColor": "#FFFFFF",
      "trackColor": "#E7E7E8",
      "trackWidth": 7,
      "thumb": "#00BCD4"
@@ -645,13 +645,13 @@
      "background": "#FAFAFA",
      "border": "3,3,3,3",
      "foreground": "#546E7A",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "SplitPane": {
      "background": "#FAFAFA",
      "highlight": "#FAFAFA"
    },
-    "SplitPaneDivider.draggingColor": "#eae8e8",
+    "SplitPaneDivider.draggingColor": "#FFFFFF",
    "StatusBar": {
      "borderColor": "#FAFAFA",
      "hoverBackground": "#E7E7E8",
@@ -671,7 +671,7 @@
      "highlight": "#d3e1e8",
      "hoverColor": "#E7E7E8",
      "labelShift": 0,
-      "selectedForeground": "#546e7a",
+      "selectedForeground": "#272727",
      "selectedLabelShift": 0,
      "selectedTabPadInsets": "0,0,0,0",
      "tabsOverlapBorder": true,
@@ -682,7 +682,7 @@
    },
    "TabbedPane.mt.tab.background": "#FAFAFA",
    "Table": {
-      "alternativeRowBackground": "#F4F4F4",
+      "alternativeRowBackground": "#EEEEEE",
      "background": "#FAFAFA",
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
@@ -690,33 +690,33 @@
      "dropLineColor": "#00BCD4",
      "dropLineShortColor": "#00BCD4",
      "focusCellBackground": "#E7E7E8",
-      "focusCellForeground": "#546e7a",
+      "focusCellForeground": "#272727",
      "foreground": "#546E7A",
      "gridColor": "#FAFAFA",
      "highlightOuter": "#E7E7E8",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "hoverInactiveBackground": "#E7E7E8",
-      "lightSelectionForeground": "#546e7a",
+      "lightSelectionForeground": "#272727",
      "lightSelectionInactiveForeground": "#94A7B0",
-      "lightSelectionInactiveBackground": "#eae8e8",
+      "lightSelectionInactiveBackground": "#FFFFFF",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a",
+      "selectionForeground": "#272727",
      "selectionInactiveBackground": "#E7E7E8",
      "selectionInactiveForeground": "#546e7a",
      "sortIconColor": "#546E7A",
-      "stripeColor": "#F4F4F4"
+      "stripeColor": "#EEEEEE"
    },
    "TableHeader": {
      "background": "#FAFAFA",
      "borderColor": "#FAFAFA",
-      "bottomSeparatorColor": "#eae8e8",
+      "bottomSeparatorColor": "#FFFFFF",
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#D2D4D5",
      "foreground": "#546E7A",
      "focusCellBackground": "#E7E7E8",
-      "focusCellForeground": "#546e7a",
+      "focusCellForeground": "#272727",
      "height": 25,
-      "separatorColor": "#eae8e8"
+      "separatorColor": "#FFFFFF"
    },
    "text": "#94A7B0",
    "textInactiveText": "#94A7B0",
@@ -727,7 +727,7 @@
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "TextField": {
      "background": "#FAFAFA",
@@ -735,7 +735,7 @@
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "TextPane": {
      "background": "#FAFAFA",
@@ -743,10 +743,10 @@
      "foreground": "#546E7A",
      "inactiveForeground": "#D2D4D5",
      "selectionBackground": "#E7E7E8",
-      "selectionForeground": "#546e7a"
+      "selectionForeground": "#272727"
    },
    "TitlePane": {
-      "background": "#F4F4F4",
+      "background": "#EEEEEE",
      "Button.hoverBackground": "#E7E7E8",
      "inactiveBackground": "#FAFAFA",
      "infoForeground": "#94A7B0",
@@ -782,12 +782,12 @@
    "ToolWindow": {
      "Button": {
        "hoverBackground": "#E7E7E8",
-        "selectedForeground": "#546e7a",
-        "selectedBackground": "#F4F4F4"
+        "selectedForeground": "#272727",
+        "selectedBackground": "#EEEEEE"
      },
      "Header": {
        "background": "#FAFAFA",
-        "borderColor": "#eae8e8",
+        "borderColor": "#FFFFFF",
        "inactiveBackground": "#FAFAFA"
      },
      "HeaderCloseButton": {
@@ -798,11 +798,11 @@
        "hoverBackground": "#E7E7E8",
        "hoverInactiveBackground": "#E7E7E8",
        "inactiveUnderlineColor": "#00BCD4",
-        "selectedBackground": "#F4F4F4",
-        "selectedInactiveBackground": "#F4F4F4",
+        "selectedBackground": "#EEEEEE",
+        "selectedInactiveBackground": "#EEEEEE",
        "underlineColor": "#00BCD4",
        "underlinedTabBackground": "#E7E7E8",
-        "underlinedTabInactiveBackground": "#eae8e8",
+        "underlinedTabInactiveBackground": "#FFFFFF",
        "underlinedTabForeground": "#546e7a",
        "underlinedTabInactiveForeground": "#546E7A"
      }
@@ -811,21 +811,21 @@
      "background": "#FAFAFA",
      "foreground": "#94A7B0",
      "hash": "#d3e1e8",
-      "hoverBackground": "#80CBC480",
+      "hoverBackground": "#80CBC440",
      "hoverInactiveBackground": "#E7E7E8",
      "modifiedItemForeground": "#00BCD4",
      "rowHeight": 28,
-      "selectionBackground": "#80CBC480",
+      "selectionBackground": "#80CBC440",
      "selectionForeground": "#546e7a",
      "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC480",
+      "selectionInactiveBackground": "#80CBC440",
      "textBackground": "#FAFAFA"
    },
    "Tree.leftChildIndent": 10,
    "Tree.rightChildIndent": 5,
    "UIDesigner": {
      "Activity.borderColor": "#d3e1e8",
-      "Canvas.background": "#F4F4F4",
+      "Canvas.background": "#EEEEEE",
      "ColorPicker": {
        "background": "#FAFAFA",
        "foreground": "#546E7A"
@@ -840,34 +840,34 @@
        "borderColor": "#d3e1e8",
        "hoverBorderColor": "#E7E7E8"
      },
-      "Canvas.background": "#F4F4F4",
+      "Canvas.background": "#EEEEEE",
      "highStroke.foreground": "#546E7A",
      "Label.foreground": "#94A7B0",
-      "List.selectionBackground": "#80CBC480",
+      "List.selectionBackground": "#80CBC440",
      "motion": {
        "borderColor": "#d3e1e8",
        "Component.foreground": "#546E7A",
        "ConstraintSetText.foreground": "#94A7B0",
-        "ConstraintSet.background": "#eae8e8",
-        "CSPanel.SelectedFocusBackground": "#80CBC4",
-        "CSPanel.SelectedBackground": "#80CBC480",
+        "ConstraintSet.background": "#FFFFFF",
+        "CSPanel.SelectedFocusBackground": "#80CBC440",
+        "CSPanel.SelectedBackground": "#80CBC440",
        "cs_FocusText.infoForeground": "#94A7B0",
        "CursorTextColor.foreground": "#546E7A",
        "HoverColor.disabledBackground": "#D2D4D5",
        "motionGraph.background": "#FAFAFA",
        "Notification.background": "#eae8e8",
-        "ourAvg.background": "#eae8e8",
-        "ourCS.background": "#eae8e8",
+        "ourAvg.background": "#FFFFFF",
+        "ourCS.background": "#FFFFFF",
        "ourCS_Border.borderColor": "#d3e1e8",
        "ourCS_TextColor.foreground": "#94A7B0",
        "ourCS_SelectedFocusBackground.selectionForeground": "#546e7a",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#E7E7E8",
        "ourCS_SelectedBorder.pressedBorderColor": "#E7E7E8",
        "ourML_BarColor.separatorColor": "#d3e1e8",
-        "PrimaryPanel.background": "#F4F4F4",
+        "PrimaryPanel.background": "#EEEEEE",
        "SecondaryPanel.background": "#FAFAFA",
        "SecondaryPanel.header.foreground": "#94A7B0",
-        "SecondaryPanel.header.background": "#F4F4F4",
+        "SecondaryPanel.header.background": "#EEEEEE",
        "timeLine.disabledBorderColor": "#d3e1e8"
      },
      "Panel": {
@@ -905,7 +905,7 @@
      },
      "HgLog": {
        "branchIconColor": "#00BCD4",
-        "bookmarkIconColor": "#546e7a",
+        "bookmarkIconColor": "#272727",
        "closedBranchIconColor": "#D2D4D5",
        "localTagIconColor": "#94A7B0",
        "mqTagIconColor": "#94A7B0",
@@ -914,11 +914,11 @@
      },
      "Log": {
        "Commit.unmatchedForeground": "#94A7B0",
-        "Commit.currentBranchBackground": "#eae8e8",
-        "Commit.hoveredBackground": "#80CBC480"
+        "Commit.currentBranchBackground": "#FFFFFF",
+        "Commit.hoveredBackground": "#80CBC440"
      },
      "RefLabel": {
-        "foreground": "#546e7a",
+        "foreground": "#272727",
        "backgroundBase": "#E7E7E8"
      }
    },
@@ -930,22 +930,22 @@
      "AssociatedComponent.background": "#FAFAFA",
      "background": "#FAFAFA",
      "borderColor": "#FAFAFA",
-      "captionBackground": "#F4F4F4",
+      "captionBackground": "#EEEEEE",
      "captionForeground": "#546E7A",
      "Details.background": "#FAFAFA",
-      "footerBackground": "#F4F4F4",
+      "footerBackground": "#EEEEEE",
      "footerForeground": "#546E7A",
      "headerBackground": "#FAFAFA",
      "headerForeground": "#546E7A",
-      "List.background": "#F4F4F4",
+      "List.background": "#EEEEEE",
      "separatorColor": "#d3e1e8",
-      "SidePanel.background": "#eae8e8",
+      "SidePanel.background": "#FFFFFF",
      "Projects": {
-        "actions.background": "#F4F4F4",
+        "actions.background": "#EEEEEE",
        "actions.selectionBackground": "#E7E7E8",
-        "background": "#eae8e8",
-        "selectionBackground": "#80CBC4",
-        "selectionInactiveBackground": "#eae8e8"
+        "background": "#FFFFFF",
+        "selectionBackground": "#80CBC440",
+        "selectionInactiveBackground": "#FFFFFF"
      }
    },
    "window": "#FAFAFA",
@@ -955,7 +955,7 @@
  },
  "icons": {
    "ColorPalette": {
-      "#43494A": "#F4F4F4",
+      "#43494A": "#EEEEEE",
      "#6B6B6B": "#94A7B0",
      "#A7A7A7": "#FAFAFA",
      "#3D6185": "#00BCD4",
@@ -972,10 +972,10 @@
      "Actions.GreyInline.Dark": "#546E7A",
      "Actions.Red": "#E53935",
      "Actions.Yellow": "#F6A434",
-      "Checkbox.Background.Default": "#F4F4F4",
-      "Checkbox.Background.Default.Dark": "#F4F4F4",
-      "Checkbox.Background.Disabled": "#eae8e8",
-      "Checkbox.Background.Disabled.Dark": "#eae8e8",
+      "Checkbox.Background.Default": "#EEEEEE",
+      "Checkbox.Background.Default.Dark": "#EEEEEE",
+      "Checkbox.Background.Disabled": "#CCD7DA50",
+      "Checkbox.Background.Disabled.Dark": "#CCD7DA50",
      "Checkbox.Border.Default": "#d3e1e8",
      "Checkbox.Border.Default.Dark": "#d3e1e8",
      "Checkbox.Border.Disabled": "#D2D4D5",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#607D8B",
-      "selectionInactiveBackground": "#546E7A50",
-      "selectionBackground": "#546E7A80",
+      "selectionInactiveBackground": "#546E7A",
+      "selectionBackground": "#546E7A",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -327,7 +327,7 @@
      "foreground": "#B0BEC5",
      "hoverBackground": "#546E7A70",
      "hoverInactiveBackground": "#314549",
-      "selectionBackground": "#546E7A50",
+      "selectionBackground": "#546E7A",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
      "selectionInactiveBackground": "#546E7A70"
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#607D8B",
-      "selectionInactiveBackground": "#546E7A50",
-      "selectionBackground": "#546E7A80",
+      "selectionInactiveBackground": "#546E7A",
+      "selectionBackground": "#546E7A",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -327,7 +327,7 @@
      "foreground": "#B0BEC5",
      "hoverBackground": "#546E7A70",
      "hoverInactiveBackground": "#314549",
-      "selectionBackground": "#546E7A50",
+      "selectionBackground": "#546E7A",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
      "selectionInactiveBackground": "#546E7A70"
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -23,7 +23,7 @@
      "inactiveBackground": "#2f2e43",
      "inactiveForeground": "#676E95",
      "infoForeground": "#676E95",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionBackgroundInactive": "#34324a",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#34324a",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#ab47bc50"
    },
    "Autocomplete": {
-      "selectionBackground": "#3C435E"
+      "selectionBackground": "#717CB470"
    },
    "Borders.ContrastBorderColor": "#292D3E",
    "Borders.color": "#2b2a3e",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#202331",
-      "selectionBackground": "#3C435E"
+      "selectionBackground": "#717CB470"
    },
    "CheckBox": {
      "background": "#292D3E",
@@ -95,7 +95,7 @@
      "disabledBackground": "#292D3E",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#676E95",
-      "selectionInactiveBackground": "#3C435E50",
-      "selectionBackground": "#3C435E80",
+      "selectionInactiveBackground": "#717CB470",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -213,7 +213,7 @@
      "foreground": "#A6ACCD",
      "inactiveBackground": "#292D3E",
      "inactiveForeground": "#515772",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#34324a",
      "foreground": "#A6ACCD",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "hoverInactiveBackground": "#414863",
-      "selectionBackground": "#3C435E50",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9570"
+      "selectionInactiveBackground": "#676E95"
    },
    "material": {
      "background": "#292D3E",
@@ -358,7 +358,7 @@
      "disabledBackground": "#34324a",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#2b2a3e"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
      "highlight": "#292D3E",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "shadow": "#202331"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#292D3E",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#292D3E",
      "disabledForeground": "#515772",
      "eapTagBackground": "#444267",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "lightSelectionBackground": "#414863",
      "paidTagBackground": "#444267",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "tagForeground": "#ab47bc",
      "tagBackground": "#444267",
      "trialTagBackground": "#444267",
@@ -541,7 +541,7 @@
      "disabledBackground": "#292D3E",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#2b2a3e",
@@ -694,7 +694,7 @@
      "foreground": "#A6ACCD",
      "gridColor": "#292D3E",
      "highlightOuter": "#414863",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "hoverInactiveBackground": "#414863",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#676E95",
@@ -811,14 +811,14 @@
      "background": "#202331",
      "foreground": "#676E95",
      "hash": "#2b2a3e",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "hoverInactiveBackground": "#414863",
      "modifiedItemForeground": "#ab47bc",
      "rowHeight": 28,
-      "selectionBackground": "#676E9570",
+      "selectionBackground": "#676E95",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9570",
+      "selectionInactiveBackground": "#676E95",
      "textBackground": "#202331"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#202331",
      "highStroke.foreground": "#A6ACCD",
      "Label.foreground": "#676E95",
-      "List.selectionBackground": "#676E9570",
+      "List.selectionBackground": "#676E95",
      "motion": {
        "borderColor": "#2b2a3e",
        "Component.foreground": "#A6ACCD",
        "ConstraintSetText.foreground": "#676E95",
        "ConstraintSet.background": "#34324a",
-        "CSPanel.SelectedFocusBackground": "#3C435E",
-        "CSPanel.SelectedBackground": "#676E9570",
+        "CSPanel.SelectedFocusBackground": "#717CB470",
+        "CSPanel.SelectedBackground": "#676E95",
        "cs_FocusText.infoForeground": "#676E95",
        "CursorTextColor.foreground": "#A6ACCD",
        "HoverColor.disabledBackground": "#515772",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#676E95",
        "Commit.currentBranchBackground": "#34324a",
-        "Commit.hoveredBackground": "#676E9570"
+        "Commit.hoveredBackground": "#676E95"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#202331",
        "actions.selectionBackground": "#444267",
        "background": "#34324a",
-        "selectionBackground": "#3C435E",
+        "selectionBackground": "#717CB470",
        "selectionInactiveBackground": "#34324a"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material
@@ -23,7 +23,7 @@
      "inactiveBackground": "#2f2e43",
      "inactiveForeground": "#676E95",
      "infoForeground": "#676E95",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionBackgroundInactive": "#34324a",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#34324a",
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#ab47bc50"
    },
    "Autocomplete": {
-      "selectionBackground": "#3C435E"
+      "selectionBackground": "#717CB470"
    },
    "Borders.ContrastBorderColor": "#292D3E",
    "Borders.color": "#2b2a3e",
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#202331",
-      "selectionBackground": "#3C435E"
+      "selectionBackground": "#717CB470"
    },
    "CheckBox": {
      "background": "#292D3E",
@@ -95,7 +95,7 @@
      "disabledBackground": "#292D3E",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -141,8 +141,8 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#676E95",
-      "selectionInactiveBackground": "#3C435E50",
-      "selectionBackground": "#3C435E80",
+      "selectionInactiveBackground": "#717CB470",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -213,7 +213,7 @@
      "foreground": "#A6ACCD",
      "inactiveBackground": "#292D3E",
      "inactiveForeground": "#515772",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#34324a",
      "foreground": "#A6ACCD",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "hoverInactiveBackground": "#414863",
-      "selectionBackground": "#3C435E50",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9570"
+      "selectionInactiveBackground": "#676E95"
    },
    "material": {
      "background": "#292D3E",
@@ -358,7 +358,7 @@
      "disabledBackground": "#34324a",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "separatorColor": "#2b2a3e"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
      "highlight": "#292D3E",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF",
      "shadow": "#292D3E"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#292D3E",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "NavBar": {
@@ -455,10 +455,10 @@
      "background": "#292D3E",
      "disabledForeground": "#515772",
      "eapTagBackground": "#444267",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "lightSelectionBackground": "#414863",
      "paidTagBackground": "#444267",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "tagForeground": "#ab47bc",
      "tagBackground": "#444267",
      "trialTagBackground": "#444267",
@@ -541,7 +541,7 @@
      "disabledBackground": "#292D3E",
      "disabledForeground": "#515772",
      "foreground": "#A6ACCD",
-      "selectionBackground": "#3C435E",
+      "selectionBackground": "#717CB470",
      "selectionForeground": "#FFFFFF"
    },
    "ScreenView.borderColor": "#2b2a3e",
@@ -694,7 +694,7 @@
      "foreground": "#A6ACCD",
      "gridColor": "#292D3E",
      "highlightOuter": "#414863",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "hoverInactiveBackground": "#414863",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#676E95",
@@ -811,14 +811,14 @@
      "background": "#292D3E",
      "foreground": "#676E95",
      "hash": "#2b2a3e",
-      "hoverBackground": "#676E9570",
+      "hoverBackground": "#676E95",
      "hoverInactiveBackground": "#414863",
      "modifiedItemForeground": "#ab47bc",
      "rowHeight": 28,
-      "selectionBackground": "#676E9570",
+      "selectionBackground": "#676E95",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9570",
+      "selectionInactiveBackground": "#676E95",
      "textBackground": "#292D3E"
    },
    "Tree.leftChildIndent": 10,
@@ -843,14 +843,14 @@
      "Canvas.background": "#202331",
      "highStroke.foreground": "#A6ACCD",
      "Label.foreground": "#676E95",
-      "List.selectionBackground": "#676E9570",
+      "List.selectionBackground": "#676E95",
      "motion": {
        "borderColor": "#2b2a3e",
        "Component.foreground": "#A6ACCD",
        "ConstraintSetText.foreground": "#676E95",
        "ConstraintSet.background": "#34324a",
-        "CSPanel.SelectedFocusBackground": "#3C435E",
-        "CSPanel.SelectedBackground": "#676E9570",
+        "CSPanel.SelectedFocusBackground": "#717CB470",
+        "CSPanel.SelectedBackground": "#676E95",
        "cs_FocusText.infoForeground": "#676E95",
        "CursorTextColor.foreground": "#A6ACCD",
        "HoverColor.disabledBackground": "#515772",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#676E95",
        "Commit.currentBranchBackground": "#34324a",
-        "Commit.hoveredBackground": "#676E9570"
+        "Commit.hoveredBackground": "#676E95"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#202331",
        "actions.selectionBackground": "#444267",
        "background": "#34324a",
-        "selectionBackground": "#3C435E",
+        "selectionBackground": "#717CB470",
        "selectionInactiveBackground": "#34324a"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai
@@ -15,17 +15,17 @@
      "background": "#2D2A2E",
      "borderColor": "#2d2a2e",
      "disabledBackground": "#3a3a3c",
-      "disabledForeground": "#727072",
-      "disabledText": "#727072",
+      "disabledForeground": "#5b595c",
+      "disabledText": "#5b595c",
      "focusColor": "#5b595c",
      "focusedBorderColor": "#ffd866",
      "foreground": "#fcfcfa",
      "inactiveBackground": "#3a3a3c",
      "inactiveForeground": "#939293",
      "infoForeground": "#939293",
-      "selectionBackground": "#5B595C",
+      "selectionBackground": "#6E6C6F",
      "selectionBackgroundInactive": "#403E41",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#ffd866",
      "selectionInactiveBackground": "#403E41",
      "separatorColor": "#2d2a2e"
    },
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#ffd86650"
    },
    "Autocomplete": {
-      "selectionBackground": "#5B595C"
+      "selectionBackground": "#6E6C6F"
    },
    "Borders.ContrastBorderColor": "#2D2A2E",
    "Borders.color": "#2d2a2e",
@@ -57,16 +57,16 @@
        "startBorderColor": "#4A474B"
      },
      "disabledBorderColor": "#403E41",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "endBackground": "#403E41",
      "endBorderColor": "#403E41",
      "focus": "#5b595c",
      "focusedBorderColor": "#ffd866",
      "foreground": "#939293",
-      "highlight": "#FFFFFF",
+      "highlight": "#ffd866",
      "mt.background": "#403E41",
      "mt.foreground": "#939293",
-      "mt.selectedForeground": "#FFFFFF",
+      "mt.selectedForeground": "#ffd866",
      "mt.selection.color1": "#4A474B",
      "mt.selection.color2": "#4A474B",
      "startBackground": "#403E41",
@@ -80,11 +80,11 @@
    },
    "Content": {
      "background": "#221F22",
-      "selectionBackground": "#5B595C"
+      "selectionBackground": "#6E6C6F"
    },
    "CheckBox": {
      "background": "#2D2A2E",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa",
      "select": "#ffd866"
    },
@@ -93,9 +93,9 @@
      "acceleratorSelectionForeground": "#939293",
      "background": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
+      "selectionBackground": "#6E6C6F",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -115,14 +115,14 @@
    "ComboBox": {
      "ArrowButton": {
        "background": "#403E41",
-        "disabledIconColor": "#727072",
+        "disabledIconColor": "#5b595c",
        "iconColor": "#fcfcfa",
        "nonEditableBackground": "#2D2A2E"
      },
      "background": "#221F22",
      "buttonBackground": "#403E41",
      "darcula.hoveredArrowButtonForeground": "#ffd866",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "modifiedItemForeground": "#ffd866",
      "nonEditableBackground": "#403E41",
@@ -138,13 +138,13 @@
      "matchForeground": "#ffd866",
      "matchSelectionForeground": "#ffd866",
      "nonFocusedState": "false",
-      "selectedGrayedForeground": "#FFFFFF",
-      "selectionGrayForeground": "#FFFFFF",
+      "selectedGrayedForeground": "#ffd866",
+      "selectionGrayForeground": "#ffd866",
      "selectionInactiveInfoForeground": "#939293",
-      "selectionInactiveBackground": "#5B595C50",
-      "selectionBackground": "#5B595C80",
-      "selectionForeground": "#FFFFFF",
-      "selectionInfoForeground": "#FFFFFF"
+      "selectionInactiveBackground": "#6E6C6F",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
+      "selectionInfoForeground": "#ffd866"
    },
    "Component": {
      "arc": 4,
@@ -160,7 +160,7 @@
    "controlText": "#939293",
    "Counter": {
      "background": "#ffd866",
-      "foreground": "#FFFFFF"
+      "foreground": "#ffd866"
    },
    "Debugger": {
      "Variables": {
@@ -192,7 +192,7 @@
      "inactiveMaskColor": "#221F22",
      "underlineColor": "#ffd866",
      "underlinedTabBackground": "#4A474B",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#ffd866"
    },
    "Desktop.background": "#2D2A2E",
    "DialogWrapper.southPanelBackground": "#2D2A2E",
@@ -212,8 +212,8 @@
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
      "inactiveBackground": "#2D2A2E",
-      "inactiveForeground": "#727072",
-      "selectionBackground": "#5B595C",
+      "inactiveForeground": "#5b595c",
+      "selectionBackground": "#6E6C6F",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -223,12 +223,12 @@
      "hoverMaskColor": "#5b595c",
      "inactiveMaskColor": "#2D2A2E",
      "inactiveColoredFileBackground": "#2D2A2E",
-      "inactiveUnderlineColor": "#727072",
+      "inactiveUnderlineColor": "#5b595c",
      "selectedForeground": "#fcfcfa",
      "selectedBackground": "#4A474B",
      "underlineColor": "#ffd866",
      "underlinedTabBackground": "#4A474B",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#ffd866"
    },
    "EditorGroupsTabs": {
      "background": "#2D2A2E",
@@ -264,7 +264,7 @@
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
      "inactiveBackground": "#403E41",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionForeground": "#FFFFFF",
      "selectionBackground": "#4A474B"
    },
@@ -306,9 +306,9 @@
    },
    "Label": {
      "background": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "disabledShadow": "#2D2A2E",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa",
      "infoForeground": "#939293",
      "selectedForeground": "#FFFFFF",
@@ -325,12 +325,12 @@
    "List": {
      "background": "#403E41",
      "foreground": "#fcfcfa",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "hoverInactiveBackground": "#4A474B",
-      "selectionBackground": "#5B595C50",
-      "selectionForeground": "#FFFFFF",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#403E4170"
+      "selectionInactiveBackground": "#403E41"
    },
    "material": {
      "background": "#2D2A2E",
@@ -339,7 +339,7 @@
      "foreground": "#fcfcfa",
      "mergeCommits": "#403E41",
      "primaryColor": "#939293",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#ffd866",
      "tab.backgroundColor": "#2D2A2E",
      "tab.borderColor": "#ffd866",
      "tagColor": "#939293"
@@ -351,38 +351,38 @@
    },
    "Menu": {
      "acceleratorForeground": "#939293",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#ffd866",
      "background": "#2D2A2E",
      "border": "4,2,4,2",
      "borderColor": "#403E41",
      "disabledBackground": "#403E41",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
      "separatorColor": "#2d2a2e"
    },
    "MenuBar": {
      "background": "#221F22",
      "borderColor": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "highlight": "#2D2A2E",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
      "shadow": "#221F22"
    },
    "MenuItem": {
      "acceleratorForeground": "#939293",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#ffd866",
      "border": "4,2,4,2",
      "background": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF"
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866"
    },
    "NavBar": {
      "arrowColor": "#fcfcfa",
@@ -426,7 +426,7 @@
    "Outline": {
      "color": "#403E41",
      "focusedColor": "#ffd866",
-      "disabledColor": "#727072"
+      "disabledColor": "#5b595c"
    },
    "Panel": {
      "background": "#2D2A2E",
@@ -437,7 +437,7 @@
      "borderColor": "#4A474B",
      "currentOverloadBackground": "#5b595c",
      "currentParameterForeground": "#ffd866",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "infoForeground": "#939293",
      "lineSeparatorColor": "#4A474B"
@@ -447,18 +447,18 @@
      "capsLockIconColor": "#ffd866",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
    "Plugins": {
      "background": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "eapTagBackground": "#5b595c",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "lightSelectionBackground": "#4A474B",
      "paidTagBackground": "#5b595c",
-      "selectionBackground": "#5B595C",
+      "selectionBackground": "#6E6C6F",
      "tagForeground": "#ffd866",
      "tagBackground": "#5b595c",
      "trialTagBackground": "#5b595c",
@@ -467,7 +467,7 @@
        "installBorderColor": "#403E41",
        "installForeground": "#fcfcfa",
        "installFocusedBackground": "#5b595c",
-        "installFillForeground": "#727072",
+        "installFillForeground": "#5b595c",
        "installFillBackground": "#403E41",
        "updateBackground": "#ffd866",
        "updateBorderColor": "#403E41",
@@ -483,7 +483,7 @@
      },
      "Tab": {
        "hoverBackground": "#4A474B",
-        "selectedForeground": "#FFFFFF",
+        "selectedForeground": "#ffd866",
        "selectedBackground": "#4A474B"
      }
    },
@@ -531,7 +531,7 @@
    },
    "RadioButton": {
      "background": "#2D2A2E",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa"
    },
    "RadioButtonMenuItem": {
@@ -539,10 +539,10 @@
      "acceleratorSelectionForeground": "#939293",
      "background": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF"
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866"
    },
    "ScreenView.borderColor": "#2d2a2e",
    "ScrollBar": {
@@ -662,8 +662,8 @@
      "contentAreaColor": "#5b595c",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#2d2a2e",
-      "disabledForeground": "#727072",
-      "disabledUnderlineColor": "#727072",
+      "disabledForeground": "#5b595c",
+      "disabledUnderlineColor": "#5b595c",
      "focus": "#4A474B",
      "focusColor": "#4A474B",
      "fontSizeOffset": 0,
@@ -686,7 +686,7 @@
      "background": "#2D2A2E",
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "dropLineColor": "#ffd866",
      "dropLineShortColor": "#ffd866",
      "focusCellBackground": "#4A474B",
@@ -694,7 +694,7 @@
      "foreground": "#fcfcfa",
      "gridColor": "#2D2A2E",
      "highlightOuter": "#4A474B",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "hoverInactiveBackground": "#4A474B",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#939293",
@@ -702,7 +702,7 @@
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#4A474B",
-      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#ffd866",
      "sortIconColor": "#fcfcfa",
      "stripeColor": "#221F22"
    },
@@ -711,7 +711,7 @@
      "borderColor": "#2D2A2E",
      "bottomSeparatorColor": "#403E41",
      "cellBorder": "4,0,4,0",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "focusCellBackground": "#4A474B",
      "focusCellForeground": "#FFFFFF",
@@ -725,7 +725,7 @@
      "background": "#221F22",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
@@ -733,7 +733,7 @@
      "background": "#221F22",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
@@ -741,7 +741,7 @@
      "background": "#221F22",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
@@ -756,7 +756,7 @@
    "ToggleButton": {
      "borderColor": "#403E41",
      "buttonColor": "#fcfcfa",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa",
      "offForeground": "#2D2A2E",
      "offBackground": "#2D2A2E",
@@ -803,7 +803,7 @@
        "underlineColor": "#ffd866",
        "underlinedTabBackground": "#4A474B",
        "underlinedTabInactiveBackground": "#403E41",
-        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabForeground": "#ffd866",
        "underlinedTabInactiveForeground": "#fcfcfa"
      }
    },
@@ -811,14 +811,14 @@
      "background": "#221F22",
      "foreground": "#939293",
      "hash": "#2d2a2e",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "hoverInactiveBackground": "#4A474B",
      "modifiedItemForeground": "#ffd866",
      "rowHeight": 28,
-      "selectionBackground": "#403E4170",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#403E4170",
+      "selectionBackground": "#403E41",
+      "selectionForeground": "#ffd866",
+      "selectionInactiveForeground": "#ffd866",
+      "selectionInactiveBackground": "#403E41",
      "textBackground": "#221F22"
    },
    "Tree.leftChildIndent": 10,
@@ -843,24 +843,24 @@
      "Canvas.background": "#221F22",
      "highStroke.foreground": "#fcfcfa",
      "Label.foreground": "#939293",
-      "List.selectionBackground": "#403E4170",
+      "List.selectionBackground": "#403E41",
      "motion": {
        "borderColor": "#2d2a2e",
        "Component.foreground": "#fcfcfa",
        "ConstraintSetText.foreground": "#939293",
        "ConstraintSet.background": "#403E41",
-        "CSPanel.SelectedFocusBackground": "#5B595C",
-        "CSPanel.SelectedBackground": "#403E4170",
+        "CSPanel.SelectedFocusBackground": "#6E6C6F",
+        "CSPanel.SelectedBackground": "#403E41",
        "cs_FocusText.infoForeground": "#939293",
        "CursorTextColor.foreground": "#fcfcfa",
-        "HoverColor.disabledBackground": "#727072",
+        "HoverColor.disabledBackground": "#5b595c",
        "motionGraph.background": "#2D2A2E",
        "Notification.background": "#363437",
        "ourAvg.background": "#403E41",
        "ourCS.background": "#403E41",
        "ourCS_Border.borderColor": "#2d2a2e",
        "ourCS_TextColor.foreground": "#939293",
-        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#ffd866",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#4A474B",
        "ourCS_SelectedBorder.pressedBorderColor": "#5b595c",
        "ourML_BarColor.separatorColor": "#2d2a2e",
@@ -879,7 +879,7 @@
        "background": "#2D2A2E",
        "borderColor": "#2d2a2e",
        "foreground": "#fcfcfa",
-        "selectedForeground": "#FFFFFF"
+        "selectedForeground": "#ffd866"
      },
      "Preview.background": "#2D2A2E",
      "stroke.acceleratorForeground": "#939293"
@@ -906,7 +906,7 @@
      "HgLog": {
        "branchIconColor": "#ffd866",
        "bookmarkIconColor": "#FFFFFF",
-        "closedBranchIconColor": "#727072",
+        "closedBranchIconColor": "#5b595c",
        "localTagIconColor": "#939293",
        "mqTagIconColor": "#939293",
        "tagIconColor": "#939293",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#939293",
        "Commit.currentBranchBackground": "#403E41",
-        "Commit.hoveredBackground": "#403E4170"
+        "Commit.hoveredBackground": "#403E41"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#221F22",
        "actions.selectionBackground": "#5b595c",
        "background": "#403E41",
-        "selectionBackground": "#5B595C",
+        "selectionBackground": "#6E6C6F",
        "selectionInactiveBackground": "#403E41"
      }
    },
@@ -961,8 +961,8 @@
      "#3D6185": "#ffd866",
      "#466D94": "#ffd866",
      "#3C3F41": "#2D2A2E",
-      "#545556": "#727072",
-      "#606060": "#727072",
+      "#545556": "#5b595c",
+      "#606060": "#5b595c",
      "#9AA7B0": "#fcfcfa",
      "#675133": "#ffd866",
      "Actions.Blue": "#A9DC76",
@@ -978,14 +978,14 @@
      "Checkbox.Background.Disabled.Dark": "#3a3a3c",
      "Checkbox.Border.Default": "#2d2a2e",
      "Checkbox.Border.Default.Dark": "#2d2a2e",
-      "Checkbox.Border.Disabled": "#727072",
-      "Checkbox.Border.Disabled.Dark": "#727072",
+      "Checkbox.Border.Disabled": "#5b595c",
+      "Checkbox.Border.Disabled.Dark": "#5b595c",
      "Checkbox.Focus.Thin.Default": "#ffd866",
      "Checkbox.Focus.Thin.Default.Dark": "#ffd866",
      "Checkbox.Focus.Wide": "#ffd866",
      "Checkbox.Focus.Wide.Dark": "#ffd866",
-      "Checkbox.Foreground.Disabled": "#727072",
-      "Checkbox.Foreground.Disabled.Dark": "#727072",
+      "Checkbox.Foreground.Disabled": "#5b595c",
+      "Checkbox.Foreground.Disabled.Dark": "#5b595c",
      "Checkbox.Background.Selected": "#ffd866",
      "Checkbox.Background.Selected.Dark": "#2D2A2E",
      "Checkbox.Border.Selected": "#ffd866",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai
@@ -15,17 +15,17 @@
      "background": "#2D2A2E",
      "borderColor": "#2d2a2e",
      "disabledBackground": "#3a3a3c",
-      "disabledForeground": "#727072",
-      "disabledText": "#727072",
+      "disabledForeground": "#5b595c",
+      "disabledText": "#5b595c",
      "focusColor": "#5b595c",
      "focusedBorderColor": "#ffd866",
      "foreground": "#fcfcfa",
      "inactiveBackground": "#3a3a3c",
      "inactiveForeground": "#939293",
      "infoForeground": "#939293",
-      "selectionBackground": "#5B595C",
+      "selectionBackground": "#6E6C6F",
      "selectionBackgroundInactive": "#403E41",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#ffd866",
      "selectionInactiveBackground": "#403E41",
      "separatorColor": "#2d2a2e"
    },
@@ -39,7 +39,7 @@
      "pressedBorderColor": "#ffd86650"
    },
    "Autocomplete": {
-      "selectionBackground": "#5B595C"
+      "selectionBackground": "#6E6C6F"
    },
    "Borders.ContrastBorderColor": "#2D2A2E",
    "Borders.color": "#2d2a2e",
@@ -57,16 +57,16 @@
        "startBorderColor": "#4A474B"
      },
      "disabledBorderColor": "#403E41",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "endBackground": "#403E41",
      "endBorderColor": "#403E41",
      "focus": "#5b595c",
      "focusedBorderColor": "#ffd866",
      "foreground": "#939293",
-      "highlight": "#FFFFFF",
+      "highlight": "#ffd866",
      "mt.background": "#403E41",
      "mt.foreground": "#939293",
-      "mt.selectedForeground": "#FFFFFF",
+      "mt.selectedForeground": "#ffd866",
      "mt.selection.color1": "#4A474B",
      "mt.selection.color2": "#4A474B",
      "startBackground": "#403E41",
@@ -80,11 +80,11 @@
    },
    "Content": {
      "background": "#221F22",
-      "selectionBackground": "#5B595C"
+      "selectionBackground": "#6E6C6F"
    },
    "CheckBox": {
      "background": "#2D2A2E",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa",
      "select": "#ffd866"
    },
@@ -93,9 +93,9 @@
      "acceleratorSelectionForeground": "#939293",
      "background": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
+      "selectionBackground": "#6E6C6F",
      "selectionForeground": "#FFFFFF"
    },
    "CodeWithMe": {
@@ -115,14 +115,14 @@
    "ComboBox": {
      "ArrowButton": {
        "background": "#403E41",
-        "disabledIconColor": "#727072",
+        "disabledIconColor": "#5b595c",
        "iconColor": "#fcfcfa",
        "nonEditableBackground": "#2D2A2E"
      },
      "background": "#2D2A2E",
      "buttonBackground": "#403E41",
      "darcula.hoveredArrowButtonForeground": "#ffd866",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "modifiedItemForeground": "#ffd866",
      "nonEditableBackground": "#403E41",
@@ -138,13 +138,13 @@
      "matchForeground": "#ffd866",
      "matchSelectionForeground": "#ffd866",
      "nonFocusedState": "false",
-      "selectedGrayedForeground": "#FFFFFF",
-      "selectionGrayForeground": "#FFFFFF",
+      "selectedGrayedForeground": "#ffd866",
+      "selectionGrayForeground": "#ffd866",
      "selectionInactiveInfoForeground": "#939293",
-      "selectionInactiveBackground": "#5B595C50",
-      "selectionBackground": "#5B595C80",
-      "selectionForeground": "#FFFFFF",
-      "selectionInfoForeground": "#FFFFFF"
+      "selectionInactiveBackground": "#6E6C6F",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
+      "selectionInfoForeground": "#ffd866"
    },
    "Component": {
      "arc": 4,
@@ -160,7 +160,7 @@
    "controlText": "#939293",
    "Counter": {
      "background": "#ffd866",
-      "foreground": "#FFFFFF"
+      "foreground": "#ffd866"
    },
    "Debugger": {
      "Variables": {
@@ -192,7 +192,7 @@
      "inactiveMaskColor": "#2D2A2E",
      "underlineColor": "#ffd866",
      "underlinedTabBackground": "#4A474B",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#ffd866"
    },
    "Desktop.background": "#2D2A2E",
    "DialogWrapper.southPanelBackground": "#2D2A2E",
@@ -212,8 +212,8 @@
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
      "inactiveBackground": "#2D2A2E",
-      "inactiveForeground": "#727072",
-      "selectionBackground": "#5B595C",
+      "inactiveForeground": "#5b595c",
+      "selectionBackground": "#6E6C6F",
      "selectionForeground": "#FFFFFF"
    },
    "EditorTabs": {
@@ -223,12 +223,12 @@
      "hoverMaskColor": "#5b595c",
      "inactiveMaskColor": "#2D2A2E",
      "inactiveColoredFileBackground": "#2D2A2E",
-      "inactiveUnderlineColor": "#727072",
+      "inactiveUnderlineColor": "#5b595c",
      "selectedForeground": "#fcfcfa",
      "selectedBackground": "#4A474B",
      "underlineColor": "#ffd866",
      "underlinedTabBackground": "#4A474B",
-      "underlinedTabForeground": "#FFFFFF"
+      "underlinedTabForeground": "#ffd866"
    },
    "EditorGroupsTabs": {
      "background": "#2D2A2E",
@@ -264,7 +264,7 @@
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
      "inactiveBackground": "#403E41",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionForeground": "#FFFFFF",
      "selectionBackground": "#4A474B"
    },
@@ -306,9 +306,9 @@
    },
    "Label": {
      "background": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "disabledShadow": "#2D2A2E",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa",
      "infoForeground": "#939293",
      "selectedForeground": "#FFFFFF",
@@ -325,12 +325,12 @@
    "List": {
      "background": "#403E41",
      "foreground": "#fcfcfa",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "hoverInactiveBackground": "#4A474B",
-      "selectionBackground": "#5B595C50",
-      "selectionForeground": "#FFFFFF",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#403E4170"
+      "selectionInactiveBackground": "#403E41"
    },
    "material": {
      "background": "#2D2A2E",
@@ -339,7 +339,7 @@
      "foreground": "#fcfcfa",
      "mergeCommits": "#403E41",
      "primaryColor": "#939293",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#ffd866",
      "tab.backgroundColor": "#2D2A2E",
      "tab.borderColor": "#ffd866",
      "tagColor": "#939293"
@@ -351,38 +351,38 @@
    },
    "Menu": {
      "acceleratorForeground": "#939293",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#ffd866",
      "background": "#2D2A2E",
      "border": "4,2,4,2",
      "borderColor": "#403E41",
      "disabledBackground": "#403E41",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
      "separatorColor": "#2d2a2e"
    },
    "MenuBar": {
      "background": "#2D2A2E",
      "borderColor": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "highlight": "#2D2A2E",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF",
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866",
      "shadow": "#2D2A2E"
    },
    "MenuItem": {
      "acceleratorForeground": "#939293",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#ffd866",
      "border": "4,2,4,2",
      "background": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF"
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866"
    },
    "NavBar": {
      "arrowColor": "#fcfcfa",
@@ -426,7 +426,7 @@
    "Outline": {
      "color": "#403E41",
      "focusedColor": "#ffd866",
-      "disabledColor": "#727072"
+      "disabledColor": "#5b595c"
    },
    "Panel": {
      "background": "#2D2A2E",
@@ -437,7 +437,7 @@
      "borderColor": "#4A474B",
      "currentOverloadBackground": "#5b595c",
      "currentParameterForeground": "#ffd866",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "infoForeground": "#939293",
      "lineSeparatorColor": "#4A474B"
@@ -447,18 +447,18 @@
      "capsLockIconColor": "#ffd866",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
    "Plugins": {
      "background": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "eapTagBackground": "#5b595c",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "lightSelectionBackground": "#4A474B",
      "paidTagBackground": "#5b595c",
-      "selectionBackground": "#5B595C",
+      "selectionBackground": "#6E6C6F",
      "tagForeground": "#ffd866",
      "tagBackground": "#5b595c",
      "trialTagBackground": "#5b595c",
@@ -467,7 +467,7 @@
        "installBorderColor": "#403E41",
        "installForeground": "#fcfcfa",
        "installFocusedBackground": "#5b595c",
-        "installFillForeground": "#727072",
+        "installFillForeground": "#5b595c",
        "installFillBackground": "#403E41",
        "updateBackground": "#ffd866",
        "updateBorderColor": "#403E41",
@@ -483,7 +483,7 @@
      },
      "Tab": {
        "hoverBackground": "#4A474B",
-        "selectedForeground": "#FFFFFF",
+        "selectedForeground": "#ffd866",
        "selectedBackground": "#4A474B"
      }
    },
@@ -531,7 +531,7 @@
    },
    "RadioButton": {
      "background": "#2D2A2E",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa"
    },
    "RadioButtonMenuItem": {
@@ -539,10 +539,10 @@
      "acceleratorSelectionForeground": "#939293",
      "background": "#2D2A2E",
      "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
-      "selectionBackground": "#5B595C",
-      "selectionForeground": "#FFFFFF"
+      "selectionBackground": "#6E6C6F",
+      "selectionForeground": "#ffd866"
    },
    "ScreenView.borderColor": "#2d2a2e",
    "ScrollBar": {
@@ -662,8 +662,8 @@
      "contentAreaColor": "#5b595c",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#2d2a2e",
-      "disabledForeground": "#727072",
-      "disabledUnderlineColor": "#727072",
+      "disabledForeground": "#5b595c",
+      "disabledUnderlineColor": "#5b595c",
      "focus": "#4A474B",
      "focusColor": "#4A474B",
      "fontSizeOffset": 0,
@@ -686,7 +686,7 @@
      "background": "#2D2A2E",
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "dropLineColor": "#ffd866",
      "dropLineShortColor": "#ffd866",
      "focusCellBackground": "#4A474B",
@@ -694,7 +694,7 @@
      "foreground": "#fcfcfa",
      "gridColor": "#2D2A2E",
      "highlightOuter": "#4A474B",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "hoverInactiveBackground": "#4A474B",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#939293",
@@ -702,7 +702,7 @@
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveBackground": "#4A474B",
-      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#ffd866",
      "sortIconColor": "#fcfcfa",
      "stripeColor": "#221F22"
    },
@@ -711,7 +711,7 @@
      "borderColor": "#2D2A2E",
      "bottomSeparatorColor": "#403E41",
      "cellBorder": "4,0,4,0",
-      "disabledForeground": "#727072",
+      "disabledForeground": "#5b595c",
      "foreground": "#fcfcfa",
      "focusCellBackground": "#4A474B",
      "focusCellForeground": "#FFFFFF",
@@ -725,7 +725,7 @@
      "background": "#2D2A2E",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
@@ -733,7 +733,7 @@
      "background": "#2D2A2E",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
@@ -741,7 +741,7 @@
      "background": "#2D2A2E",
      "caretForeground": "#ffd866",
      "foreground": "#fcfcfa",
-      "inactiveForeground": "#727072",
+      "inactiveForeground": "#5b595c",
      "selectionBackground": "#4A474B",
      "selectionForeground": "#FFFFFF"
    },
@@ -756,7 +756,7 @@
    "ToggleButton": {
      "borderColor": "#403E41",
      "buttonColor": "#fcfcfa",
-      "disabledText": "#727072",
+      "disabledText": "#5b595c",
      "foreground": "#fcfcfa",
      "offForeground": "#2D2A2E",
      "offBackground": "#2D2A2E",
@@ -803,7 +803,7 @@
        "underlineColor": "#ffd866",
        "underlinedTabBackground": "#4A474B",
        "underlinedTabInactiveBackground": "#403E41",
-        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabForeground": "#ffd866",
        "underlinedTabInactiveForeground": "#fcfcfa"
      }
    },
@@ -811,14 +811,14 @@
      "background": "#2D2A2E",
      "foreground": "#939293",
      "hash": "#2d2a2e",
-      "hoverBackground": "#403E4170",
+      "hoverBackground": "#403E41",
      "hoverInactiveBackground": "#4A474B",
      "modifiedItemForeground": "#ffd866",
      "rowHeight": 28,
-      "selectionBackground": "#403E4170",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#403E4170",
+      "selectionBackground": "#403E41",
+      "selectionForeground": "#ffd866",
+      "selectionInactiveForeground": "#ffd866",
+      "selectionInactiveBackground": "#403E41",
      "textBackground": "#2D2A2E"
    },
    "Tree.leftChildIndent": 10,
@@ -843,24 +843,24 @@
      "Canvas.background": "#221F22",
      "highStroke.foreground": "#fcfcfa",
      "Label.foreground": "#939293",
-      "List.selectionBackground": "#403E4170",
+      "List.selectionBackground": "#403E41",
      "motion": {
        "borderColor": "#2d2a2e",
        "Component.foreground": "#fcfcfa",
        "ConstraintSetText.foreground": "#939293",
        "ConstraintSet.background": "#403E41",
-        "CSPanel.SelectedFocusBackground": "#5B595C",
-        "CSPanel.SelectedBackground": "#403E4170",
+        "CSPanel.SelectedFocusBackground": "#6E6C6F",
+        "CSPanel.SelectedBackground": "#403E41",
        "cs_FocusText.infoForeground": "#939293",
        "CursorTextColor.foreground": "#fcfcfa",
-        "HoverColor.disabledBackground": "#727072",
+        "HoverColor.disabledBackground": "#5b595c",
        "motionGraph.background": "#2D2A2E",
        "Notification.background": "#363437",
        "ourAvg.background": "#403E41",
        "ourCS.background": "#403E41",
        "ourCS_Border.borderColor": "#2d2a2e",
        "ourCS_TextColor.foreground": "#939293",
-        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#ffd866",
        "ourCS_SelectedBackground.selectionInactiveBackground": "#4A474B",
        "ourCS_SelectedBorder.pressedBorderColor": "#5b595c",
        "ourML_BarColor.separatorColor": "#2d2a2e",
@@ -879,7 +879,7 @@
        "background": "#2D2A2E",
        "borderColor": "#2d2a2e",
        "foreground": "#fcfcfa",
-        "selectedForeground": "#FFFFFF"
+        "selectedForeground": "#ffd866"
      },
      "Preview.background": "#2D2A2E",
      "stroke.acceleratorForeground": "#939293"
@@ -906,7 +906,7 @@
      "HgLog": {
        "branchIconColor": "#ffd866",
        "bookmarkIconColor": "#FFFFFF",
-        "closedBranchIconColor": "#727072",
+        "closedBranchIconColor": "#5b595c",
        "localTagIconColor": "#939293",
        "mqTagIconColor": "#939293",
        "tagIconColor": "#939293",
@@ -915,7 +915,7 @@
      "Log": {
        "Commit.unmatchedForeground": "#939293",
        "Commit.currentBranchBackground": "#403E41",
-        "Commit.hoveredBackground": "#403E4170"
+        "Commit.hoveredBackground": "#403E41"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
@@ -944,7 +944,7 @@
        "actions.background": "#221F22",
        "actions.selectionBackground": "#5b595c",
        "background": "#403E41",
-        "selectionBackground": "#5B595C",
+        "selectionBackground": "#6E6C6F",
        "selectionInactiveBackground": "#403E41"
      }
    },
@@ -961,8 +961,8 @@
      "#3D6185": "#ffd866",
      "#466D94": "#ffd866",
      "#3C3F41": "#2D2A2E",
-      "#545556": "#727072",
-      "#606060": "#727072",
+      "#545556": "#5b595c",
+      "#606060": "#5b595c",
      "#9AA7B0": "#fcfcfa",
      "#675133": "#ffd866",
      "Actions.Blue": "#A9DC76",
@@ -978,14 +978,14 @@
      "Checkbox.Background.Disabled.Dark": "#3a3a3c",
      "Checkbox.Border.Default": "#2d2a2e",
      "Checkbox.Border.Default.Dark": "#2d2a2e",
-      "Checkbox.Border.Disabled": "#727072",
-      "Checkbox.Border.Disabled.Dark": "#727072",
+      "Checkbox.Border.Disabled": "#5b595c",
+      "Checkbox.Border.Disabled.Dark": "#5b595c",
      "Checkbox.Focus.Thin.Default": "#ffd866",
      "Checkbox.Focus.Thin.Default.Dark": "#ffd866",
      "Checkbox.Focus.Wide": "#ffd866",
      "Checkbox.Focus.Wide.Dark": "#ffd866",
-      "Checkbox.Foreground.Disabled": "#727072",
-      "Checkbox.Foreground.Disabled.Dark": "#727072",
+      "Checkbox.Foreground.Disabled": "#5b595c",
+      "Checkbox.Foreground.Disabled.Dark": "#5b595c",
      "Checkbox.Background.Selected": "#ffd866",
      "Checkbox.Background.Selected.Dark": "#2D2A2E",
      "Checkbox.Border.Selected": "#ffd866",
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight
@@ -18,7 +18,7 @@
      "disabledForeground": "#828bb8",
      "disabledText": "#828bb8",
      "focusColor": "#444a73",
-      "focusedBorderColor": "#4fd6be",
+      "focusedBorderColor": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveBackground": "#2f334d",
      "inactiveForeground": "#a9b8e8",
@@ -31,12 +31,12 @@
    },
    "activeCaption": "#222436",
    "ActionButton": {
-      "hoverBackground": "#4fd6be50",
-      "hoverBorderColor": "#4fd6be50",
+      "hoverBackground": "#74a0f150",
+      "hoverBorderColor": "#74a0f150",
      "hoverSeparatorColor": "#444a73",
-      "focusedBorderColor": "#4fd6be50",
-      "pressedBackground": "#4fd6be50",
-      "pressedBorderColor": "#4fd6be50"
+      "focusedBorderColor": "#74a0f150",
+      "pressedBackground": "#74a0f150",
+      "pressedBorderColor": "#74a0f150"
    },
    "Autocomplete": {
      "selectionBackground": "#444a73"
@@ -50,8 +50,8 @@
        "endBackground": "#2f334d",
        "endBorderColor": "#2f334d",
        "foreground": "#FFFFFF",
-        "focusColor": "#4fd6be",
-        "focusedBorderColor": "#4fd6be",
+        "focusColor": "#74a0f1",
+        "focusedBorderColor": "#74a0f1",
        "shadowColor": "#2f334d",
        "startBackground": "#2f334d",
        "startBorderColor": "#2f334d"
@@ -61,7 +61,7 @@
      "endBackground": "#444a73",
      "endBorderColor": "#444a73",
      "focus": "#444a73",
-      "focusedBorderColor": "#4fd6be",
+      "focusedBorderColor": "#74a0f1",
      "foreground": "#a9b8e8",
      "highlight": "#FFFFFF",
      "mt.background": "#444a73",
@@ -86,7 +86,7 @@
      "background": "#222436",
      "disabledText": "#828bb8",
      "foreground": "#c8d3f5",
-      "select": "#4fd6be"
+      "select": "#74a0f1"
    },
    "CheckBoxMenuItem": {
      "acceleratorForeground": "#a9b8e8",
@@ -101,7 +101,7 @@
    "CodeWithMe": {
      "Avatar.foreground": "#c8d3f5",
      "AccessEnabled": {
-        "accessDot": "#4fd6be",
+        "accessDot": "#74a0f1",
        "dropdownBorder": "#2f334d",
        "pillBackground": "$second"
      }
@@ -121,10 +121,10 @@
      },
      "background": "#191a2a",
      "buttonBackground": "#444a73",
-      "darcula.hoveredArrowButtonForeground": "#4fd6be",
+      "darcula.hoveredArrowButtonForeground": "#74a0f1",
      "disabledForeground": "#828bb8",
      "foreground": "#c8d3f5",
-      "modifiedItemForeground": "#4fd6be",
+      "modifiedItemForeground": "#74a0f1",
      "nonEditableBackground": "#2f334d",
      "padding": "5,5,5,5",
      "selectionBackground": "#2f334d",
@@ -135,14 +135,14 @@
      "background": "#2f334d",
      "foreground": "#c8d3f5",
      "infoForeground": "#a9b8e8",
-      "matchForeground": "#4fd6be",
-      "matchSelectionForeground": "#4fd6be",
+      "matchForeground": "#74a0f1",
+      "matchSelectionForeground": "#74a0f1",
      "nonFocusedState": "false",
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#a9b8e8",
-      "selectionInactiveBackground": "#444a7350",
-      "selectionBackground": "#444a7380",
+      "selectionInactiveBackground": "#444a73",
+      "selectionBackground": "#444a73",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -150,27 +150,27 @@
      "arc": 4,
      "borderColor": "#444a73",
      "disabledBorderColor": "#444a73",
-      "focusColor": "#4fd6be",
-      "focusedBorderColor": "#4fd6be",
-      "hoverIconColor": "#4fd6be",
+      "focusColor": "#74a0f1",
+      "focusedBorderColor": "#74a0f1",
+      "hoverIconColor": "#74a0f1",
      "infoForeground": "#a9b8e8",
      "iconColor": "#c8d3f5"
    },
    "control": "#222436",
    "controlText": "#a9b8e8",
    "Counter": {
-      "background": "#4fd6be",
+      "background": "#74a0f1",
      "foreground": "#FFFFFF"
    },
    "Debugger": {
      "Variables": {
        "collectingDataForeground": "#a9b8e8",
-        "changedValueForeground": "#4fd6be",
+        "changedValueForeground": "#74a0f1",
        "errorMessageForeground": "#ff757f",
        "evaluatingExpressionForeground": "#a9b8e8",
-        "exceptionForeground": "#c099ff",
-        "modifyingValueForeground": "#4fd6be",
-        "valueForeground": "#4fd6be"
+        "exceptionForeground": "#ffbd76",
+        "modifyingValueForeground": "#74a0f1",
+        "valueForeground": "#74a0f1"
      }
    },
    "DebuggerTabs": {
@@ -188,9 +188,9 @@
      "hoverMaskColor": "#444a73",
      "inactiveColoredTabBackground": "#222436",
      "inactiveColoredFileBackground": "#444a73",
-      "inactiveUnderlineColor": "#4fd6be",
+      "inactiveUnderlineColor": "#74a0f1",
      "inactiveMaskColor": "#191a2a",
-      "underlineColor": "#4fd6be",
+      "underlineColor": "#74a0f1",
      "underlinedTabBackground": "#2f334d",
      "underlinedTabForeground": "#FFFFFF"
    },
@@ -209,7 +209,7 @@
    },
    "EditorPane": {
      "background": "#191a2a",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveBackground": "#222436",
      "inactiveForeground": "#828bb8",
@@ -226,7 +226,7 @@
      "inactiveUnderlineColor": "#828bb8",
      "selectedForeground": "#c8d3f5",
      "selectedBackground": "#2f334d",
-      "underlineColor": "#4fd6be",
+      "underlineColor": "#74a0f1",
      "underlinedTabBackground": "#2f334d",
      "underlinedTabForeground": "#FFFFFF"
    },
@@ -235,8 +235,8 @@
      "borderColor": "#2f334d",
      "hoverBackground": "#444a73",
      "hoverColor": "#444a73",
-      "inactiveUnderlineColor": "#4fd6be",
-      "underlineColor": "#4fd6be",
+      "inactiveUnderlineColor": "#74a0f1",
+      "underlineColor": "#74a0f1",
      "underlinedTabBackground": "#2f334d",
      "underlinedTabForeground": "#c8d3f5"
    },
@@ -261,7 +261,7 @@
    "Focus.color": "#222436",
    "FormattedTextField": {
      "background": "#191a2a",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveBackground": "#444a73",
      "inactiveForeground": "#828bb8",
@@ -288,7 +288,7 @@
      "infoForeground": "#a9b8e8",
      "shortcutForeground": "#a9b8e8"
    },
-    "Hyperlink.linkColor": "#4fd6be",
+    "Hyperlink.linkColor": "#74a0f1",
    "inactiveCaption": "#2f334d",
    "inactiveCaptionBorder": "#222436",
    "inactiveCaptionText": "#a9b8e8",
@@ -315,19 +315,19 @@
      "selectedDisabledForeground": "#c8d3f5"
    },
    "Link": {
-      "activeForeground": "#4fd6be",
-      "hoverForeground": "#4fd6be",
-      "pressedForeground": "#4fd6be",
+      "activeForeground": "#74a0f1",
+      "hoverForeground": "#74a0f1",
+      "pressedForeground": "#74a0f1",
      "secondaryForeground": "#a9b8e8",
-      "visitedForeground": "#4fd6be"
+      "visitedForeground": "#74a0f1"
    },
-    "link.foreground": "#4fd6be",
+    "link.foreground": "#74a0f1",
    "List": {
      "background": "#2f334d",
      "foreground": "#c8d3f5",
      "hoverBackground": "#444a7370",
      "hoverInactiveBackground": "#2f334d",
-      "selectionBackground": "#444a7350",
+      "selectionBackground": "#444a73",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
      "selectionInactiveBackground": "#444a7370"
@@ -341,7 +341,7 @@
      "primaryColor": "#a9b8e8",
      "selectionForeground": "#FFFFFF",
      "tab.backgroundColor": "#222436",
-      "tab.borderColor": "#4fd6be",
+      "tab.borderColor": "#74a0f1",
      "tagColor": "#a9b8e8"
    },
    "MemoryIndicator": {
@@ -396,7 +396,7 @@
        "background": "#191a2a"
      }
    },
-    "NewPSD.warning": "#4fd6be",
+    "NewPSD.warning": "#74a0f1",
    "Notification": {
      "background": "#191a2a",
      "borderColor": "#191a2a",
@@ -425,7 +425,7 @@
    },
    "Outline": {
      "color": "#444a73",
-      "focusedColor": "#4fd6be",
+      "focusedColor": "#74a0f1",
      "disabledColor": "#828bb8"
    },
    "Panel": {
@@ -436,7 +436,7 @@
      "background": "#2f334d",
      "borderColor": "#2f334d",
      "currentOverloadBackground": "#444a73",
-      "currentParameterForeground": "#4fd6be",
+      "currentParameterForeground": "#74a0f1",
      "disabledForeground": "#828bb8",
      "foreground": "#c8d3f5",
      "infoForeground": "#a9b8e8",
@@ -444,8 +444,8 @@
    },
    "PasswordField": {
      "background": "#191a2a",
-      "capsLockIconColor": "#4fd6be",
-      "caretForeground": "#4fd6be",
+      "capsLockIconColor": "#74a0f1",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -459,7 +459,7 @@
      "lightSelectionBackground": "#2f334d",
      "paidTagBackground": "#444a73",
      "selectionBackground": "#444a73",
-      "tagForeground": "#4fd6be",
+      "tagForeground": "#74a0f1",
      "tagBackground": "#444a73",
      "trialTagBackground": "#444a73",
      "Button": {
@@ -469,7 +469,7 @@
        "installFocusedBackground": "#444a73",
        "installFillForeground": "#828bb8",
        "installFillBackground": "#444a73",
-        "updateBackground": "#4fd6be",
+        "updateBackground": "#74a0f1",
        "updateBorderColor": "#444a73",
        "updateForeground": "#c8d3f5"
      },
@@ -491,7 +491,7 @@
      "Advertiser": {
        "background": "#222436",
        "borderColor": "#222436",
-        "foreground": "#4fd6be"
+        "foreground": "#74a0f1"
      },
      "borderColor": "#191a2a",
      "inactiveBorderColor": "#222436",
@@ -519,15 +519,15 @@
    "PopupMenuSeparator.stripeIndent": 5,
    "ProgressBar": {
      "background": "#222436",
-      "foreground": "#4fd6be",
-      "indeterminateEndColor": "#4fd6be",
-      "indeterminateStartColor": "#4fd6be",
-      "progressColor": "#4fd6be",
+      "foreground": "#74a0f1",
+      "indeterminateEndColor": "#74a0f1",
+      "indeterminateStartColor": "#74a0f1",
+      "progressColor": "#74a0f1",
      "selectionBackground": "#444a73",
      "trackColor": "#444a73"
    },
    "PsiViewer": {
-      "referenceHighlightColor": "#4fd6be"
+      "referenceHighlightColor": "#74a0f1"
    },
    "RadioButton": {
      "background": "#222436",
@@ -547,35 +547,35 @@
    "ScreenView.borderColor": "#222436",
    "ScrollBar": {
      "background": "#222436",
-      "hoverThumbBorderColor": "#4fd6be",
-      "hoverThumbColor": "#4fd6be",
+      "hoverThumbBorderColor": "#74a0f1",
+      "hoverThumbColor": "#74a0f1",
      "hoverTrackColor": "#22243630",
      "Mac": {
-        "hoverThumbBorderColor": "#4fd6be",
-        "hoverThumbColor": "#4fd6be",
+        "hoverThumbBorderColor": "#74a0f1",
+        "hoverThumbColor": "#74a0f1",
        "hoverTrackColor": "#22243630",
-        "thumbBorderColor": "#4fd6be70",
-        "thumbColor": "#4fd6be70",
+        "thumbBorderColor": "#74a0f170",
+        "thumbColor": "#74a0f170",
        "trackColor": "#22243630",
        "Transparent": {
-          "hoverThumbBorderColor": "#4fd6be",
-          "hoverThumbColor": "#4fd6be",
+          "hoverThumbBorderColor": "#74a0f1",
+          "hoverThumbColor": "#74a0f1",
          "hoverTrackColor": "#22243630",
-          "thumbBorderColor": "#4fd6be70",
-          "thumbColor": "#4fd6be70",
+          "thumbBorderColor": "#74a0f170",
+          "thumbColor": "#74a0f170",
          "trackColor": "#22243630"
        }
      },
      "thumb": "#444a73",
-      "thumbBorderColor": "#4fd6be70",
-      "thumbColor": "#4fd6be70",
+      "thumbBorderColor": "#74a0f170",
+      "thumbColor": "#74a0f170",
      "trackColor": "#22243630",
      "Transparent": {
-        "hoverThumbBorderColor": "#4fd6be",
-        "hoverThumbColor": "#4fd6be",
+        "hoverThumbBorderColor": "#74a0f1",
+        "hoverThumbColor": "#74a0f1",
        "hoverTrackColor": "#22243630",
-        "thumbBorderColor": "#4fd6be70",
-        "thumbColor": "#4fd6be70",
+        "thumbBorderColor": "#74a0f170",
+        "thumbColor": "#74a0f170",
        "trackColor": "#22243630"
      }
    },
@@ -603,10 +603,10 @@
      }
    },
    "SearchMatch": {
-      "endBackground": "#4fd6be",
-      "startBackground": "#4fd6be",
-      "endColor": "#4fd6be",
-      "startColor": "#4fd6be"
+      "endBackground": "#74a0f1",
+      "startBackground": "#74a0f1",
+      "endColor": "#74a0f1",
+      "startColor": "#74a0f1"
    },
    "SearchField.errorBackground": "#191a2a",
    "SearchOption": {
@@ -626,14 +626,14 @@
    },
    "Slider": {
      "background": "#222436",
-      "buttonBorderColor": "#4fd6be",
-      "buttonColor": "#4fd6be",
+      "buttonBorderColor": "#74a0f1",
+      "buttonColor": "#74a0f1",
      "foreground": "#c8d3f5",
      "majorTickLength": 6,
      "tickColor": "#2f334d",
      "trackColor": "#2f334d",
      "trackWidth": 7,
-      "thumb": "#4fd6be"
+      "thumb": "#74a0f1"
    },
    "SpeedSearch": {
      "background": "#444a73",
@@ -678,7 +678,7 @@
      "tabHeight": 32,
      "tabInsets": "5,10,5,10",
      "tabSelectionHeight": 2,
-      "underlineColor": "#4fd6be"
+      "underlineColor": "#74a0f1"
    },
    "TabbedPane.mt.tab.background": "#191a2a",
    "Table": {
@@ -687,8 +687,8 @@
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
      "disabledForeground": "#828bb8",
-      "dropLineColor": "#4fd6be",
-      "dropLineShortColor": "#4fd6be",
+      "dropLineColor": "#74a0f1",
+      "dropLineShortColor": "#74a0f1",
      "focusCellBackground": "#2f334d",
      "focusCellForeground": "#FFFFFF",
      "foreground": "#c8d3f5",
@@ -723,7 +723,7 @@
    "textText": "#a9b8e8",
    "TextArea": {
      "background": "#191a2a",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -731,7 +731,7 @@
    },
    "TextField": {
      "background": "#191a2a",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -739,7 +739,7 @@
    },
    "TextPane": {
      "background": "#191a2a",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -760,8 +760,8 @@
      "foreground": "#c8d3f5",
      "offForeground": "#222436",
      "offBackground": "#222436",
-      "onBackground": "#4fd6be",
-      "onForeground": "#4fd6be"
+      "onBackground": "#74a0f1",
+      "onForeground": "#74a0f1"
    },
    "ToolBar": {
      "background": "#191a2a",
@@ -797,10 +797,10 @@
        "borderColor": "#444a73",
        "hoverBackground": "#444a73",
        "hoverInactiveBackground": "#444a73",
-        "inactiveUnderlineColor": "#4fd6be",
+        "inactiveUnderlineColor": "#74a0f1",
        "selectedBackground": "#191a2a",
        "selectedInactiveBackground": "#191a2a",
-        "underlineColor": "#4fd6be",
+        "underlineColor": "#74a0f1",
        "underlinedTabBackground": "#2f334d",
        "underlinedTabInactiveBackground": "#2f334d",
        "underlinedTabForeground": "#FFFFFF",
@@ -813,7 +813,7 @@
      "hash": "#222436",
      "hoverBackground": "#444a7370",
      "hoverInactiveBackground": "#2f334d",
-      "modifiedItemForeground": "#4fd6be",
+      "modifiedItemForeground": "#74a0f1",
      "rowHeight": 28,
      "selectionBackground": "#444a7370",
      "selectionForeground": "#FFFFFF",
@@ -898,13 +898,13 @@
        "graphColor": "#444a73"
      },
      "GitLog": {
-        "localBranchIconColor": "#4fd6be",
+        "localBranchIconColor": "#74a0f1",
        "otherIconColor": "#a9b8e8",
        "remoteBranchIconColor": "#c8d3f5",
        "tagIconColor": "#a9b8e8"
      },
      "HgLog": {
-        "branchIconColor": "#4fd6be",
+        "branchIconColor": "#74a0f1",
        "bookmarkIconColor": "#FFFFFF",
        "closedBranchIconColor": "#828bb8",
        "localTagIconColor": "#a9b8e8",
@@ -958,20 +958,20 @@
      "#43494A": "#191a2a",
      "#6B6B6B": "#a9b8e8",
      "#A7A7A7": "#222436",
-      "#3D6185": "#4fd6be",
-      "#466D94": "#4fd6be",
+      "#3D6185": "#74a0f1",
+      "#466D94": "#74a0f1",
      "#3C3F41": "#222436",
      "#545556": "#828bb8",
      "#606060": "#828bb8",
      "#9AA7B0": "#c8d3f5",
-      "#675133": "#4fd6be",
-      "Actions.Blue": "#82aaff",
-      "Actions.Green": "#c3e88d",
+      "#675133": "#74a0f1",
+      "Actions.Blue": "#70b0ff",
+      "Actions.Green": "#7af8ca",
      "Actions.Grey": "#a9b8e8",
-      "Actions.GreyInline": "#7a88cf",
+      "Actions.GreyInline": "#7e8eda",
      "Actions.GreyInline.Dark": "#c8d3f5",
      "Actions.Red": "#ff757f",
-      "Actions.Yellow": "#c099ff",
+      "Actions.Yellow": "#ffbd76",
      "Checkbox.Background.Default": "#191a2a",
      "Checkbox.Background.Default.Dark": "#191a2a",
      "Checkbox.Background.Disabled": "#2f334d",
@@ -980,31 +980,31 @@
      "Checkbox.Border.Default.Dark": "#222436",
      "Checkbox.Border.Disabled": "#828bb8",
      "Checkbox.Border.Disabled.Dark": "#828bb8",
-      "Checkbox.Focus.Thin.Default": "#4fd6be",
-      "Checkbox.Focus.Thin.Default.Dark": "#4fd6be",
-      "Checkbox.Focus.Wide": "#4fd6be",
-      "Checkbox.Focus.Wide.Dark": "#4fd6be",
+      "Checkbox.Focus.Thin.Default": "#74a0f1",
+      "Checkbox.Focus.Thin.Default.Dark": "#74a0f1",
+      "Checkbox.Focus.Wide": "#74a0f1",
+      "Checkbox.Focus.Wide.Dark": "#74a0f1",
      "Checkbox.Foreground.Disabled": "#828bb8",
      "Checkbox.Foreground.Disabled.Dark": "#828bb8",
-      "Checkbox.Background.Selected": "#4fd6be",
+      "Checkbox.Background.Selected": "#74a0f1",
      "Checkbox.Background.Selected.Dark": "#222436",
-      "Checkbox.Border.Selected": "#4fd6be",
-      "Checkbox.Border.Selected.Dark": "#4fd6be",
-      "Checkbox.Foreground.Selected": "#4fd6be",
-      "Checkbox.Foreground.Selected.Dark": "#4fd6be",
+      "Checkbox.Border.Selected": "#74a0f1",
+      "Checkbox.Border.Selected.Dark": "#74a0f1",
+      "Checkbox.Foreground.Selected": "#74a0f1",
+      "Checkbox.Foreground.Selected.Dark": "#74a0f1",
      "Checkbox.Focus.Thin.Selected": "#c8d3f5",
      "Checkbox.Focus.Thin.Selected.Dark": "#c8d3f5",
-      "Objects.Grey": "#7a88cf",
-      "Objects.Blue": "#82aaff",
+      "Objects.Grey": "#7e8eda",
+      "Objects.Blue": "#70b0ff",
      "Objects.RedStatus": "#ff757f",
      "Objects.Red": "#ff757f",
-      "Objects.Pink": "#c099ff",
-      "Objects.Yellow": "#c099ff",
-      "Objects.Green": "#c3e88d",
-      "Objects.Purple": "#c099ff",
+      "Objects.Pink": "#baacff",
+      "Objects.Yellow": "#ffbd76",
+      "Objects.Green": "#7af8ca",
+      "Objects.Purple": "#baacff",
      "Objects.BlackText": "#c8d3f5",
-      "Objects.YellowDark": "#ff966c",
-      "Objects.GreenAndroid": "#c3e88d"
+      "Objects.YellowDark": "#ff9668",
+      "Objects.GreenAndroid": "#7af8ca"
    }
  }
 }
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json
@@ -18,7 +18,7 @@
      "disabledForeground": "#828bb8",
      "disabledText": "#828bb8",
      "focusColor": "#444a73",
-      "focusedBorderColor": "#4fd6be",
+      "focusedBorderColor": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveBackground": "#2f334d",
      "inactiveForeground": "#a9b8e8",
@@ -31,12 +31,12 @@
    },
    "activeCaption": "#222436",
    "ActionButton": {
-      "hoverBackground": "#4fd6be50",
-      "hoverBorderColor": "#4fd6be50",
+      "hoverBackground": "#74a0f150",
+      "hoverBorderColor": "#74a0f150",
      "hoverSeparatorColor": "#444a73",
-      "focusedBorderColor": "#4fd6be50",
-      "pressedBackground": "#4fd6be50",
-      "pressedBorderColor": "#4fd6be50"
+      "focusedBorderColor": "#74a0f150",
+      "pressedBackground": "#74a0f150",
+      "pressedBorderColor": "#74a0f150"
    },
    "Autocomplete": {
      "selectionBackground": "#444a73"
@@ -50,8 +50,8 @@
        "endBackground": "#2f334d",
        "endBorderColor": "#2f334d",
        "foreground": "#FFFFFF",
-        "focusColor": "#4fd6be",
-        "focusedBorderColor": "#4fd6be",
+        "focusColor": "#74a0f1",
+        "focusedBorderColor": "#74a0f1",
        "shadowColor": "#2f334d",
        "startBackground": "#2f334d",
        "startBorderColor": "#2f334d"
@@ -61,7 +61,7 @@
      "endBackground": "#444a73",
      "endBorderColor": "#444a73",
      "focus": "#444a73",
-      "focusedBorderColor": "#4fd6be",
+      "focusedBorderColor": "#74a0f1",
      "foreground": "#a9b8e8",
      "highlight": "#FFFFFF",
      "mt.background": "#444a73",
@@ -86,7 +86,7 @@
      "background": "#222436",
      "disabledText": "#828bb8",
      "foreground": "#c8d3f5",
-      "select": "#4fd6be"
+      "select": "#74a0f1"
    },
    "CheckBoxMenuItem": {
      "acceleratorForeground": "#a9b8e8",
@@ -101,7 +101,7 @@
    "CodeWithMe": {
      "Avatar.foreground": "#c8d3f5",
      "AccessEnabled": {
-        "accessDot": "#4fd6be",
+        "accessDot": "#74a0f1",
        "dropdownBorder": "#2f334d",
        "pillBackground": "$second"
      }
@@ -121,10 +121,10 @@
      },
      "background": "#222436",
      "buttonBackground": "#444a73",
-      "darcula.hoveredArrowButtonForeground": "#4fd6be",
+      "darcula.hoveredArrowButtonForeground": "#74a0f1",
      "disabledForeground": "#828bb8",
      "foreground": "#c8d3f5",
-      "modifiedItemForeground": "#4fd6be",
+      "modifiedItemForeground": "#74a0f1",
      "nonEditableBackground": "#2f334d",
      "padding": "5,5,5,5",
      "selectionBackground": "#2f334d",
@@ -135,14 +135,14 @@
      "background": "#2f334d",
      "foreground": "#c8d3f5",
      "infoForeground": "#a9b8e8",
-      "matchForeground": "#4fd6be",
-      "matchSelectionForeground": "#4fd6be",
+      "matchForeground": "#74a0f1",
+      "matchSelectionForeground": "#74a0f1",
      "nonFocusedState": "false",
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#a9b8e8",
-      "selectionInactiveBackground": "#444a7350",
-      "selectionBackground": "#444a7380",
+      "selectionInactiveBackground": "#444a73",
+      "selectionBackground": "#444a73",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
@@ -150,27 +150,27 @@
      "arc": 4,
      "borderColor": "#444a73",
      "disabledBorderColor": "#444a73",
-      "focusColor": "#4fd6be",
-      "focusedBorderColor": "#4fd6be",
-      "hoverIconColor": "#4fd6be",
+      "focusColor": "#74a0f1",
+      "focusedBorderColor": "#74a0f1",
+      "hoverIconColor": "#74a0f1",
      "infoForeground": "#a9b8e8",
      "iconColor": "#c8d3f5"
    },
    "control": "#222436",
    "controlText": "#a9b8e8",
    "Counter": {
-      "background": "#4fd6be",
+      "background": "#74a0f1",
      "foreground": "#FFFFFF"
    },
    "Debugger": {
      "Variables": {
        "collectingDataForeground": "#a9b8e8",
-        "changedValueForeground": "#4fd6be",
+        "changedValueForeground": "#74a0f1",
        "errorMessageForeground": "#ff757f",
        "evaluatingExpressionForeground": "#a9b8e8",
-        "exceptionForeground": "#c099ff",
-        "modifyingValueForeground": "#4fd6be",
-        "valueForeground": "#4fd6be"
+        "exceptionForeground": "#ffbd76",
+        "modifyingValueForeground": "#74a0f1",
+        "valueForeground": "#74a0f1"
      }
    },
    "DebuggerTabs": {
@@ -188,9 +188,9 @@
      "hoverMaskColor": "#444a73",
      "inactiveColoredTabBackground": "#222436",
      "inactiveColoredFileBackground": "#444a73",
-      "inactiveUnderlineColor": "#4fd6be",
+      "inactiveUnderlineColor": "#74a0f1",
      "inactiveMaskColor": "#222436",
-      "underlineColor": "#4fd6be",
+      "underlineColor": "#74a0f1",
      "underlinedTabBackground": "#2f334d",
      "underlinedTabForeground": "#FFFFFF"
    },
@@ -209,7 +209,7 @@
    },
    "EditorPane": {
      "background": "#222436",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveBackground": "#222436",
      "inactiveForeground": "#828bb8",
@@ -226,7 +226,7 @@
      "inactiveUnderlineColor": "#828bb8",
      "selectedForeground": "#c8d3f5",
      "selectedBackground": "#2f334d",
-      "underlineColor": "#4fd6be",
+      "underlineColor": "#74a0f1",
      "underlinedTabBackground": "#2f334d",
      "underlinedTabForeground": "#FFFFFF"
    },
@@ -235,8 +235,8 @@
      "borderColor": "#2f334d",
      "hoverBackground": "#444a73",
      "hoverColor": "#444a73",
-      "inactiveUnderlineColor": "#4fd6be",
-      "underlineColor": "#4fd6be",
+      "inactiveUnderlineColor": "#74a0f1",
+      "underlineColor": "#74a0f1",
      "underlinedTabBackground": "#2f334d",
      "underlinedTabForeground": "#c8d3f5"
    },
@@ -261,7 +261,7 @@
    "Focus.color": "#222436",
    "FormattedTextField": {
      "background": "#222436",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveBackground": "#444a73",
      "inactiveForeground": "#828bb8",
@@ -288,7 +288,7 @@
      "infoForeground": "#a9b8e8",
      "shortcutForeground": "#a9b8e8"
    },
-    "Hyperlink.linkColor": "#4fd6be",
+    "Hyperlink.linkColor": "#74a0f1",
    "inactiveCaption": "#2f334d",
    "inactiveCaptionBorder": "#222436",
    "inactiveCaptionText": "#a9b8e8",
@@ -315,19 +315,19 @@
      "selectedDisabledForeground": "#c8d3f5"
    },
    "Link": {
-      "activeForeground": "#4fd6be",
-      "hoverForeground": "#4fd6be",
-      "pressedForeground": "#4fd6be",
+      "activeForeground": "#74a0f1",
+      "hoverForeground": "#74a0f1",
+      "pressedForeground": "#74a0f1",
      "secondaryForeground": "#a9b8e8",
-      "visitedForeground": "#4fd6be"
+      "visitedForeground": "#74a0f1"
    },
-    "link.foreground": "#4fd6be",
+    "link.foreground": "#74a0f1",
    "List": {
      "background": "#2f334d",
      "foreground": "#c8d3f5",
      "hoverBackground": "#444a7370",
      "hoverInactiveBackground": "#2f334d",
-      "selectionBackground": "#444a7350",
+      "selectionBackground": "#444a73",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
      "selectionInactiveBackground": "#444a7370"
@@ -341,7 +341,7 @@
      "primaryColor": "#a9b8e8",
      "selectionForeground": "#FFFFFF",
      "tab.backgroundColor": "#222436",
-      "tab.borderColor": "#4fd6be",
+      "tab.borderColor": "#74a0f1",
      "tagColor": "#a9b8e8"
    },
    "MemoryIndicator": {
@@ -396,7 +396,7 @@
        "background": "#222436"
      }
    },
-    "NewPSD.warning": "#4fd6be",
+    "NewPSD.warning": "#74a0f1",
    "Notification": {
      "background": "#191a2a",
      "borderColor": "#191a2a",
@@ -425,7 +425,7 @@
    },
    "Outline": {
      "color": "#444a73",
-      "focusedColor": "#4fd6be",
+      "focusedColor": "#74a0f1",
      "disabledColor": "#828bb8"
    },
    "Panel": {
@@ -436,7 +436,7 @@
      "background": "#2f334d",
      "borderColor": "#2f334d",
      "currentOverloadBackground": "#444a73",
-      "currentParameterForeground": "#4fd6be",
+      "currentParameterForeground": "#74a0f1",
      "disabledForeground": "#828bb8",
      "foreground": "#c8d3f5",
      "infoForeground": "#a9b8e8",
@@ -444,8 +444,8 @@
    },
    "PasswordField": {
      "background": "#222436",
-      "capsLockIconColor": "#4fd6be",
-      "caretForeground": "#4fd6be",
+      "capsLockIconColor": "#74a0f1",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -459,7 +459,7 @@
      "lightSelectionBackground": "#2f334d",
      "paidTagBackground": "#444a73",
      "selectionBackground": "#444a73",
-      "tagForeground": "#4fd6be",
+      "tagForeground": "#74a0f1",
      "tagBackground": "#444a73",
      "trialTagBackground": "#444a73",
      "Button": {
@@ -469,7 +469,7 @@
        "installFocusedBackground": "#444a73",
        "installFillForeground": "#828bb8",
        "installFillBackground": "#444a73",
-        "updateBackground": "#4fd6be",
+        "updateBackground": "#74a0f1",
        "updateBorderColor": "#444a73",
        "updateForeground": "#c8d3f5"
      },
@@ -491,7 +491,7 @@
      "Advertiser": {
        "background": "#222436",
        "borderColor": "#222436",
-        "foreground": "#4fd6be"
+        "foreground": "#74a0f1"
      },
      "borderColor": "#191a2a",
      "inactiveBorderColor": "#222436",
@@ -519,15 +519,15 @@
    "PopupMenuSeparator.stripeIndent": 5,
    "ProgressBar": {
      "background": "#222436",
-      "foreground": "#4fd6be",
-      "indeterminateEndColor": "#4fd6be",
-      "indeterminateStartColor": "#4fd6be",
-      "progressColor": "#4fd6be",
+      "foreground": "#74a0f1",
+      "indeterminateEndColor": "#74a0f1",
+      "indeterminateStartColor": "#74a0f1",
+      "progressColor": "#74a0f1",
      "selectionBackground": "#444a73",
      "trackColor": "#444a73"
    },
    "PsiViewer": {
-      "referenceHighlightColor": "#4fd6be"
+      "referenceHighlightColor": "#74a0f1"
    },
    "RadioButton": {
      "background": "#222436",
@@ -547,35 +547,35 @@
    "ScreenView.borderColor": "#222436",
    "ScrollBar": {
      "background": "#222436",
-      "hoverThumbBorderColor": "#4fd6be",
-      "hoverThumbColor": "#4fd6be",
+      "hoverThumbBorderColor": "#74a0f1",
+      "hoverThumbColor": "#74a0f1",
      "hoverTrackColor": "#22243630",
      "Mac": {
-        "hoverThumbBorderColor": "#4fd6be",
-        "hoverThumbColor": "#4fd6be",
+        "hoverThumbBorderColor": "#74a0f1",
+        "hoverThumbColor": "#74a0f1",
        "hoverTrackColor": "#22243630",
-        "thumbBorderColor": "#4fd6be70",
-        "thumbColor": "#4fd6be70",
+        "thumbBorderColor": "#74a0f170",
+        "thumbColor": "#74a0f170",
        "trackColor": "#22243630",
        "Transparent": {
-          "hoverThumbBorderColor": "#4fd6be",
-          "hoverThumbColor": "#4fd6be",
+          "hoverThumbBorderColor": "#74a0f1",
+          "hoverThumbColor": "#74a0f1",
          "hoverTrackColor": "#22243630",
-          "thumbBorderColor": "#4fd6be70",
-          "thumbColor": "#4fd6be70",
+          "thumbBorderColor": "#74a0f170",
+          "thumbColor": "#74a0f170",
          "trackColor": "#22243630"
        }
      },
      "thumb": "#444a73",
-      "thumbBorderColor": "#4fd6be70",
-      "thumbColor": "#4fd6be70",
+      "thumbBorderColor": "#74a0f170",
+      "thumbColor": "#74a0f170",
      "trackColor": "#22243630",
      "Transparent": {
-        "hoverThumbBorderColor": "#4fd6be",
-        "hoverThumbColor": "#4fd6be",
+        "hoverThumbBorderColor": "#74a0f1",
+        "hoverThumbColor": "#74a0f1",
        "hoverTrackColor": "#22243630",
-        "thumbBorderColor": "#4fd6be70",
-        "thumbColor": "#4fd6be70",
+        "thumbBorderColor": "#74a0f170",
+        "thumbColor": "#74a0f170",
        "trackColor": "#22243630"
      }
    },
@@ -603,10 +603,10 @@
      }
    },
    "SearchMatch": {
-      "endBackground": "#4fd6be",
-      "startBackground": "#4fd6be",
-      "endColor": "#4fd6be",
-      "startColor": "#4fd6be"
+      "endBackground": "#74a0f1",
+      "startBackground": "#74a0f1",
+      "endColor": "#74a0f1",
+      "startColor": "#74a0f1"
    },
    "SearchField.errorBackground": "#191a2a",
    "SearchOption": {
@@ -626,14 +626,14 @@
    },
    "Slider": {
      "background": "#222436",
-      "buttonBorderColor": "#4fd6be",
-      "buttonColor": "#4fd6be",
+      "buttonBorderColor": "#74a0f1",
+      "buttonColor": "#74a0f1",
      "foreground": "#c8d3f5",
      "majorTickLength": 6,
      "tickColor": "#2f334d",
      "trackColor": "#2f334d",
      "trackWidth": 7,
-      "thumb": "#4fd6be"
+      "thumb": "#74a0f1"
    },
    "SpeedSearch": {
      "background": "#444a73",
@@ -678,7 +678,7 @@
      "tabHeight": 32,
      "tabInsets": "5,10,5,10",
      "tabSelectionHeight": 2,
-      "underlineColor": "#4fd6be"
+      "underlineColor": "#74a0f1"
    },
    "TabbedPane.mt.tab.background": "#222436",
    "Table": {
@@ -687,8 +687,8 @@
      "cellNoFocusBorder": "10,5,10,5",
      "focusCellHighlightBorder": "10,5,10,5",
      "disabledForeground": "#828bb8",
-      "dropLineColor": "#4fd6be",
-      "dropLineShortColor": "#4fd6be",
+      "dropLineColor": "#74a0f1",
+      "dropLineShortColor": "#74a0f1",
      "focusCellBackground": "#2f334d",
      "focusCellForeground": "#FFFFFF",
      "foreground": "#c8d3f5",
@@ -723,7 +723,7 @@
    "textText": "#a9b8e8",
    "TextArea": {
      "background": "#222436",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -731,7 +731,7 @@
    },
    "TextField": {
      "background": "#222436",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -739,7 +739,7 @@
    },
    "TextPane": {
      "background": "#222436",
-      "caretForeground": "#4fd6be",
+      "caretForeground": "#74a0f1",
      "foreground": "#c8d3f5",
      "inactiveForeground": "#828bb8",
      "selectionBackground": "#2f334d",
@@ -760,8 +760,8 @@
      "foreground": "#c8d3f5",
      "offForeground": "#222436",
      "offBackground": "#222436",
-      "onBackground": "#4fd6be",
-      "onForeground": "#4fd6be"
+      "onBackground": "#74a0f1",
+      "onForeground": "#74a0f1"
    },
    "ToolBar": {
      "background": "#222436",
@@ -797,10 +797,10 @@
        "borderColor": "#444a73",
        "hoverBackground": "#444a73",
        "hoverInactiveBackground": "#444a73",
-        "inactiveUnderlineColor": "#4fd6be",
+        "inactiveUnderlineColor": "#74a0f1",
        "selectedBackground": "#191a2a",
        "selectedInactiveBackground": "#191a2a",
-        "underlineColor": "#4fd6be",
+        "underlineColor": "#74a0f1",
        "underlinedTabBackground": "#2f334d",
        "underlinedTabInactiveBackground": "#2f334d",
        "underlinedTabForeground": "#FFFFFF",
@@ -813,7 +813,7 @@
      "hash": "#222436",
      "hoverBackground": "#444a7370",
      "hoverInactiveBackground": "#2f334d",
-      "modifiedItemForeground": "#4fd6be",
+      "modifiedItemForeground": "#74a0f1",
      "rowHeight": 28,
      "selectionBackground": "#444a7370",
      "selectionForeground": "#FFFFFF",
@@ -898,13 +898,13 @@
        "graphColor": "#444a73"
      },
      "GitLog": {
-        "localBranchIconColor": "#4fd6be",
+        "localBranchIconColor": "#74a0f1",
        "otherIconColor": "#a9b8e8",
        "remoteBranchIconColor": "#c8d3f5",
        "tagIconColor": "#a9b8e8"
      },
      "HgLog": {
-        "branchIconColor": "#4fd6be",
+        "branchIconColor": "#74a0f1",
        "bookmarkIconColor": "#FFFFFF",
        "closedBranchIconColor": "#828bb8",
        "localTagIconColor": "#a9b8e8",
@@ -958,20 +958,20 @@
      "#43494A": "#191a2a",
      "#6B6B6B": "#a9b8e8",
      "#A7A7A7": "#222436",
-      "#3D6185": "#4fd6be",
-      "#466D94": "#4fd6be",
+      "#3D6185": "#74a0f1",
+      "#466D94": "#74a0f1",
      "#3C3F41": "#222436",
      "#545556": "#828bb8",
      "#606060": "#828bb8",
      "#9AA7B0": "#c8d3f5",
-      "#675133": "#4fd6be",
-      "Actions.Blue": "#82aaff",
-      "Actions.Green": "#c3e88d",
+      "#675133": "#74a0f1",
+      "Actions.Blue": "#70b0ff",
+      "Actions.Green": "#7af8ca",
      "Actions.Grey": "#a9b8e8",
-      "Actions.GreyInline": "#7a88cf",
+      "Actions.GreyInline": "#7e8eda",
      "Actions.GreyInline.Dark": "#c8d3f5",
      "Actions.Red": "#ff757f",
-      "Actions.Yellow": "#c099ff",
+      "Actions.Yellow": "#ffbd76",
      "Checkbox.Background.Default": "#191a2a",
      "Checkbox.Background.Default.Dark": "#191a2a",
      "Checkbox.Background.Disabled": "#2f334d",
@@ -980,31 +980,31 @@
      "Checkbox.Border.Default.Dark": "#222436",
      "Checkbox.Border.Disabled": "#828bb8",
      "Checkbox.Border.Disabled.Dark": "#828bb8",
-      "Checkbox.Focus.Thin.Default": "#4fd6be",
-      "Checkbox.Focus.Thin.Default.Dark": "#4fd6be",
-      "Checkbox.Focus.Wide": "#4fd6be",
-      "Checkbox.Focus.Wide.Dark": "#4fd6be",
+      "Checkbox.Focus.Thin.Default": "#74a0f1",
+      "Checkbox.Focus.Thin.Default.Dark": "#74a0f1",
+      "Checkbox.Focus.Wide": "#74a0f1",
+      "Checkbox.Focus.Wide.Dark": "#74a0f1",
      "Checkbox.Foreground.Disabled": "#828bb8",
      "Checkbox.Foreground.Disabled.Dark": "#828bb8",
-      "Checkbox.Background.Selected": "#4fd6be",
+      "Checkbox.Background.Selected": "#74a0f1",
      "Checkbox.Background.Selected.Dark": "#222436",
-      "Checkbox.Border.Selected": "#4fd6be",
-      "Checkbox.Border.Selected.Dark": "#4fd6be",
-      "Checkbox.Foreground.Selected": "#4fd6be",
-      "Checkbox.Foreground.Selected.Dark": "#4fd6be",
+      "Checkbox.Border.Selected": "#74a0f1",
+      "Checkbox.Border.Selected.Dark": "#74a0f1",
+      "Checkbox.Foreground.Selected": "#74a0f1",
+      "Checkbox.Foreground.Selected.Dark": "#74a0f1",
      "Checkbox.Focus.Thin.Selected": "#c8d3f5",
      "Checkbox.Focus.Thin.Selected.Dark": "#c8d3f5",
-      "Objects.Grey": "#7a88cf",
-      "Objects.Blue": "#82aaff",
+      "Objects.Grey": "#7e8eda",
+      "Objects.Blue": "#70b0ff",
      "Objects.RedStatus": "#ff757f",
      "Objects.Red": "#ff757f",
-      "Objects.Pink": "#c099ff",
-      "Objects.Yellow": "#c099ff",
-      "Objects.Green": "#c3e88d",
-      "Objects.Purple": "#c099ff",
+      "Objects.Pink": "#baacff",
+      "Objects.Yellow": "#ffbd76",
+      "Objects.Green": "#7af8ca",
+      "Objects.Purple": "#baacff",
      "Objects.BlackText": "#c8d3f5",
-      "Objects.YellowDark": "#ff966c",
-      "Objects.GreenAndroid": "#c3e88d"
+      "Objects.YellowDark": "#ff9668",
+      "Objects.GreenAndroid": "#7af8ca"
    }
  }
 }
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
@@ -17,7 +17,7 @@
      "disabledBackground": "#083F4D",
      "disabledForeground": "#2E5861",
      "disabledText": "#2E5861",
-      "focusColor": "#11353F",
+      "focusColor": "#005a6f",
      "focusedBorderColor": "#d33682",
      "foreground": "#839496",
      "inactiveBackground": "#083F4D",
@@ -47,28 +47,28 @@
      "arc": 0,
      "background": "#002B36",
      "default": {
-        "endBackground": "#11353F",
-        "endBorderColor": "#11353F",
+        "endBackground": "#003946",
+        "endBorderColor": "#003946",
        "foreground": "#FFFFFF",
        "focusColor": "#d33682",
        "focusedBorderColor": "#d33682",
-        "shadowColor": "#11353F",
-        "startBackground": "#11353F",
-        "startBorderColor": "#11353F"
+        "shadowColor": "#003946",
+        "startBackground": "#003946",
+        "startBorderColor": "#003946"
      },
      "disabledBorderColor": "#073642",
      "disabledText": "#2E5861",
      "endBackground": "#073642",
      "endBorderColor": "#073642",
-      "focus": "#11353F",
+      "focus": "#005a6f",
      "focusedBorderColor": "#d33682",
      "foreground": "#586e75",
      "highlight": "#FFFFFF",
      "mt.background": "#073642",
      "mt.foreground": "#586e75",
      "mt.selectedForeground": "#FFFFFF",
-      "mt.selection.color1": "#11353F",
-      "mt.selection.color2": "#11353F",
+      "mt.selection.color1": "#003946",
+      "mt.selection.color2": "#003946",
      "startBackground": "#073642",
      "startBorderColor": "#073642",
      "shadowColor": "#073642",
@@ -127,7 +127,7 @@
      "modifiedItemForeground": "#d33682",
      "nonEditableBackground": "#003745",
      "padding": "5,5,5,5",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "ComboPopup.border": "#0D3640",
@@ -141,14 +141,14 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#586e75",
-      "selectionInactiveBackground": "#2E4C5250",
-      "selectionBackground": "#2E4C5280",
+      "selectionInactiveBackground": "#2E4C52",
+      "selectionBackground": "#2E4C52",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#11353F",
+      "borderColor": "#005a6f",
      "disabledBorderColor": "#073642",
      "focusColor": "#d33682",
      "focusedBorderColor": "#d33682",
@@ -174,24 +174,24 @@
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#11353F",
-      "underlinedTabBackground": "#11353F"
+      "selectedBackground": "#005a6f",
+      "underlinedTabBackground": "#005a6f"
    },
    "DebuggerPopup": {
-      "borderColor": "#11353F"
+      "borderColor": "#005a6f"
    },
    "DefaultTabs": {
      "background": "#002B36",
      "borderColor": "#002B36",
-      "hoverBackground": "#11353F",
+      "hoverBackground": "#003946",
      "hoverColor": "#00252E",
-      "hoverMaskColor": "#11353F",
+      "hoverMaskColor": "#005a6f",
      "inactiveColoredTabBackground": "#002B36",
      "inactiveColoredFileBackground": "#073642",
      "inactiveUnderlineColor": "#d33682",
      "inactiveMaskColor": "#00252E",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#11353F",
+      "underlinedTabBackground": "#003946",
      "underlinedTabForeground": "#FFFFFF"
    },
    "Desktop.background": "#002B36",
@@ -218,26 +218,26 @@
    },
    "EditorTabs": {
      "borderColor": "#003745",
-      "hoverBackground": "#11353F",
-      "hoverColor": "#11353F",
-      "hoverMaskColor": "#11353F",
+      "hoverBackground": "#005a6f",
+      "hoverColor": "#005a6f",
+      "hoverMaskColor": "#005a6f",
      "inactiveMaskColor": "#002B36",
      "inactiveColoredFileBackground": "#002B36",
      "inactiveUnderlineColor": "#2E5861",
      "selectedForeground": "#839496",
-      "selectedBackground": "#11353F",
+      "selectedBackground": "#003946",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#11353F",
+      "underlinedTabBackground": "#003946",
      "underlinedTabForeground": "#FFFFFF"
    },
    "EditorGroupsTabs": {
      "background": "#002B36",
      "borderColor": "#003745",
-      "hoverBackground": "#11353F",
-      "hoverColor": "#11353F",
+      "hoverBackground": "#005a6f",
+      "hoverColor": "#005a6f",
      "inactiveUnderlineColor": "#d33682",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#11353F",
+      "underlinedTabBackground": "#003946",
      "underlinedTabForeground": "#839496"
    },
    "FileColor": {
@@ -266,7 +266,7 @@
      "inactiveBackground": "#073642",
      "inactiveForeground": "#2E5861",
      "selectionForeground": "#FFFFFF",
-      "selectionBackground": "#11353F"
+      "selectionBackground": "#003946"
    },
    "GotItTooltip.borderColor": "#2E4C52",
    "Group": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#003745",
      "foreground": "#839496",
-      "hoverBackground": "#2E4C5270",
-      "hoverInactiveBackground": "#11353F",
-      "selectionBackground": "#2E4C5250",
+      "hoverBackground": "#2E4C5280",
+      "hoverInactiveBackground": "#003946",
+      "selectionBackground": "#2E4C52",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5270"
+      "selectionInactiveBackground": "#2E4C5280"
    },
    "material": {
      "background": "#002B36",
@@ -346,8 +346,8 @@
    },
    "MemoryIndicator": {
      "allocatedBackground": "#003745",
-      "usedColor": "#11353F",
-      "usedBackground": "#11353F"
+      "usedColor": "#005a6f",
+      "usedBackground": "#005a6f"
    },
    "Menu": {
      "acceleratorForeground": "#586e75",
@@ -434,13 +434,13 @@
    },
    "ParameterInfo": {
      "background": "#003745",
-      "borderColor": "#11353F",
-      "currentOverloadBackground": "#11353F",
+      "borderColor": "#003946",
+      "currentOverloadBackground": "#005a6f",
      "currentParameterForeground": "#d33682",
      "disabledForeground": "#2E5861",
      "foreground": "#839496",
      "infoForeground": "#586e75",
-      "lineSeparatorColor": "#11353F"
+      "lineSeparatorColor": "#003946"
    },
    "PasswordField": {
      "background": "#00252E",
@@ -448,25 +448,25 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "Plugins": {
      "background": "#002B36",
      "disabledForeground": "#2E5861",
-      "eapTagBackground": "#11353F",
-      "hoverBackground": "#2E4C5270",
-      "lightSelectionBackground": "#11353F",
-      "paidTagBackground": "#11353F",
+      "eapTagBackground": "#005a6f",
+      "hoverBackground": "#2E4C5280",
+      "lightSelectionBackground": "#003946",
+      "paidTagBackground": "#005a6f",
      "selectionBackground": "#2E4C52",
      "tagForeground": "#d33682",
-      "tagBackground": "#11353F",
-      "trialTagBackground": "#11353F",
+      "tagBackground": "#005a6f",
+      "trialTagBackground": "#005a6f",
      "Button": {
        "installBackground": "#073642",
        "installBorderColor": "#073642",
        "installForeground": "#839496",
-        "installFocusedBackground": "#11353F",
+        "installFocusedBackground": "#005a6f",
        "installFillForeground": "#2E5861",
        "installFillBackground": "#073642",
        "updateBackground": "#d33682",
@@ -482,9 +482,9 @@
        "foreground": "#839496"
      },
      "Tab": {
-        "hoverBackground": "#11353F",
+        "hoverBackground": "#003946",
        "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#11353F"
+        "selectedBackground": "#003946"
      }
    },
    "Popup": {
@@ -523,8 +523,8 @@
      "indeterminateEndColor": "#d33682",
      "indeterminateStartColor": "#d33682",
      "progressColor": "#d33682",
-      "selectionBackground": "#11353F",
-      "trackColor": "#11353F"
+      "selectionBackground": "#005a6f",
+      "trackColor": "#005a6f"
    },
    "PsiViewer": {
      "referenceHighlightColor": "#d33682"
@@ -566,7 +566,7 @@
          "trackColor": "#002B3630"
        }
      },
-      "thumb": "#11353F",
+      "thumb": "#005a6f",
      "thumbBorderColor": "#d3368270",
      "thumbColor": "#d3368270",
      "trackColor": "#002B3630",
@@ -599,7 +599,7 @@
      "Tab": {
        "active.foreground": "#FFFFFF",
        "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#11353F"
+        "selectedBackground": "#005a6f"
      }
    },
    "SearchMatch": {
@@ -610,7 +610,7 @@
    },
    "SearchField.errorBackground": "#2E4C52",
    "SearchOption": {
-      "selectedBackground": "#11353F"
+      "selectedBackground": "#003946"
    },
    "SearchResults": {
      "Ordinal.File.Foreground": "#586e75",
@@ -631,12 +631,12 @@
      "foreground": "#839496",
      "majorTickLength": 6,
      "tickColor": "#003745",
-      "trackColor": "#11353F",
+      "trackColor": "#003946",
      "trackWidth": 7,
      "thumb": "#d33682"
    },
    "SpeedSearch": {
-      "background": "#11353F",
+      "background": "#005a6f",
      "borderColor": "#0D3640",
      "foreground": "#839496",
      "errorForeground": "#839496"
@@ -654,22 +654,22 @@
    "SplitPaneDivider.draggingColor": "#003745",
    "StatusBar": {
      "borderColor": "#002B36",
-      "hoverBackground": "#11353F",
-      "LightEditBackground": "#11353F"
+      "hoverBackground": "#005a6f",
+      "LightEditBackground": "#003946"
    },
    "TabbedPane": {
      "background": "#002B36",
-      "contentAreaColor": "#11353F",
+      "contentAreaColor": "#005a6f",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#0D3640",
      "disabledForeground": "#2E5861",
      "disabledUnderlineColor": "#2E5861",
-      "focus": "#11353F",
-      "focusColor": "#11353F",
+      "focus": "#003946",
+      "focusColor": "#003946",
      "fontSizeOffset": 0,
      "foreground": "#839496",
      "highlight": "#0D3640",
-      "hoverColor": "#11353F",
+      "hoverColor": "#005a6f",
      "labelShift": 0,
      "selectedForeground": "#FFFFFF",
      "selectedLabelShift": 0,
@@ -689,19 +689,19 @@
      "disabledForeground": "#2E5861",
      "dropLineColor": "#d33682",
      "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#11353F",
+      "focusCellBackground": "#003946",
      "focusCellForeground": "#FFFFFF",
      "foreground": "#839496",
      "gridColor": "#002B36",
-      "highlightOuter": "#11353F",
-      "hoverBackground": "#2E4C5270",
-      "hoverInactiveBackground": "#11353F",
+      "highlightOuter": "#003946",
+      "hoverBackground": "#2E4C5280",
+      "hoverInactiveBackground": "#003946",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#586e75",
      "lightSelectionInactiveBackground": "#003745",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#11353F",
+      "selectionInactiveBackground": "#003946",
      "selectionInactiveForeground": "#FFFFFF",
      "sortIconColor": "#839496",
      "stripeColor": "#00252E"
@@ -713,7 +713,7 @@
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#2E5861",
      "foreground": "#839496",
-      "focusCellBackground": "#11353F",
+      "focusCellBackground": "#003946",
      "focusCellForeground": "#FFFFFF",
      "height": 25,
      "separatorColor": "#003745"
@@ -726,7 +726,7 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "TextField": {
@@ -734,7 +734,7 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "TextPane": {
@@ -742,12 +742,12 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "TitlePane": {
      "background": "#00252E",
-      "Button.hoverBackground": "#11353F",
+      "Button.hoverBackground": "#005a6f",
      "inactiveBackground": "#002B36",
      "infoForeground": "#586e75",
      "inactiveInfoForeground": "#586e75"
@@ -781,7 +781,7 @@
    },
    "ToolWindow": {
      "Button": {
-        "hoverBackground": "#11353F",
+        "hoverBackground": "#003946",
        "selectedForeground": "#FFFFFF",
        "selectedBackground": "#00252E"
      },
@@ -794,14 +794,14 @@
        "background": "#002B36"
      },
      "HeaderTab": {
-        "borderColor": "#11353F",
-        "hoverBackground": "#11353F",
-        "hoverInactiveBackground": "#11353F",
+        "borderColor": "#005a6f",
+        "hoverBackground": "#005a6f",
+        "hoverInactiveBackground": "#005a6f",
        "inactiveUnderlineColor": "#d33682",
        "selectedBackground": "#00252E",
        "selectedInactiveBackground": "#00252E",
        "underlineColor": "#d33682",
-        "underlinedTabBackground": "#11353F",
+        "underlinedTabBackground": "#003946",
        "underlinedTabInactiveBackground": "#003745",
        "underlinedTabForeground": "#FFFFFF",
        "underlinedTabInactiveForeground": "#839496"
@@ -811,14 +811,14 @@
      "background": "#00252E",
      "foreground": "#586e75",
      "hash": "#0D3640",
-      "hoverBackground": "#2E4C5270",
-      "hoverInactiveBackground": "#11353F",
+      "hoverBackground": "#2E4C5280",
+      "hoverInactiveBackground": "#003946",
      "modifiedItemForeground": "#d33682",
      "rowHeight": 28,
-      "selectionBackground": "#2E4C5270",
+      "selectionBackground": "#2E4C5280",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5270",
+      "selectionInactiveBackground": "#2E4C5280",
      "textBackground": "#00252E"
    },
    "Tree.leftChildIndent": 10,
@@ -834,23 +834,23 @@
        "borderColor": "#0D3640",
        "background": "#002B36",
        "foreground": "#839496",
-        "hoverBorderColor": "#11353F"
+        "hoverBorderColor": "#005a6f"
      },
      "Connector": {
        "borderColor": "#0D3640",
-        "hoverBorderColor": "#11353F"
+        "hoverBorderColor": "#005a6f"
      },
      "Canvas.background": "#00252E",
      "highStroke.foreground": "#839496",
      "Label.foreground": "#586e75",
-      "List.selectionBackground": "#2E4C5270",
+      "List.selectionBackground": "#2E4C5280",
      "motion": {
        "borderColor": "#0D3640",
        "Component.foreground": "#839496",
        "ConstraintSetText.foreground": "#586e75",
        "ConstraintSet.background": "#003745",
        "CSPanel.SelectedFocusBackground": "#2E4C52",
-        "CSPanel.SelectedBackground": "#2E4C5270",
+        "CSPanel.SelectedBackground": "#2E4C5280",
        "cs_FocusText.infoForeground": "#586e75",
        "CursorTextColor.foreground": "#839496",
        "HoverColor.disabledBackground": "#2E5861",
@@ -861,8 +861,8 @@
        "ourCS_Border.borderColor": "#0D3640",
        "ourCS_TextColor.foreground": "#586e75",
        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
-        "ourCS_SelectedBackground.selectionInactiveBackground": "#11353F",
-        "ourCS_SelectedBorder.pressedBorderColor": "#11353F",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#003946",
+        "ourCS_SelectedBorder.pressedBorderColor": "#005a6f",
        "ourML_BarColor.separatorColor": "#0D3640",
        "PrimaryPanel.background": "#00252E",
        "SecondaryPanel.background": "#002B36",
@@ -895,7 +895,7 @@
        "selectedBranchBackground": "#002B36"
      },
      "GitCommits": {
-        "graphColor": "#11353F"
+        "graphColor": "#005a6f"
      },
      "GitLog": {
        "localBranchIconColor": "#d33682",
@@ -915,11 +915,11 @@
      "Log": {
        "Commit.unmatchedForeground": "#586e75",
        "Commit.currentBranchBackground": "#003745",
-        "Commit.hoveredBackground": "#2E4C5270"
+        "Commit.hoveredBackground": "#2E4C5280"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
-        "backgroundBase": "#11353F"
+        "backgroundBase": "#005a6f"
      }
    },
    "Viewport": {
@@ -942,7 +942,7 @@
      "SidePanel.background": "#003745",
      "Projects": {
        "actions.background": "#00252E",
-        "actions.selectionBackground": "#11353F",
+        "actions.selectionBackground": "#005a6f",
        "background": "#003745",
        "selectionBackground": "#2E4C52",
        "selectionInactiveBackground": "#003745"
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
@@ -17,7 +17,7 @@
      "disabledBackground": "#083F4D",
      "disabledForeground": "#2E5861",
      "disabledText": "#2E5861",
-      "focusColor": "#11353F",
+      "focusColor": "#005a6f",
      "focusedBorderColor": "#d33682",
      "foreground": "#839496",
      "inactiveBackground": "#083F4D",
@@ -47,28 +47,28 @@
      "arc": 0,
      "background": "#002B36",
      "default": {
-        "endBackground": "#11353F",
-        "endBorderColor": "#11353F",
+        "endBackground": "#003946",
+        "endBorderColor": "#003946",
        "foreground": "#FFFFFF",
        "focusColor": "#d33682",
        "focusedBorderColor": "#d33682",
-        "shadowColor": "#11353F",
-        "startBackground": "#11353F",
-        "startBorderColor": "#11353F"
+        "shadowColor": "#003946",
+        "startBackground": "#003946",
+        "startBorderColor": "#003946"
      },
      "disabledBorderColor": "#073642",
      "disabledText": "#2E5861",
      "endBackground": "#073642",
      "endBorderColor": "#073642",
-      "focus": "#11353F",
+      "focus": "#005a6f",
      "focusedBorderColor": "#d33682",
      "foreground": "#586e75",
      "highlight": "#FFFFFF",
      "mt.background": "#073642",
      "mt.foreground": "#586e75",
      "mt.selectedForeground": "#FFFFFF",
-      "mt.selection.color1": "#11353F",
-      "mt.selection.color2": "#11353F",
+      "mt.selection.color1": "#003946",
+      "mt.selection.color2": "#003946",
      "startBackground": "#073642",
      "startBorderColor": "#073642",
      "shadowColor": "#073642",
@@ -127,7 +127,7 @@
      "modifiedItemForeground": "#d33682",
      "nonEditableBackground": "#003745",
      "padding": "5,5,5,5",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "ComboPopup.border": "#0D3640",
@@ -141,14 +141,14 @@
      "selectedGrayedForeground": "#FFFFFF",
      "selectionGrayForeground": "#FFFFFF",
      "selectionInactiveInfoForeground": "#586e75",
-      "selectionInactiveBackground": "#2E4C5250",
-      "selectionBackground": "#2E4C5280",
+      "selectionInactiveBackground": "#2E4C52",
+      "selectionBackground": "#2E4C52",
      "selectionForeground": "#FFFFFF",
      "selectionInfoForeground": "#FFFFFF"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#11353F",
+      "borderColor": "#005a6f",
      "disabledBorderColor": "#073642",
      "focusColor": "#d33682",
      "focusedBorderColor": "#d33682",
@@ -174,24 +174,24 @@
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#11353F",
-      "underlinedTabBackground": "#11353F"
+      "selectedBackground": "#005a6f",
+      "underlinedTabBackground": "#005a6f"
    },
    "DebuggerPopup": {
-      "borderColor": "#11353F"
+      "borderColor": "#005a6f"
    },
    "DefaultTabs": {
      "background": "#002B36",
      "borderColor": "#002B36",
-      "hoverBackground": "#11353F",
+      "hoverBackground": "#003946",
      "hoverColor": "#002B36",
-      "hoverMaskColor": "#11353F",
+      "hoverMaskColor": "#005a6f",
      "inactiveColoredTabBackground": "#002B36",
      "inactiveColoredFileBackground": "#073642",
      "inactiveUnderlineColor": "#d33682",
      "inactiveMaskColor": "#002B36",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#11353F",
+      "underlinedTabBackground": "#003946",
      "underlinedTabForeground": "#FFFFFF"
    },
    "Desktop.background": "#002B36",
@@ -218,26 +218,26 @@
    },
    "EditorTabs": {
      "borderColor": "#003745",
-      "hoverBackground": "#11353F",
-      "hoverColor": "#11353F",
-      "hoverMaskColor": "#11353F",
+      "hoverBackground": "#005a6f",
+      "hoverColor": "#005a6f",
+      "hoverMaskColor": "#005a6f",
      "inactiveMaskColor": "#002B36",
      "inactiveColoredFileBackground": "#002B36",
      "inactiveUnderlineColor": "#2E5861",
      "selectedForeground": "#839496",
-      "selectedBackground": "#11353F",
+      "selectedBackground": "#003946",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#11353F",
+      "underlinedTabBackground": "#003946",
      "underlinedTabForeground": "#FFFFFF"
    },
    "EditorGroupsTabs": {
      "background": "#002B36",
      "borderColor": "#003745",
-      "hoverBackground": "#11353F",
-      "hoverColor": "#11353F",
+      "hoverBackground": "#005a6f",
+      "hoverColor": "#005a6f",
      "inactiveUnderlineColor": "#d33682",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#11353F",
+      "underlinedTabBackground": "#003946",
      "underlinedTabForeground": "#839496"
    },
    "FileColor": {
@@ -266,7 +266,7 @@
      "inactiveBackground": "#073642",
      "inactiveForeground": "#2E5861",
      "selectionForeground": "#FFFFFF",
-      "selectionBackground": "#11353F"
+      "selectionBackground": "#003946"
    },
    "GotItTooltip.borderColor": "#2E4C52",
    "Group": {
@@ -325,12 +325,12 @@
    "List": {
      "background": "#003745",
      "foreground": "#839496",
-      "hoverBackground": "#2E4C5270",
-      "hoverInactiveBackground": "#11353F",
-      "selectionBackground": "#2E4C5250",
+      "hoverBackground": "#2E4C5280",
+      "hoverInactiveBackground": "#003946",
+      "selectionBackground": "#2E4C52",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5270"
+      "selectionInactiveBackground": "#2E4C5280"
    },
    "material": {
      "background": "#002B36",
@@ -346,8 +346,8 @@
    },
    "MemoryIndicator": {
      "allocatedBackground": "#003745",
-      "usedColor": "#11353F",
-      "usedBackground": "#11353F"
+      "usedColor": "#005a6f",
+      "usedBackground": "#005a6f"
    },
    "Menu": {
      "acceleratorForeground": "#586e75",
@@ -434,13 +434,13 @@
    },
    "ParameterInfo": {
      "background": "#003745",
-      "borderColor": "#11353F",
-      "currentOverloadBackground": "#11353F",
+      "borderColor": "#003946",
+      "currentOverloadBackground": "#005a6f",
      "currentParameterForeground": "#d33682",
      "disabledForeground": "#2E5861",
      "foreground": "#839496",
      "infoForeground": "#586e75",
-      "lineSeparatorColor": "#11353F"
+      "lineSeparatorColor": "#003946"
    },
    "PasswordField": {
      "background": "#002B36",
@@ -448,25 +448,25 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "Plugins": {
      "background": "#002B36",
      "disabledForeground": "#2E5861",
-      "eapTagBackground": "#11353F",
-      "hoverBackground": "#2E4C5270",
-      "lightSelectionBackground": "#11353F",
-      "paidTagBackground": "#11353F",
+      "eapTagBackground": "#005a6f",
+      "hoverBackground": "#2E4C5280",
+      "lightSelectionBackground": "#003946",
+      "paidTagBackground": "#005a6f",
      "selectionBackground": "#2E4C52",
      "tagForeground": "#d33682",
-      "tagBackground": "#11353F",
-      "trialTagBackground": "#11353F",
+      "tagBackground": "#005a6f",
+      "trialTagBackground": "#005a6f",
      "Button": {
        "installBackground": "#073642",
        "installBorderColor": "#073642",
        "installForeground": "#839496",
-        "installFocusedBackground": "#11353F",
+        "installFocusedBackground": "#005a6f",
        "installFillForeground": "#2E5861",
        "installFillBackground": "#073642",
        "updateBackground": "#d33682",
@@ -482,9 +482,9 @@
        "foreground": "#839496"
      },
      "Tab": {
-        "hoverBackground": "#11353F",
+        "hoverBackground": "#003946",
        "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#11353F"
+        "selectedBackground": "#003946"
      }
    },
    "Popup": {
@@ -523,8 +523,8 @@
      "indeterminateEndColor": "#d33682",
      "indeterminateStartColor": "#d33682",
      "progressColor": "#d33682",
-      "selectionBackground": "#11353F",
-      "trackColor": "#11353F"
+      "selectionBackground": "#005a6f",
+      "trackColor": "#005a6f"
    },
    "PsiViewer": {
      "referenceHighlightColor": "#d33682"
@@ -566,7 +566,7 @@
          "trackColor": "#002B3630"
        }
      },
-      "thumb": "#11353F",
+      "thumb": "#005a6f",
      "thumbBorderColor": "#d3368270",
      "thumbColor": "#d3368270",
      "trackColor": "#002B3630",
@@ -599,7 +599,7 @@
      "Tab": {
        "active.foreground": "#FFFFFF",
        "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#11353F"
+        "selectedBackground": "#005a6f"
      }
    },
    "SearchMatch": {
@@ -610,7 +610,7 @@
    },
    "SearchField.errorBackground": "#2E4C52",
    "SearchOption": {
-      "selectedBackground": "#11353F"
+      "selectedBackground": "#003946"
    },
    "SearchResults": {
      "Ordinal.File.Foreground": "#586e75",
@@ -631,12 +631,12 @@
      "foreground": "#839496",
      "majorTickLength": 6,
      "tickColor": "#003745",
-      "trackColor": "#11353F",
+      "trackColor": "#003946",
      "trackWidth": 7,
      "thumb": "#d33682"
    },
    "SpeedSearch": {
-      "background": "#11353F",
+      "background": "#005a6f",
      "borderColor": "#0D3640",
      "foreground": "#839496",
      "errorForeground": "#839496"
@@ -654,22 +654,22 @@
    "SplitPaneDivider.draggingColor": "#003745",
    "StatusBar": {
      "borderColor": "#002B36",
-      "hoverBackground": "#11353F",
-      "LightEditBackground": "#11353F"
+      "hoverBackground": "#005a6f",
+      "LightEditBackground": "#003946"
    },
    "TabbedPane": {
      "background": "#002B36",
-      "contentAreaColor": "#11353F",
+      "contentAreaColor": "#005a6f",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#0D3640",
      "disabledForeground": "#2E5861",
      "disabledUnderlineColor": "#2E5861",
-      "focus": "#11353F",
-      "focusColor": "#11353F",
+      "focus": "#003946",
+      "focusColor": "#003946",
      "fontSizeOffset": 0,
      "foreground": "#839496",
      "highlight": "#0D3640",
-      "hoverColor": "#11353F",
+      "hoverColor": "#005a6f",
      "labelShift": 0,
      "selectedForeground": "#FFFFFF",
      "selectedLabelShift": 0,
@@ -689,19 +689,19 @@
      "disabledForeground": "#2E5861",
      "dropLineColor": "#d33682",
      "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#11353F",
+      "focusCellBackground": "#003946",
      "focusCellForeground": "#FFFFFF",
      "foreground": "#839496",
      "gridColor": "#002B36",
-      "highlightOuter": "#11353F",
-      "hoverBackground": "#2E4C5270",
-      "hoverInactiveBackground": "#11353F",
+      "highlightOuter": "#003946",
+      "hoverBackground": "#2E4C5280",
+      "hoverInactiveBackground": "#003946",
      "lightSelectionForeground": "#FFFFFF",
      "lightSelectionInactiveForeground": "#586e75",
      "lightSelectionInactiveBackground": "#003745",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#11353F",
+      "selectionInactiveBackground": "#003946",
      "selectionInactiveForeground": "#FFFFFF",
      "sortIconColor": "#839496",
      "stripeColor": "#00252E"
@@ -713,7 +713,7 @@
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#2E5861",
      "foreground": "#839496",
-      "focusCellBackground": "#11353F",
+      "focusCellBackground": "#003946",
      "focusCellForeground": "#FFFFFF",
      "height": 25,
      "separatorColor": "#003745"
@@ -726,7 +726,7 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "TextField": {
@@ -734,7 +734,7 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "TextPane": {
@@ -742,12 +742,12 @@
      "caretForeground": "#d33682",
      "foreground": "#839496",
      "inactiveForeground": "#2E5861",
-      "selectionBackground": "#11353F",
+      "selectionBackground": "#003946",
      "selectionForeground": "#FFFFFF"
    },
    "TitlePane": {
      "background": "#00252E",
-      "Button.hoverBackground": "#11353F",
+      "Button.hoverBackground": "#005a6f",
      "inactiveBackground": "#002B36",
      "infoForeground": "#586e75",
      "inactiveInfoForeground": "#586e75"
@@ -781,7 +781,7 @@
    },
    "ToolWindow": {
      "Button": {
-        "hoverBackground": "#11353F",
+        "hoverBackground": "#003946",
        "selectedForeground": "#FFFFFF",
        "selectedBackground": "#00252E"
      },
@@ -794,14 +794,14 @@
        "background": "#002B36"
      },
      "HeaderTab": {
-        "borderColor": "#11353F",
-        "hoverBackground": "#11353F",
-        "hoverInactiveBackground": "#11353F",
+        "borderColor": "#005a6f",
+        "hoverBackground": "#005a6f",
+        "hoverInactiveBackground": "#005a6f",
        "inactiveUnderlineColor": "#d33682",
        "selectedBackground": "#00252E",
        "selectedInactiveBackground": "#00252E",
        "underlineColor": "#d33682",
-        "underlinedTabBackground": "#11353F",
+        "underlinedTabBackground": "#003946",
        "underlinedTabInactiveBackground": "#003745",
        "underlinedTabForeground": "#FFFFFF",
        "underlinedTabInactiveForeground": "#839496"
@@ -811,14 +811,14 @@
      "background": "#002B36",
      "foreground": "#586e75",
      "hash": "#0D3640",
-      "hoverBackground": "#2E4C5270",
-      "hoverInactiveBackground": "#11353F",
+      "hoverBackground": "#2E4C5280",
+      "hoverInactiveBackground": "#003946",
      "modifiedItemForeground": "#d33682",
      "rowHeight": 28,
-      "selectionBackground": "#2E4C5270",
+      "selectionBackground": "#2E4C5280",
      "selectionForeground": "#FFFFFF",
      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5270",
+      "selectionInactiveBackground": "#2E4C5280",
      "textBackground": "#002B36"
    },
    "Tree.leftChildIndent": 10,
@@ -834,23 +834,23 @@
        "borderColor": "#0D3640",
        "background": "#002B36",
        "foreground": "#839496",
-        "hoverBorderColor": "#11353F"
+        "hoverBorderColor": "#005a6f"
      },
      "Connector": {
        "borderColor": "#0D3640",
-        "hoverBorderColor": "#11353F"
+        "hoverBorderColor": "#005a6f"
      },
      "Canvas.background": "#00252E",
      "highStroke.foreground": "#839496",
      "Label.foreground": "#586e75",
-      "List.selectionBackground": "#2E4C5270",
+      "List.selectionBackground": "#2E4C5280",
      "motion": {
        "borderColor": "#0D3640",
        "Component.foreground": "#839496",
        "ConstraintSetText.foreground": "#586e75",
        "ConstraintSet.background": "#003745",
        "CSPanel.SelectedFocusBackground": "#2E4C52",
-        "CSPanel.SelectedBackground": "#2E4C5270",
+        "CSPanel.SelectedBackground": "#2E4C5280",
        "cs_FocusText.infoForeground": "#586e75",
        "CursorTextColor.foreground": "#839496",
        "HoverColor.disabledBackground": "#2E5861",
@@ -861,8 +861,8 @@
        "ourCS_Border.borderColor": "#0D3640",
        "ourCS_TextColor.foreground": "#586e75",
        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
-        "ourCS_SelectedBackground.selectionInactiveBackground": "#11353F",
-        "ourCS_SelectedBorder.pressedBorderColor": "#11353F",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#003946",
+        "ourCS_SelectedBorder.pressedBorderColor": "#005a6f",
        "ourML_BarColor.separatorColor": "#0D3640",
        "PrimaryPanel.background": "#00252E",
        "SecondaryPanel.background": "#002B36",
@@ -895,7 +895,7 @@
        "selectedBranchBackground": "#002B36"
      },
      "GitCommits": {
-        "graphColor": "#11353F"
+        "graphColor": "#005a6f"
      },
      "GitLog": {
        "localBranchIconColor": "#d33682",
@@ -915,11 +915,11 @@
      "Log": {
        "Commit.unmatchedForeground": "#586e75",
        "Commit.currentBranchBackground": "#003745",
-        "Commit.hoveredBackground": "#2E4C5270"
+        "Commit.hoveredBackground": "#2E4C5280"
      },
      "RefLabel": {
        "foreground": "#FFFFFF",
-        "backgroundBase": "#11353F"
+        "backgroundBase": "#005a6f"
      }
    },
    "Viewport": {
@@ -942,7 +942,7 @@
      "SidePanel.background": "#003745",
      "Projects": {
        "actions.background": "#00252E",
-        "actions.selectionBackground": "#11353F",
+        "actions.selectionBackground": "#005a6f",
        "background": "#003745",
        "selectionBackground": "#2E4C52",
        "selectionInactiveBackground": "#003745"
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
@@ -17,13 +17,13 @@
      "disabledBackground": "#E3DCC9",
      "disabledForeground": "#C9CCC3",
      "disabledText": "#C9CCC3",
-      "focusColor": "#F6F0DE",
+      "focusColor": "#d1cbb8",
      "focusedBorderColor": "#d33682",
      "foreground": "#586e75",
      "inactiveBackground": "#E3DCC9",
      "inactiveForeground": "#93a1a1",
      "infoForeground": "#93a1a1",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionBackgroundInactive": "#F6F0DE",
      "selectionForeground": "#002b36",
      "selectionInactiveBackground": "#F6F0DE",
@@ -33,13 +33,13 @@
    "ActionButton": {
      "hoverBackground": "#d3368250",
      "hoverBorderColor": "#d3368250",
-      "hoverSeparatorColor": "#FEFBF1",
+      "hoverSeparatorColor": "#d8d4c4",
      "focusedBorderColor": "#d3368250",
      "pressedBackground": "#d3368250",
      "pressedBorderColor": "#d3368250"
    },
    "Autocomplete": {
-      "selectionBackground": "#93a1a1"
+      "selectionBackground": "#e8dcb6"
    },
    "Borders.ContrastBorderColor": "#fdf6e3",
    "Borders.color": "#edead9",
@@ -47,31 +47,31 @@
      "arc": 0,
      "background": "#fdf6e3",
      "default": {
-        "endBackground": "#F6F0DE",
-        "endBorderColor": "#F6F0DE",
+        "endBackground": "#d1cbb8",
+        "endBorderColor": "#d1cbb8",
        "foreground": "#002b36",
        "focusColor": "#d33682",
        "focusedBorderColor": "#d33682",
-        "shadowColor": "#F6F0DE",
-        "startBackground": "#F6F0DE",
-        "startBorderColor": "#F6F0DE"
+        "shadowColor": "#d1cbb8",
+        "startBackground": "#d1cbb8",
+        "startBorderColor": "#d1cbb8"
      },
-      "disabledBorderColor": "#FEFBF1",
+      "disabledBorderColor": "#d8d4c4",
      "disabledText": "#C9CCC3",
-      "endBackground": "#FEFBF1",
-      "endBorderColor": "#FEFBF1",
-      "focus": "#F6F0DE",
+      "endBackground": "#d8d4c4",
+      "endBorderColor": "#d8d4c4",
+      "focus": "#d1cbb8",
      "focusedBorderColor": "#d33682",
      "foreground": "#93a1a1",
      "highlight": "#002b36",
-      "mt.background": "#FEFBF1",
+      "mt.background": "#d8d4c4",
      "mt.foreground": "#93a1a1",
      "mt.selectedForeground": "#002b36",
-      "mt.selection.color1": "#F6F0DE",
-      "mt.selection.color2": "#F6F0DE",
-      "startBackground": "#FEFBF1",
-      "startBorderColor": "#FEFBF1",
-      "shadowColor": "#FEFBF1",
+      "mt.selection.color1": "#d1cbb8",
+      "mt.selection.color2": "#d1cbb8",
+      "startBackground": "#d8d4c4",
+      "startBorderColor": "#d8d4c4",
+      "shadowColor": "#d8d4c4",
      "shadowWidth": 0
    },
    "Canvas": {
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#eee8d5",
-      "selectionBackground": "#93a1a1"
+      "selectionBackground": "#e8dcb6"
    },
    "CheckBox": {
      "background": "#fdf6e3",
@@ -95,7 +95,7 @@
      "disabledBackground": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "CodeWithMe": {
@@ -111,23 +111,23 @@
      "foreground": "#586e75",
      "swatchesDefaultRecentColor": "#586e75"
    },
-    "ComboBoxButton.background": "#FEFBF1",
+    "ComboBoxButton.background": "#d8d4c4",
    "ComboBox": {
      "ArrowButton": {
-        "background": "#FEFBF1",
+        "background": "#d8d4c4",
        "disabledIconColor": "#C9CCC3",
        "iconColor": "#586e75",
        "nonEditableBackground": "#fdf6e3"
      },
      "background": "#eee8d5",
-      "buttonBackground": "#FEFBF1",
+      "buttonBackground": "#d8d4c4",
      "darcula.hoveredArrowButtonForeground": "#d33682",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
      "modifiedItemForeground": "#d33682",
      "nonEditableBackground": "#F6F0DE",
      "padding": "5,5,5,5",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "ComboPopup.border": "#edead9",
@@ -141,15 +141,15 @@
      "selectedGrayedForeground": "#002b36",
      "selectionGrayForeground": "#002b36",
      "selectionInactiveInfoForeground": "#93a1a1",
-      "selectionInactiveBackground": "#93a1a150",
-      "selectionBackground": "#93a1a180",
+      "selectionInactiveBackground": "#e8dcb6",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "selectionInfoForeground": "#002b36"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#F6F0DE",
-      "disabledBorderColor": "#FEFBF1",
+      "borderColor": "#d1cbb8",
+      "disabledBorderColor": "#d8d4c4",
      "focusColor": "#d33682",
      "focusedBorderColor": "#d33682",
      "hoverIconColor": "#d33682",
@@ -174,24 +174,24 @@
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#F6F0DE",
-      "underlinedTabBackground": "#F6F0DE"
+      "selectedBackground": "#d1cbb8",
+      "underlinedTabBackground": "#d1cbb8"
    },
    "DebuggerPopup": {
-      "borderColor": "#F6F0DE"
+      "borderColor": "#d1cbb8"
    },
    "DefaultTabs": {
      "background": "#fdf6e3",
      "borderColor": "#fdf6e3",
-      "hoverBackground": "#F6F0DE",
+      "hoverBackground": "#d1cbb8",
      "hoverColor": "#eee8d5",
-      "hoverMaskColor": "#F6F0DE",
+      "hoverMaskColor": "#d1cbb8",
      "inactiveColoredTabBackground": "#fdf6e3",
-      "inactiveColoredFileBackground": "#FEFBF1",
+      "inactiveColoredFileBackground": "#d8d4c4",
      "inactiveUnderlineColor": "#d33682",
      "inactiveMaskColor": "#eee8d5",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabBackground": "#d1cbb8",
      "underlinedTabForeground": "#002b36"
    },
    "Desktop.background": "#fdf6e3",
@@ -213,31 +213,31 @@
      "foreground": "#586e75",
      "inactiveBackground": "#fdf6e3",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "EditorTabs": {
      "borderColor": "#F6F0DE",
-      "hoverBackground": "#F6F0DE",
-      "hoverColor": "#F6F0DE",
-      "hoverMaskColor": "#F6F0DE",
+      "hoverBackground": "#d1cbb8",
+      "hoverColor": "#d1cbb8",
+      "hoverMaskColor": "#d1cbb8",
      "inactiveMaskColor": "#fdf6e3",
      "inactiveColoredFileBackground": "#fdf6e3",
      "inactiveUnderlineColor": "#C9CCC3",
      "selectedForeground": "#586e75",
-      "selectedBackground": "#F6F0DE",
+      "selectedBackground": "#d1cbb8",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabBackground": "#d1cbb8",
      "underlinedTabForeground": "#002b36"
    },
    "EditorGroupsTabs": {
      "background": "#fdf6e3",
      "borderColor": "#F6F0DE",
-      "hoverBackground": "#F6F0DE",
-      "hoverColor": "#F6F0DE",
+      "hoverBackground": "#d1cbb8",
+      "hoverColor": "#d1cbb8",
      "inactiveUnderlineColor": "#d33682",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabBackground": "#d1cbb8",
      "underlinedTabForeground": "#586e75"
    },
    "FileColor": {
@@ -263,10 +263,10 @@
      "background": "#eee8d5",
      "caretForeground": "#d33682",
      "foreground": "#586e75",
-      "inactiveBackground": "#FEFBF1",
+      "inactiveBackground": "#d8d4c4",
      "inactiveForeground": "#C9CCC3",
      "selectionForeground": "#002b36",
-      "selectionBackground": "#F6F0DE"
+      "selectionBackground": "#d1cbb8"
    },
    "GotItTooltip.borderColor": "#EDE8D4",
    "Group": {
@@ -325,19 +325,19 @@
    "List": {
      "background": "#F6F0DE",
      "foreground": "#586e75",
-      "hoverBackground": "#93a1a170",
-      "hoverInactiveBackground": "#F6F0DE",
-      "selectionBackground": "#93a1a150",
+      "hoverBackground": "#e8dcb6b0",
+      "hoverInactiveBackground": "#d1cbb8",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#93a1a170"
+      "selectionInactiveBackground": "#e8dcb6b0"
    },
    "material": {
      "background": "#fdf6e3",
      "branchColor": "#586e75",
      "contrast": "#eee8d5",
      "foreground": "#586e75",
-      "mergeCommits": "#FEFBF1",
+      "mergeCommits": "#d8d4c4",
      "primaryColor": "#93a1a1",
      "selectionForeground": "#002b36",
      "tab.backgroundColor": "#fdf6e3",
@@ -346,8 +346,8 @@
    },
    "MemoryIndicator": {
      "allocatedBackground": "#F6F0DE",
-      "usedColor": "#F6F0DE",
-      "usedBackground": "#F6F0DE"
+      "usedColor": "#d1cbb8",
+      "usedBackground": "#d1cbb8"
    },
    "Menu": {
      "acceleratorForeground": "#93a1a1",
@@ -358,7 +358,7 @@
      "disabledBackground": "#F6F0DE",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "separatorColor": "#edead9"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
      "highlight": "#fdf6e3",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "shadow": "#eee8d5"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "NavBar": {
@@ -404,9 +404,9 @@
      "errorBorderColor": "#EDE8D4",
      "foreground": "#586e75",
      "MoreButton": {
-        "background": "#FEFBF1",
+        "background": "#d8d4c4",
        "foreground": "#586e75",
-        "innerBorderColor": "#FEFBF1"
+        "innerBorderColor": "#d8d4c4"
      },
      "ToolWindow": {
        "errorBackground": "#EDE8D4",
@@ -424,7 +424,7 @@
      "messageForeground": "#586e75"
    },
    "Outline": {
-      "color": "#FEFBF1",
+      "color": "#d8d4c4",
      "focusedColor": "#d33682",
      "disabledColor": "#C9CCC3"
    },
@@ -434,13 +434,13 @@
    },
    "ParameterInfo": {
      "background": "#F6F0DE",
-      "borderColor": "#F6F0DE",
-      "currentOverloadBackground": "#F6F0DE",
+      "borderColor": "#d1cbb8",
+      "currentOverloadBackground": "#d1cbb8",
      "currentParameterForeground": "#d33682",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
      "infoForeground": "#93a1a1",
-      "lineSeparatorColor": "#F6F0DE"
+      "lineSeparatorColor": "#d1cbb8"
    },
    "PasswordField": {
      "background": "#eee8d5",
@@ -448,29 +448,29 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "Plugins": {
      "background": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
-      "eapTagBackground": "#F6F0DE",
-      "hoverBackground": "#93a1a170",
-      "lightSelectionBackground": "#F6F0DE",
-      "paidTagBackground": "#F6F0DE",
-      "selectionBackground": "#93a1a1",
+      "eapTagBackground": "#d1cbb8",
+      "hoverBackground": "#e8dcb6b0",
+      "lightSelectionBackground": "#d1cbb8",
+      "paidTagBackground": "#d1cbb8",
+      "selectionBackground": "#e8dcb6",
      "tagForeground": "#d33682",
-      "tagBackground": "#F6F0DE",
-      "trialTagBackground": "#F6F0DE",
+      "tagBackground": "#d1cbb8",
+      "trialTagBackground": "#d1cbb8",
      "Button": {
-        "installBackground": "#FEFBF1",
-        "installBorderColor": "#FEFBF1",
+        "installBackground": "#d8d4c4",
+        "installBorderColor": "#d8d4c4",
        "installForeground": "#586e75",
-        "installFocusedBackground": "#F6F0DE",
+        "installFocusedBackground": "#d1cbb8",
        "installFillForeground": "#C9CCC3",
-        "installFillBackground": "#FEFBF1",
+        "installFillBackground": "#d8d4c4",
        "updateBackground": "#d33682",
-        "updateBorderColor": "#FEFBF1",
+        "updateBorderColor": "#d8d4c4",
        "updateForeground": "#586e75"
      },
      "SearchField": {
@@ -482,9 +482,9 @@
        "foreground": "#586e75"
      },
      "Tab": {
-        "hoverBackground": "#F6F0DE",
+        "hoverBackground": "#d1cbb8",
        "selectedForeground": "#002b36",
-        "selectedBackground": "#F6F0DE"
+        "selectedBackground": "#d1cbb8"
      }
    },
    "Popup": {
@@ -523,8 +523,8 @@
      "indeterminateEndColor": "#d33682",
      "indeterminateStartColor": "#d33682",
      "progressColor": "#d33682",
-      "selectionBackground": "#F6F0DE",
-      "trackColor": "#F6F0DE"
+      "selectionBackground": "#d1cbb8",
+      "trackColor": "#d1cbb8"
    },
    "PsiViewer": {
      "referenceHighlightColor": "#d33682"
@@ -541,7 +541,7 @@
      "disabledBackground": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "ScreenView.borderColor": "#edead9",
@@ -566,7 +566,7 @@
          "trackColor": "#fdf6e330"
        }
      },
-      "thumb": "#F6F0DE",
+      "thumb": "#d1cbb8",
      "thumbBorderColor": "#d3368270",
      "thumbColor": "#d3368270",
      "trackColor": "#fdf6e330",
@@ -599,7 +599,7 @@
      "Tab": {
        "active.foreground": "#002b36",
        "selectedForeground": "#002b36",
-        "selectedBackground": "#F6F0DE"
+        "selectedBackground": "#d1cbb8"
      }
    },
    "SearchMatch": {
@@ -610,7 +610,7 @@
    },
    "SearchField.errorBackground": "#EDE8D4",
    "SearchOption": {
-      "selectedBackground": "#F6F0DE"
+      "selectedBackground": "#d1cbb8"
    },
    "SearchResults": {
      "Ordinal.File.Foreground": "#93a1a1",
@@ -631,12 +631,12 @@
      "foreground": "#586e75",
      "majorTickLength": 6,
      "tickColor": "#F6F0DE",
-      "trackColor": "#F6F0DE",
+      "trackColor": "#d1cbb8",
      "trackWidth": 7,
      "thumb": "#d33682"
    },
    "SpeedSearch": {
-      "background": "#F6F0DE",
+      "background": "#d1cbb8",
      "borderColor": "#edead9",
      "foreground": "#586e75",
      "errorForeground": "#586e75"
@@ -654,22 +654,22 @@
    "SplitPaneDivider.draggingColor": "#F6F0DE",
    "StatusBar": {
      "borderColor": "#fdf6e3",
-      "hoverBackground": "#F6F0DE",
-      "LightEditBackground": "#F6F0DE"
+      "hoverBackground": "#d1cbb8",
+      "LightEditBackground": "#d1cbb8"
    },
    "TabbedPane": {
      "background": "#fdf6e3",
-      "contentAreaColor": "#F6F0DE",
+      "contentAreaColor": "#d1cbb8",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#edead9",
      "disabledForeground": "#C9CCC3",
      "disabledUnderlineColor": "#C9CCC3",
-      "focus": "#F6F0DE",
-      "focusColor": "#F6F0DE",
+      "focus": "#d1cbb8",
+      "focusColor": "#d1cbb8",
      "fontSizeOffset": 0,
      "foreground": "#586e75",
      "highlight": "#edead9",
-      "hoverColor": "#F6F0DE",
+      "hoverColor": "#d1cbb8",
      "labelShift": 0,
      "selectedForeground": "#002b36",
      "selectedLabelShift": 0,
@@ -689,19 +689,19 @@
      "disabledForeground": "#C9CCC3",
      "dropLineColor": "#d33682",
      "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#F6F0DE",
+      "focusCellBackground": "#d1cbb8",
      "focusCellForeground": "#002b36",
      "foreground": "#586e75",
      "gridColor": "#fdf6e3",
-      "highlightOuter": "#F6F0DE",
-      "hoverBackground": "#93a1a170",
-      "hoverInactiveBackground": "#F6F0DE",
+      "highlightOuter": "#d1cbb8",
+      "hoverBackground": "#e8dcb6b0",
+      "hoverInactiveBackground": "#d1cbb8",
      "lightSelectionForeground": "#002b36",
      "lightSelectionInactiveForeground": "#93a1a1",
      "lightSelectionInactiveBackground": "#F6F0DE",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36",
-      "selectionInactiveBackground": "#F6F0DE",
+      "selectionInactiveBackground": "#d1cbb8",
      "selectionInactiveForeground": "#002b36",
      "sortIconColor": "#586e75",
      "stripeColor": "#eee8d5"
@@ -713,7 +713,7 @@
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "focusCellBackground": "#F6F0DE",
+      "focusCellBackground": "#d1cbb8",
      "focusCellForeground": "#002b36",
      "height": 25,
      "separatorColor": "#F6F0DE"
@@ -726,7 +726,7 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "TextField": {
@@ -734,7 +734,7 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "TextPane": {
@@ -742,19 +742,19 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "TitlePane": {
      "background": "#eee8d5",
-      "Button.hoverBackground": "#F6F0DE",
+      "Button.hoverBackground": "#d1cbb8",
      "inactiveBackground": "#fdf6e3",
      "infoForeground": "#93a1a1",
      "inactiveInfoForeground": "#93a1a1"
    },
    "TitledBorder.titleColor": "#586e75",
    "ToggleButton": {
-      "borderColor": "#FEFBF1",
+      "borderColor": "#d8d4c4",
      "buttonColor": "#586e75",
      "disabledText": "#C9CCC3",
      "foreground": "#586e75",
@@ -781,7 +781,7 @@
    },
    "ToolWindow": {
      "Button": {
-        "hoverBackground": "#F6F0DE",
+        "hoverBackground": "#d1cbb8",
        "selectedForeground": "#002b36",
        "selectedBackground": "#eee8d5"
      },
@@ -794,14 +794,14 @@
        "background": "#fdf6e3"
      },
      "HeaderTab": {
-        "borderColor": "#F6F0DE",
-        "hoverBackground": "#F6F0DE",
-        "hoverInactiveBackground": "#F6F0DE",
+        "borderColor": "#d1cbb8",
+        "hoverBackground": "#d1cbb8",
+        "hoverInactiveBackground": "#d1cbb8",
        "inactiveUnderlineColor": "#d33682",
        "selectedBackground": "#eee8d5",
        "selectedInactiveBackground": "#eee8d5",
        "underlineColor": "#d33682",
-        "underlinedTabBackground": "#F6F0DE",
+        "underlinedTabBackground": "#d1cbb8",
        "underlinedTabInactiveBackground": "#F6F0DE",
        "underlinedTabForeground": "#002b36",
        "underlinedTabInactiveForeground": "#586e75"
@@ -811,14 +811,14 @@
      "background": "#eee8d5",
      "foreground": "#93a1a1",
      "hash": "#edead9",
-      "hoverBackground": "#93a1a170",
-      "hoverInactiveBackground": "#F6F0DE",
+      "hoverBackground": "#e8dcb6b0",
+      "hoverInactiveBackground": "#d1cbb8",
      "modifiedItemForeground": "#d33682",
      "rowHeight": 28,
-      "selectionBackground": "#93a1a170",
+      "selectionBackground": "#e8dcb6b0",
      "selectionForeground": "#002b36",
      "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#93a1a170",
+      "selectionInactiveBackground": "#e8dcb6b0",
      "textBackground": "#eee8d5"
    },
    "Tree.leftChildIndent": 10,
@@ -834,23 +834,23 @@
        "borderColor": "#edead9",
        "background": "#fdf6e3",
        "foreground": "#586e75",
-        "hoverBorderColor": "#F6F0DE"
+        "hoverBorderColor": "#d1cbb8"
      },
      "Connector": {
        "borderColor": "#edead9",
-        "hoverBorderColor": "#F6F0DE"
+        "hoverBorderColor": "#d1cbb8"
      },
      "Canvas.background": "#eee8d5",
      "highStroke.foreground": "#586e75",
      "Label.foreground": "#93a1a1",
-      "List.selectionBackground": "#93a1a170",
+      "List.selectionBackground": "#e8dcb6b0",
      "motion": {
        "borderColor": "#edead9",
        "Component.foreground": "#586e75",
        "ConstraintSetText.foreground": "#93a1a1",
        "ConstraintSet.background": "#F6F0DE",
-        "CSPanel.SelectedFocusBackground": "#93a1a1",
-        "CSPanel.SelectedBackground": "#93a1a170",
+        "CSPanel.SelectedFocusBackground": "#e8dcb6",
+        "CSPanel.SelectedBackground": "#e8dcb6b0",
        "cs_FocusText.infoForeground": "#93a1a1",
        "CursorTextColor.foreground": "#586e75",
        "HoverColor.disabledBackground": "#C9CCC3",
@@ -861,8 +861,8 @@
        "ourCS_Border.borderColor": "#edead9",
        "ourCS_TextColor.foreground": "#93a1a1",
        "ourCS_SelectedFocusBackground.selectionForeground": "#002b36",
-        "ourCS_SelectedBackground.selectionInactiveBackground": "#F6F0DE",
-        "ourCS_SelectedBorder.pressedBorderColor": "#F6F0DE",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#d1cbb8",
+        "ourCS_SelectedBorder.pressedBorderColor": "#d1cbb8",
        "ourML_BarColor.separatorColor": "#edead9",
        "PrimaryPanel.background": "#eee8d5",
        "SecondaryPanel.background": "#fdf6e3",
@@ -895,7 +895,7 @@
        "selectedBranchBackground": "#fdf6e3"
      },
      "GitCommits": {
-        "graphColor": "#F6F0DE"
+        "graphColor": "#d1cbb8"
      },
      "GitLog": {
        "localBranchIconColor": "#d33682",
@@ -915,11 +915,11 @@
      "Log": {
        "Commit.unmatchedForeground": "#93a1a1",
        "Commit.currentBranchBackground": "#F6F0DE",
-        "Commit.hoveredBackground": "#93a1a170"
+        "Commit.hoveredBackground": "#e8dcb6b0"
      },
      "RefLabel": {
        "foreground": "#002b36",
-        "backgroundBase": "#F6F0DE"
+        "backgroundBase": "#d1cbb8"
      }
    },
    "Viewport": {
@@ -942,9 +942,9 @@
      "SidePanel.background": "#F6F0DE",
      "Projects": {
        "actions.background": "#eee8d5",
-        "actions.selectionBackground": "#F6F0DE",
+        "actions.selectionBackground": "#d1cbb8",
        "background": "#F6F0DE",
-        "selectionBackground": "#93a1a1",
+        "selectionBackground": "#e8dcb6",
        "selectionInactiveBackground": "#F6F0DE"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized
@@ -17,13 +17,13 @@
      "disabledBackground": "#E3DCC9",
      "disabledForeground": "#C9CCC3",
      "disabledText": "#C9CCC3",
-      "focusColor": "#F6F0DE",
+      "focusColor": "#d1cbb8",
      "focusedBorderColor": "#d33682",
      "foreground": "#586e75",
      "inactiveBackground": "#E3DCC9",
      "inactiveForeground": "#93a1a1",
      "infoForeground": "#93a1a1",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionBackgroundInactive": "#F6F0DE",
      "selectionForeground": "#002b36",
      "selectionInactiveBackground": "#F6F0DE",
@@ -33,13 +33,13 @@
    "ActionButton": {
      "hoverBackground": "#d3368250",
      "hoverBorderColor": "#d3368250",
-      "hoverSeparatorColor": "#FEFBF1",
+      "hoverSeparatorColor": "#d8d4c4",
      "focusedBorderColor": "#d3368250",
      "pressedBackground": "#d3368250",
      "pressedBorderColor": "#d3368250"
    },
    "Autocomplete": {
-      "selectionBackground": "#93a1a1"
+      "selectionBackground": "#e8dcb6"
    },
    "Borders.ContrastBorderColor": "#fdf6e3",
    "Borders.color": "#edead9",
@@ -47,31 +47,31 @@
      "arc": 0,
      "background": "#fdf6e3",
      "default": {
-        "endBackground": "#F6F0DE",
-        "endBorderColor": "#F6F0DE",
+        "endBackground": "#d1cbb8",
+        "endBorderColor": "#d1cbb8",
        "foreground": "#002b36",
        "focusColor": "#d33682",
        "focusedBorderColor": "#d33682",
-        "shadowColor": "#F6F0DE",
-        "startBackground": "#F6F0DE",
-        "startBorderColor": "#F6F0DE"
+        "shadowColor": "#d1cbb8",
+        "startBackground": "#d1cbb8",
+        "startBorderColor": "#d1cbb8"
      },
-      "disabledBorderColor": "#FEFBF1",
+      "disabledBorderColor": "#d8d4c4",
      "disabledText": "#C9CCC3",
-      "endBackground": "#FEFBF1",
-      "endBorderColor": "#FEFBF1",
-      "focus": "#F6F0DE",
+      "endBackground": "#d8d4c4",
+      "endBorderColor": "#d8d4c4",
+      "focus": "#d1cbb8",
      "focusedBorderColor": "#d33682",
      "foreground": "#93a1a1",
      "highlight": "#002b36",
-      "mt.background": "#FEFBF1",
+      "mt.background": "#d8d4c4",
      "mt.foreground": "#93a1a1",
      "mt.selectedForeground": "#002b36",
-      "mt.selection.color1": "#F6F0DE",
-      "mt.selection.color2": "#F6F0DE",
-      "startBackground": "#FEFBF1",
-      "startBorderColor": "#FEFBF1",
-      "shadowColor": "#FEFBF1",
+      "mt.selection.color1": "#d1cbb8",
+      "mt.selection.color2": "#d1cbb8",
+      "startBackground": "#d8d4c4",
+      "startBorderColor": "#d8d4c4",
+      "shadowColor": "#d8d4c4",
      "shadowWidth": 0
    },
    "Canvas": {
@@ -80,7 +80,7 @@
    },
    "Content": {
      "background": "#eee8d5",
-      "selectionBackground": "#93a1a1"
+      "selectionBackground": "#e8dcb6"
    },
    "CheckBox": {
      "background": "#fdf6e3",
@@ -95,7 +95,7 @@
      "disabledBackground": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "CodeWithMe": {
@@ -111,23 +111,23 @@
      "foreground": "#586e75",
      "swatchesDefaultRecentColor": "#586e75"
    },
-    "ComboBoxButton.background": "#FEFBF1",
+    "ComboBoxButton.background": "#d8d4c4",
    "ComboBox": {
      "ArrowButton": {
-        "background": "#FEFBF1",
+        "background": "#d8d4c4",
        "disabledIconColor": "#C9CCC3",
        "iconColor": "#586e75",
        "nonEditableBackground": "#fdf6e3"
      },
      "background": "#fdf6e3",
-      "buttonBackground": "#FEFBF1",
+      "buttonBackground": "#d8d4c4",
      "darcula.hoveredArrowButtonForeground": "#d33682",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
      "modifiedItemForeground": "#d33682",
      "nonEditableBackground": "#F6F0DE",
      "padding": "5,5,5,5",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "ComboPopup.border": "#edead9",
@@ -141,15 +141,15 @@
      "selectedGrayedForeground": "#002b36",
      "selectionGrayForeground": "#002b36",
      "selectionInactiveInfoForeground": "#93a1a1",
-      "selectionInactiveBackground": "#93a1a150",
-      "selectionBackground": "#93a1a180",
+      "selectionInactiveBackground": "#e8dcb6",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "selectionInfoForeground": "#002b36"
    },
    "Component": {
      "arc": 4,
-      "borderColor": "#F6F0DE",
-      "disabledBorderColor": "#FEFBF1",
+      "borderColor": "#d1cbb8",
+      "disabledBorderColor": "#d8d4c4",
      "focusColor": "#d33682",
      "focusedBorderColor": "#d33682",
      "hoverIconColor": "#d33682",
@@ -174,24 +174,24 @@
      }
    },
    "DebuggerTabs": {
-      "selectedBackground": "#F6F0DE",
-      "underlinedTabBackground": "#F6F0DE"
+      "selectedBackground": "#d1cbb8",
+      "underlinedTabBackground": "#d1cbb8"
    },
    "DebuggerPopup": {
-      "borderColor": "#F6F0DE"
+      "borderColor": "#d1cbb8"
    },
    "DefaultTabs": {
      "background": "#fdf6e3",
      "borderColor": "#fdf6e3",
-      "hoverBackground": "#F6F0DE",
+      "hoverBackground": "#d1cbb8",
      "hoverColor": "#fdf6e3",
-      "hoverMaskColor": "#F6F0DE",
+      "hoverMaskColor": "#d1cbb8",
      "inactiveColoredTabBackground": "#fdf6e3",
-      "inactiveColoredFileBackground": "#FEFBF1",
+      "inactiveColoredFileBackground": "#d8d4c4",
      "inactiveUnderlineColor": "#d33682",
      "inactiveMaskColor": "#fdf6e3",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabBackground": "#d1cbb8",
      "underlinedTabForeground": "#002b36"
    },
    "Desktop.background": "#fdf6e3",
@@ -213,31 +213,31 @@
      "foreground": "#586e75",
      "inactiveBackground": "#fdf6e3",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "EditorTabs": {
      "borderColor": "#F6F0DE",
-      "hoverBackground": "#F6F0DE",
-      "hoverColor": "#F6F0DE",
-      "hoverMaskColor": "#F6F0DE",
+      "hoverBackground": "#d1cbb8",
+      "hoverColor": "#d1cbb8",
+      "hoverMaskColor": "#d1cbb8",
      "inactiveMaskColor": "#fdf6e3",
      "inactiveColoredFileBackground": "#fdf6e3",
      "inactiveUnderlineColor": "#C9CCC3",
      "selectedForeground": "#586e75",
-      "selectedBackground": "#F6F0DE",
+      "selectedBackground": "#d1cbb8",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabBackground": "#d1cbb8",
      "underlinedTabForeground": "#002b36"
    },
    "EditorGroupsTabs": {
      "background": "#fdf6e3",
      "borderColor": "#F6F0DE",
-      "hoverBackground": "#F6F0DE",
-      "hoverColor": "#F6F0DE",
+      "hoverBackground": "#d1cbb8",
+      "hoverColor": "#d1cbb8",
      "inactiveUnderlineColor": "#d33682",
      "underlineColor": "#d33682",
-      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabBackground": "#d1cbb8",
      "underlinedTabForeground": "#586e75"
    },
    "FileColor": {
@@ -263,10 +263,10 @@
      "background": "#fdf6e3",
      "caretForeground": "#d33682",
      "foreground": "#586e75",
-      "inactiveBackground": "#FEFBF1",
+      "inactiveBackground": "#d8d4c4",
      "inactiveForeground": "#C9CCC3",
      "selectionForeground": "#002b36",
-      "selectionBackground": "#F6F0DE"
+      "selectionBackground": "#d1cbb8"
    },
    "GotItTooltip.borderColor": "#EDE8D4",
    "Group": {
@@ -325,19 +325,19 @@
    "List": {
      "background": "#F6F0DE",
      "foreground": "#586e75",
-      "hoverBackground": "#93a1a170",
-      "hoverInactiveBackground": "#F6F0DE",
-      "selectionBackground": "#93a1a150",
+      "hoverBackground": "#e8dcb6b0",
+      "hoverInactiveBackground": "#d1cbb8",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#93a1a170"
+      "selectionInactiveBackground": "#e8dcb6b0"
    },
    "material": {
      "background": "#fdf6e3",
      "branchColor": "#586e75",
      "contrast": "#eee8d5",
      "foreground": "#586e75",
-      "mergeCommits": "#FEFBF1",
+      "mergeCommits": "#d8d4c4",
      "primaryColor": "#93a1a1",
      "selectionForeground": "#002b36",
      "tab.backgroundColor": "#fdf6e3",
@@ -346,8 +346,8 @@
    },
    "MemoryIndicator": {
      "allocatedBackground": "#F6F0DE",
-      "usedColor": "#F6F0DE",
-      "usedBackground": "#F6F0DE"
+      "usedColor": "#d1cbb8",
+      "usedBackground": "#d1cbb8"
    },
    "Menu": {
      "acceleratorForeground": "#93a1a1",
@@ -358,7 +358,7 @@
      "disabledBackground": "#F6F0DE",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "separatorColor": "#edead9"
    },
@@ -369,7 +369,7 @@
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
      "highlight": "#fdf6e3",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36",
      "shadow": "#fdf6e3"
    },
@@ -381,7 +381,7 @@
      "disabledBackground": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "NavBar": {
@@ -404,9 +404,9 @@
      "errorBorderColor": "#EDE8D4",
      "foreground": "#586e75",
      "MoreButton": {
-        "background": "#FEFBF1",
+        "background": "#d8d4c4",
        "foreground": "#586e75",
-        "innerBorderColor": "#FEFBF1"
+        "innerBorderColor": "#d8d4c4"
      },
      "ToolWindow": {
        "errorBackground": "#EDE8D4",
@@ -424,7 +424,7 @@
      "messageForeground": "#586e75"
    },
    "Outline": {
-      "color": "#FEFBF1",
+      "color": "#d8d4c4",
      "focusedColor": "#d33682",
      "disabledColor": "#C9CCC3"
    },
@@ -434,13 +434,13 @@
    },
    "ParameterInfo": {
      "background": "#F6F0DE",
-      "borderColor": "#F6F0DE",
-      "currentOverloadBackground": "#F6F0DE",
+      "borderColor": "#d1cbb8",
+      "currentOverloadBackground": "#d1cbb8",
      "currentParameterForeground": "#d33682",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
      "infoForeground": "#93a1a1",
-      "lineSeparatorColor": "#F6F0DE"
+      "lineSeparatorColor": "#d1cbb8"
    },
    "PasswordField": {
      "background": "#fdf6e3",
@@ -448,29 +448,29 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "Plugins": {
      "background": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
-      "eapTagBackground": "#F6F0DE",
-      "hoverBackground": "#93a1a170",
-      "lightSelectionBackground": "#F6F0DE",
-      "paidTagBackground": "#F6F0DE",
-      "selectionBackground": "#93a1a1",
+      "eapTagBackground": "#d1cbb8",
+      "hoverBackground": "#e8dcb6b0",
+      "lightSelectionBackground": "#d1cbb8",
+      "paidTagBackground": "#d1cbb8",
+      "selectionBackground": "#e8dcb6",
      "tagForeground": "#d33682",
-      "tagBackground": "#F6F0DE",
-      "trialTagBackground": "#F6F0DE",
+      "tagBackground": "#d1cbb8",
+      "trialTagBackground": "#d1cbb8",
      "Button": {
-        "installBackground": "#FEFBF1",
-        "installBorderColor": "#FEFBF1",
+        "installBackground": "#d8d4c4",
+        "installBorderColor": "#d8d4c4",
        "installForeground": "#586e75",
-        "installFocusedBackground": "#F6F0DE",
+        "installFocusedBackground": "#d1cbb8",
        "installFillForeground": "#C9CCC3",
-        "installFillBackground": "#FEFBF1",
+        "installFillBackground": "#d8d4c4",
        "updateBackground": "#d33682",
-        "updateBorderColor": "#FEFBF1",
+        "updateBorderColor": "#d8d4c4",
        "updateForeground": "#586e75"
      },
      "SearchField": {
@@ -482,9 +482,9 @@
        "foreground": "#586e75"
      },
      "Tab": {
-        "hoverBackground": "#F6F0DE",
+        "hoverBackground": "#d1cbb8",
        "selectedForeground": "#002b36",
-        "selectedBackground": "#F6F0DE"
+        "selectedBackground": "#d1cbb8"
      }
    },
    "Popup": {
@@ -523,8 +523,8 @@
      "indeterminateEndColor": "#d33682",
      "indeterminateStartColor": "#d33682",
      "progressColor": "#d33682",
-      "selectionBackground": "#F6F0DE",
-      "trackColor": "#F6F0DE"
+      "selectionBackground": "#d1cbb8",
+      "trackColor": "#d1cbb8"
    },
    "PsiViewer": {
      "referenceHighlightColor": "#d33682"
@@ -541,7 +541,7 @@
      "disabledBackground": "#fdf6e3",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "selectionBackground": "#93a1a1",
+      "selectionBackground": "#e8dcb6",
      "selectionForeground": "#002b36"
    },
    "ScreenView.borderColor": "#edead9",
@@ -566,7 +566,7 @@
          "trackColor": "#fdf6e330"
        }
      },
-      "thumb": "#F6F0DE",
+      "thumb": "#d1cbb8",
      "thumbBorderColor": "#d3368270",
      "thumbColor": "#d3368270",
      "trackColor": "#fdf6e330",
@@ -599,7 +599,7 @@
      "Tab": {
        "active.foreground": "#002b36",
        "selectedForeground": "#002b36",
-        "selectedBackground": "#F6F0DE"
+        "selectedBackground": "#d1cbb8"
      }
    },
    "SearchMatch": {
@@ -610,7 +610,7 @@
    },
    "SearchField.errorBackground": "#EDE8D4",
    "SearchOption": {
-      "selectedBackground": "#F6F0DE"
+      "selectedBackground": "#d1cbb8"
    },
    "SearchResults": {
      "Ordinal.File.Foreground": "#93a1a1",
@@ -631,12 +631,12 @@
      "foreground": "#586e75",
      "majorTickLength": 6,
      "tickColor": "#F6F0DE",
-      "trackColor": "#F6F0DE",
+      "trackColor": "#d1cbb8",
      "trackWidth": 7,
      "thumb": "#d33682"
    },
    "SpeedSearch": {
-      "background": "#F6F0DE",
+      "background": "#d1cbb8",
      "borderColor": "#edead9",
      "foreground": "#586e75",
      "errorForeground": "#586e75"
@@ -654,22 +654,22 @@
    "SplitPaneDivider.draggingColor": "#F6F0DE",
    "StatusBar": {
      "borderColor": "#fdf6e3",
-      "hoverBackground": "#F6F0DE",
-      "LightEditBackground": "#F6F0DE"
+      "hoverBackground": "#d1cbb8",
+      "LightEditBackground": "#d1cbb8"
    },
    "TabbedPane": {
      "background": "#fdf6e3",
-      "contentAreaColor": "#F6F0DE",
+      "contentAreaColor": "#d1cbb8",
      "contentBorderInsets": "3,1,1,1",
      "darkShadow": "#edead9",
      "disabledForeground": "#C9CCC3",
      "disabledUnderlineColor": "#C9CCC3",
-      "focus": "#F6F0DE",
-      "focusColor": "#F6F0DE",
+      "focus": "#d1cbb8",
+      "focusColor": "#d1cbb8",
      "fontSizeOffset": 0,
      "foreground": "#586e75",
      "highlight": "#edead9",
-      "hoverColor": "#F6F0DE",
+      "hoverColor": "#d1cbb8",
      "labelShift": 0,
      "selectedForeground": "#002b36",
      "selectedLabelShift": 0,
@@ -689,19 +689,19 @@
      "disabledForeground": "#C9CCC3",
      "dropLineColor": "#d33682",
      "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#F6F0DE",
+      "focusCellBackground": "#d1cbb8",
      "focusCellForeground": "#002b36",
      "foreground": "#586e75",
      "gridColor": "#fdf6e3",
-      "highlightOuter": "#F6F0DE",
-      "hoverBackground": "#93a1a170",
-      "hoverInactiveBackground": "#F6F0DE",
+      "highlightOuter": "#d1cbb8",
+      "hoverBackground": "#e8dcb6b0",
+      "hoverInactiveBackground": "#d1cbb8",
      "lightSelectionForeground": "#002b36",
      "lightSelectionInactiveForeground": "#93a1a1",
      "lightSelectionInactiveBackground": "#F6F0DE",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36",
-      "selectionInactiveBackground": "#F6F0DE",
+      "selectionInactiveBackground": "#d1cbb8",
      "selectionInactiveForeground": "#002b36",
      "sortIconColor": "#586e75",
      "stripeColor": "#eee8d5"
@@ -713,7 +713,7 @@
      "cellBorder": "4,0,4,0",
      "disabledForeground": "#C9CCC3",
      "foreground": "#586e75",
-      "focusCellBackground": "#F6F0DE",
+      "focusCellBackground": "#d1cbb8",
      "focusCellForeground": "#002b36",
      "height": 25,
      "separatorColor": "#F6F0DE"
@@ -726,7 +726,7 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "TextField": {
@@ -734,7 +734,7 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "TextPane": {
@@ -742,19 +742,19 @@
      "caretForeground": "#d33682",
      "foreground": "#586e75",
      "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#F6F0DE",
+      "selectionBackground": "#d1cbb8",
      "selectionForeground": "#002b36"
    },
    "TitlePane": {
      "background": "#eee8d5",
-      "Button.hoverBackground": "#F6F0DE",
+      "Button.hoverBackground": "#d1cbb8",
      "inactiveBackground": "#fdf6e3",
      "infoForeground": "#93a1a1",
      "inactiveInfoForeground": "#93a1a1"
    },
    "TitledBorder.titleColor": "#586e75",
    "ToggleButton": {
-      "borderColor": "#FEFBF1",
+      "borderColor": "#d8d4c4",
      "buttonColor": "#586e75",
      "disabledText": "#C9CCC3",
      "foreground": "#586e75",
@@ -781,7 +781,7 @@
    },
    "ToolWindow": {
      "Button": {
-        "hoverBackground": "#F6F0DE",
+        "hoverBackground": "#d1cbb8",
        "selectedForeground": "#002b36",
        "selectedBackground": "#eee8d5"
      },
@@ -794,14 +794,14 @@
        "background": "#fdf6e3"
      },
      "HeaderTab": {
-        "borderColor": "#F6F0DE",
-        "hoverBackground": "#F6F0DE",
-        "hoverInactiveBackground": "#F6F0DE",
+        "borderColor": "#d1cbb8",
+        "hoverBackground": "#d1cbb8",
+        "hoverInactiveBackground": "#d1cbb8",
        "inactiveUnderlineColor": "#d33682",
        "selectedBackground": "#eee8d5",
        "selectedInactiveBackground": "#eee8d5",
        "underlineColor": "#d33682",
-        "underlinedTabBackground": "#F6F0DE",
+        "underlinedTabBackground": "#d1cbb8",
        "underlinedTabInactiveBackground": "#F6F0DE",
        "underlinedTabForeground": "#002b36",
        "underlinedTabInactiveForeground": "#586e75"
@@ -811,14 +811,14 @@
      "background": "#fdf6e3",
      "foreground": "#93a1a1",
      "hash": "#edead9",
-      "hoverBackground": "#93a1a170",
-      "hoverInactiveBackground": "#F6F0DE",
+      "hoverBackground": "#e8dcb6b0",
+      "hoverInactiveBackground": "#d1cbb8",
      "modifiedItemForeground": "#d33682",
      "rowHeight": 28,
-      "selectionBackground": "#93a1a170",
+      "selectionBackground": "#e8dcb6b0",
      "selectionForeground": "#002b36",
      "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#93a1a170",
+      "selectionInactiveBackground": "#e8dcb6b0",
      "textBackground": "#fdf6e3"
    },
    "Tree.leftChildIndent": 10,
@@ -834,23 +834,23 @@
        "borderColor": "#edead9",
        "background": "#fdf6e3",
        "foreground": "#586e75",
-        "hoverBorderColor": "#F6F0DE"
+        "hoverBorderColor": "#d1cbb8"
      },
      "Connector": {
        "borderColor": "#edead9",
-        "hoverBorderColor": "#F6F0DE"
+        "hoverBorderColor": "#d1cbb8"
      },
      "Canvas.background": "#eee8d5",
      "highStroke.foreground": "#586e75",
      "Label.foreground": "#93a1a1",
-      "List.selectionBackground": "#93a1a170",
+      "List.selectionBackground": "#e8dcb6b0",
      "motion": {
        "borderColor": "#edead9",
        "Component.foreground": "#586e75",
        "ConstraintSetText.foreground": "#93a1a1",
        "ConstraintSet.background": "#F6F0DE",
-        "CSPanel.SelectedFocusBackground": "#93a1a1",
-        "CSPanel.SelectedBackground": "#93a1a170",
+        "CSPanel.SelectedFocusBackground": "#e8dcb6",
+        "CSPanel.SelectedBackground": "#e8dcb6b0",
        "cs_FocusText.infoForeground": "#93a1a1",
        "CursorTextColor.foreground": "#586e75",
        "HoverColor.disabledBackground": "#C9CCC3",
@@ -861,8 +861,8 @@
        "ourCS_Border.borderColor": "#edead9",
        "ourCS_TextColor.foreground": "#93a1a1",
        "ourCS_SelectedFocusBackground.selectionForeground": "#002b36",
-        "ourCS_SelectedBackground.selectionInactiveBackground": "#F6F0DE",
-        "ourCS_SelectedBorder.pressedBorderColor": "#F6F0DE",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#d1cbb8",
+        "ourCS_SelectedBorder.pressedBorderColor": "#d1cbb8",
        "ourML_BarColor.separatorColor": "#edead9",
        "PrimaryPanel.background": "#eee8d5",
        "SecondaryPanel.background": "#fdf6e3",
@@ -895,7 +895,7 @@
        "selectedBranchBackground": "#fdf6e3"
      },
      "GitCommits": {
-        "graphColor": "#F6F0DE"
+        "graphColor": "#d1cbb8"
      },
      "GitLog": {
        "localBranchIconColor": "#d33682",
@@ -915,11 +915,11 @@
      "Log": {
        "Commit.unmatchedForeground": "#93a1a1",
        "Commit.currentBranchBackground": "#F6F0DE",
-        "Commit.hoveredBackground": "#93a1a170"
+        "Commit.hoveredBackground": "#e8dcb6b0"
      },
      "RefLabel": {
        "foreground": "#002b36",
-        "backgroundBase": "#F6F0DE"
+        "backgroundBase": "#d1cbb8"
      }
    },
    "Viewport": {
@@ -942,9 +942,9 @@
      "SidePanel.background": "#F6F0DE",
      "Projects": {
        "actions.background": "#eee8d5",
-        "actions.selectionBackground": "#F6F0DE",
+        "actions.selectionBackground": "#d1cbb8",
        "background": "#F6F0DE",
-        "selectionBackground": "#93a1a1",
+        "selectionBackground": "#e8dcb6",
        "selectionInactiveBackground": "#F6F0DE"
      }
    },
--- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json
+++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json
@@ -6,7 +6,8 @@
  "colors": {
    "accentColor": "#568AF2",
    "backgroundColor": "#21252b",
-    "borderColor": "#333841"
+    "borderColor": "#333841",
+    "infoForeground": "#7e8491"
  },
  "ui": {
    "*": {
@@ -131,7 +132,7 @@
    },

    "Label": {
-      "infoForeground": "#7e8491"
+      "infoForeground": "infoForeground"
    },

    "Link": {
@@ -325,6 +326,11 @@
      }
    },

+    "TitlePane" : {
+      "infoForeground": "infoForeground",
+      "inactiveInfoForeground": "#5C6370"
+    },
+
    "Tree": {
      "selectionBackground": "#4d78cc",
      "modifiedItemForeground": "accentColor",
--- a/flatlaf-jide-oss/README.md
+++ b/flatlaf-jide-oss/README.md
@@ -21,8 +21,7 @@ and create a pull request.
 Download
 --------

-FlatLaf for JIDE Common Layer binaries are available on **JCenter** and **Maven
-Central**.
+FlatLaf for JIDE Common Layer binaries are available on **Maven Central**.

 If you use Maven or Gradle, add a dependency with following coordinates to your
 build script:
@@ -33,4 +32,4 @@ build script:

 Otherwise download `flatlaf-jide-oss-<version>.jar` here:

-[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf-jide-oss/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf-jide-oss/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-jide-oss/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-jide-oss)
--- a/flatlaf-swingx/README.md
+++ b/flatlaf-swingx/README.md
@@ -26,7 +26,7 @@ this addon:
 Download
 --------

-FlatLaf for SwingX binaries are available on **JCenter** and **Maven Central**.
+FlatLaf for SwingX binaries are available on **Maven Central**.

 If you use Maven or Gradle, add a dependency with following coordinates to your
 build script:
@@ -37,4 +37,4 @@ build script:

 Otherwise download `flatlaf-swingx-<version>.jar` here:

-[![Download](https://api.bintray.com/packages/jformdesigner/flatlaf/flatlaf-swingx/images/download.svg)](https://bintray.com/jformdesigner/flatlaf/flatlaf-swingx/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-swingx/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-swingx)
--- a/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt
+++ b/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt
@@ -13,7 +13,7 @@
 - Button.innerFocusWidth         1
 + Button.innerFocusWidth         0

- CheckBox.icon.focusedBackground #4d466d94    javax.swing.plaf.ColorUIResource [UI]
+- CheckBox.icon.focusedBackground #466d944d  30%    javax.swing.plaf.ColorUIResource [UI]

 - ComboBox.border                [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatRoundBorder [UI]
 + ComboBox.border                [lazy] 3,3,3,3  false    com.formdev.flatlaf.ui.FlatRoundBorder [UI]
--- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt
+++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt
@@ -127,7 +127,7 @@ CheckBox.icon.checkmarkColor   #a7a7a7    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.disabledBorderColor #545556    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.disabledCheckmarkColor #606060    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.icon.focusedBackground #4d466d94    javax.swing.plaf.ColorUIResource [UI]
+CheckBox.icon.focusedBackground #466d944d  30%    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.focusedBorderColor #466d94    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.hoverBackground  #4a5152    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(3% autoInverse)
 CheckBox.icon.hoverBorderColor #466d94    javax.swing.plaf.ColorUIResource [UI]
@@ -648,7 +648,7 @@ PanelUI                        com.formdev.flatlaf.ui.FlatPanelUI
 PasswordField.background       #45494a    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatTextBorder [UI]
 PasswordField.capsLockIcon     [lazy] 16,16    com.formdev.flatlaf.icons.FlatCapsLockIcon [UI]
-PasswordField.capsLockIconColor #64ffffff    javax.swing.plaf.ColorUIResource [UI]
+PasswordField.capsLockIconColor #ffffff64  39%    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
@@ -855,7 +855,7 @@ Slider.disabledTrackColor      #4c5052    javax.swing.plaf.ColorUIResource [UI]
 Slider.focus                   #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 Slider.focusInsets             0,0,0,0    javax.swing.plaf.InsetsUIResource [UI]
 Slider.focusWidth              4
-Slider.focusedColor            #b33d6185    com.formdev.flatlaf.util.DerivedColor [UI]    fade(70%)
+Slider.focusedColor            #3d6185b3  70%    com.formdev.flatlaf.util.DerivedColor [UI]    fade(70%)
 Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #242424    javax.swing.plaf.ColorUIResource [UI]
@@ -1129,7 +1129,7 @@ TitlePane.buttonSize           44,30    javax.swing.plaf.DimensionUIResource [UI
 TitlePane.closeHoverBackground #e81123    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closeHoverForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closeIcon            [lazy] 44,30    com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
-TitlePane.closePressedBackground #99e81123    javax.swing.plaf.ColorUIResource [UI]
+TitlePane.closePressedBackground #e8112399  60%    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closePressedForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.embeddedForeground   #959595    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.foreground           #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt
+++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt
@@ -653,7 +653,7 @@ PanelUI                        com.formdev.flatlaf.ui.FlatPanelUI
 PasswordField.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatTextBorder [UI]
 PasswordField.capsLockIcon     [lazy] 16,16    com.formdev.flatlaf.icons.FlatCapsLockIcon [UI]
-PasswordField.capsLockIconColor #64000000    javax.swing.plaf.ColorUIResource [UI]
+PasswordField.capsLockIconColor #00000064  39%    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
@@ -860,7 +860,7 @@ Slider.disabledTrackColor      #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
 Slider.focus                   #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 Slider.focusInsets             0,0,0,0    javax.swing.plaf.InsetsUIResource [UI]
 Slider.focusWidth              4
-Slider.focusedColor            #8097c3f3    com.formdev.flatlaf.util.DerivedColor [UI]    fade(50%)
+Slider.focusedColor            #97c3f380  50%    com.formdev.flatlaf.util.DerivedColor [UI]    fade(50%)
 Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #000000    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #ffffff    javax.swing.plaf.ColorUIResource [UI]
@@ -1134,7 +1134,7 @@ TitlePane.buttonSize           44,30    javax.swing.plaf.DimensionUIResource [UI
 TitlePane.closeHoverBackground #e81123    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closeHoverForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closeIcon            [lazy] 44,30    com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
-TitlePane.closePressedBackground #99e81123    javax.swing.plaf.ColorUIResource [UI]
+TitlePane.closePressedBackground #e8112399  60%    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closePressedForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.embeddedForeground   #595959    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.foreground           #000000    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt
+++ b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt
@@ -706,7 +706,7 @@ ProgressBar.cellLength         1
 ProgressBar.cellSpacing        0
 ProgressBar.cycleTime          10000
 ProgressBar.font               [active] Segoe UI plain 10    javax.swing.plaf.FontUIResource [UI]
-ProgressBar.foreground         #33737373    javax.swing.plaf.ColorUIResource [UI]
+ProgressBar.foreground         #73737333  20%    javax.swing.plaf.ColorUIResource [UI]
 ProgressBar.horizontalSize     146,4    javax.swing.plaf.DimensionUIResource [UI]
 ProgressBar.repaintInterval    15
 ProgressBar.selectionBackground #000088    javax.swing.plaf.ColorUIResource [UI]
@@ -805,7 +805,7 @@ ScrollBar.minimumThumbSize     10,10    javax.swing.plaf.DimensionUIResource [UI
 ScrollBar.pressedThumbWithTrack false
 ScrollBar.showButtons          false
 ScrollBar.squareButtons        false
-ScrollBar.thumb                #33737373    javax.swing.plaf.ColorUIResource [UI]
+ScrollBar.thumb                #73737333  20%    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.thumbArc             0
 ScrollBar.thumbDarkShadow      #696969    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.thumbHighlight       #ffffff    javax.swing.plaf.ColorUIResource [UI]
@@ -1127,7 +1127,7 @@ TitlePane.buttonSize           44,30    javax.swing.plaf.DimensionUIResource [UI
 TitlePane.closeHoverBackground #e81123    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closeHoverForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closeIcon            [lazy] 44,30    com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
-TitlePane.closePressedBackground #99e81123    javax.swing.plaf.ColorUIResource [UI]
+TitlePane.closePressedBackground #e8112399  60%    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.closePressedForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.foreground           #0000ff    javax.swing.plaf.ColorUIResource [UI]
 TitlePane.iconMargins          3,8,3,0    javax.swing.plaf.InsetsUIResource [UI]
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatAnimatedIconTest.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatAnimatedIconTest.java
@@ -196,10 +196,10 @@ public class FlatAnimatedIconTest
 			g.fillRoundRect( x, y, width, height, height, height );

 			int thumbSize = height - 4;
-			int thumbX = x + 2 + Math.round( (width - 4 - thumbSize) * animatedValue );
+			float thumbX = x + 2 + ((width - 4 - thumbSize) * animatedValue);
 			int thumbY = y + 2;
 			g.setColor( Color.white );
-			g.fillOval( thumbX, thumbY, thumbSize, thumbSize );
+			((Graphics2D)g).fill( new Ellipse2D.Float( thumbX, thumbY, thumbSize, thumbSize ) );
 		}

 		@Override
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.java
@@ -55,73 +55,111 @@ public class FlatHtmlTest

 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
-		labelLabel = new JLabel();
-		editorPaneLabel = new JLabel();
-		textPaneLabel = new JLabel();
-		toolTipLabel = new JLabel();
-		panel1 = new JPanel();
-		label5 = new JLabel();
-		label6 = new JLabel();
-		label7 = new JLabel();
-		label3 = new JLabel();
-		button1 = new JButton();
-		button2 = new JButton();
-		label11 = new JLabel();
-		toggleButton1 = new JToggleButton();
-		toggleButton2 = new JToggleButton();
-		label12 = new JLabel();
-		checkBox1 = new JCheckBox();
-		checkBox2 = new JCheckBox();
-		label13 = new JLabel();
-		radioButton1 = new JRadioButton();
-		radioButton2 = new JRadioButton();
-		label8 = new JLabel();
-		menu1 = new JMenu();
-		menu2 = new JMenu();
-		label4 = new JLabel();
-		menuItem1 = new JMenuItem();
-		menuItem2 = new JMenuItem();
-		label9 = new JLabel();
-		checkBoxMenuItem1 = new JCheckBoxMenuItem();
-		checkBoxMenuItem2 = new JCheckBoxMenuItem();
-		label10 = new JLabel();
-		radioButtonMenuItem1 = new JRadioButtonMenuItem();
-		radioButtonMenuItem2 = new JRadioButtonMenuItem();
-		label14 = new JLabel();
-		label15 = new JLabel();
-		label16 = new JLabel();
-		label17 = new JLabel();
-		comboBox1 = new JComboBox<>();
-		comboBox2 = new JComboBox<>();
-		label18 = new JLabel();
-		xHyperlink1 = new JXHyperlink();
-		xHyperlink2 = new JXHyperlink();
+		JLabel labelLabel = new JLabel();
+		JLabel editorPaneLabel = new JLabel();
+		JLabel textPaneLabel = new JLabel();
+		JLabel toolTipLabel = new JLabel();
+		JPanel panel1 = new JPanel();
+		JLabel label5 = new JLabel();
+		JLabel label6 = new JLabel();
+		JLabel label7 = new JLabel();
+		JLabel label3 = new JLabel();
+		JButton button1 = new JButton();
+		JButton button2 = new JButton();
+		JLabel label11 = new JLabel();
+		JToggleButton toggleButton1 = new JToggleButton();
+		JToggleButton toggleButton2 = new JToggleButton();
+		JLabel label12 = new JLabel();
+		JCheckBox checkBox1 = new JCheckBox();
+		JCheckBox checkBox2 = new JCheckBox();
+		JLabel label13 = new JLabel();
+		JRadioButton radioButton1 = new JRadioButton();
+		JRadioButton radioButton2 = new JRadioButton();
+		JLabel label8 = new JLabel();
+		JMenu menu1 = new JMenu();
+		JMenu menu2 = new JMenu();
+		JLabel label4 = new JLabel();
+		JMenuItem menuItem1 = new JMenuItem();
+		JMenuItem menuItem2 = new JMenuItem();
+		JLabel label9 = new JLabel();
+		JCheckBoxMenuItem checkBoxMenuItem1 = new JCheckBoxMenuItem();
+		JCheckBoxMenuItem checkBoxMenuItem2 = new JCheckBoxMenuItem();
+		JLabel label10 = new JLabel();
+		JRadioButtonMenuItem radioButtonMenuItem1 = new JRadioButtonMenuItem();
+		JRadioButtonMenuItem radioButtonMenuItem2 = new JRadioButtonMenuItem();
+		JLabel label14 = new JLabel();
+		JLabel label15 = new JLabel();
+		JLabel label16 = new JLabel();
+		JLabel label17 = new JLabel();
+		JComboBox<String> comboBox1 = new JComboBox<>();
+		JComboBox<String> comboBox2 = new JComboBox<>();
+		JLabel label18 = new JLabel();
+		JXHyperlink xHyperlink1 = new JXHyperlink();
+		JXHyperlink xHyperlink2 = new JXHyperlink();
 		label1 = new JLabel();
-		scrollPane15 = new JScrollPane();
+		JScrollPane scrollPane15 = new JScrollPane();
 		editorPane1 = new JEditorPane();
-		scrollPane16 = new JScrollPane();
+		JScrollPane scrollPane16 = new JScrollPane();
 		textPane1 = new JTextPane();
 		toolTip1 = new JToolTip();
 		label2 = new JLabel();
-		scrollPane17 = new JScrollPane();
+		JScrollPane scrollPane17 = new JScrollPane();
 		editorPane2 = new JEditorPane();
-		scrollPane18 = new JScrollPane();
+		JScrollPane scrollPane18 = new JScrollPane();
 		textPane2 = new JTextPane();
 		toolTip2 = new JToolTip();
+		panel2 = new JPanel();
+		JLabel label22 = new JLabel();
+		JLabel label19 = new JLabel();
+		JLabel label20 = new JLabel();
+		JLabel label25 = new JLabel();
+		JLabel label28 = new JLabel();
+		JLabel label31 = new JLabel();
+		JLabel label23 = new JLabel();
+		JLabel label35 = new JLabel();
+		JLabel label41 = new JLabel();
+		JLabel label37 = new JLabel();
+		JLabel label32 = new JLabel();
+		JLabel label36 = new JLabel();
+		JLabel label30 = new JLabel();
+		JLabel label29 = new JLabel();
+		JLabel label34 = new JLabel();
+		JLabel label40 = new JLabel();
+		JLabel label39 = new JLabel();
+		JLabel label49 = new JLabel();
+		JLabel label50 = new JLabel();
+		JLabel label43 = new JLabel();
+		JLabel label42 = new JLabel();
+		JLabel label51 = new JLabel();
+		JLabel label26 = new JLabel();
+		JLabel label38 = new JLabel();
+		JLabel label27 = new JLabel();
+		JLabel label45 = new JLabel();
+		JLabel label52 = new JLabel();
+		JLabel label44 = new JLabel();
+		JLabel label21 = new JLabel();
+		JLabel label24 = new JLabel();
+		JLabel label46 = new JLabel();
+		JLabel label47 = new JLabel();
+		JLabel label53 = new JLabel();
+		JLabel label48 = new JLabel();
+		JLabel label54 = new JLabel();
+		JLabel label56 = new JLabel();
+		JLabel label57 = new JLabel();

 		//======== this ========
 		setLayout(new MigLayout(
 			"ltr,insets dialog,hidemode 3",
 			// columns
-			"[fill]" +
-			"[fill]" +
-			"[fill]" +
-			"[fill]" +
+			"[grow,sizegroup 1,fill]" +
+			"[grow,sizegroup 1,fill]" +
+			"[grow,sizegroup 1,fill]" +
+			"[grow,sizegroup 1,fill]" +
 			"[fill]",
 			// rows
 			"[]" +
-			"[top]" +
-			"[top]"));
+			"[fill]" +
+			"[grow,fill]"));

 		//---- labelLabel ----
 		labelLabel.setText("JLabel:");
@@ -325,10 +363,11 @@ public class FlatHtmlTest
 			xHyperlink2.setText("Some text");
 			panel1.add(xHyperlink2, "cell 2 11");
 		}
-		add(panel1, "cell 4 0 1 3,aligny top,growy 0");
+		add(panel1, "cell 4 0 1 2,aligny top,growy 0");

 		//---- label1 ----
-		label1.setText("<html>HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a><h1>Header 1</h1><h2>Header 2</h2><h3>Header 3</h3><h4>Header 4</h4><h5>Header 5</h5><h6>Header 6</h6><p>Paragraph</p><hr><table border=\"1\"><tr><th>Col 1</th><th>Col 2</th></tr><tr><td>abc</td><td>def</td></tr></table><ul><li>item 1</li><li>item 2</li></ul></html>");
+		label1.setText("<html>HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a><h1>Header 1</h1><h2>Header 2</h2><h3>Header 3</h3><h4>Header 4</h4><h5>Header 5</h5><h6>Header 6</h6><p>Paragraph</p><address>Address</address><hr><table border=\"1\"><tr><th>Col 1</th><th>Col 2</th></tr><tr><td>abc</td><td>def</td></tr></table><ul><li>item 1</li><li>item 2</li></ul></html>");
+		label1.setVerticalAlignment(SwingConstants.TOP);
 		add(label1, "cell 0 1");

 		//======== scrollPane15 ========
@@ -357,6 +396,7 @@ public class FlatHtmlTest

 		//---- label2 ----
 		label2.setText("text");
+		label2.setVerticalAlignment(SwingConstants.TOP);
 		add(label2, "cell 0 2");

 		//======== scrollPane17 ========
@@ -367,7 +407,7 @@ public class FlatHtmlTest
 			editorPane2.setText("text");
 			scrollPane17.setViewportView(editorPane2);
 		}
-		add(scrollPane17, "cell 1 2,grow");
+		add(scrollPane17, "cell 1 2");

 		//======== scrollPane18 ========
 		{
@@ -382,6 +422,180 @@ public class FlatHtmlTest
 		//---- toolTip2 ----
 		toolTip2.setTipText("text");
 		add(toolTip2, "cell 3 2");
+
+		//======== panel2 ========
+		{
+			panel2.setLayout(new MigLayout(
+				"insets 0,hidemode 3",
+				// columns
+				"[fill]para" +
+				"[fill]" +
+				"[fill]" +
+				"[fill]" +
+				"[fill]" +
+				"[fill]" +
+				"[fill]",
+				// rows
+				"[]" +
+				"[]" +
+				"[]" +
+				"[]" +
+				"[]" +
+				"[]para" +
+				"[]para" +
+				"[]" +
+				"[]" +
+				"[]"));
+
+			//---- label22 ----
+			label22.setText("plain");
+			panel2.add(label22, "cell 0 0");
+
+			//---- label19 ----
+			label19.setText("<html><h1>h1</h1></html>");
+			panel2.add(label19, "cell 1 0");
+
+			//---- label20 ----
+			label20.setText("<html><h2>h2</h2></html>");
+			panel2.add(label20, "cell 2 0");
+
+			//---- label25 ----
+			label25.setText("<html><h3>h3</h3></html>");
+			panel2.add(label25, "cell 3 0");
+
+			//---- label28 ----
+			label28.setText("<html><h4>h4</h4></html>");
+			panel2.add(label28, "cell 4 0");
+
+			//---- label31 ----
+			label31.setText("<html><h5>h5</h5></html>");
+			panel2.add(label31, "cell 5 0");
+
+			//---- label23 ----
+			label23.setText("<html><h6>h6</h6></html>");
+			panel2.add(label23, "cell 6 0");
+
+			//---- label35 ----
+			label35.setText("plain");
+			panel2.add(label35, "cell 0 1");
+
+			//---- label41 ----
+			label41.setText("<html><strong>strong</strong></html>");
+			panel2.add(label41, "cell 1 1");
+
+			//---- label37 ----
+			label37.setText("<html><b>b</b></html>");
+			panel2.add(label37, "cell 2 1");
+
+			//---- label32 ----
+			label32.setText("<html><em>em</em></html>");
+			panel2.add(label32, "cell 3 1");
+
+			//---- label36 ----
+			label36.setText("<html><i>i</i></html>");
+			panel2.add(label36, "cell 4 1");
+
+			//---- label30 ----
+			label30.setText("<html><cite>cite</cite></html>");
+			panel2.add(label30, "cell 5 1");
+
+			//---- label29 ----
+			label29.setText("<html><dfn>dfn</dfn></html>");
+			panel2.add(label29, "cell 6 1");
+
+			//---- label34 ----
+			label34.setText("plain");
+			panel2.add(label34, "cell 0 2");
+
+			//---- label40 ----
+			label40.setText("<html><strike>strike</strike></html>");
+			panel2.add(label40, "cell 1 2");
+
+			//---- label39 ----
+			label39.setText("<html><s>s</s></html>");
+			panel2.add(label39, "cell 2 2");
+
+			//---- label49 ----
+			label49.setText("<html><body>body</body></html>");
+			panel2.add(label49, "cell 3 2");
+
+			//---- label50 ----
+			label50.setText("<html><a href=\"#\">a</a></html>");
+			panel2.add(label50, "cell 4 2");
+
+			//---- label43 ----
+			label43.setText("<html><u>u</u></html>");
+			panel2.add(label43, "cell 5 2");
+
+			//---- label42 ----
+			label42.setText("<html><var>var</var></html>");
+			panel2.add(label42, "cell 6 2");
+
+			//---- label51 ----
+			label51.setText("plain");
+			panel2.add(label51, "cell 0 3");
+
+			//---- label26 ----
+			label26.setText("<html><code>code</code></html>");
+			panel2.add(label26, "cell 1 3");
+
+			//---- label38 ----
+			label38.setText("<html><kbd>kbd</kbd></html>");
+			panel2.add(label38, "cell 2 3");
+
+			//---- label27 ----
+			label27.setText("<html><samp>samp</samp></html>");
+			panel2.add(label27, "cell 3 3");
+
+			//---- label45 ----
+			label45.setText("<html><tt>tt</tt></html>");
+			panel2.add(label45, "cell 4 3");
+
+			//---- label52 ----
+			label52.setText("plain");
+			panel2.add(label52, "cell 0 4");
+
+			//---- label44 ----
+			label44.setText("<html><pre>pre</pre></html>");
+			panel2.add(label44, "cell 1 4");
+
+			//---- label21 ----
+			label21.setText("<html><big>big</big></html>");
+			panel2.add(label21, "cell 2 4");
+
+			//---- label24 ----
+			label24.setText("<html><small>small</small></html>");
+			panel2.add(label24, "cell 3 4");
+
+			//---- label46 ----
+			label46.setText("<html><sub>sub</sub></html>");
+			panel2.add(label46, "cell 4 4");
+
+			//---- label47 ----
+			label47.setText("<html><sup>sup</sup></html>");
+			panel2.add(label47, "cell 5 4");
+
+			//---- label53 ----
+			label53.setText("plain");
+			panel2.add(label53, "cell 0 5");
+
+			//---- label48 ----
+			label48.setText("<html><address>address</address></html>");
+			panel2.add(label48, "cell 1 5");
+
+			//---- label54 ----
+			label54.setText("Test whether inserted rule affects display:");
+			panel2.add(label54, "cell 0 7 7 1");
+
+			//---- label56 ----
+			label56.setText("<html><head><style>body { color: red }</style></head>leading <big>red</big> trailing</html>");
+			panel2.add(label56, "cell 0 8 7 1");
+
+			//---- label57 ----
+			label57.setText("<html><style>body { color: red }</style><p>leading <big>red</big> trailing</p></html>");
+			panel2.add(label57, "cell 0 9 7 1");
+		}
+		add(panel2, "cell 4 2");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}

@@ -399,65 +613,29 @@ public class FlatHtmlTest
 		increaseFontSize( editorPane2, editorPane1.getFont() );
 		increaseFontSize( textPane2, textPane1.getFont() );
 		increaseFontSize( toolTip2, toolTip1.getFont() );
+
+		Font largeLabelFont = increaseFontSize( UIManager.getFont( "Label.font" ) );
+		for( Component c : panel2.getComponents() )
+			c.setFont( largeLabelFont );
 	}

 	private void increaseFontSize( JComponent c, Font baseFont ) {
-		c.setFont( baseFont.deriveFont( Font.PLAIN, baseFont.getSize() + UIScale.scale( 10f ) ) );
+		c.setFont( increaseFontSize( baseFont ) );
+	}
+
+	private Font increaseFontSize( Font baseFont ) {
+		return baseFont.deriveFont( Font.PLAIN, baseFont.getSize() + UIScale.scale( 10f ) );
 	}

 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
-	private JLabel labelLabel;
-	private JLabel editorPaneLabel;
-	private JLabel textPaneLabel;
-	private JLabel toolTipLabel;
-	private JPanel panel1;
-	private JLabel label5;
-	private JLabel label6;
-	private JLabel label7;
-	private JLabel label3;
-	private JButton button1;
-	private JButton button2;
-	private JLabel label11;
-	private JToggleButton toggleButton1;
-	private JToggleButton toggleButton2;
-	private JLabel label12;
-	private JCheckBox checkBox1;
-	private JCheckBox checkBox2;
-	private JLabel label13;
-	private JRadioButton radioButton1;
-	private JRadioButton radioButton2;
-	private JLabel label8;
-	private JMenu menu1;
-	private JMenu menu2;
-	private JLabel label4;
-	private JMenuItem menuItem1;
-	private JMenuItem menuItem2;
-	private JLabel label9;
-	private JCheckBoxMenuItem checkBoxMenuItem1;
-	private JCheckBoxMenuItem checkBoxMenuItem2;
-	private JLabel label10;
-	private JRadioButtonMenuItem radioButtonMenuItem1;
-	private JRadioButtonMenuItem radioButtonMenuItem2;
-	private JLabel label14;
-	private JLabel label15;
-	private JLabel label16;
-	private JLabel label17;
-	private JComboBox<String> comboBox1;
-	private JComboBox<String> comboBox2;
-	private JLabel label18;
-	private JXHyperlink xHyperlink1;
-	private JXHyperlink xHyperlink2;
 	private JLabel label1;
-	private JScrollPane scrollPane15;
 	private JEditorPane editorPane1;
-	private JScrollPane scrollPane16;
 	private JTextPane textPane1;
 	private JToolTip toolTip1;
 	private JLabel label2;
-	private JScrollPane scrollPane17;
 	private JEditorPane editorPane2;
-	private JScrollPane scrollPane18;
 	private JTextPane textPane2;
 	private JToolTip toolTip2;
+	private JPanel panel2;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 }
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatHtmlTest.jfd
@@ -3,10 +3,13 @@ JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
 new FormModel {
 	contentType: "form/swing"
 	root: new FormRoot {
+		auxiliary() {
+			"JavaCodeGenerator.defaultVariableLocal": true
+		}
 		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 			"$layoutConstraints": "ltr,insets dialog,hidemode 3"
-			"$columnConstraints": "[fill][fill][fill][fill][fill]"
-			"$rowConstraints": "[][top][top]"
+			"$columnConstraints": "[grow,sizegroup 1,fill][grow,sizegroup 1,fill][grow,sizegroup 1,fill][grow,sizegroup 1,fill][fill]"
+			"$rowConstraints": "[][fill][grow,fill]"
 		} ) {
 			name: "this"
 			add( new FormComponent( "javax.swing.JLabel" ) {
@@ -274,11 +277,15 @@ new FormModel {
 					"value": "cell 2 11"
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 4 0 1 3,aligny top,growy 0"
+				"value": "cell 4 0 1 2,aligny top,growy 0"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label1"
-				"text": "<html>HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a><h1>Header 1</h1><h2>Header 2</h2><h3>Header 3</h3><h4>Header 4</h4><h5>Header 5</h5><h6>Header 6</h6><p>Paragraph</p><hr><table border=\"1\"><tr><th>Col 1</th><th>Col 2</th></tr><tr><td>abc</td><td>def</td></tr></table><ul><li>item 1</li><li>item 2</li></ul></html>"
+				"text": "<html>HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a><h1>Header 1</h1><h2>Header 2</h2><h3>Header 3</h3><h4>Header 4</h4><h5>Header 5</h5><h6>Header 6</h6><p>Paragraph</p><address>Address</address><hr><table border=\"1\"><tr><th>Col 1</th><th>Col 2</th></tr><tr><td>abc</td><td>def</td></tr></table><ul><li>item 1</li><li>item 2</li></ul></html>"
+				"verticalAlignment": 1
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 1"
 			} )
@@ -288,6 +295,9 @@ new FormModel {
 					name: "editorPane1"
 					"contentType": "text/html"
 					"text": "text"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 1,grow"
@@ -298,6 +308,9 @@ new FormModel {
 					name: "textPane1"
 					"contentType": "text/html"
 					"text": "text"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 1"
@@ -305,12 +318,19 @@ new FormModel {
 			add( new FormComponent( "javax.swing.JToolTip" ) {
 				name: "toolTip1"
 				"tipText": "text"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 3 1"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "label2"
 				"text": "text"
+				"verticalAlignment": 1
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 2"
 			} )
@@ -320,9 +340,12 @@ new FormModel {
 					name: "editorPane2"
 					"contentType": "text/html"
 					"text": "text"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 2,grow"
+				"value": "cell 1 2"
 			} )
 			add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
 				name: "scrollPane18"
@@ -330,6 +353,9 @@ new FormModel {
 					name: "textPane2"
 					"contentType": "text/html"
 					"text": "text"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
 				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 2 2"
@@ -337,12 +363,249 @@ new FormModel {
 			add( new FormComponent( "javax.swing.JToolTip" ) {
 				name: "toolTip2"
 				"tipText": "text"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 3 2"
 			} )
+			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "insets 0,hidemode 3"
+				"$columnConstraints": "[fill]para[fill][fill][fill][fill][fill][fill]"
+				"$rowConstraints": "[][][][][][]para[]para[][][]"
+			} ) {
+				name: "panel2"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label22"
+					"text": "plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label19"
+					"text": "<html><h1>h1</h1></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label20"
+					"text": "<html><h2>h2</h2></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label25"
+					"text": "<html><h3>h3</h3></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label28"
+					"text": "<html><h4>h4</h4></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label31"
+					"text": "<html><h5>h5</h5></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label23"
+					"text": "<html><h6>h6</h6></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 6 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label35"
+					"text": "plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label41"
+					"text": "<html><strong>strong</strong></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label37"
+					"text": "<html><b>b</b></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label32"
+					"text": "<html><em>em</em></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label36"
+					"text": "<html><i>i</i></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label30"
+					"text": "<html><cite>cite</cite></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label29"
+					"text": "<html><dfn>dfn</dfn></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 6 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label34"
+					"text": "plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label40"
+					"text": "<html><strike>strike</strike></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label39"
+					"text": "<html><s>s</s></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label49"
+					"text": "<html><body>body</body></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label50"
+					"text": "<html><a href=\"#\">a</a></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label43"
+					"text": "<html><u>u</u></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label42"
+					"text": "<html><var>var</var></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 6 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label51"
+					"text": "plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label26"
+					"text": "<html><code>code</code></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label38"
+					"text": "<html><kbd>kbd</kbd></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label27"
+					"text": "<html><samp>samp</samp></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label45"
+					"text": "<html><tt>tt</tt></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label52"
+					"text": "plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label44"
+					"text": "<html><pre>pre</pre></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label21"
+					"text": "<html><big>big</big></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label24"
+					"text": "<html><small>small</small></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 3 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label46"
+					"text": "<html><sub>sub</sub></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 4 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label47"
+					"text": "<html><sup>sup</sup></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 5 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label53"
+					"text": "plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label48"
+					"text": "<html><address>address</address></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 5"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label54"
+					"text": "Test whether inserted rule affects display:"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7 7 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label56"
+					"text": "<html><head><style>body { color: red }</style></head>leading <big>red</big> trailing</html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 8 7 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "label57"
+					"text": "<html><style>body { color: red }</style><p>leading <big>red</big> trailing</p></html>"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 9 7 1"
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 4 2"
+			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 820, 755 )
+			"size": new java.awt.Dimension( 905, 815 )
 		} )
 	}
 }
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java
@@ -752,7 +752,9 @@ public class FlatTestFrame
 					"2.5",
 					"3",
 					"3.5",
-					"4"
+					"4",
+					"5",
+					"6"
 				}));
 				scaleFactorComboBox.setMaximumRowCount(20);
 				scaleFactorComboBox.addActionListener(e -> scaleFactorChanged());
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd
@@ -47,6 +47,8 @@ new FormModel {
 							addElement( "3" )
 							addElement( "3.5" )
 							addElement( "4" )
+							addElement( "5" )
+							addElement( "6" )
 						}
 						"maximumRowCount": 20
 						auxiliary() {
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
@@ -67,8 +67,6 @@ import com.formdev.flatlaf.testing.FlatTestLaf;
 import com.formdev.flatlaf.ui.FlatLineBorder;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.ColorFunctions.ColorFunction;
-import com.formdev.flatlaf.util.ColorFunctions.Fade;
-import com.formdev.flatlaf.util.ColorFunctions.HSLIncreaseDecrease;
 import com.formdev.flatlaf.util.DerivedColor;
 import com.formdev.flatlaf.util.StringUtils;
 import com.formdev.flatlaf.util.SystemInfo;
@@ -409,36 +407,16 @@ public class UIDefaultsDump
 			DerivedColor derivedColor = (DerivedColor) color;
 			for( ColorFunction function : derivedColor.getFunctions() ) {
 				out.print( " " );
-				dumpColorFunction( out, function );
+				out.print( function.toString() );
 			}
 		}
 	}

 	private String dumpColorHex( Color color ) {
 		boolean hasAlpha = (color.getAlpha() != 255);
-		return String.format( hasAlpha ? "#%08x" : "#%06x",
-			hasAlpha ? color.getRGB() : (color.getRGB() & 0xffffff) );
-	}
-
-	private void dumpColorFunction( PrintWriter out, ColorFunction function ) {
-		if( function instanceof HSLIncreaseDecrease ) {
-			HSLIncreaseDecrease func = (HSLIncreaseDecrease) function;
-			String name;
-			switch( func.hslIndex ) {
-				case 0: name = "spin"; break;
-				case 1: name = func.increase ? "saturate" : "desaturate"; break;
-				case 2: name = func.increase ? "lighten" : "darken"; break;
-				case 3: name = func.increase ? "fadein" : "fadeout"; break;
-				default: throw new IllegalArgumentException();
-			}
-			out.printf( "%s(%.0f%%%s%s)", name, func.amount,
-				(func.relative ? " relative" : ""),
-				(func.autoInverse ? " autoInverse" : "") );
-		} else if( function instanceof Fade ) {
-			Fade func = (Fade) function;
-			out.printf( "fade(%.0f%%)", func.amount );
-		} else
-			throw new IllegalArgumentException( "unknown color function: " + function );
+		return hasAlpha
+			? String.format( "#%06x%02x  %d%%", color.getRGB() & 0xffffff, (color.getRGB() >> 24) & 0xff, Math.round( color.getAlpha() / 2.55f ) )
+			: String.format( "#%06x", color.getRGB() & 0xffffff );
 	}

 	private void dumpFont( PrintWriter out, Font font ) {
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePropertiesSupport.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePropertiesSupport.java
@@ -179,6 +179,9 @@ class FlatThemePropertiesSupport
 		for( Object key : getProperties().keySet() )
 			allKeysCache.add( (String) key );

+		if( baseFiles == null )
+			return allKeysCache;
+
 		for( int i = 0; i < baseFiles.length; i++ ) {
 			for( Object key : getBaseProperties( i ).keySet() )
 				allKeysCache.add( (String) key );
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -24,11 +24,3 @@ include( "flatlaf-intellij-themes" )
 include( "flatlaf-demo" )
 include( "flatlaf-testing" )
 include( "flatlaf-theme-editor" )
-
-pluginManagement {
-	plugins {
-		// NOTE: keep plugin versions in sync with buildSrc/build.gradle.kts
-		id( "com.jfrog.bintray" ) version "1.8.4"
-		id( "com.jfrog.artifactory" ) version "4.13.0"
-	}
-}
Author	SHA1	Message	Date
Karl Tauber	140ebfdb92	release 1.0-rc3	2021-02-06 23:31:53 +01:00
Karl Tauber	37d0179de1	GitHub Actions: upload demo (was removed in previous commit)	2021-02-06 23:27:39 +01:00
Karl Tauber	823d4b0fe2	dropped usage of bintray, jcenter and jfrog artifactory deploy to Sonatype OSSRH snapshots are now here: https://oss.sonatype.org/content/repositories/snapshots/com/formdev/	2021-02-06 19:02:32 +01:00
Karl Tauber	dd1eacf4f0	update to Gradle 6.8.2 ./gradlew wrapper --gradle-version=6.8.2	2021-02-06 11:35:35 +01:00
Karl Tauber	86c33dd686	fixed javadoc syntax error	2021-02-06 11:26:57 +01:00
Karl Tauber	c6757cc61b	UI defaults inspector: filter by colors with alpha and derived colors	2021-02-06 01:32:32 +01:00
Karl Tauber	a38cf284dd	UI defaults inspector: show color functions in value tooltips	2021-02-06 01:31:34 +01:00
Karl Tauber	575b8e3f7f	UI defaults inspector: for derived colors, no longer change Item.value from Color to Color[] because this could cause problems if there is a UI value of type Color[]	2021-02-06 01:01:48 +01:00
Karl Tauber	bc443f47f1	Theme Editor: fixed NPE (caused by no longer implemented base files support)	2021-02-05 23:33:26 +01:00
Karl Tauber	b631bcc0db	UIDefaultsLoader: check for endless recursion in parsing color functions (e.g. `abc = darken($abc,10%)`)	2021-02-05 23:30:48 +01:00
Karl Tauber	5ccd92ece6	CheckBox: fixed background of check boxes in JIDE `CheckBoxTree` (broken since commit `dd8ab242fb`)	2021-02-04 19:41:14 +01:00
Karl Tauber	2f3c8868a7	IntelliJ Themes: fixed table header background when dragging column in "Dark Flat" and "Light Flat" themes	2021-02-04 19:18:06 +01:00
Karl Tauber	6f7b5e8005	README.md: removed JCenter and replaced download links to bintray with Maven Central	2021-02-04 16:48:53 +01:00
Karl Tauber	10d1e4b798	UIDefaultsDump: dump color value in same format as used in FlatLaf properties files; also dump alpha as percentage	2021-02-04 15:24:50 +01:00
Karl Tauber	9d5934df14	Extras: FlatInspector: use HTML in tooltip	2021-02-04 15:19:33 +01:00
Karl Tauber	be507de6c1	Label and ToolTip: made inserting BASE_SIZE rule into HTML text more reliable	2021-02-04 15:10:27 +01:00
Karl Tauber	e5d3c08821	Fixed color of `<address>` tag in HTML text	2021-02-04 12:58:14 +01:00
Karl Tauber	027b4ab7da	Label and ToolTip: fixed font sizes for `<code>`, `<kbd>`, `<big>`, `<small>` and `<samp>` tags in HTML text ToolTip: update font size if `tiptext` property changes	2021-02-04 12:56:18 +01:00
Karl Tauber	fefea0d7ec	IntelliJ Themes: updated themes to newest versions (used IJThemesUpdater)	2021-02-02 18:00:17 +01:00
Karl Tauber	33f30bfd19	README.md: new applications using FlatLaf: - DbVisualizer - MagicPlot - Thermo-Calc - Burp Suite - BurpCustomizer - IGMAS+	2021-02-01 21:58:18 +01:00
Karl Tauber	e9d4b9961a	README.md: made "commercial" bold	2021-02-01 15:14:07 +01:00
Karl Tauber	b94248fe79	README.md: removed "new" badge from projects using FlatLaf	2021-02-01 14:58:44 +01:00
Karl Tauber	225975e0dd	FlatTestFrame: added 5x and 6x scale factors	2021-02-01 13:57:36 +01:00
Karl Tauber	eac7492143	FlatAnimatedIconTest: made animation of switch smooth on high scale factors	2021-02-01 12:55:14 +01:00