release 1.0-rc1

Also changed auto-inverse threshold from 50% to 65% for increase and 35% for decrease, because this gives much better results for slider hover and pressed colors. This does not change other colors in core themes, but few colors in some IntelliJ themes (usually checkbox hover/pressed).

CHANGELOG.md

@@ -1,6 +1,63 @@
 FlatLaf Change Log
 ==================
 
+## 1.0-rc1
+
+#### New features and improvements
+
+- Button: Disabled `Button.defaultButtonFollowsFocus` on Windows (as on other
+  platforms). If you like to keep the old behavior in your application, use:
+  `if(SystemInfo.isWindows)
+  UIManager.put("Button.defaultButtonFollowsFocus",true);`.
+- ComboBox, Spinner and SplitPaneDivider: Added pressed feedback to arrow
+  buttons.
+- Slider: Support per component custom thumb and track colors via
+  `JSlider.setForeground(Color)` and `JSlider.setBackground(Color)`.
+- Slider: Improved thumb hover and pressed colors.
+- TextComponent: Clip placeholder text if it does not fit into visible area. (PR
+  #229)
+- macOS: Improved font rendering on macOS when using JetBrains Runtime. (PRs
+  #237, #239 and #241)
+- Extras: UI defaults inspector:
+  - Support embedding UI defaults inspector panel into any window. See
+    `FlatUIDefaultsInspector.createInspectorPanel()`.
+  - Copy selected keys and values into clipboard via context menu.
+  - Support wildcard matching in filter (`*` matches any number of characters,
+    `?` matches a single character, `^` beginning of line, `$` end of line).
+- IntelliJ Themes:
+  - Added hover and pressed feedback to Button, CheckBox, RadioButton and
+    ToggleButton. (issue #176)
+  - Added "Material Theme UI Lite / Moonlight" theme.
+  - Updated "Dracula", "Gradianto" and "Material Theme UI Lite" themes.
+
+#### Fixed bugs
+
+- Button and ToggleButton: Threat Unicode surrogate character pair as single
+  character and make button square. (issue #234)
+- Button and ToggleButton: ToolBar buttons now respect explicitly set background
+  color. If no background color is set, then the button background is not
+  painted anymore. (issue #191)
+- ToggleButton: Tab style buttons (client property `JButton.buttonType` is
+  `tab`) now respect explicitly set background color.
+- TabbedPane: Fixed `IndexOutOfBoundsException` when using tooltip text on close
+  buttons and closing last/rightmost tab. (issue #235)
+- TabbedPane: Fixed scrolling tabs with touchpads and high-resolution mouse
+  wheels.
+- Extras: Added missing export of package
+  `com.formdev.flatlaf.extras.components` to Java 9 module descriptor.
+- JIDE Common Layer:
+  - Invoke `LookAndFeelFactory.installJideExtension()` when using FlatLaf UI
+    delegates. (issue #230)
+  - RangeSlider: Fixed slider focused colors in IntelliJ themes.
+- IntelliJ Themes:
+  - Fixed menu item check colors.
+  - Fixed `MenuItem.underlineSelectionColor`.
+  - Fixed List, Tree and Table `selectionInactiveForeground` in light Arc
+    themes.
+  - Fixed List and Table background colors in Material UI Lite themes.
+  - Fixed menu accelerator colors in Monocai theme. (issue #243)
+
+
 ## 0.46
 
 #### New features and improvements

README.md

@@ -73,6 +73,20 @@ Addons
 - [JIDE Common Layer](flatlaf-jide-oss)
 
 
+Documentation
+-------------
+
+For more information and documentation visit
+[FlatLaf Home](https://www.formdev.com/flatlaf/)
+
+
+Buzz
+----
+
+- [What others say about FlatLaf on Twitter](https://twitter.com/search?f=live&q=flatlaf)
+- [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)
+
+
 Projects using FlatLaf
 ----------------------
 
@@ -112,14 +126,14 @@ Projects using FlatLaf
   [OFTP2](https://mendelson-e-c.com/oftp2) (commercial)
 - [MeteoInfo](https://github.com/meteoinfo/MeteoInfo) 2.2 - GIS and scientific
   computation environment for meteorological community
-- [lsfusion platform](https://github.com/lsfusion/platform) - information
+- [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
 - [Jes - Die Java-EÜR](https://www.jes-eur.de)
 - [Mapton](https://mapton.org/) 2.0
-  ([source code](https://github.com/trixon/mapton)) based on NetBeans platform -
-  some kind of map application
+  ([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)
@@ -147,17 +161,3 @@ Projects using FlatLaf
   [Android Tool](https://github.com/fast-geek/Android-Tool) - makes popular adb
   and fastboot commands easier to use
 - and more...
-
-
-Buzz
-----
-
-- [What others say about FlatLaf on Twitter](https://twitter.com/search?f=live&q=flatlaf)
-- [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)
-
-
-Documentation
--------------
-
-For more information and documentation visit
-[FlatLaf Home](https://www.formdev.com/flatlaf/)

build.gradle.kts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-val releaseVersion = "0.46"
-val developmentVersion = "0.47-SNAPSHOT"
+val releaseVersion = "1.0-rc1"
+val developmentVersion = "1.0-rc2-SNAPSHOT"
 
 version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
 
@@ -64,7 +64,7 @@ allprojects {
 			// manifest for all created JARs
 			manifest.attributes(mapOf(
 				"Implementation-Vendor" to "FormDev Software GmbH",
-				"Implementation-Copyright" to "Copyright (C) ${java.time.LocalDate.now().year} FormDev Software GmbH. All rights reserved.",
+				"Implementation-Copyright" to "Copyright (C) 2019-${java.time.LocalDate.now().year} FormDev Software GmbH. All rights reserved.",
 				"Implementation-Version" to project.version))
 
 			// add META-INF/LICENSE to all created JARs

buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts

@@ -63,8 +63,14 @@ publishing {
 				}
 
 				scm {
+					connection.set( "scm:git:git://github.com/JFormDesigner/FlatLaf.git" )
 					url.set( "https://github.com/JFormDesigner/FlatLaf" )
 				}
+
+				issueManagement {
+					system.set( "GitHub" )
+					url.set( "https://github.com/JFormDesigner/FlatLaf/issues" )
+				}
 			}
 		}
 	}

flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java

@@ -467,8 +467,13 @@ public abstract class FlatLaf
 		} else if( SystemInfo.isMacOS ) {
 			String fontName;
 			if( SystemInfo.isMacOS_10_15_Catalina_orLater ) {
+				if (SystemInfo.isJetBrainsJVM_11_orLater) {
+					// See https://youtrack.jetbrains.com/issue/JBR-1915
+					fontName = ".AppleSystemUIFont";
+				} else {
 					// use Helvetica Neue font
 					fontName = "Helvetica Neue";
+				}
 			} else if( SystemInfo.isMacOS_10_11_ElCapitan_orLater ) {
 				// use San Francisco Text font
 				fontName = ".SF NS Text";
@@ -541,7 +546,12 @@ public abstract class FlatLaf
 	}
 
 	private void putAATextInfo( UIDefaults defaults ) {
-		if( SystemInfo.isJava_9_orLater ) {
+		if ( SystemInfo.isMacOS && SystemInfo.isJetBrainsJVM ) {
+			// The awt.font.desktophints property suggests sub-pixel anti-aliasing
+			// which renders text with too much weight on macOS in the JetBrains JRE.
+			// Use greyscale anti-aliasing instead.
+			defaults.put( RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON );
+		} else if( SystemInfo.isJava_9_orLater ) {
 			Object desktopHints = Toolkit.getDefaultToolkit().getDesktopProperty( DESKTOPFONTHINTS );
 			if( desktopHints instanceof Map ) {
 				@SuppressWarnings( "unchecked" )

flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java

@@ -16,6 +16,7 @@
 
 package com.formdev.flatlaf;
 
+import java.awt.Color;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -56,6 +57,8 @@ public class IntelliJTheme
 	public final boolean dark;
 	public final String author;
 
+	private final boolean isMaterialUILite;
+
 	private final Map<String, String> colors;
 	private final Map<String, Object> ui;
 	private final Map<String, Object> icons;
@@ -119,6 +122,8 @@ public class IntelliJTheme
 	    dark = Boolean.parseBoolean( (String) json.get( "dark" ) );
 	    author = (String) json.get( "author" );
 
+		isMaterialUILite = author.equals( "Mallowigi" );
+
 	    colors = (Map<String, String>) json.get( "colors" );
 	    ui = (Map<String, Object>) json.get( "ui" );
 	    icons = (Map<String, Object>) json.get( "icons" );
@@ -156,6 +161,11 @@ public class IntelliJTheme
 		defaults.put( "Button.disabledBackground", panelBackground );
 		defaults.put( "ToggleButton.disabledBackground", panelBackground );
 
+		// fix Button borders
+		copyIfNotSet( defaults, "Button.focusedBorderColor", "Component.focusedBorderColor", uiKeys );
+		defaults.put( "Button.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );
+		defaults.put( "HelpButton.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );
+
 		// IDEA uses a SVG icon for the help button, but paints the background with Button.startBackground and Button.endBackground
 		Object helpButtonBackground = defaults.get( "Button.startBackground" );
 		Object helpButtonBorderColor = defaults.get( "Button.startBorderColor" );
@@ -205,6 +215,12 @@ public class IntelliJTheme
 		if( !uiKeys.contains( "ToggleButton.foreground" ) && uiKeys.contains( "Button.foreground" ) )
 			defaults.put( "ToggleButton.foreground", defaults.get( "Button.foreground" ) );
 
+		// fix List and Table background colors in Material UI Lite themes
+		if( isMaterialUILite ) {
+			defaults.put( "List.background", defaults.get( "Tree.background" ) );
+			defaults.put( "Table.background", defaults.get( "Tree.background" ) );
+		}
+
 		// limit tree row height
 		int rowHeight = defaults.getInt( "Tree.rowHeight" );
 		if( rowHeight > 22 )
@@ -225,10 +241,17 @@ public class IntelliJTheme
 		// remove theme specific UI defaults and remember only those for current theme
 		Map<Object, Object> themeSpecificDefaults = new HashMap<>();
 		String currentThemePrefix = '[' + name.replace( ' ', '_' ) + ']';
+		String currentAuthorPrefix = "[author-" + author.replace( ' ', '_' ) + ']';
+		String allThemesPrefix = "[*]";
+		String[] prefixes = { currentThemePrefix, currentAuthorPrefix, allThemesPrefix };
 		for( String key : themeSpecificKeys ) {
 			Object value = defaults.remove( key );
-			if( key.startsWith( currentThemePrefix ) )
-				themeSpecificDefaults.put( key.substring( currentThemePrefix.length() ), value );
+			for( String prefix : prefixes ) {
+				if( key.startsWith( prefix ) ) {
+					themeSpecificDefaults.put( key.substring( prefix.length() ), value );
+					break;
+				}
+			}
 		}
 
 		return themeSpecificDefaults;
@@ -269,7 +292,6 @@ public class IntelliJTheme
 			uiKeys.add( key );
 
 			// fix ComboBox size and Spinner border in all Material UI Lite themes
-			boolean isMaterialUILite = author.equals( "Mallowigi" );
 			if( isMaterialUILite && (key.equals( "ComboBox.padding" ) || key.equals( "Spinner.border" )) )
 				return; // ignore
 
@@ -381,7 +403,7 @@ public class IntelliJTheme
 	}
 
 	/**
-	 * Because IDEA uses SVGs for check boxes and radio buttons the colors for
+	 * Because IDEA uses SVGs for check boxes and radio buttons, the colors for
 	 * this two components are specified in "icons > ColorPalette".
 	 * FlatLaf uses vector icons and expects colors for the two components in UI defaults.
 	 */
@@ -453,27 +475,43 @@ public class IntelliJTheme
 			}
 		}
 
-		// remove hover and pressed colors
+		// update hover, pressed and focused colors
 		if( checkboxModified ) {
+			// for non-filled checkbox/radiobutton used in dark themes
 			defaults.remove( "CheckBox.icon.focusWidth" );
-			defaults.remove( "CheckBox.icon.hoverBorderColor" );
-			defaults.remove( "CheckBox.icon.focusedBackground" );
-			defaults.remove( "CheckBox.icon.hoverBackground" );
-			defaults.remove( "CheckBox.icon.pressedBackground" );
-			defaults.remove( "CheckBox.icon.selectedFocusedBackground" );
-			defaults.remove( "CheckBox.icon.selectedHoverBackground" );
-			defaults.remove( "CheckBox.icon.selectedPressedBackground" );
+			defaults.put( "CheckBox.icon.hoverBorderColor", defaults.get( "CheckBox.icon.focusedBorderColor" ) );
 
+			// for filled checkbox/radiobutton used in light themes
 			defaults.remove( "CheckBox.icon[filled].focusWidth" );
-			defaults.remove( "CheckBox.icon[filled].hoverBorderColor" );
-			defaults.remove( "CheckBox.icon[filled].focusedBackground" );
-			defaults.remove( "CheckBox.icon[filled].hoverBackground" );
-			defaults.remove( "CheckBox.icon[filled].pressedBackground" );
-			defaults.remove( "CheckBox.icon[filled].selectedFocusedBackground" );
-			defaults.remove( "CheckBox.icon[filled].selectedHoverBackground" );
-			defaults.remove( "CheckBox.icon[filled].selectedPressedBackground" );
+			defaults.put( "CheckBox.icon[filled].hoverBorderColor", defaults.get( "CheckBox.icon[filled].focusedBorderColor" ) );
+			defaults.put( "CheckBox.icon[filled].selectedFocusedBackground", defaults.get( "CheckBox.icon[filled].selectedBackground" ) );
+
+			if( dark ) {
+				// IDEA Darcula checkBoxFocused.svg, checkBoxSelectedFocused.svg,
+				// radioFocused.svg and radioSelectedFocused.svg
+				// use opacity=".65" for the border
+				// --> add alpha to focused border colors
+				String[] focusedBorderColorKeys = new String[] {
+					"CheckBox.icon.focusedBorderColor",
+					"CheckBox.icon.selectedFocusedBorderColor",
+					"CheckBox.icon[filled].focusedBorderColor",
+					"CheckBox.icon[filled].selectedFocusedBorderColor",
+				};
+				for( String key : focusedBorderColorKeys ) {
+					Color color = defaults.getColor( key );
+					if( color != null ) {
+						defaults.put( key, new ColorUIResource( new Color(
+							(color.getRGB() & 0xffffff) | 0xa6000000, true ) ) );
 					}
 				}
+			}
+		}
+	}
+
+	private void copyIfNotSet( UIDefaults defaults, String destKey, String srcKey, Set<String> uiKeys ) {
+		if( !uiKeys.contains( destKey ) )
+			defaults.put( destKey, defaults.get( srcKey ) );
+	}
 
 	/** Rename UI default keys (key --> value). */
 	private static Map<String, String> uiKeyMapping = new HashMap<>();
@@ -507,6 +545,7 @@ public class IntelliJTheme
 		uiKeyCopying.put( "CheckBoxMenuItem.margin",    "MenuItem.margin" );
 		uiKeyCopying.put( "RadioButtonMenuItem.margin", "MenuItem.margin" );
 		uiKeyMapping.put( "PopupMenu.border",           "PopupMenu.borderInsets" );
+		uiKeyCopying.put( "MenuItem.underlineSelectionColor", "TabbedPane.underlineColor" );
 
 		// IDEA uses List.selectionBackground also for menu selection
 		uiKeyCopying.put( "Menu.selectionBackground",                "List.selectionBackground" );

flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java

@@ -70,7 +70,7 @@ class UIDefaultsLoader
 	private static final String VARIABLE_PREFIX = "@";
 	private static final String PROPERTY_PREFIX = "$";
 	private static final String OPTIONAL_PREFIX = "?";
-	private static final String GLOBAL_PREFIX = "*.";
+	private static final String WILDCARD_PREFIX = "*.";
 
 	static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons,
 		Properties additionalDefaults, boolean dark, UIDefaults defaults )
@@ -198,19 +198,19 @@ class UIDefaultsLoader
 				}
 			}
 
-			// get (and remove) globals, which override all other defaults that end with same suffix
-			HashMap<String, String> globals = new HashMap<>();
+			// get (and remove) wildcard replacements, which override all other defaults that end with same suffix
+			HashMap<String, String> wildcards = new HashMap<>();
 			Iterator<Entry<Object, Object>> it = properties.entrySet().iterator();
 			while( it.hasNext() ) {
 				Entry<Object, Object> e = it.next();
 				String key = (String) e.getKey();
-				if( key.startsWith( GLOBAL_PREFIX ) ) {
-					globals.put( key.substring( GLOBAL_PREFIX.length() ), (String) e.getValue() );
+				if( key.startsWith( WILDCARD_PREFIX ) ) {
+					wildcards.put( key.substring( WILDCARD_PREFIX.length() ), (String) e.getValue() );
 					it.remove();
 				}
 			}
 
-			// override UI defaults with globals
+			// override UI defaults with wildcard replacements
 			for( Object key : defaults.keySet() ) {
 				int dot;
 				if( !(key instanceof String) ||
@@ -218,10 +218,10 @@ class UIDefaultsLoader
 					(dot = ((String)key).lastIndexOf( '.' )) < 0 )
 				  continue;
 
-				String globalKey = ((String)key).substring( dot + 1 );
-				String globalValue = globals.get( globalKey );
-				if( globalValue != null )
-					properties.put( key, globalValue );
+				String wildcardKey = ((String)key).substring( dot + 1 );
+				String wildcardValue = wildcards.get( wildcardKey );
+				if( wildcardValue != null )
+					properties.put( key, wildcardValue );
 			}
 
 			Function<String, String> propertiesGetter = key -> {
@@ -341,7 +341,12 @@ class UIDefaultsLoader
 
 		// determine value type from key
 		if( valueType == ValueType.UNKNOWN ) {
-			if( key.endsWith( "ground" ) || key.endsWith( "Color" ) )
+			if( key.endsWith( "UI" ) )
+				valueType = ValueType.STRING;
+			else if( key.endsWith( "Color" ) ||
+				(key.endsWith( "ground" ) &&
+				 (key.endsWith( ".background" ) || key.endsWith( "Background" ) ||
+				  key.endsWith( ".foreground" ) || key.endsWith( "Foreground" ))) )
 				valueType = ValueType.COLOR;
 			else if( key.endsWith( ".border" ) || key.endsWith( "Border" ) )
 				valueType = ValueType.BORDER;
@@ -356,8 +361,6 @@ class UIDefaultsLoader
 				valueType = ValueType.INTEGER;
 			else if( key.endsWith( "Char" ) )
 				valueType = ValueType.CHARACTER;
-			else if( key.endsWith( "UI" ) )
-				valueType = ValueType.STRING;
 			else if( key.endsWith( "grayFilter" ) )
 				valueType = ValueType.GRAYFILTER;
 		}

flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java

@@ -49,15 +49,16 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
  * @uiDefault CheckBox.icon.disabledBorderColor			Color
  * @uiDefault CheckBox.icon.disabledBackground			Color
  * @uiDefault CheckBox.icon.disabledCheckmarkColor		Color
- * @uiDefault CheckBox.icon.focusedBorderColor			Color
+ * @uiDefault CheckBox.icon.focusedBorderColor			Color	optional
  * @uiDefault CheckBox.icon.focusedBackground			Color	optional
- * @uiDefault CheckBox.icon.selectedFocusedBorderColor	Color	optional
- * @uiDefault CheckBox.icon.selectedFocusedBackground	Color	optional
+ * @uiDefault CheckBox.icon.selectedFocusedBorderColor	Color	optional; CheckBox.icon.focusedBorderColor is used if not specified
+ * @uiDefault CheckBox.icon.selectedFocusedBackground	Color	optional; CheckBox.icon.focusedBackground is used if not specified
+ * @uiDefault CheckBox.icon.selectedFocusedCheckmarkColor	Color	optional; CheckBox.icon.checkmarkColor is used if not specified
  * @uiDefault CheckBox.icon.hoverBorderColor			Color	optional
  * @uiDefault CheckBox.icon.hoverBackground				Color	optional
- * @uiDefault CheckBox.icon.selectedHoverBackground		Color	optional
+ * @uiDefault CheckBox.icon.selectedHoverBackground		Color	optional; CheckBox.icon.hoverBackground is used if not specified
  * @uiDefault CheckBox.icon.pressedBackground			Color	optional
- * @uiDefault CheckBox.icon.selectedPressedBackground	Color	optional
+ * @uiDefault CheckBox.icon.selectedPressedBackground	Color	optional; CheckBox.icon.pressedBackground is used if not specified
  * @uiDefault CheckBox.arc								int
  *
  * @author Karl Tauber
@@ -145,7 +146,8 @@ public class FlatCheckBoxIcon
 		paintBorder( c, g );
 
 		// paint background
-		g.setColor( FlatUIUtils.deriveColor( getBackground( c, selected ), background ) );
+		g.setColor( FlatUIUtils.deriveColor( getBackground( c, selected ),
+			selected ? selectedBackground : background ) );
 		paintBackground( c, g );
 
 		// paint checkmark

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java

@@ -57,18 +57,6 @@ public class FlatArrowButton
 	private boolean hover;
 	private boolean pressed;
 
-	public FlatArrowButton( int direction, String type, Color foreground, Color disabledForeground,
-		Color hoverForeground, Color hoverBackground )
-	{
-		this( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, null );
-	}
-
-	public FlatArrowButton( int direction, String type, Color foreground, Color disabledForeground,
-		Color hoverForeground, Color hoverBackground, Color pressedBackground )
-	{
-		this( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, null, pressedBackground );
-	}
-
 	public FlatArrowButton( int direction, String type, Color foreground, Color disabledForeground,
 		Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground )
 	{
@@ -85,7 +73,9 @@ public class FlatArrowButton
 		setOpaque( false );
 		setBorder( null );
 
-		if( hoverForeground != null || hoverBackground != null || pressedBackground != null ) {
+		if( hoverForeground != null || hoverBackground != null ||
+			pressedForeground != null || pressedBackground != null )
+		{
 			addMouseListener( new MouseAdapter() {
 				@Override
 				public void mouseEntered( MouseEvent e ) {
@@ -151,7 +141,7 @@ public class FlatArrowButton
 	}
 
 	protected Color deriveForeground( Color foreground ) {
-		return foreground;
+		return FlatUIUtils.deriveColor( foreground, this.foreground );
 	}
 
 	@Override

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java

@@ -251,7 +251,10 @@ public class FlatButtonUI
 		Icon icon = ((AbstractButton)c).getIcon();
 		String text = ((AbstractButton)c).getText();
 		return (icon != null && (text == null || text.isEmpty())) ||
-			(icon == null && text != null && ("...".equals( text ) || text.length() == 1));
+			(icon == null && text != null &&
+			 ("...".equals( text ) ||
+			  text.length() == 1 ||
+			  (text.length() == 2 && Character.isSurrogatePair( text.charAt( 0 ), text.charAt( 1 ) ))));
 	}
 
 	static final int TYPE_OTHER = -1;
@@ -407,8 +410,13 @@ public class FlatButtonUI
 			if( model.isRollover() )
 				return toolbarHoverBackground;
 
-			// use background of toolbar
-			return c.getParent().getBackground();
+			// use component background if explicitly set
+			Color bg = c.getBackground();
+			if( isCustomBackground( bg ) )
+				return bg;
+
+			// do not paint background
+			return null;
 		}
 
 		boolean def = isDefaultButton( c );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java

@@ -34,6 +34,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeEvent;
@@ -97,6 +99,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault ComboBox.buttonArrowColor			Color
  * @uiDefault ComboBox.buttonDisabledArrowColor	Color
  * @uiDefault ComboBox.buttonHoverArrowColor	Color
+ * @uiDefault ComboBox.buttonPressedArrowColor	Color
  *
  * @author Karl Tauber
  */
@@ -120,9 +123,11 @@ public class FlatComboBoxUI
 	protected Color buttonArrowColor;
 	protected Color buttonDisabledArrowColor;
 	protected Color buttonHoverArrowColor;
+	protected Color buttonPressedArrowColor;
 
 	private MouseListener hoverListener;
 	protected boolean hover;
+	protected boolean pressed;
 
 	private WeakReference<Component> lastRendererComponent;
 
@@ -134,13 +139,36 @@ public class FlatComboBoxUI
 	protected void installListeners() {
 		super.installListeners();
 
-		hoverListener = new FlatUIUtils.HoverListener( null, h -> {
-			if( !comboBox.isEditable() ) {
-				hover = h;
-				if( arrowButton != null )
+		hoverListener = new MouseAdapter() {
+			@Override
+			public void mouseEntered( MouseEvent e ) {
+				hover = true;
+				repaintArrowButton();
+			}
+
+			@Override
+			public void mouseExited( MouseEvent e ) {
+				hover = false;
+				repaintArrowButton();
+			}
+
+			@Override
+			public void mousePressed( MouseEvent e ) {
+				pressed = true;
+				repaintArrowButton();
+			}
+
+			@Override
+			public void mouseReleased( MouseEvent e ) {
+				pressed = false;
+				repaintArrowButton();
+			}
+
+			private void repaintArrowButton() {
+				if( arrowButton != null && !comboBox.isEditable() )
 					arrowButton.repaint();
 			}
-		} );
+		};
 		comboBox.addMouseListener( hoverListener );
 	}
 
@@ -175,6 +203,7 @@ public class FlatComboBoxUI
 		buttonArrowColor = UIManager.getColor( "ComboBox.buttonArrowColor" );
 		buttonDisabledArrowColor = UIManager.getColor( "ComboBox.buttonDisabledArrowColor" );
 		buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" );
+		buttonPressedArrowColor = UIManager.getColor( "ComboBox.buttonPressedArrowColor" );
 
 		// set maximumRowCount
 		int maximumRowCount = UIManager.getInt( "ComboBox.maximumRowCount" );
@@ -203,6 +232,7 @@ public class FlatComboBoxUI
 		buttonArrowColor = null;
 		buttonDisabledArrowColor = null;
 		buttonHoverArrowColor = null;
+		buttonPressedArrowColor = null;
 
 		MigLayoutVisualPadding.uninstall( comboBox );
 	}
@@ -516,19 +546,26 @@ public class FlatComboBoxUI
 		extends FlatArrowButton
 	{
 		protected FlatComboBoxButton() {
-			this( SwingConstants.SOUTH, arrowType, buttonArrowColor, buttonDisabledArrowColor, buttonHoverArrowColor, null, null );
+			this( SwingConstants.SOUTH, arrowType, buttonArrowColor, buttonDisabledArrowColor,
+				buttonHoverArrowColor, null, buttonPressedArrowColor, null );
 		}
 
 		protected FlatComboBoxButton( int direction, String type, Color foreground, Color disabledForeground,
-			Color hoverForeground, Color hoverBackground, Color pressedBackground )
+			Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground )
 		{
-			super( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, pressedBackground );
+			super( direction, type, foreground, disabledForeground,
+				hoverForeground, hoverBackground, pressedForeground, pressedBackground );
 		}
 
 		@Override
 		protected boolean isHover() {
 			return super.isHover() || (!comboBox.isEditable() ? hover : false);
 		}
+
+		@Override
+		protected boolean isPressed() {
+			return super.isPressed() || (!comboBox.isEditable() ? pressed : false);
+		}
 	}
 
 	//---- class FlatComboPopup -----------------------------------------------

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java

@@ -57,6 +57,7 @@ import com.formdev.flatlaf.util.SystemInfo;
  * @uiDefault MenuItem.underlineSelectionCheckBackground			Color
  * @uiDefault MenuItem.underlineSelectionColor						Color
  * @uiDefault MenuItem.underlineSelectionHeight						int
+ * @uiDefault MenuItem.selectionBackground							Color
  *
  * @author Karl Tauber
  */
@@ -82,6 +83,8 @@ public class FlatMenuItemRenderer
 	protected final Color underlineSelectionColor = UIManager.getColor( "MenuItem.underlineSelectionColor" );
 	protected final int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" );
 
+	protected final Color selectionBackground = UIManager.getColor( "MenuItem.selectionBackground" );
+
 	protected FlatMenuItemRenderer( JMenuItem menuItem, Icon checkIcon, Icon arrowIcon,
 		Font acceleratorFont, String acceleratorDelimiter )
 	{
@@ -303,7 +306,7 @@ debug*/
 		// then use filled icon background to indicate selection (instead of using checkIcon)
 		if( menuItem.isSelected() && checkIcon != null && icon != checkIcon ) {
 			Rectangle r = FlatUIUtils.addInsets( iconRect, scale( checkMargins ) );
-			g.setColor( deriveBackground( checkBackground ) );
+			g.setColor( FlatUIUtils.deriveColor( checkBackground, selectionBackground ) );
 			g.fillRect( r.x, r.y, r.width, r.height );
 		}
 

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java

@@ -357,13 +357,14 @@ public class FlatScrollBarUI
 	{
 		protected FlatScrollBarButton( int direction ) {
 			this( direction, arrowType, buttonArrowColor, buttonDisabledArrowColor,
-				null, hoverButtonBackground, pressedButtonBackground );
+				null, hoverButtonBackground, null, pressedButtonBackground );
 		}
 
 		protected FlatScrollBarButton( int direction, String type, Color foreground, Color disabledForeground,
-			Color hoverForeground, Color hoverBackground, Color pressedBackground )
+			Color hoverForeground, Color hoverBackground, Color pressedForeground, Color pressedBackground )
 		{
-			super( direction, type, foreground, disabledForeground, hoverForeground, hoverBackground, pressedBackground );
+			super( direction, type, foreground, disabledForeground,
+				hoverForeground, hoverBackground, pressedForeground, pressedBackground );
 
 			setArrowWidth( FlatArrowButton.DEFAULT_ARROW_WIDTH - 2 );
 			setFocusable( false );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Smooth scrolling code partly based on code from IntelliJ IDEA Community Edition,
- * which is licensed under the Apache 2.0 license. Copyright 2000-2016 JetBrains s.r.o.
- * See: https://github.com/JetBrains/intellij-community/blob/31e1b5a8e43219b9571951bab6457cfb3012e3ef/platform/platform-api/src/com/intellij/ui/components/SmoothScrollPane.java#L141-L185
- *
- */
 package com.formdev.flatlaf.ui;
 
 import java.awt.Component;
@@ -138,8 +132,6 @@ public class FlatScrollPaneUI
 		return UIManager.getBoolean( "ScrollPane.smoothScrolling" );
 	}
 
-	private static final double EPSILON = 1e-5d;
-
 	private void mouseWheelMovedSmooth( MouseWheelEvent e ) {
 		// return if there is no viewport
 		JViewport viewport = scrollpane.getViewport();
@@ -160,24 +152,22 @@ public class FlatScrollPaneUI
 		// get precise wheel rotation
 		double rotation = e.getPreciseWheelRotation();
 
-		// get unit and block increment
+		// get unit increment
 		int unitIncrement;
-		int blockIncrement;
 		int orientation = scrollbar.getOrientation();
 		Component view = viewport.getView();
 		if( view instanceof Scrollable ) {
 			Scrollable scrollable = (Scrollable) view;
 
-			// Use (0, 0) view position to obtain constant unit increment of first item
-			// (which might otherwise be variable on smaller-than-unit scrolling).
+			// Use (0, 0) view position to obtain a constant unit increment of first item.
+			// Unit increment may be different for each item.
 			Rectangle visibleRect = new Rectangle( viewport.getViewSize() );
 			unitIncrement = scrollable.getScrollableUnitIncrement( visibleRect, orientation, 1 );
-			blockIncrement = scrollable.getScrollableBlockIncrement( visibleRect, orientation, 1 );
 
 			if( unitIncrement > 0 ) {
 				// For the case that the first item (e.g. in a list) is larger
-				// than the other items, get the unit increment of the second item
-				// and use the smaller one.
+				// than the other items (e.g. themes list in FlatLaf Demo),
+				// get the unit increment of the second item and use the smaller one.
 				if( orientation == SwingConstants.VERTICAL ) {
 					visibleRect.y += unitIncrement;
 					visibleRect.height -= unitIncrement;
@@ -192,52 +182,58 @@ public class FlatScrollPaneUI
 		} else {
 			int direction = rotation < 0 ? -1 : 1;
 			unitIncrement = scrollbar.getUnitIncrement( direction );
-			blockIncrement = scrollbar.getBlockIncrement( direction );
 		}
 
-		// limit scroll amount (number of units to scroll) for small viewports
-		// (e.g. vertical scrolling in file chooser)
-		int scrollAmount = e.getScrollAmount();
+		// get viewport width/height (the visible width/height)
 		int viewportWH = (orientation == SwingConstants.VERTICAL)
 			? viewport.getHeight()
 			: viewport.getWidth();
-		if( unitIncrement * scrollAmount > viewportWH )
-			scrollAmount = Math.max( viewportWH / unitIncrement, 1 );
+
+		// limit scroll increment to viewport width/height
+		// - if scroll amount is set to a large value in OS settings
+		// - for large unit increments in small viewports (e.g. horizontal scrolling in file chooser)
+		int scrollIncrement = Math.min( unitIncrement * e.getScrollAmount(), viewportWH );
 
 		// compute relative delta
-		double delta = rotation * scrollAmount * unitIncrement;
-		boolean adjustDelta = Math.abs( rotation ) < (1.0 + EPSILON);
-		double adjustedDelta = adjustDelta
-			? Math.max( -blockIncrement, Math.min( delta, blockIncrement ) )
-			: delta;
+		double delta = rotation * scrollIncrement;
+		int idelta = (int) Math.round( delta );
+
+		// scroll at least one pixel to avoid "hanging"
+		// - for "super-low-speed" scrolling (move fingers very slowly on trackpad)
+		// - if unit increment is very small (e.g. 1 if scroll view does not implement
+		//   javax.swing.Scrollable interface)
+		if( idelta == 0 ) {
+			if( rotation > 0 )
+				idelta = 1;
+			else if( rotation < 0 )
+				idelta = -1;
+		}
 
 		// compute new value
 		int value = scrollbar.getValue();
-		double minDelta = scrollbar.getMinimum() - value;
-		double maxDelta = scrollbar.getMaximum() - scrollbar.getModel().getExtent() - value;
-		double boundedDelta = Math.max( minDelta, Math.min( adjustedDelta, maxDelta ) );
-		int newValue = value + (int) Math.round( boundedDelta );
+		int minValue = scrollbar.getMinimum();
+		int maxValue = scrollbar.getMaximum() - scrollbar.getModel().getExtent();
+		int newValue = Math.max( minValue, Math.min( value + idelta, maxValue ) );
 
 		// set new value
 		if( newValue != value )
 			scrollbar.setValue( newValue );
 
 /*debug
-		System.out.println( String.format( "%4d  %9f / %4d %4d / %12f %5s %12f / %4d %4d %4d / %12f %12f %12f / %4d",
+		System.out.println( String.format( "%s  %4d  %9f  /  %3d * %d = %3d  [%3d]  /  %8.2f %5d  /  %4d --> %4d  [%d, %d]",
+			(orientation == SwingConstants.VERTICAL) ? "V" : "H",
 			e.getWheelRotation(),
 			e.getPreciseWheelRotation(),
 			unitIncrement,
-			blockIncrement,
+			e.getScrollAmount(),
+			scrollIncrement,
+			viewportWH,
 			delta,
-			adjustDelta,
-			adjustedDelta,
+			idelta,
 			value,
-			scrollbar.getMinimum(),
-			scrollbar.getMaximum(),
-			minDelta,
-			maxDelta,
-			boundedDelta,
-			newValue ) );
+			newValue,
+			minValue,
+			maxValue ) );
 */
 	}
 

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java

@@ -91,6 +91,9 @@ public class FlatSliderUI
 	protected Color disabledThumbColor;
 	protected Color disabledThumbBorderColor;
 
+	private Color defaultBackground;
+	private Color defaultForeground;
+
 	protected boolean thumbHover;
 	protected boolean thumbPressed;
 
@@ -131,6 +134,9 @@ public class FlatSliderUI
 		disabledTrackColor = UIManager.getColor( "Slider.disabledTrackColor" );
 		disabledThumbColor = UIManager.getColor( "Slider.disabledThumbColor" );
 		disabledThumbBorderColor = FlatUIUtils.getUIColor( "Slider.disabledThumbBorderColor", "Component.disabledBorderColor" );
+
+		defaultBackground = UIManager.getColor( "Slider.background" );
+		defaultForeground = UIManager.getColor( "Slider.foreground" );
 	}
 
 	@Override
@@ -149,6 +155,9 @@ public class FlatSliderUI
 		disabledTrackColor = null;
 		disabledThumbColor = null;
 		disabledThumbBorderColor = null;
+
+		defaultBackground = null;
+		defaultForeground = null;
 	}
 
 	@Override
@@ -289,25 +298,28 @@ debug*/
 				coloredTrack = temp;
 			}
 
-			g.setColor( trackValueColor );
+			g.setColor( getTrackValueColor() );
 			((Graphics2D)g).fill( coloredTrack );
 		}
 
-		g.setColor( enabled ? trackColor : disabledTrackColor );
+		g.setColor( enabled ? getTrackColor() : disabledTrackColor );
 		((Graphics2D)g).fill( track );
 	}
 
 	@Override
 	public void paintThumb( Graphics g ) {
+		Color thumbColor = getThumbColor();
 		Color color = stateColor( slider, thumbHover, thumbPressed,
 			thumbColor, disabledThumbColor, null, hoverThumbColor, pressedThumbColor );
 		color = FlatUIUtils.deriveColor( color, thumbColor );
 
-		Color borderColor = (thumbBorderColor != null)
+		Color foreground = slider.getForeground();
+		Color borderColor = (thumbBorderColor != null && foreground == defaultForeground)
 			? stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null )
 			: null;
 
-		Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor, focusBaseColor );
+		Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor,
+			(foreground != defaultForeground) ? foreground : focusBaseColor );
 
 		paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth );
 	}
@@ -436,6 +448,21 @@ debug*/
 		return path;
 	}
 
+	protected Color getTrackValueColor() {
+		Color foreground = slider.getForeground();
+		return (foreground != defaultForeground) ? foreground : trackValueColor;
+	}
+
+	protected Color getTrackColor() {
+		Color backround = slider.getBackground();
+		return (backround != defaultBackground) ? backround : trackColor;
+	}
+
+	protected Color getThumbColor() {
+		Color foreground = slider.getForeground();
+		return (foreground != defaultForeground) ? foreground : thumbColor;
+	}
+
 	public static Color stateColor( JSlider slider, boolean hover, boolean pressed,
 		Color enabledColor, Color disabledColor, Color focusedColor, Color hoverColor, Color pressedColor )
 	{

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java

@@ -69,6 +69,7 @@ import com.formdev.flatlaf.FlatClientProperties;
  * @uiDefault Spinner.buttonArrowColor			Color
  * @uiDefault Spinner.buttonDisabledArrowColor	Color
  * @uiDefault Spinner.buttonHoverArrowColor		Color
+ * @uiDefault Spinner.buttonPressedArrowColor	Color
  * @uiDefault Spinner.padding					Insets
  *
  * @author Karl Tauber
@@ -90,6 +91,7 @@ public class FlatSpinnerUI
 	protected Color buttonArrowColor;
 	protected Color buttonDisabledArrowColor;
 	protected Color buttonHoverArrowColor;
+	protected Color buttonPressedArrowColor;
 	protected Insets padding;
 
 	public static ComponentUI createUI( JComponent c ) {
@@ -114,6 +116,7 @@ public class FlatSpinnerUI
 		buttonArrowColor = UIManager.getColor( "Spinner.buttonArrowColor" );
 		buttonDisabledArrowColor = UIManager.getColor( "Spinner.buttonDisabledArrowColor" );
 		buttonHoverArrowColor = UIManager.getColor( "Spinner.buttonHoverArrowColor" );
+		buttonPressedArrowColor = UIManager.getColor( "Spinner.buttonPressedArrowColor" );
 		padding = UIManager.getInsets( "Spinner.padding" );
 
 		// scale
@@ -134,6 +137,7 @@ public class FlatSpinnerUI
 		buttonArrowColor = null;
 		buttonDisabledArrowColor = null;
 		buttonHoverArrowColor = null;
+		buttonPressedArrowColor = null;
 		padding = null;
 
 		MigLayoutVisualPadding.uninstall( spinner );
@@ -244,7 +248,7 @@ public class FlatSpinnerUI
 
 	private Component createArrowButton( int direction, String name ) {
 		FlatArrowButton button = new FlatArrowButton( direction, arrowType, buttonArrowColor,
-			buttonDisabledArrowColor, buttonHoverArrowColor, null );
+			buttonDisabledArrowColor, buttonHoverArrowColor, null, buttonPressedArrowColor, null );
 		button.setName( name );
 		button.setYOffset( (direction == SwingConstants.NORTH) ? 1 : -1 );
 		if( direction == SwingConstants.NORTH )

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java

@@ -52,6 +52,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault SplitPane.continuousLayout				boolean
  * @uiDefault SplitPaneDivider.oneTouchArrowColor		Color
  * @uiDefault SplitPaneDivider.oneTouchHoverArrowColor	Color
+ * @uiDefault SplitPaneDivider.oneTouchPressedArrowColor Color
  * @uiDefault SplitPaneDivider.style					String	grip (default) or plain
  * @uiDefault SplitPaneDivider.gripColor				Color
  * @uiDefault SplitPaneDivider.gripDotCount				int
@@ -67,6 +68,7 @@ public class FlatSplitPaneUI
 	private Boolean continuousLayout;
 	protected Color oneTouchArrowColor;
 	protected Color oneTouchHoverArrowColor;
+	protected Color oneTouchPressedArrowColor;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatSplitPaneUI();
@@ -80,12 +82,22 @@ public class FlatSplitPaneUI
 		// used in there on LaF switching
 		oneTouchArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchArrowColor" );
 		oneTouchHoverArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchHoverArrowColor" );
+		oneTouchPressedArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchPressedArrowColor" );
 
 		super.installDefaults();
 
 		continuousLayout = (Boolean) UIManager.get( "SplitPane.continuousLayout" );
 	}
 
+	@Override
+	protected void uninstallDefaults() {
+		super.uninstallDefaults();
+
+		oneTouchArrowColor = null;
+		oneTouchHoverArrowColor = null;
+		oneTouchPressedArrowColor = null;
+	}
+
 	@Override
 	public boolean isContinuousLayout() {
 		return super.isContinuousLayout() || (continuousLayout != null && Boolean.TRUE.equals( continuousLayout ));
@@ -185,7 +197,8 @@ public class FlatSplitPaneUI
 			protected final boolean left;
 
 			protected FlatOneTouchButton( boolean left ) {
-				super( SwingConstants.NORTH, arrowType, oneTouchArrowColor, null, oneTouchHoverArrowColor, null );
+				super( SwingConstants.NORTH, arrowType, oneTouchArrowColor, null,
+					oneTouchHoverArrowColor, null, oneTouchPressedArrowColor, null );
 				setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) );
 				ToolTipManager.sharedInstance().registerComponent( this );
 

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java

@@ -221,6 +221,8 @@ public class FlatTabbedPaneUI
 	private Container leadingComponent;
 	private Container trailingComponent;
 
+	private Dimension scrollBackwardButtonPrefSize;
+
 	private Handler handler;
 	private boolean blockRollover;
 	private boolean rolloverTabClose;
@@ -1870,23 +1872,70 @@ public class FlatTabbedPaneUI
 			lastMouseY = e.getY();
 
 			double preciseWheelRotation = e.getPreciseWheelRotation();
+			boolean isPreciseWheel = (preciseWheelRotation != 0 && preciseWheelRotation != e.getWheelRotation());
 			int amount = (int) (maxTabHeight * preciseWheelRotation);
 
+			// scroll at least one pixel to avoid "hanging"
+			if( amount == 0 ) {
+				if( preciseWheelRotation > 0 )
+					amount = 1;
+				else if( preciseWheelRotation < 0 )
+					amount = -1;
+			}
+
 			// compute new view position
 			Point viewPosition = (targetViewPosition != null)
 				? targetViewPosition
 				: tabViewport.getViewPosition();
 			Dimension viewSize = tabViewport.getViewSize();
+			boolean horizontal = isHorizontalTabPlacement();
 			int x = viewPosition.x;
 			int y = viewPosition.y;
-			int tabPlacement = tabPane.getTabPlacement();
-			if( tabPlacement == TOP || tabPlacement == BOTTOM ) {
+			if( horizontal )
 				x += isLeftToRight() ? amount : -amount;
-				x = Math.min( Math.max( x, 0 ), viewSize.width - tabViewport.getWidth() );
-			} else {
+			else
 				y += amount;
-				y = Math.min( Math.max( y, 0 ), viewSize.height - tabViewport.getHeight() );
+
+			// In case of having scroll buttons on both sides and hiding disabled buttons,
+			// the viewport is moved when the scroll backward button becomes visible
+			// or is hidden. For non-precise wheel scrolling (e.g. mouse wheel on Windows),
+			// this is no problem because the scroll amount is at least a tab-height.
+			// For precise wheel scrolling (e.g. touchpad on Mac), this is a problem
+			// because it is possible to scroll by a fraction of a tab-height.
+			if( isPreciseWheel &&
+				getScrollButtonsPlacement() == BOTH &&
+				getScrollButtonsPolicy() == AS_NEEDED_SINGLE &&
+				(isLeftToRight() || !horizontal) || // scroll buttons are hidden in right-to-left
+				scrollBackwardButtonPrefSize != null )
+			{
+				// special cases for scrolling with touchpad or high-resolution wheel:
+				//   1. if view is at 0/0 and scrolling right/down, then the scroll backward button
+				//      becomes visible, which moves the viewport right/down by the width/height of
+				//      the button --> add button width/height to new view position so that
+				//      tabs seems to stay in place at screen
+				//   2. if scrolling left/up to the beginning, then the scroll backward button
+				//      becomes hidden, which moves the viewport left/up by the width/height of
+				//      the button --> set new view position to 0/0 so that
+				//      tabs seems to stay in place at screen
+				if( horizontal ) {
+					//
+					if( viewPosition.x == 0 && x > 0 )
+						x += scrollBackwardButtonPrefSize.width;
+					else if( amount < 0 && x <= scrollBackwardButtonPrefSize.width )
+						x = 0;
+				} else {
+					if( viewPosition.y == 0 && y > 0 )
+						y += scrollBackwardButtonPrefSize.height;
+					else if( amount < 0 && y <= scrollBackwardButtonPrefSize.height )
+						y = 0;
 				}
+			}
+
+			// limit new view position
+			if( horizontal )
+				x = Math.min( Math.max( x, 0 ), viewSize.width - tabViewport.getWidth() );
+			else
+				y = Math.min( Math.max( y, 0 ), viewSize.height - tabViewport.getHeight() );
 
 			// check whether view position has changed
 			Point newViewPosition = new Point( x, y );
@@ -1894,9 +1943,7 @@ public class FlatTabbedPaneUI
 				return;
 
 			// update view position
-			if( preciseWheelRotation != 0 &&
-				preciseWheelRotation != e.getWheelRotation() )
-			{
+			if( isPreciseWheel ) {
 				// do not use animation for precise scrolling (e.g. with trackpad)
 
 				// stop running animation (if any)
@@ -2109,8 +2156,10 @@ public class FlatTabbedPaneUI
 		public void mouseReleased( MouseEvent e ) {
 			if( isPressedTabClose() ) {
 				updateRollover( e );
-				if( pressedTabIndex >= 0 && pressedTabIndex == getRolloverTab() )
+				if( pressedTabIndex >= 0 && pressedTabIndex == getRolloverTab() ) {
+					restoreTabToolTip();
 					closeTab( pressedTabIndex );
+				}
 			} else
 				mouseDelegate.mouseReleased( e );
 
@@ -2188,6 +2237,7 @@ public class FlatTabbedPaneUI
 			if( lastTipTabIndex < 0 )
 				return;
 
+			if( lastTipTabIndex < tabPane.getTabCount() )
 				tabPane.setToolTipTextAt( lastTipTabIndex, lastTip );
 			lastTip = null;
 			lastTipTabIndex = -1;
@@ -2893,6 +2943,8 @@ public class FlatTabbedPaneUI
 			moreTabsButton.setVisible( moreTabsButtonVisible );
 			backwardButton.setVisible( backwardButtonVisible );
 			forwardButton.setVisible( forwardButtonVisible );
+
+			scrollBackwardButtonPrefSize = backwardButton.getPreferredSize();
 		}
 	}
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java

@@ -141,7 +141,7 @@ public class FlatTableHeaderUI
 			   rendererClassName.equals( "sun.swing.FilePane$AlignableTableHeaderRenderer" );
 	}
 
-	private void paintColumnBorders( Graphics g, JComponent c ) {
+	protected void paintColumnBorders( Graphics g, JComponent c ) {
 		int width = c.getWidth();
 		int height = c.getHeight();
 		float lineWidth = UIScale.scale( 1f );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java

@@ -39,6 +39,7 @@ import javax.swing.text.Caret;
 import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.util.HiDPIUtils;
+import com.formdev.flatlaf.util.JavaCompatibility;
 
 /**
  * Provides the Flat LaF UI delegate for {@link javax.swing.JTextField}.
@@ -213,7 +214,9 @@ public class FlatTextFieldUI
 
 		// paint placeholder
 		g.setColor( placeholderForeground );
-		FlatUIUtils.drawString( c, g, (String) placeholder, x, y );
+		String clippedPlaceholder = JavaCompatibility.getClippedString( jc, fm,
+				(String) placeholder, c.getWidth() - insets.left - insets.right );
+		FlatUIUtils.drawString( c, g, clippedPlaceholder, x, y );
 	}
 
 	@Override

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java

@@ -146,10 +146,17 @@ public class FlatToggleButtonUI
 			int height = c.getHeight();
 			int width = c.getWidth();
 			boolean selected = ((AbstractButton)c).isSelected();
+			Color enabledColor = selected ? clientPropertyColor( c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground ) : null;
+
+			// use component background if explicitly set
+			if( enabledColor == null ) {
+				Color bg = c.getBackground();
+				if( isCustomBackground( bg ) )
+					enabledColor = bg;
+			}
 
 			// paint background
-			Color background = buttonStateColor( c,
-				selected ? clientPropertyColor( c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground ) : null,
+			Color background = buttonStateColor( c, enabledColor,
 				null, tabFocusBackground, tabHoverBackground, null );
 			if( background != null ) {
 				g.setColor( background );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java

@@ -33,15 +33,12 @@ import java.awt.Shape;
 import java.awt.Window;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
 import java.util.IdentityHashMap;
 import java.util.WeakHashMap;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 import javax.swing.JComponent;
 import javax.swing.JTable;
@@ -680,37 +677,6 @@ public class FlatUIUtils
 			.computeIfAbsent( key, k -> newInstanceSupplier.get() );
 	}
 
-	//---- class HoverListener ------------------------------------------------
-
-	public static class HoverListener
-		extends MouseAdapter
-	{
-		private final Component repaintComponent;
-		private final Consumer<Boolean> hoverChanged;
-
-		public HoverListener( Component repaintComponent, Consumer<Boolean> hoverChanged ) {
-			this.repaintComponent = repaintComponent;
-			this.hoverChanged = hoverChanged;
-		}
-
-		@Override
-		public void mouseEntered( MouseEvent e ) {
-			hoverChanged.accept( true );
-			repaint();
-		}
-
-		@Override
-		public void mouseExited( MouseEvent e ) {
-			hoverChanged.accept( false );
-			repaint();
-		}
-
-		private void repaint() {
-			if( repaintComponent != null && repaintComponent.isEnabled() )
-				repaintComponent.repaint();
-		}
-	}
-
 	//---- class RepaintFocusListener -----------------------------------------
 
 	public static class RepaintFocusListener

flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java

@@ -125,8 +125,8 @@ public class ColorFunctions
 
 		protected boolean shouldInverse( float[] hsla ) {
 			return increase
-				? hsla[hslIndex] >= 50
-				: hsla[hslIndex] < 50;
+				? hsla[hslIndex] > 65
+				: hsla[hslIndex] < 35;
 		}
 	}
 

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties

@@ -30,12 +30,18 @@
 @textComponentBackground = #45494A
 @menuBackground = darken(@background,5%)
 @menuHoverBackground = lighten(@menuBackground,10%,derived)
-@menuCheckBackground=darken(@selectionBackground,10%)
+@menuCheckBackground = darken(@selectionBackground,10%,derived noAutoInverse)
 @menuAcceleratorForeground = darken(@foreground,15%)
 @menuAcceleratorSelectionForeground = @selectionForeground
 @cellFocusColor = #000
 @icon = #adadad
 
+# for buttons within components (e.g. combobox or spinner)
+@buttonArrowColor = #9A9DA1
+@buttonDisabledArrowColor = darken(@buttonArrowColor,25%)
+@buttonHoverArrowColor = lighten(@buttonArrowColor,10%,derived noAutoInverse)
+@buttonPressedArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
+
 # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
 @dropCellBackground = darken(List.selectionBackground,10%,lazy)
 @dropCellForeground = lazy(List.selectionForeground)
@@ -62,8 +68,8 @@ Button.selectedForeground=@foreground
 Button.disabledSelectedBackground = lighten($Button.background,3%,derived)
 
 Button.borderColor = #5e6060
-Button.disabledBorderColor=#5e6060
-Button.focusedBorderColor=#466d94
+Button.disabledBorderColor = $Button.borderColor
+Button.focusedBorderColor = $Component.focusedBorderColor
 Button.hoverBorderColor = $Button.focusedBorderColor
 
 Button.default.background = #365880
@@ -97,7 +103,6 @@ CheckBox.icon.disabledCheckmarkColor=#606060
 
 # focused
 CheckBox.icon.focusedBorderColor = #466D94
-CheckBox.icon.selectedFocusedBorderColor=#466D94
 
 # hover
 CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor
@@ -106,23 +111,21 @@ CheckBox.icon.hoverBackground=lighten($CheckBox.icon.background,3%,derived)
 # pressed
 CheckBox.icon.pressedBackground = lighten($CheckBox.icon.background,6%,derived)
 
+
 # used if CheckBox.icon.style = filled
 # enabled
 CheckBox.icon[filled].selectedBorderColor = $CheckBox.icon.checkmarkColor
 CheckBox.icon[filled].selectedBackground = $CheckBox.icon.checkmarkColor
 CheckBox.icon[filled].checkmarkColor = $CheckBox.icon.background
 # hover
-CheckBox.icon[filled].selectedHoverBackground=darken($CheckBox.icon[filled].selectedBackground,3%)
+CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].selectedBackground,3%,derived)
 # pressed
-CheckBox.icon[filled].selectedPressedBackground=darken($CheckBox.icon[filled].selectedBackground,6%)
+CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived)
 
 
 #---- ComboBox ----
 
-ComboBox.buttonEditableBackground=#404445
-ComboBox.buttonArrowColor=#9A9DA1
-ComboBox.buttonDisabledArrowColor=#585858
-ComboBox.buttonHoverArrowColor=#bbb
+ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
 
 
 #---- Component ----
@@ -215,8 +218,8 @@ ProgressBar.selectionBackground=@foreground
 
 #---- RootPane ----
 
-RootPane.activeBorderColor=darken(@background,7%,derived)
-RootPane.inactiveBorderColor=darken(@background,5%,derived)
+RootPane.activeBorderColor = lighten(@background,7%,derived)
+RootPane.inactiveBorderColor = lighten(@background,5%,derived)
 
 
 #---- ScrollBar ----
@@ -242,8 +245,8 @@ Slider.trackColor=#646464
 Slider.thumbColor = $Slider.trackValueColor
 Slider.tickColor = #888
 Slider.focusedColor = fade($Component.focusColor,70%,derived)
-Slider.hoverThumbColor=darken($Slider.thumbColor,10%,derived)
-Slider.pressedThumbColor=darken($Slider.thumbColor,15%,derived)
+Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived)
+Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived)
 Slider.disabledTrackColor = #4c5052
 Slider.disabledThumbColor = $Slider.disabledTrackColor
 
@@ -251,7 +254,6 @@ Slider.disabledThumbColor=$Slider.disabledTrackColor
 #---- SplitPane ----
 
 SplitPaneDivider.draggingColor = #646464
-SplitPaneDivider.oneTouchHoverArrowColor=#7A7D81
 
 
 #---- TabbedPane ----
@@ -307,4 +309,4 @@ ToolTip.background=#1e2123
 
 #---- Tree ----
 
-Tree.hash=#505355
+Tree.hash = lighten($Tree.background,5%)

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties

@@ -67,7 +67,7 @@ ViewportUI=com.formdev.flatlaf.ui.FlatViewportUI
 @menuItemMargin = 3,6,3,6
 
 
-#---- globals ----
+#---- wildcard replacements ----
 
 *.background = @background
 *.foreground = @foreground
@@ -149,7 +149,6 @@ Button.margin=2,14,2,14
 Button.iconTextGap = 4
 Button.rollover = true
 Button.defaultButtonFollowsFocus = false
-[win]Button.defaultButtonFollowsFocus=true
 
 Button.borderWidth = 1
 Button.default.borderWidth = 1
@@ -203,6 +202,10 @@ ComboBox.maximumRowCount=15
 ComboBox.buttonStyle = auto
 ComboBox.background = @textComponentBackground
 ComboBox.buttonBackground = @textComponentBackground
+ComboBox.buttonArrowColor = @buttonArrowColor
+ComboBox.buttonDisabledArrowColor = @buttonDisabledArrowColor
+ComboBox.buttonHoverArrowColor = @buttonHoverArrowColor
+ComboBox.buttonPressedArrowColor = @buttonPressedArrowColor
 
 
 #---- Component ----
@@ -474,8 +477,8 @@ ScrollBar.hoverThumbWithTrack=false
 ScrollBar.pressedThumbWithTrack = false
 ScrollBar.showButtons = false
 ScrollBar.squareButtons = false
-ScrollBar.buttonArrowColor=$ComboBox.buttonArrowColor
-ScrollBar.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
+ScrollBar.buttonArrowColor = @buttonArrowColor
+ScrollBar.buttonDisabledArrowColor = @buttonDisabledArrowColor
 ScrollBar.allowsAbsolutePositioning = true
 
 [mac]ScrollBar.minimumThumbSize = 18,18
@@ -516,9 +519,10 @@ Slider.focusWidth=4
 Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder
 Spinner.background = @textComponentBackground
 Spinner.buttonBackground = $ComboBox.buttonEditableBackground
-Spinner.buttonArrowColor=$ComboBox.buttonArrowColor
-Spinner.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
-Spinner.buttonHoverArrowColor=$ComboBox.buttonHoverArrowColor
+Spinner.buttonArrowColor = @buttonArrowColor
+Spinner.buttonDisabledArrowColor = @buttonDisabledArrowColor
+Spinner.buttonHoverArrowColor = @buttonHoverArrowColor
+Spinner.buttonPressedArrowColor = @buttonPressedArrowColor
 Spinner.padding = @textComponentMargin
 Spinner.editorBorderPainted = false
 # allowed values: button or none
@@ -535,7 +539,9 @@ SplitPane.oneTouchButtonSize={scaledInteger}6
 SplitPane.oneTouchButtonOffset = {scaledInteger}2
 
 SplitPaneDivider.border = null
-SplitPaneDivider.oneTouchArrowColor=$ComboBox.buttonArrowColor
+SplitPaneDivider.oneTouchArrowColor = @buttonArrowColor
+SplitPaneDivider.oneTouchHoverArrowColor = @buttonHoverArrowColor
+SplitPaneDivider.oneTouchPressedArrowColor = @buttonPressedArrowColor
 # allowed values: grip or plain
 SplitPaneDivider.style = grip
 SplitPaneDivider.gripColor = @icon

flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties

@@ -30,12 +30,18 @@
 @textComponentBackground = #fff
 @menuBackground = #fff
 @menuHoverBackground = darken(@menuBackground,10%,derived)
-@menuCheckBackground=lighten(@selectionBackground,40%)
+@menuCheckBackground = lighten(@selectionBackground,40%,derived noAutoInverse)
 @menuAcceleratorForeground = lighten(@foreground,30%)
 @menuAcceleratorSelectionForeground = @selectionForeground
 @cellFocusColor = #000
 @icon = #afafaf
 
+# for buttons within components (e.g. combobox or spinner)
+@buttonArrowColor = #666
+@buttonDisabledArrowColor = lighten(@buttonArrowColor,25%)
+@buttonHoverArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
+@buttonPressedArrowColor = lighten(@buttonArrowColor,30%,derived noAutoInverse)
+
 # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
 @dropCellBackground = lighten(List.selectionBackground,10%,lazy)
 @dropCellForeground = lazy(List.selectionForeground)
@@ -47,8 +53,8 @@
 
 activeCaption = #99b4d1
 inactiveCaption = #bfcddb
-controlHighlight=#e3e3e3
-controlLtHighlight=#fff
+controlHighlight = lighten($controlShadow,12%)
+controlLtHighlight = lighten($controlShadow,25%)
 controlDkShadow = darken($controlShadow,15%)
 
 
@@ -70,8 +76,8 @@ Button.hoverBorderColor=$Button.focusedBorderColor
 Button.default.background = $Button.background
 Button.default.foreground = @foreground
 Button.default.focusedBackground = $Button.focusedBackground
-Button.default.hoverBackground=$Button.hoverBackground
-Button.default.pressedBackground=$Button.pressedBackground
+Button.default.hoverBackground = darken($Button.default.background,3%,derived)
+Button.default.pressedBackground = darken($Button.default.background,10%,derived)
 Button.default.borderColor = #4F9EE3
 Button.default.hoverBorderColor = $Button.hoverBorderColor
 Button.default.focusedBorderColor = $Button.focusedBorderColor
@@ -119,17 +125,14 @@ CheckBox.icon[filled].selectedFocusedBorderColor=#ACCFF7
 CheckBox.icon[filled].selectedFocusedBackground = $CheckBox.icon[filled].selectedBackground
 CheckBox.icon[filled].selectedFocusedCheckmarkColor = $CheckBox.icon.focusedBackground
 # hover
-CheckBox.icon[filled].selectedHoverBackground=darken($CheckBox.icon[filled].selectedBackground,5%)
+CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].selectedBackground,5%,derived)
 # pressed
-CheckBox.icon[filled].selectedPressedBackground=darken($CheckBox.icon[filled].selectedBackground,10%)
+CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived)
 
 
 #---- ComboBox ----
 
-ComboBox.buttonEditableBackground=#fafafa
-ComboBox.buttonArrowColor=#666
-ComboBox.buttonDisabledArrowColor=#ABABAB
-ComboBox.buttonHoverArrowColor=#999
+ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
 
 
 #---- Component ----
@@ -227,8 +230,8 @@ ProgressBar.selectionBackground=@foreground
 
 #---- RootPane ----
 
-RootPane.activeBorderColor=#707070
-RootPane.inactiveBorderColor=lighten($RootPane.activeBorderColor,20%,derived)
+RootPane.activeBorderColor = darken(@background,50%,derived)
+RootPane.inactiveBorderColor = darken(@background,30%,derived)
 
 
 #---- ScrollBar ----
@@ -254,8 +257,8 @@ Slider.trackColor=#c4c4c4
 Slider.thumbColor = $Slider.trackValueColor
 Slider.tickColor = #888
 Slider.focusedColor = fade($Component.focusColor,50%,derived)
-Slider.hoverThumbColor=lighten($Slider.thumbColor,10%,derived)
-Slider.pressedThumbColor=lighten($Slider.thumbColor,15%,derived)
+Slider.hoverThumbColor = darken($Slider.thumbColor,5%,derived)
+Slider.pressedThumbColor = darken($Slider.thumbColor,8%,derived)
 Slider.disabledTrackColor = #c0c0c0
 Slider.disabledThumbColor = $Slider.disabledTrackColor
 
@@ -263,7 +266,6 @@ Slider.disabledThumbColor=$Slider.disabledTrackColor
 #---- SplitPane ----
 
 SplitPaneDivider.draggingColor = #c4c4c4
-SplitPaneDivider.oneTouchHoverArrowColor=#333
 
 
 #---- TabbedPane ----
@@ -319,4 +321,4 @@ ToolTip.background=#fafafa
 
 #---- Tree ----
 
-Tree.hash=#E6E6E6
+Tree.hash = darken($Tree.background,10%)

flatlaf-core/src/main/resources/com/formdev/flatlaf/IntelliJTheme$ThemeLaf.properties

@@ -35,6 +35,13 @@ Button.default.hoverBorderColor=null
 HelpButton.hoverBorderColor = null
 
 
+#---- MenuItemCheckBox ----
+
+# colors from intellij/checkmark.svg and darcula/checkmark.svg
+[light]MenuItemCheckBox.icon.checkmarkColor=#3E3E3C
+[dark]MenuItemCheckBox.icon.checkmarkColor=#fff9
+
+
 #---- Slider ----
 
 Slider.focusedColor = fade($Component.focusColor,40%,derived)
@@ -50,11 +57,21 @@ ToggleButton.endBackground=$ToggleButton.background
 
 #---- theme specific ----
 
+@ijMenuCheckBackgroundL10 = lighten(@selectionBackground,10%,derived noAutoInverse)
+@ijMenuCheckBackgroundL20 = lighten(@selectionBackground,20%,derived noAutoInverse)
+@ijMenuCheckBackgroundD10 = darken(@selectionBackground,10%,derived noAutoInverse)
+
 [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]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]ProgressBar.selectionBackground = #ddd
 [Arc_Theme_Dark]ProgressBar.selectionForeground = #ddd
@@ -64,18 +81,28 @@ ToggleButton.endBackground=$ToggleButton.background
 
 [Cobalt_2]CheckBox.icon.background = #002946
 [Cobalt_2]CheckBox.icon.checkmarkColor = #002946
+[Cobalt_2]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Cobalt_2]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+
+[Cyan_light]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
+[Cyan_light]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL20
 
 [Dark_purple]Slider.focusedColor = fade($Component.focusColor,70%,derived)
 
 [Dracula]ProgressBar.selectionBackground = #fff
 [Dracula]ProgressBar.selectionForeground = #fff
 
+[Gradianto_Dark_Fuchsia]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Gradianto_Dark_Fuchsia]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+
 [Gruvbox_Dark_Hard]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
 [Gruvbox_Dark_Hard]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
 
 [Gruvbox_Dark_Medium]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
 [Gruvbox_Dark_Medium]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
 
+[Gruvbox_Dark_Soft]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Gruvbox_Dark_Soft]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
 [Gruvbox_Dark_Soft]ToggleButton.selectedBackground = $ToggleButton.selectedBackground
 [Gruvbox_Dark_Soft]ToggleButton.toolbar.selectedBackground = $ToggleButton.toolbar.selectedBackground
 
@@ -88,10 +115,30 @@ ToggleButton.endBackground=$ToggleButton.background
 [High_contrast]ToggleButton.disabledSelectedBackground = #444
 [High_contrast]ToggleButton.toolbar.selectedBackground = #fff
 
+[Monocai]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Monocai]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+@Monocai.acceleratorForeground = lazy(MenuItem.disabledForeground)
+@Monocai.acceleratorSelectionForeground = lighten(MenuItem.disabledForeground,10%,lazy)
+[Monocai]CheckBoxMenuItem.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]CheckBoxMenuItem.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+[Monocai]Menu.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]Menu.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+[Monocai]MenuItem.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]MenuItem.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+[Monocai]RadioButtonMenuItem.acceleratorForeground = @Monocai.acceleratorForeground
+[Monocai]RadioButtonMenuItem.acceleratorSelectionForeground = @Monocai.acceleratorSelectionForeground
+
+[Nord]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[Nord]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
+
+[One_Dark]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[One_Dark]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
 [One_Dark]Slider.focusedColor = fade(#568af2,40%)
 
 [Solarized_Dark]Slider.focusedColor = fade($Component.focusColor,80%,derived)
 
+[vuesion-theme]MenuItem.checkBackground = @ijMenuCheckBackgroundL10
+[vuesion-theme]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL10
 [vuesion-theme]Slider.trackValueColor = #ececee
 [vuesion-theme]Slider.trackColor = #303a45
 [vuesion-theme]Slider.thumbColor = #ececee
@@ -100,6 +147,11 @@ ToggleButton.endBackground=$ToggleButton.background
 
 # Material Theme UI Lite
 
+[light][author-Mallowigi]MenuItem.checkBackground = @ijMenuCheckBackgroundD10
+[light][author-Mallowigi]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundD10
+[dark][author-Mallowigi]MenuItem.checkBackground = @ijMenuCheckBackgroundL20
+[dark][author-Mallowigi]MenuItem.underlineSelectionCheckBackground = @ijMenuCheckBackgroundL20
+
 [Dracula_Contrast]ProgressBar.selectionBackground = #fff
 [Dracula_Contrast]ProgressBar.selectionForeground = #fff
 

flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json

@@ -74,7 +74,7 @@
 		"license": "MIT",
 		"licenseFile": "Dracula.LICENSE.txt",
 		"sourceCodeUrl": "https://github.com/dracula/jetbrains",
-		"sourceCodePath": "blob/master/src/main/resources/themes/dracula.theme.json"
+		"sourceCodePath": "blob/master/src/main/resources/themes/Dracula.theme.json"
 	},
 	"Gradianto_dark_fuchsia.theme.json": {
 		"name": "Gradianto Dark Fuchsia",
@@ -410,6 +410,22 @@
 		"sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite",
 		"sourceCodePath": "blob/master/src/main/resources/themes/Monokai Pro Contrast.theme.json"
 	},
+	"material-theme-ui-lite/Moonlight.theme.json": {
+		"name": "Material Theme UI Lite / Moonlight",
+		"dark": true,
+		"license": "MIT",
+		"licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt",
+		"sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite",
+		"sourceCodePath": "blob/master/src/main/resources/themes/Moonlight.theme.json"
+	},
+	"material-theme-ui-lite/Moonlight Contrast.theme.json": {
+		"name": "Material Theme UI Lite / Moonlight Contrast",
+		"dark": true,
+		"license": "MIT",
+		"licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt",
+		"sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite",
+		"sourceCodePath": "blob/master/src/main/resources/themes/Moonlight Contrast.theme.json"
+	},
 	"material-theme-ui-lite/Night Owl.theme.json": {
 		"name": "Material Theme UI Lite / Night Owl",
 		"dark": true,

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java

@@ -17,18 +17,23 @@
 package com.formdev.flatlaf.extras;
 
 import java.awt.*;
+import java.awt.datatransfer.StringSelection;
 import java.awt.event.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Properties;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.prefs.Preferences;
+import java.util.regex.Pattern;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
@@ -44,6 +49,7 @@ import com.formdev.flatlaf.ui.FlatEmptyBorder;
 import com.formdev.flatlaf.ui.FlatLineBorder;
 import com.formdev.flatlaf.ui.FlatMarginBorder;
 import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.DerivedColor;
 import com.formdev.flatlaf.util.GrayFilter;
 import com.formdev.flatlaf.util.HSLColor;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
@@ -66,12 +72,12 @@ public class FlatUIDefaultsInspector
 {
 	private static final int KEY_MODIFIERS_MASK = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK;
 
-	private static FlatUIDefaultsInspector inspector;
+	private static JFrame inspectorFrame;
 
-	private final String title;
 	private final PropertyChangeListener lafListener = this::lafChanged;
 	private final PropertyChangeListener lafDefaultsListener = this::lafDefaultsChanged;
 	private boolean refreshPending;
+	private Properties derivedColorKeys;
 
 	/**
 	 * Installs a key listener into the application that allows enabling and disabling
@@ -92,27 +98,31 @@ public class FlatUIDefaultsInspector
 	}
 
 	public static void show() {
-		if( inspector != null ) {
-			inspector.ensureOnScreen();
-			inspector.frame.toFront();
+		if( inspectorFrame != null ) {
+			ensureOnScreen( inspectorFrame );
+			inspectorFrame.toFront();
 			return;
 		}
 
-		inspector = new FlatUIDefaultsInspector();
-		inspector.frame.setVisible( true );
+		inspectorFrame = new FlatUIDefaultsInspector().createFrame();
+		inspectorFrame.setVisible( true );
 	}
 
 	public static void hide() {
-		if( inspector != null )
-			inspector.frame.dispose();
+		if( inspectorFrame != null )
+			inspectorFrame.dispose();
+	}
+
+	/**
+	 * Creates a UI defaults inspector panel that can be embedded into any window.
+	 */
+	public static JComponent createInspectorPanel() {
+		return new FlatUIDefaultsInspector().panel;
 	}
 
 	private FlatUIDefaultsInspector() {
 		initComponents();
 
-		title = frame.getTitle();
-		updateWindowTitle();
-
 		panel.setBorder( new ScaledEmptyBorder( 10, 10, 10, 10 ) );
 		filterPanel.setBorder( new ScaledEmptyBorder( 0, 0, 10, 0 ) );
 
@@ -143,24 +153,21 @@ public class FlatUIDefaultsInspector
 		table.getRowSorter().setSortKeys( Collections.singletonList(
 			new RowSorter.SortKey( 0, SortOrder.ASCENDING ) ) );
 
-		// restore window bounds
-		Preferences prefs = getPrefs();
-		int x = prefs.getInt( "x", -1 );
-		int y = prefs.getInt( "y", -1 );
-		int width = prefs.getInt( "width", UIScale.scale( 600 ) );
-		int height = prefs.getInt( "height", UIScale.scale( 800 ) );
-		frame.setSize( width, height );
-		if( x != -1 && y != -1 ) {
-			frame.setLocation( x, y );
-			ensureOnScreen();
-		} else
-			frame.setLocationRelativeTo( null );
-
 		// restore column widths
+		Preferences prefs = getPrefs();
 		TableColumnModel columnModel = table.getColumnModel();
 		columnModel.getColumn( 0 ).setPreferredWidth( prefs.getInt( "column1width", 100 ) );
 		columnModel.getColumn( 1 ).setPreferredWidth( prefs.getInt( "column2width", 100 ) );
 
+		PropertyChangeListener columnWidthListener = e -> {
+			if( "width".equals( e.getPropertyName() ) ) {
+				prefs.putInt( "column1width", columnModel.getColumn( 0 ).getWidth() );
+				prefs.putInt( "column2width", columnModel.getColumn( 1 ).getWidth() );
+			}
+		};
+		columnModel.getColumn( 0 ).addPropertyChangeListener( columnWidthListener );
+		columnModel.getColumn( 1 ).addPropertyChangeListener( columnWidthListener );
+
 		// restore filter
 		String filter = prefs.get( "filter", "" );
 		String valueType = prefs.get( "valueType", null );
@@ -169,20 +176,66 @@ public class FlatUIDefaultsInspector
 		if( valueType != null )
 			valueTypeField.setSelectedItem( valueType );
 
+		panel.addPropertyChangeListener( "ancestor", e -> {
+			if( e.getNewValue() != null ) {
 				UIManager.addPropertyChangeListener( lafListener );
 				UIManager.getDefaults().addPropertyChangeListener( lafDefaultsListener );
+			} else {
+				UIManager.removePropertyChangeListener( lafListener );
+				UIManager.getDefaults().removePropertyChangeListener( lafDefaultsListener );
+			}
+		} );
 
 		// register F5 key to refresh
-		((JComponent)frame.getContentPane()).registerKeyboardAction(
+		panel.registerKeyboardAction(
 			e -> refresh(),
 			KeyStroke.getKeyStroke( KeyEvent.VK_F5, 0, false ),
 			JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
+	}
+
+	private JFrame createFrame() {
+		JFrame frame = new JFrame();
+		frame.setTitle( "UI Defaults Inspector" );
+		frame.setDefaultCloseOperation( WindowConstants.DISPOSE_ON_CLOSE );
+		frame.addWindowListener( new WindowAdapter() {
+			@Override
+			public void windowClosed( WindowEvent e ) {
+				inspectorFrame = null;
+			}
+			@Override
+			public void windowClosing( WindowEvent e ) {
+				saveWindowBounds( frame );
+			}
+			@Override
+			public void windowDeactivated( WindowEvent e ) {
+				saveWindowBounds( frame );
+			}
+		} );
+
+		updateWindowTitle( frame );
+
+		frame.getContentPane().add( panel, BorderLayout.CENTER );
+
+		// restore window bounds
+		Preferences prefs = getPrefs();
+		int x = prefs.getInt( "x", -1 );
+		int y = prefs.getInt( "y", -1 );
+		int width = prefs.getInt( "width", UIScale.scale( 600 ) );
+		int height = prefs.getInt( "height", UIScale.scale( 800 ) );
+		frame.setSize( width, height );
+		if( x != -1 && y != -1 ) {
+			frame.setLocation( x, y );
+			ensureOnScreen( frame );
+		} else
+			frame.setLocationRelativeTo( null );
 
 		// register ESC key to close frame
 		((JComponent)frame.getContentPane()).registerKeyboardAction(
 			e -> frame.dispose(),
 			KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0, false ),
 			JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
+
+		return frame;
 	}
 
 	private void delegateKey( int keyCode, String actionKey ) {
@@ -202,7 +255,7 @@ public class FlatUIDefaultsInspector
 		} );
 	}
 
-	private void ensureOnScreen() {
+	private static void ensureOnScreen( JFrame frame ) {
 		Rectangle frameBounds = frame.getBounds();
 		boolean onScreen = false;
 		for( GraphicsDevice screen : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices() ) {
@@ -219,12 +272,12 @@ public class FlatUIDefaultsInspector
 			frame.setLocationRelativeTo( null );
 	}
 
-	void lafChanged( PropertyChangeEvent e ) {
+	private void lafChanged( PropertyChangeEvent e ) {
 		if( "lookAndFeel".equals( e.getPropertyName() ) )
 			refresh();
 	}
 
-	void lafDefaultsChanged( PropertyChangeEvent e ) {
+	private void lafDefaultsChanged( PropertyChangeEvent e ) {
 		if( refreshPending )
 			return;
 
@@ -235,11 +288,13 @@ public class FlatUIDefaultsInspector
 		} );
 	}
 
-	void refresh() {
+	private void refresh() {
 		ItemsTableModel model = (ItemsTableModel) table.getModel();
 		model.setItems( getUIDefaultsItems() );
 
-		updateWindowTitle();
+		JFrame frame = (JFrame) SwingUtilities.getAncestorOfClass( JFrame.class, panel );
+		if( frame != null )
+			updateWindowTitle( frame );
 	}
 
 	private Item[] getUIDefaultsItems() {
@@ -249,6 +304,7 @@ public class FlatUIDefaultsInspector
 		Set<Entry<Object, Object>> defaultsSet = defaults.entrySet();
 		ArrayList<Item> items = new ArrayList<>( defaultsSet.size() );
 		HashSet<Object> keys = new HashSet<>( defaultsSet.size() );
+		Color[] pBaseColor = new Color[1];
 		for( Entry<Object,Object> e : defaultsSet ) {
 			Object key = e.getKey();
 
@@ -265,6 +321,13 @@ public class FlatUIDefaultsInspector
 			if( !keys.add( key ) )
 				continue;
 
+			// resolve derived color
+			if( value instanceof DerivedColor ) {
+				Color resolvedColor = resolveDerivedColor( defaults, (String) key, (DerivedColor) value, pBaseColor );
+				if( resolvedColor != value )
+					value = new Color[] { resolvedColor, pBaseColor[0], (Color) value };
+			}
+
 			// check whether key was overridden using UIManager.put(key,value)
 			Object lafValue = null;
 			if( defaults.containsKey( key ) )
@@ -277,42 +340,107 @@ public class FlatUIDefaultsInspector
 		return items.toArray( new Item[items.size()] );
 	}
 
-	private void updateWindowTitle() {
-		frame.setTitle( title + "  -  " + UIManager.getLookAndFeel().getName() );
+	private Color resolveDerivedColor( UIDefaults defaults, String key, Color color, Color[] pBaseColor ) {
+		if( pBaseColor != null )
+			pBaseColor[0] = null;
+
+		if( !(color instanceof DerivedColor) )
+			return color;
+
+		if( derivedColorKeys == null )
+			derivedColorKeys = loadDerivedColorKeys();
+
+		Object baseKey = derivedColorKeys.get( key );
+		if( baseKey == null )
+			return color;
+
+		// this is for keys that may be defined as derived colors, but do not derive them at runtime
+		if( "null".equals( baseKey ) )
+			return color;
+
+		Color baseColor = defaults.getColor( baseKey );
+		if( baseColor == null )
+			return color;
+
+		if( baseColor instanceof DerivedColor )
+			baseColor = resolveDerivedColor( defaults, (String) baseKey, baseColor, null );
+
+		if( pBaseColor != null )
+			pBaseColor[0] = baseColor;
+
+		Color newColor = FlatUIUtils.deriveColor( color, baseColor );
+
+		// creating a new color instance to drop Color.frgbvalue from newColor
+		// and avoid rounding issues/differences
+		return new Color( newColor.getRGB(), true );
 	}
 
-	private void saveWindowBounds() {
+	private Properties loadDerivedColorKeys() {
+		Properties properties = new Properties();
+		try( InputStream in = getClass().getResourceAsStream( "/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties" ) ) {
+			properties.load( in );
+		} catch( IOException ex ) {
+			ex.printStackTrace();
+		}
+		return properties;
+	}
+
+	private static void updateWindowTitle( JFrame frame ) {
+		String title = frame.getTitle();
+		String sep = "  -  ";
+		int sepIndex = title.indexOf( sep );
+		if( sepIndex >= 0 )
+			title = title.substring( 0, sepIndex );
+		frame.setTitle( title + sep + UIManager.getLookAndFeel().getName() );
+	}
+
+	private void saveWindowBounds( JFrame frame ) {
 		Preferences prefs = getPrefs();
 		prefs.putInt( "x", frame.getX() );
 		prefs.putInt( "y", frame.getY() );
 		prefs.putInt( "width", frame.getWidth() );
 		prefs.putInt( "height", frame.getHeight() );
-
-		TableColumnModel columnModel = table.getColumnModel();
-		prefs.putInt( "column1width", columnModel.getColumn( 0 ).getWidth() );
-		prefs.putInt( "column2width", columnModel.getColumn( 1 ).getWidth() );
 	}
 
 	private Preferences getPrefs() {
 		return Preferences.userRoot().node( "flatlaf-uidefaults-inspector" );
 	}
 
-	private void windowClosed() {
-		UIManager.removePropertyChangeListener( lafListener );
-		UIManager.getDefaults().removePropertyChangeListener( lafDefaultsListener );
-
-		inspector = null;
-	}
-
 	private void filterChanged() {
 		String filter = filterField.getText().trim();
 		String valueType = (String) valueTypeField.getSelectedItem();
 
 		// split filter string on space characters
-		String[] filters = filter.split( " +" );
-		for( int i = 0; i < filters.length; i++ )
+		String[] filters = !filter.isEmpty() ? filter.split( " +" ) : null;
+		Pattern[] patterns = (filters != null) ? new Pattern[filters.length] : null;
+		if( filters != null ) {
+			for( int i = 0; i < filters.length; i++ ) {
 				filters[i] = filters[i].toLowerCase( Locale.ENGLISH );
 
+				// simple wildcard matching
+				//  - '*' matches any number of characters
+				//  - '?' matches a single character
+				//  - '^' beginning of line
+				//  - '$' end of line
+				String f = filters[i];
+				boolean matchBeginning = f.startsWith( "^" );
+				boolean matchEnd = f.endsWith( "$" );
+				if( f.indexOf( '*' ) >= 0 || f.indexOf( '?' ) >= 0 || matchBeginning || matchEnd ) {
+					if( matchBeginning )
+						f = f.substring( 1 );
+					if( matchEnd )
+						f = f.substring( 0, f.length() - 1 );
+
+					String regex = ("\\Q" + f + "\\E").replace( "*", "\\E.*\\Q" ).replace( "?", "\\E.\\Q" );
+					if( !matchBeginning )
+						regex = ".*" + regex;
+					if( !matchEnd )
+						regex = regex + ".*";
+					patterns[i] = Pattern.compile( regex );
+				}
+			}
+		}
+
 		ItemsTableModel model = (ItemsTableModel) table.getModel();
 		model.setFilter( item -> {
 			if( valueType != null &&
@@ -320,12 +448,22 @@ public class FlatUIDefaultsInspector
 				!valueType.equals( typeOfValue( item.value ) ) )
 			  return false;
 
+			if( filters == null )
+				return true;
+
 			String lkey = item.key.toLowerCase( Locale.ENGLISH );
 			String lvalue = item.getValueAsString().toLowerCase( Locale.ENGLISH );
-			for( String f : filters ) {
+			for( int i = 0; i < filters.length; i++ ) {
+				Pattern p = patterns[i];
+				if( p != null ) {
+					if( p.matcher( lkey ).matches() || p.matcher( lvalue ).matches() )
+						return true;
+				} else {
+					String f = filters[i];
 					if( lkey.contains( f ) || lvalue.contains( f ) )
 						return true;
 				}
+			}
 			return false;
 		} );
 
@@ -339,7 +477,7 @@ public class FlatUIDefaultsInspector
 			return "Boolean";
 		if( value instanceof Border )
 			return "Border";
-		if( value instanceof Color )
+		if( value instanceof Color || value instanceof Color[] )
 			return "Color";
 		if( value instanceof Dimension )
 			return "Dimension";
@@ -358,9 +496,51 @@ public class FlatUIDefaultsInspector
 		return "(other)";
 	}
 
+	private void tableMousePressed( MouseEvent e ) {
+		if( !SwingUtilities.isRightMouseButton( e ) )
+			return;
+
+		int row = table.rowAtPoint( e.getPoint() );
+		if( row >= 0 && !table.isRowSelected( row ) )
+			table.setRowSelectionInterval( row, row );
+	}
+
+	private void copyKey() {
+		copyToClipboard( 0 );
+	}
+
+	private void copyValue() {
+		copyToClipboard( 1 );
+	}
+
+	private void copyKeyAndValue() {
+		copyToClipboard( -1 );
+	}
+
+	private void copyToClipboard( int column ) {
+		int[] rows = table.getSelectedRows();
+		if( rows.length == 0 )
+			return;
+
+		StringBuilder buf = new StringBuilder();
+		for( int i = 0; i < rows.length; i++ ) {
+			if( i > 0 )
+				buf.append( '\n' );
+
+			if( column < 0 || column == 0 )
+				buf.append( table.getValueAt( rows[i], 0 ) );
+			if( column < 0 )
+				buf.append( " = " );
+			if( column < 0 || column == 1 )
+				buf.append( table.getValueAt( rows[i], 1 ) );
+		}
+
+		Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+			new StringSelection( buf.toString() ), null );
+	}
+
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
-		frame = new JFrame();
 		panel = new JPanel();
 		filterPanel = new JPanel();
 		flterLabel = new JLabel();
@@ -369,27 +549,10 @@ public class FlatUIDefaultsInspector
 		valueTypeField = new JComboBox<>();
 		scrollPane = new JScrollPane();
 		table = new JTable();
-
-		//======== frame ========
-		{
-			frame.setTitle("UI Defaults Inspector");
-			frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-			frame.addWindowListener(new WindowAdapter() {
-				@Override
-				public void windowClosed(WindowEvent e) {
-					FlatUIDefaultsInspector.this.windowClosed();
-				}
-				@Override
-				public void windowClosing(WindowEvent e) {
-					saveWindowBounds();
-				}
-				@Override
-				public void windowDeactivated(WindowEvent e) {
-					saveWindowBounds();
-				}
-			});
-			Container frameContentPane = frame.getContentPane();
-			frameContentPane.setLayout(new BorderLayout());
+		tablePopupMenu = new JPopupMenu();
+		copyKeyMenuItem = new JMenuItem();
+		copyValueMenuItem = new JMenuItem();
+		copyKeyAndValueMenuItem = new JMenuItem();
 
 		//======== panel ========
 		{
@@ -452,17 +615,40 @@ public class FlatUIDefaultsInspector
 
 				//---- table ----
 				table.setAutoCreateRowSorter(true);
+				table.setComponentPopupMenu(tablePopupMenu);
+				table.addMouseListener(new MouseAdapter() {
+					@Override
+					public void mousePressed(MouseEvent e) {
+						tableMousePressed(e);
+					}
+				});
 				scrollPane.setViewportView(table);
 			}
 			panel.add(scrollPane, BorderLayout.CENTER);
 		}
-			frameContentPane.add(panel, BorderLayout.CENTER);
+
+		//======== tablePopupMenu ========
+		{
+
+			//---- copyKeyMenuItem ----
+			copyKeyMenuItem.setText("Copy Key");
+			copyKeyMenuItem.addActionListener(e -> copyKey());
+			tablePopupMenu.add(copyKeyMenuItem);
+
+			//---- copyValueMenuItem ----
+			copyValueMenuItem.setText("Copy Value");
+			copyValueMenuItem.addActionListener(e -> copyValue());
+			tablePopupMenu.add(copyValueMenuItem);
+
+			//---- copyKeyAndValueMenuItem ----
+			copyKeyAndValueMenuItem.setText("Copy Key and Value");
+			copyKeyAndValueMenuItem.addActionListener(e -> copyKeyAndValue());
+			tablePopupMenu.add(copyKeyAndValueMenuItem);
 		}
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}
 
 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
-	private JFrame frame;
 	private JPanel panel;
 	private JPanel filterPanel;
 	private JLabel flterLabel;
@@ -471,6 +657,10 @@ public class FlatUIDefaultsInspector
 	private JComboBox<String> valueTypeField;
 	private JScrollPane scrollPane;
 	private JTable table;
+	private JPopupMenu tablePopupMenu;
+	private JMenuItem copyKeyMenuItem;
+	private JMenuItem copyValueMenuItem;
+	private JMenuItem copyKeyAndValueMenuItem;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 
 	//---- class Item ---------------------------------------------------------
@@ -495,19 +685,17 @@ public class FlatUIDefaultsInspector
 		}
 
 		static String valueAsString( Object value ) {
-			if( value instanceof Color ) {
-				Color color = (Color) value;
+			if( value instanceof Color || value instanceof Color[] ) {
+				Color color = (value instanceof Color[]) ? ((Color[])value)[0] : (Color) value;
 				HSLColor hslColor = new HSLColor( color );
 				if( color.getAlpha() == 255 ) {
-					return String.format( "%s    rgb(%d, %d, %d)    hsl(%d, %d, %d)",
+					return String.format( "%-9s HSL %3d %3d %3d",
 						color2hex( color ),
-						color.getRed(), color.getGreen(), color.getBlue(),
 						(int) hslColor.getHue(), (int) hslColor.getSaturation(),
 						(int) hslColor.getLuminance() );
 				} else {
-					return String.format( "%s   rgba(%d, %d, %d, %d)    hsla(%d, %d, %d, %d)",
+					return String.format( "%-9s HSL %3d %3d %3d %2d",
 						color2hex( color ),
-						color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha(),
 						(int) hslColor.getHue(), (int) hslColor.getSaturation(),
 						(int) hslColor.getLuminance(), (int) (hslColor.getAlpha() * 100) );
 				}
@@ -533,7 +721,7 @@ public class FlatUIDefaultsInspector
 				if( border instanceof FlatLineBorder ) {
 					FlatLineBorder lineBorder = (FlatLineBorder) border;
 					return valueAsString( lineBorder.getUnscaledBorderInsets() )
-						+ "  " + Item.color2hex( lineBorder.getLineColor() )
+						+ "  " + color2hex( lineBorder.getLineColor() )
 						+ "  " + lineBorder.getLineThickness()
 						+ "    " + border.getClass().getName();
 				} else if( border instanceof EmptyBorder ) {
@@ -803,7 +991,7 @@ public class FlatUIDefaultsInspector
 			init( table, item.key, isSelected, row );
 
 			// reset background, foreground and icon
-			if( !(item.value instanceof Color) ) {
+			if( !(item.value instanceof Color) && !(item.value instanceof Color[]) ) {
 				setBackground( null );
 				setForeground( null );
 			}
@@ -815,9 +1003,9 @@ public class FlatUIDefaultsInspector
 
 			super.getTableCellRendererComponent( table, value, isSelected, hasFocus, row, column );
 
-			if( item.value instanceof Color ) {
-				Color color = (Color) item.value;
-				boolean isDark = new HSLColor( color ).getLuminance() < 70;
+			if( item.value instanceof Color || item.value instanceof Color[] ) {
+				Color color = (item.value instanceof Color[]) ? ((Color[])item.value)[0] : (Color) item.value;
+				boolean isDark = new HSLColor( color ).getLuminance() < 70 && color.getAlpha() >= 128;
 				setBackground( color );
 				setForeground( isDark ? Color.white : Color.black );
 			} else if( item.value instanceof Icon ) {
@@ -826,7 +1014,9 @@ public class FlatUIDefaultsInspector
 			}
 
 			// set tooltip
-			String toolTipText = String.valueOf( item.value );
+			String toolTipText = (item.value instanceof Object[])
+				? Arrays.toString( (Object[]) item.value ).replace( ", ", ",\n" )
+				: 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 );
@@ -838,10 +1028,31 @@ public class FlatUIDefaultsInspector
 
 		@Override
 		protected void paintComponent( Graphics g ) {
-			if( item.value instanceof Color ) {
-				// fill background
-				g.setColor( getBackground() );
-				g.fillRect( 0, 0, getWidth(), getHeight() );
+			if( item.value instanceof Color || item.value instanceof Color[] ) {
+				int width = getWidth();
+				int height = getHeight();
+				Color background = getBackground();
+
+				// paint color
+				fillRect( g, background, 0, 0, width, height );
+
+				if( item.value instanceof Color[] ) {
+					// paint base color
+					int width2 = height * 2;
+					fillRect( g, ((Color[])item.value)[1], width - width2, 0, width2, height );
+
+					// paint default color
+					Color defaultColor = ((Color[])item.value)[2];
+					if( defaultColor != null && !defaultColor.equals( background ) ) {
+						int width3 = height / 2;
+						fillRect( g, defaultColor, width - width3, 0, width3, height );
+					}
+
+					// paint "derived color" indicator
+					int width4 = height / 4;
+					g.setColor( Color.magenta );
+					g.fillRect( width - width4, 0, width4, height );
+				}
 
 				// layout text
 				FontMetrics fm = getFontMetrics( getFont() );
@@ -853,18 +1064,14 @@ public class FlatUIDefaultsInspector
 
 				g.setColor( getForeground() );
 
-				// paint rgb() and hsl() horizontally aligned
-				int rgbIndex = text.indexOf( "rgb" );
-				int hslIndex = text.indexOf( "hsl" );
-				if( rgbIndex > 0 && hslIndex > rgbIndex ) {
-					String hexText = text.substring( 0, rgbIndex );
-					String rgbText = text.substring( rgbIndex, hslIndex );
+				// paint hsl horizontally aligned
+				int hslIndex = text.indexOf( "HSL" );
+				if( hslIndex > 0 ) {
+					String hexText = text.substring( 0, hslIndex );
 					String hslText = text.substring( hslIndex );
-					int hexWidth = Math.max( fm.stringWidth( hexText ), fm.stringWidth( "#DDDDDD    " ) );
-					int rgbWidth = Math.max( fm.stringWidth( rgbText ), fm.stringWidth( "rgb(444, 444, 444)    " ) );
+					int hexWidth = Math.max( fm.stringWidth( hexText ), fm.stringWidth( "#12345678  " ) );
 					FlatUIUtils.drawString( this, g, hexText, x, y );
-					FlatUIUtils.drawString( this, g, rgbText, x + hexWidth, y );
-					FlatUIUtils.drawString( this, g, hslText, x + hexWidth + rgbWidth, y );
+					FlatUIUtils.drawString( this, g, hslText, x + hexWidth, y );
 				} else
 					FlatUIUtils.drawString( this, g, text, x, y );
 			} else
@@ -872,6 +1079,17 @@ public class FlatUIDefaultsInspector
 
 			paintSeparator( g );
 		}
+
+		private void fillRect( Graphics g, Color color, int x, int y, int width, int height ) {
+			// fill white if color is translucent
+			if( color.getAlpha() != 255 ) {
+				g.setColor( Color.white );
+				g.fillRect( x, y, width, height );
+			}
+
+			g.setColor( color );
+			g.fillRect( x, y, width, height );
+		}
 	}
 
 	//---- class SafeIcon -----------------------------------------------------

flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.jfd

@@ -1,17 +1,8 @@
-JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
 	root: new FormRoot {
-		add( new FormWindow( "javax.swing.JFrame", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-			name: "frame"
-			"title": "UI Defaults Inspector"
-			"defaultCloseOperation": 2
-			"$sizePolicy": 2
-			"$locationPolicy": 2
-			addEvent( new FormEvent( "java.awt.event.WindowListener", "windowClosed", "windowClosed", false ) )
-			addEvent( new FormEvent( "java.awt.event.WindowListener", "windowClosing", "saveWindowBounds", false ) )
-			addEvent( new FormEvent( "java.awt.event.WindowListener", "windowDeactivated", "saveWindowBounds", false ) )
 		add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
 			name: "panel"
 			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.GridBagLayout ) {
@@ -75,9 +66,8 @@ new FormModel {
 				add( new FormComponent( "javax.swing.JTable" ) {
 					name: "table"
 					"autoCreateRowSorter": true
-					} )
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
+					"componentPopupMenu": new FormReference( "tablePopupMenu" )
+					addEvent( new FormEvent( "java.awt.event.MouseListener", "mousePressed", "tableMousePressed", true ) )
 				} )
 			}, new FormLayoutConstraints( class java.lang.String ) {
 				"value": "Center"
@@ -86,5 +76,25 @@ new FormModel {
 			"location": new java.awt.Point( 0, 0 )
 			"size": new java.awt.Dimension( 400, 300 )
 		} )
+		add( new FormContainer( "javax.swing.JPopupMenu", new FormLayoutManager( class javax.swing.JPopupMenu ) ) {
+			name: "tablePopupMenu"
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "copyKeyMenuItem"
+				"text": "Copy Key"
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "copyKey", false ) )
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "copyValueMenuItem"
+				"text": "Copy Value"
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "copyValue", false ) )
+			} )
+			add( new FormComponent( "javax.swing.JMenuItem" ) {
+				name: "copyKeyAndValueMenuItem"
+				"text": "Copy Key and Value"
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "copyKeyAndValue", false ) )
+			} )
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 0, 370 )
+		} )
 	}
 }

flatlaf-extras/src/main/module-info/module-info.java

@@ -24,4 +24,7 @@ module com.formdev.flatlaf.extras {
 	requires com.formdev.flatlaf;
 
 	exports com.formdev.flatlaf.extras;
+	exports com.formdev.flatlaf.extras.components;
+
+	opens com.formdev.flatlaf.extras.resources;
 }

flatlaf-extras/src/main/resources/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties

@@ -0,0 +1,212 @@
+#
+# 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.
+#
+
+#
+# This file lists UI keys of colors, which are computed at runtime.
+#
+# Colors marked as `derived` in properties files are computed at runtime based on
+# a variable base color (usually the current background color of a component).
+# This works only for a limited set of UI keys.
+#
+# The property key is the UI key of a color, which is computed at runtime.
+# The property value is the UI key of the base color.
+#
+# This file is not used at runtime.
+# It is only used in tooling (e.g. UI Defaults Inspector or UIDefaultsDump).
+#
+
+
+#---- system colors ----
+
+scrollbar = null
+
+
+#---- Button ----
+
+Button.focusedBackground = Button.background
+Button.hoverBackground = Button.background
+Button.pressedBackground = Button.background
+Button.selectedBackground = Button.background
+Button.disabledBackground = Button.background
+Button.disabledSelectedBackground = Button.background
+
+Button.default.focusedBackground = Button.default.background
+Button.default.hoverBackground = Button.default.background
+Button.default.pressedBackground = Button.default.background
+
+Button.toolbar.hoverBackground = Button.background
+Button.toolbar.pressedBackground = Button.background
+Button.toolbar.selectedBackground = Button.background
+
+
+#---- CheckBox ----
+
+CheckBox.icon.disabledBackground = CheckBox.icon.background
+CheckBox.icon.focusedBackground = CheckBox.icon.background
+CheckBox.icon.hoverBackground = CheckBox.icon.background
+CheckBox.icon.pressedBackground = CheckBox.icon.background
+CheckBox.icon.selectedFocusedBackground = CheckBox.icon.selectedBackground
+CheckBox.icon.selectedHoverBackground = CheckBox.icon.selectedBackground
+CheckBox.icon.selectedPressedBackground = CheckBox.icon.selectedBackground
+
+CheckBox.icon[filled].disabledBackground = CheckBox.icon[filled].background
+CheckBox.icon[filled].focusedBackground = CheckBox.icon[filled].background
+CheckBox.icon[filled].hoverBackground = CheckBox.icon[filled].background
+CheckBox.icon[filled].pressedBackground = CheckBox.icon[filled].background
+CheckBox.icon[filled].selectedFocusedBackground = CheckBox.icon[filled].selectedBackground
+CheckBox.icon[filled].selectedHoverBackground = CheckBox.icon[filled].selectedBackground
+CheckBox.icon[filled].selectedPressedBackground = CheckBox.icon[filled].selectedBackground
+
+
+#---- CheckBoxMenuItem ----
+
+CheckBoxMenuItem.selectionBackground = CheckBoxMenuItem.background
+
+
+#---- ComboBox ----
+
+ComboBox.buttonDisabledArrowColor = ComboBox.buttonArrowColor
+ComboBox.buttonHoverArrowColor = ComboBox.buttonArrowColor
+ComboBox.buttonPressedArrowColor = ComboBox.buttonArrowColor
+
+
+#---- Component ----
+
+Component.custom.borderColor = null
+
+
+#---- HelpButton ----
+
+HelpButton.disabledBackground = HelpButton.background
+HelpButton.focusedBackground = HelpButton.background
+HelpButton.hoverBackground = HelpButton.background
+HelpButton.pressedBackground = HelpButton.background
+
+
+#---- InternalFrame ----
+
+InternalFrame.buttonHoverBackground = InternalFrame.activeTitleBackground
+InternalFrame.buttonPressedBackground = InternalFrame.activeTitleBackground
+
+
+#---- Menu ----
+
+Menu.selectionBackground = Menu.background
+
+
+#---- MenuBar ----
+
+MenuBar.hoverBackground = Menu.background
+MenuBar.underlineSelectionBackground = Menu.background
+
+
+#---- MenuItem ----
+
+MenuItem.checkBackground = MenuItem.selectionBackground
+MenuItem.underlineSelectionBackground = MenuItem.background
+MenuItem.underlineSelectionCheckBackground = MenuItem.selectionBackground
+MenuItem.selectionBackground = MenuItem.background
+
+
+#---- RadioButtonMenuItem ----
+
+RadioButtonMenuItem.selectionBackground = RadioButtonMenuItem.background
+
+
+#---- RootPane ----
+
+RootPane.activeBorderColor = Panel.background
+RootPane.inactiveBorderColor = Panel.background
+
+
+#---- ScrollBar ----
+
+ScrollBar.track = ScrollBar.background
+ScrollBar.thumb = ScrollBar.track
+ScrollBar.hoverTrackColor = ScrollBar.track
+ScrollBar.hoverThumbColor = ScrollBar.thumb
+ScrollBar.pressedTrackColor = ScrollBar.track
+ScrollBar.pressedThumbColor = ScrollBar.thumb
+
+ScrollBar.buttonDisabledArrowColor = ScrollBar.buttonArrowColor
+ScrollBar.hoverButtonBackground = ScrollBar.background
+ScrollBar.pressedButtonBackground = ScrollBar.background
+
+
+#---- ScrollPane ----
+
+ScrollPane.background = null
+
+
+#---- Slider ----
+
+Slider.focusedColor = Component.focusColor
+Slider.hoverThumbColor = Slider.thumbColor
+Slider.pressedThumbColor = Slider.thumbColor
+Slider.disabledThumbColor = Slider.thumbColor
+
+
+#---- Spinner ----
+
+Spinner.buttonDisabledArrowColor = Spinner.buttonArrowColor
+Spinner.buttonHoverArrowColor = Spinner.buttonArrowColor
+Spinner.buttonPressedArrowColor = Spinner.buttonArrowColor
+
+
+#---- SplitPaneDivider ----
+
+SplitPaneDivider.oneTouchHoverArrowColor = SplitPaneDivider.oneTouchArrowColor
+SplitPaneDivider.oneTouchPressedArrowColor = SplitPaneDivider.oneTouchArrowColor
+
+
+#---- TabbedPane ----
+
+TabbedPane.selectedBackground = TabbedPane.background
+TabbedPane.hoverColor = TabbedPane.background
+TabbedPane.focusColor = TabbedPane.background
+
+TabbedPane.closeBackground = TabbedPane.background
+TabbedPane.closeHoverBackground = TabbedPane.background
+TabbedPane.closePressedBackground = TabbedPane.background
+
+TabbedPane.closeForeground = TabbedPane.foreground
+TabbedPane.closeHoverForeground = TabbedPane.foreground
+TabbedPane.closePressedForeground = TabbedPane.foreground
+
+TabbedPane.buttonHoverBackground = TabbedPane.background
+TabbedPane.buttonPressedBackground = TabbedPane.background
+
+
+#---- TitlePane ----
+
+TitlePane.buttonHoverBackground = TitlePane.background
+TitlePane.buttonPressedBackground = TitlePane.background
+
+
+#---- ToggleButton ----
+
+ToggleButton.focusedBackground = ToggleButton.background
+ToggleButton.hoverBackground = ToggleButton.background
+ToggleButton.pressedBackground = ToggleButton.background
+ToggleButton.selectedBackground = ToggleButton.background
+ToggleButton.disabledBackground = ToggleButton.background
+ToggleButton.disabledSelectedBackground = ToggleButton.background
+
+ToggleButton.toolbar.hoverBackground = ToggleButton.background
+ToggleButton.toolbar.pressedBackground = ToggleButton.background
+ToggleButton.toolbar.selectedBackground = ToggleButton.background
+
+ToggleButton.tab.hoverBackground = null

flatlaf-intellij-themes/README.md

@@ -101,6 +101,8 @@ Name | Class
 [Material Palenight Contrast (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialPalenightContrastIJTheme`
 [Monokai Pro (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMonokaiProIJTheme`
 [Monokai Pro Contrast (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMonokaiProContrastIJTheme`
+[Moonlight (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMoonlightIJTheme`
+[Moonlight Contrast (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMoonlightContrastIJTheme`
 [Night Owl (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatNightOwlIJTheme`
 [Night Owl Contrast (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatNightOwlContrastIJTheme`
 [Solarized Dark (Material)](https://github.com/mallowigi/material-theme-ui-lite) | `com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatSolarizedDarkIJTheme`

flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java

@@ -82,6 +82,8 @@ public class FlatAllIJThemes
 		new FlatIJLookAndFeelInfo( "Material Palenight Contrast (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMaterialPalenightContrastIJTheme", true ),
 		new FlatIJLookAndFeelInfo( "Monokai Pro (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMonokaiProIJTheme", true ),
 		new FlatIJLookAndFeelInfo( "Monokai Pro Contrast (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMonokaiProContrastIJTheme", true ),
+		new FlatIJLookAndFeelInfo( "Moonlight (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMoonlightIJTheme", true ),
+		new FlatIJLookAndFeelInfo( "Moonlight Contrast (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMoonlightContrastIJTheme", true ),
 		new FlatIJLookAndFeelInfo( "Night Owl (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatNightOwlIJTheme", true ),
 		new FlatIJLookAndFeelInfo( "Night Owl Contrast (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatNightOwlContrastIJTheme", true ),
 		new FlatIJLookAndFeelInfo( "Solarized Dark (Material)", "com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatSolarizedDarkIJTheme", true ),

flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/materialthemeuilite/FlatMoonlightContrastIJTheme.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 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.intellijthemes.materialthemeuilite;
+
+//
+// DO NOT MODIFY
+// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator
+//
+
+import com.formdev.flatlaf.IntelliJTheme;
+
+/**
+ * @author Karl Tauber
+ */
+public class FlatMoonlightContrastIJTheme
+	extends IntelliJTheme.ThemeLaf
+{
+	public static final String NAME = "Moonlight Contrast (Material)";
+
+	public static boolean install() {
+		try {
+			return install( new FlatMoonlightContrastIJTheme() );
+		} catch( RuntimeException ex ) {
+			return false;
+		}
+	}
+
+	public static void installLafInfo() {
+		installLafInfo( NAME, FlatMoonlightContrastIJTheme.class );
+	}
+
+	public FlatMoonlightContrastIJTheme() {
+		super( Utils.loadTheme( "Moonlight Contrast.theme.json" ) );
+	}
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+}

flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/materialthemeuilite/FlatMoonlightIJTheme.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 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.intellijthemes.materialthemeuilite;
+
+//
+// DO NOT MODIFY
+// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator
+//
+
+import com.formdev.flatlaf.IntelliJTheme;
+
+/**
+ * @author Karl Tauber
+ */
+public class FlatMoonlightIJTheme
+	extends IntelliJTheme.ThemeLaf
+{
+	public static final String NAME = "Moonlight (Material)";
+
+	public static boolean install() {
+		try {
+			return install( new FlatMoonlightIJTheme() );
+		} catch( RuntimeException ex ) {
+			return false;
+		}
+	}
+
+	public static void installLafInfo() {
+		installLafInfo( NAME, FlatMoonlightIJTheme.class );
+	}
+
+	public FlatMoonlightIJTheme() {
+		super( Utils.loadTheme( "Moonlight.theme.json" ) );
+	}
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+}

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json

@@ -2,37 +2,48 @@
   "name": "Dracula",
   "dark": true,
   "author": "Zihan Ma",
-  "editorScheme": "/themes/dracula.xml",
+  "editorScheme": "/themes/Dracula.xml",
+  "colors": {
+    "primaryForeground": "#f8f8f2",
+    "primaryBackground": "#414450",
+    "secondaryBackground": "#44475a",
+    "hoverBackground": "#282a36",
+    "selectionBackground": "#6272a4",
+    "selectionInactiveBackground": "#4e5a82",
+    "borderColor": "#282a36",
+    "separatorColor": "#282a36"
+  },
   "ui": {
     "*": {
       "arc": "7",
-      "background": "#414450",
-      "selectionBackground": "#6272a4",
-      "selectionInactiveBackground": "#4e5a82",
-      "inactiveBackground": "#414450",
-      "borderColor": "#282a36"
+      "background": "primaryBackground",
+      "selectionBackground": "selectionBackground",
+      "selectionInactiveBackground": "selectionInactiveBackground",
+      "inactiveBackground": "primaryBackground",
+      "borderColor": "borderColor",
+      "separatorColor": "separatorColor"
     },
     "Borders": {
-      "color": "#282a36",
-      "ContrastBorderColor": "#282a36"
+      "color": "borderColor",
+      "ContrastBorderColor": "borderColor"
     },
     "ActionButton": {
-      "hoverBackground": "#282a35",
-      "hoverBorderColor": "#282a35",
-      "pressedBackground": "#282a35",
-      "pressedBorderColor": "#282a35"
+      "hoverBackground": "hoverBackground",
+      "hoverBorderColor": "hoverBackground",
+      "pressedBackground": "hoverBackground",
+      "pressedBorderColor": "hoverBackground"
     },
     "Button": {
-      "foreground": "#f8f8f2",
-      "startBorderColor": "#6272a4",
-      "endBorderColor": "#6272a4",
-      "startBackground": "#6272a4",
-      "endBackground": "#6272a4",
+      "foreground": "primaryForeground",
+      "startBorderColor": "selectionBackground",
+      "endBorderColor": "selectionBackground",
+      "startBackground": "selectionBackground",
+      "endBackground": "selectionBackground",
       "focusedBorderColor": "#bd93f9",
       "default": {
-        "foreground": "#f8f8f2",
-        "startBackground": "#6272a4",
-        "endBackground": "#6272a4",
+        "foreground": "primaryForeground",
+        "startBackground": "selectionBackground",
+        "endBackground": "selectionBackground",
         "startBorderColor": "#bd93f9",
         "endBorderColor": "#bd93f9",
         "focusColor": "#bd93f9",
@@ -40,7 +51,7 @@
       }
     },
     "Counter": {
-      "foreground": "#414450",
+      "foreground": "primaryBackground",
       "background": "#2fc864"
     },
     "CheckBoxMenuItem": {
@@ -49,50 +60,50 @@
     "ComboBox": {
       "modifiedItemForeground": "#ff79c6",
       "ArrowButton": {
-        "background": "#44475a",
-        "nonEditableBackground": "#44475a",
+        "background": "secondaryBackground",
+        "nonEditableBackground": "secondaryBackground",
         "iconColor": "#bd93f9"
       },
       "selectionBackground": "#bd93f9",
-      "nonEditableBackground": "#44475a"
+      "nonEditableBackground": "secondaryBackground"
     },
     "CompletionPopup": {
-      "selectionBackground": "#6272a4",
-      "selectionInactiveBackground": "#4e5a82",
+      "selectionBackground": "selectionBackground",
+      "selectionInactiveBackground": "selectionInactiveBackground",
       "matchForeground": "#ff79c6"
     },
     "Component": {
       "focusColor": "#bd93f9",
-      "borderColor": "#6272a4",
-      "focusedBorderColor": "#6272a4",
+      "borderColor": "selectionBackground",
+      "focusedBorderColor": "selectionBackground",
       "errorFocusColor": "#ff5554",
       "inactiveErrorFocusColor": "#ff5554",
       "warningFocusColor": "#f1fa8c",
       "inactiveWarningFocusColor": "#f1fa8c"
     },
     "DragAndDrop": {
-      "areaBorderColor": "#6272a4"
+      "areaBorderColor": "selectionBackground"
     },
     "Editor": {
-      "background": "#44475a",
+      "background": "secondaryBackground",
       "shortcutForeground": "#ff79c6"
     },
     "EditorTabs": {
-      "background": "#44475a",
+      "background": "secondaryBackground",
       "underlinedTabBackground": "#313341",
       "underlineColor": "#bd93f9",
-      "underlineHeight": 1
+      "underlineHeight": 2
     },
     "FileColor": {
       "Blue": "#8be9fd",
       "Green": "#63667E",
       "Orange": "#ffb86c",
-      "Yellow": "#44475a",
+      "Yellow": "secondaryBackground",
       "Rose": "#ff79c6",
       "Violet": "#bd93f9"
     },
     "Label": {
-      "foreground": "#f8f8f2",
+      "foreground": "primaryForeground",
       "errorForeground": "#ff5554"
     },
     "Link": {
@@ -102,51 +113,52 @@
       "pressedForeground": "#bd93f9"
     },
     "Notification": {
-      "borderColor": "#6272a4",
+      "borderColor": "selectionBackground",
       "errorBorderColor": "#ff5554",
-      "errorBackground": "#414450",
-      "errorForeground": "#f8f8f2",
+      "errorBackground": "primaryBackground",
+      "errorForeground": "primaryForeground",
       "ToolWindow": {
-        "warningForeground": "#f8f8f2",
-        "warningBackground": "#414450",
+        "warningForeground": "primaryForeground",
+        "warningBackground": "primaryBackground",
         "warningBorderColor": "#ffb86c",
-        "errorForeground": "#f8f8f2",
+        "errorForeground": "primaryForeground",
         "errorBorderColor": "#ff5554",
-        "errorBackground": "#414450",
-        "informativeForeground": "#f8f8f2",
-        "informativeBackground": "#414450",
+        "errorBackground": "primaryBackground",
+        "informativeForeground": "primaryForeground",
+        "informativeBackground": "primaryBackground",
         "informativeBorderColor": "#50fa7b"
       }
     },
     "Plugins": {
       "SearchField": {
-        "background": "#44475a"
+        "background": "secondaryBackground"
       },
       "SectionHeader": {
-        "foreground": "#f8f8f2"
+        "foreground": "primaryForeground"
       },
-      "lightSelectionBackground": "#282a35",
+      "hoverBackground": "hoverBackground",
+      "lightSelectionBackground": "hoverBackground",
       "Button": {
         "installBorderColor": "#bd93f9",
         "installForeground": "#bd93f9",
-        "installBackground": "#414450",
-        "installFillForeground": "#414450",
+        "installBackground": "primaryBackground",
+        "installFillForeground": "primaryBackground",
         "installFillBackground": "#bd93f9",
-        "installFocusedBackground": "#414450",
+        "installFocusedBackground": "primaryBackground",
         "updateBorderColor": "#5da3f4",
-        "updateForeground": "#f8f8f2",
+        "updateForeground": "primaryForeground",
         "updateBackground": "#5da3f4"
       },
       "Tab": {
-        "selectedBackground": "#282a35",
-        "selectedForeground": "#f8f8f2",
-        "hoverBackground": "#282a35"
+        "selectedBackground": "hoverBackground",
+        "selectedForeground": "primaryForeground",
+        "hoverBackground": "hoverBackground"
       }
     },
     "ProgressBar": {
       "failedColor": "#ff5554",
       "failedEndColor": "#ff5554",
-      "trackColor": "#6272a4",
+      "trackColor": "selectionBackground",
       "progressColor": "#ff79c6",
       "indeterminateStartColor": "#93b8f9",
       "indeterminateEndColor": "#bd93f9",
@@ -155,8 +167,8 @@
     },
     "Popup": {
       "Header": {
-        "activeBackground": "#44475a",
-        "inactiveBackground": "#44475a"
+        "activeBackground": "secondaryBackground",
+        "inactiveBackground": "secondaryBackground"
       }
     },
     "ScrollBar": {
@@ -169,39 +181,54 @@
     },
     "SearchEverywhere": {
       "SearchField": {
-        "background": "#44475a"
+        "background": "secondaryBackground"
       },
       "Tab": {
         "selectedBackground": "#313341",
-        "selectedForeground": "#f8f8f2"
+        "selectedForeground": "primaryForeground"
       }
     },
     "SearchMatch": {
       "startBackground": "#ff79c6",
       "endBackground": "#ff79c6"
     },
-    "Separator.separatorColor": "#282a35",
+    "Separator": {
+      "separatorColor": "separatorColor"
+    },
+    "SidePanel": {
+      "background": "secondaryBackground"
+    },
+    "StatusBar": {
+      "hoverBackground": "hoverBackground"
+    },
     "TabbedPane": {
       "tabSelectionHeight": 1,
-      "focusColor": "#282a35",
-      "hoverColor": "#282a35",
+      "focusColor": "hoverBackground",
+      "hoverColor": "hoverBackground",
       "underlineColor": "#bd93f9",
-      "contentAreaColor": "#282a35"
+      "contentAreaColor": "hoverBackground"
+    },
+    "Table": {
+      "gridColor": "#5d617a",
+      "hoverBackground": "selectionBackground"
+    },
+    "TableHeader": {
+      "bottomSeparatorColor": "separatorColor"
     },
     "ToggleButton": {
       "onBackground": "#50fa7b",
-      "onForeground": "#282a35",
-      "offBackground": "#6272a4",
-      "offForeground": "#282a35",
-      "buttonColor": "#f8f8f2"
+      "onForeground": "hoverBackground",
+      "offBackground": "selectionBackground",
+      "offForeground": "hoverBackground",
+      "buttonColor": "primaryForeground"
     },
     "ToolWindow": {
       "Button": {
-        "hoverBackground": "#282a35"
+        "hoverBackground": "hoverBackground"
       },
       "Header": {
-        "background": "#44475a",
-        "inactiveBackground": "#44475a"
+        "background": "secondaryBackground",
+        "inactiveBackground": "secondaryBackground"
       },
       "HeaderTab": {
         "underlineColor": "#bd93f9",
@@ -212,8 +239,8 @@
     },
     "Tree": {
       "modifiedItemForeground": "#ff79c6",
-      "selectionBackground": "#6272a4",
-      "selectionInactiveBackground": "#4e5a82"
+      "selectionBackground": "selectionBackground",
+      "selectionInactiveBackground": "selectionInactiveBackground"
     },
     "ValidationTooltip": {
       "errorBackground": "#ff5554",
@@ -224,7 +251,7 @@
     "VersionControl": {
       "FileHistory": {
         "Commit": {
-          "selectedBranchBackground": "#44475a"
+          "selectedBranchBackground": "secondaryBackground"
         }
       },
       "GitLog": {
@@ -236,16 +263,23 @@
       },
       "Log": {
         "Commit": {
-          "currentBranchBackground": "#44475a"
+          "hoveredBackground": "selectionBackground",
+          "currentBranchBackground": "secondaryBackground"
         }
       }
     },
     "WelcomeScreen": {
-      "separatorColor": "#191b1f",
+      "SidePanel": {
+        "background": "secondaryBackground"
+      },
+      "separatorColor": "separatorColor",
       "Projects": {
-        "background": "#282a35",
-        "selectionBackground": "#44475a",
-        "selectionInactiveBackground": "#44475a"
+        "background": "hoverBackground",
+        "selectionBackground": "secondaryBackground",
+        "selectionInactiveBackground": "secondaryBackground",
+        "actions": {
+          "background": "hoverBackground"
+        }
       }
     }
   },

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json

@@ -230,35 +230,35 @@
     "ScrollBar" : {
       "hoverThumbBorderColor" : "#39666394",
       "background" : "#16322cff",
-      "hoverThumbColor": "#1f3e38b2",
+      "hoverThumbColor": "#497486ff",
       "hoverTrackColor": "#224039ff",
-      "thumb": "#20403aff",
+      "thumb": "#406480ff",
       "thumbBorderColor": "#39666394",
-      "thumbColor": "#20403d94",
+      "thumbColor": "#406480ff",
       "thumbDarkShadow": "#122623ff",
       "thumbHighlight": "#2a4f4cff",
       "thumbShadow": "#162b24ff",
       "track": "#182d26ff",
       "Transparent": {
-        "thumbColor": "#20403d94",
+        "thumbColor": "#406480ff",
         "hoverThumbBorderColor" : "#14262694",
-        "hoverThumbColor": "#1f3e38b2",
+        "hoverThumbColor": "#497486ff",
         "hoverTrackColor": "#224039ff",
         "thumbBorderColor": "#14262694"
       },
       "Mac" : {
         "Transparent": {
-          "thumbColor": "#20403d94",
+          "thumbColor": "#406480ff",
           "hoverThumbBorderColor" : "#14262694",
-          "hoverThumbColor": "#1f3e38b2",
+          "hoverThumbColor": "#497486ff",
           "hoverTrackColor": "#224039ff",
-          "thumbBorderColor": "##39666394"
+          "thumbBorderColor": "#39666394"
         },
         "hoverThumbBorderColor" : "#14262694",
-        "hoverThumbColor": "#1f3e38b2",
+        "hoverThumbColor": "#497486ff",
         "hoverTrackColor": "#224039ff",
         "thumbBorderColor": "#14262694",
-        "thumbColor": "#20403d94"
+        "thumbColor": "#406480ff"
       }
     },
     "EditorPane.inactiveBackground": "#254a39ff"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json

@@ -252,35 +252,35 @@
     "ScrollBar" : {
       "hoverThumbBorderColor" : "#3a2241b2",
       "background" : "#241632ff",
-      "hoverThumbColor": "#472950b2",
+      "hoverThumbColor": "#694f92ff",
       "hoverTrackColor": "#3d2240ff",
       "thumb": "#2f2040ff",
       "thumbBorderColor": "#2c152fff",
-      "thumbColor": "#2f1f4094",
+      "thumbColor": "#6c499194",
       "thumbDarkShadow": "#261226ff",
       "thumbHighlight": "#4f2a4eff",
       "thumbShadow": "#22162bff",
       "track": "#23182dff",
       "Transparent": {
-        "thumbColor": "#2f1f4094",
+        "thumbColor": "#6c499194",
         "hoverThumbBorderColor" : "#3a2241b2",
-        "hoverThumbColor": "#472950b2",
+        "hoverThumbColor": "#694f92ff",
         "hoverTrackColor": "#3d2240ff",
         "thumbBorderColor": "#2c152fff"
       },
       "Mac" : {
         "Transparent": {
-          "thumbColor": "#2f1f4094",
+          "thumbColor": "#6c499194",
           "hoverThumbBorderColor" : "#3a2241b2",
-          "hoverThumbColor": "#472950b2",
+          "hoverThumbColor": "#694f92ff",
           "hoverTrackColor": "#3d2240ff",
           "thumbBorderColor": "#2c152fff"
         },
         "hoverThumbBorderColor" : "#3a2241b2",
-        "hoverThumbColor": "#472950b2",
+        "hoverThumbColor": "#694f92ff",
         "hoverTrackColor": "#3d2240ff",
         "thumbBorderColor": "#2c152fff",
-        "thumbColor": "#2f1f4094"
+        "thumbColor": "#6c499194"
       }
     },
     "TabbedPane": {

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json

@@ -18,7 +18,6 @@
       "disabledForeground": "#a3a3a3",
       "disabledBackground": "#222f44",
       "inactiveBackground": "#325180",
-
       "errorForeground": "#b5b5b5",
 
       "disabledText": "#adadad",
@@ -71,35 +70,35 @@
     "ScrollBar" : {
       "hoverThumbBorderColor" : "#12182994",
       "background" : "#161f3294",
-      "hoverThumbColor": "#313f62b2",
+      "hoverThumbColor": "#497486ff",
       "hoverTrackColor": "#222a40b2",
-      "thumb": "#20294094",
+      "thumb": "#3c557cff",
       "thumbBorderColor": "#12182994",
-      "thumbColor": "#20294094",
+      "thumbColor": "#3c557cff",
       "thumbDarkShadow": "#0c0f1a94",
       "thumbHighlight": "#3b496bb2",
       "thumbShadow": "#161a2b94",
       "track": "#181e2db2",
       "Transparent": {
-        "thumbColor": "#20294094",
+        "thumbColor": "#3c557cff",
         "hoverThumbBorderColor" : "#12182994",
-        "hoverThumbColor": "#313f62b2",
+        "hoverThumbColor": "#497486ff",
         "hoverTrackColor": "#222a40b2",
         "thumbBorderColor": "#12182994"
       },
       "Mac" : {
         "Transparent": {
-          "thumbColor": "#20294094",
+          "thumbColor": "#3c557cff",
           "hoverThumbBorderColor" : "#12182994",
-          "hoverThumbColor": "#313f62b2",
+          "hoverThumbColor": "#497486ff",
           "hoverTrackColor": "#222a40b2",
           "thumbBorderColor": "#12182994"
         },
         "hoverThumbBorderColor" : "#12182994",
-        "hoverThumbColor": "#313f62b2",
+        "hoverThumbColor": "#497486ff",
         "hoverTrackColor": "#222a40b2",
         "thumbBorderColor": "#12182994",
-        "thumbColor": "#20294094"
+        "thumbColor": "#3c557cff"
       }
     },
 

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json

@@ -3,18 +3,24 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Arc Dark.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/arcdark.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#8b9eb5",
       "background": "#2f343f",
       "borderColor": "#404552",
-      "disabledBackground": "#37373d",
+      "disabledBackground": "#474B57",
       "disabledForeground": "#D3DAE3",
       "disabledText": "#D3DAE3",
-      "focusColor": "#08507C",
+      "focusColor": "#3F3F46",
       "focusedBorderColor": "#42A5F5",
       "foreground": "#D3DAE3",
-      "inactiveBackground": "#37373d",
+      "inactiveBackground": "#474B57",
       "inactiveForeground": "#8b9eb5",
       "infoForeground": "#8b9eb5",
       "selectionBackground": "#8888FF",
@@ -54,7 +60,7 @@
       "disabledText": "#D3DAE3",
       "endBackground": "#383C4A",
       "endBorderColor": "#383C4A",
-      "focus": "#08507C",
+      "focus": "#3F3F46",
       "focusedBorderColor": "#42A5F5",
       "foreground": "#8b9eb5",
       "highlight": "#FFFFFF",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#404552",
       "Tooltip.background": "#262a33"
     },
-    "Content.background": "#262b33",
+    "Content": {
+      "background": "#262b33",
+      "selectionBackground": "#8888FF"
+    },
     "CheckBox": {
       "background": "#2f343f",
       "disabledText": "#D3DAE3",
@@ -89,6 +98,14 @@
       "selectionBackground": "#8888FF",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#D3DAE3",
+      "AccessEnabled": {
+        "accessDot": "#42A5F5",
+        "dropdownBorder": "#393f4c",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#2f343f",
       "foreground": "#D3DAE3",
@@ -104,6 +121,7 @@
       },
       "background": "#262b33",
       "buttonBackground": "#383C4A",
+      "darcula.hoveredArrowButtonForeground": "#42A5F5",
       "disabledForeground": "#D3DAE3",
       "foreground": "#D3DAE3",
       "modifiedItemForeground": "#42A5F5",
@@ -130,7 +148,7 @@
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#08507C",
+      "borderColor": "#3F3F46",
       "disabledBorderColor": "#383C4A",
       "focusColor": "#42A5F5",
       "focusedBorderColor": "#42A5F5",
@@ -156,23 +174,25 @@
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#08507C",
-      "underlinedTabBackground": "#08507C"
+      "selectedBackground": "#3F3F46",
+      "underlinedTabBackground": "#3F3F46"
     },
     "DebuggerPopup": {
-      "borderColor": "#08507C"
+      "borderColor": "#3F3F46"
     },
     "DefaultTabs": {
       "background": "#2f343f",
       "borderColor": "#2f343f",
       "hoverBackground": "#41416A",
       "hoverColor": "#262b33",
-      "hoverMaskColor": "#08507C",
+      "hoverMaskColor": "#3F3F46",
+      "inactiveColoredTabBackground": "#2f343f",
       "inactiveColoredFileBackground": "#383C4A",
-      "inactiveUnderlineColor": "#D3DAE3",
+      "inactiveUnderlineColor": "#42A5F5",
       "inactiveMaskColor": "#262b33",
       "underlineColor": "#42A5F5",
-      "underlinedTabBackground": "#41416A"
+      "underlinedTabBackground": "#41416A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#2f343f",
     "DialogWrapper.southPanelBackground": "#2f343f",
@@ -198,21 +218,23 @@
     },
     "EditorTabs": {
       "borderColor": "#393f4c",
-      "hoverColor": "#08507C",
-      "hoverMaskColor": "#08507C",
+      "hoverBackground": "#3F3F46",
+      "hoverColor": "#3F3F46",
+      "hoverMaskColor": "#3F3F46",
       "inactiveMaskColor": "#2f343f",
-      "inactiveColoredFileBackground": "#2f343f2",
+      "inactiveColoredFileBackground": "#2f343f",
       "inactiveUnderlineColor": "#D3DAE3",
       "selectedForeground": "#D3DAE3",
       "selectedBackground": "#41416A",
       "underlineColor": "#42A5F5",
-      "underlinedTabBackground": "#41416A"
+      "underlinedTabBackground": "#41416A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#2f343f",
       "borderColor": "#393f4c",
-      "hoverBackground": "#08507C",
-      "hoverColor": "#08507C",
+      "hoverBackground": "#3F3F46",
+      "hoverColor": "#3F3F46",
       "inactiveUnderlineColor": "#42A5F5",
       "underlineColor": "#42A5F5",
       "underlinedTabBackground": "#41416A",
@@ -221,7 +243,7 @@
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#37373d",
+      "Yellow": "#474B57",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#41416A"
     },
+    "GotItTooltip.borderColor": "#262a33",
     "Group": {
       "disabledSeparatorColor": "#404552",
       "separatorColor": "#404552"
     },
     "GutterTooltip": {
-      "infoForeground": "#D3DAE3",
+      "infoForeground": "#8b9eb5",
       "lineSeparatorColor": "#2f343f"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#D3DAE3",
       "foreground": "#D3DAE3",
       "infoForeground": "#8b9eb5",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#D3DAE3"
     },
     "Link": {
       "activeForeground": "#42A5F5",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#393f4c",
       "foreground": "#D3DAE3",
+      "hoverBackground": "#08507C70",
+      "hoverInactiveBackground": "#41416A",
       "selectionBackground": "#8888FF50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#09477170"
+      "selectionInactiveBackground": "#08507C70"
     },
     "material": {
       "background": "#2f343f",
@@ -320,8 +346,8 @@
     },
     "MemoryIndicator": {
       "allocatedBackground": "#393f4c",
-      "usedColor": "#08507C",
-      "usedBackground": "#08507C"
+      "usedColor": "#3F3F46",
+      "usedBackground": "#3F3F46"
     },
     "Menu": {
       "acceleratorForeground": "#8b9eb5",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#393f4c",
       "borderColor": "#41416A",
-      "currentOverloadBackground": "#41416A",
+      "currentOverloadBackground": "#3F3F46",
       "currentParameterForeground": "#42A5F5",
       "disabledForeground": "#D3DAE3",
       "foreground": "#D3DAE3",
@@ -428,21 +454,22 @@
     "Plugins": {
       "background": "#2f343f",
       "disabledForeground": "#D3DAE3",
-      "eapTagBackground": "#08507C",
-      "lightSelectionBackground": "#8888FF",
-      "paidTagBackground": "#08507C",
+      "eapTagBackground": "#3F3F46",
+      "hoverBackground": "#08507C70",
+      "lightSelectionBackground": "#41416A",
+      "paidTagBackground": "#3F3F46",
       "selectionBackground": "#8888FF",
       "tagForeground": "#42A5F5",
-      "tagBackground": "#08507C",
-      "trialTagBackground": "#08507C",
+      "tagBackground": "#3F3F46",
+      "trialTagBackground": "#3F3F46",
       "Button": {
         "installBackground": "#383C4A",
         "installBorderColor": "#383C4A",
         "installForeground": "#D3DAE3",
-        "installFocusedBackground": "#08507C",
+        "installFocusedBackground": "#3F3F46",
         "installFillForeground": "#D3DAE3",
         "installFillBackground": "#383C4A",
-        "updateBackground": "#383C4A",
+        "updateBackground": "#42A5F5",
         "updateBorderColor": "#383C4A",
         "updateForeground": "#D3DAE3"
       },
@@ -496,8 +523,8 @@
       "indeterminateEndColor": "#42A5F5",
       "indeterminateStartColor": "#42A5F5",
       "progressColor": "#42A5F5",
-      "selectionBackground": "#08507C",
-      "trackColor": "#08507C"
+      "selectionBackground": "#3F3F46",
+      "trackColor": "#3F3F46"
     },
     "PsiViewer": {
       "referenceHighlightColor": "#42A5F5"
@@ -517,6 +544,7 @@
       "selectionBackground": "#8888FF",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#404552",
     "ScrollBar": {
       "background": "#2f343f",
       "hoverThumbBorderColor": "#42A5F5",
@@ -538,7 +566,7 @@
           "trackColor": "#2f343f30"
         }
       },
-      "thumb": "#08507C",
+      "thumb": "#3F3F46",
       "thumbBorderColor": "#42A5F570",
       "thumbColor": "#42A5F570",
       "trackColor": "#2f343f30",
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#FFFFFF",
         "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#08507C"
+        "selectedBackground": "#3F3F46"
       }
     },
     "SearchMatch": {
       "endBackground": "#42A5F5",
-      "startBackground": "#42A5F5"
+      "startBackground": "#42A5F5",
+      "endColor": "#42A5F5",
+      "startColor": "#42A5F5"
     },
     "SearchField.errorBackground": "#262a33",
+    "SearchOption": {
+      "selectedBackground": "#41416A"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#8b9eb5",
+      "Repeated.File.Foreground": "#D3DAE3"
+    },
     "Separator": {
       "background": "#393f4c",
       "foreground": "#393f4c",
@@ -599,7 +636,7 @@
       "thumb": "#42A5F5"
     },
     "SpeedSearch": {
-      "background": "#08507C",
+      "background": "#3F3F46",
       "borderColor": "#404552",
       "foreground": "#D3DAE3",
       "errorForeground": "#D3DAE3"
@@ -616,11 +653,13 @@
     },
     "SplitPaneDivider.draggingColor": "#393f4c",
     "StatusBar": {
-      "borderColor": "#2f343f"
+      "borderColor": "#2f343f",
+      "hoverBackground": "#3F3F46",
+      "LightEditBackground": "#41416A"
     },
     "TabbedPane": {
       "background": "#2f343f",
-      "contentAreaColor": "#08507C",
+      "contentAreaColor": "#3F3F46",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#404552",
       "disabledForeground": "#D3DAE3",
@@ -630,7 +669,7 @@
       "fontSizeOffset": 0,
       "foreground": "#D3DAE3",
       "highlight": "#404552",
-      "hoverColor": "#08507C",
+      "hoverColor": "#3F3F46",
       "labelShift": 0,
       "selectedForeground": "#FFFFFF",
       "selectedLabelShift": 0,
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#262b33",
     "Table": {
+      "alternativeRowBackground": "#262b33",
       "background": "#2f343f",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#D3DAE3",
       "dropLineColor": "#42A5F5",
       "dropLineShortColor": "#42A5F5",
       "focusCellBackground": "#41416A",
@@ -653,6 +694,8 @@
       "foreground": "#D3DAE3",
       "gridColor": "#2f343f",
       "highlightOuter": "#41416A",
+      "hoverBackground": "#08507C70",
+      "hoverInactiveBackground": "#41416A",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#8b9eb5",
       "lightSelectionInactiveBackground": "#393f4c",
@@ -704,7 +747,7 @@
     },
     "TitlePane": {
       "background": "#262b33",
-      "Button.hoverBackground": "#08507C",
+      "Button.hoverBackground": "#3F3F46",
       "inactiveBackground": "#2f343f",
       "infoForeground": "#8b9eb5",
       "inactiveInfoForeground": "#8b9eb5"
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#2f343f",
       "Actions.infoForeground": "#8b9eb5",
-      "background": "#2f343f",
-      "borderColor": "#08507C",
+      "background": "#262a33",
+      "borderColor": "#404552",
       "foreground": "#D3DAE3",
       "infoForeground": "#8b9eb5",
       "separatorColor": "#404552",
@@ -751,50 +794,93 @@
         "background": "#2f343f"
       },
       "HeaderTab": {
-        "hoverBackground": "#08507C",
-        "hoverInactiveBackground": "#393f4c",
+        "borderColor": "#3F3F46",
+        "hoverBackground": "#3F3F46",
+        "hoverInactiveBackground": "#3F3F46",
         "inactiveUnderlineColor": "#42A5F5",
         "selectedBackground": "#262b33",
         "selectedInactiveBackground": "#262b33",
         "underlineColor": "#42A5F5",
-        "underlinedTabBackground": "#08507C",
-        "underlinedTabInactiveBackground": "#393f4c"
+        "underlinedTabBackground": "#41416A",
+        "underlinedTabInactiveBackground": "#393f4c",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#D3DAE3"
       }
     },
     "Tree": {
       "background": "#262b33",
       "foreground": "#8b9eb5",
       "hash": "#404552",
+      "hoverBackground": "#08507C70",
+      "hoverInactiveBackground": "#41416A",
       "modifiedItemForeground": "#42A5F5",
       "rowHeight": 28,
-      "selectionBackground": "#09477170",
+      "selectionBackground": "#08507C70",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#09477170",
+      "selectionInactiveBackground": "#08507C70",
       "textBackground": "#262b33"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#404552",
-      "ColorPicker.background": "#2f343f",
-      "ColorPicker.foreground": "#D3DAE3",
-      "Component.borderColor": "#404552",
-      "Component.background": "#2f343f",
-      "Component.foreground": "#D3DAE3",
-      "Connector.borderColor": "#404552",
-      "Connector.hoverBorderColor": "#08507C",
+      "Canvas.background": "#262b33",
+      "ColorPicker": {
+        "background": "#2f343f",
+        "foreground": "#D3DAE3"
+      },
+      "Component": {
+        "borderColor": "#404552",
+        "background": "#2f343f",
+        "foreground": "#D3DAE3",
+        "hoverBorderColor": "#3F3F46"
+      },
+      "Connector": {
+        "borderColor": "#404552",
+        "hoverBorderColor": "#3F3F46"
+      },
       "Canvas.background": "#262b33",
       "highStroke.foreground": "#D3DAE3",
       "Label.foreground": "#8b9eb5",
-      "List.selectionBackground": "#09477170",
-      "Panel.borderColor": "#404552",
-      "Panel.background": "#2f343f",
+      "List.selectionBackground": "#08507C70",
+      "motion": {
+        "borderColor": "#404552",
+        "Component.foreground": "#D3DAE3",
+        "ConstraintSetText.foreground": "#8b9eb5",
+        "ConstraintSet.background": "#393f4c",
+        "CSPanel.SelectedFocusBackground": "#8888FF",
+        "CSPanel.SelectedBackground": "#08507C70",
+        "cs_FocusText.infoForeground": "#8b9eb5",
+        "CursorTextColor.foreground": "#D3DAE3",
+        "HoverColor.disabledBackground": "#D3DAE3",
+        "motionGraph.background": "#2f343f",
+        "Notification.background": "#262a33",
+        "ourAvg.background": "#393f4c",
+        "ourCS.background": "#393f4c",
+        "ourCS_Border.borderColor": "#404552",
+        "ourCS_TextColor.foreground": "#8b9eb5",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#41416A",
+        "ourCS_SelectedBorder.pressedBorderColor": "#3F3F46",
+        "ourML_BarColor.separatorColor": "#404552",
+        "PrimaryPanel.background": "#262b33",
+        "SecondaryPanel.background": "#2f343f",
+        "SecondaryPanel.header.foreground": "#8b9eb5",
+        "SecondaryPanel.header.background": "#262b33",
+        "timeLine.disabledBorderColor": "#404552"
+      },
+      "Panel": {
+        "borderColor": "#404552",
+        "background": "#2f343f"
+      },
       "percent.foreground": "#D3DAE3",
-      "Placeholder.background": "#2f343f",
-      "Placeholder.borderColor": "#404552",
-      "Placeholder.foreground": "#D3DAE3",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#2f343f",
+        "borderColor": "#404552",
+        "foreground": "#D3DAE3",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#2f343f",
       "stroke.acceleratorForeground": "#8b9eb5"
     },
@@ -809,7 +895,7 @@
         "selectedBranchBackground": "#2f343f"
       },
       "GitCommits": {
-        "graphColor": "#08507C"
+        "graphColor": "#3F3F46"
       },
       "GitLog": {
         "localBranchIconColor": "#42A5F5",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#8b9eb5",
-        "Commit.currentBranchBackground": "#393f4c"
+        "Commit.currentBranchBackground": "#393f4c",
+        "Commit.hoveredBackground": "#08507C70"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
-        "backgroundBase": "#08507C"
+        "backgroundBase": "#3F3F46"
       }
     },
     "Viewport": {
@@ -840,16 +927,22 @@
       "foreground": "#D3DAE3"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#2f343f",
       "background": "#2f343f",
       "borderColor": "#2f343f",
       "captionBackground": "#262b33",
       "captionForeground": "#D3DAE3",
+      "Details.background": "#2f343f",
       "footerBackground": "#262b33",
       "footerForeground": "#D3DAE3",
       "headerBackground": "#2f343f",
       "headerForeground": "#D3DAE3",
+      "List.background": "#262b33",
       "separatorColor": "#404552",
+      "SidePanel.background": "#393f4c",
       "Projects": {
+        "actions.background": "#262b33",
+        "actions.selectionBackground": "#3F3F46",
         "background": "#393f4c",
         "selectionBackground": "#8888FF",
         "selectionInactiveBackground": "#393f4c"
@@ -881,8 +974,8 @@
       "Actions.Yellow": "#F9EE98",
       "Checkbox.Background.Default": "#262b33",
       "Checkbox.Background.Default.Dark": "#262b33",
-      "Checkbox.Background.Disabled": "#37373d",
-      "Checkbox.Background.Disabled.Dark": "#37373d",
+      "Checkbox.Background.Disabled": "#474B57",
+      "Checkbox.Background.Disabled.Dark": "#474B57",
       "Checkbox.Border.Default": "#404552",
       "Checkbox.Border.Default.Dark": "#404552",
       "Checkbox.Border.Disabled": "#D3DAE3",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json

@@ -3,18 +3,24 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Arc Dark.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/arcdark.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#8b9eb5",
       "background": "#2f343f",
       "borderColor": "#404552",
-      "disabledBackground": "#37373d",
+      "disabledBackground": "#474B57",
       "disabledForeground": "#D3DAE3",
       "disabledText": "#D3DAE3",
-      "focusColor": "#08507C",
+      "focusColor": "#3F3F46",
       "focusedBorderColor": "#42A5F5",
       "foreground": "#D3DAE3",
-      "inactiveBackground": "#37373d",
+      "inactiveBackground": "#474B57",
       "inactiveForeground": "#8b9eb5",
       "infoForeground": "#8b9eb5",
       "selectionBackground": "#8888FF",
@@ -54,7 +60,7 @@
       "disabledText": "#D3DAE3",
       "endBackground": "#383C4A",
       "endBorderColor": "#383C4A",
-      "focus": "#08507C",
+      "focus": "#3F3F46",
       "focusedBorderColor": "#42A5F5",
       "foreground": "#8b9eb5",
       "highlight": "#FFFFFF",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#404552",
       "Tooltip.background": "#262a33"
     },
-    "Content.background": "#262b33",
+    "Content": {
+      "background": "#262b33",
+      "selectionBackground": "#8888FF"
+    },
     "CheckBox": {
       "background": "#2f343f",
       "disabledText": "#D3DAE3",
@@ -89,6 +98,14 @@
       "selectionBackground": "#8888FF",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#D3DAE3",
+      "AccessEnabled": {
+        "accessDot": "#42A5F5",
+        "dropdownBorder": "#393f4c",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#2f343f",
       "foreground": "#D3DAE3",
@@ -104,6 +121,7 @@
       },
       "background": "#2f343f",
       "buttonBackground": "#383C4A",
+      "darcula.hoveredArrowButtonForeground": "#42A5F5",
       "disabledForeground": "#D3DAE3",
       "foreground": "#D3DAE3",
       "modifiedItemForeground": "#42A5F5",
@@ -130,7 +148,7 @@
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#08507C",
+      "borderColor": "#3F3F46",
       "disabledBorderColor": "#383C4A",
       "focusColor": "#42A5F5",
       "focusedBorderColor": "#42A5F5",
@@ -156,23 +174,25 @@
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#08507C",
-      "underlinedTabBackground": "#08507C"
+      "selectedBackground": "#3F3F46",
+      "underlinedTabBackground": "#3F3F46"
     },
     "DebuggerPopup": {
-      "borderColor": "#08507C"
+      "borderColor": "#3F3F46"
     },
     "DefaultTabs": {
       "background": "#2f343f",
       "borderColor": "#2f343f",
       "hoverBackground": "#41416A",
       "hoverColor": "#2f343f",
-      "hoverMaskColor": "#08507C",
+      "hoverMaskColor": "#3F3F46",
+      "inactiveColoredTabBackground": "#2f343f",
       "inactiveColoredFileBackground": "#383C4A",
-      "inactiveUnderlineColor": "#D3DAE3",
+      "inactiveUnderlineColor": "#42A5F5",
       "inactiveMaskColor": "#2f343f",
       "underlineColor": "#42A5F5",
-      "underlinedTabBackground": "#41416A"
+      "underlinedTabBackground": "#41416A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#2f343f",
     "DialogWrapper.southPanelBackground": "#2f343f",
@@ -198,21 +218,23 @@
     },
     "EditorTabs": {
       "borderColor": "#393f4c",
-      "hoverColor": "#08507C",
-      "hoverMaskColor": "#08507C",
+      "hoverBackground": "#3F3F46",
+      "hoverColor": "#3F3F46",
+      "hoverMaskColor": "#3F3F46",
       "inactiveMaskColor": "#2f343f",
-      "inactiveColoredFileBackground": "#2f343f2",
+      "inactiveColoredFileBackground": "#2f343f",
       "inactiveUnderlineColor": "#D3DAE3",
       "selectedForeground": "#D3DAE3",
       "selectedBackground": "#41416A",
       "underlineColor": "#42A5F5",
-      "underlinedTabBackground": "#41416A"
+      "underlinedTabBackground": "#41416A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#2f343f",
       "borderColor": "#393f4c",
-      "hoverBackground": "#08507C",
-      "hoverColor": "#08507C",
+      "hoverBackground": "#3F3F46",
+      "hoverColor": "#3F3F46",
       "inactiveUnderlineColor": "#42A5F5",
       "underlineColor": "#42A5F5",
       "underlinedTabBackground": "#41416A",
@@ -221,7 +243,7 @@
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#37373d",
+      "Yellow": "#474B57",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#41416A"
     },
+    "GotItTooltip.borderColor": "#262a33",
     "Group": {
       "disabledSeparatorColor": "#404552",
       "separatorColor": "#404552"
     },
     "GutterTooltip": {
-      "infoForeground": "#D3DAE3",
+      "infoForeground": "#8b9eb5",
       "lineSeparatorColor": "#2f343f"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#D3DAE3",
       "foreground": "#D3DAE3",
       "infoForeground": "#8b9eb5",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#D3DAE3"
     },
     "Link": {
       "activeForeground": "#42A5F5",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#393f4c",
       "foreground": "#D3DAE3",
+      "hoverBackground": "#08507C70",
+      "hoverInactiveBackground": "#41416A",
       "selectionBackground": "#8888FF50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#09477170"
+      "selectionInactiveBackground": "#08507C70"
     },
     "material": {
       "background": "#2f343f",
@@ -320,8 +346,8 @@
     },
     "MemoryIndicator": {
       "allocatedBackground": "#393f4c",
-      "usedColor": "#08507C",
-      "usedBackground": "#08507C"
+      "usedColor": "#3F3F46",
+      "usedBackground": "#3F3F46"
     },
     "Menu": {
       "acceleratorForeground": "#8b9eb5",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#393f4c",
       "borderColor": "#41416A",
-      "currentOverloadBackground": "#41416A",
+      "currentOverloadBackground": "#3F3F46",
       "currentParameterForeground": "#42A5F5",
       "disabledForeground": "#D3DAE3",
       "foreground": "#D3DAE3",
@@ -428,21 +454,22 @@
     "Plugins": {
       "background": "#2f343f",
       "disabledForeground": "#D3DAE3",
-      "eapTagBackground": "#08507C",
-      "lightSelectionBackground": "#8888FF",
-      "paidTagBackground": "#08507C",
+      "eapTagBackground": "#3F3F46",
+      "hoverBackground": "#08507C70",
+      "lightSelectionBackground": "#41416A",
+      "paidTagBackground": "#3F3F46",
       "selectionBackground": "#8888FF",
       "tagForeground": "#42A5F5",
-      "tagBackground": "#08507C",
-      "trialTagBackground": "#08507C",
+      "tagBackground": "#3F3F46",
+      "trialTagBackground": "#3F3F46",
       "Button": {
         "installBackground": "#383C4A",
         "installBorderColor": "#383C4A",
         "installForeground": "#D3DAE3",
-        "installFocusedBackground": "#08507C",
+        "installFocusedBackground": "#3F3F46",
         "installFillForeground": "#D3DAE3",
         "installFillBackground": "#383C4A",
-        "updateBackground": "#383C4A",
+        "updateBackground": "#42A5F5",
         "updateBorderColor": "#383C4A",
         "updateForeground": "#D3DAE3"
       },
@@ -496,8 +523,8 @@
       "indeterminateEndColor": "#42A5F5",
       "indeterminateStartColor": "#42A5F5",
       "progressColor": "#42A5F5",
-      "selectionBackground": "#08507C",
-      "trackColor": "#08507C"
+      "selectionBackground": "#3F3F46",
+      "trackColor": "#3F3F46"
     },
     "PsiViewer": {
       "referenceHighlightColor": "#42A5F5"
@@ -517,6 +544,7 @@
       "selectionBackground": "#8888FF",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#404552",
     "ScrollBar": {
       "background": "#2f343f",
       "hoverThumbBorderColor": "#42A5F5",
@@ -538,7 +566,7 @@
           "trackColor": "#2f343f30"
         }
       },
-      "thumb": "#08507C",
+      "thumb": "#3F3F46",
       "thumbBorderColor": "#42A5F570",
       "thumbColor": "#42A5F570",
       "trackColor": "#2f343f30",
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#FFFFFF",
         "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#08507C"
+        "selectedBackground": "#3F3F46"
       }
     },
     "SearchMatch": {
       "endBackground": "#42A5F5",
-      "startBackground": "#42A5F5"
+      "startBackground": "#42A5F5",
+      "endColor": "#42A5F5",
+      "startColor": "#42A5F5"
     },
     "SearchField.errorBackground": "#262a33",
+    "SearchOption": {
+      "selectedBackground": "#41416A"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#8b9eb5",
+      "Repeated.File.Foreground": "#D3DAE3"
+    },
     "Separator": {
       "background": "#393f4c",
       "foreground": "#393f4c",
@@ -599,7 +636,7 @@
       "thumb": "#42A5F5"
     },
     "SpeedSearch": {
-      "background": "#08507C",
+      "background": "#3F3F46",
       "borderColor": "#404552",
       "foreground": "#D3DAE3",
       "errorForeground": "#D3DAE3"
@@ -616,11 +653,13 @@
     },
     "SplitPaneDivider.draggingColor": "#393f4c",
     "StatusBar": {
-      "borderColor": "#2f343f"
+      "borderColor": "#2f343f",
+      "hoverBackground": "#3F3F46",
+      "LightEditBackground": "#41416A"
     },
     "TabbedPane": {
       "background": "#2f343f",
-      "contentAreaColor": "#08507C",
+      "contentAreaColor": "#3F3F46",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#404552",
       "disabledForeground": "#D3DAE3",
@@ -630,7 +669,7 @@
       "fontSizeOffset": 0,
       "foreground": "#D3DAE3",
       "highlight": "#404552",
-      "hoverColor": "#08507C",
+      "hoverColor": "#3F3F46",
       "labelShift": 0,
       "selectedForeground": "#FFFFFF",
       "selectedLabelShift": 0,
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#2f343f",
     "Table": {
+      "alternativeRowBackground": "#262b33",
       "background": "#2f343f",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#D3DAE3",
       "dropLineColor": "#42A5F5",
       "dropLineShortColor": "#42A5F5",
       "focusCellBackground": "#41416A",
@@ -653,6 +694,8 @@
       "foreground": "#D3DAE3",
       "gridColor": "#2f343f",
       "highlightOuter": "#41416A",
+      "hoverBackground": "#08507C70",
+      "hoverInactiveBackground": "#41416A",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#8b9eb5",
       "lightSelectionInactiveBackground": "#393f4c",
@@ -704,7 +747,7 @@
     },
     "TitlePane": {
       "background": "#262b33",
-      "Button.hoverBackground": "#08507C",
+      "Button.hoverBackground": "#3F3F46",
       "inactiveBackground": "#2f343f",
       "infoForeground": "#8b9eb5",
       "inactiveInfoForeground": "#8b9eb5"
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#2f343f",
       "Actions.infoForeground": "#8b9eb5",
-      "background": "#2f343f",
-      "borderColor": "#08507C",
+      "background": "#262a33",
+      "borderColor": "#404552",
       "foreground": "#D3DAE3",
       "infoForeground": "#8b9eb5",
       "separatorColor": "#404552",
@@ -751,50 +794,93 @@
         "background": "#2f343f"
       },
       "HeaderTab": {
-        "hoverBackground": "#08507C",
-        "hoverInactiveBackground": "#393f4c",
+        "borderColor": "#3F3F46",
+        "hoverBackground": "#3F3F46",
+        "hoverInactiveBackground": "#3F3F46",
         "inactiveUnderlineColor": "#42A5F5",
         "selectedBackground": "#262b33",
         "selectedInactiveBackground": "#262b33",
         "underlineColor": "#42A5F5",
-        "underlinedTabBackground": "#08507C",
-        "underlinedTabInactiveBackground": "#393f4c"
+        "underlinedTabBackground": "#41416A",
+        "underlinedTabInactiveBackground": "#393f4c",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#D3DAE3"
       }
     },
     "Tree": {
       "background": "#2f343f",
       "foreground": "#8b9eb5",
       "hash": "#404552",
+      "hoverBackground": "#08507C70",
+      "hoverInactiveBackground": "#41416A",
       "modifiedItemForeground": "#42A5F5",
       "rowHeight": 28,
-      "selectionBackground": "#09477170",
+      "selectionBackground": "#08507C70",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#09477170",
+      "selectionInactiveBackground": "#08507C70",
       "textBackground": "#2f343f"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#404552",
-      "ColorPicker.background": "#2f343f",
-      "ColorPicker.foreground": "#D3DAE3",
-      "Component.borderColor": "#404552",
-      "Component.background": "#2f343f",
-      "Component.foreground": "#D3DAE3",
-      "Connector.borderColor": "#404552",
-      "Connector.hoverBorderColor": "#08507C",
+      "Canvas.background": "#262b33",
+      "ColorPicker": {
+        "background": "#2f343f",
+        "foreground": "#D3DAE3"
+      },
+      "Component": {
+        "borderColor": "#404552",
+        "background": "#2f343f",
+        "foreground": "#D3DAE3",
+        "hoverBorderColor": "#3F3F46"
+      },
+      "Connector": {
+        "borderColor": "#404552",
+        "hoverBorderColor": "#3F3F46"
+      },
       "Canvas.background": "#262b33",
       "highStroke.foreground": "#D3DAE3",
       "Label.foreground": "#8b9eb5",
-      "List.selectionBackground": "#09477170",
-      "Panel.borderColor": "#404552",
-      "Panel.background": "#2f343f",
+      "List.selectionBackground": "#08507C70",
+      "motion": {
+        "borderColor": "#404552",
+        "Component.foreground": "#D3DAE3",
+        "ConstraintSetText.foreground": "#8b9eb5",
+        "ConstraintSet.background": "#393f4c",
+        "CSPanel.SelectedFocusBackground": "#8888FF",
+        "CSPanel.SelectedBackground": "#08507C70",
+        "cs_FocusText.infoForeground": "#8b9eb5",
+        "CursorTextColor.foreground": "#D3DAE3",
+        "HoverColor.disabledBackground": "#D3DAE3",
+        "motionGraph.background": "#2f343f",
+        "Notification.background": "#262a33",
+        "ourAvg.background": "#393f4c",
+        "ourCS.background": "#393f4c",
+        "ourCS_Border.borderColor": "#404552",
+        "ourCS_TextColor.foreground": "#8b9eb5",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#41416A",
+        "ourCS_SelectedBorder.pressedBorderColor": "#3F3F46",
+        "ourML_BarColor.separatorColor": "#404552",
+        "PrimaryPanel.background": "#262b33",
+        "SecondaryPanel.background": "#2f343f",
+        "SecondaryPanel.header.foreground": "#8b9eb5",
+        "SecondaryPanel.header.background": "#262b33",
+        "timeLine.disabledBorderColor": "#404552"
+      },
+      "Panel": {
+        "borderColor": "#404552",
+        "background": "#2f343f"
+      },
       "percent.foreground": "#D3DAE3",
-      "Placeholder.background": "#2f343f",
-      "Placeholder.borderColor": "#404552",
-      "Placeholder.foreground": "#D3DAE3",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#2f343f",
+        "borderColor": "#404552",
+        "foreground": "#D3DAE3",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#2f343f",
       "stroke.acceleratorForeground": "#8b9eb5"
     },
@@ -809,7 +895,7 @@
         "selectedBranchBackground": "#2f343f"
       },
       "GitCommits": {
-        "graphColor": "#08507C"
+        "graphColor": "#3F3F46"
       },
       "GitLog": {
         "localBranchIconColor": "#42A5F5",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#8b9eb5",
-        "Commit.currentBranchBackground": "#393f4c"
+        "Commit.currentBranchBackground": "#393f4c",
+        "Commit.hoveredBackground": "#08507C70"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
-        "backgroundBase": "#08507C"
+        "backgroundBase": "#3F3F46"
       }
     },
     "Viewport": {
@@ -840,16 +927,22 @@
       "foreground": "#D3DAE3"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#2f343f",
       "background": "#2f343f",
       "borderColor": "#2f343f",
       "captionBackground": "#262b33",
       "captionForeground": "#D3DAE3",
+      "Details.background": "#2f343f",
       "footerBackground": "#262b33",
       "footerForeground": "#D3DAE3",
       "headerBackground": "#2f343f",
       "headerForeground": "#D3DAE3",
+      "List.background": "#262b33",
       "separatorColor": "#404552",
+      "SidePanel.background": "#393f4c",
       "Projects": {
+        "actions.background": "#262b33",
+        "actions.selectionBackground": "#3F3F46",
         "background": "#393f4c",
         "selectionBackground": "#8888FF",
         "selectionInactiveBackground": "#393f4c"
@@ -881,8 +974,8 @@
       "Actions.Yellow": "#F9EE98",
       "Checkbox.Background.Default": "#262b33",
       "Checkbox.Background.Default.Dark": "#262b33",
-      "Checkbox.Background.Disabled": "#37373d",
-      "Checkbox.Background.Disabled.Dark": "#37373d",
+      "Checkbox.Background.Disabled": "#474B57",
+      "Checkbox.Background.Disabled.Dark": "#474B57",
       "Checkbox.Border.Default": "#404552",
       "Checkbox.Border.Default.Dark": "#404552",
       "Checkbox.Border.Disabled": "#D3DAE3",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Atom One Dark.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/onedark.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#979FAD",
@@ -17,7 +23,7 @@
       "inactiveBackground": "#3c4150",
       "inactiveForeground": "#979FAD",
       "infoForeground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionBackgroundInactive": "#2F333D",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#2F333D",
@@ -33,7 +39,7 @@
       "pressedBorderColor": "#2979ff50"
     },
     "Autocomplete": {
-      "selectionBackground": "#4D515D"
+      "selectionBackground": "#3A3F4B"
     },
     "Borders.ContrastBorderColor": "#282C34",
     "Borders.color": "#282C34",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#282C34",
       "Tooltip.background": "#282C34"
     },
-    "Content.background": "#21252B",
+    "Content": {
+      "background": "#21252B",
+      "selectionBackground": "#3A3F4B"
+    },
     "CheckBox": {
       "background": "#282C34",
       "disabledText": "#6B727D",
@@ -86,9 +95,17 @@
       "disabledBackground": "#282C34",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#979FAD",
+      "AccessEnabled": {
+        "accessDot": "#2979ff",
+        "dropdownBorder": "#2F333D",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#282C34",
       "foreground": "#979FAD",
@@ -104,6 +121,7 @@
       },
       "background": "#21252B",
       "buttonBackground": "#3A3F4B",
+      "darcula.hoveredArrowButtonForeground": "#2979ff",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
       "modifiedItemForeground": "#2979ff",
@@ -123,8 +141,8 @@
       "selectedGrayedForeground": "#FFFFFF",
       "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#979FAD",
-      "selectionInactiveBackground": "#4D515D50",
-      "selectionBackground": "#4D515D80",
+      "selectionInactiveBackground": "#3A3F4B50",
+      "selectionBackground": "#3A3F4B80",
       "selectionForeground": "#FFFFFF",
       "selectionInfoForeground": "#FFFFFF"
     },
@@ -168,11 +186,13 @@
       "hoverBackground": "#383E49",
       "hoverColor": "#21252B",
       "hoverMaskColor": "#383D48",
+      "inactiveColoredTabBackground": "#282C34",
       "inactiveColoredFileBackground": "#3A3F4B",
-      "inactiveUnderlineColor": "#6B727D",
+      "inactiveUnderlineColor": "#2979ff",
       "inactiveMaskColor": "#21252B",
       "underlineColor": "#2979ff",
-      "underlinedTabBackground": "#383E49"
+      "underlinedTabBackground": "#383E49",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#282C34",
     "DialogWrapper.southPanelBackground": "#282C34",
@@ -193,20 +213,22 @@
       "foreground": "#979FAD",
       "inactiveBackground": "#282C34",
       "inactiveForeground": "#6B727D",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
     "EditorTabs": {
       "borderColor": "#2F333D",
+      "hoverBackground": "#383D48",
       "hoverColor": "#383D48",
       "hoverMaskColor": "#383D48",
       "inactiveMaskColor": "#282C34",
-      "inactiveColoredFileBackground": "#282C342",
+      "inactiveColoredFileBackground": "#282C34",
       "inactiveUnderlineColor": "#6B727D",
       "selectedForeground": "#979FAD",
       "selectedBackground": "#383E49",
       "underlineColor": "#2979ff",
-      "underlinedTabBackground": "#383E49"
+      "underlinedTabBackground": "#383E49",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#282C34",
@@ -246,6 +268,7 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#383E49"
     },
+    "GotItTooltip.borderColor": "#282C34",
     "Group": {
       "disabledSeparatorColor": "#282C34",
       "separatorColor": "#282C34"
@@ -288,7 +311,8 @@
       "disabledText": "#6B727D",
       "foreground": "#979FAD",
       "infoForeground": "#979FAD",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#979FAD"
     },
     "Link": {
       "activeForeground": "#2979ff",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#2F333D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D50",
+      "hoverBackground": "#3A3F4B70",
+      "hoverInactiveBackground": "#383E49",
+      "selectionBackground": "#3A3F4B50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B80"
+      "selectionInactiveBackground": "#3A3F4B70"
     },
     "material": {
       "background": "#282C34",
@@ -332,7 +358,7 @@
       "disabledBackground": "#2F333D",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF",
       "separatorColor": "#282C34"
     },
@@ -343,7 +369,7 @@
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
       "highlight": "#282C34",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF",
       "shadow": "#21252B"
     },
@@ -355,7 +381,7 @@
       "disabledBackground": "#282C34",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#2F333D",
       "borderColor": "#383E49",
-      "currentOverloadBackground": "#383E49",
+      "currentOverloadBackground": "#383D48",
       "currentParameterForeground": "#2979ff",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
@@ -429,9 +455,10 @@
       "background": "#282C34",
       "disabledForeground": "#6B727D",
       "eapTagBackground": "#383D48",
-      "lightSelectionBackground": "#4D515D",
+      "hoverBackground": "#3A3F4B70",
+      "lightSelectionBackground": "#383E49",
       "paidTagBackground": "#383D48",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "tagForeground": "#2979ff",
       "tagBackground": "#383D48",
       "trialTagBackground": "#383D48",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#383D48",
         "installFillForeground": "#6B727D",
         "installFillBackground": "#3A3F4B",
-        "updateBackground": "#3A3F4B",
+        "updateBackground": "#2979ff",
         "updateBorderColor": "#3A3F4B",
         "updateForeground": "#979FAD"
       },
@@ -514,9 +541,10 @@
       "disabledBackground": "#282C34",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#282C34",
     "ScrollBar": {
       "background": "#282C34",
       "hoverThumbBorderColor": "#2979ff",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#2979ff",
-      "startBackground": "#2979ff"
+      "startBackground": "#2979ff",
+      "endColor": "#2979ff",
+      "startColor": "#2979ff"
     },
     "SearchField.errorBackground": "#282C34",
+    "SearchOption": {
+      "selectedBackground": "#383E49"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#979FAD",
+      "Repeated.File.Foreground": "#979FAD"
+    },
     "Separator": {
       "background": "#2F333D",
       "foreground": "#2F333D",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#2F333D",
     "StatusBar": {
-      "borderColor": "#282C34"
+      "borderColor": "#282C34",
+      "hoverBackground": "#383D48",
+      "LightEditBackground": "#383E49"
     },
     "TabbedPane": {
       "background": "#282C34",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#21252B",
     "Table": {
+      "alternativeRowBackground": "#21252B",
       "background": "#282C34",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#6B727D",
       "dropLineColor": "#2979ff",
       "dropLineShortColor": "#2979ff",
       "focusCellBackground": "#383E49",
@@ -653,6 +694,8 @@
       "foreground": "#979FAD",
       "gridColor": "#282C34",
       "highlightOuter": "#383E49",
+      "hoverBackground": "#3A3F4B70",
+      "hoverInactiveBackground": "#383E49",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#979FAD",
       "lightSelectionInactiveBackground": "#2F333D",
@@ -730,7 +773,7 @@
       "Actions.background": "#282C34",
       "Actions.infoForeground": "#979FAD",
       "background": "#282C34",
-      "borderColor": "#383D48",
+      "borderColor": "#282C34",
       "foreground": "#979FAD",
       "infoForeground": "#979FAD",
       "separatorColor": "#282C34",
@@ -751,50 +794,93 @@
         "background": "#282C34"
       },
       "HeaderTab": {
+        "borderColor": "#383D48",
         "hoverBackground": "#383D48",
-        "hoverInactiveBackground": "#2F333D",
+        "hoverInactiveBackground": "#383D48",
         "inactiveUnderlineColor": "#2979ff",
         "selectedBackground": "#21252B",
         "selectedInactiveBackground": "#21252B",
         "underlineColor": "#2979ff",
-        "underlinedTabBackground": "#383D48",
-        "underlinedTabInactiveBackground": "#2F333D"
+        "underlinedTabBackground": "#383E49",
+        "underlinedTabInactiveBackground": "#2F333D",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#979FAD"
       }
     },
     "Tree": {
       "background": "#21252B",
       "foreground": "#979FAD",
       "hash": "#282C34",
+      "hoverBackground": "#3A3F4B70",
+      "hoverInactiveBackground": "#383E49",
       "modifiedItemForeground": "#2979ff",
       "rowHeight": 28,
-      "selectionBackground": "#3A3F4B80",
+      "selectionBackground": "#3A3F4B70",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B80",
+      "selectionInactiveBackground": "#3A3F4B70",
       "textBackground": "#21252B"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#282C34",
-      "ColorPicker.background": "#282C34",
-      "ColorPicker.foreground": "#979FAD",
-      "Component.borderColor": "#282C34",
-      "Component.background": "#282C34",
-      "Component.foreground": "#979FAD",
-      "Connector.borderColor": "#282C34",
-      "Connector.hoverBorderColor": "#383D48",
+      "Canvas.background": "#21252B",
+      "ColorPicker": {
+        "background": "#282C34",
+        "foreground": "#979FAD"
+      },
+      "Component": {
+        "borderColor": "#282C34",
+        "background": "#282C34",
+        "foreground": "#979FAD",
+        "hoverBorderColor": "#383D48"
+      },
+      "Connector": {
+        "borderColor": "#282C34",
+        "hoverBorderColor": "#383D48"
+      },
       "Canvas.background": "#21252B",
       "highStroke.foreground": "#979FAD",
       "Label.foreground": "#979FAD",
-      "List.selectionBackground": "#3A3F4B80",
-      "Panel.borderColor": "#282C34",
-      "Panel.background": "#282C34",
+      "List.selectionBackground": "#3A3F4B70",
+      "motion": {
+        "borderColor": "#282C34",
+        "Component.foreground": "#979FAD",
+        "ConstraintSetText.foreground": "#979FAD",
+        "ConstraintSet.background": "#2F333D",
+        "CSPanel.SelectedFocusBackground": "#3A3F4B",
+        "CSPanel.SelectedBackground": "#3A3F4B70",
+        "cs_FocusText.infoForeground": "#979FAD",
+        "CursorTextColor.foreground": "#979FAD",
+        "HoverColor.disabledBackground": "#6B727D",
+        "motionGraph.background": "#282C34",
+        "Notification.background": "#282C34",
+        "ourAvg.background": "#2F333D",
+        "ourCS.background": "#2F333D",
+        "ourCS_Border.borderColor": "#282C34",
+        "ourCS_TextColor.foreground": "#979FAD",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#383E49",
+        "ourCS_SelectedBorder.pressedBorderColor": "#383D48",
+        "ourML_BarColor.separatorColor": "#282C34",
+        "PrimaryPanel.background": "#21252B",
+        "SecondaryPanel.background": "#282C34",
+        "SecondaryPanel.header.foreground": "#979FAD",
+        "SecondaryPanel.header.background": "#21252B",
+        "timeLine.disabledBorderColor": "#282C34"
+      },
+      "Panel": {
+        "borderColor": "#282C34",
+        "background": "#282C34"
+      },
       "percent.foreground": "#979FAD",
-      "Placeholder.background": "#282C34",
-      "Placeholder.borderColor": "#282C34",
-      "Placeholder.foreground": "#979FAD",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#282C34",
+        "borderColor": "#282C34",
+        "foreground": "#979FAD",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#282C34",
       "stroke.acceleratorForeground": "#979FAD"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#979FAD",
-        "Commit.currentBranchBackground": "#2F333D"
+        "Commit.currentBranchBackground": "#2F333D",
+        "Commit.hoveredBackground": "#3A3F4B70"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,18 +927,24 @@
       "foreground": "#979FAD"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#282C34",
       "background": "#282C34",
       "borderColor": "#282C34",
       "captionBackground": "#21252B",
       "captionForeground": "#979FAD",
+      "Details.background": "#282C34",
       "footerBackground": "#21252B",
       "footerForeground": "#979FAD",
       "headerBackground": "#282C34",
       "headerForeground": "#979FAD",
+      "List.background": "#21252B",
       "separatorColor": "#282C34",
+      "SidePanel.background": "#2F333D",
       "Projects": {
+        "actions.background": "#21252B",
+        "actions.selectionBackground": "#383D48",
         "background": "#2F333D",
-        "selectionBackground": "#4D515D",
+        "selectionBackground": "#3A3F4B",
         "selectionInactiveBackground": "#2F333D"
       }
     },

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Atom One Dark.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/onedark.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#979FAD",
@@ -17,7 +23,7 @@
       "inactiveBackground": "#3c4150",
       "inactiveForeground": "#979FAD",
       "infoForeground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionBackgroundInactive": "#2F333D",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#2F333D",
@@ -33,7 +39,7 @@
       "pressedBorderColor": "#2979ff50"
     },
     "Autocomplete": {
-      "selectionBackground": "#4D515D"
+      "selectionBackground": "#3A3F4B"
     },
     "Borders.ContrastBorderColor": "#282C34",
     "Borders.color": "#282C34",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#282C34",
       "Tooltip.background": "#282C34"
     },
-    "Content.background": "#21252B",
+    "Content": {
+      "background": "#21252B",
+      "selectionBackground": "#3A3F4B"
+    },
     "CheckBox": {
       "background": "#282C34",
       "disabledText": "#6B727D",
@@ -86,9 +95,17 @@
       "disabledBackground": "#282C34",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#979FAD",
+      "AccessEnabled": {
+        "accessDot": "#2979ff",
+        "dropdownBorder": "#2F333D",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#282C34",
       "foreground": "#979FAD",
@@ -104,6 +121,7 @@
       },
       "background": "#282C34",
       "buttonBackground": "#3A3F4B",
+      "darcula.hoveredArrowButtonForeground": "#2979ff",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
       "modifiedItemForeground": "#2979ff",
@@ -123,8 +141,8 @@
       "selectedGrayedForeground": "#FFFFFF",
       "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#979FAD",
-      "selectionInactiveBackground": "#4D515D50",
-      "selectionBackground": "#4D515D80",
+      "selectionInactiveBackground": "#3A3F4B50",
+      "selectionBackground": "#3A3F4B80",
       "selectionForeground": "#FFFFFF",
       "selectionInfoForeground": "#FFFFFF"
     },
@@ -168,11 +186,13 @@
       "hoverBackground": "#383E49",
       "hoverColor": "#282C34",
       "hoverMaskColor": "#383D48",
+      "inactiveColoredTabBackground": "#282C34",
       "inactiveColoredFileBackground": "#3A3F4B",
-      "inactiveUnderlineColor": "#6B727D",
+      "inactiveUnderlineColor": "#2979ff",
       "inactiveMaskColor": "#282C34",
       "underlineColor": "#2979ff",
-      "underlinedTabBackground": "#383E49"
+      "underlinedTabBackground": "#383E49",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#282C34",
     "DialogWrapper.southPanelBackground": "#282C34",
@@ -193,20 +213,22 @@
       "foreground": "#979FAD",
       "inactiveBackground": "#282C34",
       "inactiveForeground": "#6B727D",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
     "EditorTabs": {
       "borderColor": "#2F333D",
+      "hoverBackground": "#383D48",
       "hoverColor": "#383D48",
       "hoverMaskColor": "#383D48",
       "inactiveMaskColor": "#282C34",
-      "inactiveColoredFileBackground": "#282C342",
+      "inactiveColoredFileBackground": "#282C34",
       "inactiveUnderlineColor": "#6B727D",
       "selectedForeground": "#979FAD",
       "selectedBackground": "#383E49",
       "underlineColor": "#2979ff",
-      "underlinedTabBackground": "#383E49"
+      "underlinedTabBackground": "#383E49",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#282C34",
@@ -246,6 +268,7 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#383E49"
     },
+    "GotItTooltip.borderColor": "#282C34",
     "Group": {
       "disabledSeparatorColor": "#282C34",
       "separatorColor": "#282C34"
@@ -288,7 +311,8 @@
       "disabledText": "#6B727D",
       "foreground": "#979FAD",
       "infoForeground": "#979FAD",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#979FAD"
     },
     "Link": {
       "activeForeground": "#2979ff",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#2F333D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D50",
+      "hoverBackground": "#3A3F4B70",
+      "hoverInactiveBackground": "#383E49",
+      "selectionBackground": "#3A3F4B50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B80"
+      "selectionInactiveBackground": "#3A3F4B70"
     },
     "material": {
       "background": "#282C34",
@@ -332,7 +358,7 @@
       "disabledBackground": "#2F333D",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF",
       "separatorColor": "#282C34"
     },
@@ -343,7 +369,7 @@
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
       "highlight": "#282C34",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF",
       "shadow": "#282C34"
     },
@@ -355,7 +381,7 @@
       "disabledBackground": "#282C34",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#2F333D",
       "borderColor": "#383E49",
-      "currentOverloadBackground": "#383E49",
+      "currentOverloadBackground": "#383D48",
       "currentParameterForeground": "#2979ff",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
@@ -429,9 +455,10 @@
       "background": "#282C34",
       "disabledForeground": "#6B727D",
       "eapTagBackground": "#383D48",
-      "lightSelectionBackground": "#4D515D",
+      "hoverBackground": "#3A3F4B70",
+      "lightSelectionBackground": "#383E49",
       "paidTagBackground": "#383D48",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "tagForeground": "#2979ff",
       "tagBackground": "#383D48",
       "trialTagBackground": "#383D48",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#383D48",
         "installFillForeground": "#6B727D",
         "installFillBackground": "#3A3F4B",
-        "updateBackground": "#3A3F4B",
+        "updateBackground": "#2979ff",
         "updateBorderColor": "#3A3F4B",
         "updateForeground": "#979FAD"
       },
@@ -514,9 +541,10 @@
       "disabledBackground": "#282C34",
       "disabledForeground": "#6B727D",
       "foreground": "#979FAD",
-      "selectionBackground": "#4D515D",
+      "selectionBackground": "#3A3F4B",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#282C34",
     "ScrollBar": {
       "background": "#282C34",
       "hoverThumbBorderColor": "#2979ff",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#2979ff",
-      "startBackground": "#2979ff"
+      "startBackground": "#2979ff",
+      "endColor": "#2979ff",
+      "startColor": "#2979ff"
     },
     "SearchField.errorBackground": "#282C34",
+    "SearchOption": {
+      "selectedBackground": "#383E49"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#979FAD",
+      "Repeated.File.Foreground": "#979FAD"
+    },
     "Separator": {
       "background": "#2F333D",
       "foreground": "#2F333D",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#2F333D",
     "StatusBar": {
-      "borderColor": "#282C34"
+      "borderColor": "#282C34",
+      "hoverBackground": "#383D48",
+      "LightEditBackground": "#383E49"
     },
     "TabbedPane": {
       "background": "#282C34",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#282C34",
     "Table": {
+      "alternativeRowBackground": "#21252B",
       "background": "#282C34",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#6B727D",
       "dropLineColor": "#2979ff",
       "dropLineShortColor": "#2979ff",
       "focusCellBackground": "#383E49",
@@ -653,6 +694,8 @@
       "foreground": "#979FAD",
       "gridColor": "#282C34",
       "highlightOuter": "#383E49",
+      "hoverBackground": "#3A3F4B70",
+      "hoverInactiveBackground": "#383E49",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#979FAD",
       "lightSelectionInactiveBackground": "#2F333D",
@@ -730,7 +773,7 @@
       "Actions.background": "#282C34",
       "Actions.infoForeground": "#979FAD",
       "background": "#282C34",
-      "borderColor": "#383D48",
+      "borderColor": "#282C34",
       "foreground": "#979FAD",
       "infoForeground": "#979FAD",
       "separatorColor": "#282C34",
@@ -751,50 +794,93 @@
         "background": "#282C34"
       },
       "HeaderTab": {
+        "borderColor": "#383D48",
         "hoverBackground": "#383D48",
-        "hoverInactiveBackground": "#2F333D",
+        "hoverInactiveBackground": "#383D48",
         "inactiveUnderlineColor": "#2979ff",
         "selectedBackground": "#21252B",
         "selectedInactiveBackground": "#21252B",
         "underlineColor": "#2979ff",
-        "underlinedTabBackground": "#383D48",
-        "underlinedTabInactiveBackground": "#2F333D"
+        "underlinedTabBackground": "#383E49",
+        "underlinedTabInactiveBackground": "#2F333D",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#979FAD"
       }
     },
     "Tree": {
       "background": "#282C34",
       "foreground": "#979FAD",
       "hash": "#282C34",
+      "hoverBackground": "#3A3F4B70",
+      "hoverInactiveBackground": "#383E49",
       "modifiedItemForeground": "#2979ff",
       "rowHeight": 28,
-      "selectionBackground": "#3A3F4B80",
+      "selectionBackground": "#3A3F4B70",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A3F4B80",
+      "selectionInactiveBackground": "#3A3F4B70",
       "textBackground": "#282C34"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#282C34",
-      "ColorPicker.background": "#282C34",
-      "ColorPicker.foreground": "#979FAD",
-      "Component.borderColor": "#282C34",
-      "Component.background": "#282C34",
-      "Component.foreground": "#979FAD",
-      "Connector.borderColor": "#282C34",
-      "Connector.hoverBorderColor": "#383D48",
+      "Canvas.background": "#21252B",
+      "ColorPicker": {
+        "background": "#282C34",
+        "foreground": "#979FAD"
+      },
+      "Component": {
+        "borderColor": "#282C34",
+        "background": "#282C34",
+        "foreground": "#979FAD",
+        "hoverBorderColor": "#383D48"
+      },
+      "Connector": {
+        "borderColor": "#282C34",
+        "hoverBorderColor": "#383D48"
+      },
       "Canvas.background": "#21252B",
       "highStroke.foreground": "#979FAD",
       "Label.foreground": "#979FAD",
-      "List.selectionBackground": "#3A3F4B80",
-      "Panel.borderColor": "#282C34",
-      "Panel.background": "#282C34",
+      "List.selectionBackground": "#3A3F4B70",
+      "motion": {
+        "borderColor": "#282C34",
+        "Component.foreground": "#979FAD",
+        "ConstraintSetText.foreground": "#979FAD",
+        "ConstraintSet.background": "#2F333D",
+        "CSPanel.SelectedFocusBackground": "#3A3F4B",
+        "CSPanel.SelectedBackground": "#3A3F4B70",
+        "cs_FocusText.infoForeground": "#979FAD",
+        "CursorTextColor.foreground": "#979FAD",
+        "HoverColor.disabledBackground": "#6B727D",
+        "motionGraph.background": "#282C34",
+        "Notification.background": "#282C34",
+        "ourAvg.background": "#2F333D",
+        "ourCS.background": "#2F333D",
+        "ourCS_Border.borderColor": "#282C34",
+        "ourCS_TextColor.foreground": "#979FAD",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#383E49",
+        "ourCS_SelectedBorder.pressedBorderColor": "#383D48",
+        "ourML_BarColor.separatorColor": "#282C34",
+        "PrimaryPanel.background": "#21252B",
+        "SecondaryPanel.background": "#282C34",
+        "SecondaryPanel.header.foreground": "#979FAD",
+        "SecondaryPanel.header.background": "#21252B",
+        "timeLine.disabledBorderColor": "#282C34"
+      },
+      "Panel": {
+        "borderColor": "#282C34",
+        "background": "#282C34"
+      },
       "percent.foreground": "#979FAD",
-      "Placeholder.background": "#282C34",
-      "Placeholder.borderColor": "#282C34",
-      "Placeholder.foreground": "#979FAD",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#282C34",
+        "borderColor": "#282C34",
+        "foreground": "#979FAD",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#282C34",
       "stroke.acceleratorForeground": "#979FAD"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#979FAD",
-        "Commit.currentBranchBackground": "#2F333D"
+        "Commit.currentBranchBackground": "#2F333D",
+        "Commit.hoveredBackground": "#3A3F4B70"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,18 +927,24 @@
       "foreground": "#979FAD"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#282C34",
       "background": "#282C34",
       "borderColor": "#282C34",
       "captionBackground": "#21252B",
       "captionForeground": "#979FAD",
+      "Details.background": "#282C34",
       "footerBackground": "#21252B",
       "footerForeground": "#979FAD",
       "headerBackground": "#282C34",
       "headerForeground": "#979FAD",
+      "List.background": "#21252B",
       "separatorColor": "#282C34",
+      "SidePanel.background": "#2F333D",
       "Projects": {
+        "actions.background": "#21252B",
+        "actions.selectionBackground": "#383D48",
         "background": "#2F333D",
-        "selectionBackground": "#4D515D",
+        "selectionBackground": "#3A3F4B",
         "selectionInactiveBackground": "#2F333D"
       }
     },

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json

@@ -3,34 +3,40 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Dracula.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/dracula.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#6272A4",
       "background": "#282A36",
       "borderColor": "#21222C",
-      "disabledBackground": "#313341",
+      "disabledBackground": "#34353D",
       "disabledForeground": "#6272A4",
       "disabledText": "#6272A4",
-      "focusColor": "#6272A4",
-      "focusedBorderColor": "#FF79C5",
+      "focusColor": "#44475a",
+      "focusedBorderColor": "#9580ff",
       "foreground": "#F8F8F2",
-      "inactiveBackground": "#313341",
+      "inactiveBackground": "#34353D",
       "inactiveForeground": "#6272A4",
       "infoForeground": "#6272A4",
       "selectionBackground": "#44475A",
       "selectionBackgroundInactive": "#282A36",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#282A36",
       "separatorColor": "#21222C"
     },
     "activeCaption": "#282A36",
     "ActionButton": {
-      "hoverBackground": "#FF79C550",
-      "hoverBorderColor": "#FF79C550",
+      "hoverBackground": "#9580ff50",
+      "hoverBorderColor": "#9580ff50",
       "hoverSeparatorColor": "#393C4B",
-      "focusedBorderColor": "#FF79C550",
-      "pressedBackground": "#FF79C550",
-      "pressedBorderColor": "#FF79C550"
+      "focusedBorderColor": "#9580ff50",
+      "pressedBackground": "#9580ff50",
+      "pressedBorderColor": "#9580ff50"
     },
     "Autocomplete": {
       "selectionBackground": "#44475A"
@@ -44,8 +50,8 @@
         "endBackground": "#44475A",
         "endBorderColor": "#44475A",
         "foreground": "#8BE9FD",
-        "focusColor": "#FF79C5",
-        "focusedBorderColor": "#FF79C5",
+        "focusColor": "#9580ff",
+        "focusedBorderColor": "#9580ff",
         "shadowColor": "#44475A",
         "startBackground": "#44475A",
         "startBorderColor": "#44475A"
@@ -54,13 +60,13 @@
       "disabledText": "#6272A4",
       "endBackground": "#393C4B",
       "endBorderColor": "#393C4B",
-      "focus": "#6272A4",
-      "focusedBorderColor": "#FF79C5",
+      "focus": "#44475a",
+      "focusedBorderColor": "#9580ff",
       "foreground": "#6272A4",
-      "highlight": "#8BE9FD",
+      "highlight": "#FFFFFF",
       "mt.background": "#393C4B",
       "mt.foreground": "#6272A4",
-      "mt.selectedForeground": "#8BE9FD",
+      "mt.selectedForeground": "#FFFFFF",
       "mt.selection.color1": "#44475A",
       "mt.selection.color2": "#44475A",
       "startBackground": "#393C4B",
@@ -72,12 +78,15 @@
       "Tooltip.borderColor": "#21222C",
       "Tooltip.background": "#1D2228"
     },
-    "Content.background": "#191A21",
+    "Content": {
+      "background": "#191A21",
+      "selectionBackground": "#44475A"
+    },
     "CheckBox": {
       "background": "#282A36",
       "disabledText": "#6272A4",
       "foreground": "#F8F8F2",
-      "select": "#FF79C5"
+      "select": "#9580ff"
     },
     "CheckBoxMenuItem": {
       "acceleratorForeground": "#6272A4",
@@ -89,6 +98,14 @@
       "selectionBackground": "#44475A",
       "selectionForeground": "#8BE9FD"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#F8F8F2",
+      "AccessEnabled": {
+        "accessDot": "#9580ff",
+        "dropdownBorder": "#282A36",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#282A36",
       "foreground": "#F8F8F2",
@@ -104,9 +121,10 @@
       },
       "background": "#191A21",
       "buttonBackground": "#393C4B",
+      "darcula.hoveredArrowButtonForeground": "#9580ff",
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
-      "modifiedItemForeground": "#FF79C5",
+      "modifiedItemForeground": "#9580ff",
       "nonEditableBackground": "#282A36",
       "padding": "5,5,5,5",
       "selectionBackground": "#44475A",
@@ -117,62 +135,64 @@
       "background": "#282A36",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
-      "matchForeground": "#FF79C5",
-      "matchSelectionForeground": "#FF79C5",
+      "matchForeground": "#9580ff",
+      "matchSelectionForeground": "#9580ff",
       "nonFocusedState": "false",
-      "selectedGrayedForeground": "#8BE9FD",
-      "selectionGrayForeground": "#8BE9FD",
+      "selectedGrayedForeground": "#FFFFFF",
+      "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#6272A4",
       "selectionInactiveBackground": "#44475A50",
       "selectionBackground": "#44475A80",
-      "selectionForeground": "#8BE9FD",
-      "selectionInfoForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF",
+      "selectionInfoForeground": "#FFFFFF"
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#6272A4",
+      "borderColor": "#44475a",
       "disabledBorderColor": "#393C4B",
-      "focusColor": "#FF79C5",
-      "focusedBorderColor": "#FF79C5",
-      "hoverIconColor": "#FF79C5",
+      "focusColor": "#9580ff",
+      "focusedBorderColor": "#9580ff",
+      "hoverIconColor": "#9580ff",
       "infoForeground": "#6272A4",
       "iconColor": "#F8F8F2"
     },
     "control": "#282A36",
     "controlText": "#6272A4",
     "Counter": {
-      "background": "#FF79C5",
-      "foreground": "#8BE9FD"
+      "background": "#9580ff",
+      "foreground": "#FFFFFF"
     },
     "Debugger": {
       "Variables": {
         "collectingDataForeground": "#6272A4",
-        "changedValueForeground": "#FF79C5",
-        "errorMessageForeground": "#FF79C6",
+        "changedValueForeground": "#9580ff",
+        "errorMessageForeground": "#8BE9FD",
         "evaluatingExpressionForeground": "#6272A4",
         "exceptionForeground": "#50FA7B",
-        "modifyingValueForeground": "#FF79C5",
-        "valueForeground": "#FF79C5"
+        "modifyingValueForeground": "#9580ff",
+        "valueForeground": "#9580ff"
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#6272A4",
-      "underlinedTabBackground": "#6272A4"
+      "selectedBackground": "#44475a",
+      "underlinedTabBackground": "#44475a"
     },
     "DebuggerPopup": {
-      "borderColor": "#6272A4"
+      "borderColor": "#44475a"
     },
     "DefaultTabs": {
       "background": "#282A36",
       "borderColor": "#282A36",
       "hoverBackground": "#44475A",
       "hoverColor": "#191A21",
-      "hoverMaskColor": "#6272A4",
+      "hoverMaskColor": "#44475a",
+      "inactiveColoredTabBackground": "#282A36",
       "inactiveColoredFileBackground": "#393C4B",
-      "inactiveUnderlineColor": "#6272A4",
+      "inactiveUnderlineColor": "#9580ff",
       "inactiveMaskColor": "#191A21",
-      "underlineColor": "#FF79C5",
-      "underlinedTabBackground": "#44475A"
+      "underlineColor": "#9580ff",
+      "underlinedTabBackground": "#44475A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#282A36",
     "DialogWrapper.southPanelBackground": "#282A36",
@@ -189,7 +209,7 @@
     },
     "EditorPane": {
       "background": "#191A21",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveBackground": "#282A36",
       "inactiveForeground": "#6272A4",
@@ -198,30 +218,32 @@
     },
     "EditorTabs": {
       "borderColor": "#282A36",
-      "hoverColor": "#6272A4",
-      "hoverMaskColor": "#6272A4",
+      "hoverBackground": "#44475a",
+      "hoverColor": "#44475a",
+      "hoverMaskColor": "#44475a",
       "inactiveMaskColor": "#282A36",
-      "inactiveColoredFileBackground": "#282A362",
+      "inactiveColoredFileBackground": "#282A36",
       "inactiveUnderlineColor": "#6272A4",
       "selectedForeground": "#F8F8F2",
       "selectedBackground": "#44475A",
-      "underlineColor": "#FF79C5",
-      "underlinedTabBackground": "#44475A"
+      "underlineColor": "#9580ff",
+      "underlinedTabBackground": "#44475A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#282A36",
       "borderColor": "#282A36",
-      "hoverBackground": "#6272A4",
-      "hoverColor": "#6272A4",
-      "inactiveUnderlineColor": "#FF79C5",
-      "underlineColor": "#FF79C5",
+      "hoverBackground": "#44475a",
+      "hoverColor": "#44475a",
+      "inactiveUnderlineColor": "#9580ff",
+      "underlineColor": "#9580ff",
       "underlinedTabBackground": "#44475A",
       "underlinedTabForeground": "#F8F8F2"
     },
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#313341",
+      "Yellow": "#34353D",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -239,19 +261,20 @@
     "Focus.color": "#21222C",
     "FormattedTextField": {
       "background": "#191A21",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveBackground": "#393C4B",
       "inactiveForeground": "#6272A4",
       "selectionForeground": "#8BE9FD",
       "selectionBackground": "#44475A"
     },
+    "GotItTooltip.borderColor": "#1D2228",
     "Group": {
       "disabledSeparatorColor": "#21222C",
       "separatorColor": "#21222C"
     },
     "GutterTooltip": {
-      "infoForeground": "#F8F8F2",
+      "infoForeground": "#6272A4",
       "lineSeparatorColor": "#282A36"
     },
     "HeaderColor": {
@@ -265,7 +288,7 @@
       "infoForeground": "#6272A4",
       "shortcutForeground": "#6272A4"
     },
-    "Hyperlink.linkColor": "#FF79C5",
+    "Hyperlink.linkColor": "#9580ff",
     "inactiveCaption": "#282A36",
     "inactiveCaptionBorder": "#282A36",
     "inactiveCaptionText": "#6272A4",
@@ -288,23 +311,26 @@
       "disabledText": "#6272A4",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
-      "selectedForeground": "#8BE9FD"
+      "selectedForeground": "#8BE9FD",
+      "selectedDisabledForeground": "#F8F8F2"
     },
     "Link": {
-      "activeForeground": "#FF79C5",
-      "hoverForeground": "#FF79C5",
-      "pressedForeground": "#FF79C5",
+      "activeForeground": "#9580ff",
+      "hoverForeground": "#9580ff",
+      "pressedForeground": "#9580ff",
       "secondaryForeground": "#6272A4",
-      "visitedForeground": "#FF79C5"
+      "visitedForeground": "#9580ff"
     },
-    "link.foreground": "#FF79C5",
+    "link.foreground": "#9580ff",
     "List": {
       "background": "#282A36",
       "foreground": "#F8F8F2",
+      "hoverBackground": "#44475A70",
+      "hoverInactiveBackground": "#44475A",
       "selectionBackground": "#44475A50",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#8BE9FD",
-      "selectionInactiveBackground": "#44475A50"
+      "selectionInactiveBackground": "#44475A70"
     },
     "material": {
       "background": "#282A36",
@@ -313,19 +339,19 @@
       "foreground": "#F8F8F2",
       "mergeCommits": "#393C4B",
       "primaryColor": "#6272A4",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "tab.backgroundColor": "#282A36",
-      "tab.borderColor": "#FF79C5",
+      "tab.borderColor": "#9580ff",
       "tagColor": "#6272A4"
     },
     "MemoryIndicator": {
       "allocatedBackground": "#282A36",
-      "usedColor": "#6272A4",
-      "usedBackground": "#6272A4"
+      "usedColor": "#44475a",
+      "usedBackground": "#44475a"
     },
     "Menu": {
       "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#8BE9FD",
+      "acceleratorSelectionForeground": "#FFFFFF",
       "background": "#282A36",
       "border": "4,2,4,2",
       "borderColor": "#282A36",
@@ -333,7 +359,7 @@
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "separatorColor": "#21222C"
     },
     "MenuBar": {
@@ -344,19 +370,19 @@
       "foreground": "#F8F8F2",
       "highlight": "#282A36",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "shadow": "#191A21"
     },
     "MenuItem": {
       "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#8BE9FD",
+      "acceleratorSelectionForeground": "#FFFFFF",
       "border": "4,2,4,2",
       "background": "#282A36",
       "disabledBackground": "#282A36",
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
       "arrowColor": "#F8F8F2",
@@ -370,7 +396,7 @@
         "background": "#191A21"
       }
     },
-    "NewPSD.warning": "#FF79C5",
+    "NewPSD.warning": "#9580ff",
     "Notification": {
       "background": "#1D2228",
       "borderColor": "#1D2228",
@@ -399,7 +425,7 @@
     },
     "Outline": {
       "color": "#393C4B",
-      "focusedColor": "#FF79C5",
+      "focusedColor": "#9580ff",
       "disabledColor": "#6272A4"
     },
     "Panel": {
@@ -409,8 +435,8 @@
     "ParameterInfo": {
       "background": "#282A36",
       "borderColor": "#44475A",
-      "currentOverloadBackground": "#44475A",
-      "currentParameterForeground": "#FF79C5",
+      "currentOverloadBackground": "#44475a",
+      "currentParameterForeground": "#9580ff",
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
@@ -418,8 +444,8 @@
     },
     "PasswordField": {
       "background": "#191A21",
-      "capsLockIconColor": "#FF79C5",
-      "caretForeground": "#FF79C5",
+      "capsLockIconColor": "#9580ff",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -428,21 +454,22 @@
     "Plugins": {
       "background": "#282A36",
       "disabledForeground": "#6272A4",
-      "eapTagBackground": "#6272A4",
+      "eapTagBackground": "#44475a",
+      "hoverBackground": "#44475A70",
       "lightSelectionBackground": "#44475A",
-      "paidTagBackground": "#6272A4",
+      "paidTagBackground": "#44475a",
       "selectionBackground": "#44475A",
-      "tagForeground": "#FF79C5",
-      "tagBackground": "#6272A4",
-      "trialTagBackground": "#6272A4",
+      "tagForeground": "#9580ff",
+      "tagBackground": "#44475a",
+      "trialTagBackground": "#44475a",
       "Button": {
         "installBackground": "#393C4B",
         "installBorderColor": "#393C4B",
         "installForeground": "#F8F8F2",
-        "installFocusedBackground": "#6272A4",
+        "installFocusedBackground": "#44475a",
         "installFillForeground": "#6272A4",
         "installFillBackground": "#393C4B",
-        "updateBackground": "#393C4B",
+        "updateBackground": "#9580ff",
         "updateBorderColor": "#393C4B",
         "updateForeground": "#F8F8F2"
       },
@@ -456,7 +483,7 @@
       },
       "Tab": {
         "hoverBackground": "#44475A",
-        "selectedForeground": "#8BE9FD",
+        "selectedForeground": "#FFFFFF",
         "selectedBackground": "#44475A"
       }
     },
@@ -464,7 +491,7 @@
       "Advertiser": {
         "background": "#282A36",
         "borderColor": "#282A36",
-        "foreground": "#FF79C5"
+        "foreground": "#9580ff"
       },
       "borderColor": "#191A21",
       "inactiveBorderColor": "#282A36",
@@ -492,15 +519,15 @@
     "PopupMenuSeparator.stripeIndent": 5,
     "ProgressBar": {
       "background": "#282A36",
-      "foreground": "#FF79C5",
-      "indeterminateEndColor": "#FF79C5",
-      "indeterminateStartColor": "#FF79C5",
-      "progressColor": "#FF79C5",
-      "selectionBackground": "#6272A4",
-      "trackColor": "#6272A4"
+      "foreground": "#9580ff",
+      "indeterminateEndColor": "#9580ff",
+      "indeterminateStartColor": "#9580ff",
+      "progressColor": "#9580ff",
+      "selectionBackground": "#44475a",
+      "trackColor": "#44475a"
     },
     "PsiViewer": {
-      "referenceHighlightColor": "#FF79C5"
+      "referenceHighlightColor": "#9580ff"
     },
     "RadioButton": {
       "background": "#282A36",
@@ -515,39 +542,40 @@
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#21222C",
     "ScrollBar": {
       "background": "#282A36",
-      "hoverThumbBorderColor": "#FF79C5",
-      "hoverThumbColor": "#FF79C5",
+      "hoverThumbBorderColor": "#9580ff",
+      "hoverThumbColor": "#9580ff",
       "hoverTrackColor": "#282A3630",
       "Mac": {
-        "hoverThumbBorderColor": "#FF79C5",
-        "hoverThumbColor": "#FF79C5",
+        "hoverThumbBorderColor": "#9580ff",
+        "hoverThumbColor": "#9580ff",
         "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#FF79C570",
-        "thumbColor": "#FF79C570",
+        "thumbBorderColor": "#9580ff70",
+        "thumbColor": "#9580ff70",
         "trackColor": "#282A3630",
         "Transparent": {
-          "hoverThumbBorderColor": "#FF79C5",
-          "hoverThumbColor": "#FF79C5",
+          "hoverThumbBorderColor": "#9580ff",
+          "hoverThumbColor": "#9580ff",
           "hoverTrackColor": "#282A3630",
-          "thumbBorderColor": "#FF79C570",
-          "thumbColor": "#FF79C570",
+          "thumbBorderColor": "#9580ff70",
+          "thumbColor": "#9580ff70",
           "trackColor": "#282A3630"
         }
       },
-      "thumb": "#6272A4",
-      "thumbBorderColor": "#FF79C570",
-      "thumbColor": "#FF79C570",
+      "thumb": "#44475a",
+      "thumbBorderColor": "#9580ff70",
+      "thumbColor": "#9580ff70",
       "trackColor": "#282A3630",
       "Transparent": {
-        "hoverThumbBorderColor": "#FF79C5",
-        "hoverThumbColor": "#FF79C5",
+        "hoverThumbBorderColor": "#9580ff",
+        "hoverThumbColor": "#9580ff",
         "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#FF79C570",
-        "thumbColor": "#FF79C570",
+        "thumbBorderColor": "#9580ff70",
+        "thumbColor": "#9580ff70",
         "trackColor": "#282A3630"
       }
     },
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#8BE9FD",
         "selectedForeground": "#8BE9FD",
-        "selectedBackground": "#6272A4"
+        "selectedBackground": "#44475a"
       }
     },
     "SearchMatch": {
-      "endBackground": "#FF79C5",
-      "startBackground": "#FF79C5"
+      "endBackground": "#9580ff",
+      "startBackground": "#9580ff",
+      "endColor": "#9580ff",
+      "startColor": "#9580ff"
     },
     "SearchField.errorBackground": "#1D2228",
+    "SearchOption": {
+      "selectedBackground": "#44475A"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#6272A4",
+      "Repeated.File.Foreground": "#F8F8F2"
+    },
     "Separator": {
       "background": "#282A36",
       "foreground": "#282A36",
@@ -589,17 +626,17 @@
     },
     "Slider": {
       "background": "#282A36",
-      "buttonBorderColor": "#FF79C5",
-      "buttonColor": "#FF79C5",
+      "buttonBorderColor": "#9580ff",
+      "buttonColor": "#9580ff",
       "foreground": "#F8F8F2",
       "majorTickLength": 6,
       "tickColor": "#282A36",
       "trackColor": "#44475A",
       "trackWidth": 7,
-      "thumb": "#FF79C5"
+      "thumb": "#9580ff"
     },
     "SpeedSearch": {
-      "background": "#6272A4",
+      "background": "#44475a",
       "borderColor": "#21222C",
       "foreground": "#F8F8F2",
       "errorForeground": "#F8F8F2"
@@ -616,11 +653,13 @@
     },
     "SplitPaneDivider.draggingColor": "#282A36",
     "StatusBar": {
-      "borderColor": "#282A36"
+      "borderColor": "#282A36",
+      "hoverBackground": "#44475a",
+      "LightEditBackground": "#44475A"
     },
     "TabbedPane": {
       "background": "#282A36",
-      "contentAreaColor": "#6272A4",
+      "contentAreaColor": "#44475a",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#21222C",
       "disabledForeground": "#6272A4",
@@ -630,7 +669,7 @@
       "fontSizeOffset": 0,
       "foreground": "#F8F8F2",
       "highlight": "#21222C",
-      "hoverColor": "#6272A4",
+      "hoverColor": "#44475a",
       "labelShift": 0,
       "selectedForeground": "#8BE9FD",
       "selectedLabelShift": 0,
@@ -639,27 +678,31 @@
       "tabHeight": 32,
       "tabInsets": "5,10,5,10",
       "tabSelectionHeight": 2,
-      "underlineColor": "#FF79C5"
+      "underlineColor": "#9580ff"
     },
     "TabbedPane.mt.tab.background": "#191A21",
     "Table": {
+      "alternativeRowBackground": "#191A21",
       "background": "#282A36",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
-      "dropLineColor": "#FF79C5",
-      "dropLineShortColor": "#FF79C5",
+      "disabledForeground": "#6272A4",
+      "dropLineColor": "#9580ff",
+      "dropLineShortColor": "#9580ff",
       "focusCellBackground": "#44475A",
       "focusCellForeground": "#8BE9FD",
       "foreground": "#F8F8F2",
       "gridColor": "#282A36",
       "highlightOuter": "#44475A",
+      "hoverBackground": "#44475A70",
+      "hoverInactiveBackground": "#44475A",
       "lightSelectionForeground": "#8BE9FD",
       "lightSelectionInactiveForeground": "#6272A4",
       "lightSelectionInactiveBackground": "#282A36",
       "selectionBackground": "#44475A",
       "selectionForeground": "#8BE9FD",
       "selectionInactiveBackground": "#44475A",
-      "selectionInactiveForeground": "#8BE9FD",
+      "selectionInactiveForeground": "#FFFFFF",
       "sortIconColor": "#F8F8F2",
       "stripeColor": "#191A21"
     },
@@ -680,7 +723,7 @@
     "textText": "#6272A4",
     "TextArea": {
       "background": "#191A21",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -688,7 +731,7 @@
     },
     "TextField": {
       "background": "#191A21",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -696,7 +739,7 @@
     },
     "TextPane": {
       "background": "#191A21",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -704,7 +747,7 @@
     },
     "TitlePane": {
       "background": "#191A21",
-      "Button.hoverBackground": "#6272A4",
+      "Button.hoverBackground": "#44475a",
       "inactiveBackground": "#282A36",
       "infoForeground": "#6272A4",
       "inactiveInfoForeground": "#6272A4"
@@ -717,8 +760,8 @@
       "foreground": "#F8F8F2",
       "offForeground": "#282A36",
       "offBackground": "#282A36",
-      "onBackground": "#FF79C5",
-      "onForeground": "#FF79C5"
+      "onBackground": "#9580ff",
+      "onForeground": "#9580ff"
     },
     "ToolBar": {
       "background": "#191A21",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#282A36",
       "Actions.infoForeground": "#6272A4",
-      "background": "#282A36",
-      "borderColor": "#6272A4",
+      "background": "#1D2228",
+      "borderColor": "#21222C",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
       "separatorColor": "#21222C",
@@ -751,50 +794,93 @@
         "background": "#282A36"
       },
       "HeaderTab": {
-        "hoverBackground": "#6272A4",
-        "hoverInactiveBackground": "#282A36",
-        "inactiveUnderlineColor": "#FF79C5",
+        "borderColor": "#44475a",
+        "hoverBackground": "#44475a",
+        "hoverInactiveBackground": "#44475a",
+        "inactiveUnderlineColor": "#9580ff",
         "selectedBackground": "#191A21",
         "selectedInactiveBackground": "#191A21",
-        "underlineColor": "#FF79C5",
-        "underlinedTabBackground": "#6272A4",
-        "underlinedTabInactiveBackground": "#282A36"
+        "underlineColor": "#9580ff",
+        "underlinedTabBackground": "#44475A",
+        "underlinedTabInactiveBackground": "#282A36",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#F8F8F2"
       }
     },
     "Tree": {
       "background": "#191A21",
       "foreground": "#6272A4",
       "hash": "#21222C",
-      "modifiedItemForeground": "#FF79C5",
+      "hoverBackground": "#44475A70",
+      "hoverInactiveBackground": "#44475A",
+      "modifiedItemForeground": "#9580ff",
       "rowHeight": 28,
-      "selectionBackground": "#44475A50",
-      "selectionForeground": "#8BE9FD",
-      "selectionInactiveForeground": "#8BE9FD",
-      "selectionInactiveBackground": "#44475A50",
+      "selectionBackground": "#44475A70",
+      "selectionForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#44475A70",
       "textBackground": "#191A21"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#21222C",
-      "ColorPicker.background": "#282A36",
-      "ColorPicker.foreground": "#F8F8F2",
-      "Component.borderColor": "#21222C",
-      "Component.background": "#282A36",
-      "Component.foreground": "#F8F8F2",
-      "Connector.borderColor": "#21222C",
-      "Connector.hoverBorderColor": "#6272A4",
+      "Canvas.background": "#191A21",
+      "ColorPicker": {
+        "background": "#282A36",
+        "foreground": "#F8F8F2"
+      },
+      "Component": {
+        "borderColor": "#21222C",
+        "background": "#282A36",
+        "foreground": "#F8F8F2",
+        "hoverBorderColor": "#44475a"
+      },
+      "Connector": {
+        "borderColor": "#21222C",
+        "hoverBorderColor": "#44475a"
+      },
       "Canvas.background": "#191A21",
       "highStroke.foreground": "#F8F8F2",
       "Label.foreground": "#6272A4",
-      "List.selectionBackground": "#44475A50",
-      "Panel.borderColor": "#21222C",
-      "Panel.background": "#282A36",
+      "List.selectionBackground": "#44475A70",
+      "motion": {
+        "borderColor": "#21222C",
+        "Component.foreground": "#F8F8F2",
+        "ConstraintSetText.foreground": "#6272A4",
+        "ConstraintSet.background": "#282A36",
+        "CSPanel.SelectedFocusBackground": "#44475A",
+        "CSPanel.SelectedBackground": "#44475A70",
+        "cs_FocusText.infoForeground": "#6272A4",
+        "CursorTextColor.foreground": "#F8F8F2",
+        "HoverColor.disabledBackground": "#6272A4",
+        "motionGraph.background": "#282A36",
+        "Notification.background": "#1D2228",
+        "ourAvg.background": "#282A36",
+        "ourCS.background": "#282A36",
+        "ourCS_Border.borderColor": "#21222C",
+        "ourCS_TextColor.foreground": "#6272A4",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#44475A",
+        "ourCS_SelectedBorder.pressedBorderColor": "#44475a",
+        "ourML_BarColor.separatorColor": "#21222C",
+        "PrimaryPanel.background": "#191A21",
+        "SecondaryPanel.background": "#282A36",
+        "SecondaryPanel.header.foreground": "#6272A4",
+        "SecondaryPanel.header.background": "#191A21",
+        "timeLine.disabledBorderColor": "#21222C"
+      },
+      "Panel": {
+        "borderColor": "#21222C",
+        "background": "#282A36"
+      },
       "percent.foreground": "#F8F8F2",
-      "Placeholder.background": "#282A36",
-      "Placeholder.borderColor": "#21222C",
-      "Placeholder.foreground": "#F8F8F2",
-      "Placeholder.selectedForeground": "#8BE9FD",
+      "Placeholder": {
+        "background": "#282A36",
+        "borderColor": "#21222C",
+        "foreground": "#F8F8F2",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#282A36",
       "stroke.acceleratorForeground": "#6272A4"
     },
@@ -809,16 +895,16 @@
         "selectedBranchBackground": "#282A36"
       },
       "GitCommits": {
-        "graphColor": "#6272A4"
+        "graphColor": "#44475a"
       },
       "GitLog": {
-        "localBranchIconColor": "#FF79C5",
+        "localBranchIconColor": "#9580ff",
         "otherIconColor": "#6272A4",
         "remoteBranchIconColor": "#F8F8F2",
         "tagIconColor": "#6272A4"
       },
       "HgLog": {
-        "branchIconColor": "#FF79C5",
+        "branchIconColor": "#9580ff",
         "bookmarkIconColor": "#8BE9FD",
         "closedBranchIconColor": "#6272A4",
         "localTagIconColor": "#6272A4",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#6272A4",
-        "Commit.currentBranchBackground": "#282A36"
+        "Commit.currentBranchBackground": "#282A36",
+        "Commit.hoveredBackground": "#44475A70"
       },
       "RefLabel": {
         "foreground": "#8BE9FD",
-        "backgroundBase": "#6272A4"
+        "backgroundBase": "#44475a"
       }
     },
     "Viewport": {
@@ -840,16 +927,22 @@
       "foreground": "#F8F8F2"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#282A36",
       "background": "#282A36",
       "borderColor": "#282A36",
       "captionBackground": "#191A21",
       "captionForeground": "#F8F8F2",
+      "Details.background": "#282A36",
       "footerBackground": "#191A21",
       "footerForeground": "#F8F8F2",
       "headerBackground": "#282A36",
       "headerForeground": "#F8F8F2",
+      "List.background": "#191A21",
       "separatorColor": "#21222C",
+      "SidePanel.background": "#282A36",
       "Projects": {
+        "actions.background": "#191A21",
+        "actions.selectionBackground": "#44475a",
         "background": "#282A36",
         "selectionBackground": "#44475A",
         "selectionInactiveBackground": "#282A36"
@@ -865,46 +958,46 @@
       "#43494A": "#191A21",
       "#6B6B6B": "#6272A4",
       "#A7A7A7": "#282A36",
-      "#3D6185": "#FF79C5",
-      "#466D94": "#FF79C5",
+      "#3D6185": "#9580ff",
+      "#466D94": "#9580ff",
       "#3C3F41": "#282A36",
       "#545556": "#6272A4",
       "#606060": "#6272A4",
       "#9AA7B0": "#F8F8F2",
-      "#675133": "#FF79C5",
+      "#675133": "#9580ff",
       "Actions.Blue": "#50FA78",
       "Actions.Green": "#F1FA8C",
       "Actions.Grey": "#6272A4",
       "Actions.GreyInline": "#6272A4",
       "Actions.GreyInline.Dark": "#F8F8F2",
-      "Actions.Red": "#FF79C6",
+      "Actions.Red": "#8BE9FD",
       "Actions.Yellow": "#50FA7B",
       "Checkbox.Background.Default": "#191A21",
       "Checkbox.Background.Default.Dark": "#191A21",
-      "Checkbox.Background.Disabled": "#313341",
-      "Checkbox.Background.Disabled.Dark": "#313341",
+      "Checkbox.Background.Disabled": "#34353D",
+      "Checkbox.Background.Disabled.Dark": "#34353D",
       "Checkbox.Border.Default": "#21222C",
       "Checkbox.Border.Default.Dark": "#21222C",
       "Checkbox.Border.Disabled": "#6272A4",
       "Checkbox.Border.Disabled.Dark": "#6272A4",
-      "Checkbox.Focus.Thin.Default": "#FF79C5",
-      "Checkbox.Focus.Thin.Default.Dark": "#FF79C5",
-      "Checkbox.Focus.Wide": "#FF79C5",
-      "Checkbox.Focus.Wide.Dark": "#FF79C5",
+      "Checkbox.Focus.Thin.Default": "#9580ff",
+      "Checkbox.Focus.Thin.Default.Dark": "#9580ff",
+      "Checkbox.Focus.Wide": "#9580ff",
+      "Checkbox.Focus.Wide.Dark": "#9580ff",
       "Checkbox.Foreground.Disabled": "#6272A4",
       "Checkbox.Foreground.Disabled.Dark": "#6272A4",
-      "Checkbox.Background.Selected": "#FF79C5",
+      "Checkbox.Background.Selected": "#9580ff",
       "Checkbox.Background.Selected.Dark": "#282A36",
-      "Checkbox.Border.Selected": "#FF79C5",
-      "Checkbox.Border.Selected.Dark": "#FF79C5",
-      "Checkbox.Foreground.Selected": "#FF79C5",
-      "Checkbox.Foreground.Selected.Dark": "#FF79C5",
+      "Checkbox.Border.Selected": "#9580ff",
+      "Checkbox.Border.Selected.Dark": "#9580ff",
+      "Checkbox.Foreground.Selected": "#9580ff",
+      "Checkbox.Foreground.Selected.Dark": "#9580ff",
       "Checkbox.Focus.Thin.Selected": "#F8F8F2",
       "Checkbox.Focus.Thin.Selected.Dark": "#F8F8F2",
       "Objects.Grey": "#6272A4",
       "Objects.Blue": "#50FA78",
-      "Objects.RedStatus": "#FF79C6",
-      "Objects.Red": "#FF79C6",
+      "Objects.RedStatus": "#8BE9FD",
+      "Objects.Red": "#8BE9FD",
       "Objects.Pink": "#FF79C6",
       "Objects.Yellow": "#50FA7B",
       "Objects.Green": "#F1FA8C",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json

@@ -3,34 +3,40 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Dracula.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/dracula.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#6272A4",
       "background": "#282A36",
       "borderColor": "#21222C",
-      "disabledBackground": "#313341",
+      "disabledBackground": "#34353D",
       "disabledForeground": "#6272A4",
       "disabledText": "#6272A4",
-      "focusColor": "#6272A4",
-      "focusedBorderColor": "#FF79C5",
+      "focusColor": "#44475a",
+      "focusedBorderColor": "#9580ff",
       "foreground": "#F8F8F2",
-      "inactiveBackground": "#313341",
+      "inactiveBackground": "#34353D",
       "inactiveForeground": "#6272A4",
       "infoForeground": "#6272A4",
       "selectionBackground": "#44475A",
       "selectionBackgroundInactive": "#282A36",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#282A36",
       "separatorColor": "#21222C"
     },
     "activeCaption": "#282A36",
     "ActionButton": {
-      "hoverBackground": "#FF79C550",
-      "hoverBorderColor": "#FF79C550",
+      "hoverBackground": "#9580ff50",
+      "hoverBorderColor": "#9580ff50",
       "hoverSeparatorColor": "#393C4B",
-      "focusedBorderColor": "#FF79C550",
-      "pressedBackground": "#FF79C550",
-      "pressedBorderColor": "#FF79C550"
+      "focusedBorderColor": "#9580ff50",
+      "pressedBackground": "#9580ff50",
+      "pressedBorderColor": "#9580ff50"
     },
     "Autocomplete": {
       "selectionBackground": "#44475A"
@@ -44,8 +50,8 @@
         "endBackground": "#44475A",
         "endBorderColor": "#44475A",
         "foreground": "#8BE9FD",
-        "focusColor": "#FF79C5",
-        "focusedBorderColor": "#FF79C5",
+        "focusColor": "#9580ff",
+        "focusedBorderColor": "#9580ff",
         "shadowColor": "#44475A",
         "startBackground": "#44475A",
         "startBorderColor": "#44475A"
@@ -54,13 +60,13 @@
       "disabledText": "#6272A4",
       "endBackground": "#393C4B",
       "endBorderColor": "#393C4B",
-      "focus": "#6272A4",
-      "focusedBorderColor": "#FF79C5",
+      "focus": "#44475a",
+      "focusedBorderColor": "#9580ff",
       "foreground": "#6272A4",
-      "highlight": "#8BE9FD",
+      "highlight": "#FFFFFF",
       "mt.background": "#393C4B",
       "mt.foreground": "#6272A4",
-      "mt.selectedForeground": "#8BE9FD",
+      "mt.selectedForeground": "#FFFFFF",
       "mt.selection.color1": "#44475A",
       "mt.selection.color2": "#44475A",
       "startBackground": "#393C4B",
@@ -72,12 +78,15 @@
       "Tooltip.borderColor": "#21222C",
       "Tooltip.background": "#1D2228"
     },
-    "Content.background": "#191A21",
+    "Content": {
+      "background": "#191A21",
+      "selectionBackground": "#44475A"
+    },
     "CheckBox": {
       "background": "#282A36",
       "disabledText": "#6272A4",
       "foreground": "#F8F8F2",
-      "select": "#FF79C5"
+      "select": "#9580ff"
     },
     "CheckBoxMenuItem": {
       "acceleratorForeground": "#6272A4",
@@ -89,6 +98,14 @@
       "selectionBackground": "#44475A",
       "selectionForeground": "#8BE9FD"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#F8F8F2",
+      "AccessEnabled": {
+        "accessDot": "#9580ff",
+        "dropdownBorder": "#282A36",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#282A36",
       "foreground": "#F8F8F2",
@@ -104,9 +121,10 @@
       },
       "background": "#282A36",
       "buttonBackground": "#393C4B",
+      "darcula.hoveredArrowButtonForeground": "#9580ff",
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
-      "modifiedItemForeground": "#FF79C5",
+      "modifiedItemForeground": "#9580ff",
       "nonEditableBackground": "#282A36",
       "padding": "5,5,5,5",
       "selectionBackground": "#44475A",
@@ -117,62 +135,64 @@
       "background": "#282A36",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
-      "matchForeground": "#FF79C5",
-      "matchSelectionForeground": "#FF79C5",
+      "matchForeground": "#9580ff",
+      "matchSelectionForeground": "#9580ff",
       "nonFocusedState": "false",
-      "selectedGrayedForeground": "#8BE9FD",
-      "selectionGrayForeground": "#8BE9FD",
+      "selectedGrayedForeground": "#FFFFFF",
+      "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#6272A4",
       "selectionInactiveBackground": "#44475A50",
       "selectionBackground": "#44475A80",
-      "selectionForeground": "#8BE9FD",
-      "selectionInfoForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF",
+      "selectionInfoForeground": "#FFFFFF"
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#6272A4",
+      "borderColor": "#44475a",
       "disabledBorderColor": "#393C4B",
-      "focusColor": "#FF79C5",
-      "focusedBorderColor": "#FF79C5",
-      "hoverIconColor": "#FF79C5",
+      "focusColor": "#9580ff",
+      "focusedBorderColor": "#9580ff",
+      "hoverIconColor": "#9580ff",
       "infoForeground": "#6272A4",
       "iconColor": "#F8F8F2"
     },
     "control": "#282A36",
     "controlText": "#6272A4",
     "Counter": {
-      "background": "#FF79C5",
-      "foreground": "#8BE9FD"
+      "background": "#9580ff",
+      "foreground": "#FFFFFF"
     },
     "Debugger": {
       "Variables": {
         "collectingDataForeground": "#6272A4",
-        "changedValueForeground": "#FF79C5",
-        "errorMessageForeground": "#FF79C6",
+        "changedValueForeground": "#9580ff",
+        "errorMessageForeground": "#8BE9FD",
         "evaluatingExpressionForeground": "#6272A4",
         "exceptionForeground": "#50FA7B",
-        "modifyingValueForeground": "#FF79C5",
-        "valueForeground": "#FF79C5"
+        "modifyingValueForeground": "#9580ff",
+        "valueForeground": "#9580ff"
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#6272A4",
-      "underlinedTabBackground": "#6272A4"
+      "selectedBackground": "#44475a",
+      "underlinedTabBackground": "#44475a"
     },
     "DebuggerPopup": {
-      "borderColor": "#6272A4"
+      "borderColor": "#44475a"
     },
     "DefaultTabs": {
       "background": "#282A36",
       "borderColor": "#282A36",
       "hoverBackground": "#44475A",
       "hoverColor": "#282A36",
-      "hoverMaskColor": "#6272A4",
+      "hoverMaskColor": "#44475a",
+      "inactiveColoredTabBackground": "#282A36",
       "inactiveColoredFileBackground": "#393C4B",
-      "inactiveUnderlineColor": "#6272A4",
+      "inactiveUnderlineColor": "#9580ff",
       "inactiveMaskColor": "#282A36",
-      "underlineColor": "#FF79C5",
-      "underlinedTabBackground": "#44475A"
+      "underlineColor": "#9580ff",
+      "underlinedTabBackground": "#44475A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#282A36",
     "DialogWrapper.southPanelBackground": "#282A36",
@@ -189,7 +209,7 @@
     },
     "EditorPane": {
       "background": "#282A36",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveBackground": "#282A36",
       "inactiveForeground": "#6272A4",
@@ -198,30 +218,32 @@
     },
     "EditorTabs": {
       "borderColor": "#282A36",
-      "hoverColor": "#6272A4",
-      "hoverMaskColor": "#6272A4",
+      "hoverBackground": "#44475a",
+      "hoverColor": "#44475a",
+      "hoverMaskColor": "#44475a",
       "inactiveMaskColor": "#282A36",
-      "inactiveColoredFileBackground": "#282A362",
+      "inactiveColoredFileBackground": "#282A36",
       "inactiveUnderlineColor": "#6272A4",
       "selectedForeground": "#F8F8F2",
       "selectedBackground": "#44475A",
-      "underlineColor": "#FF79C5",
-      "underlinedTabBackground": "#44475A"
+      "underlineColor": "#9580ff",
+      "underlinedTabBackground": "#44475A",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#282A36",
       "borderColor": "#282A36",
-      "hoverBackground": "#6272A4",
-      "hoverColor": "#6272A4",
-      "inactiveUnderlineColor": "#FF79C5",
-      "underlineColor": "#FF79C5",
+      "hoverBackground": "#44475a",
+      "hoverColor": "#44475a",
+      "inactiveUnderlineColor": "#9580ff",
+      "underlineColor": "#9580ff",
       "underlinedTabBackground": "#44475A",
       "underlinedTabForeground": "#F8F8F2"
     },
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#313341",
+      "Yellow": "#34353D",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -239,19 +261,20 @@
     "Focus.color": "#21222C",
     "FormattedTextField": {
       "background": "#282A36",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveBackground": "#393C4B",
       "inactiveForeground": "#6272A4",
       "selectionForeground": "#8BE9FD",
       "selectionBackground": "#44475A"
     },
+    "GotItTooltip.borderColor": "#1D2228",
     "Group": {
       "disabledSeparatorColor": "#21222C",
       "separatorColor": "#21222C"
     },
     "GutterTooltip": {
-      "infoForeground": "#F8F8F2",
+      "infoForeground": "#6272A4",
       "lineSeparatorColor": "#282A36"
     },
     "HeaderColor": {
@@ -265,7 +288,7 @@
       "infoForeground": "#6272A4",
       "shortcutForeground": "#6272A4"
     },
-    "Hyperlink.linkColor": "#FF79C5",
+    "Hyperlink.linkColor": "#9580ff",
     "inactiveCaption": "#282A36",
     "inactiveCaptionBorder": "#282A36",
     "inactiveCaptionText": "#6272A4",
@@ -288,23 +311,26 @@
       "disabledText": "#6272A4",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
-      "selectedForeground": "#8BE9FD"
+      "selectedForeground": "#8BE9FD",
+      "selectedDisabledForeground": "#F8F8F2"
     },
     "Link": {
-      "activeForeground": "#FF79C5",
-      "hoverForeground": "#FF79C5",
-      "pressedForeground": "#FF79C5",
+      "activeForeground": "#9580ff",
+      "hoverForeground": "#9580ff",
+      "pressedForeground": "#9580ff",
       "secondaryForeground": "#6272A4",
-      "visitedForeground": "#FF79C5"
+      "visitedForeground": "#9580ff"
     },
-    "link.foreground": "#FF79C5",
+    "link.foreground": "#9580ff",
     "List": {
       "background": "#282A36",
       "foreground": "#F8F8F2",
+      "hoverBackground": "#44475A70",
+      "hoverInactiveBackground": "#44475A",
       "selectionBackground": "#44475A50",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#8BE9FD",
-      "selectionInactiveBackground": "#44475A50"
+      "selectionInactiveBackground": "#44475A70"
     },
     "material": {
       "background": "#282A36",
@@ -313,19 +339,19 @@
       "foreground": "#F8F8F2",
       "mergeCommits": "#393C4B",
       "primaryColor": "#6272A4",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "tab.backgroundColor": "#282A36",
-      "tab.borderColor": "#FF79C5",
+      "tab.borderColor": "#9580ff",
       "tagColor": "#6272A4"
     },
     "MemoryIndicator": {
       "allocatedBackground": "#282A36",
-      "usedColor": "#6272A4",
-      "usedBackground": "#6272A4"
+      "usedColor": "#44475a",
+      "usedBackground": "#44475a"
     },
     "Menu": {
       "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#8BE9FD",
+      "acceleratorSelectionForeground": "#FFFFFF",
       "background": "#282A36",
       "border": "4,2,4,2",
       "borderColor": "#282A36",
@@ -333,7 +359,7 @@
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "separatorColor": "#21222C"
     },
     "MenuBar": {
@@ -344,19 +370,19 @@
       "foreground": "#F8F8F2",
       "highlight": "#282A36",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD",
+      "selectionForeground": "#FFFFFF",
       "shadow": "#282A36"
     },
     "MenuItem": {
       "acceleratorForeground": "#6272A4",
-      "acceleratorSelectionForeground": "#8BE9FD",
+      "acceleratorSelectionForeground": "#FFFFFF",
       "border": "4,2,4,2",
       "background": "#282A36",
       "disabledBackground": "#282A36",
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
       "arrowColor": "#F8F8F2",
@@ -370,7 +396,7 @@
         "background": "#282A36"
       }
     },
-    "NewPSD.warning": "#FF79C5",
+    "NewPSD.warning": "#9580ff",
     "Notification": {
       "background": "#1D2228",
       "borderColor": "#1D2228",
@@ -399,7 +425,7 @@
     },
     "Outline": {
       "color": "#393C4B",
-      "focusedColor": "#FF79C5",
+      "focusedColor": "#9580ff",
       "disabledColor": "#6272A4"
     },
     "Panel": {
@@ -409,8 +435,8 @@
     "ParameterInfo": {
       "background": "#282A36",
       "borderColor": "#44475A",
-      "currentOverloadBackground": "#44475A",
-      "currentParameterForeground": "#FF79C5",
+      "currentOverloadBackground": "#44475a",
+      "currentParameterForeground": "#9580ff",
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
@@ -418,8 +444,8 @@
     },
     "PasswordField": {
       "background": "#282A36",
-      "capsLockIconColor": "#FF79C5",
-      "caretForeground": "#FF79C5",
+      "capsLockIconColor": "#9580ff",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -428,21 +454,22 @@
     "Plugins": {
       "background": "#282A36",
       "disabledForeground": "#6272A4",
-      "eapTagBackground": "#6272A4",
+      "eapTagBackground": "#44475a",
+      "hoverBackground": "#44475A70",
       "lightSelectionBackground": "#44475A",
-      "paidTagBackground": "#6272A4",
+      "paidTagBackground": "#44475a",
       "selectionBackground": "#44475A",
-      "tagForeground": "#FF79C5",
-      "tagBackground": "#6272A4",
-      "trialTagBackground": "#6272A4",
+      "tagForeground": "#9580ff",
+      "tagBackground": "#44475a",
+      "trialTagBackground": "#44475a",
       "Button": {
         "installBackground": "#393C4B",
         "installBorderColor": "#393C4B",
         "installForeground": "#F8F8F2",
-        "installFocusedBackground": "#6272A4",
+        "installFocusedBackground": "#44475a",
         "installFillForeground": "#6272A4",
         "installFillBackground": "#393C4B",
-        "updateBackground": "#393C4B",
+        "updateBackground": "#9580ff",
         "updateBorderColor": "#393C4B",
         "updateForeground": "#F8F8F2"
       },
@@ -456,7 +483,7 @@
       },
       "Tab": {
         "hoverBackground": "#44475A",
-        "selectedForeground": "#8BE9FD",
+        "selectedForeground": "#FFFFFF",
         "selectedBackground": "#44475A"
       }
     },
@@ -464,7 +491,7 @@
       "Advertiser": {
         "background": "#282A36",
         "borderColor": "#282A36",
-        "foreground": "#FF79C5"
+        "foreground": "#9580ff"
       },
       "borderColor": "#191A21",
       "inactiveBorderColor": "#282A36",
@@ -492,15 +519,15 @@
     "PopupMenuSeparator.stripeIndent": 5,
     "ProgressBar": {
       "background": "#282A36",
-      "foreground": "#FF79C5",
-      "indeterminateEndColor": "#FF79C5",
-      "indeterminateStartColor": "#FF79C5",
-      "progressColor": "#FF79C5",
-      "selectionBackground": "#6272A4",
-      "trackColor": "#6272A4"
+      "foreground": "#9580ff",
+      "indeterminateEndColor": "#9580ff",
+      "indeterminateStartColor": "#9580ff",
+      "progressColor": "#9580ff",
+      "selectionBackground": "#44475a",
+      "trackColor": "#44475a"
     },
     "PsiViewer": {
-      "referenceHighlightColor": "#FF79C5"
+      "referenceHighlightColor": "#9580ff"
     },
     "RadioButton": {
       "background": "#282A36",
@@ -515,39 +542,40 @@
       "disabledForeground": "#6272A4",
       "foreground": "#F8F8F2",
       "selectionBackground": "#44475A",
-      "selectionForeground": "#8BE9FD"
+      "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#21222C",
     "ScrollBar": {
       "background": "#282A36",
-      "hoverThumbBorderColor": "#FF79C5",
-      "hoverThumbColor": "#FF79C5",
+      "hoverThumbBorderColor": "#9580ff",
+      "hoverThumbColor": "#9580ff",
       "hoverTrackColor": "#282A3630",
       "Mac": {
-        "hoverThumbBorderColor": "#FF79C5",
-        "hoverThumbColor": "#FF79C5",
+        "hoverThumbBorderColor": "#9580ff",
+        "hoverThumbColor": "#9580ff",
         "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#FF79C570",
-        "thumbColor": "#FF79C570",
+        "thumbBorderColor": "#9580ff70",
+        "thumbColor": "#9580ff70",
         "trackColor": "#282A3630",
         "Transparent": {
-          "hoverThumbBorderColor": "#FF79C5",
-          "hoverThumbColor": "#FF79C5",
+          "hoverThumbBorderColor": "#9580ff",
+          "hoverThumbColor": "#9580ff",
           "hoverTrackColor": "#282A3630",
-          "thumbBorderColor": "#FF79C570",
-          "thumbColor": "#FF79C570",
+          "thumbBorderColor": "#9580ff70",
+          "thumbColor": "#9580ff70",
           "trackColor": "#282A3630"
         }
       },
-      "thumb": "#6272A4",
-      "thumbBorderColor": "#FF79C570",
-      "thumbColor": "#FF79C570",
+      "thumb": "#44475a",
+      "thumbBorderColor": "#9580ff70",
+      "thumbColor": "#9580ff70",
       "trackColor": "#282A3630",
       "Transparent": {
-        "hoverThumbBorderColor": "#FF79C5",
-        "hoverThumbColor": "#FF79C5",
+        "hoverThumbBorderColor": "#9580ff",
+        "hoverThumbColor": "#9580ff",
         "hoverTrackColor": "#282A3630",
-        "thumbBorderColor": "#FF79C570",
-        "thumbColor": "#FF79C570",
+        "thumbBorderColor": "#9580ff70",
+        "thumbColor": "#9580ff70",
         "trackColor": "#282A3630"
       }
     },
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#8BE9FD",
         "selectedForeground": "#8BE9FD",
-        "selectedBackground": "#6272A4"
+        "selectedBackground": "#44475a"
       }
     },
     "SearchMatch": {
-      "endBackground": "#FF79C5",
-      "startBackground": "#FF79C5"
+      "endBackground": "#9580ff",
+      "startBackground": "#9580ff",
+      "endColor": "#9580ff",
+      "startColor": "#9580ff"
     },
     "SearchField.errorBackground": "#1D2228",
+    "SearchOption": {
+      "selectedBackground": "#44475A"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#6272A4",
+      "Repeated.File.Foreground": "#F8F8F2"
+    },
     "Separator": {
       "background": "#282A36",
       "foreground": "#282A36",
@@ -589,17 +626,17 @@
     },
     "Slider": {
       "background": "#282A36",
-      "buttonBorderColor": "#FF79C5",
-      "buttonColor": "#FF79C5",
+      "buttonBorderColor": "#9580ff",
+      "buttonColor": "#9580ff",
       "foreground": "#F8F8F2",
       "majorTickLength": 6,
       "tickColor": "#282A36",
       "trackColor": "#44475A",
       "trackWidth": 7,
-      "thumb": "#FF79C5"
+      "thumb": "#9580ff"
     },
     "SpeedSearch": {
-      "background": "#6272A4",
+      "background": "#44475a",
       "borderColor": "#21222C",
       "foreground": "#F8F8F2",
       "errorForeground": "#F8F8F2"
@@ -616,11 +653,13 @@
     },
     "SplitPaneDivider.draggingColor": "#282A36",
     "StatusBar": {
-      "borderColor": "#282A36"
+      "borderColor": "#282A36",
+      "hoverBackground": "#44475a",
+      "LightEditBackground": "#44475A"
     },
     "TabbedPane": {
       "background": "#282A36",
-      "contentAreaColor": "#6272A4",
+      "contentAreaColor": "#44475a",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#21222C",
       "disabledForeground": "#6272A4",
@@ -630,7 +669,7 @@
       "fontSizeOffset": 0,
       "foreground": "#F8F8F2",
       "highlight": "#21222C",
-      "hoverColor": "#6272A4",
+      "hoverColor": "#44475a",
       "labelShift": 0,
       "selectedForeground": "#8BE9FD",
       "selectedLabelShift": 0,
@@ -639,27 +678,31 @@
       "tabHeight": 32,
       "tabInsets": "5,10,5,10",
       "tabSelectionHeight": 2,
-      "underlineColor": "#FF79C5"
+      "underlineColor": "#9580ff"
     },
     "TabbedPane.mt.tab.background": "#282A36",
     "Table": {
+      "alternativeRowBackground": "#191A21",
       "background": "#282A36",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
-      "dropLineColor": "#FF79C5",
-      "dropLineShortColor": "#FF79C5",
+      "disabledForeground": "#6272A4",
+      "dropLineColor": "#9580ff",
+      "dropLineShortColor": "#9580ff",
       "focusCellBackground": "#44475A",
       "focusCellForeground": "#8BE9FD",
       "foreground": "#F8F8F2",
       "gridColor": "#282A36",
       "highlightOuter": "#44475A",
+      "hoverBackground": "#44475A70",
+      "hoverInactiveBackground": "#44475A",
       "lightSelectionForeground": "#8BE9FD",
       "lightSelectionInactiveForeground": "#6272A4",
       "lightSelectionInactiveBackground": "#282A36",
       "selectionBackground": "#44475A",
       "selectionForeground": "#8BE9FD",
       "selectionInactiveBackground": "#44475A",
-      "selectionInactiveForeground": "#8BE9FD",
+      "selectionInactiveForeground": "#FFFFFF",
       "sortIconColor": "#F8F8F2",
       "stripeColor": "#191A21"
     },
@@ -680,7 +723,7 @@
     "textText": "#6272A4",
     "TextArea": {
       "background": "#282A36",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -688,7 +731,7 @@
     },
     "TextField": {
       "background": "#282A36",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -696,7 +739,7 @@
     },
     "TextPane": {
       "background": "#282A36",
-      "caretForeground": "#FF79C5",
+      "caretForeground": "#9580ff",
       "foreground": "#F8F8F2",
       "inactiveForeground": "#6272A4",
       "selectionBackground": "#44475A",
@@ -704,7 +747,7 @@
     },
     "TitlePane": {
       "background": "#191A21",
-      "Button.hoverBackground": "#6272A4",
+      "Button.hoverBackground": "#44475a",
       "inactiveBackground": "#282A36",
       "infoForeground": "#6272A4",
       "inactiveInfoForeground": "#6272A4"
@@ -717,8 +760,8 @@
       "foreground": "#F8F8F2",
       "offForeground": "#282A36",
       "offBackground": "#282A36",
-      "onBackground": "#FF79C5",
-      "onForeground": "#FF79C5"
+      "onBackground": "#9580ff",
+      "onForeground": "#9580ff"
     },
     "ToolBar": {
       "background": "#282A36",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#282A36",
       "Actions.infoForeground": "#6272A4",
-      "background": "#282A36",
-      "borderColor": "#6272A4",
+      "background": "#1D2228",
+      "borderColor": "#21222C",
       "foreground": "#F8F8F2",
       "infoForeground": "#6272A4",
       "separatorColor": "#21222C",
@@ -751,50 +794,93 @@
         "background": "#282A36"
       },
       "HeaderTab": {
-        "hoverBackground": "#6272A4",
-        "hoverInactiveBackground": "#282A36",
-        "inactiveUnderlineColor": "#FF79C5",
+        "borderColor": "#44475a",
+        "hoverBackground": "#44475a",
+        "hoverInactiveBackground": "#44475a",
+        "inactiveUnderlineColor": "#9580ff",
         "selectedBackground": "#191A21",
         "selectedInactiveBackground": "#191A21",
-        "underlineColor": "#FF79C5",
-        "underlinedTabBackground": "#6272A4",
-        "underlinedTabInactiveBackground": "#282A36"
+        "underlineColor": "#9580ff",
+        "underlinedTabBackground": "#44475A",
+        "underlinedTabInactiveBackground": "#282A36",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#F8F8F2"
       }
     },
     "Tree": {
       "background": "#282A36",
       "foreground": "#6272A4",
       "hash": "#21222C",
-      "modifiedItemForeground": "#FF79C5",
+      "hoverBackground": "#44475A70",
+      "hoverInactiveBackground": "#44475A",
+      "modifiedItemForeground": "#9580ff",
       "rowHeight": 28,
-      "selectionBackground": "#44475A50",
-      "selectionForeground": "#8BE9FD",
-      "selectionInactiveForeground": "#8BE9FD",
-      "selectionInactiveBackground": "#44475A50",
+      "selectionBackground": "#44475A70",
+      "selectionForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#44475A70",
       "textBackground": "#282A36"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#21222C",
-      "ColorPicker.background": "#282A36",
-      "ColorPicker.foreground": "#F8F8F2",
-      "Component.borderColor": "#21222C",
-      "Component.background": "#282A36",
-      "Component.foreground": "#F8F8F2",
-      "Connector.borderColor": "#21222C",
-      "Connector.hoverBorderColor": "#6272A4",
+      "Canvas.background": "#191A21",
+      "ColorPicker": {
+        "background": "#282A36",
+        "foreground": "#F8F8F2"
+      },
+      "Component": {
+        "borderColor": "#21222C",
+        "background": "#282A36",
+        "foreground": "#F8F8F2",
+        "hoverBorderColor": "#44475a"
+      },
+      "Connector": {
+        "borderColor": "#21222C",
+        "hoverBorderColor": "#44475a"
+      },
       "Canvas.background": "#191A21",
       "highStroke.foreground": "#F8F8F2",
       "Label.foreground": "#6272A4",
-      "List.selectionBackground": "#44475A50",
-      "Panel.borderColor": "#21222C",
-      "Panel.background": "#282A36",
+      "List.selectionBackground": "#44475A70",
+      "motion": {
+        "borderColor": "#21222C",
+        "Component.foreground": "#F8F8F2",
+        "ConstraintSetText.foreground": "#6272A4",
+        "ConstraintSet.background": "#282A36",
+        "CSPanel.SelectedFocusBackground": "#44475A",
+        "CSPanel.SelectedBackground": "#44475A70",
+        "cs_FocusText.infoForeground": "#6272A4",
+        "CursorTextColor.foreground": "#F8F8F2",
+        "HoverColor.disabledBackground": "#6272A4",
+        "motionGraph.background": "#282A36",
+        "Notification.background": "#1D2228",
+        "ourAvg.background": "#282A36",
+        "ourCS.background": "#282A36",
+        "ourCS_Border.borderColor": "#21222C",
+        "ourCS_TextColor.foreground": "#6272A4",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#44475A",
+        "ourCS_SelectedBorder.pressedBorderColor": "#44475a",
+        "ourML_BarColor.separatorColor": "#21222C",
+        "PrimaryPanel.background": "#191A21",
+        "SecondaryPanel.background": "#282A36",
+        "SecondaryPanel.header.foreground": "#6272A4",
+        "SecondaryPanel.header.background": "#191A21",
+        "timeLine.disabledBorderColor": "#21222C"
+      },
+      "Panel": {
+        "borderColor": "#21222C",
+        "background": "#282A36"
+      },
       "percent.foreground": "#F8F8F2",
-      "Placeholder.background": "#282A36",
-      "Placeholder.borderColor": "#21222C",
-      "Placeholder.foreground": "#F8F8F2",
-      "Placeholder.selectedForeground": "#8BE9FD",
+      "Placeholder": {
+        "background": "#282A36",
+        "borderColor": "#21222C",
+        "foreground": "#F8F8F2",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#282A36",
       "stroke.acceleratorForeground": "#6272A4"
     },
@@ -809,16 +895,16 @@
         "selectedBranchBackground": "#282A36"
       },
       "GitCommits": {
-        "graphColor": "#6272A4"
+        "graphColor": "#44475a"
       },
       "GitLog": {
-        "localBranchIconColor": "#FF79C5",
+        "localBranchIconColor": "#9580ff",
         "otherIconColor": "#6272A4",
         "remoteBranchIconColor": "#F8F8F2",
         "tagIconColor": "#6272A4"
       },
       "HgLog": {
-        "branchIconColor": "#FF79C5",
+        "branchIconColor": "#9580ff",
         "bookmarkIconColor": "#8BE9FD",
         "closedBranchIconColor": "#6272A4",
         "localTagIconColor": "#6272A4",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#6272A4",
-        "Commit.currentBranchBackground": "#282A36"
+        "Commit.currentBranchBackground": "#282A36",
+        "Commit.hoveredBackground": "#44475A70"
       },
       "RefLabel": {
         "foreground": "#8BE9FD",
-        "backgroundBase": "#6272A4"
+        "backgroundBase": "#44475a"
       }
     },
     "Viewport": {
@@ -840,16 +927,22 @@
       "foreground": "#F8F8F2"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#282A36",
       "background": "#282A36",
       "borderColor": "#282A36",
       "captionBackground": "#191A21",
       "captionForeground": "#F8F8F2",
+      "Details.background": "#282A36",
       "footerBackground": "#191A21",
       "footerForeground": "#F8F8F2",
       "headerBackground": "#282A36",
       "headerForeground": "#F8F8F2",
+      "List.background": "#191A21",
       "separatorColor": "#21222C",
+      "SidePanel.background": "#282A36",
       "Projects": {
+        "actions.background": "#191A21",
+        "actions.selectionBackground": "#44475a",
         "background": "#282A36",
         "selectionBackground": "#44475A",
         "selectionInactiveBackground": "#282A36"
@@ -865,46 +958,46 @@
       "#43494A": "#191A21",
       "#6B6B6B": "#6272A4",
       "#A7A7A7": "#282A36",
-      "#3D6185": "#FF79C5",
-      "#466D94": "#FF79C5",
+      "#3D6185": "#9580ff",
+      "#466D94": "#9580ff",
       "#3C3F41": "#282A36",
       "#545556": "#6272A4",
       "#606060": "#6272A4",
       "#9AA7B0": "#F8F8F2",
-      "#675133": "#FF79C5",
+      "#675133": "#9580ff",
       "Actions.Blue": "#50FA78",
       "Actions.Green": "#F1FA8C",
       "Actions.Grey": "#6272A4",
       "Actions.GreyInline": "#6272A4",
       "Actions.GreyInline.Dark": "#F8F8F2",
-      "Actions.Red": "#FF79C6",
+      "Actions.Red": "#8BE9FD",
       "Actions.Yellow": "#50FA7B",
       "Checkbox.Background.Default": "#191A21",
       "Checkbox.Background.Default.Dark": "#191A21",
-      "Checkbox.Background.Disabled": "#313341",
-      "Checkbox.Background.Disabled.Dark": "#313341",
+      "Checkbox.Background.Disabled": "#34353D",
+      "Checkbox.Background.Disabled.Dark": "#34353D",
       "Checkbox.Border.Default": "#21222C",
       "Checkbox.Border.Default.Dark": "#21222C",
       "Checkbox.Border.Disabled": "#6272A4",
       "Checkbox.Border.Disabled.Dark": "#6272A4",
-      "Checkbox.Focus.Thin.Default": "#FF79C5",
-      "Checkbox.Focus.Thin.Default.Dark": "#FF79C5",
-      "Checkbox.Focus.Wide": "#FF79C5",
-      "Checkbox.Focus.Wide.Dark": "#FF79C5",
+      "Checkbox.Focus.Thin.Default": "#9580ff",
+      "Checkbox.Focus.Thin.Default.Dark": "#9580ff",
+      "Checkbox.Focus.Wide": "#9580ff",
+      "Checkbox.Focus.Wide.Dark": "#9580ff",
       "Checkbox.Foreground.Disabled": "#6272A4",
       "Checkbox.Foreground.Disabled.Dark": "#6272A4",
-      "Checkbox.Background.Selected": "#FF79C5",
+      "Checkbox.Background.Selected": "#9580ff",
       "Checkbox.Background.Selected.Dark": "#282A36",
-      "Checkbox.Border.Selected": "#FF79C5",
-      "Checkbox.Border.Selected.Dark": "#FF79C5",
-      "Checkbox.Foreground.Selected": "#FF79C5",
-      "Checkbox.Foreground.Selected.Dark": "#FF79C5",
+      "Checkbox.Border.Selected": "#9580ff",
+      "Checkbox.Border.Selected.Dark": "#9580ff",
+      "Checkbox.Foreground.Selected": "#9580ff",
+      "Checkbox.Foreground.Selected.Dark": "#9580ff",
       "Checkbox.Focus.Thin.Selected": "#F8F8F2",
       "Checkbox.Focus.Thin.Selected.Dark": "#F8F8F2",
       "Objects.Grey": "#6272A4",
       "Objects.Blue": "#50FA78",
-      "Objects.RedStatus": "#FF79C6",
-      "Objects.Red": "#FF79C6",
+      "Objects.RedStatus": "#8BE9FD",
+      "Objects.Red": "#8BE9FD",
       "Objects.Pink": "#FF79C6",
       "Objects.Yellow": "#50FA7B",
       "Objects.Green": "#F1FA8C",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json

@@ -2,32 +2,38 @@
   "name": "GitHub Contrast",
   "dark": false,
   "author": "Mallowigi",
-  "editorScheme": "/colors/Github.xml",
+  "editorScheme": "/colors/GitHub (Material).xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/github.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#292D31",
       "background": "#F7F8FA",
       "borderColor": "#DFE1E4",
-      "disabledBackground": "#dcdcdc",
-      "disabledForeground": "#9ba0a3",
-      "disabledText": "#9ba0a3",
+      "disabledBackground": "#FDFDFD",
+      "disabledForeground": "#6C737C",
+      "disabledText": "#6C737C",
       "focusColor": "#CCE5FF",
       "focusedBorderColor": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveBackground": "#dcdcdc",
+      "inactiveBackground": "#FDFDFD",
       "inactiveForeground": "#292D31",
       "infoForeground": "#292D31",
       "selectionBackground": "#3A66D1",
-      "selectionBackgroundInactive": "#f3f3f3",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#f3f3f3",
+      "selectionBackgroundInactive": "#F7F8FA",
+      "selectionForeground": "#111111",
+      "selectionInactiveBackground": "#F7F8FA",
       "separatorColor": "#DFE1E4"
     },
     "activeCaption": "#F7F8FA",
     "ActionButton": {
       "hoverBackground": "#79CB6050",
       "hoverBorderColor": "#79CB6050",
-      "hoverSeparatorColor": "#edf1f5",
+      "hoverSeparatorColor": "#F1F3F6",
       "focusedBorderColor": "#79CB6050",
       "pressedBackground": "#79CB6050",
       "pressedBorderColor": "#79CB6050"
@@ -50,32 +56,35 @@
         "startBackground": "#cce5ff",
         "startBorderColor": "#cce5ff"
       },
-      "disabledBorderColor": "#edf1f5",
-      "disabledText": "#9ba0a3",
-      "endBackground": "#edf1f5",
-      "endBorderColor": "#edf1f5",
+      "disabledBorderColor": "#F1F3F6",
+      "disabledText": "#6C737C",
+      "endBackground": "#F1F3F6",
+      "endBorderColor": "#F1F3F6",
       "focus": "#CCE5FF",
       "focusedBorderColor": "#79CB60",
       "foreground": "#292D31",
-      "highlight": "#FFFFFF",
-      "mt.background": "#edf1f5",
+      "highlight": "#111111",
+      "mt.background": "#F1F3F6",
       "mt.foreground": "#292D31",
-      "mt.selectedForeground": "#FFFFFF",
+      "mt.selectedForeground": "#111111",
       "mt.selection.color1": "#cce5ff",
       "mt.selection.color2": "#cce5ff",
-      "startBackground": "#edf1f5",
-      "startBorderColor": "#edf1f5",
-      "shadowColor": "#edf1f5",
+      "startBackground": "#F1F3F6",
+      "startBorderColor": "#F1F3F6",
+      "shadowColor": "#F1F3F6",
       "shadowWidth": 0
     },
     "Canvas": {
       "Tooltip.borderColor": "#DFE1E4",
       "Tooltip.background": "#DFECFE"
     },
-    "Content.background": "#fafbfc",
+    "Content": {
+      "background": "#FFFFFF",
+      "selectionBackground": "#3A66D1"
+    },
     "CheckBox": {
       "background": "#F7F8FA",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168",
       "select": "#79CB60"
     },
@@ -84,54 +93,63 @@
       "acceleratorSelectionForeground": "#292D31",
       "background": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
       "selectionForeground": "#111111"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#5B6168",
+      "AccessEnabled": {
+        "accessDot": "#79CB60",
+        "dropdownBorder": "#F7F8FA",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#F7F8FA",
       "foreground": "#5B6168",
       "swatchesDefaultRecentColor": "#5B6168"
     },
-    "ComboBoxButton.background": "#edf1f5",
+    "ComboBoxButton.background": "#F1F3F6",
     "ComboBox": {
       "ArrowButton": {
-        "background": "#edf1f5",
-        "disabledIconColor": "#9ba0a3",
+        "background": "#F1F3F6",
+        "disabledIconColor": "#6C737C",
         "iconColor": "#5B6168",
         "nonEditableBackground": "#F7F8FA"
       },
-      "background": "#fafbfc",
-      "buttonBackground": "#edf1f5",
-      "disabledForeground": "#9ba0a3",
+      "background": "#FFFFFF",
+      "buttonBackground": "#F1F3F6",
+      "darcula.hoveredArrowButtonForeground": "#79CB60",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "modifiedItemForeground": "#79CB60",
-      "nonEditableBackground": "#f3f3f3",
+      "nonEditableBackground": "#F7F8FA",
       "padding": "5,5,5,5",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "ComboPopup.border": "#DFE1E4",
     "CompletionPopup": {
-      "background": "#f3f3f3",
+      "background": "#F7F8FA",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
       "matchForeground": "#79CB60",
       "matchSelectionForeground": "#79CB60",
       "nonFocusedState": "false",
-      "selectedGrayedForeground": "#FFFFFF",
-      "selectionGrayForeground": "#FFFFFF",
+      "selectedGrayedForeground": "#111111",
+      "selectionGrayForeground": "#111111",
       "selectionInactiveInfoForeground": "#292D31",
       "selectionInactiveBackground": "#3A66D150",
       "selectionBackground": "#3A66D180",
-      "selectionForeground": "#FFFFFF",
-      "selectionInfoForeground": "#FFFFFF"
+      "selectionForeground": "#111111",
+      "selectionInfoForeground": "#111111"
     },
     "Component": {
       "arc": 4,
       "borderColor": "#CCE5FF",
-      "disabledBorderColor": "#edf1f5",
+      "disabledBorderColor": "#F1F3F6",
       "focusColor": "#79CB60",
       "focusedBorderColor": "#79CB60",
       "hoverIconColor": "#79CB60",
@@ -142,7 +160,7 @@
     "controlText": "#292D31",
     "Counter": {
       "background": "#79CB60",
-      "foreground": "#FFFFFF"
+      "foreground": "#111111"
     },
     "Debugger": {
       "Variables": {
@@ -166,13 +184,15 @@
       "background": "#F7F8FA",
       "borderColor": "#F7F8FA",
       "hoverBackground": "#cce5ff",
-      "hoverColor": "#fafbfc",
+      "hoverColor": "#FFFFFF",
       "hoverMaskColor": "#CCE5FF",
-      "inactiveColoredFileBackground": "#edf1f5",
-      "inactiveUnderlineColor": "#9ba0a3",
-      "inactiveMaskColor": "#fafbfc",
+      "inactiveColoredTabBackground": "#F7F8FA",
+      "inactiveColoredFileBackground": "#F1F3F6",
+      "inactiveUnderlineColor": "#79CB60",
+      "inactiveMaskColor": "#FFFFFF",
       "underlineColor": "#79CB60",
-      "underlinedTabBackground": "#cce5ff"
+      "underlinedTabBackground": "#cce5ff",
+      "underlinedTabForeground": "#111111"
     },
     "Desktop.background": "#F7F8FA",
     "DialogWrapper.southPanelBackground": "#F7F8FA",
@@ -183,34 +203,36 @@
       "areaForeground": "#5B6168"
     },
     "Editor": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "foreground": "#5B6168",
       "shortcutForeground": "#292D31"
     },
     "EditorPane": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
       "inactiveBackground": "#F7F8FA",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#3A66D1",
       "selectionForeground": "#111111"
     },
     "EditorTabs": {
-      "borderColor": "#f3f3f3",
+      "borderColor": "#F7F8FA",
+      "hoverBackground": "#CCE5FF",
       "hoverColor": "#CCE5FF",
       "hoverMaskColor": "#CCE5FF",
       "inactiveMaskColor": "#F7F8FA",
-      "inactiveColoredFileBackground": "#F7F8FA2",
-      "inactiveUnderlineColor": "#9ba0a3",
+      "inactiveColoredFileBackground": "#F7F8FA",
+      "inactiveUnderlineColor": "#6C737C",
       "selectedForeground": "#5B6168",
       "selectedBackground": "#cce5ff",
       "underlineColor": "#79CB60",
-      "underlinedTabBackground": "#cce5ff"
+      "underlinedTabBackground": "#cce5ff",
+      "underlinedTabForeground": "#111111"
     },
     "EditorGroupsTabs": {
       "background": "#F7F8FA",
-      "borderColor": "#f3f3f3",
+      "borderColor": "#F7F8FA",
       "hoverBackground": "#CCE5FF",
       "hoverColor": "#CCE5FF",
       "inactiveUnderlineColor": "#79CB60",
@@ -221,7 +243,7 @@
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#dcdcdc",
+      "Yellow": "#FDFDFD",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -238,25 +260,26 @@
     },
     "Focus.color": "#DFE1E4",
     "FormattedTextField": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveBackground": "#edf1f5",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveBackground": "#F1F3F6",
+      "inactiveForeground": "#6C737C",
       "selectionForeground": "#111111",
       "selectionBackground": "#cce5ff"
     },
+    "GotItTooltip.borderColor": "#DFECFE",
     "Group": {
       "disabledSeparatorColor": "#DFE1E4",
       "separatorColor": "#DFE1E4"
     },
     "GutterTooltip": {
-      "infoForeground": "#5B6168",
+      "infoForeground": "#292D31",
       "lineSeparatorColor": "#F7F8FA"
     },
     "HeaderColor": {
       "active": "#F7F8FA",
-      "inactive": "#fafbfc"
+      "inactive": "#FFFFFF"
     },
     "HelpTooltip": {
       "background": "#F7F8FA",
@@ -266,7 +289,7 @@
       "shortcutForeground": "#292D31"
     },
     "Hyperlink.linkColor": "#79CB60",
-    "inactiveCaption": "#f3f3f3",
+    "inactiveCaption": "#F7F8FA",
     "inactiveCaptionBorder": "#F7F8FA",
     "inactiveCaptionText": "#292D31",
     "info": "#292D31",
@@ -283,12 +306,13 @@
     },
     "Label": {
       "background": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "disabledShadow": "#F7F8FA",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
-      "selectedForeground": "#111111"
+      "selectedForeground": "#111111",
+      "selectedDisabledForeground": "#5B6168"
     },
     "Link": {
       "activeForeground": "#79CB60",
@@ -299,64 +323,66 @@
     },
     "link.foreground": "#79CB60",
     "List": {
-      "background": "#f3f3f3",
+      "background": "#F7F8FA",
       "foreground": "#5B6168",
+      "hoverBackground": "#3A66D170",
+      "hoverInactiveBackground": "#cce5ff",
       "selectionBackground": "#3A66D150",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#111111",
       "selectionInactiveForeground": "#111111",
-      "selectionInactiveBackground": "#3A66D1"
+      "selectionInactiveBackground": "#3A66D170"
     },
     "material": {
       "background": "#F7F8FA",
       "branchColor": "#5B6168",
-      "contrast": "#fafbfc",
+      "contrast": "#FFFFFF",
       "foreground": "#5B6168",
-      "mergeCommits": "#edf1f5",
+      "mergeCommits": "#F1F3F6",
       "primaryColor": "#292D31",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#111111",
       "tab.backgroundColor": "#F7F8FA",
       "tab.borderColor": "#79CB60",
       "tagColor": "#292D31"
     },
     "MemoryIndicator": {
-      "allocatedBackground": "#f3f3f3",
+      "allocatedBackground": "#F7F8FA",
       "usedColor": "#CCE5FF",
       "usedBackground": "#CCE5FF"
     },
     "Menu": {
       "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#111111",
       "background": "#F7F8FA",
       "border": "4,2,4,2",
-      "borderColor": "#f3f3f3",
-      "disabledBackground": "#f3f3f3",
-      "disabledForeground": "#9ba0a3",
+      "borderColor": "#F7F8FA",
+      "disabledBackground": "#F7F8FA",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#111111",
       "separatorColor": "#DFE1E4"
     },
     "MenuBar": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "borderColor": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "highlight": "#F7F8FA",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF",
-      "shadow": "#fafbfc"
+      "selectionForeground": "#111111",
+      "shadow": "#FFFFFF"
     },
     "MenuItem": {
       "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#111111",
       "border": "4,2,4,2",
       "background": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#111111"
     },
     "NavBar": {
       "arrowColor": "#5B6168",
@@ -367,7 +393,7 @@
         "background": "#F7F8FA"
       },
       "SearchField": {
-        "background": "#fafbfc"
+        "background": "#FFFFFF"
       }
     },
     "NewPSD.warning": "#79CB60",
@@ -378,9 +404,9 @@
       "errorBorderColor": "#DFECFE",
       "foreground": "#5B6168",
       "MoreButton": {
-        "background": "#edf1f5",
+        "background": "#F1F3F6",
         "foreground": "#5B6168",
-        "innerBorderColor": "#edf1f5"
+        "innerBorderColor": "#F1F3F6"
       },
       "ToolWindow": {
         "errorBackground": "#DFECFE",
@@ -398,65 +424,66 @@
       "messageForeground": "#5B6168"
     },
     "Outline": {
-      "color": "#edf1f5",
+      "color": "#F1F3F6",
       "focusedColor": "#79CB60",
-      "disabledColor": "#9ba0a3"
+      "disabledColor": "#6C737C"
     },
     "Panel": {
       "background": "#F7F8FA",
       "foreground": "#5B6168"
     },
     "ParameterInfo": {
-      "background": "#f3f3f3",
+      "background": "#F7F8FA",
       "borderColor": "#cce5ff",
-      "currentOverloadBackground": "#cce5ff",
+      "currentOverloadBackground": "#CCE5FF",
       "currentParameterForeground": "#79CB60",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
       "lineSeparatorColor": "#cce5ff"
     },
     "PasswordField": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "capsLockIconColor": "#79CB60",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "Plugins": {
       "background": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "eapTagBackground": "#CCE5FF",
-      "lightSelectionBackground": "#3A66D1",
+      "hoverBackground": "#3A66D170",
+      "lightSelectionBackground": "#cce5ff",
       "paidTagBackground": "#CCE5FF",
       "selectionBackground": "#3A66D1",
       "tagForeground": "#79CB60",
       "tagBackground": "#CCE5FF",
       "trialTagBackground": "#CCE5FF",
       "Button": {
-        "installBackground": "#edf1f5",
-        "installBorderColor": "#edf1f5",
+        "installBackground": "#F1F3F6",
+        "installBorderColor": "#F1F3F6",
         "installForeground": "#5B6168",
         "installFocusedBackground": "#CCE5FF",
-        "installFillForeground": "#9ba0a3",
-        "installFillBackground": "#edf1f5",
-        "updateBackground": "#edf1f5",
-        "updateBorderColor": "#edf1f5",
+        "installFillForeground": "#6C737C",
+        "installFillBackground": "#F1F3F6",
+        "updateBackground": "#79CB60",
+        "updateBorderColor": "#F1F3F6",
         "updateForeground": "#5B6168"
       },
       "SearchField": {
-        "background": "#fafbfc",
+        "background": "#FFFFFF",
         "borderColor": "#DFE1E4"
       },
       "SectionHeader": {
-        "background": "#f3f3f3",
+        "background": "#F7F8FA",
         "foreground": "#5B6168"
       },
       "Tab": {
         "hoverBackground": "#cce5ff",
-        "selectedForeground": "#FFFFFF",
+        "selectedForeground": "#111111",
         "selectedBackground": "#cce5ff"
       }
     },
@@ -466,20 +493,20 @@
         "borderColor": "#F7F8FA",
         "foreground": "#79CB60"
       },
-      "borderColor": "#fafbfc",
+      "borderColor": "#FFFFFF",
       "inactiveBorderColor": "#F7F8FA",
-      "innerBorderColor": "#f3f3f3",
+      "innerBorderColor": "#F7F8FA",
       "Header": {
         "activeBackground": "#F7F8FA",
-        "inactiveBackground": "#fafbfc"
+        "inactiveBackground": "#FFFFFF"
       },
       "paintBorder": true,
       "separatorForeground": "#5B6168",
-      "separatorColor": "#f3f3f3",
+      "separatorColor": "#F7F8FA",
       "Toolbar": {
-        "Floating.background": "#fafbfc",
-        "background": "#fafbfc",
-        "borderColor": "#fafbfc"
+        "Floating.background": "#FFFFFF",
+        "background": "#FFFFFF",
+        "borderColor": "#FFFFFF"
       }
     },
     "PopupMenu": {
@@ -504,7 +531,7 @@
     },
     "RadioButton": {
       "background": "#F7F8FA",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168"
     },
     "RadioButtonMenuItem": {
@@ -512,11 +539,12 @@
       "acceleratorSelectionForeground": "#292D31",
       "background": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#111111"
     },
+    "ScreenView.borderColor": "#DFE1E4",
     "ScrollBar": {
       "background": "#F7F8FA",
       "hoverThumbBorderColor": "#79CB60",
@@ -553,7 +581,7 @@
     },
     "SearchEverywhere": {
       "Advertiser": {
-        "background": "#fafbfc",
+        "background": "#FFFFFF",
         "foreground": "#292D31"
       },
       "Header": {
@@ -565,7 +593,7 @@
       },
       "SearchField": {
         "background": "#F7F8FA",
-        "borderColor": "#fafbfc",
+        "borderColor": "#FFFFFF",
         "infoForeground": "#292D31"
       },
       "Tab": {
@@ -576,16 +604,25 @@
     },
     "SearchMatch": {
       "endBackground": "#79CB60",
-      "startBackground": "#79CB60"
+      "startBackground": "#79CB60",
+      "endColor": "#79CB60",
+      "startColor": "#79CB60"
     },
     "SearchField.errorBackground": "#DFECFE",
+    "SearchOption": {
+      "selectedBackground": "#cce5ff"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#292D31",
+      "Repeated.File.Foreground": "#5B6168"
+    },
     "Separator": {
-      "background": "#f3f3f3",
-      "foreground": "#f3f3f3",
-      "separatorColor": "#f3f3f3"
+      "background": "#F7F8FA",
+      "foreground": "#F7F8FA",
+      "separatorColor": "#F7F8FA"
     },
     "SidePanel": {
-      "background": "#fafbfc"
+      "background": "#FFFFFF"
     },
     "Slider": {
       "background": "#F7F8FA",
@@ -593,7 +630,7 @@
       "buttonColor": "#79CB60",
       "foreground": "#5B6168",
       "majorTickLength": 6,
-      "tickColor": "#f3f3f3",
+      "tickColor": "#F7F8FA",
       "trackColor": "#cce5ff",
       "trackWidth": 7,
       "thumb": "#79CB60"
@@ -612,19 +649,21 @@
     },
     "SplitPane": {
       "background": "#F7F8FA",
-      "highlight": "#fafbfc"
+      "highlight": "#FFFFFF"
     },
-    "SplitPaneDivider.draggingColor": "#f3f3f3",
+    "SplitPaneDivider.draggingColor": "#F7F8FA",
     "StatusBar": {
-      "borderColor": "#F7F8FA"
+      "borderColor": "#F7F8FA",
+      "hoverBackground": "#CCE5FF",
+      "LightEditBackground": "#cce5ff"
     },
     "TabbedPane": {
       "background": "#F7F8FA",
       "contentAreaColor": "#CCE5FF",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#DFE1E4",
-      "disabledForeground": "#9ba0a3",
-      "disabledUnderlineColor": "#9ba0a3",
+      "disabledForeground": "#6C737C",
+      "disabledUnderlineColor": "#6C737C",
       "focus": "#cce5ff",
       "focusColor": "#cce5ff",
       "fontSizeOffset": 0,
@@ -641,11 +680,13 @@
       "tabSelectionHeight": 2,
       "underlineColor": "#79CB60"
     },
-    "TabbedPane.mt.tab.background": "#fafbfc",
+    "TabbedPane.mt.tab.background": "#FFFFFF",
     "Table": {
+      "alternativeRowBackground": "#FFFFFF",
       "background": "#F7F8FA",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#6C737C",
       "dropLineColor": "#79CB60",
       "dropLineShortColor": "#79CB60",
       "focusCellBackground": "#cce5ff",
@@ -653,57 +694,59 @@
       "foreground": "#5B6168",
       "gridColor": "#F7F8FA",
       "highlightOuter": "#cce5ff",
+      "hoverBackground": "#3A66D170",
+      "hoverInactiveBackground": "#cce5ff",
       "lightSelectionForeground": "#111111",
       "lightSelectionInactiveForeground": "#292D31",
-      "lightSelectionInactiveBackground": "#f3f3f3",
+      "lightSelectionInactiveBackground": "#F7F8FA",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111",
       "selectionInactiveBackground": "#cce5ff",
-      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#111111",
       "sortIconColor": "#5B6168",
-      "stripeColor": "#fafbfc"
+      "stripeColor": "#FFFFFF"
     },
     "TableHeader": {
       "background": "#F7F8FA",
       "borderColor": "#F7F8FA",
-      "bottomSeparatorColor": "#f3f3f3",
+      "bottomSeparatorColor": "#F7F8FA",
       "cellBorder": "4,0,4,0",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "focusCellBackground": "#cce5ff",
       "focusCellForeground": "#111111",
       "height": 25,
-      "separatorColor": "#f3f3f3"
+      "separatorColor": "#F7F8FA"
     },
     "text": "#292D31",
     "textInactiveText": "#292D31",
     "textText": "#292D31",
     "TextArea": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "TextField": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "TextPane": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "TitlePane": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "Button.hoverBackground": "#CCE5FF",
       "inactiveBackground": "#F7F8FA",
       "infoForeground": "#292D31",
@@ -711,9 +754,9 @@
     },
     "TitledBorder.titleColor": "#5B6168",
     "ToggleButton": {
-      "borderColor": "#edf1f5",
+      "borderColor": "#F1F3F6",
       "buttonColor": "#5B6168",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168",
       "offForeground": "#F7F8FA",
       "offBackground": "#F7F8FA",
@@ -721,7 +764,7 @@
       "onForeground": "#79CB60"
     },
     "ToolBar": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "borderHandleColor": "#292D31",
       "floatingForeground": "#292D31",
       "foreground": "#5B6168"
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#F7F8FA",
       "Actions.infoForeground": "#292D31",
-      "background": "#F7F8FA",
-      "borderColor": "#CCE5FF",
+      "background": "#DFECFE",
+      "borderColor": "#DFE1E4",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
       "separatorColor": "#DFE1E4",
@@ -740,61 +783,104 @@
       "Button": {
         "hoverBackground": "#cce5ff",
         "selectedForeground": "#111111",
-        "selectedBackground": "#fafbfc"
+        "selectedBackground": "#FFFFFF"
       },
       "Header": {
         "background": "#F7F8FA",
-        "borderColor": "#f3f3f3",
+        "borderColor": "#F7F8FA",
         "inactiveBackground": "#F7F8FA"
       },
       "HeaderCloseButton": {
         "background": "#F7F8FA"
       },
       "HeaderTab": {
+        "borderColor": "#CCE5FF",
         "hoverBackground": "#CCE5FF",
-        "hoverInactiveBackground": "#f3f3f3",
+        "hoverInactiveBackground": "#CCE5FF",
         "inactiveUnderlineColor": "#79CB60",
-        "selectedBackground": "#fafbfc",
-        "selectedInactiveBackground": "#fafbfc",
+        "selectedBackground": "#FFFFFF",
+        "selectedInactiveBackground": "#FFFFFF",
         "underlineColor": "#79CB60",
-        "underlinedTabBackground": "#CCE5FF",
-        "underlinedTabInactiveBackground": "#f3f3f3"
+        "underlinedTabBackground": "#cce5ff",
+        "underlinedTabInactiveBackground": "#F7F8FA",
+        "underlinedTabForeground": "#111111",
+        "underlinedTabInactiveForeground": "#5B6168"
       }
     },
     "Tree": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "foreground": "#292D31",
       "hash": "#DFE1E4",
+      "hoverBackground": "#3A66D170",
+      "hoverInactiveBackground": "#cce5ff",
       "modifiedItemForeground": "#79CB60",
       "rowHeight": 28,
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A66D1",
-      "textBackground": "#fafbfc"
+      "selectionBackground": "#3A66D170",
+      "selectionForeground": "#111111",
+      "selectionInactiveForeground": "#111111",
+      "selectionInactiveBackground": "#3A66D170",
+      "textBackground": "#FFFFFF"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#DFE1E4",
-      "ColorPicker.background": "#F7F8FA",
-      "ColorPicker.foreground": "#5B6168",
-      "Component.borderColor": "#DFE1E4",
-      "Component.background": "#F7F8FA",
-      "Component.foreground": "#5B6168",
-      "Connector.borderColor": "#DFE1E4",
-      "Connector.hoverBorderColor": "#CCE5FF",
-      "Canvas.background": "#fafbfc",
+      "Canvas.background": "#FFFFFF",
+      "ColorPicker": {
+        "background": "#F7F8FA",
+        "foreground": "#5B6168"
+      },
+      "Component": {
+        "borderColor": "#DFE1E4",
+        "background": "#F7F8FA",
+        "foreground": "#5B6168",
+        "hoverBorderColor": "#CCE5FF"
+      },
+      "Connector": {
+        "borderColor": "#DFE1E4",
+        "hoverBorderColor": "#CCE5FF"
+      },
+      "Canvas.background": "#FFFFFF",
       "highStroke.foreground": "#5B6168",
       "Label.foreground": "#292D31",
-      "List.selectionBackground": "#3A66D1",
-      "Panel.borderColor": "#DFE1E4",
-      "Panel.background": "#F7F8FA",
+      "List.selectionBackground": "#3A66D170",
+      "motion": {
+        "borderColor": "#DFE1E4",
+        "Component.foreground": "#5B6168",
+        "ConstraintSetText.foreground": "#292D31",
+        "ConstraintSet.background": "#F7F8FA",
+        "CSPanel.SelectedFocusBackground": "#3A66D1",
+        "CSPanel.SelectedBackground": "#3A66D170",
+        "cs_FocusText.infoForeground": "#292D31",
+        "CursorTextColor.foreground": "#5B6168",
+        "HoverColor.disabledBackground": "#6C737C",
+        "motionGraph.background": "#F7F8FA",
+        "Notification.background": "#DFECFE",
+        "ourAvg.background": "#F7F8FA",
+        "ourCS.background": "#F7F8FA",
+        "ourCS_Border.borderColor": "#DFE1E4",
+        "ourCS_TextColor.foreground": "#292D31",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#111111",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#cce5ff",
+        "ourCS_SelectedBorder.pressedBorderColor": "#CCE5FF",
+        "ourML_BarColor.separatorColor": "#DFE1E4",
+        "PrimaryPanel.background": "#FFFFFF",
+        "SecondaryPanel.background": "#F7F8FA",
+        "SecondaryPanel.header.foreground": "#292D31",
+        "SecondaryPanel.header.background": "#FFFFFF",
+        "timeLine.disabledBorderColor": "#DFE1E4"
+      },
+      "Panel": {
+        "borderColor": "#DFE1E4",
+        "background": "#F7F8FA"
+      },
       "percent.foreground": "#5B6168",
-      "Placeholder.background": "#F7F8FA",
-      "Placeholder.borderColor": "#DFE1E4",
-      "Placeholder.foreground": "#5B6168",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#F7F8FA",
+        "borderColor": "#DFE1E4",
+        "foreground": "#5B6168",
+        "selectedForeground": "#111111"
+      },
       "Preview.background": "#F7F8FA",
       "stroke.acceleratorForeground": "#292D31"
     },
@@ -820,7 +906,7 @@
       "HgLog": {
         "branchIconColor": "#79CB60",
         "bookmarkIconColor": "#111111",
-        "closedBranchIconColor": "#9ba0a3",
+        "closedBranchIconColor": "#6C737C",
         "localTagIconColor": "#292D31",
         "mqTagIconColor": "#292D31",
         "tagIconColor": "#292D31",
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#292D31",
-        "Commit.currentBranchBackground": "#f3f3f3"
+        "Commit.currentBranchBackground": "#F7F8FA",
+        "Commit.hoveredBackground": "#3A66D170"
       },
       "RefLabel": {
         "foreground": "#111111",
@@ -836,40 +923,46 @@
       }
     },
     "Viewport": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "foreground": "#5B6168"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#F7F8FA",
       "background": "#F7F8FA",
       "borderColor": "#F7F8FA",
-      "captionBackground": "#fafbfc",
+      "captionBackground": "#FFFFFF",
       "captionForeground": "#5B6168",
-      "footerBackground": "#fafbfc",
+      "Details.background": "#F7F8FA",
+      "footerBackground": "#FFFFFF",
       "footerForeground": "#5B6168",
       "headerBackground": "#F7F8FA",
       "headerForeground": "#5B6168",
+      "List.background": "#FFFFFF",
       "separatorColor": "#DFE1E4",
+      "SidePanel.background": "#F7F8FA",
       "Projects": {
-        "background": "#f3f3f3",
+        "actions.background": "#FFFFFF",
+        "actions.selectionBackground": "#CCE5FF",
+        "background": "#F7F8FA",
         "selectionBackground": "#3A66D1",
-        "selectionInactiveBackground": "#f3f3f3"
+        "selectionInactiveBackground": "#F7F8FA"
       }
     },
-    "window": "#fafbfc",
+    "window": "#FFFFFF",
     "windowBorder": "#DFE1E4",
     "windowText": "#292D31",
     "Window.border": "#DFE1E4"
   },
   "icons": {
     "ColorPalette": {
-      "#43494A": "#fafbfc",
+      "#43494A": "#FFFFFF",
       "#6B6B6B": "#292D31",
       "#A7A7A7": "#F7F8FA",
       "#3D6185": "#79CB60",
       "#466D94": "#79CB60",
       "#3C3F41": "#F7F8FA",
-      "#545556": "#9ba0a3",
-      "#606060": "#9ba0a3",
+      "#545556": "#6C737C",
+      "#606060": "#6C737C",
       "#9AA7B0": "#5B6168",
       "#675133": "#79CB60",
       "Actions.Blue": "#6F42C1",
@@ -879,20 +972,20 @@
       "Actions.GreyInline.Dark": "#5B6168",
       "Actions.Red": "#22863A",
       "Actions.Yellow": "#6F42C1",
-      "Checkbox.Background.Default": "#fafbfc",
-      "Checkbox.Background.Default.Dark": "#fafbfc",
-      "Checkbox.Background.Disabled": "#dcdcdc",
-      "Checkbox.Background.Disabled.Dark": "#dcdcdc",
+      "Checkbox.Background.Default": "#FFFFFF",
+      "Checkbox.Background.Default.Dark": "#FFFFFF",
+      "Checkbox.Background.Disabled": "#FDFDFD",
+      "Checkbox.Background.Disabled.Dark": "#FDFDFD",
       "Checkbox.Border.Default": "#DFE1E4",
       "Checkbox.Border.Default.Dark": "#DFE1E4",
-      "Checkbox.Border.Disabled": "#9ba0a3",
-      "Checkbox.Border.Disabled.Dark": "#9ba0a3",
+      "Checkbox.Border.Disabled": "#6C737C",
+      "Checkbox.Border.Disabled.Dark": "#6C737C",
       "Checkbox.Focus.Thin.Default": "#79CB60",
       "Checkbox.Focus.Thin.Default.Dark": "#79CB60",
       "Checkbox.Focus.Wide": "#79CB60",
       "Checkbox.Focus.Wide.Dark": "#79CB60",
-      "Checkbox.Foreground.Disabled": "#9ba0a3",
-      "Checkbox.Foreground.Disabled.Dark": "#9ba0a3",
+      "Checkbox.Foreground.Disabled": "#6C737C",
+      "Checkbox.Foreground.Disabled.Dark": "#6C737C",
       "Checkbox.Background.Selected": "#79CB60",
       "Checkbox.Background.Selected.Dark": "#F7F8FA",
       "Checkbox.Border.Selected": "#79CB60",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json

@@ -2,32 +2,38 @@
   "name": "GitHub",
   "dark": false,
   "author": "Mallowigi",
-  "editorScheme": "/colors/Github.xml",
+  "editorScheme": "/colors/GitHub (Material).xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/github.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#292D31",
       "background": "#F7F8FA",
       "borderColor": "#DFE1E4",
-      "disabledBackground": "#dcdcdc",
-      "disabledForeground": "#9ba0a3",
-      "disabledText": "#9ba0a3",
+      "disabledBackground": "#FDFDFD",
+      "disabledForeground": "#6C737C",
+      "disabledText": "#6C737C",
       "focusColor": "#CCE5FF",
       "focusedBorderColor": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveBackground": "#dcdcdc",
+      "inactiveBackground": "#FDFDFD",
       "inactiveForeground": "#292D31",
       "infoForeground": "#292D31",
       "selectionBackground": "#3A66D1",
-      "selectionBackgroundInactive": "#f3f3f3",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#f3f3f3",
+      "selectionBackgroundInactive": "#F7F8FA",
+      "selectionForeground": "#111111",
+      "selectionInactiveBackground": "#F7F8FA",
       "separatorColor": "#DFE1E4"
     },
     "activeCaption": "#F7F8FA",
     "ActionButton": {
       "hoverBackground": "#79CB6050",
       "hoverBorderColor": "#79CB6050",
-      "hoverSeparatorColor": "#edf1f5",
+      "hoverSeparatorColor": "#F1F3F6",
       "focusedBorderColor": "#79CB6050",
       "pressedBackground": "#79CB6050",
       "pressedBorderColor": "#79CB6050"
@@ -50,32 +56,35 @@
         "startBackground": "#cce5ff",
         "startBorderColor": "#cce5ff"
       },
-      "disabledBorderColor": "#edf1f5",
-      "disabledText": "#9ba0a3",
-      "endBackground": "#edf1f5",
-      "endBorderColor": "#edf1f5",
+      "disabledBorderColor": "#F1F3F6",
+      "disabledText": "#6C737C",
+      "endBackground": "#F1F3F6",
+      "endBorderColor": "#F1F3F6",
       "focus": "#CCE5FF",
       "focusedBorderColor": "#79CB60",
       "foreground": "#292D31",
-      "highlight": "#FFFFFF",
-      "mt.background": "#edf1f5",
+      "highlight": "#111111",
+      "mt.background": "#F1F3F6",
       "mt.foreground": "#292D31",
-      "mt.selectedForeground": "#FFFFFF",
+      "mt.selectedForeground": "#111111",
       "mt.selection.color1": "#cce5ff",
       "mt.selection.color2": "#cce5ff",
-      "startBackground": "#edf1f5",
-      "startBorderColor": "#edf1f5",
-      "shadowColor": "#edf1f5",
+      "startBackground": "#F1F3F6",
+      "startBorderColor": "#F1F3F6",
+      "shadowColor": "#F1F3F6",
       "shadowWidth": 0
     },
     "Canvas": {
       "Tooltip.borderColor": "#DFE1E4",
       "Tooltip.background": "#DFECFE"
     },
-    "Content.background": "#fafbfc",
+    "Content": {
+      "background": "#FFFFFF",
+      "selectionBackground": "#3A66D1"
+    },
     "CheckBox": {
       "background": "#F7F8FA",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168",
       "select": "#79CB60"
     },
@@ -84,54 +93,63 @@
       "acceleratorSelectionForeground": "#292D31",
       "background": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
       "selectionForeground": "#111111"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#5B6168",
+      "AccessEnabled": {
+        "accessDot": "#79CB60",
+        "dropdownBorder": "#F7F8FA",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#F7F8FA",
       "foreground": "#5B6168",
       "swatchesDefaultRecentColor": "#5B6168"
     },
-    "ComboBoxButton.background": "#edf1f5",
+    "ComboBoxButton.background": "#F1F3F6",
     "ComboBox": {
       "ArrowButton": {
-        "background": "#edf1f5",
-        "disabledIconColor": "#9ba0a3",
+        "background": "#F1F3F6",
+        "disabledIconColor": "#6C737C",
         "iconColor": "#5B6168",
         "nonEditableBackground": "#F7F8FA"
       },
       "background": "#F7F8FA",
-      "buttonBackground": "#edf1f5",
-      "disabledForeground": "#9ba0a3",
+      "buttonBackground": "#F1F3F6",
+      "darcula.hoveredArrowButtonForeground": "#79CB60",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "modifiedItemForeground": "#79CB60",
-      "nonEditableBackground": "#f3f3f3",
+      "nonEditableBackground": "#F7F8FA",
       "padding": "5,5,5,5",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "ComboPopup.border": "#DFE1E4",
     "CompletionPopup": {
-      "background": "#f3f3f3",
+      "background": "#F7F8FA",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
       "matchForeground": "#79CB60",
       "matchSelectionForeground": "#79CB60",
       "nonFocusedState": "false",
-      "selectedGrayedForeground": "#FFFFFF",
-      "selectionGrayForeground": "#FFFFFF",
+      "selectedGrayedForeground": "#111111",
+      "selectionGrayForeground": "#111111",
       "selectionInactiveInfoForeground": "#292D31",
       "selectionInactiveBackground": "#3A66D150",
       "selectionBackground": "#3A66D180",
-      "selectionForeground": "#FFFFFF",
-      "selectionInfoForeground": "#FFFFFF"
+      "selectionForeground": "#111111",
+      "selectionInfoForeground": "#111111"
     },
     "Component": {
       "arc": 4,
       "borderColor": "#CCE5FF",
-      "disabledBorderColor": "#edf1f5",
+      "disabledBorderColor": "#F1F3F6",
       "focusColor": "#79CB60",
       "focusedBorderColor": "#79CB60",
       "hoverIconColor": "#79CB60",
@@ -142,7 +160,7 @@
     "controlText": "#292D31",
     "Counter": {
       "background": "#79CB60",
-      "foreground": "#FFFFFF"
+      "foreground": "#111111"
     },
     "Debugger": {
       "Variables": {
@@ -168,11 +186,13 @@
       "hoverBackground": "#cce5ff",
       "hoverColor": "#F7F8FA",
       "hoverMaskColor": "#CCE5FF",
-      "inactiveColoredFileBackground": "#edf1f5",
-      "inactiveUnderlineColor": "#9ba0a3",
+      "inactiveColoredTabBackground": "#F7F8FA",
+      "inactiveColoredFileBackground": "#F1F3F6",
+      "inactiveUnderlineColor": "#79CB60",
       "inactiveMaskColor": "#F7F8FA",
       "underlineColor": "#79CB60",
-      "underlinedTabBackground": "#cce5ff"
+      "underlinedTabBackground": "#cce5ff",
+      "underlinedTabForeground": "#111111"
     },
     "Desktop.background": "#F7F8FA",
     "DialogWrapper.southPanelBackground": "#F7F8FA",
@@ -192,25 +212,27 @@
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
       "inactiveBackground": "#F7F8FA",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#3A66D1",
       "selectionForeground": "#111111"
     },
     "EditorTabs": {
-      "borderColor": "#f3f3f3",
+      "borderColor": "#F7F8FA",
+      "hoverBackground": "#CCE5FF",
       "hoverColor": "#CCE5FF",
       "hoverMaskColor": "#CCE5FF",
       "inactiveMaskColor": "#F7F8FA",
-      "inactiveColoredFileBackground": "#F7F8FA2",
-      "inactiveUnderlineColor": "#9ba0a3",
+      "inactiveColoredFileBackground": "#F7F8FA",
+      "inactiveUnderlineColor": "#6C737C",
       "selectedForeground": "#5B6168",
       "selectedBackground": "#cce5ff",
       "underlineColor": "#79CB60",
-      "underlinedTabBackground": "#cce5ff"
+      "underlinedTabBackground": "#cce5ff",
+      "underlinedTabForeground": "#111111"
     },
     "EditorGroupsTabs": {
       "background": "#F7F8FA",
-      "borderColor": "#f3f3f3",
+      "borderColor": "#F7F8FA",
       "hoverBackground": "#CCE5FF",
       "hoverColor": "#CCE5FF",
       "inactiveUnderlineColor": "#79CB60",
@@ -221,7 +243,7 @@
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#dcdcdc",
+      "Yellow": "#FDFDFD",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -241,22 +263,23 @@
       "background": "#F7F8FA",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveBackground": "#edf1f5",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveBackground": "#F1F3F6",
+      "inactiveForeground": "#6C737C",
       "selectionForeground": "#111111",
       "selectionBackground": "#cce5ff"
     },
+    "GotItTooltip.borderColor": "#DFECFE",
     "Group": {
       "disabledSeparatorColor": "#DFE1E4",
       "separatorColor": "#DFE1E4"
     },
     "GutterTooltip": {
-      "infoForeground": "#5B6168",
+      "infoForeground": "#292D31",
       "lineSeparatorColor": "#F7F8FA"
     },
     "HeaderColor": {
       "active": "#F7F8FA",
-      "inactive": "#fafbfc"
+      "inactive": "#FFFFFF"
     },
     "HelpTooltip": {
       "background": "#F7F8FA",
@@ -266,7 +289,7 @@
       "shortcutForeground": "#292D31"
     },
     "Hyperlink.linkColor": "#79CB60",
-    "inactiveCaption": "#f3f3f3",
+    "inactiveCaption": "#F7F8FA",
     "inactiveCaptionBorder": "#F7F8FA",
     "inactiveCaptionText": "#292D31",
     "info": "#292D31",
@@ -283,12 +306,13 @@
     },
     "Label": {
       "background": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "disabledShadow": "#F7F8FA",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
-      "selectedForeground": "#111111"
+      "selectedForeground": "#111111",
+      "selectedDisabledForeground": "#5B6168"
     },
     "Link": {
       "activeForeground": "#79CB60",
@@ -299,64 +323,66 @@
     },
     "link.foreground": "#79CB60",
     "List": {
-      "background": "#f3f3f3",
+      "background": "#F7F8FA",
       "foreground": "#5B6168",
+      "hoverBackground": "#3A66D170",
+      "hoverInactiveBackground": "#cce5ff",
       "selectionBackground": "#3A66D150",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#111111",
       "selectionInactiveForeground": "#111111",
-      "selectionInactiveBackground": "#3A66D1"
+      "selectionInactiveBackground": "#3A66D170"
     },
     "material": {
       "background": "#F7F8FA",
       "branchColor": "#5B6168",
-      "contrast": "#fafbfc",
+      "contrast": "#FFFFFF",
       "foreground": "#5B6168",
-      "mergeCommits": "#edf1f5",
+      "mergeCommits": "#F1F3F6",
       "primaryColor": "#292D31",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#111111",
       "tab.backgroundColor": "#F7F8FA",
       "tab.borderColor": "#79CB60",
       "tagColor": "#292D31"
     },
     "MemoryIndicator": {
-      "allocatedBackground": "#f3f3f3",
+      "allocatedBackground": "#F7F8FA",
       "usedColor": "#CCE5FF",
       "usedBackground": "#CCE5FF"
     },
     "Menu": {
       "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#111111",
       "background": "#F7F8FA",
       "border": "4,2,4,2",
-      "borderColor": "#f3f3f3",
-      "disabledBackground": "#f3f3f3",
-      "disabledForeground": "#9ba0a3",
+      "borderColor": "#F7F8FA",
+      "disabledBackground": "#F7F8FA",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#111111",
       "separatorColor": "#DFE1E4"
     },
     "MenuBar": {
       "background": "#F7F8FA",
       "borderColor": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "highlight": "#F7F8FA",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF",
+      "selectionForeground": "#111111",
       "shadow": "#F7F8FA"
     },
     "MenuItem": {
       "acceleratorForeground": "#292D31",
-      "acceleratorSelectionForeground": "#FFFFFF",
+      "acceleratorSelectionForeground": "#111111",
       "border": "4,2,4,2",
       "background": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#111111"
     },
     "NavBar": {
       "arrowColor": "#5B6168",
@@ -378,9 +404,9 @@
       "errorBorderColor": "#DFECFE",
       "foreground": "#5B6168",
       "MoreButton": {
-        "background": "#edf1f5",
+        "background": "#F1F3F6",
         "foreground": "#5B6168",
-        "innerBorderColor": "#edf1f5"
+        "innerBorderColor": "#F1F3F6"
       },
       "ToolWindow": {
         "errorBackground": "#DFECFE",
@@ -398,20 +424,20 @@
       "messageForeground": "#5B6168"
     },
     "Outline": {
-      "color": "#edf1f5",
+      "color": "#F1F3F6",
       "focusedColor": "#79CB60",
-      "disabledColor": "#9ba0a3"
+      "disabledColor": "#6C737C"
     },
     "Panel": {
       "background": "#F7F8FA",
       "foreground": "#5B6168"
     },
     "ParameterInfo": {
-      "background": "#f3f3f3",
+      "background": "#F7F8FA",
       "borderColor": "#cce5ff",
-      "currentOverloadBackground": "#cce5ff",
+      "currentOverloadBackground": "#CCE5FF",
       "currentParameterForeground": "#79CB60",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
       "lineSeparatorColor": "#cce5ff"
@@ -421,29 +447,30 @@
       "capsLockIconColor": "#79CB60",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "Plugins": {
       "background": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "eapTagBackground": "#CCE5FF",
-      "lightSelectionBackground": "#3A66D1",
+      "hoverBackground": "#3A66D170",
+      "lightSelectionBackground": "#cce5ff",
       "paidTagBackground": "#CCE5FF",
       "selectionBackground": "#3A66D1",
       "tagForeground": "#79CB60",
       "tagBackground": "#CCE5FF",
       "trialTagBackground": "#CCE5FF",
       "Button": {
-        "installBackground": "#edf1f5",
-        "installBorderColor": "#edf1f5",
+        "installBackground": "#F1F3F6",
+        "installBorderColor": "#F1F3F6",
         "installForeground": "#5B6168",
         "installFocusedBackground": "#CCE5FF",
-        "installFillForeground": "#9ba0a3",
-        "installFillBackground": "#edf1f5",
-        "updateBackground": "#edf1f5",
-        "updateBorderColor": "#edf1f5",
+        "installFillForeground": "#6C737C",
+        "installFillBackground": "#F1F3F6",
+        "updateBackground": "#79CB60",
+        "updateBorderColor": "#F1F3F6",
         "updateForeground": "#5B6168"
       },
       "SearchField": {
@@ -451,12 +478,12 @@
         "borderColor": "#DFE1E4"
       },
       "SectionHeader": {
-        "background": "#f3f3f3",
+        "background": "#F7F8FA",
         "foreground": "#5B6168"
       },
       "Tab": {
         "hoverBackground": "#cce5ff",
-        "selectedForeground": "#FFFFFF",
+        "selectedForeground": "#111111",
         "selectedBackground": "#cce5ff"
       }
     },
@@ -466,20 +493,20 @@
         "borderColor": "#F7F8FA",
         "foreground": "#79CB60"
       },
-      "borderColor": "#fafbfc",
+      "borderColor": "#FFFFFF",
       "inactiveBorderColor": "#F7F8FA",
-      "innerBorderColor": "#f3f3f3",
+      "innerBorderColor": "#F7F8FA",
       "Header": {
         "activeBackground": "#F7F8FA",
-        "inactiveBackground": "#fafbfc"
+        "inactiveBackground": "#FFFFFF"
       },
       "paintBorder": true,
       "separatorForeground": "#5B6168",
-      "separatorColor": "#f3f3f3",
+      "separatorColor": "#F7F8FA",
       "Toolbar": {
-        "Floating.background": "#fafbfc",
-        "background": "#fafbfc",
-        "borderColor": "#fafbfc"
+        "Floating.background": "#FFFFFF",
+        "background": "#FFFFFF",
+        "borderColor": "#FFFFFF"
       }
     },
     "PopupMenu": {
@@ -504,7 +531,7 @@
     },
     "RadioButton": {
       "background": "#F7F8FA",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168"
     },
     "RadioButtonMenuItem": {
@@ -512,11 +539,12 @@
       "acceleratorSelectionForeground": "#292D31",
       "background": "#F7F8FA",
       "disabledBackground": "#F7F8FA",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF"
+      "selectionForeground": "#111111"
     },
+    "ScreenView.borderColor": "#DFE1E4",
     "ScrollBar": {
       "background": "#F7F8FA",
       "hoverThumbBorderColor": "#79CB60",
@@ -553,7 +581,7 @@
     },
     "SearchEverywhere": {
       "Advertiser": {
-        "background": "#fafbfc",
+        "background": "#FFFFFF",
         "foreground": "#292D31"
       },
       "Header": {
@@ -565,7 +593,7 @@
       },
       "SearchField": {
         "background": "#F7F8FA",
-        "borderColor": "#fafbfc",
+        "borderColor": "#FFFFFF",
         "infoForeground": "#292D31"
       },
       "Tab": {
@@ -576,13 +604,22 @@
     },
     "SearchMatch": {
       "endBackground": "#79CB60",
-      "startBackground": "#79CB60"
+      "startBackground": "#79CB60",
+      "endColor": "#79CB60",
+      "startColor": "#79CB60"
     },
     "SearchField.errorBackground": "#DFECFE",
+    "SearchOption": {
+      "selectedBackground": "#cce5ff"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#292D31",
+      "Repeated.File.Foreground": "#5B6168"
+    },
     "Separator": {
-      "background": "#f3f3f3",
-      "foreground": "#f3f3f3",
-      "separatorColor": "#f3f3f3"
+      "background": "#F7F8FA",
+      "foreground": "#F7F8FA",
+      "separatorColor": "#F7F8FA"
     },
     "SidePanel": {
       "background": "#F7F8FA"
@@ -593,7 +630,7 @@
       "buttonColor": "#79CB60",
       "foreground": "#5B6168",
       "majorTickLength": 6,
-      "tickColor": "#f3f3f3",
+      "tickColor": "#F7F8FA",
       "trackColor": "#cce5ff",
       "trackWidth": 7,
       "thumb": "#79CB60"
@@ -614,17 +651,19 @@
       "background": "#F7F8FA",
       "highlight": "#F7F8FA"
     },
-    "SplitPaneDivider.draggingColor": "#f3f3f3",
+    "SplitPaneDivider.draggingColor": "#F7F8FA",
     "StatusBar": {
-      "borderColor": "#F7F8FA"
+      "borderColor": "#F7F8FA",
+      "hoverBackground": "#CCE5FF",
+      "LightEditBackground": "#cce5ff"
     },
     "TabbedPane": {
       "background": "#F7F8FA",
       "contentAreaColor": "#CCE5FF",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#DFE1E4",
-      "disabledForeground": "#9ba0a3",
-      "disabledUnderlineColor": "#9ba0a3",
+      "disabledForeground": "#6C737C",
+      "disabledUnderlineColor": "#6C737C",
       "focus": "#cce5ff",
       "focusColor": "#cce5ff",
       "fontSizeOffset": 0,
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#F7F8FA",
     "Table": {
+      "alternativeRowBackground": "#FFFFFF",
       "background": "#F7F8FA",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#6C737C",
       "dropLineColor": "#79CB60",
       "dropLineShortColor": "#79CB60",
       "focusCellBackground": "#cce5ff",
@@ -653,27 +694,29 @@
       "foreground": "#5B6168",
       "gridColor": "#F7F8FA",
       "highlightOuter": "#cce5ff",
+      "hoverBackground": "#3A66D170",
+      "hoverInactiveBackground": "#cce5ff",
       "lightSelectionForeground": "#111111",
       "lightSelectionInactiveForeground": "#292D31",
-      "lightSelectionInactiveBackground": "#f3f3f3",
+      "lightSelectionInactiveBackground": "#F7F8FA",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111",
       "selectionInactiveBackground": "#cce5ff",
-      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveForeground": "#111111",
       "sortIconColor": "#5B6168",
-      "stripeColor": "#fafbfc"
+      "stripeColor": "#FFFFFF"
     },
     "TableHeader": {
       "background": "#F7F8FA",
       "borderColor": "#F7F8FA",
-      "bottomSeparatorColor": "#f3f3f3",
+      "bottomSeparatorColor": "#F7F8FA",
       "cellBorder": "4,0,4,0",
-      "disabledForeground": "#9ba0a3",
+      "disabledForeground": "#6C737C",
       "foreground": "#5B6168",
       "focusCellBackground": "#cce5ff",
       "focusCellForeground": "#111111",
       "height": 25,
-      "separatorColor": "#f3f3f3"
+      "separatorColor": "#F7F8FA"
     },
     "text": "#292D31",
     "textInactiveText": "#292D31",
@@ -682,7 +725,7 @@
       "background": "#F7F8FA",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
@@ -690,7 +733,7 @@
       "background": "#F7F8FA",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
@@ -698,12 +741,12 @@
       "background": "#F7F8FA",
       "caretForeground": "#79CB60",
       "foreground": "#5B6168",
-      "inactiveForeground": "#9ba0a3",
+      "inactiveForeground": "#6C737C",
       "selectionBackground": "#cce5ff",
       "selectionForeground": "#111111"
     },
     "TitlePane": {
-      "background": "#fafbfc",
+      "background": "#FFFFFF",
       "Button.hoverBackground": "#CCE5FF",
       "inactiveBackground": "#F7F8FA",
       "infoForeground": "#292D31",
@@ -711,9 +754,9 @@
     },
     "TitledBorder.titleColor": "#5B6168",
     "ToggleButton": {
-      "borderColor": "#edf1f5",
+      "borderColor": "#F1F3F6",
       "buttonColor": "#5B6168",
-      "disabledText": "#9ba0a3",
+      "disabledText": "#6C737C",
       "foreground": "#5B6168",
       "offForeground": "#F7F8FA",
       "offBackground": "#F7F8FA",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#F7F8FA",
       "Actions.infoForeground": "#292D31",
-      "background": "#F7F8FA",
-      "borderColor": "#CCE5FF",
+      "background": "#DFECFE",
+      "borderColor": "#DFE1E4",
       "foreground": "#5B6168",
       "infoForeground": "#292D31",
       "separatorColor": "#DFE1E4",
@@ -740,61 +783,104 @@
       "Button": {
         "hoverBackground": "#cce5ff",
         "selectedForeground": "#111111",
-        "selectedBackground": "#fafbfc"
+        "selectedBackground": "#FFFFFF"
       },
       "Header": {
         "background": "#F7F8FA",
-        "borderColor": "#f3f3f3",
+        "borderColor": "#F7F8FA",
         "inactiveBackground": "#F7F8FA"
       },
       "HeaderCloseButton": {
         "background": "#F7F8FA"
       },
       "HeaderTab": {
+        "borderColor": "#CCE5FF",
         "hoverBackground": "#CCE5FF",
-        "hoverInactiveBackground": "#f3f3f3",
+        "hoverInactiveBackground": "#CCE5FF",
         "inactiveUnderlineColor": "#79CB60",
-        "selectedBackground": "#fafbfc",
-        "selectedInactiveBackground": "#fafbfc",
+        "selectedBackground": "#FFFFFF",
+        "selectedInactiveBackground": "#FFFFFF",
         "underlineColor": "#79CB60",
-        "underlinedTabBackground": "#CCE5FF",
-        "underlinedTabInactiveBackground": "#f3f3f3"
+        "underlinedTabBackground": "#cce5ff",
+        "underlinedTabInactiveBackground": "#F7F8FA",
+        "underlinedTabForeground": "#111111",
+        "underlinedTabInactiveForeground": "#5B6168"
       }
     },
     "Tree": {
       "background": "#F7F8FA",
       "foreground": "#292D31",
       "hash": "#DFE1E4",
+      "hoverBackground": "#3A66D170",
+      "hoverInactiveBackground": "#cce5ff",
       "modifiedItemForeground": "#79CB60",
       "rowHeight": 28,
-      "selectionBackground": "#3A66D1",
-      "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#3A66D1",
+      "selectionBackground": "#3A66D170",
+      "selectionForeground": "#111111",
+      "selectionInactiveForeground": "#111111",
+      "selectionInactiveBackground": "#3A66D170",
       "textBackground": "#F7F8FA"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#DFE1E4",
-      "ColorPicker.background": "#F7F8FA",
-      "ColorPicker.foreground": "#5B6168",
-      "Component.borderColor": "#DFE1E4",
-      "Component.background": "#F7F8FA",
-      "Component.foreground": "#5B6168",
-      "Connector.borderColor": "#DFE1E4",
-      "Connector.hoverBorderColor": "#CCE5FF",
-      "Canvas.background": "#fafbfc",
+      "Canvas.background": "#FFFFFF",
+      "ColorPicker": {
+        "background": "#F7F8FA",
+        "foreground": "#5B6168"
+      },
+      "Component": {
+        "borderColor": "#DFE1E4",
+        "background": "#F7F8FA",
+        "foreground": "#5B6168",
+        "hoverBorderColor": "#CCE5FF"
+      },
+      "Connector": {
+        "borderColor": "#DFE1E4",
+        "hoverBorderColor": "#CCE5FF"
+      },
+      "Canvas.background": "#FFFFFF",
       "highStroke.foreground": "#5B6168",
       "Label.foreground": "#292D31",
-      "List.selectionBackground": "#3A66D1",
-      "Panel.borderColor": "#DFE1E4",
-      "Panel.background": "#F7F8FA",
+      "List.selectionBackground": "#3A66D170",
+      "motion": {
+        "borderColor": "#DFE1E4",
+        "Component.foreground": "#5B6168",
+        "ConstraintSetText.foreground": "#292D31",
+        "ConstraintSet.background": "#F7F8FA",
+        "CSPanel.SelectedFocusBackground": "#3A66D1",
+        "CSPanel.SelectedBackground": "#3A66D170",
+        "cs_FocusText.infoForeground": "#292D31",
+        "CursorTextColor.foreground": "#5B6168",
+        "HoverColor.disabledBackground": "#6C737C",
+        "motionGraph.background": "#F7F8FA",
+        "Notification.background": "#DFECFE",
+        "ourAvg.background": "#F7F8FA",
+        "ourCS.background": "#F7F8FA",
+        "ourCS_Border.borderColor": "#DFE1E4",
+        "ourCS_TextColor.foreground": "#292D31",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#111111",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#cce5ff",
+        "ourCS_SelectedBorder.pressedBorderColor": "#CCE5FF",
+        "ourML_BarColor.separatorColor": "#DFE1E4",
+        "PrimaryPanel.background": "#FFFFFF",
+        "SecondaryPanel.background": "#F7F8FA",
+        "SecondaryPanel.header.foreground": "#292D31",
+        "SecondaryPanel.header.background": "#FFFFFF",
+        "timeLine.disabledBorderColor": "#DFE1E4"
+      },
+      "Panel": {
+        "borderColor": "#DFE1E4",
+        "background": "#F7F8FA"
+      },
       "percent.foreground": "#5B6168",
-      "Placeholder.background": "#F7F8FA",
-      "Placeholder.borderColor": "#DFE1E4",
-      "Placeholder.foreground": "#5B6168",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#F7F8FA",
+        "borderColor": "#DFE1E4",
+        "foreground": "#5B6168",
+        "selectedForeground": "#111111"
+      },
       "Preview.background": "#F7F8FA",
       "stroke.acceleratorForeground": "#292D31"
     },
@@ -820,7 +906,7 @@
       "HgLog": {
         "branchIconColor": "#79CB60",
         "bookmarkIconColor": "#111111",
-        "closedBranchIconColor": "#9ba0a3",
+        "closedBranchIconColor": "#6C737C",
         "localTagIconColor": "#292D31",
         "mqTagIconColor": "#292D31",
         "tagIconColor": "#292D31",
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#292D31",
-        "Commit.currentBranchBackground": "#f3f3f3"
+        "Commit.currentBranchBackground": "#F7F8FA",
+        "Commit.hoveredBackground": "#3A66D170"
       },
       "RefLabel": {
         "foreground": "#111111",
@@ -840,19 +927,25 @@
       "foreground": "#5B6168"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#F7F8FA",
       "background": "#F7F8FA",
       "borderColor": "#F7F8FA",
-      "captionBackground": "#fafbfc",
+      "captionBackground": "#FFFFFF",
       "captionForeground": "#5B6168",
-      "footerBackground": "#fafbfc",
+      "Details.background": "#F7F8FA",
+      "footerBackground": "#FFFFFF",
       "footerForeground": "#5B6168",
       "headerBackground": "#F7F8FA",
       "headerForeground": "#5B6168",
+      "List.background": "#FFFFFF",
       "separatorColor": "#DFE1E4",
+      "SidePanel.background": "#F7F8FA",
       "Projects": {
-        "background": "#f3f3f3",
+        "actions.background": "#FFFFFF",
+        "actions.selectionBackground": "#CCE5FF",
+        "background": "#F7F8FA",
         "selectionBackground": "#3A66D1",
-        "selectionInactiveBackground": "#f3f3f3"
+        "selectionInactiveBackground": "#F7F8FA"
       }
     },
     "window": "#F7F8FA",
@@ -862,14 +955,14 @@
   },
   "icons": {
     "ColorPalette": {
-      "#43494A": "#fafbfc",
+      "#43494A": "#FFFFFF",
       "#6B6B6B": "#292D31",
       "#A7A7A7": "#F7F8FA",
       "#3D6185": "#79CB60",
       "#466D94": "#79CB60",
       "#3C3F41": "#F7F8FA",
-      "#545556": "#9ba0a3",
-      "#606060": "#9ba0a3",
+      "#545556": "#6C737C",
+      "#606060": "#6C737C",
       "#9AA7B0": "#5B6168",
       "#675133": "#79CB60",
       "Actions.Blue": "#6F42C1",
@@ -879,20 +972,20 @@
       "Actions.GreyInline.Dark": "#5B6168",
       "Actions.Red": "#22863A",
       "Actions.Yellow": "#6F42C1",
-      "Checkbox.Background.Default": "#fafbfc",
-      "Checkbox.Background.Default.Dark": "#fafbfc",
-      "Checkbox.Background.Disabled": "#dcdcdc",
-      "Checkbox.Background.Disabled.Dark": "#dcdcdc",
+      "Checkbox.Background.Default": "#FFFFFF",
+      "Checkbox.Background.Default.Dark": "#FFFFFF",
+      "Checkbox.Background.Disabled": "#FDFDFD",
+      "Checkbox.Background.Disabled.Dark": "#FDFDFD",
       "Checkbox.Border.Default": "#DFE1E4",
       "Checkbox.Border.Default.Dark": "#DFE1E4",
-      "Checkbox.Border.Disabled": "#9ba0a3",
-      "Checkbox.Border.Disabled.Dark": "#9ba0a3",
+      "Checkbox.Border.Disabled": "#6C737C",
+      "Checkbox.Border.Disabled.Dark": "#6C737C",
       "Checkbox.Focus.Thin.Default": "#79CB60",
       "Checkbox.Focus.Thin.Default.Dark": "#79CB60",
       "Checkbox.Focus.Wide": "#79CB60",
       "Checkbox.Focus.Wide.Dark": "#79CB60",
-      "Checkbox.Foreground.Disabled": "#9ba0a3",
-      "Checkbox.Foreground.Disabled.Dark": "#9ba0a3",
+      "Checkbox.Foreground.Disabled": "#6C737C",
+      "Checkbox.Foreground.Disabled.Dark": "#6C737C",
       "Checkbox.Background.Selected": "#79CB60",
       "Checkbox.Background.Selected.Dark": "#F7F8FA",
       "Checkbox.Border.Selected": "#79CB60",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker Contrast.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Darker.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/darker.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#727272",
@@ -17,7 +23,7 @@
       "inactiveBackground": "#323232",
       "inactiveForeground": "#727272",
       "infoForeground": "#727272",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionBackgroundInactive": "#292929",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#292929",
@@ -33,7 +39,7 @@
       "pressedBorderColor": "#FF980050"
     },
     "Autocomplete": {
-      "selectionBackground": "#404040"
+      "selectionBackground": "#353535"
     },
     "Borders.ContrastBorderColor": "#212121",
     "Borders.color": "#292929",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#292929",
       "Tooltip.background": "#1A1A1A"
     },
-    "Content.background": "#1A1A1A",
+    "Content": {
+      "background": "#1A1A1A",
+      "selectionBackground": "#353535"
+    },
     "CheckBox": {
       "background": "#212121",
       "disabledText": "#474747",
@@ -86,9 +95,17 @@
       "disabledBackground": "#212121",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#B0BEC5",
+      "AccessEnabled": {
+        "accessDot": "#FF9800",
+        "dropdownBorder": "#292929",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#212121",
       "foreground": "#B0BEC5",
@@ -104,6 +121,7 @@
       },
       "background": "#1A1A1A",
       "buttonBackground": "#2A2A2A",
+      "darcula.hoveredArrowButtonForeground": "#FF9800",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
       "modifiedItemForeground": "#FF9800",
@@ -123,8 +141,8 @@
       "selectedGrayedForeground": "#FFFFFF",
       "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#727272",
-      "selectionInactiveBackground": "#40404050",
-      "selectionBackground": "#40404080",
+      "selectionInactiveBackground": "#35353550",
+      "selectionBackground": "#35353580",
       "selectionForeground": "#FFFFFF",
       "selectionInfoForeground": "#FFFFFF"
     },
@@ -168,11 +186,13 @@
       "hoverBackground": "#323232",
       "hoverColor": "#1A1A1A",
       "hoverMaskColor": "#3F3F3F",
+      "inactiveColoredTabBackground": "#212121",
       "inactiveColoredFileBackground": "#2A2A2A",
-      "inactiveUnderlineColor": "#474747",
+      "inactiveUnderlineColor": "#FF9800",
       "inactiveMaskColor": "#1A1A1A",
       "underlineColor": "#FF9800",
-      "underlinedTabBackground": "#323232"
+      "underlinedTabBackground": "#323232",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#212121",
     "DialogWrapper.southPanelBackground": "#212121",
@@ -193,20 +213,22 @@
       "foreground": "#B0BEC5",
       "inactiveBackground": "#212121",
       "inactiveForeground": "#474747",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
     "EditorTabs": {
       "borderColor": "#292929",
+      "hoverBackground": "#3F3F3F",
       "hoverColor": "#3F3F3F",
       "hoverMaskColor": "#3F3F3F",
       "inactiveMaskColor": "#212121",
-      "inactiveColoredFileBackground": "#2121212",
+      "inactiveColoredFileBackground": "#212121",
       "inactiveUnderlineColor": "#474747",
       "selectedForeground": "#B0BEC5",
       "selectedBackground": "#323232",
       "underlineColor": "#FF9800",
-      "underlinedTabBackground": "#323232"
+      "underlinedTabBackground": "#323232",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#212121",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#323232"
     },
+    "GotItTooltip.borderColor": "#1A1A1A",
     "Group": {
       "disabledSeparatorColor": "#292929",
       "separatorColor": "#292929"
     },
     "GutterTooltip": {
-      "infoForeground": "#B0BEC5",
+      "infoForeground": "#727272",
       "lineSeparatorColor": "#212121"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#474747",
       "foreground": "#B0BEC5",
       "infoForeground": "#727272",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#B0BEC5"
     },
     "Link": {
       "activeForeground": "#FF9800",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#292929",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#40404050",
+      "hoverBackground": "#32323270",
+      "hoverInactiveBackground": "#323232",
+      "selectionBackground": "#35353550",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#323232c0"
+      "selectionInactiveBackground": "#32323270"
     },
     "material": {
       "background": "#212121",
@@ -332,7 +358,7 @@
       "disabledBackground": "#292929",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF",
       "separatorColor": "#292929"
     },
@@ -343,7 +369,7 @@
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
       "highlight": "#212121",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF",
       "shadow": "#1A1A1A"
     },
@@ -355,7 +381,7 @@
       "disabledBackground": "#212121",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#292929",
       "borderColor": "#323232",
-      "currentOverloadBackground": "#323232",
+      "currentOverloadBackground": "#3F3F3F",
       "currentParameterForeground": "#FF9800",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
@@ -429,9 +455,10 @@
       "background": "#212121",
       "disabledForeground": "#474747",
       "eapTagBackground": "#3F3F3F",
-      "lightSelectionBackground": "#404040",
+      "hoverBackground": "#32323270",
+      "lightSelectionBackground": "#323232",
       "paidTagBackground": "#3F3F3F",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "tagForeground": "#FF9800",
       "tagBackground": "#3F3F3F",
       "trialTagBackground": "#3F3F3F",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#3F3F3F",
         "installFillForeground": "#474747",
         "installFillBackground": "#2A2A2A",
-        "updateBackground": "#2A2A2A",
+        "updateBackground": "#FF9800",
         "updateBorderColor": "#2A2A2A",
         "updateForeground": "#B0BEC5"
       },
@@ -514,9 +541,10 @@
       "disabledBackground": "#212121",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#292929",
     "ScrollBar": {
       "background": "#212121",
       "hoverThumbBorderColor": "#FF9800",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#FF9800",
-      "startBackground": "#FF9800"
+      "startBackground": "#FF9800",
+      "endColor": "#FF9800",
+      "startColor": "#FF9800"
     },
     "SearchField.errorBackground": "#1A1A1A",
+    "SearchOption": {
+      "selectedBackground": "#323232"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#727272",
+      "Repeated.File.Foreground": "#B0BEC5"
+    },
     "Separator": {
       "background": "#292929",
       "foreground": "#292929",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#292929",
     "StatusBar": {
-      "borderColor": "#212121"
+      "borderColor": "#212121",
+      "hoverBackground": "#3F3F3F",
+      "LightEditBackground": "#323232"
     },
     "TabbedPane": {
       "background": "#212121",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#1A1A1A",
     "Table": {
+      "alternativeRowBackground": "#1A1A1A",
       "background": "#212121",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#474747",
       "dropLineColor": "#FF9800",
       "dropLineShortColor": "#FF9800",
       "focusCellBackground": "#323232",
@@ -653,6 +694,8 @@
       "foreground": "#B0BEC5",
       "gridColor": "#212121",
       "highlightOuter": "#323232",
+      "hoverBackground": "#32323270",
+      "hoverInactiveBackground": "#323232",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#727272",
       "lightSelectionInactiveBackground": "#292929",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#212121",
       "Actions.infoForeground": "#727272",
-      "background": "#212121",
-      "borderColor": "#3F3F3F",
+      "background": "#1A1A1A",
+      "borderColor": "#292929",
       "foreground": "#B0BEC5",
       "infoForeground": "#727272",
       "separatorColor": "#292929",
@@ -751,50 +794,93 @@
         "background": "#212121"
       },
       "HeaderTab": {
+        "borderColor": "#3F3F3F",
         "hoverBackground": "#3F3F3F",
-        "hoverInactiveBackground": "#292929",
+        "hoverInactiveBackground": "#3F3F3F",
         "inactiveUnderlineColor": "#FF9800",
         "selectedBackground": "#1A1A1A",
         "selectedInactiveBackground": "#1A1A1A",
         "underlineColor": "#FF9800",
-        "underlinedTabBackground": "#3F3F3F",
-        "underlinedTabInactiveBackground": "#292929"
+        "underlinedTabBackground": "#323232",
+        "underlinedTabInactiveBackground": "#292929",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#B0BEC5"
       }
     },
     "Tree": {
       "background": "#1A1A1A",
       "foreground": "#727272",
       "hash": "#292929",
+      "hoverBackground": "#32323270",
+      "hoverInactiveBackground": "#323232",
       "modifiedItemForeground": "#FF9800",
       "rowHeight": 28,
-      "selectionBackground": "#323232c0",
+      "selectionBackground": "#32323270",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#323232c0",
+      "selectionInactiveBackground": "#32323270",
       "textBackground": "#1A1A1A"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#292929",
-      "ColorPicker.background": "#212121",
-      "ColorPicker.foreground": "#B0BEC5",
-      "Component.borderColor": "#292929",
-      "Component.background": "#212121",
-      "Component.foreground": "#B0BEC5",
-      "Connector.borderColor": "#292929",
-      "Connector.hoverBorderColor": "#3F3F3F",
+      "Canvas.background": "#1A1A1A",
+      "ColorPicker": {
+        "background": "#212121",
+        "foreground": "#B0BEC5"
+      },
+      "Component": {
+        "borderColor": "#292929",
+        "background": "#212121",
+        "foreground": "#B0BEC5",
+        "hoverBorderColor": "#3F3F3F"
+      },
+      "Connector": {
+        "borderColor": "#292929",
+        "hoverBorderColor": "#3F3F3F"
+      },
       "Canvas.background": "#1A1A1A",
       "highStroke.foreground": "#B0BEC5",
       "Label.foreground": "#727272",
-      "List.selectionBackground": "#323232c0",
-      "Panel.borderColor": "#292929",
-      "Panel.background": "#212121",
+      "List.selectionBackground": "#32323270",
+      "motion": {
+        "borderColor": "#292929",
+        "Component.foreground": "#B0BEC5",
+        "ConstraintSetText.foreground": "#727272",
+        "ConstraintSet.background": "#292929",
+        "CSPanel.SelectedFocusBackground": "#353535",
+        "CSPanel.SelectedBackground": "#32323270",
+        "cs_FocusText.infoForeground": "#727272",
+        "CursorTextColor.foreground": "#B0BEC5",
+        "HoverColor.disabledBackground": "#474747",
+        "motionGraph.background": "#212121",
+        "Notification.background": "#1A1A1A",
+        "ourAvg.background": "#292929",
+        "ourCS.background": "#292929",
+        "ourCS_Border.borderColor": "#292929",
+        "ourCS_TextColor.foreground": "#727272",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#323232",
+        "ourCS_SelectedBorder.pressedBorderColor": "#3F3F3F",
+        "ourML_BarColor.separatorColor": "#292929",
+        "PrimaryPanel.background": "#1A1A1A",
+        "SecondaryPanel.background": "#212121",
+        "SecondaryPanel.header.foreground": "#727272",
+        "SecondaryPanel.header.background": "#1A1A1A",
+        "timeLine.disabledBorderColor": "#292929"
+      },
+      "Panel": {
+        "borderColor": "#292929",
+        "background": "#212121"
+      },
       "percent.foreground": "#B0BEC5",
-      "Placeholder.background": "#212121",
-      "Placeholder.borderColor": "#292929",
-      "Placeholder.foreground": "#B0BEC5",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#212121",
+        "borderColor": "#292929",
+        "foreground": "#B0BEC5",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#212121",
       "stroke.acceleratorForeground": "#727272"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#727272",
-        "Commit.currentBranchBackground": "#292929"
+        "Commit.currentBranchBackground": "#292929",
+        "Commit.hoveredBackground": "#32323270"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,18 +927,24 @@
       "foreground": "#B0BEC5"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#212121",
       "background": "#212121",
       "borderColor": "#212121",
       "captionBackground": "#1A1A1A",
       "captionForeground": "#B0BEC5",
+      "Details.background": "#212121",
       "footerBackground": "#1A1A1A",
       "footerForeground": "#B0BEC5",
       "headerBackground": "#212121",
       "headerForeground": "#B0BEC5",
+      "List.background": "#1A1A1A",
       "separatorColor": "#292929",
+      "SidePanel.background": "#292929",
       "Projects": {
+        "actions.background": "#1A1A1A",
+        "actions.selectionBackground": "#3F3F3F",
         "background": "#292929",
-        "selectionBackground": "#404040",
+        "selectionBackground": "#353535",
         "selectionInactiveBackground": "#292929"
       }
     },

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Darker.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/darker.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#727272",
@@ -17,7 +23,7 @@
       "inactiveBackground": "#323232",
       "inactiveForeground": "#727272",
       "infoForeground": "#727272",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionBackgroundInactive": "#292929",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#292929",
@@ -33,7 +39,7 @@
       "pressedBorderColor": "#FF980050"
     },
     "Autocomplete": {
-      "selectionBackground": "#404040"
+      "selectionBackground": "#353535"
     },
     "Borders.ContrastBorderColor": "#212121",
     "Borders.color": "#292929",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#292929",
       "Tooltip.background": "#1A1A1A"
     },
-    "Content.background": "#1A1A1A",
+    "Content": {
+      "background": "#1A1A1A",
+      "selectionBackground": "#353535"
+    },
     "CheckBox": {
       "background": "#212121",
       "disabledText": "#474747",
@@ -86,9 +95,17 @@
       "disabledBackground": "#212121",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#B0BEC5",
+      "AccessEnabled": {
+        "accessDot": "#FF9800",
+        "dropdownBorder": "#292929",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#212121",
       "foreground": "#B0BEC5",
@@ -104,6 +121,7 @@
       },
       "background": "#212121",
       "buttonBackground": "#2A2A2A",
+      "darcula.hoveredArrowButtonForeground": "#FF9800",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
       "modifiedItemForeground": "#FF9800",
@@ -123,8 +141,8 @@
       "selectedGrayedForeground": "#FFFFFF",
       "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#727272",
-      "selectionInactiveBackground": "#40404050",
-      "selectionBackground": "#40404080",
+      "selectionInactiveBackground": "#35353550",
+      "selectionBackground": "#35353580",
       "selectionForeground": "#FFFFFF",
       "selectionInfoForeground": "#FFFFFF"
     },
@@ -168,11 +186,13 @@
       "hoverBackground": "#323232",
       "hoverColor": "#212121",
       "hoverMaskColor": "#3F3F3F",
+      "inactiveColoredTabBackground": "#212121",
       "inactiveColoredFileBackground": "#2A2A2A",
-      "inactiveUnderlineColor": "#474747",
+      "inactiveUnderlineColor": "#FF9800",
       "inactiveMaskColor": "#212121",
       "underlineColor": "#FF9800",
-      "underlinedTabBackground": "#323232"
+      "underlinedTabBackground": "#323232",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#212121",
     "DialogWrapper.southPanelBackground": "#212121",
@@ -193,20 +213,22 @@
       "foreground": "#B0BEC5",
       "inactiveBackground": "#212121",
       "inactiveForeground": "#474747",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
     "EditorTabs": {
       "borderColor": "#292929",
+      "hoverBackground": "#3F3F3F",
       "hoverColor": "#3F3F3F",
       "hoverMaskColor": "#3F3F3F",
       "inactiveMaskColor": "#212121",
-      "inactiveColoredFileBackground": "#2121212",
+      "inactiveColoredFileBackground": "#212121",
       "inactiveUnderlineColor": "#474747",
       "selectedForeground": "#B0BEC5",
       "selectedBackground": "#323232",
       "underlineColor": "#FF9800",
-      "underlinedTabBackground": "#323232"
+      "underlinedTabBackground": "#323232",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#212121",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#323232"
     },
+    "GotItTooltip.borderColor": "#1A1A1A",
     "Group": {
       "disabledSeparatorColor": "#292929",
       "separatorColor": "#292929"
     },
     "GutterTooltip": {
-      "infoForeground": "#B0BEC5",
+      "infoForeground": "#727272",
       "lineSeparatorColor": "#212121"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#474747",
       "foreground": "#B0BEC5",
       "infoForeground": "#727272",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#B0BEC5"
     },
     "Link": {
       "activeForeground": "#FF9800",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#292929",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#40404050",
+      "hoverBackground": "#32323270",
+      "hoverInactiveBackground": "#323232",
+      "selectionBackground": "#35353550",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#323232c0"
+      "selectionInactiveBackground": "#32323270"
     },
     "material": {
       "background": "#212121",
@@ -332,7 +358,7 @@
       "disabledBackground": "#292929",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF",
       "separatorColor": "#292929"
     },
@@ -343,7 +369,7 @@
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
       "highlight": "#212121",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF",
       "shadow": "#212121"
     },
@@ -355,7 +381,7 @@
       "disabledBackground": "#212121",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#292929",
       "borderColor": "#323232",
-      "currentOverloadBackground": "#323232",
+      "currentOverloadBackground": "#3F3F3F",
       "currentParameterForeground": "#FF9800",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
@@ -429,9 +455,10 @@
       "background": "#212121",
       "disabledForeground": "#474747",
       "eapTagBackground": "#3F3F3F",
-      "lightSelectionBackground": "#404040",
+      "hoverBackground": "#32323270",
+      "lightSelectionBackground": "#323232",
       "paidTagBackground": "#3F3F3F",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "tagForeground": "#FF9800",
       "tagBackground": "#3F3F3F",
       "trialTagBackground": "#3F3F3F",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#3F3F3F",
         "installFillForeground": "#474747",
         "installFillBackground": "#2A2A2A",
-        "updateBackground": "#2A2A2A",
+        "updateBackground": "#FF9800",
         "updateBorderColor": "#2A2A2A",
         "updateForeground": "#B0BEC5"
       },
@@ -514,9 +541,10 @@
       "disabledBackground": "#212121",
       "disabledForeground": "#474747",
       "foreground": "#B0BEC5",
-      "selectionBackground": "#404040",
+      "selectionBackground": "#353535",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#292929",
     "ScrollBar": {
       "background": "#212121",
       "hoverThumbBorderColor": "#FF9800",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#FF9800",
-      "startBackground": "#FF9800"
+      "startBackground": "#FF9800",
+      "endColor": "#FF9800",
+      "startColor": "#FF9800"
     },
     "SearchField.errorBackground": "#1A1A1A",
+    "SearchOption": {
+      "selectedBackground": "#323232"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#727272",
+      "Repeated.File.Foreground": "#B0BEC5"
+    },
     "Separator": {
       "background": "#292929",
       "foreground": "#292929",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#292929",
     "StatusBar": {
-      "borderColor": "#212121"
+      "borderColor": "#212121",
+      "hoverBackground": "#3F3F3F",
+      "LightEditBackground": "#323232"
     },
     "TabbedPane": {
       "background": "#212121",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#212121",
     "Table": {
+      "alternativeRowBackground": "#1A1A1A",
       "background": "#212121",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#474747",
       "dropLineColor": "#FF9800",
       "dropLineShortColor": "#FF9800",
       "focusCellBackground": "#323232",
@@ -653,6 +694,8 @@
       "foreground": "#B0BEC5",
       "gridColor": "#212121",
       "highlightOuter": "#323232",
+      "hoverBackground": "#32323270",
+      "hoverInactiveBackground": "#323232",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#727272",
       "lightSelectionInactiveBackground": "#292929",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#212121",
       "Actions.infoForeground": "#727272",
-      "background": "#212121",
-      "borderColor": "#3F3F3F",
+      "background": "#1A1A1A",
+      "borderColor": "#292929",
       "foreground": "#B0BEC5",
       "infoForeground": "#727272",
       "separatorColor": "#292929",
@@ -751,50 +794,93 @@
         "background": "#212121"
       },
       "HeaderTab": {
+        "borderColor": "#3F3F3F",
         "hoverBackground": "#3F3F3F",
-        "hoverInactiveBackground": "#292929",
+        "hoverInactiveBackground": "#3F3F3F",
         "inactiveUnderlineColor": "#FF9800",
         "selectedBackground": "#1A1A1A",
         "selectedInactiveBackground": "#1A1A1A",
         "underlineColor": "#FF9800",
-        "underlinedTabBackground": "#3F3F3F",
-        "underlinedTabInactiveBackground": "#292929"
+        "underlinedTabBackground": "#323232",
+        "underlinedTabInactiveBackground": "#292929",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#B0BEC5"
       }
     },
     "Tree": {
       "background": "#212121",
       "foreground": "#727272",
       "hash": "#292929",
+      "hoverBackground": "#32323270",
+      "hoverInactiveBackground": "#323232",
       "modifiedItemForeground": "#FF9800",
       "rowHeight": 28,
-      "selectionBackground": "#323232c0",
+      "selectionBackground": "#32323270",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#323232c0",
+      "selectionInactiveBackground": "#32323270",
       "textBackground": "#212121"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#292929",
-      "ColorPicker.background": "#212121",
-      "ColorPicker.foreground": "#B0BEC5",
-      "Component.borderColor": "#292929",
-      "Component.background": "#212121",
-      "Component.foreground": "#B0BEC5",
-      "Connector.borderColor": "#292929",
-      "Connector.hoverBorderColor": "#3F3F3F",
+      "Canvas.background": "#1A1A1A",
+      "ColorPicker": {
+        "background": "#212121",
+        "foreground": "#B0BEC5"
+      },
+      "Component": {
+        "borderColor": "#292929",
+        "background": "#212121",
+        "foreground": "#B0BEC5",
+        "hoverBorderColor": "#3F3F3F"
+      },
+      "Connector": {
+        "borderColor": "#292929",
+        "hoverBorderColor": "#3F3F3F"
+      },
       "Canvas.background": "#1A1A1A",
       "highStroke.foreground": "#B0BEC5",
       "Label.foreground": "#727272",
-      "List.selectionBackground": "#323232c0",
-      "Panel.borderColor": "#292929",
-      "Panel.background": "#212121",
+      "List.selectionBackground": "#32323270",
+      "motion": {
+        "borderColor": "#292929",
+        "Component.foreground": "#B0BEC5",
+        "ConstraintSetText.foreground": "#727272",
+        "ConstraintSet.background": "#292929",
+        "CSPanel.SelectedFocusBackground": "#353535",
+        "CSPanel.SelectedBackground": "#32323270",
+        "cs_FocusText.infoForeground": "#727272",
+        "CursorTextColor.foreground": "#B0BEC5",
+        "HoverColor.disabledBackground": "#474747",
+        "motionGraph.background": "#212121",
+        "Notification.background": "#1A1A1A",
+        "ourAvg.background": "#292929",
+        "ourCS.background": "#292929",
+        "ourCS_Border.borderColor": "#292929",
+        "ourCS_TextColor.foreground": "#727272",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#323232",
+        "ourCS_SelectedBorder.pressedBorderColor": "#3F3F3F",
+        "ourML_BarColor.separatorColor": "#292929",
+        "PrimaryPanel.background": "#1A1A1A",
+        "SecondaryPanel.background": "#212121",
+        "SecondaryPanel.header.foreground": "#727272",
+        "SecondaryPanel.header.background": "#1A1A1A",
+        "timeLine.disabledBorderColor": "#292929"
+      },
+      "Panel": {
+        "borderColor": "#292929",
+        "background": "#212121"
+      },
       "percent.foreground": "#B0BEC5",
-      "Placeholder.background": "#212121",
-      "Placeholder.borderColor": "#292929",
-      "Placeholder.foreground": "#B0BEC5",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#212121",
+        "borderColor": "#292929",
+        "foreground": "#B0BEC5",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#212121",
       "stroke.acceleratorForeground": "#727272"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#727272",
-        "Commit.currentBranchBackground": "#292929"
+        "Commit.currentBranchBackground": "#292929",
+        "Commit.hoveredBackground": "#32323270"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,18 +927,24 @@
       "foreground": "#B0BEC5"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#212121",
       "background": "#212121",
       "borderColor": "#212121",
       "captionBackground": "#1A1A1A",
       "captionForeground": "#B0BEC5",
+      "Details.background": "#212121",
       "footerBackground": "#1A1A1A",
       "footerForeground": "#B0BEC5",
       "headerBackground": "#212121",
       "headerForeground": "#B0BEC5",
+      "List.background": "#1A1A1A",
       "separatorColor": "#292929",
+      "SidePanel.background": "#292929",
       "Projects": {
+        "actions.background": "#1A1A1A",
+        "actions.selectionBackground": "#3F3F3F",
         "background": "#292929",
-        "selectionBackground": "#404040",
+        "selectionBackground": "#353535",
         "selectionInactiveBackground": "#292929"
       }
     },

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Deep Ocean.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/deepocean.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#4B526D",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#0F111A",
       "Tooltip.background": "#090B10"
     },
-    "Content.background": "#090B10",
+    "Content": {
+      "background": "#090B10",
+      "selectionBackground": "#232632"
+    },
     "CheckBox": {
       "background": "#0F111A",
       "disabledText": "#464B5D",
@@ -89,6 +98,14 @@
       "selectionBackground": "#232632",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#8F93A2",
+      "AccessEnabled": {
+        "accessDot": "#84ffff",
+        "dropdownBorder": "#181A1F",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#0F111A",
       "foreground": "#8F93A2",
@@ -104,6 +121,7 @@
       },
       "background": "#090B10",
       "buttonBackground": "#191A21",
+      "darcula.hoveredArrowButtonForeground": "#84ffff",
       "disabledForeground": "#464B5D",
       "foreground": "#8F93A2",
       "modifiedItemForeground": "#84ffff",
@@ -168,11 +186,13 @@
       "hoverBackground": "#1A1C25",
       "hoverColor": "#090B10",
       "hoverMaskColor": "#1F2233",
+      "inactiveColoredTabBackground": "#0F111A",
       "inactiveColoredFileBackground": "#191A21",
-      "inactiveUnderlineColor": "#464B5D",
+      "inactiveUnderlineColor": "#84ffff",
       "inactiveMaskColor": "#090B10",
       "underlineColor": "#84ffff",
-      "underlinedTabBackground": "#1A1C25"
+      "underlinedTabBackground": "#1A1C25",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#0F111A",
     "DialogWrapper.southPanelBackground": "#0F111A",
@@ -198,15 +218,17 @@
     },
     "EditorTabs": {
       "borderColor": "#181A1F",
+      "hoverBackground": "#1F2233",
       "hoverColor": "#1F2233",
       "hoverMaskColor": "#1F2233",
       "inactiveMaskColor": "#0F111A",
-      "inactiveColoredFileBackground": "#0F111A2",
+      "inactiveColoredFileBackground": "#0F111A",
       "inactiveUnderlineColor": "#464B5D",
       "selectedForeground": "#8F93A2",
       "selectedBackground": "#1A1C25",
       "underlineColor": "#84ffff",
-      "underlinedTabBackground": "#1A1C25"
+      "underlinedTabBackground": "#1A1C25",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#0F111A",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#1A1C25"
     },
+    "GotItTooltip.borderColor": "#090B10",
     "Group": {
       "disabledSeparatorColor": "#0F111A",
       "separatorColor": "#0F111A"
     },
     "GutterTooltip": {
-      "infoForeground": "#8F93A2",
+      "infoForeground": "#4B526D",
       "lineSeparatorColor": "#0F111A"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#464B5D",
       "foreground": "#8F93A2",
       "infoForeground": "#4B526D",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#8F93A2"
     },
     "Link": {
       "activeForeground": "#84ffff",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#181A1F",
       "foreground": "#8F93A2",
+      "hoverBackground": "#717CB416",
+      "hoverInactiveBackground": "#1A1C25",
       "selectionBackground": "#23263250",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB430"
+      "selectionInactiveBackground": "#717CB416"
     },
     "material": {
       "background": "#0F111A",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#181A1F",
       "borderColor": "#1A1C25",
-      "currentOverloadBackground": "#1A1C25",
+      "currentOverloadBackground": "#1F2233",
       "currentParameterForeground": "#84ffff",
       "disabledForeground": "#464B5D",
       "foreground": "#8F93A2",
@@ -429,7 +455,8 @@
       "background": "#0F111A",
       "disabledForeground": "#464B5D",
       "eapTagBackground": "#1F2233",
-      "lightSelectionBackground": "#232632",
+      "hoverBackground": "#717CB416",
+      "lightSelectionBackground": "#1A1C25",
       "paidTagBackground": "#1F2233",
       "selectionBackground": "#232632",
       "tagForeground": "#84ffff",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#1F2233",
         "installFillForeground": "#464B5D",
         "installFillBackground": "#191A21",
-        "updateBackground": "#191A21",
+        "updateBackground": "#84ffff",
         "updateBorderColor": "#191A21",
         "updateForeground": "#8F93A2"
       },
@@ -517,6 +544,7 @@
       "selectionBackground": "#232632",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#0F111A",
     "ScrollBar": {
       "background": "#0F111A",
       "hoverThumbBorderColor": "#84ffff",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#84ffff",
-      "startBackground": "#84ffff"
+      "startBackground": "#84ffff",
+      "endColor": "#84ffff",
+      "startColor": "#84ffff"
     },
     "SearchField.errorBackground": "#090B10",
+    "SearchOption": {
+      "selectedBackground": "#1A1C25"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#4B526D",
+      "Repeated.File.Foreground": "#8F93A2"
+    },
     "Separator": {
       "background": "#181A1F",
       "foreground": "#181A1F",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#181A1F",
     "StatusBar": {
-      "borderColor": "#0F111A"
+      "borderColor": "#0F111A",
+      "hoverBackground": "#1F2233",
+      "LightEditBackground": "#1A1C25"
     },
     "TabbedPane": {
       "background": "#0F111A",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#090B10",
     "Table": {
+      "alternativeRowBackground": "#090B10",
       "background": "#0F111A",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#464B5D",
       "dropLineColor": "#84ffff",
       "dropLineShortColor": "#84ffff",
       "focusCellBackground": "#1A1C25",
@@ -653,6 +694,8 @@
       "foreground": "#8F93A2",
       "gridColor": "#0F111A",
       "highlightOuter": "#1A1C25",
+      "hoverBackground": "#717CB416",
+      "hoverInactiveBackground": "#1A1C25",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#4B526D",
       "lightSelectionInactiveBackground": "#181A1F",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#0F111A",
       "Actions.infoForeground": "#4B526D",
-      "background": "#0F111A",
-      "borderColor": "#1F2233",
+      "background": "#090B10",
+      "borderColor": "#0F111A",
       "foreground": "#8F93A2",
       "infoForeground": "#4B526D",
       "separatorColor": "#0F111A",
@@ -751,50 +794,93 @@
         "background": "#0F111A"
       },
       "HeaderTab": {
+        "borderColor": "#1F2233",
         "hoverBackground": "#1F2233",
-        "hoverInactiveBackground": "#181A1F",
+        "hoverInactiveBackground": "#1F2233",
         "inactiveUnderlineColor": "#84ffff",
         "selectedBackground": "#090B10",
         "selectedInactiveBackground": "#090B10",
         "underlineColor": "#84ffff",
-        "underlinedTabBackground": "#1F2233",
-        "underlinedTabInactiveBackground": "#181A1F"
+        "underlinedTabBackground": "#1A1C25",
+        "underlinedTabInactiveBackground": "#181A1F",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#8F93A2"
       }
     },
     "Tree": {
       "background": "#090B10",
       "foreground": "#4B526D",
       "hash": "#0F111A",
+      "hoverBackground": "#717CB416",
+      "hoverInactiveBackground": "#1A1C25",
       "modifiedItemForeground": "#84ffff",
       "rowHeight": 28,
-      "selectionBackground": "#717CB430",
+      "selectionBackground": "#717CB416",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB430",
+      "selectionInactiveBackground": "#717CB416",
       "textBackground": "#090B10"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#0F111A",
-      "ColorPicker.background": "#0F111A",
-      "ColorPicker.foreground": "#8F93A2",
-      "Component.borderColor": "#0F111A",
-      "Component.background": "#0F111A",
-      "Component.foreground": "#8F93A2",
-      "Connector.borderColor": "#0F111A",
-      "Connector.hoverBorderColor": "#1F2233",
+      "Canvas.background": "#090B10",
+      "ColorPicker": {
+        "background": "#0F111A",
+        "foreground": "#8F93A2"
+      },
+      "Component": {
+        "borderColor": "#0F111A",
+        "background": "#0F111A",
+        "foreground": "#8F93A2",
+        "hoverBorderColor": "#1F2233"
+      },
+      "Connector": {
+        "borderColor": "#0F111A",
+        "hoverBorderColor": "#1F2233"
+      },
       "Canvas.background": "#090B10",
       "highStroke.foreground": "#8F93A2",
       "Label.foreground": "#4B526D",
-      "List.selectionBackground": "#717CB430",
-      "Panel.borderColor": "#0F111A",
-      "Panel.background": "#0F111A",
+      "List.selectionBackground": "#717CB416",
+      "motion": {
+        "borderColor": "#0F111A",
+        "Component.foreground": "#8F93A2",
+        "ConstraintSetText.foreground": "#4B526D",
+        "ConstraintSet.background": "#181A1F",
+        "CSPanel.SelectedFocusBackground": "#232632",
+        "CSPanel.SelectedBackground": "#717CB416",
+        "cs_FocusText.infoForeground": "#4B526D",
+        "CursorTextColor.foreground": "#8F93A2",
+        "HoverColor.disabledBackground": "#464B5D",
+        "motionGraph.background": "#0F111A",
+        "Notification.background": "#090B10",
+        "ourAvg.background": "#181A1F",
+        "ourCS.background": "#181A1F",
+        "ourCS_Border.borderColor": "#0F111A",
+        "ourCS_TextColor.foreground": "#4B526D",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#1A1C25",
+        "ourCS_SelectedBorder.pressedBorderColor": "#1F2233",
+        "ourML_BarColor.separatorColor": "#0F111A",
+        "PrimaryPanel.background": "#090B10",
+        "SecondaryPanel.background": "#0F111A",
+        "SecondaryPanel.header.foreground": "#4B526D",
+        "SecondaryPanel.header.background": "#090B10",
+        "timeLine.disabledBorderColor": "#0F111A"
+      },
+      "Panel": {
+        "borderColor": "#0F111A",
+        "background": "#0F111A"
+      },
       "percent.foreground": "#8F93A2",
-      "Placeholder.background": "#0F111A",
-      "Placeholder.borderColor": "#0F111A",
-      "Placeholder.foreground": "#8F93A2",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#0F111A",
+        "borderColor": "#0F111A",
+        "foreground": "#8F93A2",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#0F111A",
       "stroke.acceleratorForeground": "#4B526D"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#4B526D",
-        "Commit.currentBranchBackground": "#181A1F"
+        "Commit.currentBranchBackground": "#181A1F",
+        "Commit.hoveredBackground": "#717CB416"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,16 +927,22 @@
       "foreground": "#8F93A2"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#0F111A",
       "background": "#0F111A",
       "borderColor": "#0F111A",
       "captionBackground": "#090B10",
       "captionForeground": "#8F93A2",
+      "Details.background": "#0F111A",
       "footerBackground": "#090B10",
       "footerForeground": "#8F93A2",
       "headerBackground": "#0F111A",
       "headerForeground": "#8F93A2",
+      "List.background": "#090B10",
       "separatorColor": "#0F111A",
+      "SidePanel.background": "#181A1F",
       "Projects": {
+        "actions.background": "#090B10",
+        "actions.selectionBackground": "#1F2233",
         "background": "#181A1F",
         "selectionBackground": "#232632",
         "selectionInactiveBackground": "#181A1F"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Deep Ocean.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/deepocean.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#4B526D",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#0F111A",
       "Tooltip.background": "#090B10"
     },
-    "Content.background": "#090B10",
+    "Content": {
+      "background": "#090B10",
+      "selectionBackground": "#232632"
+    },
     "CheckBox": {
       "background": "#0F111A",
       "disabledText": "#464B5D",
@@ -89,6 +98,14 @@
       "selectionBackground": "#232632",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#8F93A2",
+      "AccessEnabled": {
+        "accessDot": "#84ffff",
+        "dropdownBorder": "#181A1F",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#0F111A",
       "foreground": "#8F93A2",
@@ -104,6 +121,7 @@
       },
       "background": "#0F111A",
       "buttonBackground": "#191A21",
+      "darcula.hoveredArrowButtonForeground": "#84ffff",
       "disabledForeground": "#464B5D",
       "foreground": "#8F93A2",
       "modifiedItemForeground": "#84ffff",
@@ -168,11 +186,13 @@
       "hoverBackground": "#1A1C25",
       "hoverColor": "#0F111A",
       "hoverMaskColor": "#1F2233",
+      "inactiveColoredTabBackground": "#0F111A",
       "inactiveColoredFileBackground": "#191A21",
-      "inactiveUnderlineColor": "#464B5D",
+      "inactiveUnderlineColor": "#84ffff",
       "inactiveMaskColor": "#0F111A",
       "underlineColor": "#84ffff",
-      "underlinedTabBackground": "#1A1C25"
+      "underlinedTabBackground": "#1A1C25",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#0F111A",
     "DialogWrapper.southPanelBackground": "#0F111A",
@@ -198,15 +218,17 @@
     },
     "EditorTabs": {
       "borderColor": "#181A1F",
+      "hoverBackground": "#1F2233",
       "hoverColor": "#1F2233",
       "hoverMaskColor": "#1F2233",
       "inactiveMaskColor": "#0F111A",
-      "inactiveColoredFileBackground": "#0F111A2",
+      "inactiveColoredFileBackground": "#0F111A",
       "inactiveUnderlineColor": "#464B5D",
       "selectedForeground": "#8F93A2",
       "selectedBackground": "#1A1C25",
       "underlineColor": "#84ffff",
-      "underlinedTabBackground": "#1A1C25"
+      "underlinedTabBackground": "#1A1C25",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#0F111A",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#1A1C25"
     },
+    "GotItTooltip.borderColor": "#090B10",
     "Group": {
       "disabledSeparatorColor": "#0F111A",
       "separatorColor": "#0F111A"
     },
     "GutterTooltip": {
-      "infoForeground": "#8F93A2",
+      "infoForeground": "#4B526D",
       "lineSeparatorColor": "#0F111A"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#464B5D",
       "foreground": "#8F93A2",
       "infoForeground": "#4B526D",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#8F93A2"
     },
     "Link": {
       "activeForeground": "#84ffff",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#181A1F",
       "foreground": "#8F93A2",
+      "hoverBackground": "#717CB416",
+      "hoverInactiveBackground": "#1A1C25",
       "selectionBackground": "#23263250",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB430"
+      "selectionInactiveBackground": "#717CB416"
     },
     "material": {
       "background": "#0F111A",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#181A1F",
       "borderColor": "#1A1C25",
-      "currentOverloadBackground": "#1A1C25",
+      "currentOverloadBackground": "#1F2233",
       "currentParameterForeground": "#84ffff",
       "disabledForeground": "#464B5D",
       "foreground": "#8F93A2",
@@ -429,7 +455,8 @@
       "background": "#0F111A",
       "disabledForeground": "#464B5D",
       "eapTagBackground": "#1F2233",
-      "lightSelectionBackground": "#232632",
+      "hoverBackground": "#717CB416",
+      "lightSelectionBackground": "#1A1C25",
       "paidTagBackground": "#1F2233",
       "selectionBackground": "#232632",
       "tagForeground": "#84ffff",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#1F2233",
         "installFillForeground": "#464B5D",
         "installFillBackground": "#191A21",
-        "updateBackground": "#191A21",
+        "updateBackground": "#84ffff",
         "updateBorderColor": "#191A21",
         "updateForeground": "#8F93A2"
       },
@@ -517,6 +544,7 @@
       "selectionBackground": "#232632",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#0F111A",
     "ScrollBar": {
       "background": "#0F111A",
       "hoverThumbBorderColor": "#84ffff",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#84ffff",
-      "startBackground": "#84ffff"
+      "startBackground": "#84ffff",
+      "endColor": "#84ffff",
+      "startColor": "#84ffff"
     },
     "SearchField.errorBackground": "#090B10",
+    "SearchOption": {
+      "selectedBackground": "#1A1C25"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#4B526D",
+      "Repeated.File.Foreground": "#8F93A2"
+    },
     "Separator": {
       "background": "#181A1F",
       "foreground": "#181A1F",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#181A1F",
     "StatusBar": {
-      "borderColor": "#0F111A"
+      "borderColor": "#0F111A",
+      "hoverBackground": "#1F2233",
+      "LightEditBackground": "#1A1C25"
     },
     "TabbedPane": {
       "background": "#0F111A",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#0F111A",
     "Table": {
+      "alternativeRowBackground": "#090B10",
       "background": "#0F111A",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#464B5D",
       "dropLineColor": "#84ffff",
       "dropLineShortColor": "#84ffff",
       "focusCellBackground": "#1A1C25",
@@ -653,6 +694,8 @@
       "foreground": "#8F93A2",
       "gridColor": "#0F111A",
       "highlightOuter": "#1A1C25",
+      "hoverBackground": "#717CB416",
+      "hoverInactiveBackground": "#1A1C25",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#4B526D",
       "lightSelectionInactiveBackground": "#181A1F",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#0F111A",
       "Actions.infoForeground": "#4B526D",
-      "background": "#0F111A",
-      "borderColor": "#1F2233",
+      "background": "#090B10",
+      "borderColor": "#0F111A",
       "foreground": "#8F93A2",
       "infoForeground": "#4B526D",
       "separatorColor": "#0F111A",
@@ -751,50 +794,93 @@
         "background": "#0F111A"
       },
       "HeaderTab": {
+        "borderColor": "#1F2233",
         "hoverBackground": "#1F2233",
-        "hoverInactiveBackground": "#181A1F",
+        "hoverInactiveBackground": "#1F2233",
         "inactiveUnderlineColor": "#84ffff",
         "selectedBackground": "#090B10",
         "selectedInactiveBackground": "#090B10",
         "underlineColor": "#84ffff",
-        "underlinedTabBackground": "#1F2233",
-        "underlinedTabInactiveBackground": "#181A1F"
+        "underlinedTabBackground": "#1A1C25",
+        "underlinedTabInactiveBackground": "#181A1F",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#8F93A2"
       }
     },
     "Tree": {
       "background": "#0F111A",
       "foreground": "#4B526D",
       "hash": "#0F111A",
+      "hoverBackground": "#717CB416",
+      "hoverInactiveBackground": "#1A1C25",
       "modifiedItemForeground": "#84ffff",
       "rowHeight": 28,
-      "selectionBackground": "#717CB430",
+      "selectionBackground": "#717CB416",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#717CB430",
+      "selectionInactiveBackground": "#717CB416",
       "textBackground": "#0F111A"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#0F111A",
-      "ColorPicker.background": "#0F111A",
-      "ColorPicker.foreground": "#8F93A2",
-      "Component.borderColor": "#0F111A",
-      "Component.background": "#0F111A",
-      "Component.foreground": "#8F93A2",
-      "Connector.borderColor": "#0F111A",
-      "Connector.hoverBorderColor": "#1F2233",
+      "Canvas.background": "#090B10",
+      "ColorPicker": {
+        "background": "#0F111A",
+        "foreground": "#8F93A2"
+      },
+      "Component": {
+        "borderColor": "#0F111A",
+        "background": "#0F111A",
+        "foreground": "#8F93A2",
+        "hoverBorderColor": "#1F2233"
+      },
+      "Connector": {
+        "borderColor": "#0F111A",
+        "hoverBorderColor": "#1F2233"
+      },
       "Canvas.background": "#090B10",
       "highStroke.foreground": "#8F93A2",
       "Label.foreground": "#4B526D",
-      "List.selectionBackground": "#717CB430",
-      "Panel.borderColor": "#0F111A",
-      "Panel.background": "#0F111A",
+      "List.selectionBackground": "#717CB416",
+      "motion": {
+        "borderColor": "#0F111A",
+        "Component.foreground": "#8F93A2",
+        "ConstraintSetText.foreground": "#4B526D",
+        "ConstraintSet.background": "#181A1F",
+        "CSPanel.SelectedFocusBackground": "#232632",
+        "CSPanel.SelectedBackground": "#717CB416",
+        "cs_FocusText.infoForeground": "#4B526D",
+        "CursorTextColor.foreground": "#8F93A2",
+        "HoverColor.disabledBackground": "#464B5D",
+        "motionGraph.background": "#0F111A",
+        "Notification.background": "#090B10",
+        "ourAvg.background": "#181A1F",
+        "ourCS.background": "#181A1F",
+        "ourCS_Border.borderColor": "#0F111A",
+        "ourCS_TextColor.foreground": "#4B526D",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#1A1C25",
+        "ourCS_SelectedBorder.pressedBorderColor": "#1F2233",
+        "ourML_BarColor.separatorColor": "#0F111A",
+        "PrimaryPanel.background": "#090B10",
+        "SecondaryPanel.background": "#0F111A",
+        "SecondaryPanel.header.foreground": "#4B526D",
+        "SecondaryPanel.header.background": "#090B10",
+        "timeLine.disabledBorderColor": "#0F111A"
+      },
+      "Panel": {
+        "borderColor": "#0F111A",
+        "background": "#0F111A"
+      },
       "percent.foreground": "#8F93A2",
-      "Placeholder.background": "#0F111A",
-      "Placeholder.borderColor": "#0F111A",
-      "Placeholder.foreground": "#8F93A2",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#0F111A",
+        "borderColor": "#0F111A",
+        "foreground": "#8F93A2",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#0F111A",
       "stroke.acceleratorForeground": "#4B526D"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#4B526D",
-        "Commit.currentBranchBackground": "#181A1F"
+        "Commit.currentBranchBackground": "#181A1F",
+        "Commit.hoveredBackground": "#717CB416"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,16 +927,22 @@
       "foreground": "#8F93A2"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#0F111A",
       "background": "#0F111A",
       "borderColor": "#0F111A",
       "captionBackground": "#090B10",
       "captionForeground": "#8F93A2",
+      "Details.background": "#0F111A",
       "footerBackground": "#090B10",
       "footerForeground": "#8F93A2",
       "headerBackground": "#0F111A",
       "headerForeground": "#8F93A2",
+      "List.background": "#090B10",
       "separatorColor": "#0F111A",
+      "SidePanel.background": "#181A1F",
       "Projects": {
+        "actions.background": "#090B10",
+        "actions.selectionBackground": "#1F2233",
         "background": "#181A1F",
         "selectionBackground": "#232632",
         "selectionInactiveBackground": "#181A1F"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter Contrast.theme.json

@@ -3,24 +3,30 @@
   "dark": false,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Lighter.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/lighter.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#94A7B0",
       "background": "#FAFAFA",
       "borderColor": "#d3e1e8",
-      "disabledBackground": "#CCD7DA",
+      "disabledBackground": "#eae8e8",
       "disabledForeground": "#D2D4D5",
       "disabledText": "#D2D4D5",
       "focusColor": "#E7E7E8",
       "focusedBorderColor": "#00BCD4",
       "foreground": "#546E7A",
-      "inactiveBackground": "#CCD7DA",
+      "inactiveBackground": "#eae8e8",
       "inactiveForeground": "#94A7B0",
       "infoForeground": "#94A7B0",
       "selectionBackground": "#80CBC4",
-      "selectionBackgroundInactive": "#FFFFFF",
+      "selectionBackgroundInactive": "#eae8e8",
       "selectionForeground": "#546e7a",
-      "selectionInactiveBackground": "#FFFFFF",
+      "selectionInactiveBackground": "#eae8e8",
       "separatorColor": "#d3e1e8"
     },
     "activeCaption": "#FAFAFA",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#d3e1e8",
       "Tooltip.background": "#eae8e8"
     },
-    "Content.background": "#EEEEEE",
+    "Content": {
+      "background": "#F4F4F4",
+      "selectionBackground": "#80CBC4"
+    },
     "CheckBox": {
       "background": "#FAFAFA",
       "disabledText": "#D2D4D5",
@@ -89,6 +98,14 @@
       "selectionBackground": "#80CBC4",
       "selectionForeground": "#546e7a"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#546E7A",
+      "AccessEnabled": {
+        "accessDot": "#00BCD4",
+        "dropdownBorder": "#eae8e8",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#FAFAFA",
       "foreground": "#546E7A",
@@ -102,19 +119,20 @@
         "iconColor": "#546E7A",
         "nonEditableBackground": "#FAFAFA"
       },
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "buttonBackground": "#F3F4F5",
+      "darcula.hoveredArrowButtonForeground": "#00BCD4",
       "disabledForeground": "#D2D4D5",
       "foreground": "#546E7A",
       "modifiedItemForeground": "#00BCD4",
-      "nonEditableBackground": "#FFFFFF",
+      "nonEditableBackground": "#eae8e8",
       "padding": "5,5,5,5",
       "selectionBackground": "#E7E7E8",
       "selectionForeground": "#546e7a"
     },
     "ComboPopup.border": "#d3e1e8",
     "CompletionPopup": {
-      "background": "#FFFFFF",
+      "background": "#eae8e8",
       "foreground": "#546E7A",
       "infoForeground": "#94A7B0",
       "matchForeground": "#00BCD4",
@@ -166,13 +184,15 @@
       "background": "#FAFAFA",
       "borderColor": "#FAFAFA",
       "hoverBackground": "#E7E7E8",
-      "hoverColor": "#EEEEEE",
+      "hoverColor": "#F4F4F4",
       "hoverMaskColor": "#E7E7E8",
+      "inactiveColoredTabBackground": "#FAFAFA",
       "inactiveColoredFileBackground": "#F3F4F5",
-      "inactiveUnderlineColor": "#D2D4D5",
-      "inactiveMaskColor": "#EEEEEE",
+      "inactiveUnderlineColor": "#00BCD4",
+      "inactiveMaskColor": "#F4F4F4",
       "underlineColor": "#00BCD4",
-      "underlinedTabBackground": "#E7E7E8"
+      "underlinedTabBackground": "#E7E7E8",
+      "underlinedTabForeground": "#546e7a"
     },
     "Desktop.background": "#FAFAFA",
     "DialogWrapper.southPanelBackground": "#FAFAFA",
@@ -183,12 +203,12 @@
       "areaForeground": "#546E7A"
     },
     "Editor": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "foreground": "#546E7A",
       "shortcutForeground": "#94A7B0"
     },
     "EditorPane": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "caretForeground": "#00BCD4",
       "foreground": "#546E7A",
       "inactiveBackground": "#FAFAFA",
@@ -197,20 +217,22 @@
       "selectionForeground": "#546e7a"
     },
     "EditorTabs": {
-      "borderColor": "#FFFFFF",
+      "borderColor": "#eae8e8",
+      "hoverBackground": "#E7E7E8",
       "hoverColor": "#E7E7E8",
       "hoverMaskColor": "#E7E7E8",
       "inactiveMaskColor": "#FAFAFA",
-      "inactiveColoredFileBackground": "#FAFAFA2",
+      "inactiveColoredFileBackground": "#FAFAFA",
       "inactiveUnderlineColor": "#D2D4D5",
       "selectedForeground": "#546E7A",
       "selectedBackground": "#E7E7E8",
       "underlineColor": "#00BCD4",
-      "underlinedTabBackground": "#E7E7E8"
+      "underlinedTabBackground": "#E7E7E8",
+      "underlinedTabForeground": "#546e7a"
     },
     "EditorGroupsTabs": {
       "background": "#FAFAFA",
-      "borderColor": "#FFFFFF",
+      "borderColor": "#eae8e8",
       "hoverBackground": "#E7E7E8",
       "hoverColor": "#E7E7E8",
       "inactiveUnderlineColor": "#00BCD4",
@@ -221,7 +243,7 @@
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#CCD7DA",
+      "Yellow": "#eae8e8",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -238,7 +260,7 @@
     },
     "Focus.color": "#d3e1e8",
     "FormattedTextField": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "caretForeground": "#00BCD4",
       "foreground": "#546E7A",
       "inactiveBackground": "#F3F4F5",
@@ -246,17 +268,18 @@
       "selectionForeground": "#546e7a",
       "selectionBackground": "#E7E7E8"
     },
+    "GotItTooltip.borderColor": "#eae8e8",
     "Group": {
       "disabledSeparatorColor": "#d3e1e8",
       "separatorColor": "#d3e1e8"
     },
     "GutterTooltip": {
-      "infoForeground": "#546E7A",
+      "infoForeground": "#94A7B0",
       "lineSeparatorColor": "#FAFAFA"
     },
     "HeaderColor": {
       "active": "#FAFAFA",
-      "inactive": "#EEEEEE"
+      "inactive": "#F4F4F4"
     },
     "HelpTooltip": {
       "background": "#FAFAFA",
@@ -266,7 +289,7 @@
       "shortcutForeground": "#94A7B0"
     },
     "Hyperlink.linkColor": "#00BCD4",
-    "inactiveCaption": "#FFFFFF",
+    "inactiveCaption": "#eae8e8",
     "inactiveCaptionBorder": "#FAFAFA",
     "inactiveCaptionText": "#94A7B0",
     "info": "#94A7B0",
@@ -288,7 +311,8 @@
       "disabledText": "#D2D4D5",
       "foreground": "#546E7A",
       "infoForeground": "#94A7B0",
-      "selectedForeground": "#546e7a"
+      "selectedForeground": "#546e7a",
+      "selectedDisabledForeground": "#546E7A"
     },
     "Link": {
       "activeForeground": "#00BCD4",
@@ -299,17 +323,19 @@
     },
     "link.foreground": "#00BCD4",
     "List": {
-      "background": "#FFFFFF",
+      "background": "#eae8e8",
       "foreground": "#546E7A",
+      "hoverBackground": "#80CBC480",
+      "hoverInactiveBackground": "#E7E7E8",
       "selectionBackground": "#80CBC450",
       "selectionForeground": "#546e7a",
       "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC440"
+      "selectionInactiveBackground": "#80CBC480"
     },
     "material": {
       "background": "#FAFAFA",
       "branchColor": "#546E7A",
-      "contrast": "#EEEEEE",
+      "contrast": "#F4F4F4",
       "foreground": "#546E7A",
       "mergeCommits": "#F3F4F5",
       "primaryColor": "#94A7B0",
@@ -319,7 +345,7 @@
       "tagColor": "#94A7B0"
     },
     "MemoryIndicator": {
-      "allocatedBackground": "#FFFFFF",
+      "allocatedBackground": "#eae8e8",
       "usedColor": "#E7E7E8",
       "usedBackground": "#E7E7E8"
     },
@@ -328,8 +354,8 @@
       "acceleratorSelectionForeground": "#546e7a",
       "background": "#FAFAFA",
       "border": "4,2,4,2",
-      "borderColor": "#FFFFFF",
-      "disabledBackground": "#FFFFFF",
+      "borderColor": "#eae8e8",
+      "disabledBackground": "#eae8e8",
       "disabledForeground": "#D2D4D5",
       "foreground": "#546E7A",
       "selectionBackground": "#80CBC4",
@@ -337,7 +363,7 @@
       "separatorColor": "#d3e1e8"
     },
     "MenuBar": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "borderColor": "#FAFAFA",
       "disabledBackground": "#FAFAFA",
       "disabledForeground": "#D2D4D5",
@@ -345,7 +371,7 @@
       "highlight": "#FAFAFA",
       "selectionBackground": "#80CBC4",
       "selectionForeground": "#546e7a",
-      "shadow": "#EEEEEE"
+      "shadow": "#F4F4F4"
     },
     "MenuItem": {
       "acceleratorForeground": "#94A7B0",
@@ -367,7 +393,7 @@
         "background": "#FAFAFA"
       },
       "SearchField": {
-        "background": "#EEEEEE"
+        "background": "#F4F4F4"
       }
     },
     "NewPSD.warning": "#00BCD4",
@@ -407,7 +433,7 @@
       "foreground": "#546E7A"
     },
     "ParameterInfo": {
-      "background": "#FFFFFF",
+      "background": "#eae8e8",
       "borderColor": "#E7E7E8",
       "currentOverloadBackground": "#E7E7E8",
       "currentParameterForeground": "#00BCD4",
@@ -417,7 +443,7 @@
       "lineSeparatorColor": "#E7E7E8"
     },
     "PasswordField": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "capsLockIconColor": "#00BCD4",
       "caretForeground": "#00BCD4",
       "foreground": "#546E7A",
@@ -429,7 +455,8 @@
       "background": "#FAFAFA",
       "disabledForeground": "#D2D4D5",
       "eapTagBackground": "#E7E7E8",
-      "lightSelectionBackground": "#80CBC4",
+      "hoverBackground": "#80CBC480",
+      "lightSelectionBackground": "#E7E7E8",
       "paidTagBackground": "#E7E7E8",
       "selectionBackground": "#80CBC4",
       "tagForeground": "#00BCD4",
@@ -442,16 +469,16 @@
         "installFocusedBackground": "#E7E7E8",
         "installFillForeground": "#D2D4D5",
         "installFillBackground": "#F3F4F5",
-        "updateBackground": "#F3F4F5",
+        "updateBackground": "#00BCD4",
         "updateBorderColor": "#F3F4F5",
         "updateForeground": "#546E7A"
       },
       "SearchField": {
-        "background": "#EEEEEE",
+        "background": "#F4F4F4",
         "borderColor": "#d3e1e8"
       },
       "SectionHeader": {
-        "background": "#FFFFFF",
+        "background": "#eae8e8",
         "foreground": "#546E7A"
       },
       "Tab": {
@@ -466,20 +493,20 @@
         "borderColor": "#FAFAFA",
         "foreground": "#00BCD4"
       },
-      "borderColor": "#EEEEEE",
+      "borderColor": "#F4F4F4",
       "inactiveBorderColor": "#FAFAFA",
-      "innerBorderColor": "#FFFFFF",
+      "innerBorderColor": "#eae8e8",
       "Header": {
         "activeBackground": "#FAFAFA",
-        "inactiveBackground": "#EEEEEE"
+        "inactiveBackground": "#F4F4F4"
       },
       "paintBorder": true,
       "separatorForeground": "#546E7A",
-      "separatorColor": "#FFFFFF",
+      "separatorColor": "#eae8e8",
       "Toolbar": {
-        "Floating.background": "#EEEEEE",
-        "background": "#EEEEEE",
-        "borderColor": "#EEEEEE"
+        "Floating.background": "#F4F4F4",
+        "background": "#F4F4F4",
+        "borderColor": "#F4F4F4"
       }
     },
     "PopupMenu": {
@@ -517,6 +544,7 @@
       "selectionBackground": "#80CBC4",
       "selectionForeground": "#546e7a"
     },
+    "ScreenView.borderColor": "#d3e1e8",
     "ScrollBar": {
       "background": "#FAFAFA",
       "hoverThumbBorderColor": "#00BCD4",
@@ -553,7 +581,7 @@
     },
     "SearchEverywhere": {
       "Advertiser": {
-        "background": "#EEEEEE",
+        "background": "#F4F4F4",
         "foreground": "#94A7B0"
       },
       "Header": {
@@ -565,7 +593,7 @@
       },
       "SearchField": {
         "background": "#FAFAFA",
-        "borderColor": "#EEEEEE",
+        "borderColor": "#F4F4F4",
         "infoForeground": "#94A7B0"
       },
       "Tab": {
@@ -576,16 +604,25 @@
     },
     "SearchMatch": {
       "endBackground": "#00BCD4",
-      "startBackground": "#00BCD4"
+      "startBackground": "#00BCD4",
+      "endColor": "#00BCD4",
+      "startColor": "#00BCD4"
     },
     "SearchField.errorBackground": "#eae8e8",
+    "SearchOption": {
+      "selectedBackground": "#E7E7E8"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#94A7B0",
+      "Repeated.File.Foreground": "#546E7A"
+    },
     "Separator": {
-      "background": "#FFFFFF",
-      "foreground": "#FFFFFF",
-      "separatorColor": "#FFFFFF"
+      "background": "#eae8e8",
+      "foreground": "#eae8e8",
+      "separatorColor": "#eae8e8"
     },
     "SidePanel": {
-      "background": "#EEEEEE"
+      "background": "#F4F4F4"
     },
     "Slider": {
       "background": "#FAFAFA",
@@ -593,7 +630,7 @@
       "buttonColor": "#00BCD4",
       "foreground": "#546E7A",
       "majorTickLength": 6,
-      "tickColor": "#FFFFFF",
+      "tickColor": "#eae8e8",
       "trackColor": "#E7E7E8",
       "trackWidth": 7,
       "thumb": "#00BCD4"
@@ -612,11 +649,13 @@
     },
     "SplitPane": {
       "background": "#FAFAFA",
-      "highlight": "#EEEEEE"
+      "highlight": "#F4F4F4"
     },
-    "SplitPaneDivider.draggingColor": "#FFFFFF",
+    "SplitPaneDivider.draggingColor": "#eae8e8",
     "StatusBar": {
-      "borderColor": "#FAFAFA"
+      "borderColor": "#FAFAFA",
+      "hoverBackground": "#E7E7E8",
+      "LightEditBackground": "#E7E7E8"
     },
     "TabbedPane": {
       "background": "#FAFAFA",
@@ -641,11 +680,13 @@
       "tabSelectionHeight": 2,
       "underlineColor": "#00BCD4"
     },
-    "TabbedPane.mt.tab.background": "#EEEEEE",
+    "TabbedPane.mt.tab.background": "#F4F4F4",
     "Table": {
+      "alternativeRowBackground": "#F4F4F4",
       "background": "#FAFAFA",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#D2D4D5",
       "dropLineColor": "#00BCD4",
       "dropLineShortColor": "#00BCD4",
       "focusCellBackground": "#E7E7E8",
@@ -653,33 +694,35 @@
       "foreground": "#546E7A",
       "gridColor": "#FAFAFA",
       "highlightOuter": "#E7E7E8",
+      "hoverBackground": "#80CBC480",
+      "hoverInactiveBackground": "#E7E7E8",
       "lightSelectionForeground": "#546e7a",
       "lightSelectionInactiveForeground": "#94A7B0",
-      "lightSelectionInactiveBackground": "#FFFFFF",
+      "lightSelectionInactiveBackground": "#eae8e8",
       "selectionBackground": "#E7E7E8",
       "selectionForeground": "#546e7a",
       "selectionInactiveBackground": "#E7E7E8",
       "selectionInactiveForeground": "#546e7a",
       "sortIconColor": "#546E7A",
-      "stripeColor": "#EEEEEE"
+      "stripeColor": "#F4F4F4"
     },
     "TableHeader": {
       "background": "#FAFAFA",
       "borderColor": "#FAFAFA",
-      "bottomSeparatorColor": "#FFFFFF",
+      "bottomSeparatorColor": "#eae8e8",
       "cellBorder": "4,0,4,0",
       "disabledForeground": "#D2D4D5",
       "foreground": "#546E7A",
       "focusCellBackground": "#E7E7E8",
       "focusCellForeground": "#546e7a",
       "height": 25,
-      "separatorColor": "#FFFFFF"
+      "separatorColor": "#eae8e8"
     },
     "text": "#94A7B0",
     "textInactiveText": "#94A7B0",
     "textText": "#94A7B0",
     "TextArea": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "caretForeground": "#00BCD4",
       "foreground": "#546E7A",
       "inactiveForeground": "#D2D4D5",
@@ -687,7 +730,7 @@
       "selectionForeground": "#546e7a"
     },
     "TextField": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "caretForeground": "#00BCD4",
       "foreground": "#546E7A",
       "inactiveForeground": "#D2D4D5",
@@ -695,7 +738,7 @@
       "selectionForeground": "#546e7a"
     },
     "TextPane": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "caretForeground": "#00BCD4",
       "foreground": "#546E7A",
       "inactiveForeground": "#D2D4D5",
@@ -703,7 +746,7 @@
       "selectionForeground": "#546e7a"
     },
     "TitlePane": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "Button.hoverBackground": "#E7E7E8",
       "inactiveBackground": "#FAFAFA",
       "infoForeground": "#94A7B0",
@@ -721,7 +764,7 @@
       "onForeground": "#00BCD4"
     },
     "ToolBar": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "borderHandleColor": "#94A7B0",
       "floatingForeground": "#94A7B0",
       "foreground": "#546E7A"
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#FAFAFA",
       "Actions.infoForeground": "#94A7B0",
-      "background": "#FAFAFA",
-      "borderColor": "#E7E7E8",
+      "background": "#eae8e8",
+      "borderColor": "#d3e1e8",
       "foreground": "#546E7A",
       "infoForeground": "#94A7B0",
       "separatorColor": "#d3e1e8",
@@ -740,61 +783,104 @@
       "Button": {
         "hoverBackground": "#E7E7E8",
         "selectedForeground": "#546e7a",
-        "selectedBackground": "#EEEEEE"
+        "selectedBackground": "#F4F4F4"
       },
       "Header": {
         "background": "#FAFAFA",
-        "borderColor": "#FFFFFF",
+        "borderColor": "#eae8e8",
         "inactiveBackground": "#FAFAFA"
       },
       "HeaderCloseButton": {
         "background": "#FAFAFA"
       },
       "HeaderTab": {
+        "borderColor": "#E7E7E8",
         "hoverBackground": "#E7E7E8",
-        "hoverInactiveBackground": "#FFFFFF",
+        "hoverInactiveBackground": "#E7E7E8",
         "inactiveUnderlineColor": "#00BCD4",
-        "selectedBackground": "#EEEEEE",
-        "selectedInactiveBackground": "#EEEEEE",
+        "selectedBackground": "#F4F4F4",
+        "selectedInactiveBackground": "#F4F4F4",
         "underlineColor": "#00BCD4",
         "underlinedTabBackground": "#E7E7E8",
-        "underlinedTabInactiveBackground": "#FFFFFF"
+        "underlinedTabInactiveBackground": "#eae8e8",
+        "underlinedTabForeground": "#546e7a",
+        "underlinedTabInactiveForeground": "#546E7A"
       }
     },
     "Tree": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "foreground": "#94A7B0",
       "hash": "#d3e1e8",
+      "hoverBackground": "#80CBC480",
+      "hoverInactiveBackground": "#E7E7E8",
       "modifiedItemForeground": "#00BCD4",
       "rowHeight": 28,
-      "selectionBackground": "#80CBC440",
+      "selectionBackground": "#80CBC480",
       "selectionForeground": "#546e7a",
       "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC440",
-      "textBackground": "#EEEEEE"
+      "selectionInactiveBackground": "#80CBC480",
+      "textBackground": "#F4F4F4"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#d3e1e8",
-      "ColorPicker.background": "#FAFAFA",
-      "ColorPicker.foreground": "#546E7A",
-      "Component.borderColor": "#d3e1e8",
-      "Component.background": "#FAFAFA",
-      "Component.foreground": "#546E7A",
-      "Connector.borderColor": "#d3e1e8",
-      "Connector.hoverBorderColor": "#E7E7E8",
-      "Canvas.background": "#EEEEEE",
+      "Canvas.background": "#F4F4F4",
+      "ColorPicker": {
+        "background": "#FAFAFA",
+        "foreground": "#546E7A"
+      },
+      "Component": {
+        "borderColor": "#d3e1e8",
+        "background": "#FAFAFA",
+        "foreground": "#546E7A",
+        "hoverBorderColor": "#E7E7E8"
+      },
+      "Connector": {
+        "borderColor": "#d3e1e8",
+        "hoverBorderColor": "#E7E7E8"
+      },
+      "Canvas.background": "#F4F4F4",
       "highStroke.foreground": "#546E7A",
       "Label.foreground": "#94A7B0",
-      "List.selectionBackground": "#80CBC440",
-      "Panel.borderColor": "#d3e1e8",
-      "Panel.background": "#FAFAFA",
+      "List.selectionBackground": "#80CBC480",
+      "motion": {
+        "borderColor": "#d3e1e8",
+        "Component.foreground": "#546E7A",
+        "ConstraintSetText.foreground": "#94A7B0",
+        "ConstraintSet.background": "#eae8e8",
+        "CSPanel.SelectedFocusBackground": "#80CBC4",
+        "CSPanel.SelectedBackground": "#80CBC480",
+        "cs_FocusText.infoForeground": "#94A7B0",
+        "CursorTextColor.foreground": "#546E7A",
+        "HoverColor.disabledBackground": "#D2D4D5",
+        "motionGraph.background": "#FAFAFA",
+        "Notification.background": "#eae8e8",
+        "ourAvg.background": "#eae8e8",
+        "ourCS.background": "#eae8e8",
+        "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",
+        "SecondaryPanel.background": "#FAFAFA",
+        "SecondaryPanel.header.foreground": "#94A7B0",
+        "SecondaryPanel.header.background": "#F4F4F4",
+        "timeLine.disabledBorderColor": "#d3e1e8"
+      },
+      "Panel": {
+        "borderColor": "#d3e1e8",
+        "background": "#FAFAFA"
+      },
       "percent.foreground": "#546E7A",
-      "Placeholder.background": "#FAFAFA",
-      "Placeholder.borderColor": "#d3e1e8",
-      "Placeholder.foreground": "#546E7A",
-      "Placeholder.selectedForeground": "#546e7a",
+      "Placeholder": {
+        "background": "#FAFAFA",
+        "borderColor": "#d3e1e8",
+        "foreground": "#546E7A",
+        "selectedForeground": "#546e7a"
+      },
       "Preview.background": "#FAFAFA",
       "stroke.acceleratorForeground": "#94A7B0"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#94A7B0",
-        "Commit.currentBranchBackground": "#FFFFFF"
+        "Commit.currentBranchBackground": "#eae8e8",
+        "Commit.hoveredBackground": "#80CBC480"
       },
       "RefLabel": {
         "foreground": "#546e7a",
@@ -836,33 +923,39 @@
       }
     },
     "Viewport": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "foreground": "#546E7A"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#FAFAFA",
       "background": "#FAFAFA",
       "borderColor": "#FAFAFA",
-      "captionBackground": "#EEEEEE",
+      "captionBackground": "#F4F4F4",
       "captionForeground": "#546E7A",
-      "footerBackground": "#EEEEEE",
+      "Details.background": "#FAFAFA",
+      "footerBackground": "#F4F4F4",
       "footerForeground": "#546E7A",
       "headerBackground": "#FAFAFA",
       "headerForeground": "#546E7A",
+      "List.background": "#F4F4F4",
       "separatorColor": "#d3e1e8",
+      "SidePanel.background": "#eae8e8",
       "Projects": {
-        "background": "#FFFFFF",
+        "actions.background": "#F4F4F4",
+        "actions.selectionBackground": "#E7E7E8",
+        "background": "#eae8e8",
         "selectionBackground": "#80CBC4",
-        "selectionInactiveBackground": "#FFFFFF"
+        "selectionInactiveBackground": "#eae8e8"
       }
     },
-    "window": "#EEEEEE",
+    "window": "#F4F4F4",
     "windowBorder": "#d3e1e8",
     "windowText": "#94A7B0",
     "Window.border": "#d3e1e8"
   },
   "icons": {
     "ColorPalette": {
-      "#43494A": "#EEEEEE",
+      "#43494A": "#F4F4F4",
       "#6B6B6B": "#94A7B0",
       "#A7A7A7": "#FAFAFA",
       "#3D6185": "#00BCD4",
@@ -879,10 +972,10 @@
       "Actions.GreyInline.Dark": "#546E7A",
       "Actions.Red": "#E53935",
       "Actions.Yellow": "#F6A434",
-      "Checkbox.Background.Default": "#EEEEEE",
-      "Checkbox.Background.Default.Dark": "#EEEEEE",
-      "Checkbox.Background.Disabled": "#CCD7DA",
-      "Checkbox.Background.Disabled.Dark": "#CCD7DA",
+      "Checkbox.Background.Default": "#F4F4F4",
+      "Checkbox.Background.Default.Dark": "#F4F4F4",
+      "Checkbox.Background.Disabled": "#eae8e8",
+      "Checkbox.Background.Disabled.Dark": "#eae8e8",
       "Checkbox.Border.Default": "#d3e1e8",
       "Checkbox.Border.Default.Dark": "#d3e1e8",
       "Checkbox.Border.Disabled": "#D2D4D5",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter.theme.json

@@ -3,24 +3,30 @@
   "dark": false,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Lighter.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/lighter.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#94A7B0",
       "background": "#FAFAFA",
       "borderColor": "#d3e1e8",
-      "disabledBackground": "#CCD7DA",
+      "disabledBackground": "#eae8e8",
       "disabledForeground": "#D2D4D5",
       "disabledText": "#D2D4D5",
       "focusColor": "#E7E7E8",
       "focusedBorderColor": "#00BCD4",
       "foreground": "#546E7A",
-      "inactiveBackground": "#CCD7DA",
+      "inactiveBackground": "#eae8e8",
       "inactiveForeground": "#94A7B0",
       "infoForeground": "#94A7B0",
       "selectionBackground": "#80CBC4",
-      "selectionBackgroundInactive": "#FFFFFF",
+      "selectionBackgroundInactive": "#eae8e8",
       "selectionForeground": "#546e7a",
-      "selectionInactiveBackground": "#FFFFFF",
+      "selectionInactiveBackground": "#eae8e8",
       "separatorColor": "#d3e1e8"
     },
     "activeCaption": "#FAFAFA",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#d3e1e8",
       "Tooltip.background": "#eae8e8"
     },
-    "Content.background": "#EEEEEE",
+    "Content": {
+      "background": "#F4F4F4",
+      "selectionBackground": "#80CBC4"
+    },
     "CheckBox": {
       "background": "#FAFAFA",
       "disabledText": "#D2D4D5",
@@ -89,6 +98,14 @@
       "selectionBackground": "#80CBC4",
       "selectionForeground": "#546e7a"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#546E7A",
+      "AccessEnabled": {
+        "accessDot": "#00BCD4",
+        "dropdownBorder": "#eae8e8",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#FAFAFA",
       "foreground": "#546E7A",
@@ -104,17 +121,18 @@
       },
       "background": "#FAFAFA",
       "buttonBackground": "#F3F4F5",
+      "darcula.hoveredArrowButtonForeground": "#00BCD4",
       "disabledForeground": "#D2D4D5",
       "foreground": "#546E7A",
       "modifiedItemForeground": "#00BCD4",
-      "nonEditableBackground": "#FFFFFF",
+      "nonEditableBackground": "#eae8e8",
       "padding": "5,5,5,5",
       "selectionBackground": "#E7E7E8",
       "selectionForeground": "#546e7a"
     },
     "ComboPopup.border": "#d3e1e8",
     "CompletionPopup": {
-      "background": "#FFFFFF",
+      "background": "#eae8e8",
       "foreground": "#546E7A",
       "infoForeground": "#94A7B0",
       "matchForeground": "#00BCD4",
@@ -168,11 +186,13 @@
       "hoverBackground": "#E7E7E8",
       "hoverColor": "#FAFAFA",
       "hoverMaskColor": "#E7E7E8",
+      "inactiveColoredTabBackground": "#FAFAFA",
       "inactiveColoredFileBackground": "#F3F4F5",
-      "inactiveUnderlineColor": "#D2D4D5",
+      "inactiveUnderlineColor": "#00BCD4",
       "inactiveMaskColor": "#FAFAFA",
       "underlineColor": "#00BCD4",
-      "underlinedTabBackground": "#E7E7E8"
+      "underlinedTabBackground": "#E7E7E8",
+      "underlinedTabForeground": "#546e7a"
     },
     "Desktop.background": "#FAFAFA",
     "DialogWrapper.southPanelBackground": "#FAFAFA",
@@ -197,20 +217,22 @@
       "selectionForeground": "#546e7a"
     },
     "EditorTabs": {
-      "borderColor": "#FFFFFF",
+      "borderColor": "#eae8e8",
+      "hoverBackground": "#E7E7E8",
       "hoverColor": "#E7E7E8",
       "hoverMaskColor": "#E7E7E8",
       "inactiveMaskColor": "#FAFAFA",
-      "inactiveColoredFileBackground": "#FAFAFA2",
+      "inactiveColoredFileBackground": "#FAFAFA",
       "inactiveUnderlineColor": "#D2D4D5",
       "selectedForeground": "#546E7A",
       "selectedBackground": "#E7E7E8",
       "underlineColor": "#00BCD4",
-      "underlinedTabBackground": "#E7E7E8"
+      "underlinedTabBackground": "#E7E7E8",
+      "underlinedTabForeground": "#546e7a"
     },
     "EditorGroupsTabs": {
       "background": "#FAFAFA",
-      "borderColor": "#FFFFFF",
+      "borderColor": "#eae8e8",
       "hoverBackground": "#E7E7E8",
       "hoverColor": "#E7E7E8",
       "inactiveUnderlineColor": "#00BCD4",
@@ -221,7 +243,7 @@
     "FileColor": {
       "Green": "#387002",
       "Blue": "#004BA0",
-      "Yellow": "#CCD7DA",
+      "Yellow": "#eae8e8",
       "Orange": "#B53D00",
       "Violet": "#4D2C91",
       "Rose": "#A00037"
@@ -246,17 +268,18 @@
       "selectionForeground": "#546e7a",
       "selectionBackground": "#E7E7E8"
     },
+    "GotItTooltip.borderColor": "#eae8e8",
     "Group": {
       "disabledSeparatorColor": "#d3e1e8",
       "separatorColor": "#d3e1e8"
     },
     "GutterTooltip": {
-      "infoForeground": "#546E7A",
+      "infoForeground": "#94A7B0",
       "lineSeparatorColor": "#FAFAFA"
     },
     "HeaderColor": {
       "active": "#FAFAFA",
-      "inactive": "#EEEEEE"
+      "inactive": "#F4F4F4"
     },
     "HelpTooltip": {
       "background": "#FAFAFA",
@@ -266,7 +289,7 @@
       "shortcutForeground": "#94A7B0"
     },
     "Hyperlink.linkColor": "#00BCD4",
-    "inactiveCaption": "#FFFFFF",
+    "inactiveCaption": "#eae8e8",
     "inactiveCaptionBorder": "#FAFAFA",
     "inactiveCaptionText": "#94A7B0",
     "info": "#94A7B0",
@@ -288,7 +311,8 @@
       "disabledText": "#D2D4D5",
       "foreground": "#546E7A",
       "infoForeground": "#94A7B0",
-      "selectedForeground": "#546e7a"
+      "selectedForeground": "#546e7a",
+      "selectedDisabledForeground": "#546E7A"
     },
     "Link": {
       "activeForeground": "#00BCD4",
@@ -299,17 +323,19 @@
     },
     "link.foreground": "#00BCD4",
     "List": {
-      "background": "#FFFFFF",
+      "background": "#eae8e8",
       "foreground": "#546E7A",
+      "hoverBackground": "#80CBC480",
+      "hoverInactiveBackground": "#E7E7E8",
       "selectionBackground": "#80CBC450",
       "selectionForeground": "#546e7a",
       "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC440"
+      "selectionInactiveBackground": "#80CBC480"
     },
     "material": {
       "background": "#FAFAFA",
       "branchColor": "#546E7A",
-      "contrast": "#EEEEEE",
+      "contrast": "#F4F4F4",
       "foreground": "#546E7A",
       "mergeCommits": "#F3F4F5",
       "primaryColor": "#94A7B0",
@@ -319,7 +345,7 @@
       "tagColor": "#94A7B0"
     },
     "MemoryIndicator": {
-      "allocatedBackground": "#FFFFFF",
+      "allocatedBackground": "#eae8e8",
       "usedColor": "#E7E7E8",
       "usedBackground": "#E7E7E8"
     },
@@ -328,8 +354,8 @@
       "acceleratorSelectionForeground": "#546e7a",
       "background": "#FAFAFA",
       "border": "4,2,4,2",
-      "borderColor": "#FFFFFF",
-      "disabledBackground": "#FFFFFF",
+      "borderColor": "#eae8e8",
+      "disabledBackground": "#eae8e8",
       "disabledForeground": "#D2D4D5",
       "foreground": "#546E7A",
       "selectionBackground": "#80CBC4",
@@ -407,7 +433,7 @@
       "foreground": "#546E7A"
     },
     "ParameterInfo": {
-      "background": "#FFFFFF",
+      "background": "#eae8e8",
       "borderColor": "#E7E7E8",
       "currentOverloadBackground": "#E7E7E8",
       "currentParameterForeground": "#00BCD4",
@@ -429,7 +455,8 @@
       "background": "#FAFAFA",
       "disabledForeground": "#D2D4D5",
       "eapTagBackground": "#E7E7E8",
-      "lightSelectionBackground": "#80CBC4",
+      "hoverBackground": "#80CBC480",
+      "lightSelectionBackground": "#E7E7E8",
       "paidTagBackground": "#E7E7E8",
       "selectionBackground": "#80CBC4",
       "tagForeground": "#00BCD4",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#E7E7E8",
         "installFillForeground": "#D2D4D5",
         "installFillBackground": "#F3F4F5",
-        "updateBackground": "#F3F4F5",
+        "updateBackground": "#00BCD4",
         "updateBorderColor": "#F3F4F5",
         "updateForeground": "#546E7A"
       },
@@ -451,7 +478,7 @@
         "borderColor": "#d3e1e8"
       },
       "SectionHeader": {
-        "background": "#FFFFFF",
+        "background": "#eae8e8",
         "foreground": "#546E7A"
       },
       "Tab": {
@@ -466,20 +493,20 @@
         "borderColor": "#FAFAFA",
         "foreground": "#00BCD4"
       },
-      "borderColor": "#EEEEEE",
+      "borderColor": "#F4F4F4",
       "inactiveBorderColor": "#FAFAFA",
-      "innerBorderColor": "#FFFFFF",
+      "innerBorderColor": "#eae8e8",
       "Header": {
         "activeBackground": "#FAFAFA",
-        "inactiveBackground": "#EEEEEE"
+        "inactiveBackground": "#F4F4F4"
       },
       "paintBorder": true,
       "separatorForeground": "#546E7A",
-      "separatorColor": "#FFFFFF",
+      "separatorColor": "#eae8e8",
       "Toolbar": {
-        "Floating.background": "#EEEEEE",
-        "background": "#EEEEEE",
-        "borderColor": "#EEEEEE"
+        "Floating.background": "#F4F4F4",
+        "background": "#F4F4F4",
+        "borderColor": "#F4F4F4"
       }
     },
     "PopupMenu": {
@@ -517,6 +544,7 @@
       "selectionBackground": "#80CBC4",
       "selectionForeground": "#546e7a"
     },
+    "ScreenView.borderColor": "#d3e1e8",
     "ScrollBar": {
       "background": "#FAFAFA",
       "hoverThumbBorderColor": "#00BCD4",
@@ -553,7 +581,7 @@
     },
     "SearchEverywhere": {
       "Advertiser": {
-        "background": "#EEEEEE",
+        "background": "#F4F4F4",
         "foreground": "#94A7B0"
       },
       "Header": {
@@ -565,7 +593,7 @@
       },
       "SearchField": {
         "background": "#FAFAFA",
-        "borderColor": "#EEEEEE",
+        "borderColor": "#F4F4F4",
         "infoForeground": "#94A7B0"
       },
       "Tab": {
@@ -576,13 +604,22 @@
     },
     "SearchMatch": {
       "endBackground": "#00BCD4",
-      "startBackground": "#00BCD4"
+      "startBackground": "#00BCD4",
+      "endColor": "#00BCD4",
+      "startColor": "#00BCD4"
     },
     "SearchField.errorBackground": "#eae8e8",
+    "SearchOption": {
+      "selectedBackground": "#E7E7E8"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#94A7B0",
+      "Repeated.File.Foreground": "#546E7A"
+    },
     "Separator": {
-      "background": "#FFFFFF",
-      "foreground": "#FFFFFF",
-      "separatorColor": "#FFFFFF"
+      "background": "#eae8e8",
+      "foreground": "#eae8e8",
+      "separatorColor": "#eae8e8"
     },
     "SidePanel": {
       "background": "#FAFAFA"
@@ -593,7 +630,7 @@
       "buttonColor": "#00BCD4",
       "foreground": "#546E7A",
       "majorTickLength": 6,
-      "tickColor": "#FFFFFF",
+      "tickColor": "#eae8e8",
       "trackColor": "#E7E7E8",
       "trackWidth": 7,
       "thumb": "#00BCD4"
@@ -614,9 +651,11 @@
       "background": "#FAFAFA",
       "highlight": "#FAFAFA"
     },
-    "SplitPaneDivider.draggingColor": "#FFFFFF",
+    "SplitPaneDivider.draggingColor": "#eae8e8",
     "StatusBar": {
-      "borderColor": "#FAFAFA"
+      "borderColor": "#FAFAFA",
+      "hoverBackground": "#E7E7E8",
+      "LightEditBackground": "#E7E7E8"
     },
     "TabbedPane": {
       "background": "#FAFAFA",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#FAFAFA",
     "Table": {
+      "alternativeRowBackground": "#F4F4F4",
       "background": "#FAFAFA",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#D2D4D5",
       "dropLineColor": "#00BCD4",
       "dropLineShortColor": "#00BCD4",
       "focusCellBackground": "#E7E7E8",
@@ -653,27 +694,29 @@
       "foreground": "#546E7A",
       "gridColor": "#FAFAFA",
       "highlightOuter": "#E7E7E8",
+      "hoverBackground": "#80CBC480",
+      "hoverInactiveBackground": "#E7E7E8",
       "lightSelectionForeground": "#546e7a",
       "lightSelectionInactiveForeground": "#94A7B0",
-      "lightSelectionInactiveBackground": "#FFFFFF",
+      "lightSelectionInactiveBackground": "#eae8e8",
       "selectionBackground": "#E7E7E8",
       "selectionForeground": "#546e7a",
       "selectionInactiveBackground": "#E7E7E8",
       "selectionInactiveForeground": "#546e7a",
       "sortIconColor": "#546E7A",
-      "stripeColor": "#EEEEEE"
+      "stripeColor": "#F4F4F4"
     },
     "TableHeader": {
       "background": "#FAFAFA",
       "borderColor": "#FAFAFA",
-      "bottomSeparatorColor": "#FFFFFF",
+      "bottomSeparatorColor": "#eae8e8",
       "cellBorder": "4,0,4,0",
       "disabledForeground": "#D2D4D5",
       "foreground": "#546E7A",
       "focusCellBackground": "#E7E7E8",
       "focusCellForeground": "#546e7a",
       "height": 25,
-      "separatorColor": "#FFFFFF"
+      "separatorColor": "#eae8e8"
     },
     "text": "#94A7B0",
     "textInactiveText": "#94A7B0",
@@ -703,7 +746,7 @@
       "selectionForeground": "#546e7a"
     },
     "TitlePane": {
-      "background": "#EEEEEE",
+      "background": "#F4F4F4",
       "Button.hoverBackground": "#E7E7E8",
       "inactiveBackground": "#FAFAFA",
       "infoForeground": "#94A7B0",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#FAFAFA",
       "Actions.infoForeground": "#94A7B0",
-      "background": "#FAFAFA",
-      "borderColor": "#E7E7E8",
+      "background": "#eae8e8",
+      "borderColor": "#d3e1e8",
       "foreground": "#546E7A",
       "infoForeground": "#94A7B0",
       "separatorColor": "#d3e1e8",
@@ -740,61 +783,104 @@
       "Button": {
         "hoverBackground": "#E7E7E8",
         "selectedForeground": "#546e7a",
-        "selectedBackground": "#EEEEEE"
+        "selectedBackground": "#F4F4F4"
       },
       "Header": {
         "background": "#FAFAFA",
-        "borderColor": "#FFFFFF",
+        "borderColor": "#eae8e8",
         "inactiveBackground": "#FAFAFA"
       },
       "HeaderCloseButton": {
         "background": "#FAFAFA"
       },
       "HeaderTab": {
+        "borderColor": "#E7E7E8",
         "hoverBackground": "#E7E7E8",
-        "hoverInactiveBackground": "#FFFFFF",
+        "hoverInactiveBackground": "#E7E7E8",
         "inactiveUnderlineColor": "#00BCD4",
-        "selectedBackground": "#EEEEEE",
-        "selectedInactiveBackground": "#EEEEEE",
+        "selectedBackground": "#F4F4F4",
+        "selectedInactiveBackground": "#F4F4F4",
         "underlineColor": "#00BCD4",
         "underlinedTabBackground": "#E7E7E8",
-        "underlinedTabInactiveBackground": "#FFFFFF"
+        "underlinedTabInactiveBackground": "#eae8e8",
+        "underlinedTabForeground": "#546e7a",
+        "underlinedTabInactiveForeground": "#546E7A"
       }
     },
     "Tree": {
       "background": "#FAFAFA",
       "foreground": "#94A7B0",
       "hash": "#d3e1e8",
+      "hoverBackground": "#80CBC480",
+      "hoverInactiveBackground": "#E7E7E8",
       "modifiedItemForeground": "#00BCD4",
       "rowHeight": 28,
-      "selectionBackground": "#80CBC440",
+      "selectionBackground": "#80CBC480",
       "selectionForeground": "#546e7a",
       "selectionInactiveForeground": "#546e7a",
-      "selectionInactiveBackground": "#80CBC440",
+      "selectionInactiveBackground": "#80CBC480",
       "textBackground": "#FAFAFA"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#d3e1e8",
-      "ColorPicker.background": "#FAFAFA",
-      "ColorPicker.foreground": "#546E7A",
-      "Component.borderColor": "#d3e1e8",
-      "Component.background": "#FAFAFA",
-      "Component.foreground": "#546E7A",
-      "Connector.borderColor": "#d3e1e8",
-      "Connector.hoverBorderColor": "#E7E7E8",
-      "Canvas.background": "#EEEEEE",
+      "Canvas.background": "#F4F4F4",
+      "ColorPicker": {
+        "background": "#FAFAFA",
+        "foreground": "#546E7A"
+      },
+      "Component": {
+        "borderColor": "#d3e1e8",
+        "background": "#FAFAFA",
+        "foreground": "#546E7A",
+        "hoverBorderColor": "#E7E7E8"
+      },
+      "Connector": {
+        "borderColor": "#d3e1e8",
+        "hoverBorderColor": "#E7E7E8"
+      },
+      "Canvas.background": "#F4F4F4",
       "highStroke.foreground": "#546E7A",
       "Label.foreground": "#94A7B0",
-      "List.selectionBackground": "#80CBC440",
-      "Panel.borderColor": "#d3e1e8",
-      "Panel.background": "#FAFAFA",
+      "List.selectionBackground": "#80CBC480",
+      "motion": {
+        "borderColor": "#d3e1e8",
+        "Component.foreground": "#546E7A",
+        "ConstraintSetText.foreground": "#94A7B0",
+        "ConstraintSet.background": "#eae8e8",
+        "CSPanel.SelectedFocusBackground": "#80CBC4",
+        "CSPanel.SelectedBackground": "#80CBC480",
+        "cs_FocusText.infoForeground": "#94A7B0",
+        "CursorTextColor.foreground": "#546E7A",
+        "HoverColor.disabledBackground": "#D2D4D5",
+        "motionGraph.background": "#FAFAFA",
+        "Notification.background": "#eae8e8",
+        "ourAvg.background": "#eae8e8",
+        "ourCS.background": "#eae8e8",
+        "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",
+        "SecondaryPanel.background": "#FAFAFA",
+        "SecondaryPanel.header.foreground": "#94A7B0",
+        "SecondaryPanel.header.background": "#F4F4F4",
+        "timeLine.disabledBorderColor": "#d3e1e8"
+      },
+      "Panel": {
+        "borderColor": "#d3e1e8",
+        "background": "#FAFAFA"
+      },
       "percent.foreground": "#546E7A",
-      "Placeholder.background": "#FAFAFA",
-      "Placeholder.borderColor": "#d3e1e8",
-      "Placeholder.foreground": "#546E7A",
-      "Placeholder.selectedForeground": "#546e7a",
+      "Placeholder": {
+        "background": "#FAFAFA",
+        "borderColor": "#d3e1e8",
+        "foreground": "#546E7A",
+        "selectedForeground": "#546e7a"
+      },
       "Preview.background": "#FAFAFA",
       "stroke.acceleratorForeground": "#94A7B0"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#94A7B0",
-        "Commit.currentBranchBackground": "#FFFFFF"
+        "Commit.currentBranchBackground": "#eae8e8",
+        "Commit.hoveredBackground": "#80CBC480"
       },
       "RefLabel": {
         "foreground": "#546e7a",
@@ -840,19 +927,25 @@
       "foreground": "#546E7A"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#FAFAFA",
       "background": "#FAFAFA",
       "borderColor": "#FAFAFA",
-      "captionBackground": "#EEEEEE",
+      "captionBackground": "#F4F4F4",
       "captionForeground": "#546E7A",
-      "footerBackground": "#EEEEEE",
+      "Details.background": "#FAFAFA",
+      "footerBackground": "#F4F4F4",
       "footerForeground": "#546E7A",
       "headerBackground": "#FAFAFA",
       "headerForeground": "#546E7A",
+      "List.background": "#F4F4F4",
       "separatorColor": "#d3e1e8",
+      "SidePanel.background": "#eae8e8",
       "Projects": {
-        "background": "#FFFFFF",
+        "actions.background": "#F4F4F4",
+        "actions.selectionBackground": "#E7E7E8",
+        "background": "#eae8e8",
         "selectionBackground": "#80CBC4",
-        "selectionInactiveBackground": "#FFFFFF"
+        "selectionInactiveBackground": "#eae8e8"
       }
     },
     "window": "#FAFAFA",
@@ -862,7 +955,7 @@
   },
   "icons": {
     "ColorPalette": {
-      "#43494A": "#EEEEEE",
+      "#43494A": "#F4F4F4",
       "#6B6B6B": "#94A7B0",
       "#A7A7A7": "#FAFAFA",
       "#3D6185": "#00BCD4",
@@ -879,10 +972,10 @@
       "Actions.GreyInline.Dark": "#546E7A",
       "Actions.Red": "#E53935",
       "Actions.Yellow": "#F6A434",
-      "Checkbox.Background.Default": "#EEEEEE",
-      "Checkbox.Background.Default.Dark": "#EEEEEE",
-      "Checkbox.Background.Disabled": "#CCD7DA",
-      "Checkbox.Background.Disabled.Dark": "#CCD7DA",
+      "Checkbox.Background.Default": "#F4F4F4",
+      "Checkbox.Background.Default.Dark": "#F4F4F4",
+      "Checkbox.Background.Disabled": "#eae8e8",
+      "Checkbox.Background.Disabled.Dark": "#eae8e8",
       "Checkbox.Border.Default": "#d3e1e8",
       "Checkbox.Border.Default.Dark": "#d3e1e8",
       "Checkbox.Border.Disabled": "#D2D4D5",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic Contrast.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Oceanic.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/oceanic.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#607D8B",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#2A373E",
       "Tooltip.background": "#1E272C"
     },
-    "Content.background": "#1E272C",
+    "Content": {
+      "background": "#1E272C",
+      "selectionBackground": "#546E7A"
+    },
     "CheckBox": {
       "background": "#263238",
       "disabledText": "#415967",
@@ -89,6 +98,14 @@
       "selectionBackground": "#546E7A",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#B0BEC5",
+      "AccessEnabled": {
+        "accessDot": "#009688",
+        "dropdownBorder": "#32424A",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#263238",
       "foreground": "#B0BEC5",
@@ -104,6 +121,7 @@
       },
       "background": "#1E272C",
       "buttonBackground": "#2E3C43",
+      "darcula.hoveredArrowButtonForeground": "#009688",
       "disabledForeground": "#415967",
       "foreground": "#B0BEC5",
       "modifiedItemForeground": "#009688",
@@ -168,11 +186,13 @@
       "hoverBackground": "#314549",
       "hoverColor": "#1E272C",
       "hoverMaskColor": "#425B67",
+      "inactiveColoredTabBackground": "#263238",
       "inactiveColoredFileBackground": "#2E3C43",
-      "inactiveUnderlineColor": "#415967",
+      "inactiveUnderlineColor": "#009688",
       "inactiveMaskColor": "#1E272C",
       "underlineColor": "#009688",
-      "underlinedTabBackground": "#314549"
+      "underlinedTabBackground": "#314549",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#263238",
     "DialogWrapper.southPanelBackground": "#263238",
@@ -198,15 +218,17 @@
     },
     "EditorTabs": {
       "borderColor": "#32424A",
+      "hoverBackground": "#425B67",
       "hoverColor": "#425B67",
       "hoverMaskColor": "#425B67",
       "inactiveMaskColor": "#263238",
-      "inactiveColoredFileBackground": "#2632382",
+      "inactiveColoredFileBackground": "#263238",
       "inactiveUnderlineColor": "#415967",
       "selectedForeground": "#B0BEC5",
       "selectedBackground": "#314549",
       "underlineColor": "#009688",
-      "underlinedTabBackground": "#314549"
+      "underlinedTabBackground": "#314549",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#263238",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#314549"
     },
+    "GotItTooltip.borderColor": "#1E272C",
     "Group": {
       "disabledSeparatorColor": "#2A373E",
       "separatorColor": "#2A373E"
     },
     "GutterTooltip": {
-      "infoForeground": "#B0BEC5",
+      "infoForeground": "#607D8B",
       "lineSeparatorColor": "#263238"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#415967",
       "foreground": "#B0BEC5",
       "infoForeground": "#607D8B",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#B0BEC5"
     },
     "Link": {
       "activeForeground": "#009688",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#32424A",
       "foreground": "#B0BEC5",
+      "hoverBackground": "#546E7A70",
+      "hoverInactiveBackground": "#314549",
       "selectionBackground": "#546E7A50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#546E7A50"
+      "selectionInactiveBackground": "#546E7A70"
     },
     "material": {
       "background": "#263238",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#32424A",
       "borderColor": "#314549",
-      "currentOverloadBackground": "#314549",
+      "currentOverloadBackground": "#425B67",
       "currentParameterForeground": "#009688",
       "disabledForeground": "#415967",
       "foreground": "#B0BEC5",
@@ -429,7 +455,8 @@
       "background": "#263238",
       "disabledForeground": "#415967",
       "eapTagBackground": "#425B67",
-      "lightSelectionBackground": "#546E7A",
+      "hoverBackground": "#546E7A70",
+      "lightSelectionBackground": "#314549",
       "paidTagBackground": "#425B67",
       "selectionBackground": "#546E7A",
       "tagForeground": "#009688",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#425B67",
         "installFillForeground": "#415967",
         "installFillBackground": "#2E3C43",
-        "updateBackground": "#2E3C43",
+        "updateBackground": "#009688",
         "updateBorderColor": "#2E3C43",
         "updateForeground": "#B0BEC5"
       },
@@ -517,6 +544,7 @@
       "selectionBackground": "#546E7A",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#2A373E",
     "ScrollBar": {
       "background": "#263238",
       "hoverThumbBorderColor": "#009688",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#009688",
-      "startBackground": "#009688"
+      "startBackground": "#009688",
+      "endColor": "#009688",
+      "startColor": "#009688"
     },
     "SearchField.errorBackground": "#1E272C",
+    "SearchOption": {
+      "selectedBackground": "#314549"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#607D8B",
+      "Repeated.File.Foreground": "#B0BEC5"
+    },
     "Separator": {
       "background": "#32424A",
       "foreground": "#32424A",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#32424A",
     "StatusBar": {
-      "borderColor": "#263238"
+      "borderColor": "#263238",
+      "hoverBackground": "#425B67",
+      "LightEditBackground": "#314549"
     },
     "TabbedPane": {
       "background": "#263238",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#1E272C",
     "Table": {
+      "alternativeRowBackground": "#1E272C",
       "background": "#263238",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#415967",
       "dropLineColor": "#009688",
       "dropLineShortColor": "#009688",
       "focusCellBackground": "#314549",
@@ -653,6 +694,8 @@
       "foreground": "#B0BEC5",
       "gridColor": "#263238",
       "highlightOuter": "#314549",
+      "hoverBackground": "#546E7A70",
+      "hoverInactiveBackground": "#314549",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#607D8B",
       "lightSelectionInactiveBackground": "#32424A",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#263238",
       "Actions.infoForeground": "#607D8B",
-      "background": "#263238",
-      "borderColor": "#425B67",
+      "background": "#1E272C",
+      "borderColor": "#2A373E",
       "foreground": "#B0BEC5",
       "infoForeground": "#607D8B",
       "separatorColor": "#2A373E",
@@ -751,50 +794,93 @@
         "background": "#263238"
       },
       "HeaderTab": {
+        "borderColor": "#425B67",
         "hoverBackground": "#425B67",
-        "hoverInactiveBackground": "#32424A",
+        "hoverInactiveBackground": "#425B67",
         "inactiveUnderlineColor": "#009688",
         "selectedBackground": "#1E272C",
         "selectedInactiveBackground": "#1E272C",
         "underlineColor": "#009688",
-        "underlinedTabBackground": "#425B67",
-        "underlinedTabInactiveBackground": "#32424A"
+        "underlinedTabBackground": "#314549",
+        "underlinedTabInactiveBackground": "#32424A",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#B0BEC5"
       }
     },
     "Tree": {
       "background": "#1E272C",
       "foreground": "#607D8B",
       "hash": "#2A373E",
+      "hoverBackground": "#546E7A70",
+      "hoverInactiveBackground": "#314549",
       "modifiedItemForeground": "#009688",
       "rowHeight": 28,
-      "selectionBackground": "#546E7A50",
+      "selectionBackground": "#546E7A70",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#546E7A50",
+      "selectionInactiveBackground": "#546E7A70",
       "textBackground": "#1E272C"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#2A373E",
-      "ColorPicker.background": "#263238",
-      "ColorPicker.foreground": "#B0BEC5",
-      "Component.borderColor": "#2A373E",
-      "Component.background": "#263238",
-      "Component.foreground": "#B0BEC5",
-      "Connector.borderColor": "#2A373E",
-      "Connector.hoverBorderColor": "#425B67",
+      "Canvas.background": "#1E272C",
+      "ColorPicker": {
+        "background": "#263238",
+        "foreground": "#B0BEC5"
+      },
+      "Component": {
+        "borderColor": "#2A373E",
+        "background": "#263238",
+        "foreground": "#B0BEC5",
+        "hoverBorderColor": "#425B67"
+      },
+      "Connector": {
+        "borderColor": "#2A373E",
+        "hoverBorderColor": "#425B67"
+      },
       "Canvas.background": "#1E272C",
       "highStroke.foreground": "#B0BEC5",
       "Label.foreground": "#607D8B",
-      "List.selectionBackground": "#546E7A50",
-      "Panel.borderColor": "#2A373E",
-      "Panel.background": "#263238",
+      "List.selectionBackground": "#546E7A70",
+      "motion": {
+        "borderColor": "#2A373E",
+        "Component.foreground": "#B0BEC5",
+        "ConstraintSetText.foreground": "#607D8B",
+        "ConstraintSet.background": "#32424A",
+        "CSPanel.SelectedFocusBackground": "#546E7A",
+        "CSPanel.SelectedBackground": "#546E7A70",
+        "cs_FocusText.infoForeground": "#607D8B",
+        "CursorTextColor.foreground": "#B0BEC5",
+        "HoverColor.disabledBackground": "#415967",
+        "motionGraph.background": "#263238",
+        "Notification.background": "#1E272C",
+        "ourAvg.background": "#32424A",
+        "ourCS.background": "#32424A",
+        "ourCS_Border.borderColor": "#2A373E",
+        "ourCS_TextColor.foreground": "#607D8B",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#314549",
+        "ourCS_SelectedBorder.pressedBorderColor": "#425B67",
+        "ourML_BarColor.separatorColor": "#2A373E",
+        "PrimaryPanel.background": "#1E272C",
+        "SecondaryPanel.background": "#263238",
+        "SecondaryPanel.header.foreground": "#607D8B",
+        "SecondaryPanel.header.background": "#1E272C",
+        "timeLine.disabledBorderColor": "#2A373E"
+      },
+      "Panel": {
+        "borderColor": "#2A373E",
+        "background": "#263238"
+      },
       "percent.foreground": "#B0BEC5",
-      "Placeholder.background": "#263238",
-      "Placeholder.borderColor": "#2A373E",
-      "Placeholder.foreground": "#B0BEC5",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#263238",
+        "borderColor": "#2A373E",
+        "foreground": "#B0BEC5",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#263238",
       "stroke.acceleratorForeground": "#607D8B"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#607D8B",
-        "Commit.currentBranchBackground": "#32424A"
+        "Commit.currentBranchBackground": "#32424A",
+        "Commit.hoveredBackground": "#546E7A70"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,16 +927,22 @@
       "foreground": "#B0BEC5"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#263238",
       "background": "#263238",
       "borderColor": "#263238",
       "captionBackground": "#1E272C",
       "captionForeground": "#B0BEC5",
+      "Details.background": "#263238",
       "footerBackground": "#1E272C",
       "footerForeground": "#B0BEC5",
       "headerBackground": "#263238",
       "headerForeground": "#B0BEC5",
+      "List.background": "#1E272C",
       "separatorColor": "#2A373E",
+      "SidePanel.background": "#32424A",
       "Projects": {
+        "actions.background": "#1E272C",
+        "actions.selectionBackground": "#425B67",
         "background": "#32424A",
         "selectionBackground": "#546E7A",
         "selectionInactiveBackground": "#32424A"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Oceanic.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/oceanic.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#607D8B",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#2A373E",
       "Tooltip.background": "#1E272C"
     },
-    "Content.background": "#1E272C",
+    "Content": {
+      "background": "#1E272C",
+      "selectionBackground": "#546E7A"
+    },
     "CheckBox": {
       "background": "#263238",
       "disabledText": "#415967",
@@ -89,6 +98,14 @@
       "selectionBackground": "#546E7A",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#B0BEC5",
+      "AccessEnabled": {
+        "accessDot": "#009688",
+        "dropdownBorder": "#32424A",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#263238",
       "foreground": "#B0BEC5",
@@ -104,6 +121,7 @@
       },
       "background": "#263238",
       "buttonBackground": "#2E3C43",
+      "darcula.hoveredArrowButtonForeground": "#009688",
       "disabledForeground": "#415967",
       "foreground": "#B0BEC5",
       "modifiedItemForeground": "#009688",
@@ -168,11 +186,13 @@
       "hoverBackground": "#314549",
       "hoverColor": "#263238",
       "hoverMaskColor": "#425B67",
+      "inactiveColoredTabBackground": "#263238",
       "inactiveColoredFileBackground": "#2E3C43",
-      "inactiveUnderlineColor": "#415967",
+      "inactiveUnderlineColor": "#009688",
       "inactiveMaskColor": "#263238",
       "underlineColor": "#009688",
-      "underlinedTabBackground": "#314549"
+      "underlinedTabBackground": "#314549",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#263238",
     "DialogWrapper.southPanelBackground": "#263238",
@@ -198,15 +218,17 @@
     },
     "EditorTabs": {
       "borderColor": "#32424A",
+      "hoverBackground": "#425B67",
       "hoverColor": "#425B67",
       "hoverMaskColor": "#425B67",
       "inactiveMaskColor": "#263238",
-      "inactiveColoredFileBackground": "#2632382",
+      "inactiveColoredFileBackground": "#263238",
       "inactiveUnderlineColor": "#415967",
       "selectedForeground": "#B0BEC5",
       "selectedBackground": "#314549",
       "underlineColor": "#009688",
-      "underlinedTabBackground": "#314549"
+      "underlinedTabBackground": "#314549",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#263238",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#314549"
     },
+    "GotItTooltip.borderColor": "#1E272C",
     "Group": {
       "disabledSeparatorColor": "#2A373E",
       "separatorColor": "#2A373E"
     },
     "GutterTooltip": {
-      "infoForeground": "#B0BEC5",
+      "infoForeground": "#607D8B",
       "lineSeparatorColor": "#263238"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#415967",
       "foreground": "#B0BEC5",
       "infoForeground": "#607D8B",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#B0BEC5"
     },
     "Link": {
       "activeForeground": "#009688",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#32424A",
       "foreground": "#B0BEC5",
+      "hoverBackground": "#546E7A70",
+      "hoverInactiveBackground": "#314549",
       "selectionBackground": "#546E7A50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#546E7A50"
+      "selectionInactiveBackground": "#546E7A70"
     },
     "material": {
       "background": "#263238",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#32424A",
       "borderColor": "#314549",
-      "currentOverloadBackground": "#314549",
+      "currentOverloadBackground": "#425B67",
       "currentParameterForeground": "#009688",
       "disabledForeground": "#415967",
       "foreground": "#B0BEC5",
@@ -429,7 +455,8 @@
       "background": "#263238",
       "disabledForeground": "#415967",
       "eapTagBackground": "#425B67",
-      "lightSelectionBackground": "#546E7A",
+      "hoverBackground": "#546E7A70",
+      "lightSelectionBackground": "#314549",
       "paidTagBackground": "#425B67",
       "selectionBackground": "#546E7A",
       "tagForeground": "#009688",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#425B67",
         "installFillForeground": "#415967",
         "installFillBackground": "#2E3C43",
-        "updateBackground": "#2E3C43",
+        "updateBackground": "#009688",
         "updateBorderColor": "#2E3C43",
         "updateForeground": "#B0BEC5"
       },
@@ -517,6 +544,7 @@
       "selectionBackground": "#546E7A",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#2A373E",
     "ScrollBar": {
       "background": "#263238",
       "hoverThumbBorderColor": "#009688",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#009688",
-      "startBackground": "#009688"
+      "startBackground": "#009688",
+      "endColor": "#009688",
+      "startColor": "#009688"
     },
     "SearchField.errorBackground": "#1E272C",
+    "SearchOption": {
+      "selectedBackground": "#314549"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#607D8B",
+      "Repeated.File.Foreground": "#B0BEC5"
+    },
     "Separator": {
       "background": "#32424A",
       "foreground": "#32424A",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#32424A",
     "StatusBar": {
-      "borderColor": "#263238"
+      "borderColor": "#263238",
+      "hoverBackground": "#425B67",
+      "LightEditBackground": "#314549"
     },
     "TabbedPane": {
       "background": "#263238",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#263238",
     "Table": {
+      "alternativeRowBackground": "#1E272C",
       "background": "#263238",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#415967",
       "dropLineColor": "#009688",
       "dropLineShortColor": "#009688",
       "focusCellBackground": "#314549",
@@ -653,6 +694,8 @@
       "foreground": "#B0BEC5",
       "gridColor": "#263238",
       "highlightOuter": "#314549",
+      "hoverBackground": "#546E7A70",
+      "hoverInactiveBackground": "#314549",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#607D8B",
       "lightSelectionInactiveBackground": "#32424A",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#263238",
       "Actions.infoForeground": "#607D8B",
-      "background": "#263238",
-      "borderColor": "#425B67",
+      "background": "#1E272C",
+      "borderColor": "#2A373E",
       "foreground": "#B0BEC5",
       "infoForeground": "#607D8B",
       "separatorColor": "#2A373E",
@@ -751,50 +794,93 @@
         "background": "#263238"
       },
       "HeaderTab": {
+        "borderColor": "#425B67",
         "hoverBackground": "#425B67",
-        "hoverInactiveBackground": "#32424A",
+        "hoverInactiveBackground": "#425B67",
         "inactiveUnderlineColor": "#009688",
         "selectedBackground": "#1E272C",
         "selectedInactiveBackground": "#1E272C",
         "underlineColor": "#009688",
-        "underlinedTabBackground": "#425B67",
-        "underlinedTabInactiveBackground": "#32424A"
+        "underlinedTabBackground": "#314549",
+        "underlinedTabInactiveBackground": "#32424A",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#B0BEC5"
       }
     },
     "Tree": {
       "background": "#263238",
       "foreground": "#607D8B",
       "hash": "#2A373E",
+      "hoverBackground": "#546E7A70",
+      "hoverInactiveBackground": "#314549",
       "modifiedItemForeground": "#009688",
       "rowHeight": 28,
-      "selectionBackground": "#546E7A50",
+      "selectionBackground": "#546E7A70",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#546E7A50",
+      "selectionInactiveBackground": "#546E7A70",
       "textBackground": "#263238"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#2A373E",
-      "ColorPicker.background": "#263238",
-      "ColorPicker.foreground": "#B0BEC5",
-      "Component.borderColor": "#2A373E",
-      "Component.background": "#263238",
-      "Component.foreground": "#B0BEC5",
-      "Connector.borderColor": "#2A373E",
-      "Connector.hoverBorderColor": "#425B67",
+      "Canvas.background": "#1E272C",
+      "ColorPicker": {
+        "background": "#263238",
+        "foreground": "#B0BEC5"
+      },
+      "Component": {
+        "borderColor": "#2A373E",
+        "background": "#263238",
+        "foreground": "#B0BEC5",
+        "hoverBorderColor": "#425B67"
+      },
+      "Connector": {
+        "borderColor": "#2A373E",
+        "hoverBorderColor": "#425B67"
+      },
       "Canvas.background": "#1E272C",
       "highStroke.foreground": "#B0BEC5",
       "Label.foreground": "#607D8B",
-      "List.selectionBackground": "#546E7A50",
-      "Panel.borderColor": "#2A373E",
-      "Panel.background": "#263238",
+      "List.selectionBackground": "#546E7A70",
+      "motion": {
+        "borderColor": "#2A373E",
+        "Component.foreground": "#B0BEC5",
+        "ConstraintSetText.foreground": "#607D8B",
+        "ConstraintSet.background": "#32424A",
+        "CSPanel.SelectedFocusBackground": "#546E7A",
+        "CSPanel.SelectedBackground": "#546E7A70",
+        "cs_FocusText.infoForeground": "#607D8B",
+        "CursorTextColor.foreground": "#B0BEC5",
+        "HoverColor.disabledBackground": "#415967",
+        "motionGraph.background": "#263238",
+        "Notification.background": "#1E272C",
+        "ourAvg.background": "#32424A",
+        "ourCS.background": "#32424A",
+        "ourCS_Border.borderColor": "#2A373E",
+        "ourCS_TextColor.foreground": "#607D8B",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#314549",
+        "ourCS_SelectedBorder.pressedBorderColor": "#425B67",
+        "ourML_BarColor.separatorColor": "#2A373E",
+        "PrimaryPanel.background": "#1E272C",
+        "SecondaryPanel.background": "#263238",
+        "SecondaryPanel.header.foreground": "#607D8B",
+        "SecondaryPanel.header.background": "#1E272C",
+        "timeLine.disabledBorderColor": "#2A373E"
+      },
+      "Panel": {
+        "borderColor": "#2A373E",
+        "background": "#263238"
+      },
       "percent.foreground": "#B0BEC5",
-      "Placeholder.background": "#263238",
-      "Placeholder.borderColor": "#2A373E",
-      "Placeholder.foreground": "#B0BEC5",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#263238",
+        "borderColor": "#2A373E",
+        "foreground": "#B0BEC5",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#263238",
       "stroke.acceleratorForeground": "#607D8B"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#607D8B",
-        "Commit.currentBranchBackground": "#32424A"
+        "Commit.currentBranchBackground": "#32424A",
+        "Commit.hoveredBackground": "#546E7A70"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,16 +927,22 @@
       "foreground": "#B0BEC5"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#263238",
       "background": "#263238",
       "borderColor": "#263238",
       "captionBackground": "#1E272C",
       "captionForeground": "#B0BEC5",
+      "Details.background": "#263238",
       "footerBackground": "#1E272C",
       "footerForeground": "#B0BEC5",
       "headerBackground": "#263238",
       "headerForeground": "#B0BEC5",
+      "List.background": "#1E272C",
       "separatorColor": "#2A373E",
+      "SidePanel.background": "#32424A",
       "Projects": {
+        "actions.background": "#1E272C",
+        "actions.selectionBackground": "#425B67",
         "background": "#32424A",
         "selectionBackground": "#546E7A",
         "selectionInactiveBackground": "#32424A"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight Contrast.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Palenight.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/palenight.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#676E95",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#2b2a3e",
       "Tooltip.background": "#202331"
     },
-    "Content.background": "#202331",
+    "Content": {
+      "background": "#202331",
+      "selectionBackground": "#3C435E"
+    },
     "CheckBox": {
       "background": "#292D3E",
       "disabledText": "#515772",
@@ -89,6 +98,14 @@
       "selectionBackground": "#3C435E",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#A6ACCD",
+      "AccessEnabled": {
+        "accessDot": "#ab47bc",
+        "dropdownBorder": "#34324a",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#292D3E",
       "foreground": "#A6ACCD",
@@ -104,6 +121,7 @@
       },
       "background": "#202331",
       "buttonBackground": "#303348",
+      "darcula.hoveredArrowButtonForeground": "#ab47bc",
       "disabledForeground": "#515772",
       "foreground": "#A6ACCD",
       "modifiedItemForeground": "#ab47bc",
@@ -168,11 +186,13 @@
       "hoverBackground": "#414863",
       "hoverColor": "#202331",
       "hoverMaskColor": "#444267",
+      "inactiveColoredTabBackground": "#292D3E",
       "inactiveColoredFileBackground": "#303348",
-      "inactiveUnderlineColor": "#515772",
+      "inactiveUnderlineColor": "#ab47bc",
       "inactiveMaskColor": "#202331",
       "underlineColor": "#ab47bc",
-      "underlinedTabBackground": "#414863"
+      "underlinedTabBackground": "#414863",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#292D3E",
     "DialogWrapper.southPanelBackground": "#292D3E",
@@ -198,15 +218,17 @@
     },
     "EditorTabs": {
       "borderColor": "#34324a",
+      "hoverBackground": "#444267",
       "hoverColor": "#444267",
       "hoverMaskColor": "#444267",
       "inactiveMaskColor": "#292D3E",
-      "inactiveColoredFileBackground": "#292D3E2",
+      "inactiveColoredFileBackground": "#292D3E",
       "inactiveUnderlineColor": "#515772",
       "selectedForeground": "#A6ACCD",
       "selectedBackground": "#414863",
       "underlineColor": "#ab47bc",
-      "underlinedTabBackground": "#414863"
+      "underlinedTabBackground": "#414863",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#292D3E",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#414863"
     },
+    "GotItTooltip.borderColor": "#202331",
     "Group": {
       "disabledSeparatorColor": "#2b2a3e",
       "separatorColor": "#2b2a3e"
     },
     "GutterTooltip": {
-      "infoForeground": "#A6ACCD",
+      "infoForeground": "#676E95",
       "lineSeparatorColor": "#292D3E"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#515772",
       "foreground": "#A6ACCD",
       "infoForeground": "#676E95",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#A6ACCD"
     },
     "Link": {
       "activeForeground": "#ab47bc",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#34324a",
       "foreground": "#A6ACCD",
+      "hoverBackground": "#676E9570",
+      "hoverInactiveBackground": "#414863",
       "selectionBackground": "#3C435E50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9550"
+      "selectionInactiveBackground": "#676E9570"
     },
     "material": {
       "background": "#292D3E",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#34324a",
       "borderColor": "#414863",
-      "currentOverloadBackground": "#414863",
+      "currentOverloadBackground": "#444267",
       "currentParameterForeground": "#ab47bc",
       "disabledForeground": "#515772",
       "foreground": "#A6ACCD",
@@ -429,7 +455,8 @@
       "background": "#292D3E",
       "disabledForeground": "#515772",
       "eapTagBackground": "#444267",
-      "lightSelectionBackground": "#3C435E",
+      "hoverBackground": "#676E9570",
+      "lightSelectionBackground": "#414863",
       "paidTagBackground": "#444267",
       "selectionBackground": "#3C435E",
       "tagForeground": "#ab47bc",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#444267",
         "installFillForeground": "#515772",
         "installFillBackground": "#303348",
-        "updateBackground": "#303348",
+        "updateBackground": "#ab47bc",
         "updateBorderColor": "#303348",
         "updateForeground": "#A6ACCD"
       },
@@ -517,6 +544,7 @@
       "selectionBackground": "#3C435E",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#2b2a3e",
     "ScrollBar": {
       "background": "#292D3E",
       "hoverThumbBorderColor": "#ab47bc",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#ab47bc",
-      "startBackground": "#ab47bc"
+      "startBackground": "#ab47bc",
+      "endColor": "#ab47bc",
+      "startColor": "#ab47bc"
     },
     "SearchField.errorBackground": "#202331",
+    "SearchOption": {
+      "selectedBackground": "#414863"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#676E95",
+      "Repeated.File.Foreground": "#A6ACCD"
+    },
     "Separator": {
       "background": "#34324a",
       "foreground": "#34324a",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#34324a",
     "StatusBar": {
-      "borderColor": "#292D3E"
+      "borderColor": "#292D3E",
+      "hoverBackground": "#444267",
+      "LightEditBackground": "#414863"
     },
     "TabbedPane": {
       "background": "#292D3E",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#202331",
     "Table": {
+      "alternativeRowBackground": "#202331",
       "background": "#292D3E",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#515772",
       "dropLineColor": "#ab47bc",
       "dropLineShortColor": "#ab47bc",
       "focusCellBackground": "#414863",
@@ -653,6 +694,8 @@
       "foreground": "#A6ACCD",
       "gridColor": "#292D3E",
       "highlightOuter": "#414863",
+      "hoverBackground": "#676E9570",
+      "hoverInactiveBackground": "#414863",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#676E95",
       "lightSelectionInactiveBackground": "#34324a",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#292D3E",
       "Actions.infoForeground": "#676E95",
-      "background": "#292D3E",
-      "borderColor": "#444267",
+      "background": "#202331",
+      "borderColor": "#2b2a3e",
       "foreground": "#A6ACCD",
       "infoForeground": "#676E95",
       "separatorColor": "#2b2a3e",
@@ -751,50 +794,93 @@
         "background": "#292D3E"
       },
       "HeaderTab": {
+        "borderColor": "#444267",
         "hoverBackground": "#444267",
-        "hoverInactiveBackground": "#34324a",
+        "hoverInactiveBackground": "#444267",
         "inactiveUnderlineColor": "#ab47bc",
         "selectedBackground": "#202331",
         "selectedInactiveBackground": "#202331",
         "underlineColor": "#ab47bc",
-        "underlinedTabBackground": "#444267",
-        "underlinedTabInactiveBackground": "#34324a"
+        "underlinedTabBackground": "#414863",
+        "underlinedTabInactiveBackground": "#34324a",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#A6ACCD"
       }
     },
     "Tree": {
       "background": "#202331",
       "foreground": "#676E95",
       "hash": "#2b2a3e",
+      "hoverBackground": "#676E9570",
+      "hoverInactiveBackground": "#414863",
       "modifiedItemForeground": "#ab47bc",
       "rowHeight": 28,
-      "selectionBackground": "#676E9550",
+      "selectionBackground": "#676E9570",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9550",
+      "selectionInactiveBackground": "#676E9570",
       "textBackground": "#202331"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#2b2a3e",
-      "ColorPicker.background": "#292D3E",
-      "ColorPicker.foreground": "#A6ACCD",
-      "Component.borderColor": "#2b2a3e",
-      "Component.background": "#292D3E",
-      "Component.foreground": "#A6ACCD",
-      "Connector.borderColor": "#2b2a3e",
-      "Connector.hoverBorderColor": "#444267",
+      "Canvas.background": "#202331",
+      "ColorPicker": {
+        "background": "#292D3E",
+        "foreground": "#A6ACCD"
+      },
+      "Component": {
+        "borderColor": "#2b2a3e",
+        "background": "#292D3E",
+        "foreground": "#A6ACCD",
+        "hoverBorderColor": "#444267"
+      },
+      "Connector": {
+        "borderColor": "#2b2a3e",
+        "hoverBorderColor": "#444267"
+      },
       "Canvas.background": "#202331",
       "highStroke.foreground": "#A6ACCD",
       "Label.foreground": "#676E95",
-      "List.selectionBackground": "#676E9550",
-      "Panel.borderColor": "#2b2a3e",
-      "Panel.background": "#292D3E",
+      "List.selectionBackground": "#676E9570",
+      "motion": {
+        "borderColor": "#2b2a3e",
+        "Component.foreground": "#A6ACCD",
+        "ConstraintSetText.foreground": "#676E95",
+        "ConstraintSet.background": "#34324a",
+        "CSPanel.SelectedFocusBackground": "#3C435E",
+        "CSPanel.SelectedBackground": "#676E9570",
+        "cs_FocusText.infoForeground": "#676E95",
+        "CursorTextColor.foreground": "#A6ACCD",
+        "HoverColor.disabledBackground": "#515772",
+        "motionGraph.background": "#292D3E",
+        "Notification.background": "#202331",
+        "ourAvg.background": "#34324a",
+        "ourCS.background": "#34324a",
+        "ourCS_Border.borderColor": "#2b2a3e",
+        "ourCS_TextColor.foreground": "#676E95",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#414863",
+        "ourCS_SelectedBorder.pressedBorderColor": "#444267",
+        "ourML_BarColor.separatorColor": "#2b2a3e",
+        "PrimaryPanel.background": "#202331",
+        "SecondaryPanel.background": "#292D3E",
+        "SecondaryPanel.header.foreground": "#676E95",
+        "SecondaryPanel.header.background": "#202331",
+        "timeLine.disabledBorderColor": "#2b2a3e"
+      },
+      "Panel": {
+        "borderColor": "#2b2a3e",
+        "background": "#292D3E"
+      },
       "percent.foreground": "#A6ACCD",
-      "Placeholder.background": "#292D3E",
-      "Placeholder.borderColor": "#2b2a3e",
-      "Placeholder.foreground": "#A6ACCD",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#292D3E",
+        "borderColor": "#2b2a3e",
+        "foreground": "#A6ACCD",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#292D3E",
       "stroke.acceleratorForeground": "#676E95"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#676E95",
-        "Commit.currentBranchBackground": "#34324a"
+        "Commit.currentBranchBackground": "#34324a",
+        "Commit.hoveredBackground": "#676E9570"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,16 +927,22 @@
       "foreground": "#A6ACCD"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#292D3E",
       "background": "#292D3E",
       "borderColor": "#292D3E",
       "captionBackground": "#202331",
       "captionForeground": "#A6ACCD",
+      "Details.background": "#292D3E",
       "footerBackground": "#202331",
       "footerForeground": "#A6ACCD",
       "headerBackground": "#292D3E",
       "headerForeground": "#A6ACCD",
+      "List.background": "#202331",
       "separatorColor": "#2b2a3e",
+      "SidePanel.background": "#34324a",
       "Projects": {
+        "actions.background": "#202331",
+        "actions.selectionBackground": "#444267",
         "background": "#34324a",
         "selectionBackground": "#3C435E",
         "selectionInactiveBackground": "#34324a"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Material Palenight.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/palenight.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#676E95",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#2b2a3e",
       "Tooltip.background": "#202331"
     },
-    "Content.background": "#202331",
+    "Content": {
+      "background": "#202331",
+      "selectionBackground": "#3C435E"
+    },
     "CheckBox": {
       "background": "#292D3E",
       "disabledText": "#515772",
@@ -89,6 +98,14 @@
       "selectionBackground": "#3C435E",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#A6ACCD",
+      "AccessEnabled": {
+        "accessDot": "#ab47bc",
+        "dropdownBorder": "#34324a",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#292D3E",
       "foreground": "#A6ACCD",
@@ -104,6 +121,7 @@
       },
       "background": "#292D3E",
       "buttonBackground": "#303348",
+      "darcula.hoveredArrowButtonForeground": "#ab47bc",
       "disabledForeground": "#515772",
       "foreground": "#A6ACCD",
       "modifiedItemForeground": "#ab47bc",
@@ -168,11 +186,13 @@
       "hoverBackground": "#414863",
       "hoverColor": "#292D3E",
       "hoverMaskColor": "#444267",
+      "inactiveColoredTabBackground": "#292D3E",
       "inactiveColoredFileBackground": "#303348",
-      "inactiveUnderlineColor": "#515772",
+      "inactiveUnderlineColor": "#ab47bc",
       "inactiveMaskColor": "#292D3E",
       "underlineColor": "#ab47bc",
-      "underlinedTabBackground": "#414863"
+      "underlinedTabBackground": "#414863",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#292D3E",
     "DialogWrapper.southPanelBackground": "#292D3E",
@@ -198,15 +218,17 @@
     },
     "EditorTabs": {
       "borderColor": "#34324a",
+      "hoverBackground": "#444267",
       "hoverColor": "#444267",
       "hoverMaskColor": "#444267",
       "inactiveMaskColor": "#292D3E",
-      "inactiveColoredFileBackground": "#292D3E2",
+      "inactiveColoredFileBackground": "#292D3E",
       "inactiveUnderlineColor": "#515772",
       "selectedForeground": "#A6ACCD",
       "selectedBackground": "#414863",
       "underlineColor": "#ab47bc",
-      "underlinedTabBackground": "#414863"
+      "underlinedTabBackground": "#414863",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#292D3E",
@@ -246,12 +268,13 @@
       "selectionForeground": "#FFFFFF",
       "selectionBackground": "#414863"
     },
+    "GotItTooltip.borderColor": "#202331",
     "Group": {
       "disabledSeparatorColor": "#2b2a3e",
       "separatorColor": "#2b2a3e"
     },
     "GutterTooltip": {
-      "infoForeground": "#A6ACCD",
+      "infoForeground": "#676E95",
       "lineSeparatorColor": "#292D3E"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#515772",
       "foreground": "#A6ACCD",
       "infoForeground": "#676E95",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#A6ACCD"
     },
     "Link": {
       "activeForeground": "#ab47bc",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#34324a",
       "foreground": "#A6ACCD",
+      "hoverBackground": "#676E9570",
+      "hoverInactiveBackground": "#414863",
       "selectionBackground": "#3C435E50",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9550"
+      "selectionInactiveBackground": "#676E9570"
     },
     "material": {
       "background": "#292D3E",
@@ -409,7 +435,7 @@
     "ParameterInfo": {
       "background": "#34324a",
       "borderColor": "#414863",
-      "currentOverloadBackground": "#414863",
+      "currentOverloadBackground": "#444267",
       "currentParameterForeground": "#ab47bc",
       "disabledForeground": "#515772",
       "foreground": "#A6ACCD",
@@ -429,7 +455,8 @@
       "background": "#292D3E",
       "disabledForeground": "#515772",
       "eapTagBackground": "#444267",
-      "lightSelectionBackground": "#3C435E",
+      "hoverBackground": "#676E9570",
+      "lightSelectionBackground": "#414863",
       "paidTagBackground": "#444267",
       "selectionBackground": "#3C435E",
       "tagForeground": "#ab47bc",
@@ -442,7 +469,7 @@
         "installFocusedBackground": "#444267",
         "installFillForeground": "#515772",
         "installFillBackground": "#303348",
-        "updateBackground": "#303348",
+        "updateBackground": "#ab47bc",
         "updateBorderColor": "#303348",
         "updateForeground": "#A6ACCD"
       },
@@ -517,6 +544,7 @@
       "selectionBackground": "#3C435E",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#2b2a3e",
     "ScrollBar": {
       "background": "#292D3E",
       "hoverThumbBorderColor": "#ab47bc",
@@ -576,9 +604,18 @@
     },
     "SearchMatch": {
       "endBackground": "#ab47bc",
-      "startBackground": "#ab47bc"
+      "startBackground": "#ab47bc",
+      "endColor": "#ab47bc",
+      "startColor": "#ab47bc"
     },
     "SearchField.errorBackground": "#202331",
+    "SearchOption": {
+      "selectedBackground": "#414863"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#676E95",
+      "Repeated.File.Foreground": "#A6ACCD"
+    },
     "Separator": {
       "background": "#34324a",
       "foreground": "#34324a",
@@ -616,7 +653,9 @@
     },
     "SplitPaneDivider.draggingColor": "#34324a",
     "StatusBar": {
-      "borderColor": "#292D3E"
+      "borderColor": "#292D3E",
+      "hoverBackground": "#444267",
+      "LightEditBackground": "#414863"
     },
     "TabbedPane": {
       "background": "#292D3E",
@@ -643,9 +682,11 @@
     },
     "TabbedPane.mt.tab.background": "#292D3E",
     "Table": {
+      "alternativeRowBackground": "#202331",
       "background": "#292D3E",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#515772",
       "dropLineColor": "#ab47bc",
       "dropLineShortColor": "#ab47bc",
       "focusCellBackground": "#414863",
@@ -653,6 +694,8 @@
       "foreground": "#A6ACCD",
       "gridColor": "#292D3E",
       "highlightOuter": "#414863",
+      "hoverBackground": "#676E9570",
+      "hoverInactiveBackground": "#414863",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#676E95",
       "lightSelectionInactiveBackground": "#34324a",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#292D3E",
       "Actions.infoForeground": "#676E95",
-      "background": "#292D3E",
-      "borderColor": "#444267",
+      "background": "#202331",
+      "borderColor": "#2b2a3e",
       "foreground": "#A6ACCD",
       "infoForeground": "#676E95",
       "separatorColor": "#2b2a3e",
@@ -751,50 +794,93 @@
         "background": "#292D3E"
       },
       "HeaderTab": {
+        "borderColor": "#444267",
         "hoverBackground": "#444267",
-        "hoverInactiveBackground": "#34324a",
+        "hoverInactiveBackground": "#444267",
         "inactiveUnderlineColor": "#ab47bc",
         "selectedBackground": "#202331",
         "selectedInactiveBackground": "#202331",
         "underlineColor": "#ab47bc",
-        "underlinedTabBackground": "#444267",
-        "underlinedTabInactiveBackground": "#34324a"
+        "underlinedTabBackground": "#414863",
+        "underlinedTabInactiveBackground": "#34324a",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#A6ACCD"
       }
     },
     "Tree": {
       "background": "#292D3E",
       "foreground": "#676E95",
       "hash": "#2b2a3e",
+      "hoverBackground": "#676E9570",
+      "hoverInactiveBackground": "#414863",
       "modifiedItemForeground": "#ab47bc",
       "rowHeight": 28,
-      "selectionBackground": "#676E9550",
+      "selectionBackground": "#676E9570",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#676E9550",
+      "selectionInactiveBackground": "#676E9570",
       "textBackground": "#292D3E"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#2b2a3e",
-      "ColorPicker.background": "#292D3E",
-      "ColorPicker.foreground": "#A6ACCD",
-      "Component.borderColor": "#2b2a3e",
-      "Component.background": "#292D3E",
-      "Component.foreground": "#A6ACCD",
-      "Connector.borderColor": "#2b2a3e",
-      "Connector.hoverBorderColor": "#444267",
+      "Canvas.background": "#202331",
+      "ColorPicker": {
+        "background": "#292D3E",
+        "foreground": "#A6ACCD"
+      },
+      "Component": {
+        "borderColor": "#2b2a3e",
+        "background": "#292D3E",
+        "foreground": "#A6ACCD",
+        "hoverBorderColor": "#444267"
+      },
+      "Connector": {
+        "borderColor": "#2b2a3e",
+        "hoverBorderColor": "#444267"
+      },
       "Canvas.background": "#202331",
       "highStroke.foreground": "#A6ACCD",
       "Label.foreground": "#676E95",
-      "List.selectionBackground": "#676E9550",
-      "Panel.borderColor": "#2b2a3e",
-      "Panel.background": "#292D3E",
+      "List.selectionBackground": "#676E9570",
+      "motion": {
+        "borderColor": "#2b2a3e",
+        "Component.foreground": "#A6ACCD",
+        "ConstraintSetText.foreground": "#676E95",
+        "ConstraintSet.background": "#34324a",
+        "CSPanel.SelectedFocusBackground": "#3C435E",
+        "CSPanel.SelectedBackground": "#676E9570",
+        "cs_FocusText.infoForeground": "#676E95",
+        "CursorTextColor.foreground": "#A6ACCD",
+        "HoverColor.disabledBackground": "#515772",
+        "motionGraph.background": "#292D3E",
+        "Notification.background": "#202331",
+        "ourAvg.background": "#34324a",
+        "ourCS.background": "#34324a",
+        "ourCS_Border.borderColor": "#2b2a3e",
+        "ourCS_TextColor.foreground": "#676E95",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#414863",
+        "ourCS_SelectedBorder.pressedBorderColor": "#444267",
+        "ourML_BarColor.separatorColor": "#2b2a3e",
+        "PrimaryPanel.background": "#202331",
+        "SecondaryPanel.background": "#292D3E",
+        "SecondaryPanel.header.foreground": "#676E95",
+        "SecondaryPanel.header.background": "#202331",
+        "timeLine.disabledBorderColor": "#2b2a3e"
+      },
+      "Panel": {
+        "borderColor": "#2b2a3e",
+        "background": "#292D3E"
+      },
       "percent.foreground": "#A6ACCD",
-      "Placeholder.background": "#292D3E",
-      "Placeholder.borderColor": "#2b2a3e",
-      "Placeholder.foreground": "#A6ACCD",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#292D3E",
+        "borderColor": "#2b2a3e",
+        "foreground": "#A6ACCD",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#292D3E",
       "stroke.acceleratorForeground": "#676E95"
     },
@@ -828,7 +914,8 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#676E95",
-        "Commit.currentBranchBackground": "#34324a"
+        "Commit.currentBranchBackground": "#34324a",
+        "Commit.hoveredBackground": "#676E9570"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
@@ -840,16 +927,22 @@
       "foreground": "#A6ACCD"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#292D3E",
       "background": "#292D3E",
       "borderColor": "#292D3E",
       "captionBackground": "#202331",
       "captionForeground": "#A6ACCD",
+      "Details.background": "#292D3E",
       "footerBackground": "#202331",
       "footerForeground": "#A6ACCD",
       "headerBackground": "#292D3E",
       "headerForeground": "#A6ACCD",
+      "List.background": "#202331",
       "separatorColor": "#2b2a3e",
+      "SidePanel.background": "#34324a",
       "Projects": {
+        "actions.background": "#202331",
+        "actions.selectionBackground": "#444267",
         "background": "#34324a",
         "selectionBackground": "#3C435E",
         "selectionInactiveBackground": "#34324a"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json

@@ -3,21 +3,27 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Monokai Pro.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/monokai.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#939293",
       "background": "#2D2A2E",
       "borderColor": "#2d2a2e",
       "disabledBackground": "#3a3a3c",
-      "disabledForeground": "#5b595c",
-      "disabledText": "#5b595c",
+      "disabledForeground": "#727072",
+      "disabledText": "#727072",
       "focusColor": "#5b595c",
       "focusedBorderColor": "#ffd866",
       "foreground": "#fcfcfa",
       "inactiveBackground": "#3a3a3c",
       "inactiveForeground": "#939293",
       "infoForeground": "#939293",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionBackgroundInactive": "#403E41",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#403E41",
@@ -33,7 +39,7 @@
       "pressedBorderColor": "#ffd86650"
     },
     "Autocomplete": {
-      "selectionBackground": "#6E6C6F"
+      "selectionBackground": "#5B595C"
     },
     "Borders.ContrastBorderColor": "#2D2A2E",
     "Borders.color": "#2d2a2e",
@@ -43,7 +49,7 @@
       "default": {
         "endBackground": "#4A474B",
         "endBorderColor": "#4A474B",
-        "foreground": "#ffd866",
+        "foreground": "#FFFFFF",
         "focusColor": "#ffd866",
         "focusedBorderColor": "#ffd866",
         "shadowColor": "#4A474B",
@@ -51,7 +57,7 @@
         "startBorderColor": "#4A474B"
       },
       "disabledBorderColor": "#403E41",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "endBackground": "#403E41",
       "endBorderColor": "#403E41",
       "focus": "#5b595c",
@@ -72,10 +78,13 @@
       "Tooltip.borderColor": "#2d2a2e",
       "Tooltip.background": "#363437"
     },
-    "Content.background": "#3a3a3c",
+    "Content": {
+      "background": "#221F22",
+      "selectionBackground": "#5B595C"
+    },
     "CheckBox": {
       "background": "#2D2A2E",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa",
       "select": "#ffd866"
     },
@@ -84,10 +93,18 @@
       "acceleratorSelectionForeground": "#939293",
       "background": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
-      "selectionForeground": "#ffd866"
+      "selectionBackground": "#5B595C",
+      "selectionForeground": "#FFFFFF"
+    },
+    "CodeWithMe": {
+      "Avatar.foreground": "#fcfcfa",
+      "AccessEnabled": {
+        "accessDot": "#ffd866",
+        "dropdownBorder": "#403E41",
+        "pillBackground": "$second"
+      }
     },
     "ColorChooser": {
       "background": "#2D2A2E",
@@ -98,19 +115,20 @@
     "ComboBox": {
       "ArrowButton": {
         "background": "#403E41",
-        "disabledIconColor": "#5b595c",
+        "disabledIconColor": "#727072",
         "iconColor": "#fcfcfa",
         "nonEditableBackground": "#2D2A2E"
       },
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "buttonBackground": "#403E41",
-      "disabledForeground": "#5b595c",
+      "darcula.hoveredArrowButtonForeground": "#ffd866",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "modifiedItemForeground": "#ffd866",
       "nonEditableBackground": "#403E41",
       "padding": "5,5,5,5",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "ComboPopup.border": "#2d2a2e",
     "CompletionPopup": {
@@ -123,8 +141,8 @@
       "selectedGrayedForeground": "#FFFFFF",
       "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#939293",
-      "selectionInactiveBackground": "#6E6C6F50",
-      "selectionBackground": "#6E6C6F80",
+      "selectionInactiveBackground": "#5B595C50",
+      "selectionBackground": "#5B595C80",
       "selectionForeground": "#FFFFFF",
       "selectionInfoForeground": "#FFFFFF"
     },
@@ -166,13 +184,15 @@
       "background": "#2D2A2E",
       "borderColor": "#2D2A2E",
       "hoverBackground": "#4A474B",
-      "hoverColor": "#3a3a3c",
+      "hoverColor": "#221F22",
       "hoverMaskColor": "#5b595c",
+      "inactiveColoredTabBackground": "#2D2A2E",
       "inactiveColoredFileBackground": "#403E41",
-      "inactiveUnderlineColor": "#5b595c",
-      "inactiveMaskColor": "#3a3a3c",
+      "inactiveUnderlineColor": "#ffd866",
+      "inactiveMaskColor": "#221F22",
       "underlineColor": "#ffd866",
-      "underlinedTabBackground": "#4A474B"
+      "underlinedTabBackground": "#4A474B",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#2D2A2E",
     "DialogWrapper.southPanelBackground": "#2D2A2E",
@@ -183,30 +203,32 @@
       "areaForeground": "#fcfcfa"
     },
     "Editor": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "foreground": "#fcfcfa",
       "shortcutForeground": "#939293"
     },
     "EditorPane": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
       "inactiveBackground": "#2D2A2E",
-      "inactiveForeground": "#5b595c",
-      "selectionBackground": "#6E6C6F",
-      "selectionForeground": "#ffd866"
+      "inactiveForeground": "#727072",
+      "selectionBackground": "#5B595C",
+      "selectionForeground": "#FFFFFF"
     },
     "EditorTabs": {
       "borderColor": "#403E41",
+      "hoverBackground": "#5b595c",
       "hoverColor": "#5b595c",
       "hoverMaskColor": "#5b595c",
       "inactiveMaskColor": "#2D2A2E",
-      "inactiveColoredFileBackground": "#2D2A2E2",
-      "inactiveUnderlineColor": "#5b595c",
+      "inactiveColoredFileBackground": "#2D2A2E",
+      "inactiveUnderlineColor": "#727072",
       "selectedForeground": "#fcfcfa",
       "selectedBackground": "#4A474B",
       "underlineColor": "#ffd866",
-      "underlinedTabBackground": "#4A474B"
+      "underlinedTabBackground": "#4A474B",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#2D2A2E",
@@ -238,25 +260,26 @@
     },
     "Focus.color": "#2d2a2e",
     "FormattedTextField": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
       "inactiveBackground": "#403E41",
-      "inactiveForeground": "#5b595c",
-      "selectionForeground": "#ffd866",
+      "inactiveForeground": "#727072",
+      "selectionForeground": "#FFFFFF",
       "selectionBackground": "#4A474B"
     },
+    "GotItTooltip.borderColor": "#363437",
     "Group": {
       "disabledSeparatorColor": "#2d2a2e",
       "separatorColor": "#2d2a2e"
     },
     "GutterTooltip": {
-      "infoForeground": "#fcfcfa",
+      "infoForeground": "#939293",
       "lineSeparatorColor": "#2D2A2E"
     },
     "HeaderColor": {
       "active": "#2D2A2E",
-      "inactive": "#3a3a3c"
+      "inactive": "#221F22"
     },
     "HelpTooltip": {
       "background": "#2D2A2E",
@@ -283,12 +306,13 @@
     },
     "Label": {
       "background": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "disabledShadow": "#2D2A2E",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa",
       "infoForeground": "#939293",
-      "selectedForeground": "#ffd866"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#fcfcfa"
     },
     "Link": {
       "activeForeground": "#ffd866",
@@ -301,15 +325,17 @@
     "List": {
       "background": "#403E41",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F50",
+      "hoverBackground": "#403E4170",
+      "hoverInactiveBackground": "#4A474B",
+      "selectionBackground": "#5B595C50",
       "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#ffd866",
-      "selectionInactiveBackground": "#403E41"
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#403E4170"
     },
     "material": {
       "background": "#2D2A2E",
       "branchColor": "#fcfcfa",
-      "contrast": "#3a3a3c",
+      "contrast": "#221F22",
       "foreground": "#fcfcfa",
       "mergeCommits": "#403E41",
       "primaryColor": "#939293",
@@ -330,22 +356,22 @@
       "border": "4,2,4,2",
       "borderColor": "#403E41",
       "disabledBackground": "#403E41",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF",
       "separatorColor": "#2d2a2e"
     },
     "MenuBar": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "borderColor": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "highlight": "#2D2A2E",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF",
-      "shadow": "#3a3a3c"
+      "shadow": "#221F22"
     },
     "MenuItem": {
       "acceleratorForeground": "#939293",
@@ -353,9 +379,9 @@
       "border": "4,2,4,2",
       "background": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
@@ -367,7 +393,7 @@
         "background": "#2D2A2E"
       },
       "SearchField": {
-        "background": "#3a3a3c"
+        "background": "#221F22"
       }
     },
     "NewPSD.warning": "#ffd866",
@@ -400,7 +426,7 @@
     "Outline": {
       "color": "#403E41",
       "focusedColor": "#ffd866",
-      "disabledColor": "#5b595c"
+      "disabledColor": "#727072"
     },
     "Panel": {
       "background": "#2D2A2E",
@@ -409,29 +435,30 @@
     "ParameterInfo": {
       "background": "#403E41",
       "borderColor": "#4A474B",
-      "currentOverloadBackground": "#4A474B",
+      "currentOverloadBackground": "#5b595c",
       "currentParameterForeground": "#ffd866",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "infoForeground": "#939293",
       "lineSeparatorColor": "#4A474B"
     },
     "PasswordField": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "capsLockIconColor": "#ffd866",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "Plugins": {
       "background": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "eapTagBackground": "#5b595c",
-      "lightSelectionBackground": "#6E6C6F",
+      "hoverBackground": "#403E4170",
+      "lightSelectionBackground": "#4A474B",
       "paidTagBackground": "#5b595c",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "tagForeground": "#ffd866",
       "tagBackground": "#5b595c",
       "trialTagBackground": "#5b595c",
@@ -440,14 +467,14 @@
         "installBorderColor": "#403E41",
         "installForeground": "#fcfcfa",
         "installFocusedBackground": "#5b595c",
-        "installFillForeground": "#5b595c",
+        "installFillForeground": "#727072",
         "installFillBackground": "#403E41",
-        "updateBackground": "#403E41",
+        "updateBackground": "#ffd866",
         "updateBorderColor": "#403E41",
         "updateForeground": "#fcfcfa"
       },
       "SearchField": {
-        "background": "#3a3a3c",
+        "background": "#221F22",
         "borderColor": "#2d2a2e"
       },
       "SectionHeader": {
@@ -466,20 +493,20 @@
         "borderColor": "#2D2A2E",
         "foreground": "#ffd866"
       },
-      "borderColor": "#3a3a3c",
+      "borderColor": "#221F22",
       "inactiveBorderColor": "#2D2A2E",
       "innerBorderColor": "#403E41",
       "Header": {
         "activeBackground": "#2D2A2E",
-        "inactiveBackground": "#3a3a3c"
+        "inactiveBackground": "#221F22"
       },
       "paintBorder": true,
       "separatorForeground": "#fcfcfa",
       "separatorColor": "#403E41",
       "Toolbar": {
-        "Floating.background": "#3a3a3c",
-        "background": "#3a3a3c",
-        "borderColor": "#3a3a3c"
+        "Floating.background": "#221F22",
+        "background": "#221F22",
+        "borderColor": "#221F22"
       }
     },
     "PopupMenu": {
@@ -504,7 +531,7 @@
     },
     "RadioButton": {
       "background": "#2D2A2E",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa"
     },
     "RadioButtonMenuItem": {
@@ -512,11 +539,12 @@
       "acceleratorSelectionForeground": "#939293",
       "background": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#2d2a2e",
     "ScrollBar": {
       "background": "#2D2A2E",
       "hoverThumbBorderColor": "#ffd866",
@@ -553,7 +581,7 @@
     },
     "SearchEverywhere": {
       "Advertiser": {
-        "background": "#3a3a3c",
+        "background": "#221F22",
         "foreground": "#939293"
       },
       "Header": {
@@ -565,27 +593,36 @@
       },
       "SearchField": {
         "background": "#2D2A2E",
-        "borderColor": "#3a3a3c",
+        "borderColor": "#221F22",
         "infoForeground": "#939293"
       },
       "Tab": {
-        "active.foreground": "#ffd866",
-        "selectedForeground": "#ffd866",
+        "active.foreground": "#FFFFFF",
+        "selectedForeground": "#FFFFFF",
         "selectedBackground": "#5b595c"
       }
     },
     "SearchMatch": {
       "endBackground": "#ffd866",
-      "startBackground": "#ffd866"
+      "startBackground": "#ffd866",
+      "endColor": "#ffd866",
+      "startColor": "#ffd866"
     },
     "SearchField.errorBackground": "#363437",
+    "SearchOption": {
+      "selectedBackground": "#4A474B"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#939293",
+      "Repeated.File.Foreground": "#fcfcfa"
+    },
     "Separator": {
       "background": "#403E41",
       "foreground": "#403E41",
       "separatorColor": "#403E41"
     },
     "SidePanel": {
-      "background": "#3a3a3c"
+      "background": "#221F22"
     },
     "Slider": {
       "background": "#2D2A2E",
@@ -608,23 +645,25 @@
       "background": "#2D2A2E",
       "border": "3,3,3,3",
       "foreground": "#fcfcfa",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "SplitPane": {
       "background": "#2D2A2E",
-      "highlight": "#3a3a3c"
+      "highlight": "#221F22"
     },
     "SplitPaneDivider.draggingColor": "#403E41",
     "StatusBar": {
-      "borderColor": "#2D2A2E"
+      "borderColor": "#2D2A2E",
+      "hoverBackground": "#5b595c",
+      "LightEditBackground": "#4A474B"
     },
     "TabbedPane": {
       "background": "#2D2A2E",
       "contentAreaColor": "#5b595c",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#2d2a2e",
-      "disabledForeground": "#5b595c",
-      "disabledUnderlineColor": "#5b595c",
+      "disabledForeground": "#727072",
+      "disabledUnderlineColor": "#727072",
       "focus": "#4A474B",
       "focusColor": "#4A474B",
       "fontSizeOffset": 0,
@@ -632,7 +671,7 @@
       "highlight": "#2d2a2e",
       "hoverColor": "#5b595c",
       "labelShift": 0,
-      "selectedForeground": "#ffd866",
+      "selectedForeground": "#FFFFFF",
       "selectedLabelShift": 0,
       "selectedTabPadInsets": "0,0,0,0",
       "tabsOverlapBorder": true,
@@ -641,37 +680,41 @@
       "tabSelectionHeight": 2,
       "underlineColor": "#ffd866"
     },
-    "TabbedPane.mt.tab.background": "#3a3a3c",
+    "TabbedPane.mt.tab.background": "#221F22",
     "Table": {
+      "alternativeRowBackground": "#221F22",
       "background": "#2D2A2E",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#727072",
       "dropLineColor": "#ffd866",
       "dropLineShortColor": "#ffd866",
       "focusCellBackground": "#4A474B",
-      "focusCellForeground": "#ffd866",
+      "focusCellForeground": "#FFFFFF",
       "foreground": "#fcfcfa",
       "gridColor": "#2D2A2E",
       "highlightOuter": "#4A474B",
-      "lightSelectionForeground": "#ffd866",
+      "hoverBackground": "#403E4170",
+      "hoverInactiveBackground": "#4A474B",
+      "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#939293",
       "lightSelectionInactiveBackground": "#403E41",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866",
+      "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#4A474B",
       "selectionInactiveForeground": "#FFFFFF",
       "sortIconColor": "#fcfcfa",
-      "stripeColor": "#3a3a3c"
+      "stripeColor": "#221F22"
     },
     "TableHeader": {
       "background": "#2D2A2E",
       "borderColor": "#2D2A2E",
       "bottomSeparatorColor": "#403E41",
       "cellBorder": "4,0,4,0",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "focusCellBackground": "#4A474B",
-      "focusCellForeground": "#ffd866",
+      "focusCellForeground": "#FFFFFF",
       "height": 25,
       "separatorColor": "#403E41"
     },
@@ -679,31 +722,31 @@
     "textInactiveText": "#939293",
     "textText": "#939293",
     "TextArea": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "TextField": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "TextPane": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "TitlePane": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "Button.hoverBackground": "#5b595c",
       "inactiveBackground": "#2D2A2E",
       "infoForeground": "#939293",
@@ -713,7 +756,7 @@
     "ToggleButton": {
       "borderColor": "#403E41",
       "buttonColor": "#fcfcfa",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa",
       "offForeground": "#2D2A2E",
       "offBackground": "#2D2A2E",
@@ -721,7 +764,7 @@
       "onForeground": "#ffd866"
     },
     "ToolBar": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "borderHandleColor": "#939293",
       "floatingForeground": "#939293",
       "foreground": "#fcfcfa"
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#2D2A2E",
       "Actions.infoForeground": "#939293",
-      "background": "#2D2A2E",
-      "borderColor": "#5b595c",
+      "background": "#363437",
+      "borderColor": "#2d2a2e",
       "foreground": "#fcfcfa",
       "infoForeground": "#939293",
       "separatorColor": "#2d2a2e",
@@ -739,8 +782,8 @@
     "ToolWindow": {
       "Button": {
         "hoverBackground": "#4A474B",
-        "selectedForeground": "#ffd866",
-        "selectedBackground": "#3a3a3c"
+        "selectedForeground": "#FFFFFF",
+        "selectedBackground": "#221F22"
       },
       "Header": {
         "background": "#2D2A2E",
@@ -751,50 +794,93 @@
         "background": "#2D2A2E"
       },
       "HeaderTab": {
+        "borderColor": "#5b595c",
         "hoverBackground": "#5b595c",
-        "hoverInactiveBackground": "#403E41",
+        "hoverInactiveBackground": "#5b595c",
         "inactiveUnderlineColor": "#ffd866",
-        "selectedBackground": "#3a3a3c",
-        "selectedInactiveBackground": "#3a3a3c",
+        "selectedBackground": "#221F22",
+        "selectedInactiveBackground": "#221F22",
         "underlineColor": "#ffd866",
-        "underlinedTabBackground": "#5b595c",
-        "underlinedTabInactiveBackground": "#403E41"
+        "underlinedTabBackground": "#4A474B",
+        "underlinedTabInactiveBackground": "#403E41",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#fcfcfa"
       }
     },
     "Tree": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "foreground": "#939293",
       "hash": "#2d2a2e",
+      "hoverBackground": "#403E4170",
+      "hoverInactiveBackground": "#4A474B",
       "modifiedItemForeground": "#ffd866",
       "rowHeight": 28,
-      "selectionBackground": "#403E41",
+      "selectionBackground": "#403E4170",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#403E41",
-      "textBackground": "#3a3a3c"
+      "selectionInactiveBackground": "#403E4170",
+      "textBackground": "#221F22"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#2d2a2e",
-      "ColorPicker.background": "#2D2A2E",
-      "ColorPicker.foreground": "#fcfcfa",
-      "Component.borderColor": "#2d2a2e",
-      "Component.background": "#2D2A2E",
-      "Component.foreground": "#fcfcfa",
-      "Connector.borderColor": "#2d2a2e",
-      "Connector.hoverBorderColor": "#5b595c",
-      "Canvas.background": "#3a3a3c",
+      "Canvas.background": "#221F22",
+      "ColorPicker": {
+        "background": "#2D2A2E",
+        "foreground": "#fcfcfa"
+      },
+      "Component": {
+        "borderColor": "#2d2a2e",
+        "background": "#2D2A2E",
+        "foreground": "#fcfcfa",
+        "hoverBorderColor": "#5b595c"
+      },
+      "Connector": {
+        "borderColor": "#2d2a2e",
+        "hoverBorderColor": "#5b595c"
+      },
+      "Canvas.background": "#221F22",
       "highStroke.foreground": "#fcfcfa",
       "Label.foreground": "#939293",
-      "List.selectionBackground": "#403E41",
-      "Panel.borderColor": "#2d2a2e",
-      "Panel.background": "#2D2A2E",
+      "List.selectionBackground": "#403E4170",
+      "motion": {
+        "borderColor": "#2d2a2e",
+        "Component.foreground": "#fcfcfa",
+        "ConstraintSetText.foreground": "#939293",
+        "ConstraintSet.background": "#403E41",
+        "CSPanel.SelectedFocusBackground": "#5B595C",
+        "CSPanel.SelectedBackground": "#403E4170",
+        "cs_FocusText.infoForeground": "#939293",
+        "CursorTextColor.foreground": "#fcfcfa",
+        "HoverColor.disabledBackground": "#727072",
+        "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_SelectedBackground.selectionInactiveBackground": "#4A474B",
+        "ourCS_SelectedBorder.pressedBorderColor": "#5b595c",
+        "ourML_BarColor.separatorColor": "#2d2a2e",
+        "PrimaryPanel.background": "#221F22",
+        "SecondaryPanel.background": "#2D2A2E",
+        "SecondaryPanel.header.foreground": "#939293",
+        "SecondaryPanel.header.background": "#221F22",
+        "timeLine.disabledBorderColor": "#2d2a2e"
+      },
+      "Panel": {
+        "borderColor": "#2d2a2e",
+        "background": "#2D2A2E"
+      },
       "percent.foreground": "#fcfcfa",
-      "Placeholder.background": "#2D2A2E",
-      "Placeholder.borderColor": "#2d2a2e",
-      "Placeholder.foreground": "#fcfcfa",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#2D2A2E",
+        "borderColor": "#2d2a2e",
+        "foreground": "#fcfcfa",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#2D2A2E",
       "stroke.acceleratorForeground": "#939293"
     },
@@ -819,8 +905,8 @@
       },
       "HgLog": {
         "branchIconColor": "#ffd866",
-        "bookmarkIconColor": "#ffd866",
-        "closedBranchIconColor": "#5b595c",
+        "bookmarkIconColor": "#FFFFFF",
+        "closedBranchIconColor": "#727072",
         "localTagIconColor": "#939293",
         "mqTagIconColor": "#939293",
         "tagIconColor": "#939293",
@@ -828,48 +914,55 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#939293",
-        "Commit.currentBranchBackground": "#403E41"
+        "Commit.currentBranchBackground": "#403E41",
+        "Commit.hoveredBackground": "#403E4170"
       },
       "RefLabel": {
-        "foreground": "#ffd866",
+        "foreground": "#FFFFFF",
         "backgroundBase": "#5b595c"
       }
     },
     "Viewport": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "foreground": "#fcfcfa"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#2D2A2E",
       "background": "#2D2A2E",
       "borderColor": "#2D2A2E",
-      "captionBackground": "#3a3a3c",
+      "captionBackground": "#221F22",
       "captionForeground": "#fcfcfa",
-      "footerBackground": "#3a3a3c",
+      "Details.background": "#2D2A2E",
+      "footerBackground": "#221F22",
       "footerForeground": "#fcfcfa",
       "headerBackground": "#2D2A2E",
       "headerForeground": "#fcfcfa",
+      "List.background": "#221F22",
       "separatorColor": "#2d2a2e",
+      "SidePanel.background": "#403E41",
       "Projects": {
+        "actions.background": "#221F22",
+        "actions.selectionBackground": "#5b595c",
         "background": "#403E41",
-        "selectionBackground": "#6E6C6F",
+        "selectionBackground": "#5B595C",
         "selectionInactiveBackground": "#403E41"
       }
     },
-    "window": "#3a3a3c",
+    "window": "#221F22",
     "windowBorder": "#2d2a2e",
     "windowText": "#939293",
     "Window.border": "#2d2a2e"
   },
   "icons": {
     "ColorPalette": {
-      "#43494A": "#3a3a3c",
+      "#43494A": "#221F22",
       "#6B6B6B": "#939293",
       "#A7A7A7": "#2D2A2E",
       "#3D6185": "#ffd866",
       "#466D94": "#ffd866",
       "#3C3F41": "#2D2A2E",
-      "#545556": "#5b595c",
-      "#606060": "#5b595c",
+      "#545556": "#727072",
+      "#606060": "#727072",
       "#9AA7B0": "#fcfcfa",
       "#675133": "#ffd866",
       "Actions.Blue": "#A9DC76",
@@ -879,20 +972,20 @@
       "Actions.GreyInline.Dark": "#fcfcfa",
       "Actions.Red": "#FF6188",
       "Actions.Yellow": "#78DCE8",
-      "Checkbox.Background.Default": "#3a3a3c",
-      "Checkbox.Background.Default.Dark": "#3a3a3c",
+      "Checkbox.Background.Default": "#221F22",
+      "Checkbox.Background.Default.Dark": "#221F22",
       "Checkbox.Background.Disabled": "#3a3a3c",
       "Checkbox.Background.Disabled.Dark": "#3a3a3c",
       "Checkbox.Border.Default": "#2d2a2e",
       "Checkbox.Border.Default.Dark": "#2d2a2e",
-      "Checkbox.Border.Disabled": "#5b595c",
-      "Checkbox.Border.Disabled.Dark": "#5b595c",
+      "Checkbox.Border.Disabled": "#727072",
+      "Checkbox.Border.Disabled.Dark": "#727072",
       "Checkbox.Focus.Thin.Default": "#ffd866",
       "Checkbox.Focus.Thin.Default.Dark": "#ffd866",
       "Checkbox.Focus.Wide": "#ffd866",
       "Checkbox.Focus.Wide.Dark": "#ffd866",
-      "Checkbox.Foreground.Disabled": "#5b595c",
-      "Checkbox.Foreground.Disabled.Dark": "#5b595c",
+      "Checkbox.Foreground.Disabled": "#727072",
+      "Checkbox.Foreground.Disabled.Dark": "#727072",
       "Checkbox.Background.Selected": "#ffd866",
       "Checkbox.Background.Selected.Dark": "#2D2A2E",
       "Checkbox.Border.Selected": "#ffd866",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json

@@ -3,21 +3,27 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Monokai Pro.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/monokai.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#939293",
       "background": "#2D2A2E",
       "borderColor": "#2d2a2e",
       "disabledBackground": "#3a3a3c",
-      "disabledForeground": "#5b595c",
-      "disabledText": "#5b595c",
+      "disabledForeground": "#727072",
+      "disabledText": "#727072",
       "focusColor": "#5b595c",
       "focusedBorderColor": "#ffd866",
       "foreground": "#fcfcfa",
       "inactiveBackground": "#3a3a3c",
       "inactiveForeground": "#939293",
       "infoForeground": "#939293",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionBackgroundInactive": "#403E41",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#403E41",
@@ -33,7 +39,7 @@
       "pressedBorderColor": "#ffd86650"
     },
     "Autocomplete": {
-      "selectionBackground": "#6E6C6F"
+      "selectionBackground": "#5B595C"
     },
     "Borders.ContrastBorderColor": "#2D2A2E",
     "Borders.color": "#2d2a2e",
@@ -43,7 +49,7 @@
       "default": {
         "endBackground": "#4A474B",
         "endBorderColor": "#4A474B",
-        "foreground": "#ffd866",
+        "foreground": "#FFFFFF",
         "focusColor": "#ffd866",
         "focusedBorderColor": "#ffd866",
         "shadowColor": "#4A474B",
@@ -51,7 +57,7 @@
         "startBorderColor": "#4A474B"
       },
       "disabledBorderColor": "#403E41",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "endBackground": "#403E41",
       "endBorderColor": "#403E41",
       "focus": "#5b595c",
@@ -72,10 +78,13 @@
       "Tooltip.borderColor": "#2d2a2e",
       "Tooltip.background": "#363437"
     },
-    "Content.background": "#3a3a3c",
+    "Content": {
+      "background": "#221F22",
+      "selectionBackground": "#5B595C"
+    },
     "CheckBox": {
       "background": "#2D2A2E",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa",
       "select": "#ffd866"
     },
@@ -84,10 +93,18 @@
       "acceleratorSelectionForeground": "#939293",
       "background": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
-      "selectionForeground": "#ffd866"
+      "selectionBackground": "#5B595C",
+      "selectionForeground": "#FFFFFF"
+    },
+    "CodeWithMe": {
+      "Avatar.foreground": "#fcfcfa",
+      "AccessEnabled": {
+        "accessDot": "#ffd866",
+        "dropdownBorder": "#403E41",
+        "pillBackground": "$second"
+      }
     },
     "ColorChooser": {
       "background": "#2D2A2E",
@@ -98,19 +115,20 @@
     "ComboBox": {
       "ArrowButton": {
         "background": "#403E41",
-        "disabledIconColor": "#5b595c",
+        "disabledIconColor": "#727072",
         "iconColor": "#fcfcfa",
         "nonEditableBackground": "#2D2A2E"
       },
       "background": "#2D2A2E",
       "buttonBackground": "#403E41",
-      "disabledForeground": "#5b595c",
+      "darcula.hoveredArrowButtonForeground": "#ffd866",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "modifiedItemForeground": "#ffd866",
       "nonEditableBackground": "#403E41",
       "padding": "5,5,5,5",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "ComboPopup.border": "#2d2a2e",
     "CompletionPopup": {
@@ -123,8 +141,8 @@
       "selectedGrayedForeground": "#FFFFFF",
       "selectionGrayForeground": "#FFFFFF",
       "selectionInactiveInfoForeground": "#939293",
-      "selectionInactiveBackground": "#6E6C6F50",
-      "selectionBackground": "#6E6C6F80",
+      "selectionInactiveBackground": "#5B595C50",
+      "selectionBackground": "#5B595C80",
       "selectionForeground": "#FFFFFF",
       "selectionInfoForeground": "#FFFFFF"
     },
@@ -168,11 +186,13 @@
       "hoverBackground": "#4A474B",
       "hoverColor": "#2D2A2E",
       "hoverMaskColor": "#5b595c",
+      "inactiveColoredTabBackground": "#2D2A2E",
       "inactiveColoredFileBackground": "#403E41",
-      "inactiveUnderlineColor": "#5b595c",
+      "inactiveUnderlineColor": "#ffd866",
       "inactiveMaskColor": "#2D2A2E",
       "underlineColor": "#ffd866",
-      "underlinedTabBackground": "#4A474B"
+      "underlinedTabBackground": "#4A474B",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#2D2A2E",
     "DialogWrapper.southPanelBackground": "#2D2A2E",
@@ -192,21 +212,23 @@
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
       "inactiveBackground": "#2D2A2E",
-      "inactiveForeground": "#5b595c",
-      "selectionBackground": "#6E6C6F",
-      "selectionForeground": "#ffd866"
+      "inactiveForeground": "#727072",
+      "selectionBackground": "#5B595C",
+      "selectionForeground": "#FFFFFF"
     },
     "EditorTabs": {
       "borderColor": "#403E41",
+      "hoverBackground": "#5b595c",
       "hoverColor": "#5b595c",
       "hoverMaskColor": "#5b595c",
       "inactiveMaskColor": "#2D2A2E",
-      "inactiveColoredFileBackground": "#2D2A2E2",
-      "inactiveUnderlineColor": "#5b595c",
+      "inactiveColoredFileBackground": "#2D2A2E",
+      "inactiveUnderlineColor": "#727072",
       "selectedForeground": "#fcfcfa",
       "selectedBackground": "#4A474B",
       "underlineColor": "#ffd866",
-      "underlinedTabBackground": "#4A474B"
+      "underlinedTabBackground": "#4A474B",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#2D2A2E",
@@ -242,21 +264,22 @@
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
       "inactiveBackground": "#403E41",
-      "inactiveForeground": "#5b595c",
-      "selectionForeground": "#ffd866",
+      "inactiveForeground": "#727072",
+      "selectionForeground": "#FFFFFF",
       "selectionBackground": "#4A474B"
     },
+    "GotItTooltip.borderColor": "#363437",
     "Group": {
       "disabledSeparatorColor": "#2d2a2e",
       "separatorColor": "#2d2a2e"
     },
     "GutterTooltip": {
-      "infoForeground": "#fcfcfa",
+      "infoForeground": "#939293",
       "lineSeparatorColor": "#2D2A2E"
     },
     "HeaderColor": {
       "active": "#2D2A2E",
-      "inactive": "#3a3a3c"
+      "inactive": "#221F22"
     },
     "HelpTooltip": {
       "background": "#2D2A2E",
@@ -283,12 +306,13 @@
     },
     "Label": {
       "background": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "disabledShadow": "#2D2A2E",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa",
       "infoForeground": "#939293",
-      "selectedForeground": "#ffd866"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#fcfcfa"
     },
     "Link": {
       "activeForeground": "#ffd866",
@@ -301,15 +325,17 @@
     "List": {
       "background": "#403E41",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F50",
+      "hoverBackground": "#403E4170",
+      "hoverInactiveBackground": "#4A474B",
+      "selectionBackground": "#5B595C50",
       "selectionForeground": "#FFFFFF",
-      "selectionInactiveForeground": "#ffd866",
-      "selectionInactiveBackground": "#403E41"
+      "selectionInactiveForeground": "#FFFFFF",
+      "selectionInactiveBackground": "#403E4170"
     },
     "material": {
       "background": "#2D2A2E",
       "branchColor": "#fcfcfa",
-      "contrast": "#3a3a3c",
+      "contrast": "#221F22",
       "foreground": "#fcfcfa",
       "mergeCommits": "#403E41",
       "primaryColor": "#939293",
@@ -330,9 +356,9 @@
       "border": "4,2,4,2",
       "borderColor": "#403E41",
       "disabledBackground": "#403E41",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF",
       "separatorColor": "#2d2a2e"
     },
@@ -340,10 +366,10 @@
       "background": "#2D2A2E",
       "borderColor": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "highlight": "#2D2A2E",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF",
       "shadow": "#2D2A2E"
     },
@@ -353,9 +379,9 @@
       "border": "4,2,4,2",
       "background": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF"
     },
     "NavBar": {
@@ -400,7 +426,7 @@
     "Outline": {
       "color": "#403E41",
       "focusedColor": "#ffd866",
-      "disabledColor": "#5b595c"
+      "disabledColor": "#727072"
     },
     "Panel": {
       "background": "#2D2A2E",
@@ -409,9 +435,9 @@
     "ParameterInfo": {
       "background": "#403E41",
       "borderColor": "#4A474B",
-      "currentOverloadBackground": "#4A474B",
+      "currentOverloadBackground": "#5b595c",
       "currentParameterForeground": "#ffd866",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "infoForeground": "#939293",
       "lineSeparatorColor": "#4A474B"
@@ -421,17 +447,18 @@
       "capsLockIconColor": "#ffd866",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "Plugins": {
       "background": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "eapTagBackground": "#5b595c",
-      "lightSelectionBackground": "#6E6C6F",
+      "hoverBackground": "#403E4170",
+      "lightSelectionBackground": "#4A474B",
       "paidTagBackground": "#5b595c",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "tagForeground": "#ffd866",
       "tagBackground": "#5b595c",
       "trialTagBackground": "#5b595c",
@@ -440,9 +467,9 @@
         "installBorderColor": "#403E41",
         "installForeground": "#fcfcfa",
         "installFocusedBackground": "#5b595c",
-        "installFillForeground": "#5b595c",
+        "installFillForeground": "#727072",
         "installFillBackground": "#403E41",
-        "updateBackground": "#403E41",
+        "updateBackground": "#ffd866",
         "updateBorderColor": "#403E41",
         "updateForeground": "#fcfcfa"
       },
@@ -466,20 +493,20 @@
         "borderColor": "#2D2A2E",
         "foreground": "#ffd866"
       },
-      "borderColor": "#3a3a3c",
+      "borderColor": "#221F22",
       "inactiveBorderColor": "#2D2A2E",
       "innerBorderColor": "#403E41",
       "Header": {
         "activeBackground": "#2D2A2E",
-        "inactiveBackground": "#3a3a3c"
+        "inactiveBackground": "#221F22"
       },
       "paintBorder": true,
       "separatorForeground": "#fcfcfa",
       "separatorColor": "#403E41",
       "Toolbar": {
-        "Floating.background": "#3a3a3c",
-        "background": "#3a3a3c",
-        "borderColor": "#3a3a3c"
+        "Floating.background": "#221F22",
+        "background": "#221F22",
+        "borderColor": "#221F22"
       }
     },
     "PopupMenu": {
@@ -504,7 +531,7 @@
     },
     "RadioButton": {
       "background": "#2D2A2E",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa"
     },
     "RadioButtonMenuItem": {
@@ -512,11 +539,12 @@
       "acceleratorSelectionForeground": "#939293",
       "background": "#2D2A2E",
       "disabledBackground": "#2D2A2E",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
-      "selectionBackground": "#6E6C6F",
+      "selectionBackground": "#5B595C",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#2d2a2e",
     "ScrollBar": {
       "background": "#2D2A2E",
       "hoverThumbBorderColor": "#ffd866",
@@ -553,7 +581,7 @@
     },
     "SearchEverywhere": {
       "Advertiser": {
-        "background": "#3a3a3c",
+        "background": "#221F22",
         "foreground": "#939293"
       },
       "Header": {
@@ -565,20 +593,29 @@
       },
       "SearchField": {
         "background": "#2D2A2E",
-        "borderColor": "#3a3a3c",
+        "borderColor": "#221F22",
         "infoForeground": "#939293"
       },
       "Tab": {
-        "active.foreground": "#ffd866",
-        "selectedForeground": "#ffd866",
+        "active.foreground": "#FFFFFF",
+        "selectedForeground": "#FFFFFF",
         "selectedBackground": "#5b595c"
       }
     },
     "SearchMatch": {
       "endBackground": "#ffd866",
-      "startBackground": "#ffd866"
+      "startBackground": "#ffd866",
+      "endColor": "#ffd866",
+      "startColor": "#ffd866"
     },
     "SearchField.errorBackground": "#363437",
+    "SearchOption": {
+      "selectedBackground": "#4A474B"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#939293",
+      "Repeated.File.Foreground": "#fcfcfa"
+    },
     "Separator": {
       "background": "#403E41",
       "foreground": "#403E41",
@@ -608,7 +645,7 @@
       "background": "#2D2A2E",
       "border": "3,3,3,3",
       "foreground": "#fcfcfa",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "SplitPane": {
       "background": "#2D2A2E",
@@ -616,15 +653,17 @@
     },
     "SplitPaneDivider.draggingColor": "#403E41",
     "StatusBar": {
-      "borderColor": "#2D2A2E"
+      "borderColor": "#2D2A2E",
+      "hoverBackground": "#5b595c",
+      "LightEditBackground": "#4A474B"
     },
     "TabbedPane": {
       "background": "#2D2A2E",
       "contentAreaColor": "#5b595c",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#2d2a2e",
-      "disabledForeground": "#5b595c",
-      "disabledUnderlineColor": "#5b595c",
+      "disabledForeground": "#727072",
+      "disabledUnderlineColor": "#727072",
       "focus": "#4A474B",
       "focusColor": "#4A474B",
       "fontSizeOffset": 0,
@@ -632,7 +671,7 @@
       "highlight": "#2d2a2e",
       "hoverColor": "#5b595c",
       "labelShift": 0,
-      "selectedForeground": "#ffd866",
+      "selectedForeground": "#FFFFFF",
       "selectedLabelShift": 0,
       "selectedTabPadInsets": "0,0,0,0",
       "tabsOverlapBorder": true,
@@ -643,35 +682,39 @@
     },
     "TabbedPane.mt.tab.background": "#2D2A2E",
     "Table": {
+      "alternativeRowBackground": "#221F22",
       "background": "#2D2A2E",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#727072",
       "dropLineColor": "#ffd866",
       "dropLineShortColor": "#ffd866",
       "focusCellBackground": "#4A474B",
-      "focusCellForeground": "#ffd866",
+      "focusCellForeground": "#FFFFFF",
       "foreground": "#fcfcfa",
       "gridColor": "#2D2A2E",
       "highlightOuter": "#4A474B",
-      "lightSelectionForeground": "#ffd866",
+      "hoverBackground": "#403E4170",
+      "hoverInactiveBackground": "#4A474B",
+      "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#939293",
       "lightSelectionInactiveBackground": "#403E41",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866",
+      "selectionForeground": "#FFFFFF",
       "selectionInactiveBackground": "#4A474B",
       "selectionInactiveForeground": "#FFFFFF",
       "sortIconColor": "#fcfcfa",
-      "stripeColor": "#3a3a3c"
+      "stripeColor": "#221F22"
     },
     "TableHeader": {
       "background": "#2D2A2E",
       "borderColor": "#2D2A2E",
       "bottomSeparatorColor": "#403E41",
       "cellBorder": "4,0,4,0",
-      "disabledForeground": "#5b595c",
+      "disabledForeground": "#727072",
       "foreground": "#fcfcfa",
       "focusCellBackground": "#4A474B",
-      "focusCellForeground": "#ffd866",
+      "focusCellForeground": "#FFFFFF",
       "height": 25,
       "separatorColor": "#403E41"
     },
@@ -682,28 +725,28 @@
       "background": "#2D2A2E",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "TextField": {
       "background": "#2D2A2E",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "TextPane": {
       "background": "#2D2A2E",
       "caretForeground": "#ffd866",
       "foreground": "#fcfcfa",
-      "inactiveForeground": "#5b595c",
+      "inactiveForeground": "#727072",
       "selectionBackground": "#4A474B",
-      "selectionForeground": "#ffd866"
+      "selectionForeground": "#FFFFFF"
     },
     "TitlePane": {
-      "background": "#3a3a3c",
+      "background": "#221F22",
       "Button.hoverBackground": "#5b595c",
       "inactiveBackground": "#2D2A2E",
       "infoForeground": "#939293",
@@ -713,7 +756,7 @@
     "ToggleButton": {
       "borderColor": "#403E41",
       "buttonColor": "#fcfcfa",
-      "disabledText": "#5b595c",
+      "disabledText": "#727072",
       "foreground": "#fcfcfa",
       "offForeground": "#2D2A2E",
       "offBackground": "#2D2A2E",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#2D2A2E",
       "Actions.infoForeground": "#939293",
-      "background": "#2D2A2E",
-      "borderColor": "#5b595c",
+      "background": "#363437",
+      "borderColor": "#2d2a2e",
       "foreground": "#fcfcfa",
       "infoForeground": "#939293",
       "separatorColor": "#2d2a2e",
@@ -739,8 +782,8 @@
     "ToolWindow": {
       "Button": {
         "hoverBackground": "#4A474B",
-        "selectedForeground": "#ffd866",
-        "selectedBackground": "#3a3a3c"
+        "selectedForeground": "#FFFFFF",
+        "selectedBackground": "#221F22"
       },
       "Header": {
         "background": "#2D2A2E",
@@ -751,50 +794,93 @@
         "background": "#2D2A2E"
       },
       "HeaderTab": {
+        "borderColor": "#5b595c",
         "hoverBackground": "#5b595c",
-        "hoverInactiveBackground": "#403E41",
+        "hoverInactiveBackground": "#5b595c",
         "inactiveUnderlineColor": "#ffd866",
-        "selectedBackground": "#3a3a3c",
-        "selectedInactiveBackground": "#3a3a3c",
+        "selectedBackground": "#221F22",
+        "selectedInactiveBackground": "#221F22",
         "underlineColor": "#ffd866",
-        "underlinedTabBackground": "#5b595c",
-        "underlinedTabInactiveBackground": "#403E41"
+        "underlinedTabBackground": "#4A474B",
+        "underlinedTabInactiveBackground": "#403E41",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#fcfcfa"
       }
     },
     "Tree": {
       "background": "#2D2A2E",
       "foreground": "#939293",
       "hash": "#2d2a2e",
+      "hoverBackground": "#403E4170",
+      "hoverInactiveBackground": "#4A474B",
       "modifiedItemForeground": "#ffd866",
       "rowHeight": 28,
-      "selectionBackground": "#403E41",
+      "selectionBackground": "#403E4170",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#403E41",
+      "selectionInactiveBackground": "#403E4170",
       "textBackground": "#2D2A2E"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#2d2a2e",
-      "ColorPicker.background": "#2D2A2E",
-      "ColorPicker.foreground": "#fcfcfa",
-      "Component.borderColor": "#2d2a2e",
-      "Component.background": "#2D2A2E",
-      "Component.foreground": "#fcfcfa",
-      "Connector.borderColor": "#2d2a2e",
-      "Connector.hoverBorderColor": "#5b595c",
-      "Canvas.background": "#3a3a3c",
+      "Canvas.background": "#221F22",
+      "ColorPicker": {
+        "background": "#2D2A2E",
+        "foreground": "#fcfcfa"
+      },
+      "Component": {
+        "borderColor": "#2d2a2e",
+        "background": "#2D2A2E",
+        "foreground": "#fcfcfa",
+        "hoverBorderColor": "#5b595c"
+      },
+      "Connector": {
+        "borderColor": "#2d2a2e",
+        "hoverBorderColor": "#5b595c"
+      },
+      "Canvas.background": "#221F22",
       "highStroke.foreground": "#fcfcfa",
       "Label.foreground": "#939293",
-      "List.selectionBackground": "#403E41",
-      "Panel.borderColor": "#2d2a2e",
-      "Panel.background": "#2D2A2E",
+      "List.selectionBackground": "#403E4170",
+      "motion": {
+        "borderColor": "#2d2a2e",
+        "Component.foreground": "#fcfcfa",
+        "ConstraintSetText.foreground": "#939293",
+        "ConstraintSet.background": "#403E41",
+        "CSPanel.SelectedFocusBackground": "#5B595C",
+        "CSPanel.SelectedBackground": "#403E4170",
+        "cs_FocusText.infoForeground": "#939293",
+        "CursorTextColor.foreground": "#fcfcfa",
+        "HoverColor.disabledBackground": "#727072",
+        "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_SelectedBackground.selectionInactiveBackground": "#4A474B",
+        "ourCS_SelectedBorder.pressedBorderColor": "#5b595c",
+        "ourML_BarColor.separatorColor": "#2d2a2e",
+        "PrimaryPanel.background": "#221F22",
+        "SecondaryPanel.background": "#2D2A2E",
+        "SecondaryPanel.header.foreground": "#939293",
+        "SecondaryPanel.header.background": "#221F22",
+        "timeLine.disabledBorderColor": "#2d2a2e"
+      },
+      "Panel": {
+        "borderColor": "#2d2a2e",
+        "background": "#2D2A2E"
+      },
       "percent.foreground": "#fcfcfa",
-      "Placeholder.background": "#2D2A2E",
-      "Placeholder.borderColor": "#2d2a2e",
-      "Placeholder.foreground": "#fcfcfa",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#2D2A2E",
+        "borderColor": "#2d2a2e",
+        "foreground": "#fcfcfa",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#2D2A2E",
       "stroke.acceleratorForeground": "#939293"
     },
@@ -819,8 +905,8 @@
       },
       "HgLog": {
         "branchIconColor": "#ffd866",
-        "bookmarkIconColor": "#ffd866",
-        "closedBranchIconColor": "#5b595c",
+        "bookmarkIconColor": "#FFFFFF",
+        "closedBranchIconColor": "#727072",
         "localTagIconColor": "#939293",
         "mqTagIconColor": "#939293",
         "tagIconColor": "#939293",
@@ -828,10 +914,11 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#939293",
-        "Commit.currentBranchBackground": "#403E41"
+        "Commit.currentBranchBackground": "#403E41",
+        "Commit.hoveredBackground": "#403E4170"
       },
       "RefLabel": {
-        "foreground": "#ffd866",
+        "foreground": "#FFFFFF",
         "backgroundBase": "#5b595c"
       }
     },
@@ -840,18 +927,24 @@
       "foreground": "#fcfcfa"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#2D2A2E",
       "background": "#2D2A2E",
       "borderColor": "#2D2A2E",
-      "captionBackground": "#3a3a3c",
+      "captionBackground": "#221F22",
       "captionForeground": "#fcfcfa",
-      "footerBackground": "#3a3a3c",
+      "Details.background": "#2D2A2E",
+      "footerBackground": "#221F22",
       "footerForeground": "#fcfcfa",
       "headerBackground": "#2D2A2E",
       "headerForeground": "#fcfcfa",
+      "List.background": "#221F22",
       "separatorColor": "#2d2a2e",
+      "SidePanel.background": "#403E41",
       "Projects": {
+        "actions.background": "#221F22",
+        "actions.selectionBackground": "#5b595c",
         "background": "#403E41",
-        "selectionBackground": "#6E6C6F",
+        "selectionBackground": "#5B595C",
         "selectionInactiveBackground": "#403E41"
       }
     },
@@ -862,14 +955,14 @@
   },
   "icons": {
     "ColorPalette": {
-      "#43494A": "#3a3a3c",
+      "#43494A": "#221F22",
       "#6B6B6B": "#939293",
       "#A7A7A7": "#2D2A2E",
       "#3D6185": "#ffd866",
       "#466D94": "#ffd866",
       "#3C3F41": "#2D2A2E",
-      "#545556": "#5b595c",
-      "#606060": "#5b595c",
+      "#545556": "#727072",
+      "#606060": "#727072",
       "#9AA7B0": "#fcfcfa",
       "#675133": "#ffd866",
       "Actions.Blue": "#A9DC76",
@@ -879,20 +972,20 @@
       "Actions.GreyInline.Dark": "#fcfcfa",
       "Actions.Red": "#FF6188",
       "Actions.Yellow": "#78DCE8",
-      "Checkbox.Background.Default": "#3a3a3c",
-      "Checkbox.Background.Default.Dark": "#3a3a3c",
+      "Checkbox.Background.Default": "#221F22",
+      "Checkbox.Background.Default.Dark": "#221F22",
       "Checkbox.Background.Disabled": "#3a3a3c",
       "Checkbox.Background.Disabled.Dark": "#3a3a3c",
       "Checkbox.Border.Default": "#2d2a2e",
       "Checkbox.Border.Default.Dark": "#2d2a2e",
-      "Checkbox.Border.Disabled": "#5b595c",
-      "Checkbox.Border.Disabled.Dark": "#5b595c",
+      "Checkbox.Border.Disabled": "#727072",
+      "Checkbox.Border.Disabled.Dark": "#727072",
       "Checkbox.Focus.Thin.Default": "#ffd866",
       "Checkbox.Focus.Thin.Default.Dark": "#ffd866",
       "Checkbox.Focus.Wide": "#ffd866",
       "Checkbox.Focus.Wide.Dark": "#ffd866",
-      "Checkbox.Foreground.Disabled": "#5b595c",
-      "Checkbox.Foreground.Disabled.Dark": "#5b595c",
+      "Checkbox.Foreground.Disabled": "#727072",
+      "Checkbox.Foreground.Disabled.Dark": "#727072",
       "Checkbox.Background.Selected": "#ffd866",
       "Checkbox.Background.Selected.Dark": "#2D2A2E",
       "Checkbox.Border.Selected": "#ffd866",

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json

@@ -1,8 +1,14 @@
 {
-  "name": "Material Solarized Dark Contrast",
+  "name": "Solarized Dark Contrast",
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Solarized Dark.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/solardark.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#586e75",
@@ -11,7 +17,7 @@
       "disabledBackground": "#083F4D",
       "disabledForeground": "#2E5861",
       "disabledText": "#2E5861",
-      "focusColor": "#005a6f",
+      "focusColor": "#11353F",
       "focusedBorderColor": "#d33682",
       "foreground": "#839496",
       "inactiveBackground": "#083F4D",
@@ -41,28 +47,28 @@
       "arc": 0,
       "background": "#002B36",
       "default": {
-        "endBackground": "#003946",
-        "endBorderColor": "#003946",
+        "endBackground": "#11353F",
+        "endBorderColor": "#11353F",
         "foreground": "#FFFFFF",
         "focusColor": "#d33682",
         "focusedBorderColor": "#d33682",
-        "shadowColor": "#003946",
-        "startBackground": "#003946",
-        "startBorderColor": "#003946"
+        "shadowColor": "#11353F",
+        "startBackground": "#11353F",
+        "startBorderColor": "#11353F"
       },
       "disabledBorderColor": "#073642",
       "disabledText": "#2E5861",
       "endBackground": "#073642",
       "endBorderColor": "#073642",
-      "focus": "#005a6f",
+      "focus": "#11353F",
       "focusedBorderColor": "#d33682",
       "foreground": "#586e75",
       "highlight": "#FFFFFF",
       "mt.background": "#073642",
       "mt.foreground": "#586e75",
       "mt.selectedForeground": "#FFFFFF",
-      "mt.selection.color1": "#003946",
-      "mt.selection.color2": "#003946",
+      "mt.selection.color1": "#11353F",
+      "mt.selection.color2": "#11353F",
       "startBackground": "#073642",
       "startBorderColor": "#073642",
       "shadowColor": "#073642",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#0D3640",
       "Tooltip.background": "#2E4C52"
     },
-    "Content.background": "#00252E",
+    "Content": {
+      "background": "#00252E",
+      "selectionBackground": "#2E4C52"
+    },
     "CheckBox": {
       "background": "#002B36",
       "disabledText": "#2E5861",
@@ -89,6 +98,14 @@
       "selectionBackground": "#2E4C52",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#839496",
+      "AccessEnabled": {
+        "accessDot": "#d33682",
+        "dropdownBorder": "#003745",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#002B36",
       "foreground": "#839496",
@@ -104,12 +121,13 @@
       },
       "background": "#00252E",
       "buttonBackground": "#073642",
+      "darcula.hoveredArrowButtonForeground": "#d33682",
       "disabledForeground": "#2E5861",
       "foreground": "#839496",
       "modifiedItemForeground": "#d33682",
       "nonEditableBackground": "#003745",
       "padding": "5,5,5,5",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "ComboPopup.border": "#0D3640",
@@ -130,7 +148,7 @@
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#005a6f",
+      "borderColor": "#11353F",
       "disabledBorderColor": "#073642",
       "focusColor": "#d33682",
       "focusedBorderColor": "#d33682",
@@ -156,23 +174,25 @@
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#005a6f",
-      "underlinedTabBackground": "#005a6f"
+      "selectedBackground": "#11353F",
+      "underlinedTabBackground": "#11353F"
     },
     "DebuggerPopup": {
-      "borderColor": "#005a6f"
+      "borderColor": "#11353F"
     },
     "DefaultTabs": {
       "background": "#002B36",
       "borderColor": "#002B36",
-      "hoverBackground": "#003946",
+      "hoverBackground": "#11353F",
       "hoverColor": "#00252E",
-      "hoverMaskColor": "#005a6f",
+      "hoverMaskColor": "#11353F",
+      "inactiveColoredTabBackground": "#002B36",
       "inactiveColoredFileBackground": "#073642",
-      "inactiveUnderlineColor": "#2E5861",
+      "inactiveUnderlineColor": "#d33682",
       "inactiveMaskColor": "#00252E",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#003946"
+      "underlinedTabBackground": "#11353F",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#002B36",
     "DialogWrapper.southPanelBackground": "#002B36",
@@ -198,24 +218,26 @@
     },
     "EditorTabs": {
       "borderColor": "#003745",
-      "hoverColor": "#005a6f",
-      "hoverMaskColor": "#005a6f",
+      "hoverBackground": "#11353F",
+      "hoverColor": "#11353F",
+      "hoverMaskColor": "#11353F",
       "inactiveMaskColor": "#002B36",
-      "inactiveColoredFileBackground": "#002B362",
+      "inactiveColoredFileBackground": "#002B36",
       "inactiveUnderlineColor": "#2E5861",
       "selectedForeground": "#839496",
-      "selectedBackground": "#003946",
+      "selectedBackground": "#11353F",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#003946"
+      "underlinedTabBackground": "#11353F",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#002B36",
       "borderColor": "#003745",
-      "hoverBackground": "#005a6f",
-      "hoverColor": "#005a6f",
+      "hoverBackground": "#11353F",
+      "hoverColor": "#11353F",
       "inactiveUnderlineColor": "#d33682",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#003946",
+      "underlinedTabBackground": "#11353F",
       "underlinedTabForeground": "#839496"
     },
     "FileColor": {
@@ -244,14 +266,15 @@
       "inactiveBackground": "#073642",
       "inactiveForeground": "#2E5861",
       "selectionForeground": "#FFFFFF",
-      "selectionBackground": "#003946"
+      "selectionBackground": "#11353F"
     },
+    "GotItTooltip.borderColor": "#2E4C52",
     "Group": {
       "disabledSeparatorColor": "#0D3640",
       "separatorColor": "#0D3640"
     },
     "GutterTooltip": {
-      "infoForeground": "#839496",
+      "infoForeground": "#586e75",
       "lineSeparatorColor": "#002B36"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#2E5861",
       "foreground": "#839496",
       "infoForeground": "#586e75",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#839496"
     },
     "Link": {
       "activeForeground": "#d33682",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#003745",
       "foreground": "#839496",
+      "hoverBackground": "#2E4C5270",
+      "hoverInactiveBackground": "#11353F",
       "selectionBackground": "#2E4C5250",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5280"
+      "selectionInactiveBackground": "#2E4C5270"
     },
     "material": {
       "background": "#002B36",
@@ -320,8 +346,8 @@
     },
     "MemoryIndicator": {
       "allocatedBackground": "#003745",
-      "usedColor": "#005a6f",
-      "usedBackground": "#005a6f"
+      "usedColor": "#11353F",
+      "usedBackground": "#11353F"
     },
     "Menu": {
       "acceleratorForeground": "#586e75",
@@ -408,13 +434,13 @@
     },
     "ParameterInfo": {
       "background": "#003745",
-      "borderColor": "#003946",
-      "currentOverloadBackground": "#003946",
+      "borderColor": "#11353F",
+      "currentOverloadBackground": "#11353F",
       "currentParameterForeground": "#d33682",
       "disabledForeground": "#2E5861",
       "foreground": "#839496",
       "infoForeground": "#586e75",
-      "lineSeparatorColor": "#003946"
+      "lineSeparatorColor": "#11353F"
     },
     "PasswordField": {
       "background": "#00252E",
@@ -422,27 +448,28 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "Plugins": {
       "background": "#002B36",
       "disabledForeground": "#2E5861",
-      "eapTagBackground": "#005a6f",
-      "lightSelectionBackground": "#2E4C52",
-      "paidTagBackground": "#005a6f",
+      "eapTagBackground": "#11353F",
+      "hoverBackground": "#2E4C5270",
+      "lightSelectionBackground": "#11353F",
+      "paidTagBackground": "#11353F",
       "selectionBackground": "#2E4C52",
       "tagForeground": "#d33682",
-      "tagBackground": "#005a6f",
-      "trialTagBackground": "#005a6f",
+      "tagBackground": "#11353F",
+      "trialTagBackground": "#11353F",
       "Button": {
         "installBackground": "#073642",
         "installBorderColor": "#073642",
         "installForeground": "#839496",
-        "installFocusedBackground": "#005a6f",
+        "installFocusedBackground": "#11353F",
         "installFillForeground": "#2E5861",
         "installFillBackground": "#073642",
-        "updateBackground": "#073642",
+        "updateBackground": "#d33682",
         "updateBorderColor": "#073642",
         "updateForeground": "#839496"
       },
@@ -455,9 +482,9 @@
         "foreground": "#839496"
       },
       "Tab": {
-        "hoverBackground": "#003946",
+        "hoverBackground": "#11353F",
         "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#003946"
+        "selectedBackground": "#11353F"
       }
     },
     "Popup": {
@@ -496,8 +523,8 @@
       "indeterminateEndColor": "#d33682",
       "indeterminateStartColor": "#d33682",
       "progressColor": "#d33682",
-      "selectionBackground": "#005a6f",
-      "trackColor": "#005a6f"
+      "selectionBackground": "#11353F",
+      "trackColor": "#11353F"
     },
     "PsiViewer": {
       "referenceHighlightColor": "#d33682"
@@ -517,6 +544,7 @@
       "selectionBackground": "#2E4C52",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#0D3640",
     "ScrollBar": {
       "background": "#002B36",
       "hoverThumbBorderColor": "#d33682",
@@ -538,7 +566,7 @@
           "trackColor": "#002B3630"
         }
       },
-      "thumb": "#005a6f",
+      "thumb": "#11353F",
       "thumbBorderColor": "#d3368270",
       "thumbColor": "#d3368270",
       "trackColor": "#002B3630",
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#FFFFFF",
         "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#005a6f"
+        "selectedBackground": "#11353F"
       }
     },
     "SearchMatch": {
       "endBackground": "#d33682",
-      "startBackground": "#d33682"
+      "startBackground": "#d33682",
+      "endColor": "#d33682",
+      "startColor": "#d33682"
     },
     "SearchField.errorBackground": "#2E4C52",
+    "SearchOption": {
+      "selectedBackground": "#11353F"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#586e75",
+      "Repeated.File.Foreground": "#839496"
+    },
     "Separator": {
       "background": "#003745",
       "foreground": "#003745",
@@ -594,12 +631,12 @@
       "foreground": "#839496",
       "majorTickLength": 6,
       "tickColor": "#003745",
-      "trackColor": "#003946",
+      "trackColor": "#11353F",
       "trackWidth": 7,
       "thumb": "#d33682"
     },
     "SpeedSearch": {
-      "background": "#005a6f",
+      "background": "#11353F",
       "borderColor": "#0D3640",
       "foreground": "#839496",
       "errorForeground": "#839496"
@@ -616,21 +653,23 @@
     },
     "SplitPaneDivider.draggingColor": "#003745",
     "StatusBar": {
-      "borderColor": "#002B36"
+      "borderColor": "#002B36",
+      "hoverBackground": "#11353F",
+      "LightEditBackground": "#11353F"
     },
     "TabbedPane": {
       "background": "#002B36",
-      "contentAreaColor": "#005a6f",
+      "contentAreaColor": "#11353F",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#0D3640",
       "disabledForeground": "#2E5861",
       "disabledUnderlineColor": "#2E5861",
-      "focus": "#003946",
-      "focusColor": "#003946",
+      "focus": "#11353F",
+      "focusColor": "#11353F",
       "fontSizeOffset": 0,
       "foreground": "#839496",
       "highlight": "#0D3640",
-      "hoverColor": "#005a6f",
+      "hoverColor": "#11353F",
       "labelShift": 0,
       "selectedForeground": "#FFFFFF",
       "selectedLabelShift": 0,
@@ -643,22 +682,26 @@
     },
     "TabbedPane.mt.tab.background": "#00252E",
     "Table": {
+      "alternativeRowBackground": "#00252E",
       "background": "#002B36",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#2E5861",
       "dropLineColor": "#d33682",
       "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#003946",
+      "focusCellBackground": "#11353F",
       "focusCellForeground": "#FFFFFF",
       "foreground": "#839496",
       "gridColor": "#002B36",
-      "highlightOuter": "#003946",
+      "highlightOuter": "#11353F",
+      "hoverBackground": "#2E4C5270",
+      "hoverInactiveBackground": "#11353F",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#586e75",
       "lightSelectionInactiveBackground": "#003745",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#003946",
+      "selectionInactiveBackground": "#11353F",
       "selectionInactiveForeground": "#FFFFFF",
       "sortIconColor": "#839496",
       "stripeColor": "#00252E"
@@ -670,7 +713,7 @@
       "cellBorder": "4,0,4,0",
       "disabledForeground": "#2E5861",
       "foreground": "#839496",
-      "focusCellBackground": "#003946",
+      "focusCellBackground": "#11353F",
       "focusCellForeground": "#FFFFFF",
       "height": 25,
       "separatorColor": "#003745"
@@ -683,7 +726,7 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "TextField": {
@@ -691,7 +734,7 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "TextPane": {
@@ -699,12 +742,12 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "TitlePane": {
       "background": "#00252E",
-      "Button.hoverBackground": "#005a6f",
+      "Button.hoverBackground": "#11353F",
       "inactiveBackground": "#002B36",
       "infoForeground": "#586e75",
       "inactiveInfoForeground": "#586e75"
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#002B36",
       "Actions.infoForeground": "#586e75",
-      "background": "#002B36",
-      "borderColor": "#005a6f",
+      "background": "#2E4C52",
+      "borderColor": "#0D3640",
       "foreground": "#839496",
       "infoForeground": "#586e75",
       "separatorColor": "#0D3640",
@@ -738,7 +781,7 @@
     },
     "ToolWindow": {
       "Button": {
-        "hoverBackground": "#003946",
+        "hoverBackground": "#11353F",
         "selectedForeground": "#FFFFFF",
         "selectedBackground": "#00252E"
       },
@@ -751,50 +794,93 @@
         "background": "#002B36"
       },
       "HeaderTab": {
-        "hoverBackground": "#005a6f",
-        "hoverInactiveBackground": "#003745",
+        "borderColor": "#11353F",
+        "hoverBackground": "#11353F",
+        "hoverInactiveBackground": "#11353F",
         "inactiveUnderlineColor": "#d33682",
         "selectedBackground": "#00252E",
         "selectedInactiveBackground": "#00252E",
         "underlineColor": "#d33682",
-        "underlinedTabBackground": "#005a6f",
-        "underlinedTabInactiveBackground": "#003745"
+        "underlinedTabBackground": "#11353F",
+        "underlinedTabInactiveBackground": "#003745",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#839496"
       }
     },
     "Tree": {
       "background": "#00252E",
       "foreground": "#586e75",
       "hash": "#0D3640",
+      "hoverBackground": "#2E4C5270",
+      "hoverInactiveBackground": "#11353F",
       "modifiedItemForeground": "#d33682",
       "rowHeight": 28,
-      "selectionBackground": "#2E4C5280",
+      "selectionBackground": "#2E4C5270",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5280",
+      "selectionInactiveBackground": "#2E4C5270",
       "textBackground": "#00252E"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#0D3640",
-      "ColorPicker.background": "#002B36",
-      "ColorPicker.foreground": "#839496",
-      "Component.borderColor": "#0D3640",
-      "Component.background": "#002B36",
-      "Component.foreground": "#839496",
-      "Connector.borderColor": "#0D3640",
-      "Connector.hoverBorderColor": "#005a6f",
+      "Canvas.background": "#00252E",
+      "ColorPicker": {
+        "background": "#002B36",
+        "foreground": "#839496"
+      },
+      "Component": {
+        "borderColor": "#0D3640",
+        "background": "#002B36",
+        "foreground": "#839496",
+        "hoverBorderColor": "#11353F"
+      },
+      "Connector": {
+        "borderColor": "#0D3640",
+        "hoverBorderColor": "#11353F"
+      },
       "Canvas.background": "#00252E",
       "highStroke.foreground": "#839496",
       "Label.foreground": "#586e75",
-      "List.selectionBackground": "#2E4C5280",
-      "Panel.borderColor": "#0D3640",
-      "Panel.background": "#002B36",
+      "List.selectionBackground": "#2E4C5270",
+      "motion": {
+        "borderColor": "#0D3640",
+        "Component.foreground": "#839496",
+        "ConstraintSetText.foreground": "#586e75",
+        "ConstraintSet.background": "#003745",
+        "CSPanel.SelectedFocusBackground": "#2E4C52",
+        "CSPanel.SelectedBackground": "#2E4C5270",
+        "cs_FocusText.infoForeground": "#586e75",
+        "CursorTextColor.foreground": "#839496",
+        "HoverColor.disabledBackground": "#2E5861",
+        "motionGraph.background": "#002B36",
+        "Notification.background": "#2E4C52",
+        "ourAvg.background": "#003745",
+        "ourCS.background": "#003745",
+        "ourCS_Border.borderColor": "#0D3640",
+        "ourCS_TextColor.foreground": "#586e75",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#11353F",
+        "ourCS_SelectedBorder.pressedBorderColor": "#11353F",
+        "ourML_BarColor.separatorColor": "#0D3640",
+        "PrimaryPanel.background": "#00252E",
+        "SecondaryPanel.background": "#002B36",
+        "SecondaryPanel.header.foreground": "#586e75",
+        "SecondaryPanel.header.background": "#00252E",
+        "timeLine.disabledBorderColor": "#0D3640"
+      },
+      "Panel": {
+        "borderColor": "#0D3640",
+        "background": "#002B36"
+      },
       "percent.foreground": "#839496",
-      "Placeholder.background": "#002B36",
-      "Placeholder.borderColor": "#0D3640",
-      "Placeholder.foreground": "#839496",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#002B36",
+        "borderColor": "#0D3640",
+        "foreground": "#839496",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#002B36",
       "stroke.acceleratorForeground": "#586e75"
     },
@@ -809,7 +895,7 @@
         "selectedBranchBackground": "#002B36"
       },
       "GitCommits": {
-        "graphColor": "#005a6f"
+        "graphColor": "#11353F"
       },
       "GitLog": {
         "localBranchIconColor": "#d33682",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#586e75",
-        "Commit.currentBranchBackground": "#003745"
+        "Commit.currentBranchBackground": "#003745",
+        "Commit.hoveredBackground": "#2E4C5270"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
-        "backgroundBase": "#005a6f"
+        "backgroundBase": "#11353F"
       }
     },
     "Viewport": {
@@ -840,16 +927,22 @@
       "foreground": "#839496"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#002B36",
       "background": "#002B36",
       "borderColor": "#002B36",
       "captionBackground": "#00252E",
       "captionForeground": "#839496",
+      "Details.background": "#002B36",
       "footerBackground": "#00252E",
       "footerForeground": "#839496",
       "headerBackground": "#002B36",
       "headerForeground": "#839496",
+      "List.background": "#00252E",
       "separatorColor": "#0D3640",
+      "SidePanel.background": "#003745",
       "Projects": {
+        "actions.background": "#00252E",
+        "actions.selectionBackground": "#11353F",
         "background": "#003745",
         "selectionBackground": "#2E4C52",
         "selectionInactiveBackground": "#003745"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json

@@ -3,6 +3,12 @@
   "dark": true,
   "author": "Mallowigi",
   "editorScheme": "/colors/Solarized Dark.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/solardark.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#586e75",
@@ -11,7 +17,7 @@
       "disabledBackground": "#083F4D",
       "disabledForeground": "#2E5861",
       "disabledText": "#2E5861",
-      "focusColor": "#005a6f",
+      "focusColor": "#11353F",
       "focusedBorderColor": "#d33682",
       "foreground": "#839496",
       "inactiveBackground": "#083F4D",
@@ -41,28 +47,28 @@
       "arc": 0,
       "background": "#002B36",
       "default": {
-        "endBackground": "#003946",
-        "endBorderColor": "#003946",
+        "endBackground": "#11353F",
+        "endBorderColor": "#11353F",
         "foreground": "#FFFFFF",
         "focusColor": "#d33682",
         "focusedBorderColor": "#d33682",
-        "shadowColor": "#003946",
-        "startBackground": "#003946",
-        "startBorderColor": "#003946"
+        "shadowColor": "#11353F",
+        "startBackground": "#11353F",
+        "startBorderColor": "#11353F"
       },
       "disabledBorderColor": "#073642",
       "disabledText": "#2E5861",
       "endBackground": "#073642",
       "endBorderColor": "#073642",
-      "focus": "#005a6f",
+      "focus": "#11353F",
       "focusedBorderColor": "#d33682",
       "foreground": "#586e75",
       "highlight": "#FFFFFF",
       "mt.background": "#073642",
       "mt.foreground": "#586e75",
       "mt.selectedForeground": "#FFFFFF",
-      "mt.selection.color1": "#003946",
-      "mt.selection.color2": "#003946",
+      "mt.selection.color1": "#11353F",
+      "mt.selection.color2": "#11353F",
       "startBackground": "#073642",
       "startBorderColor": "#073642",
       "shadowColor": "#073642",
@@ -72,7 +78,10 @@
       "Tooltip.borderColor": "#0D3640",
       "Tooltip.background": "#2E4C52"
     },
-    "Content.background": "#00252E",
+    "Content": {
+      "background": "#00252E",
+      "selectionBackground": "#2E4C52"
+    },
     "CheckBox": {
       "background": "#002B36",
       "disabledText": "#2E5861",
@@ -89,6 +98,14 @@
       "selectionBackground": "#2E4C52",
       "selectionForeground": "#FFFFFF"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#839496",
+      "AccessEnabled": {
+        "accessDot": "#d33682",
+        "dropdownBorder": "#003745",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#002B36",
       "foreground": "#839496",
@@ -104,12 +121,13 @@
       },
       "background": "#002B36",
       "buttonBackground": "#073642",
+      "darcula.hoveredArrowButtonForeground": "#d33682",
       "disabledForeground": "#2E5861",
       "foreground": "#839496",
       "modifiedItemForeground": "#d33682",
       "nonEditableBackground": "#003745",
       "padding": "5,5,5,5",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "ComboPopup.border": "#0D3640",
@@ -130,7 +148,7 @@
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#005a6f",
+      "borderColor": "#11353F",
       "disabledBorderColor": "#073642",
       "focusColor": "#d33682",
       "focusedBorderColor": "#d33682",
@@ -156,23 +174,25 @@
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#005a6f",
-      "underlinedTabBackground": "#005a6f"
+      "selectedBackground": "#11353F",
+      "underlinedTabBackground": "#11353F"
     },
     "DebuggerPopup": {
-      "borderColor": "#005a6f"
+      "borderColor": "#11353F"
     },
     "DefaultTabs": {
       "background": "#002B36",
       "borderColor": "#002B36",
-      "hoverBackground": "#003946",
+      "hoverBackground": "#11353F",
       "hoverColor": "#002B36",
-      "hoverMaskColor": "#005a6f",
+      "hoverMaskColor": "#11353F",
+      "inactiveColoredTabBackground": "#002B36",
       "inactiveColoredFileBackground": "#073642",
-      "inactiveUnderlineColor": "#2E5861",
+      "inactiveUnderlineColor": "#d33682",
       "inactiveMaskColor": "#002B36",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#003946"
+      "underlinedTabBackground": "#11353F",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "Desktop.background": "#002B36",
     "DialogWrapper.southPanelBackground": "#002B36",
@@ -198,24 +218,26 @@
     },
     "EditorTabs": {
       "borderColor": "#003745",
-      "hoverColor": "#005a6f",
-      "hoverMaskColor": "#005a6f",
+      "hoverBackground": "#11353F",
+      "hoverColor": "#11353F",
+      "hoverMaskColor": "#11353F",
       "inactiveMaskColor": "#002B36",
-      "inactiveColoredFileBackground": "#002B362",
+      "inactiveColoredFileBackground": "#002B36",
       "inactiveUnderlineColor": "#2E5861",
       "selectedForeground": "#839496",
-      "selectedBackground": "#003946",
+      "selectedBackground": "#11353F",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#003946"
+      "underlinedTabBackground": "#11353F",
+      "underlinedTabForeground": "#FFFFFF"
     },
     "EditorGroupsTabs": {
       "background": "#002B36",
       "borderColor": "#003745",
-      "hoverBackground": "#005a6f",
-      "hoverColor": "#005a6f",
+      "hoverBackground": "#11353F",
+      "hoverColor": "#11353F",
       "inactiveUnderlineColor": "#d33682",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#003946",
+      "underlinedTabBackground": "#11353F",
       "underlinedTabForeground": "#839496"
     },
     "FileColor": {
@@ -244,14 +266,15 @@
       "inactiveBackground": "#073642",
       "inactiveForeground": "#2E5861",
       "selectionForeground": "#FFFFFF",
-      "selectionBackground": "#003946"
+      "selectionBackground": "#11353F"
     },
+    "GotItTooltip.borderColor": "#2E4C52",
     "Group": {
       "disabledSeparatorColor": "#0D3640",
       "separatorColor": "#0D3640"
     },
     "GutterTooltip": {
-      "infoForeground": "#839496",
+      "infoForeground": "#586e75",
       "lineSeparatorColor": "#002B36"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#2E5861",
       "foreground": "#839496",
       "infoForeground": "#586e75",
-      "selectedForeground": "#FFFFFF"
+      "selectedForeground": "#FFFFFF",
+      "selectedDisabledForeground": "#839496"
     },
     "Link": {
       "activeForeground": "#d33682",
@@ -301,10 +325,12 @@
     "List": {
       "background": "#003745",
       "foreground": "#839496",
+      "hoverBackground": "#2E4C5270",
+      "hoverInactiveBackground": "#11353F",
       "selectionBackground": "#2E4C5250",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5280"
+      "selectionInactiveBackground": "#2E4C5270"
     },
     "material": {
       "background": "#002B36",
@@ -320,8 +346,8 @@
     },
     "MemoryIndicator": {
       "allocatedBackground": "#003745",
-      "usedColor": "#005a6f",
-      "usedBackground": "#005a6f"
+      "usedColor": "#11353F",
+      "usedBackground": "#11353F"
     },
     "Menu": {
       "acceleratorForeground": "#586e75",
@@ -408,13 +434,13 @@
     },
     "ParameterInfo": {
       "background": "#003745",
-      "borderColor": "#003946",
-      "currentOverloadBackground": "#003946",
+      "borderColor": "#11353F",
+      "currentOverloadBackground": "#11353F",
       "currentParameterForeground": "#d33682",
       "disabledForeground": "#2E5861",
       "foreground": "#839496",
       "infoForeground": "#586e75",
-      "lineSeparatorColor": "#003946"
+      "lineSeparatorColor": "#11353F"
     },
     "PasswordField": {
       "background": "#002B36",
@@ -422,27 +448,28 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "Plugins": {
       "background": "#002B36",
       "disabledForeground": "#2E5861",
-      "eapTagBackground": "#005a6f",
-      "lightSelectionBackground": "#2E4C52",
-      "paidTagBackground": "#005a6f",
+      "eapTagBackground": "#11353F",
+      "hoverBackground": "#2E4C5270",
+      "lightSelectionBackground": "#11353F",
+      "paidTagBackground": "#11353F",
       "selectionBackground": "#2E4C52",
       "tagForeground": "#d33682",
-      "tagBackground": "#005a6f",
-      "trialTagBackground": "#005a6f",
+      "tagBackground": "#11353F",
+      "trialTagBackground": "#11353F",
       "Button": {
         "installBackground": "#073642",
         "installBorderColor": "#073642",
         "installForeground": "#839496",
-        "installFocusedBackground": "#005a6f",
+        "installFocusedBackground": "#11353F",
         "installFillForeground": "#2E5861",
         "installFillBackground": "#073642",
-        "updateBackground": "#073642",
+        "updateBackground": "#d33682",
         "updateBorderColor": "#073642",
         "updateForeground": "#839496"
       },
@@ -455,9 +482,9 @@
         "foreground": "#839496"
       },
       "Tab": {
-        "hoverBackground": "#003946",
+        "hoverBackground": "#11353F",
         "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#003946"
+        "selectedBackground": "#11353F"
       }
     },
     "Popup": {
@@ -496,8 +523,8 @@
       "indeterminateEndColor": "#d33682",
       "indeterminateStartColor": "#d33682",
       "progressColor": "#d33682",
-      "selectionBackground": "#005a6f",
-      "trackColor": "#005a6f"
+      "selectionBackground": "#11353F",
+      "trackColor": "#11353F"
     },
     "PsiViewer": {
       "referenceHighlightColor": "#d33682"
@@ -517,6 +544,7 @@
       "selectionBackground": "#2E4C52",
       "selectionForeground": "#FFFFFF"
     },
+    "ScreenView.borderColor": "#0D3640",
     "ScrollBar": {
       "background": "#002B36",
       "hoverThumbBorderColor": "#d33682",
@@ -538,7 +566,7 @@
           "trackColor": "#002B3630"
         }
       },
-      "thumb": "#005a6f",
+      "thumb": "#11353F",
       "thumbBorderColor": "#d3368270",
       "thumbColor": "#d3368270",
       "trackColor": "#002B3630",
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#FFFFFF",
         "selectedForeground": "#FFFFFF",
-        "selectedBackground": "#005a6f"
+        "selectedBackground": "#11353F"
       }
     },
     "SearchMatch": {
       "endBackground": "#d33682",
-      "startBackground": "#d33682"
+      "startBackground": "#d33682",
+      "endColor": "#d33682",
+      "startColor": "#d33682"
     },
     "SearchField.errorBackground": "#2E4C52",
+    "SearchOption": {
+      "selectedBackground": "#11353F"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#586e75",
+      "Repeated.File.Foreground": "#839496"
+    },
     "Separator": {
       "background": "#003745",
       "foreground": "#003745",
@@ -594,12 +631,12 @@
       "foreground": "#839496",
       "majorTickLength": 6,
       "tickColor": "#003745",
-      "trackColor": "#003946",
+      "trackColor": "#11353F",
       "trackWidth": 7,
       "thumb": "#d33682"
     },
     "SpeedSearch": {
-      "background": "#005a6f",
+      "background": "#11353F",
       "borderColor": "#0D3640",
       "foreground": "#839496",
       "errorForeground": "#839496"
@@ -616,21 +653,23 @@
     },
     "SplitPaneDivider.draggingColor": "#003745",
     "StatusBar": {
-      "borderColor": "#002B36"
+      "borderColor": "#002B36",
+      "hoverBackground": "#11353F",
+      "LightEditBackground": "#11353F"
     },
     "TabbedPane": {
       "background": "#002B36",
-      "contentAreaColor": "#005a6f",
+      "contentAreaColor": "#11353F",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#0D3640",
       "disabledForeground": "#2E5861",
       "disabledUnderlineColor": "#2E5861",
-      "focus": "#003946",
-      "focusColor": "#003946",
+      "focus": "#11353F",
+      "focusColor": "#11353F",
       "fontSizeOffset": 0,
       "foreground": "#839496",
       "highlight": "#0D3640",
-      "hoverColor": "#005a6f",
+      "hoverColor": "#11353F",
       "labelShift": 0,
       "selectedForeground": "#FFFFFF",
       "selectedLabelShift": 0,
@@ -643,22 +682,26 @@
     },
     "TabbedPane.mt.tab.background": "#002B36",
     "Table": {
+      "alternativeRowBackground": "#00252E",
       "background": "#002B36",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#2E5861",
       "dropLineColor": "#d33682",
       "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#003946",
+      "focusCellBackground": "#11353F",
       "focusCellForeground": "#FFFFFF",
       "foreground": "#839496",
       "gridColor": "#002B36",
-      "highlightOuter": "#003946",
+      "highlightOuter": "#11353F",
+      "hoverBackground": "#2E4C5270",
+      "hoverInactiveBackground": "#11353F",
       "lightSelectionForeground": "#FFFFFF",
       "lightSelectionInactiveForeground": "#586e75",
       "lightSelectionInactiveBackground": "#003745",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#003946",
+      "selectionInactiveBackground": "#11353F",
       "selectionInactiveForeground": "#FFFFFF",
       "sortIconColor": "#839496",
       "stripeColor": "#00252E"
@@ -670,7 +713,7 @@
       "cellBorder": "4,0,4,0",
       "disabledForeground": "#2E5861",
       "foreground": "#839496",
-      "focusCellBackground": "#003946",
+      "focusCellBackground": "#11353F",
       "focusCellForeground": "#FFFFFF",
       "height": 25,
       "separatorColor": "#003745"
@@ -683,7 +726,7 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "TextField": {
@@ -691,7 +734,7 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "TextPane": {
@@ -699,12 +742,12 @@
       "caretForeground": "#d33682",
       "foreground": "#839496",
       "inactiveForeground": "#2E5861",
-      "selectionBackground": "#003946",
+      "selectionBackground": "#11353F",
       "selectionForeground": "#FFFFFF"
     },
     "TitlePane": {
       "background": "#00252E",
-      "Button.hoverBackground": "#005a6f",
+      "Button.hoverBackground": "#11353F",
       "inactiveBackground": "#002B36",
       "infoForeground": "#586e75",
       "inactiveInfoForeground": "#586e75"
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#002B36",
       "Actions.infoForeground": "#586e75",
-      "background": "#002B36",
-      "borderColor": "#005a6f",
+      "background": "#2E4C52",
+      "borderColor": "#0D3640",
       "foreground": "#839496",
       "infoForeground": "#586e75",
       "separatorColor": "#0D3640",
@@ -738,7 +781,7 @@
     },
     "ToolWindow": {
       "Button": {
-        "hoverBackground": "#003946",
+        "hoverBackground": "#11353F",
         "selectedForeground": "#FFFFFF",
         "selectedBackground": "#00252E"
       },
@@ -751,50 +794,93 @@
         "background": "#002B36"
       },
       "HeaderTab": {
-        "hoverBackground": "#005a6f",
-        "hoverInactiveBackground": "#003745",
+        "borderColor": "#11353F",
+        "hoverBackground": "#11353F",
+        "hoverInactiveBackground": "#11353F",
         "inactiveUnderlineColor": "#d33682",
         "selectedBackground": "#00252E",
         "selectedInactiveBackground": "#00252E",
         "underlineColor": "#d33682",
-        "underlinedTabBackground": "#005a6f",
-        "underlinedTabInactiveBackground": "#003745"
+        "underlinedTabBackground": "#11353F",
+        "underlinedTabInactiveBackground": "#003745",
+        "underlinedTabForeground": "#FFFFFF",
+        "underlinedTabInactiveForeground": "#839496"
       }
     },
     "Tree": {
       "background": "#002B36",
       "foreground": "#586e75",
       "hash": "#0D3640",
+      "hoverBackground": "#2E4C5270",
+      "hoverInactiveBackground": "#11353F",
       "modifiedItemForeground": "#d33682",
       "rowHeight": 28,
-      "selectionBackground": "#2E4C5280",
+      "selectionBackground": "#2E4C5270",
       "selectionForeground": "#FFFFFF",
       "selectionInactiveForeground": "#FFFFFF",
-      "selectionInactiveBackground": "#2E4C5280",
+      "selectionInactiveBackground": "#2E4C5270",
       "textBackground": "#002B36"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#0D3640",
-      "ColorPicker.background": "#002B36",
-      "ColorPicker.foreground": "#839496",
-      "Component.borderColor": "#0D3640",
-      "Component.background": "#002B36",
-      "Component.foreground": "#839496",
-      "Connector.borderColor": "#0D3640",
-      "Connector.hoverBorderColor": "#005a6f",
+      "Canvas.background": "#00252E",
+      "ColorPicker": {
+        "background": "#002B36",
+        "foreground": "#839496"
+      },
+      "Component": {
+        "borderColor": "#0D3640",
+        "background": "#002B36",
+        "foreground": "#839496",
+        "hoverBorderColor": "#11353F"
+      },
+      "Connector": {
+        "borderColor": "#0D3640",
+        "hoverBorderColor": "#11353F"
+      },
       "Canvas.background": "#00252E",
       "highStroke.foreground": "#839496",
       "Label.foreground": "#586e75",
-      "List.selectionBackground": "#2E4C5280",
-      "Panel.borderColor": "#0D3640",
-      "Panel.background": "#002B36",
+      "List.selectionBackground": "#2E4C5270",
+      "motion": {
+        "borderColor": "#0D3640",
+        "Component.foreground": "#839496",
+        "ConstraintSetText.foreground": "#586e75",
+        "ConstraintSet.background": "#003745",
+        "CSPanel.SelectedFocusBackground": "#2E4C52",
+        "CSPanel.SelectedBackground": "#2E4C5270",
+        "cs_FocusText.infoForeground": "#586e75",
+        "CursorTextColor.foreground": "#839496",
+        "HoverColor.disabledBackground": "#2E5861",
+        "motionGraph.background": "#002B36",
+        "Notification.background": "#2E4C52",
+        "ourAvg.background": "#003745",
+        "ourCS.background": "#003745",
+        "ourCS_Border.borderColor": "#0D3640",
+        "ourCS_TextColor.foreground": "#586e75",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#FFFFFF",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#11353F",
+        "ourCS_SelectedBorder.pressedBorderColor": "#11353F",
+        "ourML_BarColor.separatorColor": "#0D3640",
+        "PrimaryPanel.background": "#00252E",
+        "SecondaryPanel.background": "#002B36",
+        "SecondaryPanel.header.foreground": "#586e75",
+        "SecondaryPanel.header.background": "#00252E",
+        "timeLine.disabledBorderColor": "#0D3640"
+      },
+      "Panel": {
+        "borderColor": "#0D3640",
+        "background": "#002B36"
+      },
       "percent.foreground": "#839496",
-      "Placeholder.background": "#002B36",
-      "Placeholder.borderColor": "#0D3640",
-      "Placeholder.foreground": "#839496",
-      "Placeholder.selectedForeground": "#FFFFFF",
+      "Placeholder": {
+        "background": "#002B36",
+        "borderColor": "#0D3640",
+        "foreground": "#839496",
+        "selectedForeground": "#FFFFFF"
+      },
       "Preview.background": "#002B36",
       "stroke.acceleratorForeground": "#586e75"
     },
@@ -809,7 +895,7 @@
         "selectedBranchBackground": "#002B36"
       },
       "GitCommits": {
-        "graphColor": "#005a6f"
+        "graphColor": "#11353F"
       },
       "GitLog": {
         "localBranchIconColor": "#d33682",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#586e75",
-        "Commit.currentBranchBackground": "#003745"
+        "Commit.currentBranchBackground": "#003745",
+        "Commit.hoveredBackground": "#2E4C5270"
       },
       "RefLabel": {
         "foreground": "#FFFFFF",
-        "backgroundBase": "#005a6f"
+        "backgroundBase": "#11353F"
       }
     },
     "Viewport": {
@@ -840,16 +927,22 @@
       "foreground": "#839496"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#002B36",
       "background": "#002B36",
       "borderColor": "#002B36",
       "captionBackground": "#00252E",
       "captionForeground": "#839496",
+      "Details.background": "#002B36",
       "footerBackground": "#00252E",
       "footerForeground": "#839496",
       "headerBackground": "#002B36",
       "headerForeground": "#839496",
+      "List.background": "#00252E",
       "separatorColor": "#0D3640",
+      "SidePanel.background": "#003745",
       "Projects": {
+        "actions.background": "#00252E",
+        "actions.selectionBackground": "#11353F",
         "background": "#003745",
         "selectionBackground": "#2E4C52",
         "selectionInactiveBackground": "#003745"

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json

@@ -1,8 +1,14 @@
 {
-  "name": "Material Solarized Light Contrast",
+  "name": "Solarized Light Contrast",
   "dark": false,
   "author": "Mallowigi",
   "editorScheme": "/colors/Solarized Light.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/solarlight.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#93a1a1",
@@ -11,13 +17,13 @@
       "disabledBackground": "#E3DCC9",
       "disabledForeground": "#C9CCC3",
       "disabledText": "#C9CCC3",
-      "focusColor": "#d1cbb8",
+      "focusColor": "#F6F0DE",
       "focusedBorderColor": "#d33682",
       "foreground": "#586e75",
       "inactiveBackground": "#E3DCC9",
       "inactiveForeground": "#93a1a1",
       "infoForeground": "#93a1a1",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionBackgroundInactive": "#F6F0DE",
       "selectionForeground": "#002b36",
       "selectionInactiveBackground": "#F6F0DE",
@@ -27,13 +33,13 @@
     "ActionButton": {
       "hoverBackground": "#d3368250",
       "hoverBorderColor": "#d3368250",
-      "hoverSeparatorColor": "#d8d4c4",
+      "hoverSeparatorColor": "#FEFBF1",
       "focusedBorderColor": "#d3368250",
       "pressedBackground": "#d3368250",
       "pressedBorderColor": "#d3368250"
     },
     "Autocomplete": {
-      "selectionBackground": "#e8dcb6"
+      "selectionBackground": "#93a1a1"
     },
     "Borders.ContrastBorderColor": "#fdf6e3",
     "Borders.color": "#edead9",
@@ -41,38 +47,41 @@
       "arc": 0,
       "background": "#fdf6e3",
       "default": {
-        "endBackground": "#d1cbb8",
-        "endBorderColor": "#d1cbb8",
+        "endBackground": "#F6F0DE",
+        "endBorderColor": "#F6F0DE",
         "foreground": "#002b36",
         "focusColor": "#d33682",
         "focusedBorderColor": "#d33682",
-        "shadowColor": "#d1cbb8",
-        "startBackground": "#d1cbb8",
-        "startBorderColor": "#d1cbb8"
+        "shadowColor": "#F6F0DE",
+        "startBackground": "#F6F0DE",
+        "startBorderColor": "#F6F0DE"
       },
-      "disabledBorderColor": "#d8d4c4",
+      "disabledBorderColor": "#FEFBF1",
       "disabledText": "#C9CCC3",
-      "endBackground": "#d8d4c4",
-      "endBorderColor": "#d8d4c4",
-      "focus": "#d1cbb8",
+      "endBackground": "#FEFBF1",
+      "endBorderColor": "#FEFBF1",
+      "focus": "#F6F0DE",
       "focusedBorderColor": "#d33682",
       "foreground": "#93a1a1",
       "highlight": "#002b36",
-      "mt.background": "#d8d4c4",
+      "mt.background": "#FEFBF1",
       "mt.foreground": "#93a1a1",
       "mt.selectedForeground": "#002b36",
-      "mt.selection.color1": "#d1cbb8",
-      "mt.selection.color2": "#d1cbb8",
-      "startBackground": "#d8d4c4",
-      "startBorderColor": "#d8d4c4",
-      "shadowColor": "#d8d4c4",
+      "mt.selection.color1": "#F6F0DE",
+      "mt.selection.color2": "#F6F0DE",
+      "startBackground": "#FEFBF1",
+      "startBorderColor": "#FEFBF1",
+      "shadowColor": "#FEFBF1",
       "shadowWidth": 0
     },
     "Canvas": {
       "Tooltip.borderColor": "#edead9",
       "Tooltip.background": "#EDE8D4"
     },
-    "Content.background": "#eee8d5",
+    "Content": {
+      "background": "#eee8d5",
+      "selectionBackground": "#93a1a1"
+    },
     "CheckBox": {
       "background": "#fdf6e3",
       "disabledText": "#C9CCC3",
@@ -86,30 +95,39 @@
       "disabledBackground": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#586e75",
+      "AccessEnabled": {
+        "accessDot": "#d33682",
+        "dropdownBorder": "#F6F0DE",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#fdf6e3",
       "foreground": "#586e75",
       "swatchesDefaultRecentColor": "#586e75"
     },
-    "ComboBoxButton.background": "#d8d4c4",
+    "ComboBoxButton.background": "#FEFBF1",
     "ComboBox": {
       "ArrowButton": {
-        "background": "#d8d4c4",
+        "background": "#FEFBF1",
         "disabledIconColor": "#C9CCC3",
         "iconColor": "#586e75",
         "nonEditableBackground": "#fdf6e3"
       },
       "background": "#eee8d5",
-      "buttonBackground": "#d8d4c4",
+      "buttonBackground": "#FEFBF1",
+      "darcula.hoveredArrowButtonForeground": "#d33682",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
       "modifiedItemForeground": "#d33682",
       "nonEditableBackground": "#F6F0DE",
       "padding": "5,5,5,5",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "ComboPopup.border": "#edead9",
@@ -123,15 +141,15 @@
       "selectedGrayedForeground": "#002b36",
       "selectionGrayForeground": "#002b36",
       "selectionInactiveInfoForeground": "#93a1a1",
-      "selectionInactiveBackground": "#e8dcb650",
-      "selectionBackground": "#e8dcb680",
+      "selectionInactiveBackground": "#93a1a150",
+      "selectionBackground": "#93a1a180",
       "selectionForeground": "#002b36",
       "selectionInfoForeground": "#002b36"
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#d1cbb8",
-      "disabledBorderColor": "#d8d4c4",
+      "borderColor": "#F6F0DE",
+      "disabledBorderColor": "#FEFBF1",
       "focusColor": "#d33682",
       "focusedBorderColor": "#d33682",
       "hoverIconColor": "#d33682",
@@ -156,23 +174,25 @@
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#d1cbb8",
-      "underlinedTabBackground": "#d1cbb8"
+      "selectedBackground": "#F6F0DE",
+      "underlinedTabBackground": "#F6F0DE"
     },
     "DebuggerPopup": {
-      "borderColor": "#d1cbb8"
+      "borderColor": "#F6F0DE"
     },
     "DefaultTabs": {
       "background": "#fdf6e3",
       "borderColor": "#fdf6e3",
-      "hoverBackground": "#d1cbb8",
+      "hoverBackground": "#F6F0DE",
       "hoverColor": "#eee8d5",
-      "hoverMaskColor": "#d1cbb8",
-      "inactiveColoredFileBackground": "#d8d4c4",
-      "inactiveUnderlineColor": "#C9CCC3",
+      "hoverMaskColor": "#F6F0DE",
+      "inactiveColoredTabBackground": "#fdf6e3",
+      "inactiveColoredFileBackground": "#FEFBF1",
+      "inactiveUnderlineColor": "#d33682",
       "inactiveMaskColor": "#eee8d5",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#d1cbb8"
+      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabForeground": "#002b36"
     },
     "Desktop.background": "#fdf6e3",
     "DialogWrapper.southPanelBackground": "#fdf6e3",
@@ -193,29 +213,31 @@
       "foreground": "#586e75",
       "inactiveBackground": "#fdf6e3",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
     "EditorTabs": {
       "borderColor": "#F6F0DE",
-      "hoverColor": "#d1cbb8",
-      "hoverMaskColor": "#d1cbb8",
+      "hoverBackground": "#F6F0DE",
+      "hoverColor": "#F6F0DE",
+      "hoverMaskColor": "#F6F0DE",
       "inactiveMaskColor": "#fdf6e3",
-      "inactiveColoredFileBackground": "#fdf6e32",
+      "inactiveColoredFileBackground": "#fdf6e3",
       "inactiveUnderlineColor": "#C9CCC3",
       "selectedForeground": "#586e75",
-      "selectedBackground": "#d1cbb8",
+      "selectedBackground": "#F6F0DE",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#d1cbb8"
+      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabForeground": "#002b36"
     },
     "EditorGroupsTabs": {
       "background": "#fdf6e3",
       "borderColor": "#F6F0DE",
-      "hoverBackground": "#d1cbb8",
-      "hoverColor": "#d1cbb8",
+      "hoverBackground": "#F6F0DE",
+      "hoverColor": "#F6F0DE",
       "inactiveUnderlineColor": "#d33682",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#d1cbb8",
+      "underlinedTabBackground": "#F6F0DE",
       "underlinedTabForeground": "#586e75"
     },
     "FileColor": {
@@ -241,17 +263,18 @@
       "background": "#eee8d5",
       "caretForeground": "#d33682",
       "foreground": "#586e75",
-      "inactiveBackground": "#d8d4c4",
+      "inactiveBackground": "#FEFBF1",
       "inactiveForeground": "#C9CCC3",
       "selectionForeground": "#002b36",
-      "selectionBackground": "#d1cbb8"
+      "selectionBackground": "#F6F0DE"
     },
+    "GotItTooltip.borderColor": "#EDE8D4",
     "Group": {
       "disabledSeparatorColor": "#edead9",
       "separatorColor": "#edead9"
     },
     "GutterTooltip": {
-      "infoForeground": "#586e75",
+      "infoForeground": "#93a1a1",
       "lineSeparatorColor": "#fdf6e3"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#C9CCC3",
       "foreground": "#586e75",
       "infoForeground": "#93a1a1",
-      "selectedForeground": "#002b36"
+      "selectedForeground": "#002b36",
+      "selectedDisabledForeground": "#586e75"
     },
     "Link": {
       "activeForeground": "#d33682",
@@ -301,17 +325,19 @@
     "List": {
       "background": "#F6F0DE",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb650",
+      "hoverBackground": "#93a1a170",
+      "hoverInactiveBackground": "#F6F0DE",
+      "selectionBackground": "#93a1a150",
       "selectionForeground": "#002b36",
       "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#e8dcb6b0"
+      "selectionInactiveBackground": "#93a1a170"
     },
     "material": {
       "background": "#fdf6e3",
       "branchColor": "#586e75",
       "contrast": "#eee8d5",
       "foreground": "#586e75",
-      "mergeCommits": "#d8d4c4",
+      "mergeCommits": "#FEFBF1",
       "primaryColor": "#93a1a1",
       "selectionForeground": "#002b36",
       "tab.backgroundColor": "#fdf6e3",
@@ -320,8 +346,8 @@
     },
     "MemoryIndicator": {
       "allocatedBackground": "#F6F0DE",
-      "usedColor": "#d1cbb8",
-      "usedBackground": "#d1cbb8"
+      "usedColor": "#F6F0DE",
+      "usedBackground": "#F6F0DE"
     },
     "Menu": {
       "acceleratorForeground": "#93a1a1",
@@ -332,7 +358,7 @@
       "disabledBackground": "#F6F0DE",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36",
       "separatorColor": "#edead9"
     },
@@ -343,7 +369,7 @@
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
       "highlight": "#fdf6e3",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36",
       "shadow": "#eee8d5"
     },
@@ -355,7 +381,7 @@
       "disabledBackground": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
     "NavBar": {
@@ -378,9 +404,9 @@
       "errorBorderColor": "#EDE8D4",
       "foreground": "#586e75",
       "MoreButton": {
-        "background": "#d8d4c4",
+        "background": "#FEFBF1",
         "foreground": "#586e75",
-        "innerBorderColor": "#d8d4c4"
+        "innerBorderColor": "#FEFBF1"
       },
       "ToolWindow": {
         "errorBackground": "#EDE8D4",
@@ -398,7 +424,7 @@
       "messageForeground": "#586e75"
     },
     "Outline": {
-      "color": "#d8d4c4",
+      "color": "#FEFBF1",
       "focusedColor": "#d33682",
       "disabledColor": "#C9CCC3"
     },
@@ -408,13 +434,13 @@
     },
     "ParameterInfo": {
       "background": "#F6F0DE",
-      "borderColor": "#d1cbb8",
-      "currentOverloadBackground": "#d1cbb8",
+      "borderColor": "#F6F0DE",
+      "currentOverloadBackground": "#F6F0DE",
       "currentParameterForeground": "#d33682",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
       "infoForeground": "#93a1a1",
-      "lineSeparatorColor": "#d1cbb8"
+      "lineSeparatorColor": "#F6F0DE"
     },
     "PasswordField": {
       "background": "#eee8d5",
@@ -422,28 +448,29 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "Plugins": {
       "background": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
-      "eapTagBackground": "#d1cbb8",
-      "lightSelectionBackground": "#e8dcb6",
-      "paidTagBackground": "#d1cbb8",
-      "selectionBackground": "#e8dcb6",
+      "eapTagBackground": "#F6F0DE",
+      "hoverBackground": "#93a1a170",
+      "lightSelectionBackground": "#F6F0DE",
+      "paidTagBackground": "#F6F0DE",
+      "selectionBackground": "#93a1a1",
       "tagForeground": "#d33682",
-      "tagBackground": "#d1cbb8",
-      "trialTagBackground": "#d1cbb8",
+      "tagBackground": "#F6F0DE",
+      "trialTagBackground": "#F6F0DE",
       "Button": {
-        "installBackground": "#d8d4c4",
-        "installBorderColor": "#d8d4c4",
+        "installBackground": "#FEFBF1",
+        "installBorderColor": "#FEFBF1",
         "installForeground": "#586e75",
-        "installFocusedBackground": "#d1cbb8",
+        "installFocusedBackground": "#F6F0DE",
         "installFillForeground": "#C9CCC3",
-        "installFillBackground": "#d8d4c4",
-        "updateBackground": "#d8d4c4",
-        "updateBorderColor": "#d8d4c4",
+        "installFillBackground": "#FEFBF1",
+        "updateBackground": "#d33682",
+        "updateBorderColor": "#FEFBF1",
         "updateForeground": "#586e75"
       },
       "SearchField": {
@@ -455,9 +482,9 @@
         "foreground": "#586e75"
       },
       "Tab": {
-        "hoverBackground": "#d1cbb8",
+        "hoverBackground": "#F6F0DE",
         "selectedForeground": "#002b36",
-        "selectedBackground": "#d1cbb8"
+        "selectedBackground": "#F6F0DE"
       }
     },
     "Popup": {
@@ -496,8 +523,8 @@
       "indeterminateEndColor": "#d33682",
       "indeterminateStartColor": "#d33682",
       "progressColor": "#d33682",
-      "selectionBackground": "#d1cbb8",
-      "trackColor": "#d1cbb8"
+      "selectionBackground": "#F6F0DE",
+      "trackColor": "#F6F0DE"
     },
     "PsiViewer": {
       "referenceHighlightColor": "#d33682"
@@ -514,9 +541,10 @@
       "disabledBackground": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
+    "ScreenView.borderColor": "#edead9",
     "ScrollBar": {
       "background": "#fdf6e3",
       "hoverThumbBorderColor": "#d33682",
@@ -538,7 +566,7 @@
           "trackColor": "#fdf6e330"
         }
       },
-      "thumb": "#d1cbb8",
+      "thumb": "#F6F0DE",
       "thumbBorderColor": "#d3368270",
       "thumbColor": "#d3368270",
       "trackColor": "#fdf6e330",
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#002b36",
         "selectedForeground": "#002b36",
-        "selectedBackground": "#d1cbb8"
+        "selectedBackground": "#F6F0DE"
       }
     },
     "SearchMatch": {
       "endBackground": "#d33682",
-      "startBackground": "#d33682"
+      "startBackground": "#d33682",
+      "endColor": "#d33682",
+      "startColor": "#d33682"
     },
     "SearchField.errorBackground": "#EDE8D4",
+    "SearchOption": {
+      "selectedBackground": "#F6F0DE"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#93a1a1",
+      "Repeated.File.Foreground": "#586e75"
+    },
     "Separator": {
       "background": "#F6F0DE",
       "foreground": "#F6F0DE",
@@ -594,12 +631,12 @@
       "foreground": "#586e75",
       "majorTickLength": 6,
       "tickColor": "#F6F0DE",
-      "trackColor": "#d1cbb8",
+      "trackColor": "#F6F0DE",
       "trackWidth": 7,
       "thumb": "#d33682"
     },
     "SpeedSearch": {
-      "background": "#d1cbb8",
+      "background": "#F6F0DE",
       "borderColor": "#edead9",
       "foreground": "#586e75",
       "errorForeground": "#586e75"
@@ -616,21 +653,23 @@
     },
     "SplitPaneDivider.draggingColor": "#F6F0DE",
     "StatusBar": {
-      "borderColor": "#fdf6e3"
+      "borderColor": "#fdf6e3",
+      "hoverBackground": "#F6F0DE",
+      "LightEditBackground": "#F6F0DE"
     },
     "TabbedPane": {
       "background": "#fdf6e3",
-      "contentAreaColor": "#d1cbb8",
+      "contentAreaColor": "#F6F0DE",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#edead9",
       "disabledForeground": "#C9CCC3",
       "disabledUnderlineColor": "#C9CCC3",
-      "focus": "#d1cbb8",
-      "focusColor": "#d1cbb8",
+      "focus": "#F6F0DE",
+      "focusColor": "#F6F0DE",
       "fontSizeOffset": 0,
       "foreground": "#586e75",
       "highlight": "#edead9",
-      "hoverColor": "#d1cbb8",
+      "hoverColor": "#F6F0DE",
       "labelShift": 0,
       "selectedForeground": "#002b36",
       "selectedLabelShift": 0,
@@ -643,22 +682,26 @@
     },
     "TabbedPane.mt.tab.background": "#eee8d5",
     "Table": {
+      "alternativeRowBackground": "#eee8d5",
       "background": "#fdf6e3",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#C9CCC3",
       "dropLineColor": "#d33682",
       "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#d1cbb8",
+      "focusCellBackground": "#F6F0DE",
       "focusCellForeground": "#002b36",
       "foreground": "#586e75",
       "gridColor": "#fdf6e3",
-      "highlightOuter": "#d1cbb8",
+      "highlightOuter": "#F6F0DE",
+      "hoverBackground": "#93a1a170",
+      "hoverInactiveBackground": "#F6F0DE",
       "lightSelectionForeground": "#002b36",
       "lightSelectionInactiveForeground": "#93a1a1",
       "lightSelectionInactiveBackground": "#F6F0DE",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36",
-      "selectionInactiveBackground": "#d1cbb8",
+      "selectionInactiveBackground": "#F6F0DE",
       "selectionInactiveForeground": "#002b36",
       "sortIconColor": "#586e75",
       "stripeColor": "#eee8d5"
@@ -670,7 +713,7 @@
       "cellBorder": "4,0,4,0",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "focusCellBackground": "#d1cbb8",
+      "focusCellBackground": "#F6F0DE",
       "focusCellForeground": "#002b36",
       "height": 25,
       "separatorColor": "#F6F0DE"
@@ -683,7 +726,7 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "TextField": {
@@ -691,7 +734,7 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "TextPane": {
@@ -699,19 +742,19 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "TitlePane": {
       "background": "#eee8d5",
-      "Button.hoverBackground": "#d1cbb8",
+      "Button.hoverBackground": "#F6F0DE",
       "inactiveBackground": "#fdf6e3",
       "infoForeground": "#93a1a1",
       "inactiveInfoForeground": "#93a1a1"
     },
     "TitledBorder.titleColor": "#586e75",
     "ToggleButton": {
-      "borderColor": "#d8d4c4",
+      "borderColor": "#FEFBF1",
       "buttonColor": "#586e75",
       "disabledText": "#C9CCC3",
       "foreground": "#586e75",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#fdf6e3",
       "Actions.infoForeground": "#93a1a1",
-      "background": "#fdf6e3",
-      "borderColor": "#d1cbb8",
+      "background": "#EDE8D4",
+      "borderColor": "#edead9",
       "foreground": "#586e75",
       "infoForeground": "#93a1a1",
       "separatorColor": "#edead9",
@@ -738,7 +781,7 @@
     },
     "ToolWindow": {
       "Button": {
-        "hoverBackground": "#d1cbb8",
+        "hoverBackground": "#F6F0DE",
         "selectedForeground": "#002b36",
         "selectedBackground": "#eee8d5"
       },
@@ -751,50 +794,93 @@
         "background": "#fdf6e3"
       },
       "HeaderTab": {
-        "hoverBackground": "#d1cbb8",
+        "borderColor": "#F6F0DE",
+        "hoverBackground": "#F6F0DE",
         "hoverInactiveBackground": "#F6F0DE",
         "inactiveUnderlineColor": "#d33682",
         "selectedBackground": "#eee8d5",
         "selectedInactiveBackground": "#eee8d5",
         "underlineColor": "#d33682",
-        "underlinedTabBackground": "#d1cbb8",
-        "underlinedTabInactiveBackground": "#F6F0DE"
+        "underlinedTabBackground": "#F6F0DE",
+        "underlinedTabInactiveBackground": "#F6F0DE",
+        "underlinedTabForeground": "#002b36",
+        "underlinedTabInactiveForeground": "#586e75"
       }
     },
     "Tree": {
       "background": "#eee8d5",
       "foreground": "#93a1a1",
       "hash": "#edead9",
+      "hoverBackground": "#93a1a170",
+      "hoverInactiveBackground": "#F6F0DE",
       "modifiedItemForeground": "#d33682",
       "rowHeight": 28,
-      "selectionBackground": "#e8dcb6b0",
+      "selectionBackground": "#93a1a170",
       "selectionForeground": "#002b36",
       "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#e8dcb6b0",
+      "selectionInactiveBackground": "#93a1a170",
       "textBackground": "#eee8d5"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#edead9",
-      "ColorPicker.background": "#fdf6e3",
-      "ColorPicker.foreground": "#586e75",
-      "Component.borderColor": "#edead9",
-      "Component.background": "#fdf6e3",
-      "Component.foreground": "#586e75",
-      "Connector.borderColor": "#edead9",
-      "Connector.hoverBorderColor": "#d1cbb8",
+      "Canvas.background": "#eee8d5",
+      "ColorPicker": {
+        "background": "#fdf6e3",
+        "foreground": "#586e75"
+      },
+      "Component": {
+        "borderColor": "#edead9",
+        "background": "#fdf6e3",
+        "foreground": "#586e75",
+        "hoverBorderColor": "#F6F0DE"
+      },
+      "Connector": {
+        "borderColor": "#edead9",
+        "hoverBorderColor": "#F6F0DE"
+      },
       "Canvas.background": "#eee8d5",
       "highStroke.foreground": "#586e75",
       "Label.foreground": "#93a1a1",
-      "List.selectionBackground": "#e8dcb6b0",
-      "Panel.borderColor": "#edead9",
-      "Panel.background": "#fdf6e3",
+      "List.selectionBackground": "#93a1a170",
+      "motion": {
+        "borderColor": "#edead9",
+        "Component.foreground": "#586e75",
+        "ConstraintSetText.foreground": "#93a1a1",
+        "ConstraintSet.background": "#F6F0DE",
+        "CSPanel.SelectedFocusBackground": "#93a1a1",
+        "CSPanel.SelectedBackground": "#93a1a170",
+        "cs_FocusText.infoForeground": "#93a1a1",
+        "CursorTextColor.foreground": "#586e75",
+        "HoverColor.disabledBackground": "#C9CCC3",
+        "motionGraph.background": "#fdf6e3",
+        "Notification.background": "#EDE8D4",
+        "ourAvg.background": "#F6F0DE",
+        "ourCS.background": "#F6F0DE",
+        "ourCS_Border.borderColor": "#edead9",
+        "ourCS_TextColor.foreground": "#93a1a1",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#002b36",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#F6F0DE",
+        "ourCS_SelectedBorder.pressedBorderColor": "#F6F0DE",
+        "ourML_BarColor.separatorColor": "#edead9",
+        "PrimaryPanel.background": "#eee8d5",
+        "SecondaryPanel.background": "#fdf6e3",
+        "SecondaryPanel.header.foreground": "#93a1a1",
+        "SecondaryPanel.header.background": "#eee8d5",
+        "timeLine.disabledBorderColor": "#edead9"
+      },
+      "Panel": {
+        "borderColor": "#edead9",
+        "background": "#fdf6e3"
+      },
       "percent.foreground": "#586e75",
-      "Placeholder.background": "#fdf6e3",
-      "Placeholder.borderColor": "#edead9",
-      "Placeholder.foreground": "#586e75",
-      "Placeholder.selectedForeground": "#002b36",
+      "Placeholder": {
+        "background": "#fdf6e3",
+        "borderColor": "#edead9",
+        "foreground": "#586e75",
+        "selectedForeground": "#002b36"
+      },
       "Preview.background": "#fdf6e3",
       "stroke.acceleratorForeground": "#93a1a1"
     },
@@ -809,7 +895,7 @@
         "selectedBranchBackground": "#fdf6e3"
       },
       "GitCommits": {
-        "graphColor": "#d1cbb8"
+        "graphColor": "#F6F0DE"
       },
       "GitLog": {
         "localBranchIconColor": "#d33682",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#93a1a1",
-        "Commit.currentBranchBackground": "#F6F0DE"
+        "Commit.currentBranchBackground": "#F6F0DE",
+        "Commit.hoveredBackground": "#93a1a170"
       },
       "RefLabel": {
         "foreground": "#002b36",
-        "backgroundBase": "#d1cbb8"
+        "backgroundBase": "#F6F0DE"
       }
     },
     "Viewport": {
@@ -840,18 +927,24 @@
       "foreground": "#586e75"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#fdf6e3",
       "background": "#fdf6e3",
       "borderColor": "#fdf6e3",
       "captionBackground": "#eee8d5",
       "captionForeground": "#586e75",
+      "Details.background": "#fdf6e3",
       "footerBackground": "#eee8d5",
       "footerForeground": "#586e75",
       "headerBackground": "#fdf6e3",
       "headerForeground": "#586e75",
+      "List.background": "#eee8d5",
       "separatorColor": "#edead9",
+      "SidePanel.background": "#F6F0DE",
       "Projects": {
+        "actions.background": "#eee8d5",
+        "actions.selectionBackground": "#F6F0DE",
         "background": "#F6F0DE",
-        "selectionBackground": "#e8dcb6",
+        "selectionBackground": "#93a1a1",
         "selectionInactiveBackground": "#F6F0DE"
       }
     },

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json

@@ -3,6 +3,12 @@
   "dark": false,
   "author": "Mallowigi",
   "editorScheme": "/colors/Solarized Light.xml",
+  "emptyFrameBackground": {
+    "anchor": "center",
+    "image": "/walls/solarlight.svg",
+    "fill": "scale",
+    "transparency": 50
+  },
   "ui": {
     "*": {
       "acceleratorSelectionForeground": "#93a1a1",
@@ -11,13 +17,13 @@
       "disabledBackground": "#E3DCC9",
       "disabledForeground": "#C9CCC3",
       "disabledText": "#C9CCC3",
-      "focusColor": "#d1cbb8",
+      "focusColor": "#F6F0DE",
       "focusedBorderColor": "#d33682",
       "foreground": "#586e75",
       "inactiveBackground": "#E3DCC9",
       "inactiveForeground": "#93a1a1",
       "infoForeground": "#93a1a1",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionBackgroundInactive": "#F6F0DE",
       "selectionForeground": "#002b36",
       "selectionInactiveBackground": "#F6F0DE",
@@ -27,13 +33,13 @@
     "ActionButton": {
       "hoverBackground": "#d3368250",
       "hoverBorderColor": "#d3368250",
-      "hoverSeparatorColor": "#d8d4c4",
+      "hoverSeparatorColor": "#FEFBF1",
       "focusedBorderColor": "#d3368250",
       "pressedBackground": "#d3368250",
       "pressedBorderColor": "#d3368250"
     },
     "Autocomplete": {
-      "selectionBackground": "#e8dcb6"
+      "selectionBackground": "#93a1a1"
     },
     "Borders.ContrastBorderColor": "#fdf6e3",
     "Borders.color": "#edead9",
@@ -41,38 +47,41 @@
       "arc": 0,
       "background": "#fdf6e3",
       "default": {
-        "endBackground": "#d1cbb8",
-        "endBorderColor": "#d1cbb8",
+        "endBackground": "#F6F0DE",
+        "endBorderColor": "#F6F0DE",
         "foreground": "#002b36",
         "focusColor": "#d33682",
         "focusedBorderColor": "#d33682",
-        "shadowColor": "#d1cbb8",
-        "startBackground": "#d1cbb8",
-        "startBorderColor": "#d1cbb8"
+        "shadowColor": "#F6F0DE",
+        "startBackground": "#F6F0DE",
+        "startBorderColor": "#F6F0DE"
       },
-      "disabledBorderColor": "#d8d4c4",
+      "disabledBorderColor": "#FEFBF1",
       "disabledText": "#C9CCC3",
-      "endBackground": "#d8d4c4",
-      "endBorderColor": "#d8d4c4",
-      "focus": "#d1cbb8",
+      "endBackground": "#FEFBF1",
+      "endBorderColor": "#FEFBF1",
+      "focus": "#F6F0DE",
       "focusedBorderColor": "#d33682",
       "foreground": "#93a1a1",
       "highlight": "#002b36",
-      "mt.background": "#d8d4c4",
+      "mt.background": "#FEFBF1",
       "mt.foreground": "#93a1a1",
       "mt.selectedForeground": "#002b36",
-      "mt.selection.color1": "#d1cbb8",
-      "mt.selection.color2": "#d1cbb8",
-      "startBackground": "#d8d4c4",
-      "startBorderColor": "#d8d4c4",
-      "shadowColor": "#d8d4c4",
+      "mt.selection.color1": "#F6F0DE",
+      "mt.selection.color2": "#F6F0DE",
+      "startBackground": "#FEFBF1",
+      "startBorderColor": "#FEFBF1",
+      "shadowColor": "#FEFBF1",
       "shadowWidth": 0
     },
     "Canvas": {
       "Tooltip.borderColor": "#edead9",
       "Tooltip.background": "#EDE8D4"
     },
-    "Content.background": "#eee8d5",
+    "Content": {
+      "background": "#eee8d5",
+      "selectionBackground": "#93a1a1"
+    },
     "CheckBox": {
       "background": "#fdf6e3",
       "disabledText": "#C9CCC3",
@@ -86,30 +95,39 @@
       "disabledBackground": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
+    "CodeWithMe": {
+      "Avatar.foreground": "#586e75",
+      "AccessEnabled": {
+        "accessDot": "#d33682",
+        "dropdownBorder": "#F6F0DE",
+        "pillBackground": "$second"
+      }
+    },
     "ColorChooser": {
       "background": "#fdf6e3",
       "foreground": "#586e75",
       "swatchesDefaultRecentColor": "#586e75"
     },
-    "ComboBoxButton.background": "#d8d4c4",
+    "ComboBoxButton.background": "#FEFBF1",
     "ComboBox": {
       "ArrowButton": {
-        "background": "#d8d4c4",
+        "background": "#FEFBF1",
         "disabledIconColor": "#C9CCC3",
         "iconColor": "#586e75",
         "nonEditableBackground": "#fdf6e3"
       },
       "background": "#fdf6e3",
-      "buttonBackground": "#d8d4c4",
+      "buttonBackground": "#FEFBF1",
+      "darcula.hoveredArrowButtonForeground": "#d33682",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
       "modifiedItemForeground": "#d33682",
       "nonEditableBackground": "#F6F0DE",
       "padding": "5,5,5,5",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "ComboPopup.border": "#edead9",
@@ -123,15 +141,15 @@
       "selectedGrayedForeground": "#002b36",
       "selectionGrayForeground": "#002b36",
       "selectionInactiveInfoForeground": "#93a1a1",
-      "selectionInactiveBackground": "#e8dcb650",
-      "selectionBackground": "#e8dcb680",
+      "selectionInactiveBackground": "#93a1a150",
+      "selectionBackground": "#93a1a180",
       "selectionForeground": "#002b36",
       "selectionInfoForeground": "#002b36"
     },
     "Component": {
       "arc": 4,
-      "borderColor": "#d1cbb8",
-      "disabledBorderColor": "#d8d4c4",
+      "borderColor": "#F6F0DE",
+      "disabledBorderColor": "#FEFBF1",
       "focusColor": "#d33682",
       "focusedBorderColor": "#d33682",
       "hoverIconColor": "#d33682",
@@ -156,23 +174,25 @@
       }
     },
     "DebuggerTabs": {
-      "selectedBackground": "#d1cbb8",
-      "underlinedTabBackground": "#d1cbb8"
+      "selectedBackground": "#F6F0DE",
+      "underlinedTabBackground": "#F6F0DE"
     },
     "DebuggerPopup": {
-      "borderColor": "#d1cbb8"
+      "borderColor": "#F6F0DE"
     },
     "DefaultTabs": {
       "background": "#fdf6e3",
       "borderColor": "#fdf6e3",
-      "hoverBackground": "#d1cbb8",
+      "hoverBackground": "#F6F0DE",
       "hoverColor": "#fdf6e3",
-      "hoverMaskColor": "#d1cbb8",
-      "inactiveColoredFileBackground": "#d8d4c4",
-      "inactiveUnderlineColor": "#C9CCC3",
+      "hoverMaskColor": "#F6F0DE",
+      "inactiveColoredTabBackground": "#fdf6e3",
+      "inactiveColoredFileBackground": "#FEFBF1",
+      "inactiveUnderlineColor": "#d33682",
       "inactiveMaskColor": "#fdf6e3",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#d1cbb8"
+      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabForeground": "#002b36"
     },
     "Desktop.background": "#fdf6e3",
     "DialogWrapper.southPanelBackground": "#fdf6e3",
@@ -193,29 +213,31 @@
       "foreground": "#586e75",
       "inactiveBackground": "#fdf6e3",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
     "EditorTabs": {
       "borderColor": "#F6F0DE",
-      "hoverColor": "#d1cbb8",
-      "hoverMaskColor": "#d1cbb8",
+      "hoverBackground": "#F6F0DE",
+      "hoverColor": "#F6F0DE",
+      "hoverMaskColor": "#F6F0DE",
       "inactiveMaskColor": "#fdf6e3",
-      "inactiveColoredFileBackground": "#fdf6e32",
+      "inactiveColoredFileBackground": "#fdf6e3",
       "inactiveUnderlineColor": "#C9CCC3",
       "selectedForeground": "#586e75",
-      "selectedBackground": "#d1cbb8",
+      "selectedBackground": "#F6F0DE",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#d1cbb8"
+      "underlinedTabBackground": "#F6F0DE",
+      "underlinedTabForeground": "#002b36"
     },
     "EditorGroupsTabs": {
       "background": "#fdf6e3",
       "borderColor": "#F6F0DE",
-      "hoverBackground": "#d1cbb8",
-      "hoverColor": "#d1cbb8",
+      "hoverBackground": "#F6F0DE",
+      "hoverColor": "#F6F0DE",
       "inactiveUnderlineColor": "#d33682",
       "underlineColor": "#d33682",
-      "underlinedTabBackground": "#d1cbb8",
+      "underlinedTabBackground": "#F6F0DE",
       "underlinedTabForeground": "#586e75"
     },
     "FileColor": {
@@ -241,17 +263,18 @@
       "background": "#fdf6e3",
       "caretForeground": "#d33682",
       "foreground": "#586e75",
-      "inactiveBackground": "#d8d4c4",
+      "inactiveBackground": "#FEFBF1",
       "inactiveForeground": "#C9CCC3",
       "selectionForeground": "#002b36",
-      "selectionBackground": "#d1cbb8"
+      "selectionBackground": "#F6F0DE"
     },
+    "GotItTooltip.borderColor": "#EDE8D4",
     "Group": {
       "disabledSeparatorColor": "#edead9",
       "separatorColor": "#edead9"
     },
     "GutterTooltip": {
-      "infoForeground": "#586e75",
+      "infoForeground": "#93a1a1",
       "lineSeparatorColor": "#fdf6e3"
     },
     "HeaderColor": {
@@ -288,7 +311,8 @@
       "disabledText": "#C9CCC3",
       "foreground": "#586e75",
       "infoForeground": "#93a1a1",
-      "selectedForeground": "#002b36"
+      "selectedForeground": "#002b36",
+      "selectedDisabledForeground": "#586e75"
     },
     "Link": {
       "activeForeground": "#d33682",
@@ -301,17 +325,19 @@
     "List": {
       "background": "#F6F0DE",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb650",
+      "hoverBackground": "#93a1a170",
+      "hoverInactiveBackground": "#F6F0DE",
+      "selectionBackground": "#93a1a150",
       "selectionForeground": "#002b36",
       "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#e8dcb6b0"
+      "selectionInactiveBackground": "#93a1a170"
     },
     "material": {
       "background": "#fdf6e3",
       "branchColor": "#586e75",
       "contrast": "#eee8d5",
       "foreground": "#586e75",
-      "mergeCommits": "#d8d4c4",
+      "mergeCommits": "#FEFBF1",
       "primaryColor": "#93a1a1",
       "selectionForeground": "#002b36",
       "tab.backgroundColor": "#fdf6e3",
@@ -320,8 +346,8 @@
     },
     "MemoryIndicator": {
       "allocatedBackground": "#F6F0DE",
-      "usedColor": "#d1cbb8",
-      "usedBackground": "#d1cbb8"
+      "usedColor": "#F6F0DE",
+      "usedBackground": "#F6F0DE"
     },
     "Menu": {
       "acceleratorForeground": "#93a1a1",
@@ -332,7 +358,7 @@
       "disabledBackground": "#F6F0DE",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36",
       "separatorColor": "#edead9"
     },
@@ -343,7 +369,7 @@
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
       "highlight": "#fdf6e3",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36",
       "shadow": "#fdf6e3"
     },
@@ -355,7 +381,7 @@
       "disabledBackground": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
     "NavBar": {
@@ -378,9 +404,9 @@
       "errorBorderColor": "#EDE8D4",
       "foreground": "#586e75",
       "MoreButton": {
-        "background": "#d8d4c4",
+        "background": "#FEFBF1",
         "foreground": "#586e75",
-        "innerBorderColor": "#d8d4c4"
+        "innerBorderColor": "#FEFBF1"
       },
       "ToolWindow": {
         "errorBackground": "#EDE8D4",
@@ -398,7 +424,7 @@
       "messageForeground": "#586e75"
     },
     "Outline": {
-      "color": "#d8d4c4",
+      "color": "#FEFBF1",
       "focusedColor": "#d33682",
       "disabledColor": "#C9CCC3"
     },
@@ -408,13 +434,13 @@
     },
     "ParameterInfo": {
       "background": "#F6F0DE",
-      "borderColor": "#d1cbb8",
-      "currentOverloadBackground": "#d1cbb8",
+      "borderColor": "#F6F0DE",
+      "currentOverloadBackground": "#F6F0DE",
       "currentParameterForeground": "#d33682",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
       "infoForeground": "#93a1a1",
-      "lineSeparatorColor": "#d1cbb8"
+      "lineSeparatorColor": "#F6F0DE"
     },
     "PasswordField": {
       "background": "#fdf6e3",
@@ -422,28 +448,29 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "Plugins": {
       "background": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
-      "eapTagBackground": "#d1cbb8",
-      "lightSelectionBackground": "#e8dcb6",
-      "paidTagBackground": "#d1cbb8",
-      "selectionBackground": "#e8dcb6",
+      "eapTagBackground": "#F6F0DE",
+      "hoverBackground": "#93a1a170",
+      "lightSelectionBackground": "#F6F0DE",
+      "paidTagBackground": "#F6F0DE",
+      "selectionBackground": "#93a1a1",
       "tagForeground": "#d33682",
-      "tagBackground": "#d1cbb8",
-      "trialTagBackground": "#d1cbb8",
+      "tagBackground": "#F6F0DE",
+      "trialTagBackground": "#F6F0DE",
       "Button": {
-        "installBackground": "#d8d4c4",
-        "installBorderColor": "#d8d4c4",
+        "installBackground": "#FEFBF1",
+        "installBorderColor": "#FEFBF1",
         "installForeground": "#586e75",
-        "installFocusedBackground": "#d1cbb8",
+        "installFocusedBackground": "#F6F0DE",
         "installFillForeground": "#C9CCC3",
-        "installFillBackground": "#d8d4c4",
-        "updateBackground": "#d8d4c4",
-        "updateBorderColor": "#d8d4c4",
+        "installFillBackground": "#FEFBF1",
+        "updateBackground": "#d33682",
+        "updateBorderColor": "#FEFBF1",
         "updateForeground": "#586e75"
       },
       "SearchField": {
@@ -455,9 +482,9 @@
         "foreground": "#586e75"
       },
       "Tab": {
-        "hoverBackground": "#d1cbb8",
+        "hoverBackground": "#F6F0DE",
         "selectedForeground": "#002b36",
-        "selectedBackground": "#d1cbb8"
+        "selectedBackground": "#F6F0DE"
       }
     },
     "Popup": {
@@ -496,8 +523,8 @@
       "indeterminateEndColor": "#d33682",
       "indeterminateStartColor": "#d33682",
       "progressColor": "#d33682",
-      "selectionBackground": "#d1cbb8",
-      "trackColor": "#d1cbb8"
+      "selectionBackground": "#F6F0DE",
+      "trackColor": "#F6F0DE"
     },
     "PsiViewer": {
       "referenceHighlightColor": "#d33682"
@@ -514,9 +541,10 @@
       "disabledBackground": "#fdf6e3",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "selectionBackground": "#e8dcb6",
+      "selectionBackground": "#93a1a1",
       "selectionForeground": "#002b36"
     },
+    "ScreenView.borderColor": "#edead9",
     "ScrollBar": {
       "background": "#fdf6e3",
       "hoverThumbBorderColor": "#d33682",
@@ -538,7 +566,7 @@
           "trackColor": "#fdf6e330"
         }
       },
-      "thumb": "#d1cbb8",
+      "thumb": "#F6F0DE",
       "thumbBorderColor": "#d3368270",
       "thumbColor": "#d3368270",
       "trackColor": "#fdf6e330",
@@ -571,14 +599,23 @@
       "Tab": {
         "active.foreground": "#002b36",
         "selectedForeground": "#002b36",
-        "selectedBackground": "#d1cbb8"
+        "selectedBackground": "#F6F0DE"
       }
     },
     "SearchMatch": {
       "endBackground": "#d33682",
-      "startBackground": "#d33682"
+      "startBackground": "#d33682",
+      "endColor": "#d33682",
+      "startColor": "#d33682"
     },
     "SearchField.errorBackground": "#EDE8D4",
+    "SearchOption": {
+      "selectedBackground": "#F6F0DE"
+    },
+    "SearchResults": {
+      "Ordinal.File.Foreground": "#93a1a1",
+      "Repeated.File.Foreground": "#586e75"
+    },
     "Separator": {
       "background": "#F6F0DE",
       "foreground": "#F6F0DE",
@@ -594,12 +631,12 @@
       "foreground": "#586e75",
       "majorTickLength": 6,
       "tickColor": "#F6F0DE",
-      "trackColor": "#d1cbb8",
+      "trackColor": "#F6F0DE",
       "trackWidth": 7,
       "thumb": "#d33682"
     },
     "SpeedSearch": {
-      "background": "#d1cbb8",
+      "background": "#F6F0DE",
       "borderColor": "#edead9",
       "foreground": "#586e75",
       "errorForeground": "#586e75"
@@ -616,21 +653,23 @@
     },
     "SplitPaneDivider.draggingColor": "#F6F0DE",
     "StatusBar": {
-      "borderColor": "#fdf6e3"
+      "borderColor": "#fdf6e3",
+      "hoverBackground": "#F6F0DE",
+      "LightEditBackground": "#F6F0DE"
     },
     "TabbedPane": {
       "background": "#fdf6e3",
-      "contentAreaColor": "#d1cbb8",
+      "contentAreaColor": "#F6F0DE",
       "contentBorderInsets": "3,1,1,1",
       "darkShadow": "#edead9",
       "disabledForeground": "#C9CCC3",
       "disabledUnderlineColor": "#C9CCC3",
-      "focus": "#d1cbb8",
-      "focusColor": "#d1cbb8",
+      "focus": "#F6F0DE",
+      "focusColor": "#F6F0DE",
       "fontSizeOffset": 0,
       "foreground": "#586e75",
       "highlight": "#edead9",
-      "hoverColor": "#d1cbb8",
+      "hoverColor": "#F6F0DE",
       "labelShift": 0,
       "selectedForeground": "#002b36",
       "selectedLabelShift": 0,
@@ -643,22 +682,26 @@
     },
     "TabbedPane.mt.tab.background": "#fdf6e3",
     "Table": {
+      "alternativeRowBackground": "#eee8d5",
       "background": "#fdf6e3",
       "cellNoFocusBorder": "10,5,10,5",
       "focusCellHighlightBorder": "10,5,10,5",
+      "disabledForeground": "#C9CCC3",
       "dropLineColor": "#d33682",
       "dropLineShortColor": "#d33682",
-      "focusCellBackground": "#d1cbb8",
+      "focusCellBackground": "#F6F0DE",
       "focusCellForeground": "#002b36",
       "foreground": "#586e75",
       "gridColor": "#fdf6e3",
-      "highlightOuter": "#d1cbb8",
+      "highlightOuter": "#F6F0DE",
+      "hoverBackground": "#93a1a170",
+      "hoverInactiveBackground": "#F6F0DE",
       "lightSelectionForeground": "#002b36",
       "lightSelectionInactiveForeground": "#93a1a1",
       "lightSelectionInactiveBackground": "#F6F0DE",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36",
-      "selectionInactiveBackground": "#d1cbb8",
+      "selectionInactiveBackground": "#F6F0DE",
       "selectionInactiveForeground": "#002b36",
       "sortIconColor": "#586e75",
       "stripeColor": "#eee8d5"
@@ -670,7 +713,7 @@
       "cellBorder": "4,0,4,0",
       "disabledForeground": "#C9CCC3",
       "foreground": "#586e75",
-      "focusCellBackground": "#d1cbb8",
+      "focusCellBackground": "#F6F0DE",
       "focusCellForeground": "#002b36",
       "height": 25,
       "separatorColor": "#F6F0DE"
@@ -683,7 +726,7 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "TextField": {
@@ -691,7 +734,7 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "TextPane": {
@@ -699,19 +742,19 @@
       "caretForeground": "#d33682",
       "foreground": "#586e75",
       "inactiveForeground": "#C9CCC3",
-      "selectionBackground": "#d1cbb8",
+      "selectionBackground": "#F6F0DE",
       "selectionForeground": "#002b36"
     },
     "TitlePane": {
       "background": "#eee8d5",
-      "Button.hoverBackground": "#d1cbb8",
+      "Button.hoverBackground": "#F6F0DE",
       "inactiveBackground": "#fdf6e3",
       "infoForeground": "#93a1a1",
       "inactiveInfoForeground": "#93a1a1"
     },
     "TitledBorder.titleColor": "#586e75",
     "ToggleButton": {
-      "borderColor": "#d8d4c4",
+      "borderColor": "#FEFBF1",
       "buttonColor": "#586e75",
       "disabledText": "#C9CCC3",
       "foreground": "#586e75",
@@ -729,8 +772,8 @@
     "ToolTip": {
       "Actions.background": "#fdf6e3",
       "Actions.infoForeground": "#93a1a1",
-      "background": "#fdf6e3",
-      "borderColor": "#d1cbb8",
+      "background": "#EDE8D4",
+      "borderColor": "#edead9",
       "foreground": "#586e75",
       "infoForeground": "#93a1a1",
       "separatorColor": "#edead9",
@@ -738,7 +781,7 @@
     },
     "ToolWindow": {
       "Button": {
-        "hoverBackground": "#d1cbb8",
+        "hoverBackground": "#F6F0DE",
         "selectedForeground": "#002b36",
         "selectedBackground": "#eee8d5"
       },
@@ -751,50 +794,93 @@
         "background": "#fdf6e3"
       },
       "HeaderTab": {
-        "hoverBackground": "#d1cbb8",
+        "borderColor": "#F6F0DE",
+        "hoverBackground": "#F6F0DE",
         "hoverInactiveBackground": "#F6F0DE",
         "inactiveUnderlineColor": "#d33682",
         "selectedBackground": "#eee8d5",
         "selectedInactiveBackground": "#eee8d5",
         "underlineColor": "#d33682",
-        "underlinedTabBackground": "#d1cbb8",
-        "underlinedTabInactiveBackground": "#F6F0DE"
+        "underlinedTabBackground": "#F6F0DE",
+        "underlinedTabInactiveBackground": "#F6F0DE",
+        "underlinedTabForeground": "#002b36",
+        "underlinedTabInactiveForeground": "#586e75"
       }
     },
     "Tree": {
       "background": "#fdf6e3",
       "foreground": "#93a1a1",
       "hash": "#edead9",
+      "hoverBackground": "#93a1a170",
+      "hoverInactiveBackground": "#F6F0DE",
       "modifiedItemForeground": "#d33682",
       "rowHeight": 28,
-      "selectionBackground": "#e8dcb6b0",
+      "selectionBackground": "#93a1a170",
       "selectionForeground": "#002b36",
       "selectionInactiveForeground": "#002b36",
-      "selectionInactiveBackground": "#e8dcb6b0",
+      "selectionInactiveBackground": "#93a1a170",
       "textBackground": "#fdf6e3"
     },
     "Tree.leftChildIndent": 10,
     "Tree.rightChildIndent": 5,
-    "UiDesigner": {
+    "UIDesigner": {
       "Activity.borderColor": "#edead9",
-      "ColorPicker.background": "#fdf6e3",
-      "ColorPicker.foreground": "#586e75",
-      "Component.borderColor": "#edead9",
-      "Component.background": "#fdf6e3",
-      "Component.foreground": "#586e75",
-      "Connector.borderColor": "#edead9",
-      "Connector.hoverBorderColor": "#d1cbb8",
+      "Canvas.background": "#eee8d5",
+      "ColorPicker": {
+        "background": "#fdf6e3",
+        "foreground": "#586e75"
+      },
+      "Component": {
+        "borderColor": "#edead9",
+        "background": "#fdf6e3",
+        "foreground": "#586e75",
+        "hoverBorderColor": "#F6F0DE"
+      },
+      "Connector": {
+        "borderColor": "#edead9",
+        "hoverBorderColor": "#F6F0DE"
+      },
       "Canvas.background": "#eee8d5",
       "highStroke.foreground": "#586e75",
       "Label.foreground": "#93a1a1",
-      "List.selectionBackground": "#e8dcb6b0",
-      "Panel.borderColor": "#edead9",
-      "Panel.background": "#fdf6e3",
+      "List.selectionBackground": "#93a1a170",
+      "motion": {
+        "borderColor": "#edead9",
+        "Component.foreground": "#586e75",
+        "ConstraintSetText.foreground": "#93a1a1",
+        "ConstraintSet.background": "#F6F0DE",
+        "CSPanel.SelectedFocusBackground": "#93a1a1",
+        "CSPanel.SelectedBackground": "#93a1a170",
+        "cs_FocusText.infoForeground": "#93a1a1",
+        "CursorTextColor.foreground": "#586e75",
+        "HoverColor.disabledBackground": "#C9CCC3",
+        "motionGraph.background": "#fdf6e3",
+        "Notification.background": "#EDE8D4",
+        "ourAvg.background": "#F6F0DE",
+        "ourCS.background": "#F6F0DE",
+        "ourCS_Border.borderColor": "#edead9",
+        "ourCS_TextColor.foreground": "#93a1a1",
+        "ourCS_SelectedFocusBackground.selectionForeground": "#002b36",
+        "ourCS_SelectedBackground.selectionInactiveBackground": "#F6F0DE",
+        "ourCS_SelectedBorder.pressedBorderColor": "#F6F0DE",
+        "ourML_BarColor.separatorColor": "#edead9",
+        "PrimaryPanel.background": "#eee8d5",
+        "SecondaryPanel.background": "#fdf6e3",
+        "SecondaryPanel.header.foreground": "#93a1a1",
+        "SecondaryPanel.header.background": "#eee8d5",
+        "timeLine.disabledBorderColor": "#edead9"
+      },
+      "Panel": {
+        "borderColor": "#edead9",
+        "background": "#fdf6e3"
+      },
       "percent.foreground": "#586e75",
-      "Placeholder.background": "#fdf6e3",
-      "Placeholder.borderColor": "#edead9",
-      "Placeholder.foreground": "#586e75",
-      "Placeholder.selectedForeground": "#002b36",
+      "Placeholder": {
+        "background": "#fdf6e3",
+        "borderColor": "#edead9",
+        "foreground": "#586e75",
+        "selectedForeground": "#002b36"
+      },
       "Preview.background": "#fdf6e3",
       "stroke.acceleratorForeground": "#93a1a1"
     },
@@ -809,7 +895,7 @@
         "selectedBranchBackground": "#fdf6e3"
       },
       "GitCommits": {
-        "graphColor": "#d1cbb8"
+        "graphColor": "#F6F0DE"
       },
       "GitLog": {
         "localBranchIconColor": "#d33682",
@@ -828,11 +914,12 @@
       },
       "Log": {
         "Commit.unmatchedForeground": "#93a1a1",
-        "Commit.currentBranchBackground": "#F6F0DE"
+        "Commit.currentBranchBackground": "#F6F0DE",
+        "Commit.hoveredBackground": "#93a1a170"
       },
       "RefLabel": {
         "foreground": "#002b36",
-        "backgroundBase": "#d1cbb8"
+        "backgroundBase": "#F6F0DE"
       }
     },
     "Viewport": {
@@ -840,18 +927,24 @@
       "foreground": "#586e75"
     },
     "WelcomeScreen": {
+      "AssociatedComponent.background": "#fdf6e3",
       "background": "#fdf6e3",
       "borderColor": "#fdf6e3",
       "captionBackground": "#eee8d5",
       "captionForeground": "#586e75",
+      "Details.background": "#fdf6e3",
       "footerBackground": "#eee8d5",
       "footerForeground": "#586e75",
       "headerBackground": "#fdf6e3",
       "headerForeground": "#586e75",
+      "List.background": "#eee8d5",
       "separatorColor": "#edead9",
+      "SidePanel.background": "#F6F0DE",
       "Projects": {
+        "actions.background": "#eee8d5",
+        "actions.selectionBackground": "#F6F0DE",
         "background": "#F6F0DE",
-        "selectionBackground": "#e8dcb6",
+        "selectionBackground": "#93a1a1",
         "selectionInactiveBackground": "#F6F0DE"
       }
     },

flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json

@@ -341,6 +341,7 @@
     "VersionControl": {
       "Log.Commit": {
         "currentBranchBackground": "#282c35",
+        "hoveredBackground": "#2c313c",
         "unmatchedForeground": "#5c6370"
       },
 

flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java

@@ -39,6 +39,7 @@ import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.jidesoft.plaf.LookAndFeelFactory;
 import com.jidesoft.plaf.UIDefaultsLookup;
 import com.jidesoft.plaf.basic.BasicJideTabbedPaneUI;
 import com.jidesoft.swing.JideTabbedPane;
@@ -66,6 +67,7 @@ public class FlatJideTabbedPaneUI
 	private Object[] oldRenderingHints;
 
 	public static ComponentUI createUI( JComponent c ) {
+		LookAndFeelFactory.installJideExtension();
 		return new FlatJideTabbedPaneUI();
 	}
 

flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java

@@ -36,6 +36,7 @@ import javax.swing.plaf.ComponentUI;
 import com.formdev.flatlaf.ui.FlatSliderUI;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.UIScale;
+import com.jidesoft.plaf.LookAndFeelFactory;
 import com.jidesoft.plaf.basic.BasicRangeSliderUI;
 
 /**
@@ -52,6 +53,7 @@ public class FlatRangeSliderUI
 	protected Color trackColor;
 	protected Color thumbColor;
 	protected Color thumbBorderColor;
+	protected Color focusBaseColor;
 	protected Color focusedColor;
 	protected Color focusedThumbBorderColor;
 	protected Color hoverTrackColor;
@@ -62,9 +64,13 @@ public class FlatRangeSliderUI
 	protected Color disabledThumbColor;
 	protected Color disabledThumbBorderColor;
 
+	private Color defaultBackground;
+	private Color defaultForeground;
+
 	private Object[] oldRenderingHints;
 
 	public static ComponentUI createUI( JComponent c ) {
+		LookAndFeelFactory.installJideExtension();
 		return new FlatRangeSliderUI();
 	}
 
@@ -116,7 +122,8 @@ public class FlatRangeSliderUI
 		trackColor = UIManager.getColor( "Slider.trackColor" );
 		thumbColor = UIManager.getColor( "Slider.thumbColor" );
 		thumbBorderColor = UIManager.getColor( "Slider.thumbBorderColor" );
-		focusedColor = FlatUIUtils.getUIColor( "Slider.focusedColor", "Component.focusColor" );
+		focusBaseColor = UIManager.getColor( "Component.focusColor" );
+		focusedColor = FlatUIUtils.getUIColor( "Slider.focusedColor", focusBaseColor );
 		focusedThumbBorderColor = FlatUIUtils.getUIColor( "Slider.focusedThumbBorderColor", "Component.focusedBorderColor" );
 		hoverTrackColor = FlatUIUtils.getUIColor( "Slider.hoverTrackColor", "Slider.hoverThumbColor" );
 		hoverThumbColor = UIManager.getColor( "Slider.hoverThumbColor" );
@@ -125,6 +132,9 @@ public class FlatRangeSliderUI
 		disabledTrackColor = UIManager.getColor( "Slider.disabledTrackColor" );
 		disabledThumbColor = UIManager.getColor( "Slider.disabledThumbColor" );
 		disabledThumbBorderColor = FlatUIUtils.getUIColor( "Slider.disabledThumbBorderColor", "Component.disabledBorderColor" );
+
+		defaultBackground = UIManager.getColor( "Slider.background" );
+		defaultForeground = UIManager.getColor( "Slider.foreground" );
 	}
 
 	@Override
@@ -135,6 +145,7 @@ public class FlatRangeSliderUI
 		trackColor = null;
 		thumbColor = null;
 		thumbBorderColor = null;
+		focusBaseColor = null;
 		focusedColor = null;
 		focusedThumbBorderColor = null;
 		hoverTrackColor = null;
@@ -144,6 +155,9 @@ public class FlatRangeSliderUI
 		disabledTrackColor = null;
 		disabledThumbColor = null;
 		disabledThumbBorderColor = null;
+
+		defaultBackground = null;
+		defaultForeground = null;
 	}
 
 	@Override
@@ -273,13 +287,14 @@ debug*/
 			track = new RoundRectangle2D.Float( x, trackRect.y, tw, trackRect.height, arc, arc );
 		}
 
-		g.setColor( enabled ? trackColor : disabledTrackColor );
+		g.setColor( enabled ? getTrackColor() : disabledTrackColor );
 		((Graphics2D)g).fill( track );
 
 		if( coloredTrack != null ) {
 			boolean trackHover = hover && rollover1 && rollover2;
 			boolean trackPressed = pressed1 && pressed2;
 
+			Color trackValueColor = getTrackValueColor();
 			Color color = FlatSliderUI.stateColor( slider, trackHover, trackPressed,
 				trackValueColor, null, null, hoverTrackColor, pressedTrackColor );
 
@@ -293,17 +308,37 @@ debug*/
 		boolean thumbHover = hover && ((!second && rollover1) || (second && rollover2));
 		boolean thumbPressed = (!second && pressed1) || (second && pressed2);
 
+		Color thumbColor = getThumbColor();
 		Color color = FlatSliderUI.stateColor( slider, thumbHover, thumbPressed,
 			thumbColor, disabledThumbColor, null, hoverThumbColor, pressedThumbColor );
 		color = FlatUIUtils.deriveColor( color, thumbColor );
 
-		Color borderColor = (thumbBorderColor != null)
+		Color foreground = slider.getForeground();
+		Color borderColor = (thumbBorderColor != null && foreground == defaultForeground)
 			? FlatSliderUI.stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null )
 			: null;
 
+		Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor,
+			(foreground != defaultForeground) ? foreground : focusBaseColor );
+
 		FlatSliderUI.paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth );
 	}
 
+	protected Color getTrackValueColor() {
+		Color foreground = slider.getForeground();
+		return (foreground != defaultForeground) ? foreground : trackValueColor;
+	}
+
+	protected Color getTrackColor() {
+		Color backround = slider.getBackground();
+		return (backround != defaultBackground) ? backround : trackColor;
+	}
+
+	protected Color getThumbColor() {
+		Color foreground = slider.getForeground();
+		return (foreground != defaultForeground) ? foreground : thumbColor;
+	}
+
 	protected boolean isRoundThumb() {
 		return !slider.getPaintTicks() && !slider.getPaintLabels();
 	}

flatlaf-swingx/src/main/java/com/formdev/flatlaf/swingx/ui/FlatDatePickerUI.java

@@ -70,6 +70,7 @@ public class FlatDatePickerUI
 	protected Color buttonArrowColor;
 	protected Color buttonDisabledArrowColor;
 	protected Color buttonHoverArrowColor;
+	protected Color buttonPressedArrowColor;
 
 	private JButton popupButton;
 
@@ -94,6 +95,7 @@ public class FlatDatePickerUI
 		buttonArrowColor = UIManager.getColor( "ComboBox.buttonArrowColor" );
 		buttonDisabledArrowColor = UIManager.getColor( "ComboBox.buttonDisabledArrowColor" );
 		buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" );
+		buttonPressedArrowColor = UIManager.getColor( "ComboBox.buttonPressedArrowColor" );
 
 		super.installUI( c );
 
@@ -140,6 +142,7 @@ public class FlatDatePickerUI
 		buttonArrowColor = null;
 		buttonDisabledArrowColor = null;
 		buttonHoverArrowColor = null;
+		buttonPressedArrowColor = null;
 
 		if( datePicker.getBorder() instanceof UIResource )
 			datePicker.setBorder( null );
@@ -160,7 +163,7 @@ public class FlatDatePickerUI
 	@Override
 	protected JButton createPopupButton() {
 		popupButton = new FlatArrowButton( SwingConstants.SOUTH, arrowType, buttonArrowColor,
-			buttonDisabledArrowColor, buttonHoverArrowColor, null );
+			buttonDisabledArrowColor, buttonHoverArrowColor, null, buttonPressedArrowColor, null );
 		popupButton.setName( "popupButton" );
 		return popupButton;
 	}

flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-linux.txt

@@ -1,9 +1,6 @@
 - OS     Windows 10
 + OS     Linux
 
-- Button.defaultButtonFollowsFocus true
-+ Button.defaultButtonFollowsFocus false
-
 - ProgressBar.font               [active] Segoe UI plain 10    javax.swing.plaf.FontUIResource [UI]
 + ProgressBar.font               [active] Cantarell plain 13    javax.swing.plaf.FontUIResource [UI]
 

flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt

@@ -1,9 +1,6 @@
 - OS     Windows 10
 + OS     Mac OS X
 
-- Button.defaultButtonFollowsFocus true
-+ Button.defaultButtonFollowsFocus false
-
 + ComboBox.showPopupOnNavigation true
 
 - Menu.shortcutKeys              length=1    [I

flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt

@@ -77,7 +77,7 @@ Button.default.foreground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Button.default.hoverBackground #3b5f8b    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(3% autoInverse)
 Button.default.hoverBorderColor #537699    javax.swing.plaf.ColorUIResource [UI]
 Button.default.pressedBackground #3f6796    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(6% autoInverse)
-Button.defaultButtonFollowsFocus true
+Button.defaultButtonFollowsFocus false
 Button.disabledBackground      #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledBorderColor     #5e6060    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledSelectedBackground #53585a    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(3% autoInverse)
@@ -132,14 +132,13 @@ CheckBox.icon.hoverBorderColor #466d94    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.pressedBackground #52595a    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(6% autoInverse)
 CheckBox.icon.selectedBackground #43494a    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.selectedBorderColor #6b6b6b    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.icon.selectedFocusedBorderColor #466d94    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon                  [lazy] 15,15    com.formdev.flatlaf.icons.FlatCheckBoxIcon [UI]
 CheckBox.iconTextGap           4
 CheckBox.icon[filled].checkmarkColor #43494a    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon[filled].selectedBackground #a7a7a7    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon[filled].selectedBorderColor #a7a7a7    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.icon[filled].selectedHoverBackground #9f9f9f    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.icon[filled].selectedPressedBackground #989898    javax.swing.plaf.ColorUIResource [UI]
+CheckBox.icon[filled].selectedHoverBackground #9f9f9f    com.formdev.flatlaf.util.DerivedColor [UI]    darken(3% autoInverse)
+CheckBox.icon[filled].selectedPressedBackground #989898    com.formdev.flatlaf.util.DerivedColor [UI]    darken(6% autoInverse)
 CheckBox.margin                2,2,2,2    javax.swing.plaf.InsetsUIResource [UI]
 CheckBox.rollover              true
 CheckBox.textIconGap           4
@@ -189,10 +188,11 @@ ComboBox.border                [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 ComboBox.buttonArrowColor      #9a9da1    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonBackground      #45494a    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonDarkShadow      #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.buttonDisabledArrowColor #585858    javax.swing.plaf.ColorUIResource [UI]
+ComboBox.buttonDisabledArrowColor #5a5d61    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonEditableBackground #404445    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonHighlight       #242424    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.buttonHoverArrowColor #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+ComboBox.buttonHoverArrowColor #b4b7ba    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(10%)
+ComboBox.buttonPressedArrowColor #cfd0d2    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(20%)
 ComboBox.buttonShadow          #646464    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonStyle           auto
 ComboBox.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
@@ -542,7 +542,7 @@ MenuItem.arrowIcon             [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenu
 MenuItem.background            #303234    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
 MenuItem.borderPainted         true
-MenuItem.checkBackground       #3c588b    javax.swing.plaf.ColorUIResource [UI]
+MenuItem.checkBackground       #3c588b    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10%)
 MenuItem.checkMargins          2,2,2,2    javax.swing.plaf.InsetsUIResource [UI]
 MenuItem.disabledForeground    #888888    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.font                  [active] $defaultFont [UI]
@@ -557,7 +557,7 @@ MenuItem.selectionForeground   #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.textAcceleratorGap    24
 MenuItem.textNoAcceleratorGap  6
 MenuItem.underlineSelectionBackground #484c4f    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(10% autoInverse)
-MenuItem.underlineSelectionCheckBackground #3c588b    javax.swing.plaf.ColorUIResource [UI]
+MenuItem.underlineSelectionCheckBackground #3c588b    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10%)
 MenuItem.underlineSelectionColor #4a88c7    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.underlineSelectionHeight 3
 
@@ -764,7 +764,7 @@ Resizable.resizeBorder         [lazy] 4,4,4,4  false    com.formdev.flatlaf.ui.F
 
 #---- RootPane ----
 
-RootPane.activeBorderColor     #4d5154    com.formdev.flatlaf.util.DerivedColor [UI]    darken(7% autoInverse)
+RootPane.activeBorderColor     #4d5154    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(7% autoInverse)
 RootPane.border                [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatRootPaneUI$FlatWindowBorder [UI]
 RootPane.borderDragThickness   5
 RootPane.cornerDragWidth       16
@@ -779,7 +779,7 @@ RootPane.defaultButtonWindowKeyBindings length=8    [Ljava.lang.Object;
     [7] release
 RootPane.honorDialogMinimumSizeOnResize true
 RootPane.honorFrameMinimumSizeOnResize false
-RootPane.inactiveBorderColor   #484c4e    com.formdev.flatlaf.util.DerivedColor [UI]    darken(5% autoInverse)
+RootPane.inactiveBorderColor   #484c4e    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(5% autoInverse)
 RootPaneUI                     com.formdev.flatlaf.ui.FlatRootPaneUI
 
 
@@ -788,7 +788,7 @@ RootPaneUI                     com.formdev.flatlaf.ui.FlatRootPaneUI
 ScrollBar.allowsAbsolutePositioning true
 ScrollBar.background           #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.buttonArrowColor     #9a9da1    javax.swing.plaf.ColorUIResource [UI]
-ScrollBar.buttonDisabledArrowColor #585858    javax.swing.plaf.ColorUIResource [UI]
+ScrollBar.buttonDisabledArrowColor #5a5d61    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.foreground           #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.hoverButtonBackground #484c4e    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(5%)
 ScrollBar.hoverThumbColor      #6e767a    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(10%)
@@ -851,11 +851,11 @@ Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #242424    javax.swing.plaf.ColorUIResource [UI]
 Slider.horizontalSize          200,21    java.awt.Dimension
-Slider.hoverThumbColor         #346faa    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10% autoInverse)
+Slider.hoverThumbColor         #5d95cd    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(5% autoInverse)
 Slider.minimumHorizontalSize   36,21    java.awt.Dimension
 Slider.minimumVerticalSize     21,36    java.awt.Dimension
 Slider.onlyLeftMouseButtonDrag true
-Slider.pressedThumbColor       #2e6296    com.formdev.flatlaf.util.DerivedColor [UI]    darken(15% autoInverse)
+Slider.pressedThumbColor       #699cd1    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(8% autoInverse)
 Slider.shadow                  #646464    javax.swing.plaf.ColorUIResource [UI]
 Slider.thumbColor              #4a88c7    javax.swing.plaf.ColorUIResource [UI]
 Slider.thumbSize               12,12    javax.swing.plaf.DimensionUIResource [UI]
@@ -874,8 +874,9 @@ Spinner.background             #45494a    javax.swing.plaf.ColorUIResource [UI]
 Spinner.border                 [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatRoundBorder [UI]
 Spinner.buttonArrowColor       #9a9da1    javax.swing.plaf.ColorUIResource [UI]
 Spinner.buttonBackground       #404445    javax.swing.plaf.ColorUIResource [UI]
-Spinner.buttonDisabledArrowColor #585858    javax.swing.plaf.ColorUIResource [UI]
-Spinner.buttonHoverArrowColor  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+Spinner.buttonDisabledArrowColor #5a5d61    javax.swing.plaf.ColorUIResource [UI]
+Spinner.buttonHoverArrowColor  #b4b7ba    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(10%)
+Spinner.buttonPressedArrowColor #cfd0d2    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(20%)
 Spinner.buttonStyle            button
 Spinner.disabledBackground     #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #888888    javax.swing.plaf.ColorUIResource [UI]
@@ -908,7 +909,8 @@ SplitPaneDivider.gripDotCount  3
 SplitPaneDivider.gripDotSize   3
 SplitPaneDivider.gripGap       2
 SplitPaneDivider.oneTouchArrowColor #9a9da1    javax.swing.plaf.ColorUIResource [UI]
-SplitPaneDivider.oneTouchHoverArrowColor #7a7d81    javax.swing.plaf.ColorUIResource [UI]
+SplitPaneDivider.oneTouchHoverArrowColor #b4b7ba    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(10%)
+SplitPaneDivider.oneTouchPressedArrowColor #cfd0d2    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(20%)
 SplitPaneDivider.style         grip
 
 
@@ -1243,7 +1245,7 @@ Tree.editorBorder              [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 Tree.expandedIcon              [lazy] 11,11    com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI]
 Tree.font                      [active] $defaultFont [UI]
 Tree.foreground                #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
-Tree.hash                      #505355    javax.swing.plaf.ColorUIResource [UI]
+Tree.hash                      #515657    javax.swing.plaf.ColorUIResource [UI]
 Tree.icon.closedColor          #adadad    javax.swing.plaf.ColorUIResource [UI]
 Tree.icon.collapsedColor       #adadad    javax.swing.plaf.ColorUIResource [UI]
 Tree.icon.expandedColor        #adadad    javax.swing.plaf.ColorUIResource [UI]

flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt

@@ -29,9 +29,15 @@
 - Button.default.foreground      #000000    javax.swing.plaf.ColorUIResource [UI]
 + Button.default.foreground      #ffffff    javax.swing.plaf.ColorUIResource [UI]
 
+- Button.default.hoverBackground #f7f7f7    com.formdev.flatlaf.util.DerivedColor [UI]    darken(3% autoInverse)
++ Button.default.hoverBackground #4182c5    com.formdev.flatlaf.util.DerivedColor [UI]    darken(3% autoInverse)
+
 - Button.default.hoverBorderColor #87afda    javax.swing.plaf.ColorUIResource [UI]
 + Button.default.hoverBorderColor #a9c9f5    javax.swing.plaf.ColorUIResource [UI]
 
+- Button.default.pressedBackground #e6e6e6    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10% autoInverse)
++ Button.default.pressedBackground #3571ae    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10% autoInverse)
+
 - Button.focusedBackground       #e3f1fa    javax.swing.plaf.ColorUIResource [UI]
 
 - CheckBox.icon.focusedBackground #e3f1fa    javax.swing.plaf.ColorUIResource [UI]

flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-linux.txt

@@ -1,9 +1,6 @@
 - OS     Windows 10
 + OS     Linux
 
-- Button.defaultButtonFollowsFocus true
-+ Button.defaultButtonFollowsFocus false
-
 - ProgressBar.font               [active] Segoe UI plain 10    javax.swing.plaf.FontUIResource [UI]
 + ProgressBar.font               [active] Cantarell plain 13    javax.swing.plaf.FontUIResource [UI]
 

flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-mac.txt

@@ -1,9 +1,6 @@
 - OS     Windows 10
 + OS     Mac OS X
 
-- Button.defaultButtonFollowsFocus true
-+ Button.defaultButtonFollowsFocus false
-
 + ComboBox.showPopupOnNavigation true
 
 - Menu.shortcutKeys              length=1    [I

flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt

@@ -77,7 +77,7 @@ Button.default.foreground      #000000    javax.swing.plaf.ColorUIResource [UI]
 Button.default.hoverBackground #f7f7f7    com.formdev.flatlaf.util.DerivedColor [UI]    darken(3% autoInverse)
 Button.default.hoverBorderColor #87afda    javax.swing.plaf.ColorUIResource [UI]
 Button.default.pressedBackground #e6e6e6    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10% autoInverse)
-Button.defaultButtonFollowsFocus true
+Button.defaultButtonFollowsFocus false
 Button.disabledBackground      #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledBorderColor     #cfcfcf    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledSelectedBackground #dedede    com.formdev.flatlaf.util.DerivedColor [UI]    darken(13% autoInverse)
@@ -142,8 +142,8 @@ CheckBox.icon[filled].selectedBorderColor #4b97d9    javax.swing.plaf.ColorUIRes
 CheckBox.icon[filled].selectedFocusedBackground #4f9ee3    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon[filled].selectedFocusedBorderColor #accff7    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon[filled].selectedFocusedCheckmarkColor #e3f1fa    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.icon[filled].selectedHoverBackground #3992e0    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.icon[filled].selectedPressedBackground #2386dc    javax.swing.plaf.ColorUIResource [UI]
+CheckBox.icon[filled].selectedHoverBackground #3992e0    com.formdev.flatlaf.util.DerivedColor [UI]    darken(5% autoInverse)
+CheckBox.icon[filled].selectedPressedBackground #2386dc    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10% autoInverse)
 CheckBox.margin                2,2,2,2    javax.swing.plaf.InsetsUIResource [UI]
 CheckBox.rollover              true
 CheckBox.textIconGap           4
@@ -193,10 +193,11 @@ ComboBox.border                [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 ComboBox.buttonArrowColor      #666666    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonBackground      #ffffff    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonDarkShadow      #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.buttonDisabledArrowColor #ababab    javax.swing.plaf.ColorUIResource [UI]
+ComboBox.buttonDisabledArrowColor #a6a6a6    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonEditableBackground #fafafa    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonHighlight       #ffffff    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.buttonHoverArrowColor #999999    javax.swing.plaf.ColorUIResource [UI]
+ComboBox.buttonHoverArrowColor #999999    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(20%)
+ComboBox.buttonPressedArrowColor #b3b3b3    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(30%)
 ComboBox.buttonShadow          #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonStyle           auto
 ComboBox.disabledBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
@@ -547,7 +548,7 @@ MenuItem.arrowIcon             [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenu
 MenuItem.background            #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
 MenuItem.borderPainted         true
-MenuItem.checkBackground       #bfd9f2    javax.swing.plaf.ColorUIResource [UI]
+MenuItem.checkBackground       #bfd9f2    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(40%)
 MenuItem.checkMargins          2,2,2,2    javax.swing.plaf.InsetsUIResource [UI]
 MenuItem.disabledForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.font                  [active] $defaultFont [UI]
@@ -562,7 +563,7 @@ MenuItem.selectionForeground   #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.textAcceleratorGap    24
 MenuItem.textNoAcceleratorGap  6
 MenuItem.underlineSelectionBackground #e6e6e6    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10% autoInverse)
-MenuItem.underlineSelectionCheckBackground #bfd9f2    javax.swing.plaf.ColorUIResource [UI]
+MenuItem.underlineSelectionCheckBackground #bfd9f2    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(40%)
 MenuItem.underlineSelectionColor #4083c9    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.underlineSelectionHeight 3
 
@@ -769,7 +770,7 @@ Resizable.resizeBorder         [lazy] 4,4,4,4  false    com.formdev.flatlaf.ui.F
 
 #---- RootPane ----
 
-RootPane.activeBorderColor     #707070    javax.swing.plaf.ColorUIResource [UI]
+RootPane.activeBorderColor     #737373    com.formdev.flatlaf.util.DerivedColor [UI]    darken(50% autoInverse)
 RootPane.border                [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatRootPaneUI$FlatWindowBorder [UI]
 RootPane.borderDragThickness   5
 RootPane.cornerDragWidth       16
@@ -784,7 +785,7 @@ RootPane.defaultButtonWindowKeyBindings length=8    [Ljava.lang.Object;
     [7] release
 RootPane.honorDialogMinimumSizeOnResize true
 RootPane.honorFrameMinimumSizeOnResize false
-RootPane.inactiveBorderColor   #a3a3a3    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(20% autoInverse)
+RootPane.inactiveBorderColor   #a6a6a6    com.formdev.flatlaf.util.DerivedColor [UI]    darken(30% autoInverse)
 RootPaneUI                     com.formdev.flatlaf.ui.FlatRootPaneUI
 
 
@@ -793,7 +794,7 @@ RootPaneUI                     com.formdev.flatlaf.ui.FlatRootPaneUI
 ScrollBar.allowsAbsolutePositioning true
 ScrollBar.background           #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.buttonArrowColor     #666666    javax.swing.plaf.ColorUIResource [UI]
-ScrollBar.buttonDisabledArrowColor #ababab    javax.swing.plaf.ColorUIResource [UI]
+ScrollBar.buttonDisabledArrowColor #a6a6a6    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.foreground           #000000    javax.swing.plaf.ColorUIResource [UI]
 ScrollBar.hoverButtonBackground #e5e5e5    com.formdev.flatlaf.util.DerivedColor [UI]    darken(5%)
 ScrollBar.hoverThumbColor      #c3c3c3    com.formdev.flatlaf.util.DerivedColor [UI]    darken(10%)
@@ -856,11 +857,11 @@ Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #000000    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Slider.horizontalSize          200,21    java.awt.Dimension
-Slider.hoverThumbColor         #1569bc    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(10% autoInverse)
+Slider.hoverThumbColor         #1775d3    com.formdev.flatlaf.util.DerivedColor [UI]    darken(5% autoInverse)
 Slider.minimumHorizontalSize   36,21    java.awt.Dimension
 Slider.minimumVerticalSize     21,36    java.awt.Dimension
 Slider.onlyLeftMouseButtonDrag true
-Slider.pressedThumbColor       #125ca5    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(15% autoInverse)
+Slider.pressedThumbColor       #166ec5    com.formdev.flatlaf.util.DerivedColor [UI]    darken(8% autoInverse)
 Slider.shadow                  #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
 Slider.thumbColor              #1e82e6    javax.swing.plaf.ColorUIResource [UI]
 Slider.thumbSize               12,12    javax.swing.plaf.DimensionUIResource [UI]
@@ -879,8 +880,9 @@ Spinner.background             #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Spinner.border                 [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatRoundBorder [UI]
 Spinner.buttonArrowColor       #666666    javax.swing.plaf.ColorUIResource [UI]
 Spinner.buttonBackground       #fafafa    javax.swing.plaf.ColorUIResource [UI]
-Spinner.buttonDisabledArrowColor #ababab    javax.swing.plaf.ColorUIResource [UI]
-Spinner.buttonHoverArrowColor  #999999    javax.swing.plaf.ColorUIResource [UI]
+Spinner.buttonDisabledArrowColor #a6a6a6    javax.swing.plaf.ColorUIResource [UI]
+Spinner.buttonHoverArrowColor  #999999    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(20%)
+Spinner.buttonPressedArrowColor #b3b3b3    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(30%)
 Spinner.buttonStyle            button
 Spinner.disabledBackground     #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -913,7 +915,8 @@ SplitPaneDivider.gripDotCount  3
 SplitPaneDivider.gripDotSize   3
 SplitPaneDivider.gripGap       2
 SplitPaneDivider.oneTouchArrowColor #666666    javax.swing.plaf.ColorUIResource [UI]
-SplitPaneDivider.oneTouchHoverArrowColor #333333    javax.swing.plaf.ColorUIResource [UI]
+SplitPaneDivider.oneTouchHoverArrowColor #999999    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(20%)
+SplitPaneDivider.oneTouchPressedArrowColor #b3b3b3    com.formdev.flatlaf.util.DerivedColor [UI]    lighten(30%)
 SplitPaneDivider.style         grip
 
 

flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt

@@ -78,7 +78,7 @@ Button.default.hoverBorderColor #ff0000    javax.swing.plaf.ColorUIResource [UI]
 Button.default.pressedBackground #ffc800    javax.swing.plaf.ColorUIResource [UI]
 Button.default.startBackground #dddddd    javax.swing.plaf.ColorUIResource [UI]
 Button.default.startBorderColor #ff0000    javax.swing.plaf.ColorUIResource [UI]
-Button.defaultButtonFollowsFocus true
+Button.defaultButtonFollowsFocus false
 Button.disabledBackground      #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledBorderColor     #000088    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledText            #000088    javax.swing.plaf.ColorUIResource [UI]
@@ -191,6 +191,7 @@ ComboBox.buttonDisabledArrowColor #ababab    javax.swing.plaf.ColorUIResource [U
 ComboBox.buttonEditableBackground #cccccc    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonHighlight       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonHoverArrowColor #ff0000    javax.swing.plaf.ColorUIResource [UI]
+ComboBox.buttonPressedArrowColor #0000ff    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonShadow          #a0a0a0    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonStyle           auto
 ComboBox.disabledBackground    #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
@@ -873,6 +874,7 @@ Spinner.buttonArrowColor       #666666    javax.swing.plaf.ColorUIResource [UI]
 Spinner.buttonBackground       #cccccc    javax.swing.plaf.ColorUIResource [UI]
 Spinner.buttonDisabledArrowColor #ababab    javax.swing.plaf.ColorUIResource [UI]
 Spinner.buttonHoverArrowColor  #ff0000    javax.swing.plaf.ColorUIResource [UI]
+Spinner.buttonPressedArrowColor #0000ff    javax.swing.plaf.ColorUIResource [UI]
 Spinner.buttonStyle            button
 Spinner.disabledBackground     #e0e0e0    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #000088    javax.swing.plaf.ColorUIResource [UI]
@@ -906,6 +908,7 @@ SplitPaneDivider.gripDotSize   3
 SplitPaneDivider.gripGap       2
 SplitPaneDivider.oneTouchArrowColor #00ff00    javax.swing.plaf.ColorUIResource [UI]
 SplitPaneDivider.oneTouchHoverArrowColor #ff0000    javax.swing.plaf.ColorUIResource [UI]
+SplitPaneDivider.oneTouchPressedArrowColor #0000ff    javax.swing.plaf.ColorUIResource [UI]
 SplitPaneDivider.style         grip
 
 

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java

@@ -214,6 +214,13 @@ public class FlatComponentsTest
 			slider.setSnapToTicks( snapToTicks );
 	}
 
+	private void sliderBorderChanged() {
+		boolean border = sliderBorderCheckBox.isSelected();
+		UIManager.put( "Slider.thumbBorderColor", border ? Color.green : null );
+		for( JSlider slider : allSliders )
+			slider.updateUI();
+	}
+
 	private void majorThickSpacingChanged() {
 		int majorTickSpacing = (Integer) majorTickSpacingSpinner.getValue();
 		for( JSlider slider : directionalSliders ) {
@@ -248,6 +255,7 @@ public class FlatComponentsTest
 		JButton button14 = new JButton();
 		JButton button15 = new JButton();
 		JButton button16 = new JButton();
+		JButton button24 = new JButton();
 		JButton button20 = new JButton();
 		JLabel toggleButtonLabel = new JLabel();
 		JToggleButton toggleButton1 = new JToggleButton();
@@ -262,6 +270,7 @@ public class FlatComponentsTest
 		JToggleButton toggleButton12 = new JToggleButton();
 		JToggleButton toggleButton13 = new JToggleButton();
 		JToggleButton toggleButton14 = new JToggleButton();
+		JToggleButton toggleButton21 = new JToggleButton();
 		JToggleButton toggleButton18 = new JToggleButton();
 		JLabel checkBoxLabel = new JLabel();
 		JCheckBox checkBox1 = new JCheckBox();
@@ -354,7 +363,7 @@ public class FlatComponentsTest
 		JScrollPane scrollPane14 = new JScrollPane();
 		progressBar3 = new FlatProgressBar();
 		progressBar4 = new FlatProgressBar();
-		JToolBar toolBar2 = new JToolBar();
+		FlatComponentsTest.TestToolBar toolBar2 = new FlatComponentsTest.TestToolBar();
 		JButton button9 = new JButton();
 		JButton button10 = new JButton();
 		JButton button11 = new JButton();
@@ -393,6 +402,7 @@ public class FlatComponentsTest
 		sliderInvertedCheckBox = new JCheckBox();
 		sliderSnapToTicksCheckBox = new JCheckBox();
 		majorTickSpacingSpinner = new JSpinner();
+		sliderBorderCheckBox = new JCheckBox();
 		minorTickSpacingSpinner = new JSpinner();
 		sliderValueLabel = new JLabel();
 		JPanel panel7 = new JPanel();
@@ -409,7 +419,7 @@ public class FlatComponentsTest
 		JToolTip toolTip1 = new JToolTip();
 		JToolTip toolTip2 = new JToolTip();
 		JLabel toolBarLabel = new JLabel();
-		JToolBar toolBar1 = new JToolBar();
+		FlatComponentsTest.TestToolBar toolBar1 = new FlatComponentsTest.TestToolBar();
 		JButton button4 = new JButton();
 		JButton button6 = new JButton();
 		JButton button7 = new JButton();
@@ -419,13 +429,13 @@ public class FlatComponentsTest
 		JToggleButton toggleButton16 = new JToggleButton();
 		JToggleButton toggleButton17 = new JToggleButton();
 		JLabel label3 = new JLabel();
-		JToolBar toolBar3 = new JToolBar();
+		FlatComponentsTest.TestToolBar toolBar3 = new FlatComponentsTest.TestToolBar();
 		FlatButton button26 = new FlatButton();
 		FlatButton button27 = new FlatButton();
 		FlatToggleButton toggleButton23 = new FlatToggleButton();
 		FlatToggleButton toggleButton24 = new FlatToggleButton();
 		JLabel label4 = new JLabel();
-		JToolBar toolBar4 = new JToolBar();
+		FlatComponentsTest.TestToolBar toolBar4 = new FlatComponentsTest.TestToolBar();
 		FlatButton button28 = new FlatButton();
 		FlatButton button29 = new FlatButton();
 		FlatToggleButton toggleButton25 = new FlatToggleButton();
@@ -549,24 +559,28 @@ public class FlatComponentsTest
 
 		//---- button13 ----
 		button13.setIcon(UIManager.getIcon("Tree.closedIcon"));
-		add(button13, "cell 5 1");
+		add(button13, "cell 5 1 2 1");
 
 		//---- button14 ----
 		button14.setText("...");
-		add(button14, "cell 5 1");
+		add(button14, "cell 5 1 2 1");
 
 		//---- button15 ----
 		button15.setText("\u2026");
-		add(button15, "cell 5 1");
+		add(button15, "cell 5 1 2 1");
 
 		//---- button16 ----
 		button16.setText("#");
-		add(button16, "cell 5 1");
+		add(button16, "cell 5 1 2 1");
+
+		//---- button24 ----
+		button24.setText("A");
+		add(button24, "cell 5 1 2 1");
 
 		//---- button20 ----
 		button20.setText("Empty border");
 		button20.setBorder(BorderFactory.createEmptyBorder());
-		add(button20, "cell 6 1");
+		add(button20, "cell 5 1 2 1");
 
 		//---- toggleButtonLabel ----
 		toggleButtonLabel.setText("JToggleButton:");
@@ -618,27 +632,32 @@ public class FlatComponentsTest
 		//---- toggleButton11 ----
 		toggleButton11.setIcon(UIManager.getIcon("Tree.closedIcon"));
 		toggleButton11.setSelected(true);
-		add(toggleButton11, "cell 5 2");
+		add(toggleButton11, "cell 5 2 2 1");
 
 		//---- toggleButton12 ----
 		toggleButton12.setText("...");
 		toggleButton12.setSelected(true);
-		add(toggleButton12, "cell 5 2");
+		add(toggleButton12, "cell 5 2 2 1");
 
 		//---- toggleButton13 ----
 		toggleButton13.setText("\u2026");
 		toggleButton13.setSelected(true);
-		add(toggleButton13, "cell 5 2");
+		add(toggleButton13, "cell 5 2 2 1");
 
 		//---- toggleButton14 ----
 		toggleButton14.setText("#");
 		toggleButton14.setSelected(true);
-		add(toggleButton14, "cell 5 2");
+		add(toggleButton14, "cell 5 2 2 1");
+
+		//---- toggleButton21 ----
+		toggleButton21.setText("A");
+		toggleButton21.setSelected(true);
+		add(toggleButton21, "cell 5 2 2 1");
 
 		//---- toggleButton18 ----
 		toggleButton18.setText("Empty border");
 		toggleButton18.setBorder(BorderFactory.createEmptyBorder());
-		add(toggleButton18, "cell 6 2");
+		add(toggleButton18, "cell 5 2 2 1");
 
 		//---- checkBoxLabel ----
 		checkBoxLabel.setText("JCheckBox");
@@ -1370,10 +1389,15 @@ public class FlatComponentsTest
 				majorTickSpacingSpinner.addChangeListener(e -> majorThickSpacingChanged());
 				panel6.add(majorTickSpacingSpinner, "cell 0 2");
 
+				//---- sliderBorderCheckBox ----
+				sliderBorderCheckBox.setText("border");
+				sliderBorderCheckBox.addActionListener(e -> sliderBorderChanged());
+				panel6.add(sliderBorderCheckBox, "cell 0 2");
+
 				//---- minorTickSpacingSpinner ----
 				minorTickSpacingSpinner.setModel(new SpinnerNumberModel(10, 0, 100, 5));
 				minorTickSpacingSpinner.addChangeListener(e -> minorThickSpacingChanged());
-				panel6.add(minorTickSpacingSpinner, "cell 0 2");
+				panel6.add(minorTickSpacingSpinner, "cell 0 3");
 
 				//---- sliderValueLabel ----
 				sliderValueLabel.setText("slider value");
@@ -1579,6 +1603,11 @@ public class FlatComponentsTest
 		buttonGroup1.add(magentaCyanOutlineRadioButton);
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 
+		// Unicode surrogate character pair "script capital A"
+		// https://www.compart.com/en/unicode/U+1D49C
+		button24.setText("\uD835\uDC9C");
+		toggleButton21.setText("\uD835\uDC9C");
+
 //		BasicComboBoxRenderer customRenderer = new BasicComboBoxRenderer();
 //		customRenderer.setBorder( new LineBorder( Color.red ) );
 //		comboBox1.setRenderer( customRenderer );
@@ -1609,6 +1638,7 @@ public class FlatComponentsTest
 	private JCheckBox sliderInvertedCheckBox;
 	private JCheckBox sliderSnapToTicksCheckBox;
 	private JSpinner majorTickSpacingSpinner;
+	private JCheckBox sliderBorderCheckBox;
 	private JSpinner minorTickSpacingSpinner;
 	private JLabel sliderValueLabel;
 	private JCheckBox indeterminateCheckBox;
@@ -1668,4 +1698,37 @@ public class FlatComponentsTest
 			}
 		}
 	}
+
+	//---- class TestToolBar --------------------------------------------------
+
+	private static class TestToolBar
+		extends JToolBar
+	{
+		@Override
+		protected void paintComponent( Graphics g ) {
+			super.paintComponent( g );
+
+			if( isPaintBackgroundPattern() && isOpaque() ) {
+				int width = getWidth();
+				int height = getHeight();
+
+				g.setColor( Color.blue );
+				for( int y = 0; y < height; y += 2 )
+					g.drawLine( 0, y, width - 1, y );
+			}
+		}
+
+		/**
+		 * Overridden to see which components paint background with color from parent.
+		 */
+		@Override
+		public Color getBackground() {
+			return isPaintBackgroundPattern() ? Color.orange : super.getBackground();
+		}
+
+		private boolean isPaintBackgroundPattern() {
+			FlatTestFrame frame = (FlatTestFrame) SwingUtilities.getAncestorOfClass( FlatTestFrame.class, this );
+			return frame != null && frame.isPaintBackgroundPattern();
+		}
+	}
 }

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd

@@ -123,32 +123,38 @@ new FormModel {
 				name: "button13"
 				"icon": &SwingIcon0 new com.jformdesigner.model.SwingIcon( 2, "Tree.closedIcon" )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 1"
+				"value": "cell 5 1 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JButton" ) {
 				name: "button14"
 				"text": "..."
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 1"
+				"value": "cell 5 1 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JButton" ) {
 				name: "button15"
 				"text": "…"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 1"
+				"value": "cell 5 1 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JButton" ) {
 				name: "button16"
 				"text": "#"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 1"
+				"value": "cell 5 1 2 1"
+			} )
+			add( new FormComponent( "javax.swing.JButton" ) {
+				name: "button24"
+				"text": "A"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 1 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JButton" ) {
 				name: "button20"
 				"text": "Empty border"
 				"border": &EmptyBorder0 new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 6 1"
+				"value": "cell 5 1 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "toggleButtonLabel"
@@ -220,35 +226,42 @@ new FormModel {
 				"icon": #SwingIcon0
 				"selected": true
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 2"
+				"value": "cell 5 2 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JToggleButton" ) {
 				name: "toggleButton12"
 				"text": "..."
 				"selected": true
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 2"
+				"value": "cell 5 2 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JToggleButton" ) {
 				name: "toggleButton13"
 				"text": "…"
 				"selected": true
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 2"
+				"value": "cell 5 2 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JToggleButton" ) {
 				name: "toggleButton14"
 				"text": "#"
 				"selected": true
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 2"
+				"value": "cell 5 2 2 1"
+			} )
+			add( new FormComponent( "javax.swing.JToggleButton" ) {
+				name: "toggleButton21"
+				"text": "A"
+				"selected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 5 2 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JToggleButton" ) {
 				name: "toggleButton18"
 				"text": "Empty border"
 				"border": #EmptyBorder0
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 6 2"
+				"value": "cell 5 2 2 1"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "checkBoxLabel"
@@ -920,7 +933,7 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 13 1 6,growy"
 			} )
-			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+			add( new FormContainer( "com.formdev.flatlaf.testing.FlatComponentsTest$TestToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
 				name: "toolBar2"
 				"orientation": 1
 				add( new FormComponent( "javax.swing.JButton" ) {
@@ -1230,6 +1243,16 @@ new FormModel {
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 						"value": "cell 0 2"
 					} )
+					add( new FormComponent( "javax.swing.JCheckBox" ) {
+						name: "sliderBorderCheckBox"
+						"text": "border"
+						auxiliary() {
+							"JavaCodeGenerator.variableLocal": false
+						}
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "sliderBorderChanged", false ) )
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 0 2"
+					} )
 					add( new FormComponent( "javax.swing.JSpinner" ) {
 						name: "minorTickSpacingSpinner"
 						"model": new javax.swing.SpinnerNumberModel( 10, 0, 100, 5 )
@@ -1238,7 +1261,7 @@ new FormModel {
 						}
 						addEvent( new FormEvent( "javax.swing.event.ChangeListener", "stateChanged", "minorThickSpacingChanged", false ) )
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 0 2"
+						"value": "cell 0 3"
 					} )
 					add( new FormComponent( "javax.swing.JLabel" ) {
 						name: "sliderValueLabel"
@@ -1378,7 +1401,7 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 0 23"
 			} )
-			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+			add( new FormContainer( "com.formdev.flatlaf.testing.FlatComponentsTest$TestToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
 				name: "toolBar1"
 				add( new FormComponent( "javax.swing.JButton" ) {
 					name: "button4"
@@ -1433,7 +1456,7 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 23 5 1"
 			} )
-			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+			add( new FormContainer( "com.formdev.flatlaf.testing.FlatComponentsTest$TestToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
 				name: "toolBar3"
 				add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatButton" ) {
 					name: "button26"
@@ -1466,7 +1489,7 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 23 5 1"
 			} )
-			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+			add( new FormContainer( "com.formdev.flatlaf.testing.FlatComponentsTest$TestToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
 				name: "toolBar4"
 				add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatButton" ) {
 					name: "button28"

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java

@@ -105,11 +105,11 @@ public class FlatContainerTest
 	}
 
 	private void tabCountChanged() {
-		for( JTabbedPane tabbedPane : allTabbedPanes )
+		for( FlatTabbedPane tabbedPane : allTabbedPanes )
 			tabCountChanged( tabbedPane );
 	}
 
-	private void tabCountChanged( JTabbedPane tabbedPane ) {
+	private void tabCountChanged( FlatTabbedPane tabbedPane ) {
 		int oldTabCount = tabbedPane.getTabCount();
 		int newTabCount = (Integer) tabCountSpinner.getValue();
 
@@ -126,7 +126,7 @@ public class FlatContainerTest
 		setTabIcons( tabbedPane );
 	}
 
-	private void addTab( JTabbedPane tabbedPane ) {
+	private void addTab( FlatTabbedPane tabbedPane ) {
 		switch( tabbedPane.getTabCount() ) {
 			case 0:
 				tabbedPane.addTab( "Tab 1", null, new Panel1(), "First tab." );
@@ -136,12 +136,14 @@ public class FlatContainerTest
 				JComponent tab2 = new Panel2();
 				tab2.setBorder( new LineBorder( Color.magenta ) );
 				tabbedPane.addTab( "Second Tab", null, tab2, "This is the second tab." );
+				tabbedPane.setTabCloseToolTipText( 1, "Close Second Tab" );
 				break;
 
 			case 2:
 				tabbedPane.addTab( "Disabled", createTab( "tab content 3" ) );
 				tabbedPane.setEnabledAt( 2, false );
 				tabbedPane.setToolTipTextAt( 2, "Disabled tab." );
+				tabbedPane.setTabCloseToolTipText( 2, "Close Disabled tab" );
 				break;
 
 			case 3:
@@ -348,9 +350,13 @@ public class FlatContainerTest
 		if( closable ) {
 			for( FlatTabbedPane tabbedPane : allTabbedPanes ) {
 				tabbedPane.setTabCloseCallback( (tabbedPane2, tabIndex) -> {
+					String tabTitle = tabbedPane2.getTitleAt( tabIndex );
 					AWTEvent e = EventQueue.getCurrentEvent();
 					int modifiers = (e instanceof MouseEvent) ? ((MouseEvent)e).getModifiers() : 0;
-					JOptionPane.showMessageDialog( this, "Closed tab '" + tabbedPane2.getTitleAt( tabIndex ) + "'."
+
+					tabbedPane2.removeTabAt( tabIndex );
+
+					JOptionPane.showMessageDialog( this, "Closed tab '" + tabTitle + "'."
 						+ "\n\n(modifiers: " + MouseEvent.getMouseModifiersText( modifiers ) + ")",
 						"Tab Closed", JOptionPane.PLAIN_MESSAGE );
 				} );

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java

@@ -211,11 +211,15 @@ public class FlatMenusTest
 		JMenuItem menuItem3 = new JMenuItem();
 		JCheckBoxMenuItem checkBoxMenuItem3 = new JCheckBoxMenuItem();
 		JRadioButtonMenuItem radioButtonMenuItem3 = new JRadioButtonMenuItem();
+		JCheckBoxMenuItem checkBoxMenuItem9 = new JCheckBoxMenuItem();
+		JRadioButtonMenuItem radioButtonMenuItem7 = new JRadioButtonMenuItem();
 		JPanel panel4 = new JPanel();
 		JMenu menu4 = new JMenu();
 		JMenuItem menuItem4 = new JMenuItem();
 		JCheckBoxMenuItem checkBoxMenuItem4 = new JCheckBoxMenuItem();
 		JRadioButtonMenuItem radioButtonMenuItem4 = new JRadioButtonMenuItem();
+		JCheckBoxMenuItem checkBoxMenuItem10 = new JCheckBoxMenuItem();
+		JRadioButtonMenuItem radioButtonMenuItem11 = new JRadioButtonMenuItem();
 		JLabel popupMenuLabel = new JLabel();
 		JButton showPopupMenuButton = new JButton();
 		armedCheckBox = new JCheckBox();
@@ -670,6 +674,8 @@ public class FlatMenusTest
 				"[]" +
 				"[]" +
 				"[]" +
+				"[]" +
+				"[]" +
 				"[]"));
 
 			//======== menu3 ========
@@ -696,6 +702,20 @@ public class FlatMenusTest
 			radioButtonMenuItem3.setSelected(true);
 			radioButtonMenuItem3.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
 			panel3.add(radioButtonMenuItem3, "cell 0 3");
+
+			//---- checkBoxMenuItem9 ----
+			checkBoxMenuItem9.setText("selected");
+			checkBoxMenuItem9.setSelected(true);
+			checkBoxMenuItem9.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
+			checkBoxMenuItem9.setIcon(new ImageIcon(getClass().getResource("/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showReadAccess.png")));
+			panel3.add(checkBoxMenuItem9, "cell 0 4");
+
+			//---- radioButtonMenuItem7 ----
+			radioButtonMenuItem7.setText("selected");
+			radioButtonMenuItem7.setSelected(true);
+			radioButtonMenuItem7.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
+			radioButtonMenuItem7.setIcon(new ImageIcon(getClass().getResource("/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showReadAccess.png")));
+			panel3.add(radioButtonMenuItem7, "cell 0 5");
 		}
 		add(panel3, "cell 3 1");
 
@@ -710,6 +730,8 @@ public class FlatMenusTest
 				"[]" +
 				"[]" +
 				"[]" +
+				"[]" +
+				"[]" +
 				"[]"));
 
 			//======== menu4 ========
@@ -739,6 +761,22 @@ public class FlatMenusTest
 			radioButtonMenuItem4.setSelected(true);
 			radioButtonMenuItem4.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
 			panel4.add(radioButtonMenuItem4, "cell 0 3");
+
+			//---- checkBoxMenuItem10 ----
+			checkBoxMenuItem10.setText("selected disabled");
+			checkBoxMenuItem10.setEnabled(false);
+			checkBoxMenuItem10.setSelected(true);
+			checkBoxMenuItem10.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
+			checkBoxMenuItem10.setIcon(new ImageIcon(getClass().getResource("/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showReadAccess.png")));
+			panel4.add(checkBoxMenuItem10, "cell 0 4");
+
+			//---- radioButtonMenuItem11 ----
+			radioButtonMenuItem11.setText("selected disabled");
+			radioButtonMenuItem11.setEnabled(false);
+			radioButtonMenuItem11.setSelected(true);
+			radioButtonMenuItem11.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
+			radioButtonMenuItem11.setIcon(new ImageIcon(getClass().getResource("/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showReadAccess.png")));
+			panel4.add(radioButtonMenuItem11, "cell 0 5");
 		}
 		add(panel4, "cell 4 1");
 

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.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"
@@ -454,7 +454,7 @@ new FormModel {
 			} )
 			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 				"$columnConstraints": "[fill]"
-				"$rowConstraints": "[][][][]"
+				"$rowConstraints": "[][][][][][]"
 				"$layoutConstraints": "insets 0"
 			} ) {
 				name: "panel3"
@@ -490,12 +490,30 @@ new FormModel {
 				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 					"value": "cell 0 3"
 				} )
+				add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
+					name: "checkBoxMenuItem9"
+					"text": "selected"
+					"selected": true
+					"accelerator": #KeyStroke1
+					"icon": &SwingIcon3 new com.jformdesigner.model.SwingIcon( 0, "/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showReadAccess.png" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormComponent( "javax.swing.JRadioButtonMenuItem" ) {
+					name: "radioButtonMenuItem7"
+					"text": "selected"
+					"selected": true
+					"accelerator": #KeyStroke1
+					"icon": #SwingIcon3
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 3 1"
 			} )
 			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 				"$columnConstraints": "[fill]"
-				"$rowConstraints": "[][][][]"
+				"$rowConstraints": "[][][][][][]"
 				"$layoutConstraints": "insets 0"
 			} ) {
 				name: "panel4"
@@ -534,6 +552,26 @@ new FormModel {
 				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 					"value": "cell 0 3"
 				} )
+				add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
+					name: "checkBoxMenuItem10"
+					"text": "selected disabled"
+					"enabled": false
+					"selected": true
+					"accelerator": #KeyStroke1
+					"icon": &SwingIcon4 new com.jformdesigner.model.SwingIcon( 0, "/com/formdev/flatlaf/testing/disabled_icons_test/intellij-showReadAccess.png" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormComponent( "javax.swing.JRadioButtonMenuItem" ) {
+					name: "radioButtonMenuItem11"
+					"text": "selected disabled"
+					"enabled": false
+					"selected": true
+					"accelerator": #KeyStroke1
+					"icon": #SwingIcon4
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 4 1"
 			} )

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java

@@ -27,6 +27,7 @@ import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import javax.swing.*;
+import javax.swing.FocusManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.metal.MetalLookAndFeel;
@@ -445,7 +446,7 @@ public class FlatTestFrame
 			Color green = dark ? Color.green.darker() : Color.green;
 
 			updateComponentsRecur( content, (c, type) -> {
-				if( type == "view" || type == "tab" ) {
+				if( type == "view" || type == "tab" || c instanceof JSlider ) {
 					c.setForeground( explicit ? magenta : restoreColor );
 					c.setBackground( explicit ? orange : restoreColor );
 				} else {
@@ -504,6 +505,29 @@ public class FlatTestFrame
 		inspector.setEnabled( inspectCheckBox.isSelected() );
 	}
 
+	private void uiDefaultsInspectorChanged() {
+		getContentPane().removeAll();
+
+		FocusManager focusManager = FocusManager.getCurrentManager();
+		Component focusOwner = focusManager.getFocusOwner();
+
+		if( uiDefaultsInspectorCheckBox.isSelected() ) {
+			JComponent uiDefaultsInspector = FlatUIDefaultsInspector.createInspectorPanel();
+
+			JSplitPane splitPane = new JSplitPane();
+			splitPane.setLeftComponent( dialogPane );
+			splitPane.setRightComponent( uiDefaultsInspector );
+			getContentPane().add( splitPane, BorderLayout.CENTER );
+		} else
+			getContentPane().add( dialogPane, BorderLayout.CENTER );
+
+		if( focusOwner != null && focusOwner.isDisplayable() )
+			focusOwner.requestFocusInWindow();
+
+		pack();
+		setLocationRelativeTo( null );
+	}
+
 	private void scaleFactorChanged() {
 		String scaleFactor = (String) scaleFactorComboBox.getSelectedItem();
 		if( "default".equals( scaleFactor ) )
@@ -662,6 +686,7 @@ public class FlatTestFrame
 		rightToLeftCheckBox = new JCheckBox();
 		enabledCheckBox = new JCheckBox();
 		inspectCheckBox = new JCheckBox();
+		uiDefaultsInspectorCheckBox = new JCheckBox();
 		explicitColorsCheckBox = new JCheckBox();
 		backgroundCheckBox = new JCheckBox();
 		opaqueTriStateCheckBox = new FlatTriStateCheckBox();
@@ -704,6 +729,7 @@ public class FlatTestFrame
 					"[fill]" +
 					"[fill]" +
 					"[fill]" +
+					"[fill]" +
 					"[grow,fill]" +
 					"[button,fill]",
 					// rows
@@ -757,23 +783,29 @@ public class FlatTestFrame
 				inspectCheckBox.addActionListener(e -> inspectChanged());
 				buttonBar.add(inspectCheckBox, "cell 5 0");
 
+				//---- uiDefaultsInspectorCheckBox ----
+				uiDefaultsInspectorCheckBox.setText("UI defaults");
+				uiDefaultsInspectorCheckBox.setMnemonic('U');
+				uiDefaultsInspectorCheckBox.addActionListener(e -> uiDefaultsInspectorChanged());
+				buttonBar.add(uiDefaultsInspectorCheckBox, "cell 6 0");
+
 				//---- explicitColorsCheckBox ----
 				explicitColorsCheckBox.setText("explicit colors");
 				explicitColorsCheckBox.setMnemonic('X');
 				explicitColorsCheckBox.addActionListener(e -> explicitColorsChanged());
-				buttonBar.add(explicitColorsCheckBox, "cell 6 0");
+				buttonBar.add(explicitColorsCheckBox, "cell 7 0");
 
 				//---- backgroundCheckBox ----
 				backgroundCheckBox.setText("background");
 				backgroundCheckBox.setMnemonic('B');
 				backgroundCheckBox.addActionListener(e -> backgroundChanged());
-				buttonBar.add(backgroundCheckBox, "cell 7 0");
+				buttonBar.add(backgroundCheckBox, "cell 8 0");
 
 				//---- opaqueTriStateCheckBox ----
 				opaqueTriStateCheckBox.setText("opaque");
 				opaqueTriStateCheckBox.setMnemonic('O');
 				opaqueTriStateCheckBox.addActionListener(e -> opaqueChanged());
-				buttonBar.add(opaqueTriStateCheckBox, "cell 8 0");
+				buttonBar.add(opaqueTriStateCheckBox, "cell 9 0");
 
 				//---- sizeVariantComboBox ----
 				sizeVariantComboBox.setModel(new DefaultComboBoxModel<>(new String[] {
@@ -784,11 +816,11 @@ public class FlatTestFrame
 				}));
 				sizeVariantComboBox.setSelectedIndex(2);
 				sizeVariantComboBox.addActionListener(e -> sizeVariantChanged());
-				buttonBar.add(sizeVariantComboBox, "cell 9 0");
+				buttonBar.add(sizeVariantComboBox, "cell 10 0");
 
 				//---- closeButton ----
 				closeButton.setText("Close");
-				buttonBar.add(closeButton, "cell 11 0");
+				buttonBar.add(closeButton, "cell 12 0");
 			}
 			dialogPane.add(buttonBar, BorderLayout.SOUTH);
 			dialogPane.add(themesPanel, BorderLayout.EAST);
@@ -807,6 +839,7 @@ public class FlatTestFrame
 	private JCheckBox rightToLeftCheckBox;
 	private JCheckBox enabledCheckBox;
 	private JCheckBox inspectCheckBox;
+	private JCheckBox uiDefaultsInspectorCheckBox;
 	private JCheckBox explicitColorsCheckBox;
 	private JCheckBox backgroundCheckBox;
 	private FlatTriStateCheckBox opaqueTriStateCheckBox;

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd

@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
 
 new FormModel {
 	contentType: "form/swing"
@@ -21,7 +21,7 @@ new FormModel {
 				} )
 				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 					"$layoutConstraints": "insets dialog"
-					"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill][fill][fill][fill][grow,fill][button,fill]"
+					"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill][fill][fill][fill][fill][grow,fill][button,fill]"
 					"$rowSpecs": "[fill]"
 				} ) {
 					name: "buttonBar"
@@ -91,13 +91,21 @@ new FormModel {
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 						"value": "cell 5 0"
 					} )
+					add( new FormComponent( "javax.swing.JCheckBox" ) {
+						name: "uiDefaultsInspectorCheckBox"
+						"text": "UI defaults"
+						"mnemonic": 85
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "uiDefaultsInspectorChanged", false ) )
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 6 0"
+					} )
 					add( new FormComponent( "javax.swing.JCheckBox" ) {
 						name: "explicitColorsCheckBox"
 						"text": "explicit colors"
 						"mnemonic": 88
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "explicitColorsChanged", false ) )
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 6 0"
+						"value": "cell 7 0"
 					} )
 					add( new FormComponent( "javax.swing.JCheckBox" ) {
 						name: "backgroundCheckBox"
@@ -105,7 +113,7 @@ new FormModel {
 						"mnemonic": 66
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "backgroundChanged", false ) )
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 7 0"
+						"value": "cell 8 0"
 					} )
 					add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatTriStateCheckBox" ) {
 						name: "opaqueTriStateCheckBox"
@@ -113,7 +121,7 @@ new FormModel {
 						"mnemonic": 79
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "opaqueChanged", false ) )
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 8 0"
+						"value": "cell 9 0"
 					} )
 					add( new FormComponent( "javax.swing.JComboBox" ) {
 						name: "sizeVariantComboBox"
@@ -127,13 +135,13 @@ new FormModel {
 						"selectedIndex": 2
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "sizeVariantChanged", false ) )
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 9 0"
+						"value": "cell 10 0"
 					} )
 					add( new FormComponent( "javax.swing.JButton" ) {
 						name: "closeButton"
 						"text": "Close"
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 11 0"
+						"value": "cell 12 0"
 					} )
 				}, new FormLayoutConstraints( class java.lang.String ) {
 					"value": "South"

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssTest.java

@@ -24,7 +24,6 @@ import javax.swing.border.*;
 import com.formdev.flatlaf.testing.*;
 import com.formdev.flatlaf.testing.FlatTestFrame;
 import com.jgoodies.forms.layout.*;
-import com.jidesoft.plaf.LookAndFeelFactory;
 import com.jidesoft.popup.JidePopup;
 import com.jidesoft.swing.*;
 import net.miginfocom.swing.*;
@@ -38,14 +37,7 @@ public class FlatJideOssTest
 	public static void main( String[] args ) {
 		SwingUtilities.invokeLater( () -> {
 			FlatTestFrame frame = FlatTestFrame.create( args, "FlatJideOssTest" );
-			LookAndFeelFactory.installJideExtension();
 			frame.showFrame( FlatJideOssTest::new );
-
-			UIManager.addPropertyChangeListener( e -> {
-				if( "lookAndFeel".equals( e.getPropertyName() ) ) {
-					LookAndFeelFactory.installJideExtension();
-				}
-			} );
 		} );
 	}
 

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatRangeSliderTest.java

@@ -22,11 +22,9 @@ import javax.swing.JLabel;
 import javax.swing.JSlider;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import javax.swing.event.ChangeListener;
 import com.formdev.flatlaf.testing.FlatTestFrame;
 import com.formdev.flatlaf.testing.FlatTestPanel;
-import com.jidesoft.plaf.LookAndFeelFactory;
 import com.jidesoft.swing.RangeSlider;
 import net.miginfocom.swing.MigLayout;
 
@@ -37,14 +35,7 @@ public class FlatRangeSliderTest
 	public static void main( String[] args ) {
 		SwingUtilities.invokeLater( () -> {
 			FlatTestFrame frame = FlatTestFrame.create( args, "FlatRangeSliderTest" );
-			LookAndFeelFactory.installJideExtension();
 			frame.showFrame( FlatRangeSliderTest::new );
-
-			UIManager.addPropertyChangeListener( e -> {
-				if( "lookAndFeel".equals( e.getPropertyName() ) ) {
-					LookAndFeelFactory.installJideExtension();
-				}
-			} );
 		} );
 	}
 

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java

@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringReader;
@@ -37,6 +38,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Properties;
 import java.util.TreeSet;
 import java.util.function.Predicate;
 import javax.swing.Icon;
@@ -63,6 +65,7 @@ import com.formdev.flatlaf.*;
 import com.formdev.flatlaf.intellijthemes.FlatAllIJThemes;
 import com.formdev.flatlaf.testing.FlatTestLaf;
 import com.formdev.flatlaf.ui.FlatLineBorder;
+import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.ColorFunctions.ColorFunction;
 import com.formdev.flatlaf.util.ColorFunctions.Fade;
 import com.formdev.flatlaf.util.ColorFunctions.HSLIncreaseDecrease;
@@ -79,6 +82,8 @@ public class UIDefaultsDump
 {
 	private final LookAndFeel lookAndFeel;
 	private final UIDefaults defaults;
+	private final Properties derivedColorKeys;
+	private final boolean isIntelliJTheme;
 
 	private String lastPrefix;
 	private JComponent dummyComponent;
@@ -280,6 +285,9 @@ public class UIDefaultsDump
 	private UIDefaultsDump( LookAndFeel lookAndFeel ) {
 		this.lookAndFeel = lookAndFeel;
 		this.defaults = lookAndFeel.getDefaults();
+
+		derivedColorKeys = loadDerivedColorKeys();
+		isIntelliJTheme = (lookAndFeel instanceof IntelliJTheme.ThemeLaf);
 	}
 
 	private void dump( PrintWriter out, Predicate<String> keyFilter ) {
@@ -316,12 +324,12 @@ public class UIDefaultsDump
 				}
 
 				out.printf( "%-30s ", strKey );
-				dumpValue( out, value );
+				dumpValue( out, strKey, value );
 				out.println();
 			} );
 	}
 
-	private void dumpValue( PrintWriter out, Object value ) {
+	private void dumpValue( PrintWriter out, String key, Object value ) {
 		if( value == null ||
 			value instanceof String ||
 			value instanceof Number ||
@@ -339,7 +347,7 @@ public class UIDefaultsDump
 		else if( value instanceof List )
 			dumpList( out, (List<?>) value );
 		else if( value instanceof Color )
-			dumpColor( out, (Color) value );
+			dumpColor( out, key, (Color) value );
 		else if( value instanceof Font )
 			dumpFont( out, (Font) value );
 		else if( value instanceof Insets )
@@ -367,7 +375,7 @@ public class UIDefaultsDump
 		out.printf( "length=%d    %s", length, dumpClass( array ) );
 		for( int i = 0; i < length; i++ ) {
 			out.printf( "%n    [%d] ", i );
-			dumpValue( out, Array.get( array, i ) );
+			dumpValue( out, null, Array.get( array, i ) );
 		}
 	}
 
@@ -375,14 +383,25 @@ public class UIDefaultsDump
 		out.printf( "size=%d    %s", list.size(), dumpClass( list ) );
 		for( int i = 0; i < list.size(); i++ ) {
 			out.printf( "%n    [%d] ", i );
-			dumpValue( out, list.get( i ) );
+			dumpValue( out, null, list.get( i ) );
 		}
 	}
 
-	private void dumpColor( PrintWriter out, Color color ) {
-		boolean hasAlpha = (color.getAlpha() != 255);
-		out.printf( hasAlpha ? "#%08x    %s" : "#%06x    %s",
-			hasAlpha ? color.getRGB() : (color.getRGB() & 0xffffff),
+	private void dumpColor( PrintWriter out, String key, Color color ) {
+		Color resolvedColor = resolveDerivedColor( key, color );
+		if( resolvedColor != color && resolvedColor.getRGB() != color.getRGB() ) {
+			if( !isIntelliJTheme ) {
+				System.err.println( "Key '" + key + "': derived colors not equal" );
+				System.err.println( "  Default color:  " + dumpColorHex( color ) );
+				System.err.println( "  Resolved color: " + dumpColorHex( resolvedColor ) );
+			}
+
+			out.printf( "%s / ",
+				dumpColorHex( resolvedColor ) );
+		}
+
+		out.printf( "%s    %s",
+			dumpColorHex( color ),
 			dumpClass( color ) );
 
 		if( color instanceof DerivedColor ) {
@@ -395,6 +414,12 @@ public class UIDefaultsDump
 		}
 	}
 
+	private String dumpColorHex( Color color ) {
+		boolean hasAlpha = (color.getAlpha() != 255);
+		return String.format( hasAlpha ? "#%08x" : "#%06x",
+			hasAlpha ? color.getRGB() : (color.getRGB() & 0xffffff) );
+	}
+
 	private void dumpColorFunction( PrintWriter out, ColorFunction function ) {
 		if( function instanceof HSLIncreaseDecrease ) {
 			HSLIncreaseDecrease func = (HSLIncreaseDecrease) function;
@@ -457,7 +482,7 @@ public class UIDefaultsDump
 			if( border instanceof LineBorder ) {
 				LineBorder b = (LineBorder) border;
 				out.print( "line: " );
-				dumpValue( out, b.getLineColor() );
+				dumpValue( out, null, b.getLineColor() );
 				out.printf( " %d %b    ", b.getThickness(), b.getRoundedCorners() );
 			}
 
@@ -498,7 +523,7 @@ public class UIDefaultsDump
 			if( border instanceof FlatLineBorder ) {
 				FlatLineBorder lineBorder = (FlatLineBorder) border;
 				out.print( "    lineColor=" );
-				dumpColor( out, lineBorder.getLineColor() );
+				dumpColor( out, null, lineBorder.getLineColor() );
 				out.printf( "    lineThickness=%f", lineBorder.getLineThickness() );
 			}
 		}
@@ -541,7 +566,7 @@ public class UIDefaultsDump
 
 	private void dumpLazyValue( PrintWriter out, LazyValue value ) {
 		out.print( "[lazy] " );
-		dumpValue( out, value.createValue( defaults ) );
+		dumpValue( out, null, value.createValue( defaults ) );
 	}
 
 	private void dumpActiveValue( PrintWriter out, ActiveValue value ) {
@@ -555,7 +580,7 @@ public class UIDefaultsDump
 			if( realValue instanceof UIResource )
 				out.print( " [UI]" );
 		} else
-			dumpValue( out, realValue );
+			dumpValue( out, null, realValue );
 	}
 
 	private String dumpClass( Object value ) {
@@ -565,6 +590,46 @@ public class UIDefaultsDump
 		return classname;
 	}
 
+	private Properties loadDerivedColorKeys() {
+		Properties properties = new Properties();
+		try( InputStream in = getClass().getResourceAsStream( "/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties" ) ) {
+			properties.load( in );
+		} catch( IOException ex ) {
+			ex.printStackTrace();
+		}
+		return properties;
+	}
+
+	private Color resolveDerivedColor( String key, Color color ) {
+		if( !(color instanceof DerivedColor) )
+			return color;
+
+		if( key == null )
+			throw new NullPointerException( "Key must not null." );
+
+		Object baseKey = derivedColorKeys.get( key );
+
+		if( baseKey == null )
+			throw new IllegalStateException( "Key '" + key + "' not found in DerivedColorKeys.properties." );
+
+		// this is for keys that may be defined as derived colors, but do not derive them at runtime
+		if( "null".equals( baseKey ) )
+			return color;
+
+		Color baseColor = defaults.getColor( baseKey );
+		if( baseColor == null )
+			throw new IllegalStateException( "Missing base color '" + baseKey + "' for key '" + key + "'." );
+
+		if( baseColor instanceof DerivedColor )
+			baseColor = resolveDerivedColor( (String) baseKey, baseColor );
+
+		Color newColor = FlatUIUtils.deriveColor( color, baseColor );
+
+		// creating a new color instance to drop Color.frgbvalue from newColor
+		// and avoid rounding issues/differences
+		return new Color( newColor.getRGB(), true );
+	}
+
 	//---- class MyBasicLookAndFeel -------------------------------------------
 
 	public static class MyBasicLookAndFeel

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsKeysDump.java

@@ -16,8 +16,10 @@
 
 package com.formdev.flatlaf.testing.uidefaults;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
@@ -42,13 +44,24 @@ public class UIDefaultsKeysDump
 
 		File keysFile = new File( "../flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt" );
 
+		// load existing keys file
 		HashSet<String> keys = new HashSet<>();
+		try( BufferedReader reader = new BufferedReader( new FileReader( keysFile ) ) ) {
+			String key;
+			while( (key = reader.readLine()) != null ) {
+				keys.add( key );
+			}
+		} catch( IOException ex ) {
+			ex.printStackTrace();
+		}
 
+		// collect keys used in Lafs
 		collectKeys( FlatLightLaf.class.getName(), keys );
 		collectKeys( FlatDarkLaf.class.getName(), keys );
 		collectKeys( FlatIntelliJLaf.class.getName(), keys );
 		collectKeys( FlatDarculaLaf.class.getName(), keys );
 
+		// write key file
 		try( Writer fileWriter = new BufferedWriter( new FileWriter( keysFile ) ) ) {
 			String[] sortedKeys = keys.toArray( new String[keys.size()] );
 			Arrays.sort( sortedKeys );

flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties

@@ -32,13 +32,19 @@
 @cellFocusColor = #f00
 @icon = #afafaf
 
+# for buttons within components (e.g. combobox or spinner)
+@buttonArrowColor = #666
+@buttonDisabledArrowColor = #ABABAB
+@buttonHoverArrowColor = #f00
+@buttonPressedArrowColor = #00f
+
 @dropCellBackground = #f00
 @dropCellForeground = #0f0
 @dropLineColor = #00f
 @dropLineShortColor = #ff0
 
 
-#---- globals ----
+#---- wildcard replacements ----
 
 *.caretForeground = #00f
 *.inactiveBackground = #f0f0f0
@@ -118,9 +124,6 @@ CheckBox.icon.pressedBackground=#FFC800
 ComboBox.background = #fff
 ComboBox.buttonBackground = #f0f0f0
 ComboBox.buttonEditableBackground = #ccc
-ComboBox.buttonArrowColor=#666
-ComboBox.buttonDisabledArrowColor=#ABABAB
-ComboBox.buttonHoverArrowColor=#f00
 
 
 #---- Component ----
@@ -276,6 +279,7 @@ Slider.disabledThumbColor=#880
 SplitPaneDivider.draggingColor = #800
 SplitPaneDivider.oneTouchArrowColor = #0f0
 SplitPaneDivider.oneTouchHoverArrowColor = #f00
+SplitPaneDivider.oneTouchPressedArrowColor = #00f
 
 
 #---- TabbedPane ----

flatlaf-theme-editor/build.gradle.kts

@@ -18,12 +18,21 @@ plugins {
 	`java-library`
 }
 
+repositories {
+	maven {
+		// for using MigLayout snapshot
+		url = uri( "https://oss.sonatype.org/content/repositories/snapshots/" )
+	}
+}
+
 dependencies {
 	implementation( project( ":flatlaf-core" ) )
 	implementation( project( ":flatlaf-extras" ) )
 
-	implementation( "com.fifesoft:rsyntaxtextarea:3.1.1" )
-	implementation( "com.fifesoft:autocomplete:3.1.0" )
+	implementation( "com.miglayout:miglayout-swing:5.3-SNAPSHOT" )
+	implementation( "com.fifesoft:rsyntaxtextarea:3.1.2" )
+	implementation( "com.fifesoft:autocomplete:3.1.1" )
+	implementation( "com.fifesoft:rstaui:3.1.1" )
 }
 
 tasks {

flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.java

@@ -0,0 +1,390 @@
+/*
+ * Copyright 2020 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.themeeditor;
+
+import java.awt.Container;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.function.Consumer;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import org.fife.rsta.ui.CollapsibleSectionPanel;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rtextarea.SearchContext;
+import org.fife.ui.rtextarea.SearchEngine;
+import org.fife.ui.rtextarea.SearchResult;
+import com.formdev.flatlaf.extras.FlatSVGIcon;
+import com.formdev.flatlaf.util.StringUtils;
+import net.miginfocom.swing.*;
+
+/**
+ * @author Karl Tauber
+ */
+class FlatFindReplaceBar
+	extends JPanel
+{
+	private final RSyntaxTextArea textArea;
+
+	private SearchContext context;
+
+	FlatFindReplaceBar( RSyntaxTextArea textArea ) {
+		this.textArea = textArea;
+
+		initComponents();
+
+		findField.getDocument().addDocumentListener( new MarkAllUpdater() );
+
+		// find previous/next with UP/DOWN keys; focus editor with F12 key
+		InputMap inputMap = getInputMap( JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
+		inputMap.put( KeyStroke.getKeyStroke( KeyEvent.VK_UP, 0 ), "findPrevious" );
+		inputMap.put( KeyStroke.getKeyStroke( KeyEvent.VK_DOWN, 0 ), "findNext" );
+		inputMap.put( KeyStroke.getKeyStroke( KeyEvent.VK_F12, 0 ), "focusEditor" );
+		ActionMap actionMap = getActionMap();
+		actionMap.put( "findPrevious", new ConsumerAction( e -> findPrevious() ) );
+		actionMap.put( "findNext", new ConsumerAction( e -> findNext() ) );
+		actionMap.put( "focusEditor", new ConsumerAction( e -> textArea.requestFocusInWindow() ) );
+
+		findPreviousButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/themeeditor/icons/findAndShowPrevMatches.svg" ) );
+		findNextButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/themeeditor/icons/findAndShowNextMatches.svg" ) );
+		matchCaseToggleButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/themeeditor/icons/matchCase.svg" ) );
+		matchWholeWordToggleButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/themeeditor/icons/words.svg" ) );
+		regexToggleButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/themeeditor/icons/regex.svg" ) );
+		closeButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/themeeditor/icons/close.svg" ) );
+
+		SearchContext context = new SearchContext();
+		context.setSearchWrap( true );
+		setSearchContext( context );
+	}
+
+	SearchContext getSearchContext() {
+		return context;
+	}
+
+	void setSearchContext( SearchContext context ) {
+		this.context = context;
+
+		findField.setText( context.getSearchFor() );
+		replaceField.setText( context.getReplaceWith() );
+		matchCaseToggleButton.setSelected( context.getMatchCase() );
+		matchWholeWordToggleButton.setSelected( context.getWholeWord() );
+		regexToggleButton.setSelected( context.isRegularExpression() );
+	}
+
+	@Override
+	public boolean requestFocusInWindow() {
+		// invoked from CollapsibleSectionPanel
+
+		// use selected text in editor for searching
+		String selectedText = textArea.getSelectedText();
+		if( !StringUtils.isEmpty( selectedText ) && selectedText.indexOf( '\n' ) < 0 )
+			findField.setText( selectedText );
+		else
+			findField.selectAll();
+
+		// if showing bar, highlight matches in editor
+		// (not invoking this from addNotify() because this would break the slide-in animation)
+		markAll();
+
+		return findField.requestFocusInWindow();
+	}
+
+	@Override
+	public void removeNotify() {
+		super.removeNotify();
+
+		// if hiding bar, clear all highlighted matches in editor and focus it
+		SearchEngine.markAll( textArea, new SearchContext() );
+		textArea.requestFocusInWindow();
+	}
+
+	private void findNext() {
+		context.setSearchForward( true );
+		find();
+	}
+
+	private void findPrevious() {
+		context.setSearchForward( false );
+		find();
+	}
+
+	private void find() {
+		findOrMarkAll( true );
+	}
+
+	private void markAll() {
+		findOrMarkAll( false );
+	}
+
+	private void findOrMarkAll( boolean find ) {
+		// update search context
+		String searchFor = findField.getText();
+		context.setSearchFor( searchFor );
+
+		// find
+		SearchResult result = find
+			? SearchEngine.find( textArea, context )
+			: SearchEngine.markAll( textArea, context );
+
+		// update matches info label
+		updateMatchesLabel( result, false );
+
+		// enabled/disable
+		boolean findEnabled = !StringUtils.isEmpty( searchFor );
+		findPreviousButton.setEnabled( findEnabled );
+		findNextButton.setEnabled( findEnabled );
+	}
+
+	private void matchCaseChanged() {
+		context.setMatchCase( matchCaseToggleButton.isSelected() );
+		markAll();
+	}
+
+	private void matchWholeWordChanged() {
+		context.setWholeWord( matchWholeWordToggleButton.isSelected() );
+		markAll();
+	}
+
+	private void regexChanged() {
+		context.setRegularExpression( regexToggleButton.isSelected() );
+		markAll();
+	}
+
+	private void replace() {
+		// update search context
+		context.setSearchFor( findField.getText() );
+		context.setReplaceWith( replaceField.getText() );
+
+		// replace
+		SearchResult result = SearchEngine.replace( textArea, context );
+
+		// update matches info labels
+		updateMatchesLabel( result, true );
+	}
+
+	private void replaceAll() {
+		// update search context
+		context.setSearchFor( findField.getText() );
+		context.setReplaceWith( replaceField.getText() );
+
+		// replace all
+		SearchResult result = SearchEngine.replaceAll( textArea, context );
+
+		// update matches info labels
+		updateMatchesLabel( result, true );
+	}
+
+	private void updateMatchesLabel( SearchResult result, boolean replace ) {
+		matchesLabel.setText( result.getMarkedCount() + " matches" );
+		replaceMatchesLabel.setText( replace ? result.getCount() + " matches replaced" : null );
+	}
+
+	private void close() {
+		Container parent = getParent();
+		if( parent instanceof CollapsibleSectionPanel )
+			((CollapsibleSectionPanel)parent).hideBottomComponent();
+		else if( parent != null )
+			parent.remove( this );
+	}
+
+	private void initComponents() {
+		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+		findLabel = new JLabel();
+		findField = new JTextField();
+		findToolBar = new JToolBar();
+		findPreviousButton = new JButton();
+		findNextButton = new JButton();
+		matchCaseToggleButton = new JToggleButton();
+		matchWholeWordToggleButton = new JToggleButton();
+		regexToggleButton = new JToggleButton();
+		matchesLabel = new JLabel();
+		closeToolBar = new JToolBar();
+		closeButton = new JButton();
+		replaceLabel = new JLabel();
+		replaceField = new JTextField();
+		toolBar1 = new JToolBar();
+		replaceButton = new JButton();
+		replaceAllButton = new JButton();
+		replaceMatchesLabel = new JLabel();
+
+		//======== this ========
+		setFocusCycleRoot(true);
+		setLayout(new MigLayout(
+			"insets 3 6 3 3,hidemode 3",
+			// columns
+			"[fill]" +
+			"[fill]0" +
+			"[fill]" +
+			"[grow,fill]" +
+			"[fill]",
+			// rows
+			"[]3" +
+			"[]"));
+
+		//---- findLabel ----
+		findLabel.setText("Find:");
+		findLabel.setDisplayedMnemonic('F');
+		findLabel.setLabelFor(findField);
+		add(findLabel, "cell 0 0");
+
+		//---- findField ----
+		findField.setColumns(16);
+		findField.addActionListener(e -> find());
+		add(findField, "cell 1 0");
+
+		//======== findToolBar ========
+		{
+			findToolBar.setFloatable(false);
+			findToolBar.setBorder(null);
+
+			//---- findPreviousButton ----
+			findPreviousButton.setToolTipText("Previous Occurrence");
+			findPreviousButton.addActionListener(e -> findPrevious());
+			findToolBar.add(findPreviousButton);
+
+			//---- findNextButton ----
+			findNextButton.setToolTipText("Next Occurrence");
+			findNextButton.addActionListener(e -> findNext());
+			findToolBar.add(findNextButton);
+			findToolBar.addSeparator();
+
+			//---- matchCaseToggleButton ----
+			matchCaseToggleButton.setToolTipText("Match Case");
+			matchCaseToggleButton.addActionListener(e -> matchCaseChanged());
+			findToolBar.add(matchCaseToggleButton);
+
+			//---- matchWholeWordToggleButton ----
+			matchWholeWordToggleButton.setToolTipText("Match Whole Word");
+			matchWholeWordToggleButton.addActionListener(e -> matchWholeWordChanged());
+			findToolBar.add(matchWholeWordToggleButton);
+
+			//---- regexToggleButton ----
+			regexToggleButton.setToolTipText("Regex");
+			regexToggleButton.addActionListener(e -> regexChanged());
+			findToolBar.add(regexToggleButton);
+		}
+		add(findToolBar, "cell 2 0");
+
+		//---- matchesLabel ----
+		matchesLabel.setEnabled(false);
+		add(matchesLabel, "cell 3 0");
+
+		//======== closeToolBar ========
+		{
+			closeToolBar.setFloatable(false);
+			closeToolBar.setBorder(null);
+
+			//---- closeButton ----
+			closeButton.setToolTipText("Close");
+			closeButton.addActionListener(e -> close());
+			closeToolBar.add(closeButton);
+		}
+		add(closeToolBar, "cell 4 0");
+
+		//---- replaceLabel ----
+		replaceLabel.setText("Replace:");
+		replaceLabel.setDisplayedMnemonic('R');
+		replaceLabel.setLabelFor(replaceField);
+		add(replaceLabel, "cell 0 1");
+
+		//---- replaceField ----
+		replaceField.setColumns(16);
+		add(replaceField, "cell 1 1");
+
+		//======== toolBar1 ========
+		{
+			toolBar1.setFloatable(false);
+			toolBar1.setBorder(null);
+
+			//---- replaceButton ----
+			replaceButton.setText("Replace");
+			replaceButton.setMnemonic('E');
+			replaceButton.addActionListener(e -> replace());
+			toolBar1.add(replaceButton);
+
+			//---- replaceAllButton ----
+			replaceAllButton.setText("Replace All");
+			replaceAllButton.setMnemonic('A');
+			replaceAllButton.addActionListener(e -> replaceAll());
+			toolBar1.add(replaceAllButton);
+		}
+		add(toolBar1, "cell 2 1");
+
+		//---- replaceMatchesLabel ----
+		replaceMatchesLabel.setEnabled(false);
+		add(replaceMatchesLabel, "cell 3 1");
+		// JFormDesigner - End of component initialization  //GEN-END:initComponents
+	}
+
+	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+	private JLabel findLabel;
+	private JTextField findField;
+	private JToolBar findToolBar;
+	private JButton findPreviousButton;
+	private JButton findNextButton;
+	private JToggleButton matchCaseToggleButton;
+	private JToggleButton matchWholeWordToggleButton;
+	private JToggleButton regexToggleButton;
+	private JLabel matchesLabel;
+	private JToolBar closeToolBar;
+	private JButton closeButton;
+	private JLabel replaceLabel;
+	private JTextField replaceField;
+	private JToolBar toolBar1;
+	private JButton replaceButton;
+	private JButton replaceAllButton;
+	private JLabel replaceMatchesLabel;
+	// JFormDesigner - End of variables declaration  //GEN-END:variables
+
+	//---- class MarkAllUpdater -----------------------------------------------
+
+	private class MarkAllUpdater
+		implements DocumentListener
+	{
+		@Override
+		public void insertUpdate( DocumentEvent e ) {
+			markAll();
+		}
+
+		@Override
+		public void removeUpdate( DocumentEvent e ) {
+			markAll();
+		}
+
+		@Override
+		public void changedUpdate( DocumentEvent e ) {
+			markAll();
+		}
+	}
+
+	//---- class ConsumerAction -----------------------------------------------
+
+	private static class ConsumerAction
+		extends AbstractAction
+	{
+		private final Consumer<ActionEvent> consumer;
+
+		ConsumerAction( Consumer<ActionEvent> consumer ) {
+			this.consumer = consumer;
+		}
+
+		@Override
+		public void actionPerformed( ActionEvent e ) {
+			consumer.accept( e );
+		}
+	}
+}

flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatFindReplaceBar.jfd

@@ -0,0 +1,125 @@
+JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
+
+new FormModel {
+	contentType: "form/swing"
+	root: new FormRoot {
+		add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+			"$layoutConstraints": "insets 3 6 3 3,hidemode 3"
+			"$columnConstraints": "[fill][fill]0[fill][grow,fill][fill]"
+			"$rowConstraints": "[]3[]"
+		} ) {
+			name: "this"
+			"focusCycleRoot": true
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "findLabel"
+				"text": "Find:"
+				"displayedMnemonic": 70
+				"labelFor": new FormReference( "findField" )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 0"
+			} )
+			add( new FormComponent( "javax.swing.JTextField" ) {
+				name: "findField"
+				"columns": 16
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "find", false ) )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 0"
+			} )
+			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+				name: "findToolBar"
+				"floatable": false
+				"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "findPreviousButton"
+					"toolTipText": "Previous Occurrence"
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "findPrevious", false ) )
+				} )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "findNextButton"
+					"toolTipText": "Next Occurrence"
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "findNext", false ) )
+				} )
+				add( new FormComponent( "javax.swing.JToolBar$Separator" ) {
+					name: "separator1"
+				} )
+				add( new FormComponent( "javax.swing.JToggleButton" ) {
+					name: "matchCaseToggleButton"
+					"toolTipText": "Match Case"
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "matchCaseChanged", false ) )
+				} )
+				add( new FormComponent( "javax.swing.JToggleButton" ) {
+					name: "matchWholeWordToggleButton"
+					"toolTipText": "Match Whole Word"
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "matchWholeWordChanged", false ) )
+				} )
+				add( new FormComponent( "javax.swing.JToggleButton" ) {
+					name: "regexToggleButton"
+					"toolTipText": "Regex"
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "regexChanged", false ) )
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 2 0"
+			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "matchesLabel"
+				"enabled": false
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 3 0"
+			} )
+			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+				name: "closeToolBar"
+				"floatable": false
+				"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "closeButton"
+					"toolTipText": "Close"
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "close", false ) )
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 4 0"
+			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "replaceLabel"
+				"text": "Replace:"
+				"displayedMnemonic": 82
+				"labelFor": new FormReference( "replaceField" )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 1"
+			} )
+			add( new FormComponent( "javax.swing.JTextField" ) {
+				name: "replaceField"
+				"columns": 16
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 1"
+			} )
+			add( new FormContainer( "javax.swing.JToolBar", new FormLayoutManager( class javax.swing.JToolBar ) ) {
+				name: "toolBar1"
+				"floatable": false
+				"border": sfield com.jformdesigner.model.FormObject NULL_VALUE
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "replaceButton"
+					"text": "Replace"
+					"mnemonic": 69
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "replace", false ) )
+				} )
+				add( new FormComponent( "javax.swing.JButton" ) {
+					name: "replaceAllButton"
+					"text": "Replace All"
+					"mnemonic": 65
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "replaceAll", false ) )
+				} )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 2 1"
+			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "replaceMatchesLabel"
+				"enabled": false
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 3 1"
+			} )
+		}, new FormLayoutConstraints( null ) {
+			"location": new java.awt.Point( 0, 0 )
+			"size": new java.awt.Dimension( 465, 125 )
+		} )
+	}
+}

flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatSyntaxTextArea.java

@@ -17,6 +17,8 @@
 package com.formdev.flatlaf.themeeditor;
 
 import java.awt.Color;
+import java.awt.KeyboardFocusManager;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import javax.swing.text.BadLocationException;
@@ -38,6 +40,9 @@ class FlatSyntaxTextArea
 	private final Map<String, Color> parsedColorsMap = new HashMap<>();
 
 	FlatSyntaxTextArea() {
+		// remove Ctrl+Tab and Ctrl+Shift+Tab focus traversal keys to allow tabbed pane to process them
+		setFocusTraversalKeys( KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, Collections.emptySet() );
+		setFocusTraversalKeys( KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, Collections.emptySet() );
 	}
 
 	boolean isUseColorOfColorTokens() {