release 1.1.1

natives.yml: exclude ~/.gradle/caches/modules-2/modules-2.lock from Gradle cache
support running on WinPE (issue #279 )
2026-02-11 14:37:13 -06:00 · 2021-03-28 16:04:14 +02:00 · 2021-03-26 21:52:28 +01:00 · 2021-03-26 21:51:11 +01:00 · 2021-03-26 21:44:41 +01:00 · 2021-03-25 16:14:41 +01:00
169 changed files with 15584 additions and 6802 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,8 +15,12 @@
 # BINARY FILES:
 #   Disable line ending normalize on checkin.

+*.dll binary
+*.dylib binary
 *.gif binary
 *.jar binary
+*.lib binary
 *.png binary
 *.sketch binary
+*.so binary
 *.zip binary
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,6 +33,8 @@ jobs:
    steps:
      - uses: actions/checkout@v2

+      - uses: gradle/wrapper-validation-action@v1
+
      - name: Setup Java ${{ matrix.java }}
        uses: actions/setup-java@v1
        with:
@@ -60,12 +62,7 @@ jobs:
        with:
          name: FlatLaf-build-artifacts
          path: |
-            flatlaf-core/build/libs
-            flatlaf-demo/build/libs
-            flatlaf-extras/build/libs
-            flatlaf-intellij-themes/build/libs
-            flatlaf-jide-oss/build/libs
-            flatlaf-swingx/build/libs
+            flatlaf-*/build/libs
            !**/*-javadoc.jar
            !**/*-sources.jar

@@ -75,7 +72,7 @@ jobs:
    needs: build
    if: |
      github.event_name == 'push' &&
-      github.ref == 'refs/heads/master' &&
+      github.ref == 'refs/heads/main' &&
      github.repository == 'JFormDesigner/FlatLaf'

    steps:
@@ -99,11 +96,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 +132,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/.github/workflows/natives.yml
+++ b/.github/workflows/natives.yml
@@ -0,0 +1,58 @@
+# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Native Libraries
+
+on:
+    push:
+        branches:
+            - '*'
+        tags:
+            - '[0-9]*'
+        paths:
+            - 'flatlaf-natives/flatlaf-natives-windows/**'
+            - '.github/workflows/natives.yml'
+    pull_request:
+        branches:
+            - '*'
+        paths:
+            - 'flatlaf-natives/flatlaf-natives-windows/**'
+            - '.github/workflows/natives.yml'
+
+jobs:
+    Windows:
+        runs-on: windows-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: gradle/wrapper-validation-action@v1
+
+            - name: Setup Java 1.8
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 1.8
+
+            - name: Cache Gradle wrapper
+              uses: actions/cache@v1
+              with:
+                  path: ~/.gradle/wrapper
+                  key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+            - name: Cache Gradle cache
+              uses: actions/cache@v2
+              with:
+                  path: |
+                    ~/.gradle/caches
+                    !~/.gradle/caches/modules-2/modules-2.lock
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+                  restore-keys: ${{ runner.os }}-gradle
+
+            - name: Build with Gradle
+              run: ./gradlew :flatlaf-natives-windows:build
+
+            - name: Upload artifacts
+              uses: actions/upload-artifact@v2
+              with:
+                  name: FlatLaf-natives-windows-build-artifacts
+                  path: |
+                      flatlaf-natives/flatlaf-natives-windows/build
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ out/
 *.iml
 *.ipr
 *.iws
+.vs/
+.vscode/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,105 @@
 FlatLaf Change Log
 ==================

+## 1.1.1
+
+#### New features and improvements
+
+- Native window decorations: Support disabling native window decorations per
+  window. (set client property `JRootPane.useWindowDecorations` to `false` on
+  root pane).
+- Support running on WinPE. (issue #279)
+
+#### Fixed bugs
+
+- Native window decorations: Fixed missing animations when minimizing,
+  maximizing or restoring a window using window title bar buttons. (issue #282)
+- Native window decorations: Fixed broken maximizing window when restoring frame
+  state at startup. (issue #283)
+- Native window decorations: Fixed double window title bar when first disposing
+  a window with `frame.dispose()` and then showing it again with
+  `frame.setVisible(true)`. (issue #277)
+- Custom window decorations: Fixed NPE in `FlatTitlePane.findHorizontalGlue()`.
+  (issue #275)
+- Custom window decorations: Fixed right aligned progress bar in embedded menu
+  bar was overlapping window title. (issue #272)
+- Fixed missing focus indicators in heavy-weight popups. (issue #273)
+- InternalFrame: Fixed translucent internal frame menu bar background if
+  `TitlePane.unifiedBackground` is `true`. (issue #274)
+- Extras: UI Inspector: Fixed `InaccessibleObjectException` when running in Java 16.
+
+
+## 1.1
+
+#### New features and improvements
+
+- Windows 10 only:
+  - Native window decorations for Windows 10 enables dark frame/dialog title bar
+    and embedded menu bar with all JREs, while still having native Windows 10
+    border drop shadows, resize behavior, window snapping and system window
+    menu. (PR #267)
+  - Custom window decorations: Support right aligned components in `JFrame`
+    title bar with embedded menu bar (using `Box.createHorizontalGlue()`). (PR
+    #268)
+  - Custom window decorations: Improved centering of window title with embedded
+    menu bar. (PR #268; issue #252)
+  - Custom window decorations: Support unified backgrounds for window title bar,
+    menu bar and main content. If enabled with `UIManager.put(
+    "TitlePane.unifiedBackground", true );` then window title bar and menu bar
+    use same background color as main content. (PR #268; issue #254)
+- JIDE Common Layer: Support `JideButton`, `JideLabel`, `JideSplitButton`,
+  `JideToggleButton` and `JideToggleSplitButton`.
+- JIDE Common Layer: The library on Maven Central no longer depends on
+  `com.jidesoft:jide-oss:3.6.18` to avoid problems when another JIDE library
+  should be used. (issue #270)
+- SwingX: The library on Maven Central no longer depends on
+  `org.swinglabs.swingx:swingx-all:1.6.5-1` to avoid problems when another
+  SwingX library should be used.
+- Support running in [JetBrains Projector](https://jetbrains.com/projector/).
+
+#### Fixed bugs
+
+- IntelliJ Themes: Fixed text color of CheckBoxMenuItem and RadioButtonMenuItem
+  in all "Arc" themes. (issue #259)
+
+
+## 1.0
+
+#### New features and improvements
+
+- Extras: UI Inspector: Tooltip is no longer limited to window bounds.
+
+#### Fixed bugs
+
+- TabbedPane: Custom `TabbedPane.selectedForeground` color did not work when
+  `TabbedPane.foreground` has also custom color. (issue #257)
+- FileChooser: Fixed display of date in details view if current user is selected
+  in "Look in" combobox. (Windows 10 only; issue #249)
+- Table: Fixed wrong grid line thickness in dragged column on HiDPI screens on
+  Java 9+. (issue #236)
+- PopupFactory: Fixed `NullPointerException` when `PopupFactory.getPopup()` is
+  invoked with parameter `owner` set to `null`.
+
+
+## 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)
@@ -73,11 +73,31 @@ Addons
 - [JIDE Common Layer](flatlaf-jide-oss)


+Getting started
+---------------
+
+To enable FlatLaf, add following code to your main method before you create any
+Swing component:
+
+~~~java
+FlatLightLaf.install();
+
+// create UI here...
+~~~
+
+
 Documentation
 -------------

 For more information and documentation visit
-[FlatLaf Home](https://www.formdev.com/flatlaf/)
+[FlatLaf Home](https://www.formdev.com/flatlaf/):
+
+- [Themes](https://www.formdev.com/flatlaf/themes/)
+- [Customizing](https://www.formdev.com/flatlaf/customizing/)
+- [How to Customize](https://www.formdev.com/flatlaf/how-to-customize/)
+- [Properties Files](https://www.formdev.com/flatlaf/properties-files/)
+- [Client Properties](https://www.formdev.com/flatlaf/client-properties/)
+- [System Properties](https://www.formdev.com/flatlaf/system-properties/)


 Buzz
@@ -87,22 +107,39 @@ 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)
+  [install4j](https://www.ej-technologies.com/products/install4j/overview.html)
+  9.0 (**commercial**) - the powerful multi-platform Java installer builder
+- ![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 +153,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 +187,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.1.1"
+val developmentVersion = "1.2-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-java9.gradle.kts
+++ b/buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts
@@ -27,6 +27,10 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 		}
 	}

+	dependencies {
+		add( "java9Compile", sourceSets.main.get().output )
+	}
+
 	tasks {
 		named<JavaCompile>( "compileJava9Java" ) {
 			sourceCompatibility = "9"
--- a/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts
+++ b/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts
@@ -33,9 +33,17 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 	sourceSets {
 		create( "module-info" ) {
 			java {
-				// include "src/main/java" here to get compile errors if classes are
+				// include "src/main/java" and "src/main/java9" here to get compile errors if classes are
 				// used from other modules that are not specified in module dependencies
-				setSrcDirs( listOf( "src/main/module-info", "src/main/java" ) )
+				setSrcDirs( listOf( "src/main/module-info", "src/main/java", "src/main/java9" ) )
+
+				// exclude Java 8 source file if an equally named Java 9+ source file exists
+				exclude {
+					if( it.isDirectory )
+						return@exclude false
+					val java9file = file( "${projectDir}/src/main/java9/${it.path}" )
+					java9file.exists() && java9file != it.file
+				}
 			}
 		}
 	}
@@ -48,7 +56,8 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 			dependsOn( extension.paths )

 			options.compilerArgs.add( "--module-path" )
-			options.compilerArgs.add( configurations.runtimeClasspath.get().asPath )
+			options.compilerArgs.add( configurations.runtimeClasspath.get().asPath
+				+ File.pathSeparator + configurations.compileClasspath.get().asPath )
 		}

 		jar {
--- 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/build.gradle.kts
+++ b/flatlaf-core/build.gradle.kts
@@ -27,6 +27,16 @@ java {
 }

 tasks {
+	compileJava {
+		// generate JNI headers
+		options.headerOutputDirectory.set( buildDir.resolve( "generated/jni-headers" ) )
+	}
+
+	processResources {
+		// build native libraries
+		dependsOn( ":flatlaf-natives-windows:assemble" )
+	}
+
 	jar {
 		archiveBaseName.set( "flatlaf" )

--- 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";

@@ -231,10 +231,28 @@ public interface FlatClientProperties

 	//---- JRootPane ----------------------------------------------------------

+	/**
+	 * Specifies whether FlatLaf native window decorations should be used
+	 * when creating {@code JFrame} or {@code JDialog}.
+	 * <p>
+	 * Setting this to {@code false} disables using FlatLaf native window decorations
+	 * for the window that contains the root pane. Needs to be set before showing the window.
+	 * <p>
+	 * (requires Window 10)
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JRootPane}<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 *
+	 * @since 1.1.1
+	 */
+	String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations";
+
 	/**
 	 * Specifies whether the menu bar is embedded into the title pane if custom
 	 * window decorations are enabled. Default is {@code true}.
 	 * <p>
+	 * (requires Window 10)
+	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JRootPane}<br>
 	 * <strong>Value type</strong> {@link java.lang.Boolean}
 	 */
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -38,8 +38,6 @@ import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -59,9 +57,10 @@ import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicLookAndFeel;
 import javax.swing.text.StyleContext;
 import javax.swing.text.html.HTMLEditorKit;
+import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
 import com.formdev.flatlaf.ui.FlatPopupFactory;
-import com.formdev.flatlaf.ui.JBRCustomDecorations;
 import com.formdev.flatlaf.util.GrayFilter;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.MultiResolutionImageSupport;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
@@ -74,7 +73,6 @@ import com.formdev.flatlaf.util.UIScale;
 public abstract class FlatLaf
 	extends BasicLookAndFeel
 {
-	static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() );
 	private static final String DESKTOPFONTHINTS = "awt.font.desktophints";

 	private static List<Object> customDefaultsSources;
@@ -91,9 +89,6 @@ public abstract class FlatLaf

 	private Consumer<UIDefaults> postInitialization;

-	private Boolean oldFrameWindowDecorated;
-	private Boolean oldDialogWindowDecorated;
-
 	/**
 	 * Sets the application look and feel to the given LaF
 	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
@@ -103,7 +98,7 @@ public abstract class FlatLaf
 			UIManager.setLookAndFeel( newLookAndFeel );
 			return true;
 		} catch( Exception ex ) {
-			LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize look and feel '" + newLookAndFeel.getClass().getName() + "'.", ex );
+			LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to initialize look and feel '" + newLookAndFeel.getClass().getName() + "'.", ex );
 			return false;
 		}
 	}
@@ -145,28 +140,28 @@ public abstract class FlatLaf
 	 * Returns whether FlatLaf supports custom window decorations.
 	 * This depends on the operating system and on the used Java runtime.
 	 * <p>
-	 * To use custom window decorations in your application, enable them with
-	 * following code (before creating any frames or dialogs). Then custom window
-	 * decorations are only enabled if this method returns {@code true}.
-	 * <pre>
-	 * JFrame.setDefaultLookAndFeelDecorated( true );
-	 * JDialog.setDefaultLookAndFeelDecorated( true );
-	 * </pre>
+	 * This method returns {@code true} on Windows 10 (see exception below), {@code false} otherwise.
 	 * <p>
-	 * Returns {@code true} on Windows 10, {@code false} otherwise.
-	 * <p>
-	 * Return also {@code false} if running on Windows 10 in
+	 * Returns also {@code false} on Windows 10 if:
+	 * <ul>
+	 * <li>FlatLaf native window border support is available (requires Windows 10)</li>
+	 * <li>running in
 	 * <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime 11 (or later)</a>
 	 * (<a href="https://github.com/JetBrains/JetBrainsRuntime">source code on github</a>)
-	 * and JBR supports custom window decorations. In this case, JBR custom decorations
-	 * are enabled if {@link JFrame#isDefaultLookAndFeelDecorated()} or
-	 * {@link JDialog#isDefaultLookAndFeelDecorated()} return {@code true}.
+	 * and JBR supports custom window decorations
+	 * </li>
+	 * </ul>
+	 * In this cases, custom decorations are enabled by the root pane.
+	 * Usage of {@link JFrame#setDefaultLookAndFeelDecorated(boolean)} or
+	 * {@link JDialog#setDefaultLookAndFeelDecorated(boolean)} is not necessary.
 	 */
 	@Override
 	public boolean getSupportsWindowDecorations() {
-		if( SystemInfo.isJetBrainsJVM_11_orLater &&
-			SystemInfo.isWindows_10_orLater &&
-			JBRCustomDecorations.isSupported() )
+		if( SystemInfo.isProjector || SystemInfo.isWinPE )
+			return false;
+
+		if( SystemInfo.isWindows_10_orLater &&
+			FlatNativeWindowBorder.isSupported() )
 		  return false;

 		return SystemInfo.isWindows_10_orLater;
@@ -262,19 +257,9 @@ 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 ) );
 			}
 		};
-
-		// enable/disable window decorations, but only if system property is either
-		// "true" or "false"; in other cases it is not changed
-		Boolean useWindowDecorations = FlatSystemProperties.getBooleanStrict( FlatSystemProperties.USE_WINDOW_DECORATIONS, null );
-		if( useWindowDecorations != null ) {
-			oldFrameWindowDecorated = JFrame.isDefaultLookAndFeelDecorated();
-			oldDialogWindowDecorated = JDialog.isDefaultLookAndFeelDecorated();
-			JFrame.setDefaultLookAndFeelDecorated( useWindowDecorations );
-			JDialog.setDefaultLookAndFeelDecorated( useWindowDecorations );
-		}
 	}

 	@Override
@@ -304,17 +289,9 @@ 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
-		if( oldFrameWindowDecorated != null ) {
-			JFrame.setDefaultLookAndFeelDecorated( oldFrameWindowDecorated );
-			JDialog.setDefaultLookAndFeelDecorated( oldDialogWindowDecorated );
-			oldFrameWindowDecorated = null;
-			oldDialogWindowDecorated = null;
-		}
-
 		super.uninitialize();
 	}

@@ -341,7 +318,7 @@ public abstract class FlatLaf
 			} else
 				aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance();
 		} catch( Exception ex ) {
-			LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex );
+			LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex );
 			throw new IllegalStateException();
 		}

@@ -400,6 +377,12 @@ public abstract class FlatLaf
 		initIconColors( defaults, isDark() );
 		FlatInputMaps.initInputMaps( defaults );

+		// copy InternalFrame.icon (the Java cup) to TitlePane.icon
+		// (using defaults.remove() to avoid that lazy value is resolved and icon loaded here)
+		Object icon = defaults.remove( "InternalFrame.icon" );
+		defaults.put( "InternalFrame.icon", icon );
+		defaults.put( "TitlePane.icon", icon );
+
 		// get addons and sort them by priority
 		ServiceLoader<FlatDefaultsAddon> addonLoader = ServiceLoader.load( FlatDefaultsAddon.class );
 		List<FlatDefaultsAddon> addons = new ArrayList<>();
@@ -460,7 +443,10 @@ public abstract class FlatLaf
 		FontUIResource uiFont = null;

 		if( SystemInfo.isWindows ) {
-			Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( "win.messagebox.font" );
+			// on WinPE use "win.defaultGUI.font", which is usually Tahoma,
+			// because Segoe UI font is not available on WinPE
+			Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty(
+				SystemInfo.isWinPE ? "win.defaultGUI.font" : "win.messagebox.font" );
 			if( winFont != null )
 				uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() );

@@ -499,7 +485,7 @@ public abstract class FlatLaf
 		// use active value for all fonts to allow changing fonts in all components
 		// (similar as in Nimbus L&F) with:
 		//     UIManager.put( "defaultFont", myFont );
-		Object activeFont =  new ActiveFont( 1 );
+		Object activeFont = new ActiveFont( 1 );

 		// override fonts
 		for( Object key : defaults.keySet() ) {
@@ -522,6 +508,13 @@ public abstract class FlatLaf
 		return (font instanceof FontUIResource) ? (FontUIResource) font : new FontUIResource( font );
 	}

+	/**
+	 * @since 1.1
+	 */
+	public static ActiveValue createActiveFontValue( float scaleFactor ) {
+		return new ActiveFont( scaleFactor );
+	}
+
 	/**
 	 * Adds the default color palette for action icons and object icons to the given UIDefaults.
 	 * <p>
@@ -577,7 +570,7 @@ public abstract class FlatLaf
 					.invoke( null, true );
 				defaults.put( key, value );
 			} catch( Exception ex ) {
-				Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+				LoggingFacade.INSTANCE.logSevere( null, ex );
 				throw new RuntimeException( ex );
 			}
 		}
@@ -684,7 +677,7 @@ public abstract class FlatLaf
 				// update UI
 				updateUI();
 			} catch( UnsupportedLookAndFeelException ex ) {
-				LOG.log( Level.SEVERE, "FlatLaf: Failed to reinitialize look and feel '" + lookAndFeel.getClass().getName() + "'.", ex );
+				LoggingFacade.INSTANCE.logSevere(  "FlatLaf: Failed to reinitialize look and feel '" + lookAndFeel.getClass().getName() + "'.", ex );
 			}
 		} );
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
@@ -16,9 +16,6 @@

 package com.formdev.flatlaf;

-import javax.swing.JDialog;
-import javax.swing.JFrame;
-
 /**
 * Defines/documents own system properties used in FlatLaf.
 *
@@ -58,11 +55,13 @@ public interface FlatSystemProperties
 	String USE_UBUNTU_FONT = "flatlaf.useUbuntuFont";

 	/**
-	 * Specifies whether custom look and feel window decorations should be used
+	 * Specifies whether FlatLaf native window decorations should be used
 	 * when creating {@code JFrame} or {@code JDialog}.
 	 * <p>
-	 * If this system property is set, FlatLaf invokes {@link JFrame#setDefaultLookAndFeelDecorated(boolean)}
-	 * and {@link JDialog#setDefaultLookAndFeelDecorated(boolean)} on LaF initialization.
+	 * Setting this to {@code true} forces using FlatLaf native window decorations
+	 * even if they are not enabled by the application.
+	 * <p>
+	 * Setting this to {@code false} disables using FlatLaf native window decorations.
 	 * <p>
 	 * (requires Window 10)
 	 * <p>
@@ -81,10 +80,12 @@ public interface FlatSystemProperties
 	 * Setting this to {@code true} forces using JetBrains Runtime custom window decorations
 	 * even if they are not enabled by the application.
 	 * <p>
+	 * Setting this to {@code false} disables using JetBrains Runtime custom window decorations.
+	 * <p>
 	 * (requires Window 10)
 	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
-	 * <strong>Default</strong> {@code true}
+	 * <strong>Default</strong> none
 	 */
 	String USE_JETBRAINS_CUSTOM_DECORATIONS = "flatlaf.useJetBrainsCustomDecorations";

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
@@ -30,11 +30,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
 import javax.swing.UIDefaults;
 import javax.swing.plaf.ColorUIResource;
 import com.formdev.flatlaf.json.Json;
 import com.formdev.flatlaf.json.ParseException;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.StringUtils;

 /**
@@ -76,7 +76,7 @@ public class IntelliJTheme
 		try {
 		    return FlatLaf.install( createLaf( in ) );
 		} catch( Exception ex ) {
-			FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to load IntelliJ theme", ex );
+			LoggingFacade.INSTANCE.logSevere(  "FlatLaf: Failed to load IntelliJ theme", ex );
 		    return false;
 		}
 	}
@@ -324,7 +324,7 @@ public class IntelliJTheme
 				try {
 					uiValue = UIDefaultsLoader.parseValue( key, valueStr );
 				} catch( RuntimeException ex ) {
-					UIDefaultsLoader.logParseError( Level.CONFIG, key, valueStr, ex );
+					UIDefaultsLoader.logParseError( key, valueStr, ex, false );
 					return; // ignore invalid value
 				}
 			}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java
@@ -28,7 +28,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.logging.Level;
+
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.StringUtils;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
@@ -172,7 +173,7 @@ class LinuxFontPolicy
 				if( "1".equals( strs.get( 5 ) ) )
 					style |= Font.ITALIC;
 			} catch( RuntimeException ex ) {
-				FlatLaf.LOG.log( Level.CONFIG, "FlatLaf: Failed to parse 'font=" + generalFont + "'.", ex );
+				LoggingFacade.INSTANCE.logConfig( "FlatLaf: Failed to parse 'font=" + generalFont + "'.", ex );
 			}
 		}

@@ -186,7 +187,7 @@ class LinuxFontPolicy
 				if( dpi < 50 )
 					dpi = 50;
 			} catch( NumberFormatException ex ) {
-				FlatLaf.LOG.log( Level.CONFIG, "FlatLaf: Failed to parse 'forceFontDPI=" + forceFontDPI + "'.", ex );
+				LoggingFacade.INSTANCE.logConfig( "FlatLaf: Failed to parse 'forceFontDPI=" + forceFontDPI + "'.", ex );
 			}
 		}

@@ -225,7 +226,7 @@ class LinuxFontPolicy
 			while( (line = reader.readLine()) != null )
 				lines.add( line );
 		} catch( IOException ex ) {
-			FlatLaf.LOG.log( Level.CONFIG, "FlatLaf: Failed to read '" + filename + "'.", ex );
+			LoggingFacade.INSTANCE.logConfig( "FlatLaf: Failed to read '" + filename + "'.", ex );
 		}
 		return lines;
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/MnemonicHandler.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/MnemonicHandler.java
@@ -28,6 +28,7 @@ import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.lang.ref.WeakReference;
 import javax.swing.AbstractButton;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -137,10 +138,17 @@ class MnemonicHandler
 					// get menu bar and first menu
 					Component c = e.getComponent();
 					JRootPane rootPane = SwingUtilities.getRootPane( c );
-					Window window = (rootPane != null) ? SwingUtilities.getWindowAncestor( rootPane ) : null;
 					JMenuBar menuBar = (rootPane != null) ? rootPane.getJMenuBar() : null;
-					if( menuBar == null && window instanceof JFrame )
-						menuBar = ((JFrame)window).getJMenuBar();
+					if( menuBar == null ) {
+						// get menu bar from frame/dialog because there
+						// may be multiple nested root panes in a frame/dialog
+						// (e.g. each internal frame has its own root pane)
+						Window window = SwingUtilities.getWindowAncestor( c );
+						if( window instanceof JFrame )
+							menuBar = ((JFrame)window).getJMenuBar();
+						else if( window instanceof JDialog )
+							menuBar = ((JDialog)window).getJMenuBar();
+					}
 					JMenu firstMenu = (menuBar != null) ? menuBar.getMenu( 0 ) : null;

 					// select first menu and show mnemonics
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
@@ -33,7 +33,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.function.Function;
-import java.util.logging.Level;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.UIDefaults.ActiveValue;
@@ -48,6 +47,7 @@ import com.formdev.flatlaf.util.ColorFunctions.ColorFunction;
 import com.formdev.flatlaf.util.DerivedColor;
 import com.formdev.flatlaf.util.GrayFilter;
 import com.formdev.flatlaf.util.HSLColor;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.StringUtils;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
@@ -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 )
 	{
@@ -241,16 +243,20 @@ class UIDefaultsLoader
 				try {
 					defaults.put( key, parseValue( key, value, null, resolver, addonClassLoaders ) );
 				} catch( RuntimeException ex ) {
-					logParseError( Level.SEVERE, key, value, ex );
+					logParseError( key, value, ex, true );
 				}
 			}
 		} catch( IOException ex ) {
-			FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to load properties files.", ex );
+			LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to load properties files.", ex );
 		}
 	}

-	static void logParseError( Level level, String key, String value, RuntimeException ex ) {
-		FlatLaf.LOG.log( level, "FlatLaf: Failed to parse: '" + key + '=' + value + '\'', ex );
+	static void logParseError( String key, String value, RuntimeException ex, boolean severe ) {
+		String message = "FlatLaf: Failed to parse: '" + key + '=' + value + '\'';
+		if( severe )
+			LoggingFacade.INSTANCE.logSevere( message, ex );
+		else
+			LoggingFacade.INSTANCE.logConfig( message, ex );
 	}

 	static String resolveValue( String value, Function<String, String> propertiesGetter ) {
@@ -438,7 +444,7 @@ class UIDefaultsLoader
 			try {
 				return findClass( value, addonClassLoaders ).newInstance();
 			} catch( InstantiationException | IllegalAccessException | ClassNotFoundException ex ) {
-				FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to instantiate '" + value + "'.", ex );
+				LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to instantiate '" + value + "'.", ex );
 				return null;
 			}
 		};
@@ -449,7 +455,7 @@ class UIDefaultsLoader
 			try {
 				return findClass( value, addonClassLoaders );
 			} catch( ClassNotFoundException ex ) {
-				FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: Failed to find class '" + value + "'.", ex );
+				LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to find class '" + value + "'.", ex );
 				return null;
 			}
 		};
@@ -580,19 +586,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 + "'" );
@@ -918,7 +932,7 @@ class UIDefaultsLoader

 		Object value = UIManager.get( uiKey );
 		if( value == null && !optional )
-			FlatLaf.LOG.log( Level.SEVERE, "FlatLaf: '" + uiKey + "' not found in UI defaults." );
+			LoggingFacade.INSTANCE.logSevere( "FlatLaf: '" + uiKey + "' not found in UI defaults.", null );
 		return value;
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java
@@ -17,16 +17,13 @@
 package com.formdev.flatlaf.ui;

 import static com.formdev.flatlaf.util.UIScale.scale;
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Shape;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.geom.Path2D;
 import javax.swing.JComponent;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicArrowButton;
@@ -190,73 +187,14 @@ public class FlatArrowButton
 	}

 	protected void paintArrow( Graphics2D g ) {
-		int direction = getDirection();
 		boolean vert = (direction == NORTH || direction == SOUTH);
-
-		// compute width/height
-		int w = scale( arrowWidth + (chevron ? 0 : 1) );
-		int h = scale( (arrowWidth / 2) + (chevron ? 0 : 1) );
-
-		// rotate width/height
-		int rw = vert ? w : h;
-		int rh = vert ? h : w;
-
-		// chevron lines end 1px outside of width/height
-		if( chevron ) {
-			// add 1px to width/height for position calculation only
-			rw++;
-			rh++;
-		}
-
-		int x = Math.round( (getWidth() - rw) / 2f + scale( (float) xOffset ) );
-		int y = Math.round( (getHeight() - rh) / 2f + scale( (float) yOffset ) );
+		int x = 0;

 		// move arrow for round borders
 		Container parent = getParent();
 		if( vert && parent instanceof JComponent && FlatUIUtils.hasRoundBorder( (JComponent) parent ) )
 			x -= scale( parent.getComponentOrientation().isLeftToRight() ? 1 : -1 );

-		// paint arrow
-		g.translate( x, y );
-/*debug
-		debugPaint( g, vert, rw, rh );
-debug*/
-		Shape arrowShape = createArrowShape( direction, chevron, w, h );
-		if( chevron ) {
-			g.setStroke( new BasicStroke( scale( 1f ) ) );
-			g.draw( arrowShape );
-		} else {
-			// triangle
-			g.fill( arrowShape );
-		}
-		g.translate( -x, -y );
+		FlatUIUtils.paintArrow( g, x, 0, getWidth(), getHeight(), getDirection(), chevron, arrowWidth, xOffset, yOffset );
 	}
-
-	public static Shape createArrowShape( int direction, boolean chevron, float w, float h ) {
-		switch( direction ) {
-			case NORTH:	return FlatUIUtils.createPath( !chevron, 0,h, (w / 2f),0, w,h );
-			case SOUTH:	return FlatUIUtils.createPath( !chevron, 0,0, (w / 2f),h, w,0 );
-			case WEST:	return FlatUIUtils.createPath( !chevron, h,0, 0,(w / 2f), h,w );
-			case EAST:	return FlatUIUtils.createPath( !chevron, 0,0, h,(w / 2f), 0,w );
-			default:	return new Path2D.Float();
-		}
-	}
-
-/*debug
-	private void debugPaint( Graphics g, boolean vert, int w, int h ) {
-		Color oldColor = g.getColor();
-		g.setColor( Color.red );
-		g.drawRect( 0, 0, w - 1, h - 1 );
-
-		int xy1 = -2;
-		int xy2 = h + 1;
-		for( int i = 0; i < 20; i++ ) {
-			g.drawRect( vert ? 0 : xy1, vert ? xy1 : 0, 0, 0 );
-			g.drawRect( vert ? 0 : xy2, vert ? xy2 : 0, 0, 0 );
-			xy1 -= 2;
-			xy2 += 2;
-		}
-		g.setColor( oldColor );
-	}
-debug*/
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
@@ -38,7 +38,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.ref.WeakReference;
 import javax.swing.AbstractAction;
@@ -274,30 +273,28 @@ public class FlatComboBoxUI

 	@Override
 	protected PropertyChangeListener createPropertyChangeListener() {
-		return new BasicComboBoxUI.PropertyChangeHandler() {
-			@Override
-			public void propertyChange( PropertyChangeEvent e ) {
-				super.propertyChange( e );
+		PropertyChangeListener superListener = super.createPropertyChangeListener();
+		return e -> {
+			superListener.propertyChange( e );

-				Object source = e.getSource();
-				String propertyName = e.getPropertyName();
+			Object source = e.getSource();
+			String propertyName = e.getPropertyName();

-				if( editor != null &&
-					((source == comboBox && propertyName == "foreground") ||
-					 (source == editor && propertyName == "enabled")) )
-				{
-					// fix editor component colors
-					updateEditorColors();
-				} else if( editor != null && source == comboBox && propertyName == "componentOrientation" ) {
-					ComponentOrientation o = (ComponentOrientation) e.getNewValue();
-					editor.applyComponentOrientation( o );
-				} else if( editor != null && FlatClientProperties.PLACEHOLDER_TEXT.equals( propertyName ) )
-					editor.repaint();
-				else if( FlatClientProperties.COMPONENT_ROUND_RECT.equals( propertyName ) )
-					comboBox.repaint();
-				else if( FlatClientProperties.MINIMUM_WIDTH.equals( propertyName ) )
-					comboBox.revalidate();
-			}
+			if( editor != null &&
+				((source == comboBox && propertyName == "foreground") ||
+				 (source == editor && propertyName == "enabled")) )
+			{
+				// fix editor component colors
+				updateEditorColors();
+			} else if( editor != null && source == comboBox && propertyName == "componentOrientation" ) {
+				ComponentOrientation o = (ComponentOrientation) e.getNewValue();
+				editor.applyComponentOrientation( o );
+			} else if( editor != null && FlatClientProperties.PLACEHOLDER_TEXT.equals( propertyName ) )
+				editor.repaint();
+			else if( FlatClientProperties.COMPONENT_ROUND_RECT.equals( propertyName ) )
+				comboBox.repaint();
+			else if( FlatClientProperties.MINIMUM_WIDTH.equals( propertyName ) )
+				comboBox.revalidate();
 		};
 	}

@@ -648,14 +645,12 @@ public class FlatComboBoxUI

 		@Override
 		protected PropertyChangeListener createPropertyChangeListener() {
-			return new BasicComboPopup.PropertyChangeHandler() {
-				@Override
-				public void propertyChange( PropertyChangeEvent e ) {
-					super.propertyChange( e );
+			PropertyChangeListener superListener = super.createPropertyChangeListener();
+			return e -> {
+				superListener.propertyChange( e );

-					if( e.getPropertyName() == "renderer" )
-						list.setCellRenderer( new PopupListCellRenderer() );
-				}
+				if( e.getPropertyName() == "renderer" )
+					list.setCellRenderer( new PopupListCellRenderer() );
 			};
 		}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java
@@ -31,13 +31,17 @@ import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.JToggleButton;
 import javax.swing.UIManager;
 import javax.swing.filechooser.FileView;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.metal.MetalFileChooserUI;
+import javax.swing.table.TableCellRenderer;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.ScaledImageIcon;
+import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;

 /**
@@ -190,6 +194,62 @@ public class FlatFileChooserUI
 		}
 	}

+	@Override
+	protected JPanel createDetailsView( JFileChooser fc ) {
+		JPanel p = super.createDetailsView( fc );
+
+		if( !SystemInfo.isWindows )
+			return p;
+
+		// find scroll pane
+		JScrollPane scrollPane = null;
+		for( Component c : p.getComponents() ) {
+			if( c instanceof JScrollPane ) {
+				scrollPane = (JScrollPane) c;
+				break;
+			}
+		}
+		if( scrollPane == null )
+			return p;
+
+		// get scroll view, which should be a table
+		Component view = scrollPane.getViewport().getView();
+		if( !(view instanceof JTable) )
+			return p;
+
+		JTable table = (JTable) view;
+
+		// on Windows 10, the date may contain left-to-right (0x200e) and right-to-left (0x200f)
+		// mark characters (see https://en.wikipedia.org/wiki/Left-to-right_mark)
+		// when the "current user" item is selected in the "look in" combobox
+		// --> remove them
+		TableCellRenderer defaultRenderer = table.getDefaultRenderer( Object.class );
+		table.setDefaultRenderer( Object.class, new TableCellRenderer() {
+			@Override
+			public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected,
+				boolean hasFocus, int row, int column )
+			{
+				// remove left-to-right and right-to-left mark characters
+				if( value instanceof String && ((String)value).startsWith( "\u200e" ) ) {
+					String str = (String) value;
+					char[] buf = new char[str.length()];
+					int j = 0;
+					for( int i = 0; i < buf.length; i++ ) {
+						char ch = str.charAt( i );
+						if( ch != '\u200e' && ch != '\u200f' )
+							buf[j++] = ch;
+					}
+					value = new String( buf, 0, j );
+				}
+
+				return defaultRenderer.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
+			}
+
+		} );
+
+		return p;
+	}
+
 	@Override
 	public Dimension getPreferredSize( JComponent c ) {
 		return UIScale.scale( super.getPreferredSize( c ) );
--- 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/FlatMenuBarUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarUI.java
@@ -16,17 +16,23 @@

 package com.formdev.flatlaf.ui;

+import java.awt.Graphics;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
 import javax.swing.ActionMap;
 import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
+import javax.swing.JRootPane;
+import javax.swing.LookAndFeel;
 import javax.swing.MenuElement;
 import javax.swing.MenuSelectionManager;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.plaf.ActionMapUIResource;
 import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicMenuBarUI;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.util.SystemInfo;
@@ -40,12 +46,15 @@ import com.formdev.flatlaf.util.SystemInfo;
 * @uiDefault MenuBar.background						Color
 * @uiDefault MenuBar.foreground						Color
 * @uiDefault MenuBar.border							Border
+ * @uiDefault TitlePane.unifiedBackground				boolean
 *
 * @author Karl Tauber
 */
 public class FlatMenuBarUI
 	extends BasicMenuBarUI
 {
+	protected boolean unifiedBackground;
+
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatMenuBarUI();
 	}
@@ -55,6 +64,15 @@ public class FlatMenuBarUI
 	 *          Do not add any functionality here.
 	 */

+	@Override
+	protected void installDefaults() {
+		super.installDefaults();
+
+		LookAndFeel.installProperty( menuBar, "opaque", false );
+
+		unifiedBackground = UIManager.getBoolean( "TitlePane.unifiedBackground" );
+	}
+
 	@Override
 	protected void installKeyboardActions() {
 		super.installKeyboardActions();
@@ -67,6 +85,39 @@ public class FlatMenuBarUI
 		map.put( "takeFocus", new TakeFocus() );
 	}

+	@Override
+	public void update( Graphics g, JComponent c ) {
+		// paint background
+		if( isFillBackground( c ) ) {
+			g.setColor( c.getBackground() );
+			g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
+		}
+
+		paint( g, c );
+	}
+
+	protected boolean isFillBackground( JComponent c ) {
+		// paint background if opaque or if having custom background color
+		if( c.isOpaque() || !(c.getBackground() instanceof UIResource) )
+			return true;
+
+		// paint background if menu bar is not the "main" menu bar
+		JRootPane rootPane = SwingUtilities.getRootPane( c );
+		if( rootPane == null || !(rootPane.getParent() instanceof Window) || rootPane.getJMenuBar() != c )
+			return true;
+
+		// do not paint background for unified title pane
+		if( unifiedBackground )
+			return false;
+
+		// paint background in full screen mode
+		if( FlatUIUtils.isFullScreen( rootPane ) )
+			return true;
+
+		// do not paint background if menu bar is embedded into title pane
+		return !FlatRootPaneUI.isMenuBarEmbedded( rootPane );
+	}
+
 	//---- class TakeFocus ----------------------------------------------------

 	/**
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.awt.Color;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.beans.PropertyChangeListener;
+import java.util.List;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JRootPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeListener;
+import com.formdev.flatlaf.FlatClientProperties;
+import com.formdev.flatlaf.FlatLaf;
+import com.formdev.flatlaf.FlatSystemProperties;
+import com.formdev.flatlaf.ui.JBRCustomDecorations.JBRWindowTopBorder;
+import com.formdev.flatlaf.util.SystemInfo;
+
+/**
+ * Support for custom window decorations with native window border.
+ *
+ * @author Karl Tauber
+ * @since 1.1
+ */
+public class FlatNativeWindowBorder
+{
+	// check this field before using class JBRCustomDecorations to avoid unnecessary loading of that class
+	private static final boolean canUseJBRCustomDecorations
+		= SystemInfo.isJetBrainsJVM_11_orLater && SystemInfo.isWindows_10_orLater;
+
+	private static Boolean supported;
+	private static Provider nativeProvider;
+
+	public static boolean isSupported() {
+		if( canUseJBRCustomDecorations )
+			return JBRCustomDecorations.isSupported();
+
+		initialize();
+		return supported;
+	}
+
+	static Object install( JRootPane rootPane ) {
+		if( canUseJBRCustomDecorations )
+			return JBRCustomDecorations.install( rootPane );
+
+		if( !isSupported() )
+			return null;
+
+		// Check whether root pane already has a window, which is the case when
+		// switching from another LaF to FlatLaf.
+		// Also check whether the window is displayable, which is required to install
+		// FlatLaf native window border.
+		// If the window is not displayable, then it was probably closed/disposed but not yet removed
+		// from the list of windows that AWT maintains and returns with Window.getWindows().
+		// It could be also be a window that is currently hidden, but may be shown later.
+		Window window = SwingUtilities.windowForComponent( rootPane );
+		if( window != null && window.isDisplayable() )
+			install( window, FlatSystemProperties.USE_WINDOW_DECORATIONS );
+
+		// Install FlatLaf native window border, which must be done late,
+		// when the native window is already created, because it needs access to the window.
+		// Uninstall FlatLaf native window border when window is disposed (or root pane removed).
+		// "ancestor" property change event is fired from JComponent.addNotify() and removeNotify().
+		PropertyChangeListener ancestorListener = e -> {
+			Object newValue = e.getNewValue();
+			if( newValue instanceof Window )
+				install( (Window) newValue, FlatSystemProperties.USE_WINDOW_DECORATIONS );
+			else if( newValue == null && e.getOldValue() instanceof Window )
+				uninstall( (Window) e.getOldValue() );
+		};
+		rootPane.addPropertyChangeListener( "ancestor", ancestorListener );
+		return ancestorListener;
+	}
+
+	static void install( Window window, String systemPropertyKey ) {
+		if( hasCustomDecoration( window ) )
+			return;
+
+		// do not enable native window border if LaF provides decorations
+		if( UIManager.getLookAndFeel().getSupportsWindowDecorations() )
+			return;
+
+		if( window instanceof JFrame ) {
+			JFrame frame = (JFrame) window;
+
+			// check whether disabled via client property
+			if( !FlatClientProperties.clientPropertyBoolean( frame.getRootPane(), FlatClientProperties.USE_WINDOW_DECORATIONS, true ) )
+				return;
+
+			// do not enable native window border if JFrame should use system window decorations
+			// and if not forced to use FlatLaf/JBR native window decorations
+			if( !JFrame.isDefaultLookAndFeelDecorated() &&
+				!UIManager.getBoolean( "TitlePane.useWindowDecorations" ) &&
+				!FlatSystemProperties.getBoolean( systemPropertyKey, false ) )
+			  return;
+
+			// do not enable native window border if frame is undecorated
+			if( frame.isUndecorated() )
+				return;
+
+			// enable native window border for window
+			setHasCustomDecoration( frame, true );
+
+			// enable Swing window decoration
+			frame.getRootPane().setWindowDecorationStyle( JRootPane.FRAME );
+
+		} else if( window instanceof JDialog ) {
+			JDialog dialog = (JDialog) window;
+
+			// check whether disabled via client property
+			if( !FlatClientProperties.clientPropertyBoolean( dialog.getRootPane(), FlatClientProperties.USE_WINDOW_DECORATIONS, true ) )
+				return;
+
+			// do not enable native window border if JDialog should use system window decorations
+			// and if not forced to use FlatLaf/JBR native window decorations
+			if( !JDialog.isDefaultLookAndFeelDecorated() &&
+				!UIManager.getBoolean( "TitlePane.useWindowDecorations" ) &&
+				!FlatSystemProperties.getBoolean( systemPropertyKey, false ) )
+			  return;
+
+			// do not enable native window border if dialog is undecorated
+			if( dialog.isUndecorated() )
+				return;
+
+			// enable native window border for window
+			setHasCustomDecoration( dialog, true );
+
+			// enable Swing window decoration
+			dialog.getRootPane().setWindowDecorationStyle( JRootPane.PLAIN_DIALOG );
+		}
+	}
+
+	static void uninstall( JRootPane rootPane, Object data ) {
+		if( canUseJBRCustomDecorations ) {
+			JBRCustomDecorations.uninstall( rootPane, data );
+			return;
+		}
+
+		// remove listener
+		if( data instanceof PropertyChangeListener )
+			rootPane.removePropertyChangeListener( "ancestor", (PropertyChangeListener) data );
+
+		// do not uninstall when switching to another FlatLaf theme
+		if( UIManager.getLookAndFeel() instanceof FlatLaf )
+			return;
+
+		// uninstall native window border
+		Window window = SwingUtilities.windowForComponent( rootPane );
+		if( window != null )
+			uninstall( window );
+	}
+
+	private static void uninstall( Window window ) {
+		if( !hasCustomDecoration( window ) )
+			return;
+
+		// disable native window border for window
+		setHasCustomDecoration( window, false );
+
+		if( window instanceof JFrame ) {
+			JFrame frame = (JFrame) window;
+
+			// disable Swing window decoration
+			frame.getRootPane().setWindowDecorationStyle( JRootPane.NONE );
+
+		} else if( window instanceof JDialog ) {
+			JDialog dialog = (JDialog) window;
+
+			// disable Swing window decoration
+			dialog.getRootPane().setWindowDecorationStyle( JRootPane.NONE );
+		}
+	}
+
+	public static boolean hasCustomDecoration( Window window ) {
+		if( canUseJBRCustomDecorations )
+			return JBRCustomDecorations.hasCustomDecoration( window );
+
+		if( !isSupported() )
+			return false;
+
+		return nativeProvider.hasCustomDecoration( window );
+	}
+
+	public static void setHasCustomDecoration( Window window, boolean hasCustomDecoration ) {
+		if( canUseJBRCustomDecorations ) {
+			JBRCustomDecorations.setHasCustomDecoration( window, hasCustomDecoration );
+			return;
+		}
+
+		if( !isSupported() )
+			return;
+
+		nativeProvider.setHasCustomDecoration( window, hasCustomDecoration );
+	}
+
+	static void setTitleBarHeightAndHitTestSpots( Window window, int titleBarHeight,
+		List<Rectangle> hitTestSpots, Rectangle appIconBounds )
+	{
+		if( canUseJBRCustomDecorations ) {
+			JBRCustomDecorations.setTitleBarHeightAndHitTestSpots( window, titleBarHeight, hitTestSpots );
+			return;
+		}
+
+		if( !isSupported() )
+			return;
+
+		nativeProvider.setTitleBarHeight( window, titleBarHeight );
+		nativeProvider.setTitleBarHitTestSpots( window, hitTestSpots );
+		nativeProvider.setTitleBarAppIconBounds( window, appIconBounds );
+	}
+
+	static boolean showWindow( Window window, int cmd ) {
+		if( canUseJBRCustomDecorations || !isSupported() )
+			return false;
+
+		return nativeProvider.showWindow( window, cmd );
+	}
+
+	private static void initialize() {
+		if( supported != null )
+			return;
+		supported = false;
+
+		// requires Windows 10
+		if( !SystemInfo.isWindows_10_orLater )
+			return;
+
+		// do not use when running in JetBrains Projector or WinPE
+		if( SystemInfo.isProjector || SystemInfo.isWinPE )
+			return;
+
+		// check whether disabled via system property
+		if( !FlatSystemProperties.getBoolean( FlatSystemProperties.USE_WINDOW_DECORATIONS, true ) )
+			return;
+
+		try {
+/*
+			Class<?> cls = Class.forName( "com.formdev.flatlaf.natives.jna.windows.FlatWindowsNativeWindowBorder" );
+			Method m = cls.getMethod( "getInstance" );
+			setNativeProvider( (Provider) m.invoke( null ) );
+*/
+			setNativeProvider( FlatWindowsNativeWindowBorder.getInstance() );
+		} catch( Exception ex ) {
+			// ignore
+		}
+	}
+
+	/**
+	 * @since 1.1.1
+	 */
+	public static void setNativeProvider( Provider provider ) {
+		if( nativeProvider != null )
+			throw new IllegalStateException();
+
+		nativeProvider = provider;
+		supported = (nativeProvider != null);
+	}
+
+	//---- interface Provider -------------------------------------------------
+
+	public interface Provider
+	{
+		boolean hasCustomDecoration( Window window );
+		void setHasCustomDecoration( Window window, boolean hasCustomDecoration );
+		void setTitleBarHeight( Window window, int titleBarHeight );
+		void setTitleBarHitTestSpots( Window window, List<Rectangle> hitTestSpots );
+		void setTitleBarAppIconBounds( Window window, Rectangle appIconBounds );
+
+		// commands for showWindow(); values must match Win32 API
+		// https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-showwindow
+		int SW_MAXIMIZE = 3;
+		int SW_MINIMIZE = 6;
+		int SW_RESTORE = 9;
+		boolean showWindow( Window window, int cmd );
+
+		boolean isColorizationColorAffectsBorders();
+		Color getColorizationColor();
+		int getColorizationColorBalance();
+
+		void addChangeListener( ChangeListener l );
+		void removeChangeListener( ChangeListener l );
+	}
+
+	//---- class WindowTopBorder -------------------------------------------
+
+	static class WindowTopBorder
+		extends JBRCustomDecorations.JBRWindowTopBorder
+	{
+		private static WindowTopBorder instance;
+
+		static JBRWindowTopBorder getInstance() {
+			if( canUseJBRCustomDecorations )
+				return JBRWindowTopBorder.getInstance();
+
+			if( instance == null )
+				instance = new WindowTopBorder();
+			return instance;
+		}
+
+		@Override
+		void installListeners() {
+			nativeProvider.addChangeListener( e -> {
+				update();
+
+				// repaint top borders of all windows
+				for( Window window : Window.getWindows() ) {
+					if( window.isDisplayable() )
+						window.repaint( 0, 0, window.getWidth(), 1 );
+				}
+			} );
+		}
+
+		@Override
+		boolean isColorizationColorAffectsBorders() {
+			return nativeProvider.isColorizationColorAffectsBorders();
+		}
+
+		@Override
+		Color getColorizationColor() {
+			return nativeProvider.getColorizationColor();
+		}
+
+		@Override
+		int getColorizationColorBalance() {
+			return nativeProvider.getColorizationColorBalance();
+		}
+	}
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupFactory.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupFactory.java
@@ -62,7 +62,7 @@ public class FlatPopupFactory
 	public Popup getPopup( Component owner, Component contents, int x, int y )
 		throws IllegalArgumentException
 	{
-		Point pt = fixToolTipLocation( owner, contents, x, y );
+		Point pt = fixToolTipLocation( contents, x, y );
 		if( pt != null ) {
 			x = pt.x;
 			y = pt.y;
@@ -70,7 +70,7 @@ public class FlatPopupFactory

 		boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" );

-		if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) )
+		if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) || SystemInfo.isProjector )
 			return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents );

 		// macOS and Linux adds drop shadow to heavy weight popups
@@ -111,6 +111,7 @@ public class FlatPopupFactory

 			// check whether heavy weight popup window is on same screen as owner component
 			if( popupWindow == null ||
+				owner == null ||
 				popupWindow.getGraphicsConfiguration() == owner.getGraphicsConfiguration() )
 			  return popup;

@@ -211,7 +212,7 @@ public class FlatPopupFactory
 	 * This method checks whether the current mouse location is within tooltip bounds
 	 * and corrects the y-location so that the tooltip is placed above the mouse location.
 	 */
-	private Point fixToolTipLocation( Component owner, Component contents, int x, int y ) {
+	private Point fixToolTipLocation( Component contents, int x, int y ) {
 		if( !(contents instanceof JToolTip) || !wasInvokedFromToolTipManager() )
 			return null;

@@ -450,10 +451,10 @@ public class FlatPopupFactory

 			mediumWeightShown = true;

-			Window window = SwingUtilities.windowForComponent( owner );
-			if( window == null )
+			if( owner == null )
 				return;

+			Window window = SwingUtilities.windowForComponent( owner );
 			if( !(window instanceof RootPaneContainer) )
 				return;

--- 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/FlatRootPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRootPaneUI.java
@@ -40,6 +40,7 @@ import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.plaf.BorderUIResource;
 import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.RootPaneUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicRootPaneUI;
 import com.formdev.flatlaf.FlatClientProperties;
@@ -70,16 +71,13 @@ import com.formdev.flatlaf.util.UIScale;
 public class FlatRootPaneUI
 	extends BasicRootPaneUI
 {
-	// check this field before using class JBRCustomDecorations to avoid unnecessary loading of that class
-	static final boolean canUseJBRCustomDecorations
-		= SystemInfo.isJetBrainsJVM_11_orLater && SystemInfo.isWindows_10_orLater;
-
 	protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );

 	protected JRootPane rootPane;
 	protected FlatTitlePane titlePane;
 	protected FlatWindowResizer windowResizer;

+	private Object nativeWindowBorderData;
 	private LayoutManager oldLayout;

 	public static ComponentUI createUI( JComponent c ) {
@@ -97,8 +95,7 @@ public class FlatRootPaneUI
 		else
 			installBorder();

-		if( canUseJBRCustomDecorations )
-			JBRCustomDecorations.install( rootPane );
+		nativeWindowBorderData = FlatNativeWindowBorder.install( rootPane );
 	}

 	protected void installBorder() {
@@ -113,6 +110,8 @@ public class FlatRootPaneUI
 	public void uninstallUI( JComponent c ) {
 		super.uninstallUI( c );

+		FlatNativeWindowBorder.uninstall( rootPane, nativeWindowBorderData );
+
 		uninstallClientDecorations();
 		rootPane = null;
 	}
@@ -139,10 +138,10 @@ public class FlatRootPaneUI
 	}

 	protected void installClientDecorations() {
-		boolean isJBRSupported = canUseJBRCustomDecorations && JBRCustomDecorations.isSupported();
+		boolean isNativeWindowBorderSupported = FlatNativeWindowBorder.isSupported();

 		// install border
-		if( rootPane.getWindowDecorationStyle() != JRootPane.NONE && !isJBRSupported )
+		if( rootPane.getWindowDecorationStyle() != JRootPane.NONE && !isNativeWindowBorderSupported )
 			LookAndFeel.installBorder( rootPane, "RootPane.border" );
 		else
 			LookAndFeel.uninstallBorder( rootPane );
@@ -155,7 +154,7 @@ public class FlatRootPaneUI
 		rootPane.setLayout( createRootLayout() );

 		// install window resizer
-		if( !isJBRSupported )
+		if( !isNativeWindowBorderSupported )
 			windowResizer = createWindowResizer();
 	}

@@ -229,6 +228,13 @@ public class FlatRootPaneUI
 		}
 	}

+	protected static boolean isMenuBarEmbedded( JRootPane rootPane ) {
+		RootPaneUI ui = rootPane.getUI();
+		return ui instanceof FlatRootPaneUI &&
+			((FlatRootPaneUI)ui).titlePane != null &&
+			((FlatRootPaneUI)ui).titlePane.isMenuBarEmbedded();
+	}
+
 	//---- class FlatRootLayout -----------------------------------------------

 	protected class FlatRootLayout
@@ -299,15 +305,16 @@ public class FlatRootPaneUI
 				rootPane.getGlassPane().setBounds( x, y, width, height );

 			int nextY = 0;
-			if( !isFullScreen && titlePane != null ) {
-				Dimension prefSize = titlePane.getPreferredSize();
-				titlePane.setBounds( 0, 0, width, prefSize.height );
-				nextY += prefSize.height;
+			if( titlePane != null ) {
+				int prefHeight = !isFullScreen ? titlePane.getPreferredSize().height : 0;
+				titlePane.setBounds( 0, 0, width, prefHeight );
+				nextY += prefHeight;
 			}

 			JMenuBar menuBar = rootPane.getJMenuBar();
 			if( menuBar != null && menuBar.isVisible() ) {
-				if( !isFullScreen && titlePane != null && titlePane.isMenuBarEmbedded() ) {
+				boolean embedded = !isFullScreen && titlePane != null && titlePane.isMenuBarEmbedded();
+				if( embedded ) {
 					titlePane.validate();
 					menuBar.setBounds( titlePane.getMenuBarBounds() );
 				} else {
@@ -344,6 +351,9 @@ public class FlatRootPaneUI

 	//---- class FlatWindowBorder ---------------------------------------------

+	/**
+	 * Window border used for non-native window decorations.
+	 */
 	public static class FlatWindowBorder
 		extends BorderUIResource.EmptyBorderUIResource
 	{
@@ -358,7 +368,7 @@ public class FlatRootPaneUI
 		@Override
 		public Insets getBorderInsets( Component c, Insets insets ) {
 			if( isWindowMaximized( c ) || FlatUIUtils.isFullScreen( c ) ) {
-				// hide border if window is maximized
+				// hide border if window is maximized or full screen
 				insets.top = insets.left = insets.bottom = insets.right = 0;
 				return insets;
 			} else
@@ -421,7 +431,9 @@ public class FlatRootPaneUI
 				(parent instanceof JFrame &&
 				 (((JFrame)parent).getJMenuBar() == null ||
 				  !((JFrame)parent).getJMenuBar().isVisible())) ||
-				parent instanceof JDialog;
+				(parent instanceof JDialog &&
+				 (((JDialog)parent).getJMenuBar() == null ||
+				  !((JDialog)parent).getJMenuBar().isVisible()));
 		}
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
@@ -23,7 +23,6 @@ import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Objects;
 import javax.swing.InputMap;
@@ -168,30 +167,28 @@ public class FlatScrollBarUI

 	@Override
 	protected PropertyChangeListener createPropertyChangeListener() {
-		return new BasicScrollBarUI.PropertyChangeHandler() {
-			@Override
-			public void propertyChange( PropertyChangeEvent e ) {
-				super.propertyChange( e );
+		PropertyChangeListener superListener = super.createPropertyChangeListener();
+		return e -> {
+			superListener.propertyChange( e );

-				switch( e.getPropertyName() ) {
-					case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
-						scrollbar.revalidate();
-						scrollbar.repaint();
-						break;
+			switch( e.getPropertyName() ) {
+				case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
+					scrollbar.revalidate();
+					scrollbar.repaint();
+					break;

-					case "componentOrientation":
-						// this is missing in BasicScrollBarUI.Handler.propertyChange()
-						InputMap inputMap = (InputMap) UIManager.get( "ScrollBar.ancestorInputMap" );
-						if( !scrollbar.getComponentOrientation().isLeftToRight() ) {
-							InputMap rtlInputMap = (InputMap) UIManager.get( "ScrollBar.ancestorInputMap.RightToLeft" );
-							if( rtlInputMap != null ) {
-								rtlInputMap.setParent( inputMap );
-								inputMap = rtlInputMap;
-							}
+				case "componentOrientation":
+					// this is missing in BasicScrollBarUI.Handler.propertyChange()
+					InputMap inputMap = (InputMap) UIManager.get( "ScrollBar.ancestorInputMap" );
+					if( !scrollbar.getComponentOrientation().isLeftToRight() ) {
+						InputMap rtlInputMap = (InputMap) UIManager.get( "ScrollBar.ancestorInputMap.RightToLeft" );
+						if( rtlInputMap != null ) {
+							rtlInputMap.setParent( inputMap );
+							inputMap = rtlInputMap;
 						}
-						SwingUtilities.replaceUIInputMap( scrollbar, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap );
-						break;
-				}
+					}
+					SwingUtilities.replaceUIInputMap( scrollbar, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap );
+					break;
 			}
 		};
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java
@@ -105,19 +105,17 @@ public class FlatScrollPaneUI

 	@Override
 	protected MouseWheelListener createMouseWheelListener() {
-		return new BasicScrollPaneUI.MouseWheelHandler() {
-			@Override
-			public void mouseWheelMoved( MouseWheelEvent e ) {
-				if( isSmoothScrollingEnabled() &&
-					scrollpane.isWheelScrollingEnabled() &&
-					e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL &&
-					e.getPreciseWheelRotation() != 0 &&
-					e.getPreciseWheelRotation() != e.getWheelRotation() )
-				{
-					mouseWheelMovedSmooth( e );
-				} else
-					super.mouseWheelMoved( e );
-			}
+		MouseWheelListener superListener = super.createMouseWheelListener();
+		return e -> {
+			if( isSmoothScrollingEnabled() &&
+				scrollpane.isWheelScrollingEnabled() &&
+				e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL &&
+				e.getPreciseWheelRotation() != 0 &&
+				e.getPreciseWheelRotation() != e.getWheelRotation() )
+			{
+				mouseWheelMovedSmooth( e );
+			} else
+				superListener.mouseWheelMoved( e );
 		};
 	}

@@ -239,41 +237,39 @@ public class FlatScrollPaneUI

 	@Override
 	protected PropertyChangeListener createPropertyChangeListener() {
-		return new BasicScrollPaneUI.PropertyChangeHandler() {
-			@Override
-			public void propertyChange( PropertyChangeEvent e ) {
-				super.propertyChange( e );
+		PropertyChangeListener superListener = super.createPropertyChangeListener();
+		return e -> {
+			superListener.propertyChange( e );

-				switch( e.getPropertyName() ) {
-					case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
-						JScrollBar vsb = scrollpane.getVerticalScrollBar();
-						JScrollBar hsb = scrollpane.getHorizontalScrollBar();
-						if( vsb != null ) {
-							vsb.revalidate();
-							vsb.repaint();
-						}
-						if( hsb != null ) {
-							hsb.revalidate();
-							hsb.repaint();
-						}
-						break;
-
-					case ScrollPaneConstants.LOWER_LEFT_CORNER:
-					case ScrollPaneConstants.LOWER_RIGHT_CORNER:
-					case ScrollPaneConstants.UPPER_LEFT_CORNER:
-					case ScrollPaneConstants.UPPER_RIGHT_CORNER:
-						// remove border from buttons added to corners
-						Object corner = e.getNewValue();
-						if( corner instanceof JButton &&
-							((JButton)corner).getBorder() instanceof FlatButtonBorder &&
-							scrollpane.getViewport() != null &&
-							scrollpane.getViewport().getView() instanceof JTable )
-						{
-							((JButton)corner).setBorder( BorderFactory.createEmptyBorder() );
-							((JButton)corner).setFocusable( false );
-						}
+			switch( e.getPropertyName() ) {
+				case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
+					JScrollBar vsb = scrollpane.getVerticalScrollBar();
+					JScrollBar hsb = scrollpane.getHorizontalScrollBar();
+					if( vsb != null ) {
+						vsb.revalidate();
+						vsb.repaint();
+					}
+					if( hsb != null ) {
+						hsb.revalidate();
+						hsb.repaint();
+					}
 					break;
-				}
+
+				case ScrollPaneConstants.LOWER_LEFT_CORNER:
+				case ScrollPaneConstants.LOWER_RIGHT_CORNER:
+				case ScrollPaneConstants.UPPER_LEFT_CORNER:
+				case ScrollPaneConstants.UPPER_RIGHT_CORNER:
+					// remove border from buttons added to corners
+					Object corner = e.getNewValue();
+					if( corner instanceof JButton &&
+						((JButton)corner).getBorder() instanceof FlatButtonBorder &&
+						scrollpane.getViewport() != null &&
+						scrollpane.getViewport().getView() instanceof JTable )
+					{
+						((JButton)corner).setBorder( BorderFactory.createEmptyBorder() );
+						((JButton)corner).setFocusable( false );
+					}
+				break;
 			}
 		};
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
@@ -893,7 +893,7 @@ public class FlatTabbedPaneUI
 			Color color;
 			if( tabPane.isEnabled() && tabPane.isEnabledAt( tabIndex ) ) {
 				color = tabPane.getForegroundAt( tabIndex );
-				if( isSelected && (color instanceof UIResource) && selectedForeground != null )
+				if( isSelected && selectedForeground != null && color == tabPane.getForeground() )
 					color = selectedForeground;
 			} else
 				color = disabledForeground;
@@ -1559,7 +1559,7 @@ public class FlatTabbedPaneUI
 			FlatUIUtils.paintComponentBackground( g, left, top,
 				getWidth() - left - right,
 				getHeight() - top - bottom,
-				0, scale( buttonArc ) );
+				0, scale( (float) buttonArc ) );
 		}
 	}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
@@ -33,7 +33,9 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicTableUI;
+import javax.swing.table.JTableHeader;
 import com.formdev.flatlaf.util.Graphics2DProxy;
+import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;

 /**
@@ -213,15 +215,18 @@ public class FlatTableUI
 			//   - do not paint last vertical grid line if line is on right edge of scroll pane
 			//   - fix unstable grid line thickness when scaled at 125%, 150%, 175%, 225%, ...
 			//     which paints either 1px or 2px lines depending on location
+			//   - on Java 9+, fix wrong grid line thickness in dragged column

 			boolean hideLastVerticalLine = hideLastVerticalLine();
 			int tableWidth = table.getWidth();
+			JTableHeader header = table.getTableHeader();
+			boolean isDragging = (header != null && header.getDraggedColumn() != null);

 			double systemScaleFactor = UIScale.getSystemScaleFactor( (Graphics2D) g );
 			double lineThickness = (1. / systemScaleFactor) * (int) systemScaleFactor;

 			// Java 8 uses drawLine() to paint grid lines
-			// Java 9+ uses fillRect() to paint grid lines
+			// Java 9+ uses fillRect() to paint grid lines (except for dragged column)
 			g = new Graphics2DProxy( (Graphics2D) g ) {
 				@Override
 				public void drawLine( int x1, int y1, int x2, int y2 ) {
@@ -231,6 +236,22 @@ public class FlatTableUI
 						wasInvokedFromPaintGrid() )
 					  return;

+					// on Java 9+, fix wrong grid line thickness in dragged column
+					if( isDragging &&
+						SystemInfo.isJava_9_orLater &&
+						((horizontalLines && y1 == y2) || (verticalLines && x1 == x2)) &&
+						wasInvokedFromPaintDraggedArea() )
+					{
+						if( y1 == y2 ) {
+							// horizontal grid line
+							super.fill( new Rectangle2D.Double( x1, y1, x2 - x1 + 1, lineThickness ) );
+						} else if( x1 == x2 ) {
+							// vertical grid line
+							super.fill( new Rectangle2D.Double( x1, y1, lineThickness, y2 - y1 + 1 ) );
+						}
+						return;
+					}
+
 					super.drawLine( x1, y1, x2, y2 );
 				}

@@ -258,11 +279,23 @@ public class FlatTableUI
 				}

 				private boolean wasInvokedFromPaintGrid() {
+					return wasInvokedFromMethod( "paintGrid" );
+				}
+
+				private boolean wasInvokedFromPaintDraggedArea() {
+					return wasInvokedFromMethod( "paintDraggedArea" );
+				}
+
+				private boolean wasInvokedFromMethod( String methodName ) {
 					StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
 					for( int i = 0; i < 10 || i < stackTrace.length; i++ ) {
-						if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) &&
-							"paintGrid".equals( stackTrace[i].getMethodName() ) )
-						  return true;
+						if( "javax.swing.plaf.basic.BasicTableUI".equals( stackTrace[i].getClassName() ) ) {
+							String methodName2 = stackTrace[i].getMethodName();
+							if( "paintCell".equals( methodName2 ) )
+								return false;
+							if( methodName.equals( methodName2 ) )
+								return true;
+						}
 					}
 					return false;
 				}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java
@@ -47,6 +47,7 @@ import java.util.List;
 import java.util.Objects;
 import javax.accessibility.AccessibleContext;
 import javax.swing.BorderFactory;
+import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -63,7 +64,7 @@ import javax.swing.border.AbstractBorder;
 import javax.swing.border.Border;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.FlatSystemProperties;
-import com.formdev.flatlaf.ui.JBRCustomDecorations.JBRWindowTopBorder;
+import com.formdev.flatlaf.ui.FlatNativeWindowBorder.WindowTopBorder;
 import com.formdev.flatlaf.util.ScaledImageIcon;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
@@ -77,12 +78,16 @@ import com.formdev.flatlaf.util.UIScale;
 * @uiDefault TitlePane.inactiveForeground					Color
 * @uiDefault TitlePane.embeddedForeground					Color
 * @uiDefault TitlePane.borderColor							Color	optional
+ * @uiDefault TitlePane.unifiedBackground					boolean
 * @uiDefault TitlePane.iconSize							Dimension
 * @uiDefault TitlePane.iconMargins							Insets
 * @uiDefault TitlePane.titleMargins						Insets
- * @uiDefault TitlePane.menuBarMargins						Insets
 * @uiDefault TitlePane.menuBarEmbedded						boolean
 * @uiDefault TitlePane.buttonMaximizedHeight				int
+ * @uiDefault TitlePane.centerTitle							boolean
+ * @uiDefault TitlePane.centerTitleIfMenuBarEmbedded		boolean
+ * @uiDefault TitlePane.menuBarTitleGap						int
+ * @uiDefault TitlePane.icon								Icon
 * @uiDefault TitlePane.closeIcon							Icon
 * @uiDefault TitlePane.iconifyIcon							Icon
 * @uiDefault TitlePane.maximizeIcon						Icon
@@ -100,9 +105,12 @@ public class FlatTitlePane
 	protected final Color embeddedForeground = UIManager.getColor( "TitlePane.embeddedForeground" );
 	protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );

-	protected final Insets menuBarMargins = UIManager.getInsets( "TitlePane.menuBarMargins" );
+	protected final boolean unifiedBackground = UIManager.getBoolean( "TitlePane.unifiedBackground" );
 	protected final Dimension iconSize = UIManager.getDimension( "TitlePane.iconSize" );
 	protected final int buttonMaximizedHeight = UIManager.getInt( "TitlePane.buttonMaximizedHeight" );
+	protected final boolean centerTitle = UIManager.getBoolean( "TitlePane.centerTitle" );
+	protected final boolean centerTitleIfMenuBarEmbedded = FlatUIUtils.getUIBoolean( "TitlePane.centerTitleIfMenuBarEmbedded", true );
+	protected final int menuBarTitleGap = FlatUIUtils.getUIInt( "TitlePane.menuBarTitleGap", 20 );

 	protected final JRootPane rootPane;

@@ -147,9 +155,15 @@ public class FlatTitlePane
 	protected void addSubComponents() {
 		leftPanel = new JPanel();
 		iconLabel = new JLabel();
-		titleLabel = new JLabel();
+		titleLabel = new JLabel() {
+			@Override
+			public void updateUI() {
+				setUI( new FlatTitleLabelUI() );
+			}
+		};
 		iconLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.iconMargins" ) ) );
 		titleLabel.setBorder( new FlatEmptyBorder( UIManager.getInsets( "TitlePane.titleMargins" ) ) );
+		titleLabel.setHorizontalAlignment( SwingConstants.CENTER );

 		leftPanel.setLayout( new BoxLayout( leftPanel, BoxLayout.LINE_AXIS ) );
 		leftPanel.setOpaque( false );
@@ -159,9 +173,7 @@ public class FlatTitlePane
 			@Override
 			public Dimension getPreferredSize() {
 				JMenuBar menuBar = rootPane.getJMenuBar();
-				return (menuBar != null && menuBar.isVisible() && isMenuBarEmbedded())
-					? FlatUIUtils.addInsets( menuBar.getPreferredSize(), UIScale.scale( menuBarMargins ) )
-					: new Dimension();
+				return hasVisibleEmbeddedMenuBar( menuBar ) ? menuBar.getPreferredSize() : new Dimension();
 			}
 		};
 		leftPanel.add( menuBarPlaceholder );
@@ -184,6 +196,20 @@ public class FlatTitlePane
 					if( !getComponentOrientation().isLeftToRight() )
 						leftPanel.setLocation( leftPanel.getX() + (oldWidth - newWidth), leftPanel.getY() );
 				}
+
+				// If menu bar is embedded and contains a horizontal glue component,
+				// then move the title label to the same location as the glue component
+				// and give it the same width.
+				// This allows placing any component on the trailing side of the title pane.
+				JMenuBar menuBar = rootPane.getJMenuBar();
+				if( hasVisibleEmbeddedMenuBar( menuBar ) ) {
+					Component horizontalGlue = findHorizontalGlue( menuBar );
+					if( horizontalGlue != null ) {
+						Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, titleLabel );
+						titleLabel.setBounds( titleLabel.getX() + glueLocation.x, titleLabel.getY(),
+							horizontalGlue.getWidth(), titleLabel.getHeight() );
+					}
+				}
 			}
 		} );

@@ -240,7 +266,7 @@ public class FlatTitlePane
 	}

 	protected void activeChanged( boolean active ) {
-		boolean hasEmbeddedMenuBar = rootPane.getJMenuBar() != null && rootPane.getJMenuBar().isVisible() && isMenuBarEmbedded();
+		boolean hasEmbeddedMenuBar = hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() );
 		Color background = FlatUIUtils.nonUIResource( active ? activeBackground : inactiveBackground );
 		Color foreground = FlatUIUtils.nonUIResource( active ? activeForeground : inactiveForeground );
 		Color titleForeground = (hasEmbeddedMenuBar && active) ? FlatUIUtils.nonUIResource( embeddedForeground ) : foreground;
@@ -252,8 +278,6 @@ public class FlatTitlePane
 		restoreButton.setForeground( foreground );
 		closeButton.setForeground( foreground );

-		titleLabel.setHorizontalAlignment( hasEmbeddedMenuBar ? SwingConstants.CENTER : SwingConstants.LEADING );
-
 		// this is necessary because hover/pressed colors are derived from background color
 		iconifyButton.setBackground( background );
 		maximizeButton.setBackground( background );
@@ -323,7 +347,7 @@ public class FlatTitlePane
 			iconLabel.setIcon( FlatTitlePaneIcon.create( images, iconSize ) );
 		else {
 			// no icon set on window --> use default icon
-			Icon defaultIcon = UIManager.getIcon( "InternalFrame.icon" );
+			Icon defaultIcon = UIManager.getIcon( "TitlePane.icon" );
 			if( defaultIcon != null && (defaultIcon.getIconWidth() == 0 || defaultIcon.getIconHeight() == 0) )
 				defaultIcon = null;
 			if( defaultIcon != null ) {
@@ -337,7 +361,7 @@ public class FlatTitlePane
 		// show/hide icon
 		iconLabel.setVisible( hasIcon );

-		updateJBRHitTestSpotsAndTitleBarHeightLater();
+		updateNativeTitleBarHeightAndHitTestSpotsLater();
 	}

 	@Override
@@ -355,7 +379,7 @@ public class FlatTitlePane
 			installWindowListeners();
 		}

-		updateJBRHitTestSpotsAndTitleBarHeightLater();
+		updateNativeTitleBarHeightAndHitTestSpotsLater();
 	}

 	@Override
@@ -394,6 +418,16 @@ public class FlatTitlePane
 		window.removeComponentListener( handler );
 	}

+	/**
+	 * Returns whether this title pane currently has an visible and embedded menubar.
+	 */
+	protected boolean hasVisibleEmbeddedMenuBar( JMenuBar menuBar ) {
+		return menuBar != null && menuBar.isVisible() && isMenuBarEmbedded();
+	}
+
+	/**
+	 * Returns whether the menubar should be embedded into the title pane.
+	 */
 	protected boolean isMenuBarEmbedded() {
 		// not storing value of "TitlePane.menuBarEmbedded" in class to allow changing at runtime
 		return UIManager.getBoolean( "TitlePane.menuBarEmbedded" ) &&
@@ -412,13 +446,37 @@ public class FlatTitlePane
 		Insets borderInsets = getBorder().getBorderInsets( this );
 		bounds.height += borderInsets.bottom;

-		return FlatUIUtils.subtractInsets( bounds, UIScale.scale( getMenuBarMargins() ) );
+		// If menu bar is embedded and contains a horizontal glue component,
+		// then make the menu bar wider so that it completely overlaps the title label.
+		// Since the menu bar is not opaque, the title label is still visible.
+		// The title label is moved to the location of the glue component by the layout manager.
+		// This allows placing any component on the trailing side of the title pane.
+		Component horizontalGlue = findHorizontalGlue( rootPane.getJMenuBar() );
+		if( horizontalGlue != null ) {
+			boolean leftToRight = getComponentOrientation().isLeftToRight();
+			int titleWidth = leftToRight
+				? buttonPanel.getX() - (leftPanel.getX() + leftPanel.getWidth())
+				: leftPanel.getX() - (buttonPanel.getX() + buttonPanel.getWidth());
+			titleWidth = Math.max( titleWidth, 0 ); // title width may be negative
+			bounds.width += titleWidth;
+			if( !leftToRight )
+				bounds.x -= titleWidth;
+		}
+
+		return bounds;
 	}

-	protected Insets getMenuBarMargins() {
-		return getComponentOrientation().isLeftToRight()
-			? menuBarMargins
-			: new Insets( menuBarMargins.top, menuBarMargins.right, menuBarMargins.bottom, menuBarMargins.left );
+	protected Component findHorizontalGlue( JMenuBar menuBar ) {
+		if( menuBar == null )
+			return null;
+
+		int count = menuBar.getComponentCount();
+		for( int i = count - 1; i >= 0; i-- ) {
+			Component c = menuBar.getComponent( i );
+			if( c instanceof Box.Filler && c.getMaximumSize().width >= Short.MAX_VALUE )
+				return c;
+		}
+		return null;
 	}

 	protected void menuBarChanged() {
@@ -435,7 +493,8 @@ public class FlatTitlePane
 	}

 	protected void menuBarLayouted() {
-		updateJBRHitTestSpotsAndTitleBarHeightLater();
+		updateNativeTitleBarHeightAndHitTestSpotsLater();
+		revalidate();
 	}

 /*debug
@@ -449,16 +508,25 @@ public class FlatTitlePane
 		}
 		if( debugHitTestSpots != null ) {
 			g.setColor( Color.blue );
+			Point offset = SwingUtilities.convertPoint( this, 0, 0, window );
 			for( Rectangle r : debugHitTestSpots )
-				g.drawRect( r.x, r.y, r.width, r.height );
+				g.drawRect( r.x - offset.x, r.y - offset.y, r.width - 1, r.height - 1 );
+		}
+		if( debugAppIconBounds != null ) {
+			g.setColor( Color.red );
+			Point offset = SwingUtilities.convertPoint( this, 0, 0, window );
+			Rectangle r = debugAppIconBounds;
+			g.drawRect( r.x - offset.x, r.y - offset.y, r.width - 1, r.height - 1 );
 		}
 	}
 debug*/

 	@Override
 	protected void paintComponent( Graphics g ) {
-		g.setColor( getBackground() );
-		g.fillRect( 0, 0, getWidth(), getHeight() );
+		if( !unifiedBackground ) {
+			g.setColor( getBackground() );
+			g.fillRect( 0, 0, getWidth(), getHeight() );
+		}
 	}

 	protected void repaintWindowBorder() {
@@ -475,10 +543,12 @@ debug*/
 	 * Iconifies the window.
 	 */
 	protected void iconify() {
-		if( window instanceof Frame ) {
-			Frame frame = (Frame) window;
+		if( !(window instanceof Frame) )
+			return;
+
+		Frame frame = (Frame) window;
+		if( !FlatNativeWindowBorder.showWindow( window, FlatNativeWindowBorder.Provider.SW_MINIMIZE ) )
 			frame.setExtendedState( frame.getExtendedState() | Frame.ICONIFIED );
-		}
 	}

 	/**
@@ -496,16 +566,17 @@ debug*/
 		rootPane.putClientProperty( "_flatlaf.maximizedBoundsUpToDate", true );

 		// maximize window
-		frame.setExtendedState( frame.getExtendedState() | Frame.MAXIMIZED_BOTH );
+		if( !FlatNativeWindowBorder.showWindow( frame, FlatNativeWindowBorder.Provider.SW_MAXIMIZE ) )
+			frame.setExtendedState( frame.getExtendedState() | Frame.MAXIMIZED_BOTH );
 	}

 	protected void updateMaximizedBounds() {
 		Frame frame = (Frame) window;

 		// set maximized bounds to avoid that maximized window overlaps Windows task bar
-		// (if not running in JBR and if not modified from the application)
+		// (if not having native window border and if not modified from the application)
 		Rectangle oldMaximizedBounds = frame.getMaximizedBounds();
-		if( !hasJBRCustomDecoration() &&
+		if( !hasNativeCustomDecoration() &&
 			(oldMaximizedBounds == null ||
 			 Objects.equals( oldMaximizedBounds, rootPane.getClientProperty( "_flatlaf.maximizedBounds" ) )) )
 		{
@@ -584,8 +655,11 @@ debug*/
 	 * Restores the window size.
 	 */
 	protected void restore() {
-		if( window instanceof Frame ) {
-			Frame frame = (Frame) window;
+		if( !(window instanceof Frame) )
+			return;
+
+		Frame frame = (Frame) window;
+		if( !FlatNativeWindowBorder.showWindow( window, FlatNativeWindowBorder.Provider.SW_RESTORE ) ) {
 			int state = frame.getExtendedState();
 			frame.setExtendedState( ((state & Frame.ICONIFIED) != 0)
 				? (state & ~Frame.ICONIFIED)
@@ -601,65 +675,118 @@ debug*/
 			window.dispatchEvent( new WindowEvent( window, WindowEvent.WINDOW_CLOSING ) );
 	}

-	protected boolean hasJBRCustomDecoration() {
-		return FlatRootPaneUI.canUseJBRCustomDecorations &&
-			window != null &&
-			JBRCustomDecorations.hasCustomDecoration( window );
+	private boolean hasJBRCustomDecoration() {
+		return window != null && JBRCustomDecorations.hasCustomDecoration( window );
 	}

-	protected void updateJBRHitTestSpotsAndTitleBarHeightLater() {
+	/**
+	 * Returns whether windows uses native window border and has custom decorations enabled.
+	 */
+	protected boolean hasNativeCustomDecoration() {
+		return window != null && FlatNativeWindowBorder.hasCustomDecoration( window );
+	}
+
+	protected void updateNativeTitleBarHeightAndHitTestSpotsLater() {
 		EventQueue.invokeLater( () -> {
-			updateJBRHitTestSpotsAndTitleBarHeight();
+			updateNativeTitleBarHeightAndHitTestSpots();
 		} );
 	}

-	protected void updateJBRHitTestSpotsAndTitleBarHeight() {
+	protected void updateNativeTitleBarHeightAndHitTestSpots() {
 		if( !isDisplayable() )
 			return;

-		if( !hasJBRCustomDecoration() )
+		if( !hasNativeCustomDecoration() )
 			return;

-		List<Rectangle> hitTestSpots = new ArrayList<>();
-		if( iconLabel.isVisible() )
-			addJBRHitTestSpot( iconLabel, false, hitTestSpots );
-		addJBRHitTestSpot( buttonPanel, false, hitTestSpots );
-		addJBRHitTestSpot( menuBarPlaceholder, true, hitTestSpots );
-
 		int titleBarHeight = getHeight();
 		// slightly reduce height so that component receives mouseExit events
 		if( titleBarHeight > 0 )
 			titleBarHeight--;

-		JBRCustomDecorations.setHitTestSpotsAndTitleBarHeight( window, hitTestSpots, titleBarHeight );
+		List<Rectangle> hitTestSpots = new ArrayList<>();
+		Rectangle appIconBounds = null;
+		if( iconLabel.isVisible() ) {
+			// compute real icon size (without insets)
+			Point location = SwingUtilities.convertPoint( iconLabel, 0, 0, window );
+			Insets iconInsets = iconLabel.getInsets();
+			Rectangle iconBounds = new Rectangle(
+				location.x + iconInsets.left,
+				location.y + iconInsets.top,
+				iconLabel.getWidth() - iconInsets.left - iconInsets.right,
+				iconLabel.getHeight() - iconInsets.top - iconInsets.bottom );
+
+			if( hasJBRCustomDecoration() )
+				hitTestSpots.add( iconBounds );
+			else
+				appIconBounds = iconBounds;
+		}
+
+		Rectangle r = getNativeHitTestSpot( buttonPanel );
+		if( r != null )
+			hitTestSpots.add( r );
+
+		JMenuBar menuBar = rootPane.getJMenuBar();
+		if( hasVisibleEmbeddedMenuBar( menuBar ) ) {
+			r = getNativeHitTestSpot( menuBarPlaceholder );
+			if( r != null ) {
+				Component horizontalGlue = findHorizontalGlue( menuBar );
+				if( horizontalGlue != null ) {
+					// If menu bar is embedded and contains a horizontal glue component,
+					// then split the hit test spot into two spots so that
+					// the glue component area can used to move the window.
+
+					Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, window );
+					Rectangle r2;
+					if( getComponentOrientation().isLeftToRight() ) {
+						int trailingWidth = (r.x + r.width - HIT_TEST_SPOT_GROW) - glueLocation.x;
+						r.width -= trailingWidth;
+						r2 = new Rectangle( glueLocation.x + horizontalGlue.getWidth(), r.y, trailingWidth, r.height );
+					} else {
+						int leadingWidth = (glueLocation.x + horizontalGlue.getWidth()) - (r.x + HIT_TEST_SPOT_GROW);
+						r.x += leadingWidth;
+						r.width -= leadingWidth;
+						r2 = new Rectangle( glueLocation.x -leadingWidth, r.y, leadingWidth, r.height );
+					}
+					r2.grow( HIT_TEST_SPOT_GROW, HIT_TEST_SPOT_GROW );
+					hitTestSpots.add( r2 );
+				}
+
+				hitTestSpots.add( r );
+			}
+		}
+
+		FlatNativeWindowBorder.setTitleBarHeightAndHitTestSpots( window, titleBarHeight, hitTestSpots, appIconBounds );

 /*debug
-		debugHitTestSpots = hitTestSpots;
 		debugTitleBarHeight = titleBarHeight;
+		debugHitTestSpots = hitTestSpots;
+		debugAppIconBounds = appIconBounds;
 		repaint();
 debug*/
 	}

-	protected void addJBRHitTestSpot( JComponent c, boolean subtractMenuBarMargins, List<Rectangle> hitTestSpots ) {
+	protected Rectangle getNativeHitTestSpot( JComponent c ) {
 		Dimension size = c.getSize();
 		if( size.width <= 0 || size.height <= 0 )
-			return;
+			return null;

 		Point location = SwingUtilities.convertPoint( c, 0, 0, window );
 		Rectangle r = new Rectangle( location, size );
-		if( subtractMenuBarMargins )
-			r = FlatUIUtils.subtractInsets( r, UIScale.scale( getMenuBarMargins() ) );
 		// slightly increase rectangle so that component receives mouseExit events
-		r.grow( 2, 2 );
-		hitTestSpots.add( r );
+		r.grow( HIT_TEST_SPOT_GROW, HIT_TEST_SPOT_GROW );
+		return r;
 	}

+	private static final int HIT_TEST_SPOT_GROW = 2;
+
 /*debug
-	private List<Rectangle> debugHitTestSpots;
 	private int debugTitleBarHeight;
+	private List<Rectangle> debugHitTestSpots;
+	private Rectangle debugAppIconBounds;
 debug*/

-	//---- class TitlePaneBorder ----------------------------------------------
+	//---- class FlatTitlePaneBorder ------------------------------------------

 	protected class FlatTitlePaneBorder
 		extends AbstractBorder
@@ -676,8 +803,8 @@ debug*/
 			} else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) )
 				insets.bottom += UIScale.scale( 1 );

-			if( hasJBRCustomDecoration() )
-				insets = FlatUIUtils.addInsets( insets, JBRWindowTopBorder.getInstance().getBorderInsets() );
+			if( hasNativeCustomDecoration() )
+				insets = FlatUIUtils.addInsets( insets, WindowTopBorder.getInstance().getBorderInsets() );

 			return insets;
 		}
@@ -695,13 +822,51 @@ debug*/
 				FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight );
 			}

-			if( hasJBRCustomDecoration() )
-				JBRWindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height );
+			if( hasNativeCustomDecoration() )
+				WindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height );
 		}

 		protected Border getMenuBarBorder() {
 			JMenuBar menuBar = rootPane.getJMenuBar();
-			return (menuBar != null && menuBar.isVisible() && isMenuBarEmbedded()) ? menuBar.getBorder() : null;
+			return hasVisibleEmbeddedMenuBar( menuBar ) ? menuBar.getBorder() : null;
+		}
+	}
+
+	//---- class FlatTitleLabelUI ---------------------------------------------
+
+	/**
+	 * @since 1.1
+	 */
+	protected class FlatTitleLabelUI
+		extends FlatLabelUI
+	{
+		@Override
+		protected void paintEnabledText( JLabel l, Graphics g, String s, int textX, int textY ) {
+			boolean hasEmbeddedMenuBar = hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() );
+			int labelWidth = l.getWidth();
+			int textWidth = labelWidth - (textX * 2);
+			int gap = UIScale.scale( menuBarTitleGap );
+
+			// The passed in textX coordinate is always to horizontally center the text within the label bounds.
+			// Modify textX so that the text is painted either centered within the window bounds or leading aligned.
+			boolean center = hasEmbeddedMenuBar ? centerTitleIfMenuBarEmbedded : centerTitle;
+			if( center ) {
+				// If window is wide enough, center title within window bounds.
+				// Otherwise leave it centered within free space (label bounds).
+				int centeredTextX = ((l.getParent().getWidth() - textWidth) / 2) - l.getX();
+				if( centeredTextX >= gap && centeredTextX + textWidth <= labelWidth - gap )
+					textX = centeredTextX;
+			} else {
+				// leading aligned
+				boolean leftToRight = getComponentOrientation().isLeftToRight();
+				Insets insets = l.getInsets();
+				int leadingInset = hasEmbeddedMenuBar ? gap : (leftToRight ? insets.left : insets.right);
+				int leadingTextX = leftToRight ? leadingInset : labelWidth - leadingInset - textWidth;
+				if( leftToRight ? leadingTextX < textX : leadingTextX > textX )
+					textX = leadingTextX;
+			}
+
+			super.paintEnabledText( l, g, s, textX, textY );
 		}
 	}

@@ -730,7 +895,7 @@ debug*/
 					break;

 				case "componentOrientation":
-					updateJBRHitTestSpotsAndTitleBarHeightLater();
+					updateNativeTitleBarHeightAndHitTestSpotsLater();
 					break;
 			}
 		}
@@ -740,10 +905,10 @@ debug*/
 		@Override
 		public void windowActivated( WindowEvent e ) {
 			activeChanged( true );
-			updateJBRHitTestSpotsAndTitleBarHeight();
+			updateNativeTitleBarHeightAndHitTestSpots();

-			if( hasJBRCustomDecoration() )
-				JBRWindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );
+			if( hasNativeCustomDecoration() )
+				WindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );

 			repaintWindowBorder();
 		}
@@ -751,10 +916,10 @@ debug*/
 		@Override
 		public void windowDeactivated( WindowEvent e ) {
 			activeChanged( false );
-			updateJBRHitTestSpotsAndTitleBarHeight();
+			updateNativeTitleBarHeightAndHitTestSpots();

-			if( hasJBRCustomDecoration() )
-				JBRWindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );
+			if( hasNativeCustomDecoration() )
+				WindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );

 			repaintWindowBorder();
 		}
@@ -762,7 +927,7 @@ debug*/
 		@Override
 		public void windowStateChanged( WindowEvent e ) {
 			frameStateChanged();
-			updateJBRHitTestSpotsAndTitleBarHeight();
+			updateNativeTitleBarHeightAndHitTestSpots();
 		}

 		//---- interface MouseListener ----
@@ -775,7 +940,7 @@ debug*/
 				if( e.getSource() == iconLabel ) {
 					// double-click on icon closes window
 					close();
-				} else if( !hasJBRCustomDecoration() &&
+				} else if( !hasNativeCustomDecoration() &&
 					window instanceof Frame &&
 					((Frame)window).isResizable() )
 				{
@@ -808,8 +973,8 @@ debug*/
 			if( window == null )
 				return; // should newer occur

-			if( hasJBRCustomDecoration() )
-				return; // do nothing if running in JBR
+			if( hasNativeCustomDecoration() )
+				return; // do nothing if having native window border

 			// restore window if it is maximized
 			if( window instanceof Frame ) {
@@ -852,7 +1017,7 @@ debug*/

 		@Override
 		public void componentResized( ComponentEvent e ) {
-			updateJBRHitTestSpotsAndTitleBarHeightLater();
+			updateNativeTitleBarHeightAndHitTestSpotsLater();
 		}

 		@Override
--- 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/ui/FlatTreeUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java
@@ -25,7 +25,6 @@ import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import javax.swing.CellRendererPane;
 import javax.swing.Icon;
@@ -193,40 +192,38 @@ public class FlatTreeUI

 	@Override
 	protected PropertyChangeListener createPropertyChangeListener() {
-		return new BasicTreeUI.PropertyChangeHandler() {
-			@Override
-			public void propertyChange( PropertyChangeEvent e ) {
-				super.propertyChange( e );
+		PropertyChangeListener superListener = super.createPropertyChangeListener();
+		return e -> {
+			superListener.propertyChange( e );

-				if( e.getSource() == tree ) {
-					switch( e.getPropertyName() ) {
-						case TREE_WIDE_SELECTION:
-						case TREE_PAINT_SELECTION:
-							tree.repaint();
-							break;
+			if( e.getSource() == tree ) {
+				switch( e.getPropertyName() ) {
+					case TREE_WIDE_SELECTION:
+					case TREE_PAINT_SELECTION:
+						tree.repaint();
+						break;

-						case "dropLocation":
-							if( isWideSelection() ) {
-								JTree.DropLocation oldValue = (JTree.DropLocation) e.getOldValue();
-								repaintWideDropLocation( oldValue );
-								repaintWideDropLocation( tree.getDropLocation() );
-							}
-							break;
-					}
+					case "dropLocation":
+						if( isWideSelection() ) {
+							JTree.DropLocation oldValue = (JTree.DropLocation) e.getOldValue();
+							repaintWideDropLocation( oldValue );
+							repaintWideDropLocation( tree.getDropLocation() );
+						}
+						break;
 				}
 			}
-
-			private void repaintWideDropLocation(JTree.DropLocation loc) {
-				if( loc == null || isDropLine( loc ) )
-					return;
-
-				Rectangle r = tree.getPathBounds( loc.getPath() );
-				if( r != null )
-					tree.repaint( 0, r.y, tree.getWidth(), r.height );
-			}
 		};
 	}

+	private void repaintWideDropLocation(JTree.DropLocation loc) {
+		if( loc == null || isDropLine( loc ) )
+			return;
+
+		Rectangle r = tree.getPathBounds( loc.getPath() );
+		if( r != null )
+			tree.repaint( 0, r.y, tree.getWidth(), r.height );
+	}
+
 	/**
 	 * Same as super.paintRow(), but supports wide selection and uses
 	 * inactive selection background/foreground if tree is not focused.
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
@@ -16,6 +16,7 @@

 package com.formdev.flatlaf.ui;

+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -30,6 +31,7 @@ import java.awt.KeyboardFocusManager;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
+import java.awt.Stroke;
 import java.awt.Window;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -44,6 +46,7 @@ import java.util.function.Supplier;
 import javax.swing.JComponent;
 import javax.swing.JTable;
 import javax.swing.LookAndFeel;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
@@ -119,6 +122,14 @@ public class FlatUIUtils
 		return (color != null) ? color : UIManager.getColor( defaultKey );
 	}

+	/**
+	 * @since 1.1
+	 */
+	public static boolean getUIBoolean( String key, boolean defaultValue ) {
+		Object value = UIManager.get( key );
+		return (value instanceof Boolean) ? (Boolean) value : defaultValue;
+	}
+
 	public static int getUIInt( String key, int defaultValue ) {
 		Object value = UIManager.get( key );
 		return (value instanceof Integer) ? (Integer) value : defaultValue;
@@ -174,7 +185,8 @@ public class FlatUIUtils

 	/**
 	 * Returns whether the given component is the permanent focus owner and
-	 * is in the active window. Used to paint focus indicators.
+	 * is in the active window or in a popup window owned by the active window.
+	 * Used to paint focus indicators.
 	 */
 	@SuppressWarnings( "unchecked" )
 	public static boolean isPermanentFocusOwner( Component c ) {
@@ -184,12 +196,18 @@ public class FlatUIUtils
 			Object value = ((JComponent)c).getClientProperty( FlatClientProperties.COMPONENT_FOCUS_OWNER );
 			if( value instanceof Predicate ) {
 				return ((Predicate<JComponent>)value).test( (JComponent) c ) &&
-					keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c );
+					isInActiveWindow( c, keyboardFocusManager.getActiveWindow() );
 			}
 		}

 		return keyboardFocusManager.getPermanentFocusOwner() == c &&
-			keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c );
+			isInActiveWindow( c, keyboardFocusManager.getActiveWindow() );
+	}
+
+	private static boolean isInActiveWindow( Component c, Window activeWindow ) {
+		Window window = SwingUtilities.windowForComponent( c );
+		return window == activeWindow ||
+			(window != null && window.getType() == Window.Type.POPUP && window.getOwner() == activeWindow);
 	}

 	/**
@@ -604,6 +622,111 @@ public class FlatUIUtils
 		return rect;
 	}

+	/**
+	 * Paints a chevron or triangle arrow in the center of the given rectangle.
+	 *
+	 * @param g the graphics context used for painting
+	 * @param x the x coordinate of the rectangle
+	 * @param y the y coordinate of the rectangle
+	 * @param width the width of the rectangle
+	 * @param height the height of the rectangle
+	 * @param direction the arrow direction ({@link SwingConstants#NORTH}, {@link SwingConstants#SOUTH}
+	 *        {@link SwingConstants#WEST} or {@link SwingConstants#EAST})
+	 * @param chevron {@code true} for chevron arrow, {@code false} for triangle arrow
+	 * @param arrowSize the width of the painted arrow (for vertical direction) (will be scaled)
+	 * @param xOffset a offset added to the x coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
+	 * @param yOffset a offset added to the y coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
+	 *
+	 * @since 1.1
+	 */
+	public static void paintArrow( Graphics2D g, int x, int y, int width, int height,
+		int direction, boolean chevron, int arrowSize, int xOffset, int yOffset )
+	{
+		// compute arrow width/height
+		int aw = UIScale.scale( arrowSize + (chevron ? 0 : 1) );
+		int ah = UIScale.scale( (arrowSize / 2) + (chevron ? 0 : 1) );
+
+		// rotate arrow width/height for horizontal directions
+		boolean vert = (direction == SwingConstants.NORTH || direction == SwingConstants.SOUTH);
+		if( !vert ) {
+			int temp = aw;
+			aw = ah;
+			ah = temp;
+		}
+
+		// chevron lines end 1px outside of width/height
+		// --> add 1px to arrow width/height for position calculation
+		int extra = chevron ? 1 : 0;
+
+		// compute arrow location
+		int ax = x + Math.round( ((width - (aw + extra)) / 2f) + UIScale.scale( (float) xOffset ) );
+		int ay = y + Math.round( ((height - (ah + extra)) / 2f) + UIScale.scale( (float) yOffset ) );
+
+		// paint arrow
+		g.translate( ax, ay );
+/*debug
+		debugPaintArrow( g, Color.red, vert, aw + extra, ah + extra );
+debug*/
+		Shape arrowShape = createArrowShape( direction, chevron, aw, ah );
+		if( chevron ) {
+			Stroke oldStroke = g.getStroke();
+			g.setStroke( new BasicStroke( UIScale.scale( 1f ) ) );
+			g.draw( arrowShape );
+			g.setStroke( oldStroke );
+		} else {
+			// triangle
+			g.fill( arrowShape );
+		}
+		g.translate( -ax, -ay );
+	}
+
+	/**
+	 * Creates a chevron or triangle arrow shape for the given direction and size.
+	 * <p>
+	 * The chevron shape is a open path that can be painted with {@link Graphics2D#draw(Shape)}.
+	 * The triangle shape is a close path that can be painted with {@link Graphics2D#fill(Shape)}.
+	 *
+	 * @param direction the arrow direction ({@link SwingConstants#NORTH}, {@link SwingConstants#SOUTH}
+	 *        {@link SwingConstants#WEST} or {@link SwingConstants#EAST})
+	 * @param chevron {@code true} for chevron arrow, {@code false} for triangle arrow
+	 * @param w the width of the returned shape
+	 * @param h the height of the returned shape
+	 *
+	 * @since 1.1
+	 */
+	public static Shape createArrowShape( int direction, boolean chevron, float w, float h ) {
+		switch( direction ) {
+			case SwingConstants.NORTH:	return createPath( !chevron, 0,h, (w / 2f),0, w,h );
+			case SwingConstants.SOUTH:	return createPath( !chevron, 0,0, (w / 2f),h, w,0 );
+			case SwingConstants.WEST:	return createPath( !chevron, w,0, 0,(h / 2f), w,h );
+			case SwingConstants.EAST:	return createPath( !chevron, 0,0, w,(h / 2f), 0,h );
+			default:					return new Path2D.Float();
+		}
+	}
+
+/*debug
+	private static void debugPaintArrow( Graphics2D g, Color color, boolean vert, int w, int h ) {
+		Color oldColor = g.getColor();
+		g.setColor( color );
+		g.fill( createRectangle( 0, 0, w, h, 1 ) );
+
+		int xy1 = -2;
+		int x2 = w + 1;
+		int y2 = h + 1;
+		for( int i = 0; i < 20; i++ ) {
+			g.fillRect( 0, xy1, 1, 1 );
+			g.fillRect( 0, y2, 1, 1 );
+			g.fillRect( xy1, 0, 1, 1 );
+			g.fillRect( x2, 0, 1, 1 );
+			xy1 -= 2;
+			x2 += 2;
+			y2 += 2;
+		}
+
+		g.setColor( oldColor );
+	}
+debug*/
+
 	/**
 	 * Creates a closed path for the given points.
 	 */
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java
@@ -0,0 +1,406 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.awt.Color;
+import java.awt.Dialog;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.GraphicsConfiguration;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.geom.AffineTransform;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.Timer;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import com.formdev.flatlaf.util.LoggingFacade;
+import com.formdev.flatlaf.util.NativeLibrary;
+import com.formdev.flatlaf.util.SystemInfo;
+
+//
+// Interesting resources:
+//     https://github.com/microsoft/terminal/blob/main/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
+//     https://docs.microsoft.com/en-us/windows/win32/dwm/customframe
+//     https://github.com/JetBrains/JetBrainsRuntime/blob/master/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
+//     https://github.com/JetBrains/JetBrainsRuntime/commit/d2820524a1aa211b1c49b30f659b9b4d07a6f96e
+//     https://github.com/JetBrains/JetBrainsRuntime/pull/18
+//     https://medium.com/swlh/customizing-the-title-bar-of-an-application-window-50a4ac3ed27e
+//     https://github.com/kalbetredev/CustomDecoratedJFrame
+//     https://github.com/Guerra24/NanoUI-win32
+//     https://github.com/oberth/custom-chrome
+//     https://github.com/rossy/borderless-window
+//
+
+/**
+ * Native window border support for Windows 10 when using custom decorations.
+ * <p>
+ * If the application wants to use custom decorations, the Windows 10 title bar is hidden
+ * (including minimize, maximize and close buttons), but not the resize borders (including drop shadow).
+ * Windows 10 window snapping functionality will remain unaffected:
+ * https://support.microsoft.com/en-us/windows/snap-your-windows-885a9b1e-a983-a3b1-16cd-c531795e6241
+ *
+ * @author Karl Tauber
+ * @since 1.1
+ */
+class FlatWindowsNativeWindowBorder
+	implements FlatNativeWindowBorder.Provider
+{
+	private final Map<Window, WndProc> windowsMap = Collections.synchronizedMap( new IdentityHashMap<>() );
+	private final EventListenerList listenerList = new EventListenerList();
+	private Timer fireStateChangedTimer;
+
+	private boolean colorizationUpToDate;
+	private boolean colorizationColorAffectsBorders;
+	private Color colorizationColor;
+	private int colorizationColorBalance;
+
+	private static NativeLibrary nativeLibrary;
+	private static FlatWindowsNativeWindowBorder instance;
+
+	static FlatNativeWindowBorder.Provider getInstance() {
+		// requires Windows 10
+		if( !SystemInfo.isWindows_10_orLater )
+			return null;
+
+		// load native library
+		if( nativeLibrary == null ) {
+			if( !SystemInfo.isJava_9_orLater ) {
+				// In Java 8, load jawt.dll (part of JRE) explicitly because it
+				// is not found when running application with <jdk>/bin/java.exe.
+				// When using <jdk>/jre/bin/java.exe, it is found.
+				// jawt.dll is located in <jdk>/jre/bin/.
+				// Java 9 and later does not have this problem.
+				try {
+					System.loadLibrary( "jawt" );
+				} catch( Exception ex ) {
+					LoggingFacade.INSTANCE.logSevere( null, ex );
+				}
+			}
+
+			String libraryName = "com/formdev/flatlaf/natives/flatlaf-windows-x86";
+			if( SystemInfo.isX86_64 )
+				libraryName += "_64";
+
+			nativeLibrary = new NativeLibrary( libraryName,
+				FlatWindowsNativeWindowBorder.class.getClassLoader(), true );
+		}
+
+		// check whether native library was successfully loaded
+		if( !nativeLibrary.isLoaded() )
+			return null;
+
+		// create new instance
+		if( instance == null )
+			instance = new FlatWindowsNativeWindowBorder();
+		return instance;
+	}
+
+	private FlatWindowsNativeWindowBorder() {
+	}
+
+	@Override
+	public boolean hasCustomDecoration( Window window ) {
+		return windowsMap.containsKey( window );
+	}
+
+	/**
+	 * Tell the window whether the application wants use custom decorations.
+	 * If {@code true}, the Windows 10 title bar is hidden (including minimize,
+	 * maximize and close buttons), but not the resize borders (including drop shadow).
+	 */
+	@Override
+	public void setHasCustomDecoration( Window window, boolean hasCustomDecoration ) {
+		if( hasCustomDecoration )
+			install( window );
+		else
+			uninstall( window );
+	}
+
+	private void install( Window window ) {
+		// requires Windows 10
+		if( !SystemInfo.isWindows_10_orLater )
+			return;
+
+		// only JFrame and JDialog are supported
+		if( !(window instanceof JFrame) && !(window instanceof JDialog) )
+			return;
+
+		// not supported if frame/dialog is undecorated
+		if( (window instanceof Frame && ((Frame)window).isUndecorated()) ||
+			(window instanceof Dialog && ((Dialog)window).isUndecorated()) )
+		  return;
+
+		// check whether already installed
+		if( windowsMap.containsKey( window ) )
+			return;
+
+		// install
+		WndProc wndProc = new WndProc( window );
+		if( wndProc.hwnd == 0 )
+			return;
+
+		windowsMap.put( window, wndProc );
+	}
+
+	private void uninstall( Window window ) {
+		WndProc wndProc = windowsMap.remove( window );
+		if( wndProc != null )
+			wndProc.uninstall();
+	}
+
+	@Override
+	public void setTitleBarHeight( Window window, int titleBarHeight ) {
+		WndProc wndProc = windowsMap.get( window );
+		if( wndProc == null )
+			return;
+
+		wndProc.titleBarHeight = titleBarHeight;
+	}
+
+	@Override
+	public void setTitleBarHitTestSpots( Window window, List<Rectangle> hitTestSpots ) {
+		WndProc wndProc = windowsMap.get( window );
+		if( wndProc == null )
+			return;
+
+		wndProc.hitTestSpots = hitTestSpots.toArray( new Rectangle[hitTestSpots.size()] );
+	}
+
+	@Override
+	public void setTitleBarAppIconBounds( Window window, Rectangle appIconBounds ) {
+		WndProc wndProc = windowsMap.get( window );
+		if( wndProc == null )
+			return;
+
+		wndProc.appIconBounds = (appIconBounds != null) ? new Rectangle( appIconBounds ) : null;
+	}
+
+	@Override
+	public boolean showWindow( Window window, int cmd ) {
+		WndProc wndProc = windowsMap.get( window );
+		if( wndProc == null )
+			return false;
+
+		wndProc.showWindow( wndProc.hwnd, cmd );
+		return true;
+	}
+
+	@Override
+	public boolean isColorizationColorAffectsBorders() {
+		updateColorization();
+		return colorizationColorAffectsBorders;
+	}
+
+	@Override
+	public Color getColorizationColor() {
+		updateColorization();
+		return colorizationColor;
+	}
+
+	@Override
+	public int getColorizationColorBalance() {
+		updateColorization();
+		return colorizationColorBalance;
+	}
+
+	private void updateColorization() {
+		if( colorizationUpToDate )
+			return;
+		colorizationUpToDate = true;
+
+		String subKey = "SOFTWARE\\Microsoft\\Windows\\DWM";
+
+		int value = registryGetIntValue( subKey, "ColorPrevalence", -1 );
+		colorizationColorAffectsBorders = (value > 0);
+
+		value = registryGetIntValue( subKey, "ColorizationColor", -1 );
+		colorizationColor = (value != -1) ? new Color( value ) : null;
+
+		colorizationColorBalance = registryGetIntValue( subKey, "ColorizationColorBalance", -1 );
+	}
+
+	private native static int registryGetIntValue( String key, String valueName, int defaultValue );
+
+	@Override
+	public void addChangeListener( ChangeListener l ) {
+		listenerList.add( ChangeListener.class, l );
+	}
+
+	@Override
+	public void removeChangeListener( ChangeListener l ) {
+		listenerList.remove( ChangeListener.class, l );
+	}
+
+	private void fireStateChanged() {
+		Object[] listeners = listenerList.getListenerList();
+		if( listeners.length == 0 )
+			return;
+
+		ChangeEvent e = new ChangeEvent( this );
+		for( int i = 0; i < listeners.length; i += 2 ) {
+			if( listeners[i] == ChangeListener.class )
+				((ChangeListener)listeners[i+1]).stateChanged( e );
+		}
+	}
+
+	/**
+	 * Because there may be sent many WM_DWMCOLORIZATIONCOLORCHANGED messages,
+	 * slightly delay event firing and fire it only once (on the AWT thread).
+	 */
+	void fireStateChangedLaterOnce() {
+		EventQueue.invokeLater( () -> {
+			if( fireStateChangedTimer != null ) {
+				fireStateChangedTimer.restart();
+				return;
+			}
+
+			fireStateChangedTimer = new Timer( 300, e -> {
+				fireStateChangedTimer = null;
+				colorizationUpToDate = false;
+
+				fireStateChanged();
+			} );
+			fireStateChangedTimer.setRepeats( false );
+			fireStateChangedTimer.start();
+		} );
+	}
+
+	//---- class WndProc ------------------------------------------------------
+
+	private class WndProc
+	{
+		// WM_NCHITTEST mouse position codes
+		private static final int
+			HTCLIENT = 1,
+			HTCAPTION = 2,
+			HTSYSMENU = 3,
+			HTTOP = 12;
+
+		private Window window;
+		private final long hwnd;
+
+		private int titleBarHeight;
+		private Rectangle[] hitTestSpots;
+		private Rectangle appIconBounds;
+
+		WndProc( Window window ) {
+			this.window = window;
+
+			hwnd = installImpl( window );
+
+			// remove the OS window title bar
+			if( window instanceof JFrame && ((JFrame)window).getExtendedState() != 0 ) {
+				// In case that the frame should be maximized or minimized immediately
+				// when showing, then it is necessary to defer ::SetWindowPos() invocation.
+				// Otherwise the frame will not be maximized or minimized.
+				// This occurs only if frame.pack() was no invoked.
+				EventQueue.invokeLater( () -> {
+					updateFrame( hwnd );
+				});
+			} else
+				updateFrame( hwnd );
+		}
+
+		void uninstall() {
+			uninstallImpl( hwnd );
+
+			// cleanup
+			window = null;
+		}
+
+		private native long installImpl( Window window );
+		private native void uninstallImpl( long hwnd );
+		private native void updateFrame( long hwnd );
+		private native void showWindow( long hwnd, int cmd );
+
+		// invoked from native code
+		private int onNcHitTest( int x, int y, boolean isOnResizeBorder ) {
+			// scale-down mouse x/y
+			Point pt = scaleDown( x, y );
+			int sx = pt.x;
+			int sy = pt.y;
+
+			// return HTSYSMENU if mouse is over application icon
+			//   - left-click on HTSYSMENU area shows system menu
+			//   - double-left-click sends WM_CLOSE
+			if( appIconBounds != null && appIconBounds.contains( sx, sy ) )
+				return HTSYSMENU;
+
+			boolean isOnTitleBar = (sy < titleBarHeight);
+
+			if( isOnTitleBar ) {
+				// use a second reference to the array to avoid that it can be changed
+				// in another thread while processing the array
+				Rectangle[] hitTestSpots2 = hitTestSpots;
+				for( Rectangle spot : hitTestSpots2 ) {
+					if( spot.contains( sx, sy ) )
+						return HTCLIENT;
+				}
+				return isOnResizeBorder ? HTTOP : HTCAPTION;
+			}
+
+			return isOnResizeBorder ? HTTOP : HTCLIENT;
+		}
+
+		/**
+		 * Scales down in the same way as AWT.
+		 * See AwtWin32GraphicsDevice::ScaleDownX() and ::ScaleDownY()
+		 */
+		private Point scaleDown( int x, int y ) {
+			GraphicsConfiguration gc = window.getGraphicsConfiguration();
+			if( gc == null )
+				return new Point( x, y );
+
+			AffineTransform t = gc.getDefaultTransform();
+			return new Point( clipRound( x / t.getScaleX() ), clipRound( y / t.getScaleY() ) );
+		}
+
+		/**
+		 * Rounds in the same way as AWT.
+		 * See AwtWin32GraphicsDevice::ClipRound()
+		 */
+		private int clipRound( double value ) {
+			value -= 0.5;
+			if( value < Integer.MIN_VALUE )
+				return Integer.MIN_VALUE;
+			if( value > Integer.MAX_VALUE )
+				return Integer.MAX_VALUE;
+			return (int) Math.ceil( value );
+		}
+
+		// invoked from native code
+		private boolean isFullscreen() {
+			GraphicsConfiguration gc = window.getGraphicsConfiguration();
+			if( gc == null )
+				return false;
+			return gc.getDevice().getFullScreenWindow() == window;
+		}
+
+		// invoked from native code
+		private void fireStateChangedLaterOnce() {
+			FlatWindowsNativeWindowBorder.this.fireStateChangedLaterOnce();
+		}
+	}
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/JBRCustomDecorations.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/JBRCustomDecorations.java
@@ -29,17 +29,15 @@ import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.beans.PropertyChangeListener;
 import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JRootPane;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.BorderUIResource;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatSystemProperties;
+import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.SystemInfo;

@@ -55,26 +53,29 @@ import com.formdev.flatlaf.util.SystemInfo;
 */
 public class JBRCustomDecorations
 {
-	private static boolean initialized;
+	private static Boolean supported;
 	private static Method Window_hasCustomDecoration;
 	private static Method Window_setHasCustomDecoration;
-	private static Method WWindowPeer_setCustomDecorationHitTestSpots;
 	private static Method WWindowPeer_setCustomDecorationTitleBarHeight;
+	private static Method WWindowPeer_setCustomDecorationHitTestSpots;
 	private static Method AWTAccessor_getComponentAccessor;
 	private static Method AWTAccessor_ComponentAccessor_getPeer;

 	public static boolean isSupported() {
 		initialize();
-		return Window_setHasCustomDecoration != null;
+		return supported;
 	}

-	static void install( JRootPane rootPane ) {
+	static Object install( JRootPane rootPane ) {
 		if( !isSupported() )
-			return;
+			return null;

 		// check whether root pane already has a parent, which is the case when switching LaF
-		if( rootPane.getParent() != null )
-			return;
+		Window window = SwingUtilities.windowForComponent( rootPane );
+		if( window != null ) {
+			FlatNativeWindowBorder.install( window, FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS );
+			return null;
+		}

 		// Use hierarchy listener to wait until the root pane is added to a window.
 		// Enabling JBR decorations must be done very early, probably before
@@ -88,8 +89,9 @@ public class JBRCustomDecorations

 				Container parent = e.getChangedParent();
 				if( parent instanceof Window )
-					install( (Window) parent );
+					FlatNativeWindowBorder.install( (Window) parent, FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS );

+				// remove listener since it is actually not possible to uninstall JBR decorations
 				// use invokeLater to remove listener to avoid that listener
 				// is removed while listener queue is processed
 				EventQueue.invokeLater( () -> {
@@ -98,54 +100,20 @@ public class JBRCustomDecorations
 			}
 		};
 		rootPane.addHierarchyListener( addListener );
+		return addListener;
 	}

-	static void install( Window window ) {
-		if( !isSupported() )
-			return;
+	static void uninstall( JRootPane rootPane, Object data ) {
+		// remove listener (if not yet done)
+		if( data instanceof HierarchyListener )
+			rootPane.removeHierarchyListener( (HierarchyListener) data );

-		// do not enable JBR decorations if LaF provides decorations
-		if( UIManager.getLookAndFeel().getSupportsWindowDecorations() )
-			return;
-
-		if( window instanceof JFrame ) {
-			JFrame frame = (JFrame) window;
-
-			// do not enable JBR decorations if JFrame should use system window decorations
-			// and if not forced to use JBR decorations
-			if( !JFrame.isDefaultLookAndFeelDecorated() &&
-				!FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, false ))
-			  return;
-
-			// do not enable JBR decorations if frame is undecorated
-			if( frame.isUndecorated() )
-				return;
-
-			// enable JBR custom window decoration for window
-			setHasCustomDecoration( frame );
-
-			// enable Swing window decoration
-			frame.getRootPane().setWindowDecorationStyle( JRootPane.FRAME );
-
-		} else if( window instanceof JDialog ) {
-			JDialog dialog = (JDialog) window;
-
-			// do not enable JBR decorations if JDialog should use system window decorations
-			// and if not forced to use JBR decorations
-			if( !JDialog.isDefaultLookAndFeelDecorated() &&
-				!FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, false ))
-			  return;
-
-			// do not enable JBR decorations if dialog is undecorated
-			if( dialog.isUndecorated() )
-				return;
-
-			// enable JBR custom window decoration for window
-			setHasCustomDecoration( dialog );
-
-			// enable Swing window decoration
-			dialog.getRootPane().setWindowDecorationStyle( JRootPane.PLAIN_DIALOG );
-		}
+		// since it is actually not possible to uninstall JBR decorations,
+		// simply reduce titleBarHeight so that it is still possible to resize window
+		// and remove hitTestSpots
+		Window window = SwingUtilities.windowForComponent( rootPane );
+		if( window != null )
+			setHasCustomDecoration( window, false );
 	}

 	static boolean hasCustomDecoration( Window window ) {
@@ -155,45 +123,49 @@ public class JBRCustomDecorations
 		try {
 			return (Boolean) Window_hasCustomDecoration.invoke( window );
 		} catch( Exception ex ) {
-			Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 			return false;
 		}
 	}

-	static void setHasCustomDecoration( Window window ) {
+	static void setHasCustomDecoration( Window window, boolean hasCustomDecoration ) {
 		if( !isSupported() )
 			return;

 		try {
-			Window_setHasCustomDecoration.invoke( window );
+			if( hasCustomDecoration )
+				Window_setHasCustomDecoration.invoke( window );
+			else
+				setTitleBarHeightAndHitTestSpots( window, 4, Collections.emptyList() );
 		} catch( Exception ex ) {
-			Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 		}
 	}

-	static void setHitTestSpotsAndTitleBarHeight( Window window, List<Rectangle> hitTestSpots, int titleBarHeight ) {
+	static void setTitleBarHeightAndHitTestSpots( Window window, int titleBarHeight, List<Rectangle> hitTestSpots ) {
 		if( !isSupported() )
 			return;

 		try {
 			Object compAccessor = AWTAccessor_getComponentAccessor.invoke( null );
 			Object peer = AWTAccessor_ComponentAccessor_getPeer.invoke( compAccessor, window );
-			WWindowPeer_setCustomDecorationHitTestSpots.invoke( peer, hitTestSpots );
 			WWindowPeer_setCustomDecorationTitleBarHeight.invoke( peer, titleBarHeight );
+			WWindowPeer_setCustomDecorationHitTestSpots.invoke( peer, hitTestSpots );
 		} catch( Exception ex ) {
-			Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 		}
 	}

 	private static void initialize() {
-		if( initialized )
+		if( supported != null )
 			return;
-		initialized = true;
+		supported = false;

 		// requires JetBrains Runtime 11 and Windows 10
 		if( !SystemInfo.isJetBrainsJVM_11_orLater || !SystemInfo.isWindows_10_orLater )
 			return;

+		// check whether disabled via system property
 		if( !FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, true ) )
 			return;

@@ -204,15 +176,17 @@ public class JBRCustomDecorations
 			AWTAccessor_ComponentAccessor_getPeer = compAccessorClass.getDeclaredMethod( "getPeer", Component.class );

 			Class<?> peerClass = Class.forName( "sun.awt.windows.WWindowPeer" );
-			WWindowPeer_setCustomDecorationHitTestSpots = peerClass.getDeclaredMethod( "setCustomDecorationHitTestSpots", List.class );
 			WWindowPeer_setCustomDecorationTitleBarHeight = peerClass.getDeclaredMethod( "setCustomDecorationTitleBarHeight", int.class );
-			WWindowPeer_setCustomDecorationHitTestSpots.setAccessible( true );
+			WWindowPeer_setCustomDecorationHitTestSpots = peerClass.getDeclaredMethod( "setCustomDecorationHitTestSpots", List.class );
 			WWindowPeer_setCustomDecorationTitleBarHeight.setAccessible( true );
+			WWindowPeer_setCustomDecorationHitTestSpots.setAccessible( true );

 			Window_hasCustomDecoration = Window.class.getDeclaredMethod( "hasCustomDecoration" );
 			Window_setHasCustomDecoration = Window.class.getDeclaredMethod( "setHasCustomDecoration" );
 			Window_hasCustomDecoration.setAccessible( true );
 			Window_setHasCustomDecoration.setAccessible( true );
+
+			supported = true;
 		} catch( Exception ex ) {
 			// ignore
 		}
@@ -237,15 +211,22 @@ public class JBRCustomDecorations
 			return instance;
 		}

-        private JBRWindowTopBorder() {
+        JBRWindowTopBorder() {
 			super( 1, 0, 0, 0 );

-			colorizationAffectsBorders = calculateAffectsBorders();
-			activeColor = calculateActiveBorderColor();
+			update();
+			installListeners();
+        }

+        void update() {
+			colorizationAffectsBorders = isColorizationColorAffectsBorders();
+			activeColor = calculateActiveBorderColor();
+        }
+
+        void installListeners() {
 			Toolkit toolkit = Toolkit.getDefaultToolkit();
 			toolkit.addPropertyChangeListener( "win.dwm.colorizationColor.affects.borders", e -> {
-				colorizationAffectsBorders = calculateAffectsBorders();
+				colorizationAffectsBorders = isColorizationColorAffectsBorders();
 				activeColor = calculateActiveBorderColor();
 			} );

@@ -257,46 +238,50 @@ public class JBRCustomDecorations
 			toolkit.addPropertyChangeListener( "win.frame.activeBorderColor", l );
 		}

-		private boolean calculateAffectsBorders() {
+        boolean isColorizationColorAffectsBorders() {
 			Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "win.dwm.colorizationColor.affects.borders" );
 			return (value instanceof Boolean) ? (Boolean) value : true;
 		}

+        Color getColorizationColor() {
+			return (Color) Toolkit.getDefaultToolkit().getDesktopProperty( "win.dwm.colorizationColor" );
+        }
+
+        int getColorizationColorBalance() {
+			Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "win.dwm.colorizationColorBalance" );
+			return (value instanceof Integer) ? (Integer) value : -1;
+        }
+
 		private Color calculateActiveBorderColor() {
 			if( !colorizationAffectsBorders )
 				return defaultActiveBorder;

-			Toolkit toolkit = Toolkit.getDefaultToolkit();
-			Color colorizationColor = (Color) toolkit.getDesktopProperty( "win.dwm.colorizationColor" );
+			Color colorizationColor = getColorizationColor();
 			if( colorizationColor != null ) {
-				Object colorizationColorBalanceObj = toolkit.getDesktopProperty( "win.dwm.colorizationColorBalance" );
-				if( colorizationColorBalanceObj instanceof Integer ) {
-					int colorizationColorBalance = (Integer) colorizationColorBalanceObj;
-					if( colorizationColorBalance < 0 || colorizationColorBalance > 100 )
-						colorizationColorBalance = 100;
+				int colorizationColorBalance = getColorizationColorBalance();
+				if( colorizationColorBalance < 0 || colorizationColorBalance > 100 )
+					colorizationColorBalance = 100;

-					if( colorizationColorBalance == 0 )
-						return new Color( 0xD9D9D9 );
-					if( colorizationColorBalance == 100 )
-						return colorizationColor;
+				if( colorizationColorBalance == 0 )
+					return new Color( 0xD9D9D9 );
+				if( colorizationColorBalance == 100 )
+					return colorizationColor;

-					float alpha = colorizationColorBalance / 100.0f;
-					float remainder = 1 - alpha;
-					int r = Math.round( colorizationColor.getRed() * alpha + 0xD9 * remainder );
-					int g = Math.round( colorizationColor.getGreen() * alpha + 0xD9 * remainder );
-					int b = Math.round( colorizationColor.getBlue() * alpha + 0xD9 * remainder );
+				float alpha = colorizationColorBalance / 100.0f;
+				float remainder = 1 - alpha;
+				int r = Math.round( colorizationColor.getRed() * alpha + 0xD9 * remainder );
+				int g = Math.round( colorizationColor.getGreen() * alpha + 0xD9 * remainder );
+				int b = Math.round( colorizationColor.getBlue() * alpha + 0xD9 * remainder );

-					// avoid potential IllegalArgumentException in Color constructor
-					r = Math.min( Math.max( r, 0 ), 255 );
-					g = Math.min( Math.max( g, 0 ), 255 );
-					b = Math.min( Math.max( b, 0 ), 255 );
+				// avoid potential IllegalArgumentException in Color constructor
+				r = Math.min( Math.max( r, 0 ), 255 );
+				g = Math.min( Math.max( g, 0 ), 255 );
+				b = Math.min( Math.max( b, 0 ), 255 );

-					return new Color( r, g, b );
-				}
-				return colorizationColor;
+				return new Color( r, g, b );
 			}

-			Color activeBorderColor = (Color) toolkit.getDesktopProperty( "win.frame.activeBorderColor" );
+			Color activeBorderColor = (Color) Toolkit.getDefaultToolkit().getDesktopProperty( "win.frame.activeBorderColor" );
 			return (activeBorderColor != null) ? activeBorderColor : UIManager.getColor( "MenuBar.borderColor" );
 		}

--- 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/java/com/formdev/flatlaf/util/JavaCompatibility.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/JavaCompatibility.java
@@ -21,10 +21,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.JComponent;
-import com.formdev.flatlaf.FlatLaf;

 /**
 * Provides Java version compatibility methods.
@@ -58,7 +55,7 @@ public class JavaCompatibility
 						? new Class[] { JComponent.class, Graphics2D.class, String.class, int.class, float.class, float.class }
 						: new Class[] { JComponent.class, Graphics.class, String.class, int.class, int.class, int.class } );
 				} catch( Exception ex ) {
-					Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+					LoggingFacade.INSTANCE.logSevere( null, ex );
 					throw new RuntimeException( ex );
 				}
 			}
@@ -70,7 +67,7 @@ public class JavaCompatibility
 			else
 				drawStringUnderlineCharAtMethod.invoke( null, c, g, text, underlinedIndex, x, y );
 		} catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) {
-			Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 			throw new RuntimeException( ex );
 		}
 	}
@@ -94,7 +91,7 @@ public class JavaCompatibility
 							: "clipStringIfNecessary",
 						new Class[] { JComponent.class, FontMetrics.class, String.class, int.class } );
 				} catch( Exception ex ) {
-					Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+					LoggingFacade.INSTANCE.logSevere( null, ex );
 					throw new RuntimeException( ex );
 				}
 			}
@@ -103,7 +100,7 @@ public class JavaCompatibility
 		try {
 			return (String) getClippedStringMethod.invoke( null, c, fm, string, availTextWidth );
 		} catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) {
-			Logger.getLogger( FlatLaf.class.getName() ).log( Level.SEVERE, null, ex );
+			LoggingFacade.INSTANCE.logSevere( null, ex );
 			throw new RuntimeException( ex );
 		}
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacade.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacade.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.util;
+
+/**
+ * @since 1.1
+ */
+public interface LoggingFacade
+{
+	LoggingFacade INSTANCE = new LoggingFacadeImpl();
+
+	void logSevere( String message, Throwable t );
+	void logConfig( String message, Throwable t );
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacadeImpl.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacadeImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.util;
+
+import com.formdev.flatlaf.FlatLaf;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @since 1.1
+ */
+class LoggingFacadeImpl
+	implements LoggingFacade
+{
+	private static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() );
+
+	@Override
+	public void logSevere( String message, Throwable t ) {
+		LOG.log( Level.SEVERE, message, t );
+	}
+
+	@Override
+	public void logConfig( String message, Throwable t ) {
+		LOG.log( Level.CONFIG, message, t );
+	}
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+/**
+ * Helper class to load native library (.dll, .so or .dylib) stored in Jar.
+ * <p>
+ * Copies native library to users temporary folder before loading it.
+ *
+ * @author Karl Tauber
+ * @since 1.1
+ */
+public class NativeLibrary
+{
+	private static final String DELETE_SUFFIX = ".delete";
+	private static boolean deletedTemporary;
+
+	private final boolean loaded;
+
+	/**
+	 * Load native library from given classloader.
+	 *
+	 * @param libraryName resource name of the native library (without "lib" prefix and without extension)
+	 * @param classLoader the classloader used to locate the library
+	 * @param supported whether the native library is supported on the current platform
+	 */
+	public NativeLibrary( String libraryName, ClassLoader classLoader, boolean supported ) {
+		this.loaded = supported
+			? loadLibraryFromJar( libraryName, classLoader )
+			: false;
+	}
+
+	/**
+	 * Returns whether the native library is loaded.
+	 * <p>
+	 * Returns {@code false} if not supported on current platform as specified in constructor
+	 * or if loading failed.
+	 */
+	public boolean isLoaded() {
+		return loaded;
+	}
+
+	private static boolean loadLibraryFromJar( String libraryName, ClassLoader classLoader ) {
+		// add prefix and suffix to library name
+		libraryName = decorateLibraryName( libraryName );
+
+		// find library
+		URL libraryUrl = classLoader.getResource( libraryName );
+		if( libraryUrl == null ) {
+			log( "Library '" + libraryName + "' not found", null );
+			return false;
+		}
+
+		File tempFile = null;
+		try {
+			// for development environment
+			if( "file".equals( libraryUrl.getProtocol() ) ) {
+				File libraryFile = new File( libraryUrl.getPath() );
+				if( libraryFile.isFile() ) {
+					// load library without copying
+					System.load( libraryFile.getCanonicalPath() );
+					return true;
+				}
+			}
+
+			// create temporary file
+			Path tempPath = createTempFile( libraryName );
+			tempFile = tempPath.toFile();
+
+			// copy library to temporary file
+			try( InputStream in = libraryUrl.openStream() ) {
+				Files.copy( in, tempPath, StandardCopyOption.REPLACE_EXISTING );
+			}
+
+			// load library
+			System.load( tempFile.getCanonicalPath() );
+
+			// delete library
+			deleteOrMarkForDeletion( tempFile );
+
+			return true;
+		} catch( Throwable ex ) {
+			log( null, ex );
+
+			if( tempFile != null )
+				deleteOrMarkForDeletion( tempFile );
+			return false;
+		}
+	}
+
+	private static String decorateLibraryName( String libraryName ) {
+		if( SystemInfo.isWindows )
+			return libraryName.concat( ".dll" );
+
+		String suffix = SystemInfo.isMacOS ? ".dylib" : ".so";
+
+		int sep = libraryName.lastIndexOf( '/' );
+		return (sep >= 0)
+			? libraryName.substring( 0, sep + 1 ) + "lib" + libraryName.substring( sep + 1 ) + suffix
+			: "lib" + libraryName + suffix;
+	}
+
+	private static void log( String msg, Throwable thrown ) {
+		LoggingFacade.INSTANCE.logSevere( msg, thrown );
+	}
+
+	private static Path createTempFile( String libraryName ) throws IOException {
+		int sep = libraryName.lastIndexOf( '/' );
+		String name = (sep >= 0) ? libraryName.substring( sep + 1 ) : libraryName;
+
+		int dot = name.lastIndexOf( '.' );
+		String prefix = ((dot >= 0) ? name.substring( 0, dot ) : name) + '-';
+		String suffix = (dot >= 0) ? name.substring( dot ) : "";
+
+		Path tempDir = getTempDir();
+		if( tempDir != null ) {
+			deleteTemporaryFiles( tempDir );
+
+			return Files.createTempFile( tempDir, prefix, suffix );
+		} else
+			return Files.createTempFile( prefix, suffix );
+	}
+
+	private static Path getTempDir() throws IOException {
+		if( SystemInfo.isWindows ) {
+			// On Windows, where File.delete() and File.deleteOnExit() does not work
+			// for loaded native libraries, they will be deleted on next application startup.
+			// The default temporary directory may contain hundreds or thousands of files.
+			// To make searching for "marked for deletion" files as fast as possible,
+			// use a sub directory that contains only our temporary native libraries.
+			Path tempDir = Paths.get( System.getProperty( "java.io.tmpdir" ) + "/flatlaf.temp" );
+			Files.createDirectories( tempDir );
+			return tempDir;
+		} else
+			return null; // use standard temporary directory
+	}
+
+	private static void deleteTemporaryFiles( Path tempDir ) {
+		if( deletedTemporary )
+			return;
+		deletedTemporary = true;
+
+		File[] markerFiles = tempDir.toFile().listFiles( (dir, name) -> name.endsWith( DELETE_SUFFIX ) );
+		if( markerFiles == null )
+			return;
+
+		for( File markerFile : markerFiles ) {
+			File toDeleteFile = new File( markerFile.getParent(), StringUtils.removeTrailing( markerFile.getName(), DELETE_SUFFIX ) );
+			if( !toDeleteFile.exists() || toDeleteFile.delete() )
+				markerFile.delete();
+		}
+	}
+
+	private static void deleteOrMarkForDeletion( File file ) {
+		// try to delete the native library
+		if( file.delete() )
+			return;
+
+		// not possible to delete on Windows because native library file is locked
+		// --> create "to delete" marker file (used at next startup)
+		try {
+			File markFile = new File( file.getParent(), file.getName() + DELETE_SUFFIX );
+			markFile.createNewFile();
+		} catch( IOException ex2 ) {
+			// ignore
+		}
+	}
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java
@@ -38,6 +38,9 @@ public class SystemInfo
 	public static final boolean isMacOS_10_14_Mojave_orLater;
 	public static final boolean isMacOS_10_15_Catalina_orLater;

+	// OS architecture
+	/** @since 1.1 */ public static final boolean isX86_64;
+
 	// Java versions
 	public static final long javaVersion;
 	public static final boolean isJava_9_orLater;
@@ -51,6 +54,10 @@ public class SystemInfo
 	// UI toolkits
 	public static final boolean isKDE;

+	// other
+	/** @since 1.1 */ public static final boolean isProjector;
+	/** @since 1.1.1 */ public static final boolean isWinPE;
+
 	static {
 		// platforms
 		String osName = System.getProperty( "os.name" ).toLowerCase( Locale.ENGLISH );
@@ -65,6 +72,10 @@ public class SystemInfo
 		isMacOS_10_14_Mojave_orLater = (isMacOS && osVersion >= toVersion( 10, 14, 0, 0 ));
 		isMacOS_10_15_Catalina_orLater = (isMacOS && osVersion >= toVersion( 10, 15, 0, 0 ));

+		// OS architecture
+		String osArch = System.getProperty( "os.arch" );
+		isX86_64 = osArch.equals( "amd64" ) || osArch.equals( "x86_64" );
+
 		// Java versions
 		javaVersion = scanVersion( System.getProperty( "java.version" ) );
 		isJava_9_orLater = (javaVersion >= toVersion( 9, 0, 0, 0 ));
@@ -78,6 +89,10 @@ public class SystemInfo

 		// UI toolkits
 		isKDE = (isLinux && System.getenv( "KDE_FULL_SESSION" ) != null);
+
+		// other
+		isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" );
+		isWinPE = isWindows && "X:\\Windows\\System32".equalsIgnoreCase( System.getProperty( "user.dir" ) );
 	}

 	public static long scanVersion( String version ) {
--- a/flatlaf-core/src/main/java9/com/formdev/flatlaf/util/LoggingFacadeImpl.java
+++ b/flatlaf-core/src/main/java9/com/formdev/flatlaf/util/LoggingFacadeImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.util;
+
+import com.formdev.flatlaf.FlatLaf;
+
+/**
+ * @since 1.1
+ */
+class LoggingFacadeImpl
+	implements LoggingFacade
+{
+	private static final System.Logger LOG = System.getLogger( FlatLaf.class.getName() );
+
+	@Override
+	public void logSevere( String message, Throwable t ) {
+		LOG.log( System.Logger.Level.ERROR, message, t );
+	}
+
+	@Override
+	public void logConfig( String message, Throwable t ) {
+		LOG.log( System.Logger.Level.DEBUG, message, t );
+	}
+}
--- a/flatlaf-core/src/main/module-info/module-info.java
+++ b/flatlaf-core/src/main/module-info/module-info.java
@@ -19,7 +19,6 @@
 */
 module com.formdev.flatlaf {
 	requires java.desktop;
-	requires java.logging;

 	exports com.formdev.flatlaf;
 	exports com.formdev.flatlaf.icons;
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -685,13 +685,17 @@ TitledBorder.border = 1,1,1,1,$Separator.foreground

 #---- TitlePane ----

+TitlePane.useWindowDecorations = true
 TitlePane.menuBarEmbedded = true
+TitlePane.unifiedBackground = false
 TitlePane.iconSize = 16,16
-TitlePane.iconMargins = 3,8,3,0
-TitlePane.menuBarMargins = 0,8,0,22
-TitlePane.titleMargins = 3,8,3,8
+TitlePane.iconMargins = 3,8,3,8
+TitlePane.titleMargins = 3,0,3,0
 TitlePane.buttonSize = 44,30
 TitlePane.buttonMaximizedHeight = 22
+TitlePane.centerTitle = false
+TitlePane.centerTitleIfMenuBarEmbedded = true
+TitlePane.menuBarTitleGap = 20
 TitlePane.closeIcon = com.formdev.flatlaf.icons.FlatWindowCloseIcon
 TitlePane.iconifyIcon = com.formdev.flatlaf.icons.FlatWindowIconifyIcon
 TitlePane.maximizeIcon = com.formdev.flatlaf.icons.FlatWindowMaximizeIcon
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties
@@ -69,21 +69,33 @@ ToggleButton.endBackground = $ToggleButton.background
@ijMenuCheckBackgroundL20 = lighten(@selectionBackground,20%,derived noAutoInverse)
@ijMenuCheckBackgroundD10 = darken(@selectionBackground,10%,derived noAutoInverse)

+[Arc_Theme]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme]PopupMenu.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
 [Arc_Theme]ProgressBar.selectionBackground = #000
 [Arc_Theme]ProgressBar.selectionForeground = #fff
 [Arc_Theme]List.selectionInactiveForeground = #fff
 [Arc_Theme]Table.selectionInactiveForeground = #fff
 [Arc_Theme]Tree.selectionInactiveForeground = #fff

+[Arc_Theme_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
 [Arc_Theme_-_Orange]ProgressBar.selectionBackground = #000
 [Arc_Theme_-_Orange]ProgressBar.selectionForeground = #fff
 [Arc_Theme_-_Orange]List.selectionInactiveForeground = #fff
 [Arc_Theme_-_Orange]Table.selectionInactiveForeground = #fff
 [Arc_Theme_-_Orange]Tree.selectionInactiveForeground = #fff

+[Arc_Theme_Dark]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_Dark]PopupMenu.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_Dark]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
 [Arc_Theme_Dark]ProgressBar.selectionBackground = #ddd
 [Arc_Theme_Dark]ProgressBar.selectionForeground = #ddd

+[Arc_Theme_Dark_-_Orange]CheckBoxMenuItem.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_Dark_-_Orange]PopupMenu.foreground = lazy(MenuItem.foreground) 
+[Arc_Theme_Dark_-_Orange]RadioButtonMenuItem.foreground = lazy(MenuItem.foreground) 
 [Arc_Theme_Dark_-_Orange]ProgressBar.selectionBackground = #ddd
 [Arc_Theme_Dark_-_Orange]ProgressBar.selectionForeground = #fff

@@ -95,6 +107,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 +137,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-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-x86.dll
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-x86.dll
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/natives/flatlaf-windows-x86_64.dll
--- 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 {
@@ -40,6 +31,7 @@ dependencies {
 	implementation( project( ":flatlaf-intellij-themes" ) )
 	implementation( "com.miglayout:miglayout-swing:5.3-SNAPSHOT" )
 	implementation( "com.jgoodies:jgoodies-forms:1.9.0" )
+//	implementation( project( ":flatlaf-natives-jna" ) )
 }

 tasks {
@@ -47,6 +39,7 @@ tasks {
 		dependsOn( ":flatlaf-core:jar" )
 		dependsOn( ":flatlaf-extras:jar" )
 		dependsOn( ":flatlaf-intellij-themes:jar" )
+//		dependsOn( ":flatlaf-natives-jna:jar" )

 		manifest {
 			attributes( "Main-Class" to "com.formdev.flatlaf.demo.FlatLafDemo" )
@@ -68,24 +61,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-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
@@ -32,7 +32,10 @@ import com.formdev.flatlaf.demo.intellijthemes.*;
 import com.formdev.flatlaf.extras.FlatAnimatedLafChange;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
+import com.formdev.flatlaf.extras.components.FlatButton;
+import com.formdev.flatlaf.extras.components.FlatButton.ButtonType;
 import com.formdev.flatlaf.extras.FlatSVGUtils;
+import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
 import com.formdev.flatlaf.ui.JBRCustomDecorations;
 import net.miginfocom.layout.ConstraintParser;
 import net.miginfocom.layout.LC;
@@ -142,15 +145,19 @@ class DemoFrame
 		boolean windowDecorations = windowDecorationsCheckBoxMenuItem.isSelected();

 		// change window decoration of demo main frame
-		dispose();
-		setUndecorated( windowDecorations );
-		getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
+		if( FlatNativeWindowBorder.isSupported() ) {
+			FlatNativeWindowBorder.setHasCustomDecoration( this, windowDecorations );
+			getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
+		} else {
+			dispose();
+			setUndecorated( windowDecorations );
+			getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
+			setVisible( true );
+		}
 		menuBarEmbeddedCheckBoxMenuItem.setEnabled( windowDecorations );
-		setVisible( true );

 		// enable/disable window decoration for later created frames/dialogs
-		JFrame.setDefaultLookAndFeelDecorated( windowDecorations );
-		JDialog.setDefaultLookAndFeelDecorated( windowDecorations );
+		UIManager.put( "TitlePane.useWindowDecorations", windowDecorations );
 	}

 	private void menuBarEmbeddedChanged() {
@@ -163,6 +170,11 @@ class DemoFrame
 //		repaint();
 	}

+	private void unifiedTitleBar() {
+		UIManager.put( "TitlePane.unifiedBackground", unifiedTitleBarMenuItem.isSelected() );
+		FlatLaf.updateUI();
+	}
+
 	private void underlineMenuSelection() {
 		UIManager.put( "MenuItem.selectionType", underlineMenuSelectionMenuItem.isSelected() ? "underline" : null );
 	}
@@ -327,6 +339,7 @@ class DemoFrame
 		optionsMenu = new JMenu();
 		windowDecorationsCheckBoxMenuItem = new JCheckBoxMenuItem();
 		menuBarEmbeddedCheckBoxMenuItem = new JCheckBoxMenuItem();
+		unifiedTitleBarMenuItem = new JCheckBoxMenuItem();
 		underlineMenuSelectionMenuItem = new JCheckBoxMenuItem();
 		alwaysShowMnemonicsMenuItem = new JCheckBoxMenuItem();
 		animatedLafChangeMenuItem = new JCheckBoxMenuItem();
@@ -588,6 +601,11 @@ class DemoFrame
 				menuBarEmbeddedCheckBoxMenuItem.addActionListener(e -> menuBarEmbeddedChanged());
 				optionsMenu.add(menuBarEmbeddedCheckBoxMenuItem);

+				//---- unifiedTitleBarMenuItem ----
+				unifiedTitleBarMenuItem.setText("Unified Title Bar");
+				unifiedTitleBarMenuItem.addActionListener(e -> unifiedTitleBar());
+				optionsMenu.add(unifiedTitleBarMenuItem);
+
 				//---- underlineMenuSelectionMenuItem ----
 				underlineMenuSelectionMenuItem.setText("Use underline menu selection");
 				underlineMenuSelectionMenuItem.addActionListener(e -> underlineMenuSelection());
@@ -702,6 +720,15 @@ class DemoFrame
 		buttonGroup1.add(radioButtonMenuItem3);
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents

+		// add "Users" button to menubar
+		FlatButton usersButton = new FlatButton();
+		usersButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/users.svg" ) );
+		usersButton.setButtonType( ButtonType.toolBarButton );
+		usersButton.setFocusable( false );
+		usersButton.addActionListener( e -> JOptionPane.showMessageDialog( null, "Hello User! How are you?", "User", JOptionPane.INFORMATION_MESSAGE ) );
+		menuBar1.add( Box.createGlue() );
+		menuBar1.add( usersButton );
+
 		undoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/undo.svg" ) );
 		redoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/redo.svg" ) );

@@ -722,7 +749,7 @@ class DemoFrame
 		pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() );

 		boolean supportsWindowDecorations = UIManager.getLookAndFeel()
-			.getSupportsWindowDecorations() || JBRCustomDecorations.isSupported();
+			.getSupportsWindowDecorations() || FlatNativeWindowBorder.isSupported();
 		windowDecorationsCheckBoxMenuItem.setEnabled( supportsWindowDecorations && !JBRCustomDecorations.isSupported() );
 		menuBarEmbeddedCheckBoxMenuItem.setEnabled( supportsWindowDecorations );

@@ -744,6 +771,7 @@ class DemoFrame
 	private JMenu optionsMenu;
 	private JCheckBoxMenuItem windowDecorationsCheckBoxMenuItem;
 	private JCheckBoxMenuItem menuBarEmbeddedCheckBoxMenuItem;
+	private JCheckBoxMenuItem unifiedTitleBarMenuItem;
 	private JCheckBoxMenuItem underlineMenuSelectionMenuItem;
 	private JCheckBoxMenuItem alwaysShowMnemonicsMenuItem;
 	private JCheckBoxMenuItem animatedLafChangeMenuItem;
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.2.0.298" Java: "15" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"

 new FormModel {
 	contentType: "form/swing"
@@ -360,6 +360,14 @@ new FormModel {
 						}
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuBarEmbeddedChanged", false ) )
 					} )
+					add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
+						name: "unifiedTitleBarMenuItem"
+						"text": "Unified Title Bar"
+						auxiliary() {
+							"JavaCodeGenerator.variableLocal": false
+						}
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "unifiedTitleBar", false ) )
+					} )
 					add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
 						name: "underlineMenuSelectionMenuItem"
 						"text": "Use underline menu selection"
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/FlatLafDemo.java
@@ -17,8 +17,6 @@
 package com.formdev.flatlaf.demo;

 import java.awt.Dimension;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.extras.FlatInspector;
@@ -46,10 +44,6 @@ public class FlatLafDemo
 		SwingUtilities.invokeLater( () -> {
 			DemoPrefs.init( PREFS_ROOT_PATH );

-			// enable window decorations
-			JFrame.setDefaultLookAndFeelDecorated( true );
-			JDialog.setDefaultLookAndFeelDecorated( true );
-
 			// application specific UI defaults
 			FlatLaf.registerCustomDefaultsSource( "com.formdev.flatlaf.demo" );

--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/users.svg
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/users.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><rect id="frame" width="16" height="16" fill="none"/><path d="M11.6 8.5c1.104 0 1.992-.88 1.992-1.964 0-1.085-.888-1.965-1.992-1.965s-2 .88-2 1.965c0 1.084.896 1.964 2 1.964zm-6-.786c1.328 0 2.392-1.053 2.392-2.357C7.992 4.053 6.928 3 5.6 3 4.272 3 3.2 4.053 3.2 5.357c0 1.304 1.072 2.357 2.4 2.357zm6 2.357c-1.464 0-4.4.723-4.4 2.161V14H16v-1.768c0-1.438-2.936-2.16-4.4-2.16zm-6-.785c-1.864 0-5.6.919-5.6 2.75V14h5.6v-1.768c0-.668.264-1.838 1.896-2.726-.696-.142-1.368-.22-1.896-.22z" fill="#6E6E6E"/></svg>
--- 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
@@ -38,6 +38,9 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
 import java.awt.event.MouseMotionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Field;
@@ -48,6 +51,8 @@ import javax.swing.JRootPane;
 import javax.swing.JToolBar;
 import javax.swing.JToolTip;
 import javax.swing.KeyStroke;
+import javax.swing.Popup;
+import javax.swing.PopupFactory;
 import javax.swing.RootPaneContainer;
 import javax.swing.SwingUtilities;
 import javax.swing.border.Border;
@@ -55,7 +60,7 @@ 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.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.UIScale;

@@ -83,7 +88,6 @@ import com.formdev.flatlaf.util.UIScale;
 public class FlatInspector
 {
 	private static final Integer HIGHLIGHT_LAYER = 401;
-	private static final Integer TOOLTIP_LAYER = 402;

 	private static final int KEY_MODIFIERS_MASK = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK;

@@ -91,6 +95,8 @@ public class FlatInspector
 	private final MouseMotionListener mouseMotionListener;
 	private final AWTEventListener keyListener;
 	private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport( this );
+	private final WindowListener windowListener;
+	private Window window;

 	private boolean enabled;
 	private Component lastComponent;
@@ -100,7 +106,7 @@ public class FlatInspector
 	private boolean wasCtrlOrShiftKeyPressed;

 	private JComponent highlightFigure;
-	private JToolTip tip;
+	private Popup popup;

 	/**
 	 * Installs a key listener into the application that allows enabling and disabling
@@ -190,6 +196,18 @@ public class FlatInspector
 				}
 			}
 		};
+
+		windowListener = new WindowAdapter() {
+			@Override
+			public void windowActivated( WindowEvent e ) {
+				update();
+			}
+
+			@Override
+			public void windowDeactivated( WindowEvent e ) {
+				hidePopup();
+			}
+		};
 	}

 	private void uninstall() {
@@ -222,12 +240,26 @@ public class FlatInspector

 		rootPane.getGlassPane().setVisible( enabled );

+		// add/remove key listener
 		Toolkit toolkit = Toolkit.getDefaultToolkit();
 		if( enabled )
 			toolkit.addAWTEventListener( keyListener, AWTEvent.KEY_EVENT_MASK );
 		else
 			toolkit.removeAWTEventListener( keyListener );

+		// add/remove window listener
+		if( enabled ) {
+			window = SwingUtilities.windowForComponent( rootPane );
+			if( window != null )
+				window.addWindowListener( windowListener );
+		} else {
+			if( window != null ) {
+				window.removeWindowListener( windowListener );
+				window = null;
+			}
+		}
+
+		// show/hide popup
 		if( enabled ) {
 			Point pt = new Point( MouseInfo.getPointerInfo().getLocation() );
 			SwingUtilities.convertPointFromScreen( pt, rootPane );
@@ -243,14 +275,19 @@ public class FlatInspector
 				highlightFigure.getParent().remove( highlightFigure );
 			highlightFigure = null;

-			if( tip != null )
-				tip.getParent().remove( tip );
-			tip = null;
+			hidePopup();
 		}

 		propertyChangeSupport.firePropertyChange( "enabled", !enabled, enabled );
 	}

+	private void hidePopup() {
+		if( popup != null ) {
+			popup.hide();
+			popup = null;
+		}
+	}
+
 	public void update() {
 		if( !rootPane.getGlassPane().isVisible() )
 			return;
@@ -304,7 +341,7 @@ public class FlatInspector
 					continue;

 				// ignore highlight figure and tooltip
-				if( c == highlightFigure || c == tip )
+				if( c == highlightFigure )
 					continue;

 				// ignore glass pane
@@ -358,31 +395,24 @@ public class FlatInspector
 	}

 	private void showToolTip( Component c, int x, int y, int parentLevel ) {
-		if( c == null ) {
-			if( tip != null )
-				tip.setVisible( false );
+		hidePopup();
+
+		if( c == null || (window != null && !window.isActive()) )
 			return;
-		}
-
-		if( tip == null ) {
-			tip = new JToolTip() {
-				@Override
-				public void updateUI() {
-					setUI( FlatToolTipUI.createUI( this ) );
-				}
-			};
-			rootPane.getLayeredPane().add( tip, TOOLTIP_LAYER );
-		} else
-			tip.setVisible( true );

+		JToolTip tip = new JToolTip();
 		tip.setTipText( buildToolTipText( c, parentLevel ) );
+		tip.putClientProperty( FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, true );
+
+		Point pt = new Point( x, y );
+		SwingUtilities.convertPointToScreen( pt, rootPane.getGlassPane() );
+		int tx = pt.x + UIScale.scale( 8 );
+		int ty = pt.y + UIScale.scale( 16 );

-		int tx = x + UIScale.scale( 8 );
-		int ty = y + UIScale.scale( 16 );
 		Dimension size = tip.getPreferredSize();

 		// position the tip in the visible area
-		Rectangle visibleRect = rootPane.getVisibleRect();
+		Rectangle visibleRect = rootPane.getGraphicsConfiguration().getBounds();
 		if( tx + size.width > visibleRect.x + visibleRect.width )
 			tx -= size.width + UIScale.scale( 16 );
 		if( ty + size.height > visibleRect.y + visibleRect.height )
@@ -392,20 +422,25 @@ public class FlatInspector
 		if( ty < visibleRect.y )
 			ty = visibleRect.y;

-		tip.setBounds( tx, ty, size.width, size.height );
-		tip.repaint();
+		PopupFactory popupFactory = PopupFactory.getSharedInstance();
+		popup = popupFactory.getPopup( c, tip, tx, ty );
+		popup.show();
 	}

 	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';
+		Package pkg = c.getClass().getPackage();
+		appendRow( buf, "Class", name + " (" + (pkg != null ? pkg.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,29 +453,29 @@ 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';
-			} catch( NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex ) {
+				appendRow( buf, "UI", (ui != null ? ui.getClass().getName() : "null") );
+			} catch( Exception ex ) {
 				// ignore
 			}
 		}
@@ -448,34 +483,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>" )
+			.append( key )
+			.append( ":</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 +530,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-extras/src/main/resources/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties
+++ b/flatlaf-extras/src/main/resources/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties
@@ -210,3 +210,13 @@ ToggleButton.toolbar.pressedBackground = ToggleButton.background
 ToggleButton.toolbar.selectedBackground = ToggleButton.background

 ToggleButton.tab.hoverBackground = null
+
+
+
+
+#---- JideButton ----
+
+JideButton.focusedBackground = JideButton.background
+JideButton.selectedAndFocusedBackground = JideButton.background
+JideButton.selectedBackground = JideButton.background
+JideButton.highlight = null
--- 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/java/com/formdev/flatlaf/intellijthemes/Utils.java
+++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/Utils.java
@@ -17,25 +17,21 @@
 package com.formdev.flatlaf.intellijthemes;

 import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.IntelliJTheme;
+import com.formdev.flatlaf.util.LoggingFacade;

 /**
 * @author Karl Tauber
 */
 class Utils
 {
-	static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() );
-
 	static IntelliJTheme loadTheme( String name ) {
 		try {
 			return new IntelliJTheme( Utils.class.getResourceAsStream(
 				"/com/formdev/flatlaf/intellijthemes/themes/" + name ) );
 		} catch( IOException ex ) {
 			String msg = "FlatLaf: Failed to load IntelliJ theme '" + name + "'";
-			LOG.log( Level.SEVERE, msg, ex );
+			LoggingFacade.INSTANCE.logSevere( msg, ex );
 			throw new RuntimeException( msg, ex );
 		}
 	}
--- a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/materialthemeuilite/Utils.java
+++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/materialthemeuilite/Utils.java
@@ -17,25 +17,21 @@
 package com.formdev.flatlaf.intellijthemes.materialthemeuilite;

 import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.IntelliJTheme;
+import com.formdev.flatlaf.util.LoggingFacade;

 /**
 * @author Karl Tauber
 */
 class Utils
 {
-	static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() );
-
 	static IntelliJTheme loadTheme( String name ) {
 		try {
 			return new IntelliJTheme( Utils.class.getResourceAsStream(
 				"/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/" + name ) );
 		} catch( IOException ex ) {
 			String msg = "FlatLaf: Failed to load IntelliJ theme '" + name + "'";
-			LOG.log( Level.SEVERE, msg, ex );
+			LoggingFacade.INSTANCE.logSevere( msg, ex );
 			throw new RuntimeException( msg, ex );
 		}
 	}
--- a/flatlaf-intellij-themes/src/main/module-info/module-info.java
+++ b/flatlaf-intellij-themes/src/main/module-info/module-info.java
@@ -19,7 +19,6 @@
 */
 module com.formdev.flatlaf.intellijthemes {
 	requires java.desktop;
-	requires java.logging;
 	requires com.formdev.flatlaf;

 	exports com.formdev.flatlaf.intellijthemes;
--- 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
@@ -6,8 +6,13 @@ This addon for FlatLaf adds support for **some**

 Following JIDE Common Layer components are currently supported by this addon:

+- `JideButton`
+- `JideLabel`
 - `JidePopupMenu`
+- `JideSplitButton`
 - `JideTabbedPane`
+- `JideToggleButton`
+- `JideToggleSplitButton`
 - `RangeSlider`
 - `TristateCheckBox`

@@ -21,8 +26,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 +37,10 @@ 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)
+
+
+JIDE Common Layer library `jide-oss-<version>.jar` (or
+`jide-common-<version>.jar`) is also required:
+
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.formdev/jide-oss/badge.svg?style=flat-square&color=007ec6)](https://maven-badges.herokuapp.com/maven-central/com.formdev/jide-oss)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Karl Tauber	95312c3650	release 1.1.1	2021-03-28 16:04:14 +02:00
Karl Tauber	9006e835c6	natives.yml: exclude ~/.gradle/caches/modules-2/modules-2.lock from Gradle cache	2021-03-26 21:52:28 +01:00
Karl Tauber	f801d61929	support running on WinPE (issue #279 )	2021-03-26 21:51:11 +01:00
Karl Tauber	a143e5777c	Extras: FlatInspector: fixed `InaccessibleObjectException` when running in Java 16	2021-03-26 21:44:41 +01:00
Karl Tauber	bf500e46e7	Window decorations: fixed wrong/missing window icon when application replaces InternalFrame.icon (issue #284 )	2021-03-25 16:14:41 +01:00
Karl Tauber	4a2f79f390	Native window decorations: updated DLLs (issues #282 and #283 ) built by GitHub Actions: https://github.com/JFormDesigner/FlatLaf/actions/runs/686023039	2021-03-25 11:10:13 +01:00
Karl Tauber	c24ce7c5bc	Native window decorations: fixed broken maximizing window when restoring frame state at startup (issue #283 )	2021-03-25 10:32:24 +01:00
Karl Tauber	8a6a0c7971	Native window decorations: fixed missing animations when minimizing, maximizing or restoring a window using window title bar buttons (issue #282 )	2021-03-24 23:59:59 +01:00
Karl Tauber	de6e5bd800	fixed missing focus indicators in heavy-weight popups (issue #273 )	2021-03-24 11:43:06 +01:00
Karl Tauber	e18a04f9e6	Merge pull request #278 from ingokegel/native_provider_setter Add a setter for the native provider	2021-03-24 11:34:22 +01:00
Karl Tauber	14fc652f4b	Window decorations: fixed right aligned progress bar in embedded menu bar was overlapping window title (issue #272 )	2021-03-23 19:23:18 +01:00
Ingo Kegel	9a876e747a	Added setter for native provider This makes it possible to support situations where the extraction of a DLL at runtime is not possible	2021-03-23 16:47:08 +01:00
Karl Tauber	f8ee8b27fb	InternalFrame: fixed translucent internal frame menu bar background if `TitlePane.unifiedBackground` is `true` (issue #274 )	2021-03-23 15:08:01 +01:00
Karl Tauber	ce1a1487aa	support menu bars in JDialog	2021-03-23 14:58:53 +01:00
Karl Tauber	fe1e364a1d	Native window decorations: support disabling native window decorations per window via client property (issue #277 )	2021-03-23 13:18:07 +01:00
Karl Tauber	eabb052107	Native window decorations: fixed double window title bar when first disposing a window and then showing it again (issue #277 )	2021-03-23 10:07:43 +01:00
Karl Tauber	734f3621f1	Window decorations: Fixed NPE in `FlatTitlePane.findHorizontalGlue()` (issue #275 )	2021-03-22 18:47:53 +01:00
Karl Tauber	9612a81f2e	release 1.1	2021-03-21 14:03:36 +01:00
Karl Tauber	2945a36cef	added since 1.1	2021-03-21 13:53:57 +01:00
Karl Tauber	b84dc5bfcc	JIDE and SwingX: README.md: added links to dependencies on maven central	2021-03-21 13:29:23 +01:00
Karl Tauber	60486fd880	JIDE: build using latest version of JIDE library `com.formdev:jide-oss:3.7.11.1`	2021-03-20 19:19:33 +01:00
Karl Tauber	891091cebc	SwingX: fixed compiling module-info (broken since previous commit)	2021-03-19 17:06:23 +01:00
Karl Tauber	1493ddcf41	SwingX: the library on Maven Central no longer depends on `org.swinglabs.swingx:swingx-all:1.6.5-1` to avoid problems when another SwingX library should be used	2021-03-19 16:23:29 +01:00
Karl Tauber	4299c50537	JIDE: the library on Maven Central no longer depends on `com.jidesoft:jide-oss:3.6.18` to avoid problems when another JIDE library should be used (issue #270 )	2021-03-19 16:22:24 +01:00
Karl Tauber	14577c396d	JIDE: fixed hover/selection background colors of `JideSplitButton` and `JideSplitToggleButton`	2021-03-19 15:59:59 +01:00
Karl Tauber	e9b566241d	JIDE: support `JideSplitButton` and `JideSplitToggleButton`	2021-03-19 15:39:32 +01:00
Karl Tauber	d39b08c035	FlatArrowButton: refactored arrow painting to FlatUIUtils.paintArrow() so that it can be easily used other components (e.g. JideSplitButton)	2021-03-19 01:21:19 +01:00
Karl Tauber	69ac683c8c	Support running in JetBrains Projector (https://jetbrains.com/projector/)	2021-03-17 00:43:08 +01:00
Karl Tauber	eafd0b3d06	use lambdas for listeners (where possible) instead of extending `BasicUI.Handler` classes some of those `BasicUI.Handler` classes may be deprecated in a future Java version (see https://github.com/openjdk/jdk/pull/1958) this should also avoid loading of those `BasicUI.Handler` classes at runtime	2021-03-17 00:34:35 +01:00
Karl Tauber	310a4989dc	JIDE: made used fonts "active" and restored fonts modified in `LookAndFeelFactory.installJideExtension()`	2021-03-16 23:23:40 +01:00
Karl Tauber	3d0df51839	JIDE: support `JideLabel` to fix wrong text colors in dark themes	2021-03-16 22:52:13 +01:00
Karl Tauber	ede02aaaa5	TabbedPane: use float arc for tab area button background	2021-03-16 22:20:46 +01:00
Karl Tauber	beff149004	JIDE: support `JideButton` and `JideToggleButton`	2021-03-16 22:15:32 +01:00
Karl Tauber	07db6e8fb0	Extras: FlatInspector: fixed NPE if component class is in default package	2021-03-16 13:46:25 +01:00
Karl Tauber	46852c0780	JIDE: invoke `LookAndFeelFactory.installJideExtension()` early in FlatJidePopupMenuUI to be sure that Jide extensions are installed	2021-03-16 13:26:36 +01:00
Karl Tauber	a5e41c573f	JIDE: UIDefaultsDump: dump UI defaults added by `LookAndFeelFactory.installJideExtension()`	2021-03-16 11:38:49 +01:00
Karl Tauber	9a94395d30	JIDE: split `FlatJideOssTest` (moved `JideTabbedPane` to FlatJideOssContainerTest`)	2021-03-15 17:40:31 +01:00
Karl Tauber	04aa61c2bb	Merge pull request #268 from title-pane-improvements Title pane improvements (Windows 10 only)	2021-03-14 17:39:50 +01:00
Karl Tauber	035a13df54	Window decorations: support unified backgrounds for window title bar, menu bar and main content (issue #254 )	2021-03-14 15:13:26 +01:00
Karl Tauber	e8a6f0ca3d	Native window decorations: added flatlaf-windows-x86.dll and updated flatlaf-windows-x86_64.dll built by GitHub Actions: https://github.com/JFormDesigner/FlatLaf/actions/runs/650060630	2021-03-14 00:20:22 +01:00
Karl Tauber	1fc519b9de	natives.yml: run "Native Libraries" also when natives.yml changed	2021-03-14 00:02:01 +01:00
Karl Tauber	2bcf38e2e3	natives.yml: run "Native Libraries" on any change in native project (e.g. when changing Gradle build script)	2021-03-13 23:59:30 +01:00
Karl Tauber	8eb44a68cb	Native window decorations: support 32-bit JREs	2021-03-13 23:41:38 +01:00
Karl Tauber	30c7b442a8	Window decorations: - support customizing of window title alignment: left aligned or centered (default is left without embedded menubar and centered with embedded menubar) - improved centering of window title with embedded menubar (issue #252)	2021-03-13 17:08:47 +01:00
Karl Tauber	cee2211108	Demo: added "users" icon to right side of menu bar to demonstrate this feature	2021-03-13 11:14:51 +01:00
Karl Tauber	b7bcbccd45	Window decorations: support right aligned extra components in `JFrame` title pane with embedded menu bar	2021-03-13 11:10:50 +01:00
Karl Tauber	d2ccb97eba	Native window decorations: use LoggingFacade	2021-03-12 23:18:13 +01:00
Karl Tauber	39d56f2603	Merge pull request #267 from native-window-decorations Native window decorations for Windows 10 (using JNI)	2021-03-12 23:15:19 +01:00
Karl Tauber	83e904dd2d	Merge pull request #262 from native-window-decorations-jna Native window decorations for Windows 10 (using JNA)	2021-03-12 23:08:35 +01:00
Karl Tauber	110c787eba	Merge pull request #265 from ingokegel:optional_logging Make the module dependency on java.logging optional	2021-03-12 22:57:04 +01:00
Karl Tauber	7c7ff289de	removed module `java.logging` from `module-info.java`s	2021-03-12 22:52:59 +01:00
Karl Tauber	617a35c51b	LoggingFacade: - make LoggingFacadeImpl classes package private - added missing @Override - minor formatting changes	2021-03-12 21:16:57 +01:00
Karl Tauber	73487ccf65	Native window decorations: - enabled by default (via UI property `TitlePane.useWindowDecorations`) - dropped system property `flatlaf.useNativeWindowDecorations` and replaced with `flatlaf.useWindowDecorations` - old functionality of system property `flatlaf.useWindowDecorations` removed	2021-03-11 10:54:23 +01:00
Ingo Kegel	712bff9c99	Use System.Logger for logging with Java 9+	2021-03-10 17:56:27 +01:00
Ingo Kegel	eedfcf86aa	LoggingFacade: moved to com.formdev.flatlaf.util, added license header, fixed NPEs in logging calls and removed overloads of logSevere	2021-03-10 17:06:12 +01:00
Karl Tauber	f730848928	Native window decorations: added flatlaf-windows-x86_64.dll built by GitHub Actions: https://github.com/JFormDesigner/FlatLaf/actions/runs/636694710	2021-03-10 16:16:50 +01:00
Karl Tauber	61d0574c5c	Native window decorations: added READMEs	2021-03-09 19:08:53 +01:00
Karl Tauber	2f01e01ec1	Native window decorations: delete temporary DLLs on next startup (same approach as used in JNA)	2021-03-07 00:10:15 +01:00
Karl Tauber	cbcf66df7f	Native window decorations: fixed enabled items is system menu	2021-03-06 16:23:10 +01:00
Karl Tauber	cfaeea039b	Native window decorations: fixed enabled items is system menu	2021-03-06 16:21:22 +01:00
Karl Tauber	a891d1eb54	Native window decorations: never build :flatlaf-natives-windows:jar because it is not used/needed	2021-03-06 15:26:18 +01:00
Karl Tauber	4372052ef0	Native window decorations: do not try to build native library (on Windows) if no C++ compiler is available	2021-03-06 15:18:23 +01:00
Karl Tauber	8734b062dc	Native window decorations: avoid using C-runtime, which reduces the DLL size from 100kb to 8kb	2021-03-06 12:01:49 +01:00
Ingo Kegel	343451de65	Make the module dependency on java.logging optional Currently, FlatLaf has the following module dependencies: $ jdeps --list-deps --multi-release 9 flatlaf-1.0.jar java.base java.desktop java.logging This commit makes the java.logging dependency optional and hides logging behind a facade that falls back to printing to stderr if the java.logging module is not available. To test, create a reduced JRE with a command like jdk-15/bin/jlink.exe --module-path jdk-15/jmods --add-modules java.desktop --add-modules java.instrument --output jre-15-desktop-only (adding java.instrument, so the FlatLafDemo main class can be started from IntelliJ IDEA)	2021-03-05 16:44:08 +01:00
Karl Tauber	144d65c776	Native window decorations: initial implementation in C++ using JNI	2021-03-05 10:31:31 +01:00
Karl Tauber	a6815574f7	Native window decorations: renamed project `flatlaf-native-jna` to `flatlaf-natives/flatlaf-natives-jna` removed module-info.java because this JAR is not released/published	2021-03-04 11:04:47 +01:00
Karl Tauber	e5a116a0d4	Extras: FlatInspector: removed println (fixes #263 )	2021-02-25 16:54:05 +01:00
Karl Tauber	0beef6b108	README.md: new applications using FlatLaf: - install4j	2021-02-25 00:00:30 +01:00
Karl Tauber	7341008449	Native window decorations: fixed missing top border line	2021-02-24 23:17:41 +01:00
Karl Tauber	49bd53194a	Native window decorations: show window system menu when left-clicking on application icon, close window on left-double-click on app icon	2021-02-23 23:31:36 +01:00
Karl Tauber	baf4437efc	Native window decorations: show window system menu when right-clicking on caption	2021-02-23 01:10:59 +01:00
Karl Tauber	b244f80f81	Native window decorations: support autohide taskbar	2021-02-22 22:57:43 +01:00
Karl Tauber	e41c91a42b	Native window decorations: fixed exception when switching Laf after closing a dialog	2021-02-22 09:56:40 +01:00
Karl Tauber	b9a2e3ceac	Native window decorations: initial implementation (using JNA; will be replaced with JNI later)	2021-02-21 17:51:19 +01:00
Karl Tauber	fa7dd3bdc4	GitHub Actions: upload all built libs	2021-02-21 17:18:59 +01:00
Karl Tauber	9a8c68b846	GitHub Actions: renamed master to main	2021-02-19 16:38:25 +01:00
Karl Tauber	698e33ddf4	IntelliJ Themes: fixed text color of CheckBoxMenuItem and RadioButtonMenuItem in all "Arc" themes (issue #259 )	2021-02-19 11:33:15 +01:00
Karl Tauber	909258ba14	README.md: added "Getting started" and direct links to documentation	2021-02-14 12:32:56 +01:00
Karl Tauber	2ad6bd1d23	release 1.0	2021-02-13 13:42:04 +01:00
Karl Tauber	510ffd41d8	PopupFactory: fixed `NullPointerException` when `PopupFactory.getPopup()` is invoked with parameter `owner` set to `null`	2021-02-13 13:31:30 +01:00
Karl Tauber	4f00591c4e	Table: fixed wrong grid line thickness in dragged column on HiDPI screens on Java 9+ (issue #236 )	2021-02-12 11:32:12 +01:00
Karl Tauber	5b65ed87cd	FileChooser: fixed display of date in details view if current user is selected in "Look in" combobox (Windows 10 only; issue #249 )	2021-02-12 11:10:25 +01:00
Karl Tauber	b0121c422d	GitHub Actions: added Gradle wrapper validation	2021-02-11 23:52:11 +01:00
Karl Tauber	a9e9fad222	Extras: FlatInspector: tooltip is no longer limited to window bounds	2021-02-11 18:23:01 +01:00
Karl Tauber	b5fc07acc7	TabbedPane: custom `TabbedPane.selectedForeground` color did not work when `TabbedPane.foreground` has also custom color (issue #257 )	2021-02-11 12:04:36 +01:00
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
				`@@ -0,0 +1 @@`
				<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><rect id="frame" width="16" height="16" fill="none"/><path d="M11.6 8.5c1.104 0 1.992-.88 1.992-1.964 0-1.085-.888-1.965-1.992-1.965s-2 .88-2 1.965c0 1.084.896 1.964 2 1.964zm-6-.786c1.328 0 2.392-1.053 2.392-2.357C7.992 4.053 6.928 3 5.6 3 4.272 3 3.2 4.053 3.2 5.357c0 1.304 1.072 2.357 2.4 2.357zm6 2.357c-1.464 0-4.4.723-4.4 2.161V14H16v-1.768c0-1.438-2.936-2.16-4.4-2.16zm-6-.785c-1.864 0-5.6.919-5.6 2.75V14h5.6v-1.768c0-.668.264-1.838 1.896-2.726-.696-.142-1.368-.22-1.896-.22z" fill="#6E6E6E"/></svg>