release 2.5

~~~java
JButton button = new JButton();
int arc = FlatLaf.getStyleableValue( button, "arc" );
Color borderColor = FlatLaf.getStyleableValue( button, "borderColor" );
~~~

.github/workflows/natives.yml

@@ -9,20 +9,26 @@ on:
         tags:
             - '[0-9]*'
         paths:
-            - 'flatlaf-natives/flatlaf-natives-windows/**'
+            - 'flatlaf-natives/**'
             - '.github/workflows/natives.yml'
             - 'gradle/wrapper/gradle-wrapper.properties'
     pull_request:
         branches:
             - '*'
         paths:
-            - 'flatlaf-natives/flatlaf-natives-windows/**'
+            - 'flatlaf-natives/**'
             - '.github/workflows/natives.yml'
             - 'gradle/wrapper/gradle-wrapper.properties'
 
 jobs:
-    Windows:
-        runs-on: windows-latest
+    Natives:
+        strategy:
+            matrix:
+                os:
+                    - windows
+                    - ubuntu
+
+        runs-on: ${{ matrix.os }}-latest
 
         steps:
             - uses: actions/checkout@v3
@@ -37,14 +43,14 @@ jobs:
                   cache: gradle
 
             - name: Build with Gradle
-              # --no-daemon is necessary on Windows otherwise caching Gradle would fail with: 
+              # --no-daemon is necessary on Windows otherwise caching Gradle would fail with:
               #   tar.exe: Couldn't open ~/.gradle/caches/modules-2/modules-2.lock: Permission denied
-              run: ./gradlew :flatlaf-natives-windows:build-natives --no-daemon
+              run: ./gradlew build-natives --no-daemon
 
             - name: Upload artifacts
               uses: actions/upload-artifact@v3
               with:
-                  name: FlatLaf-natives-windows-build-artifacts
+                  name: FlatLaf-natives-build-artifacts-${{ matrix.os }}
                   path: |
                       flatlaf-core/src/main/resources/com/formdev/flatlaf/natives
-                      flatlaf-natives/flatlaf-natives-windows/build
+                      flatlaf-natives/flatlaf-natives-*/build

CHANGELOG.md

@@ -1,6 +1,41 @@
 FlatLaf Change Log
 ==================
 
+## 2.5
+
+#### New features and improvements
+
+- Linux: Use X11 window manager events to move window and to show window menu
+  (right-click on window title bar), if custom window decorations are enabled.
+  This gives FlatLaf windows a more "native" feeling. (issue #482)
+- MenuBar: Support different menu selection style UI defaults for `MenuBar` and
+  `MenuItem`. (issue #587)
+- MenuBar: Top level menus now use `MenuBar.font` instead of `Menu.font`. (issue
+  #589)
+- PasswordField: Reveal button is now hidden (and turned off) if password field
+  is disabled. (issue #501)
+- TabbedPane: New option to disable tab run rotation in wrap layout. Set UI
+  value `TabbedPane.rotateTabRuns` to `false`. (issue #574)
+- Window decorations:
+  - Added client property to mark components in embedded menu bar as "caption"
+    (allow moving window). (issue #569)
+  - Option to show window icon only in frames, but not in dialogs. Set UI value
+    `TitlePane.showIconInDialogs` to `false`. (issue #589)
+  - Added UI value `TitlePane.font` to customize window title font. (issue #589)
+- Added system property `flatlaf.updateUIOnSystemFontChange` to allow disabling
+  automatic UI update when system font changes. (issue #580)
+
+#### Fixed bugs
+
+- Fixed missing UI value `MenuItem.acceleratorDelimiter` on macOS. (was `null`,
+  is now an empty string)
+- Fixed possible exception in `FlatUIUtils.resetRenderingHints()`. (issue #575)
+- Fixed AWT components on macOS, which use Swing components internally. (issue
+  #583)
+- SwingX: Fixed missing highlighting of "today" in `JXMonthView` and
+  `JXDatePicker`.
+
+
 ## 2.4
 
 #### New features and improvements

build.gradle.kts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-val releaseVersion = "2.4"
-val developmentVersion = "2.5-SNAPSHOT"
+val releaseVersion = "2.5"
+val developmentVersion = "3.0-SNAPSHOT"
 
 version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
 

buildSrc/src/main/kotlin/flatlaf-cpp-library.gradle.kts

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 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.
+ */
+
+plugins {
+	`cpp-library`
+}
+
+library {
+	// disable debuggable for release builds to make shared libraries smaller
+	binaries.configureEach( CppSharedLibrary::class ) {
+		with( compileTask.get() ) {
+			if( name.contains( "Release" ) )
+				isDebuggable = false
+		}
+		with( linkTask.get() ) {
+			if( name.contains( "Release" ) )
+				debuggable.set( false )
+		}
+	}
+}
+
+tasks {
+	withType<CppCompile>().configureEach {
+		doFirst {
+			println( "Used Tool Chain:" )
+			println( "  - ${toolChain.get()}" )
+			println( "Available Tool Chains:" )
+			toolChains.forEach {
+				println( "  - $it" )
+			}
+		}
+	}
+}

buildSrc/src/main/kotlin/flatlaf-jni-headers.gradle.kts

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 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.
+ */
+
+open class JniHeadersExtension {
+	var headers: List<String> = emptyList()
+}
+
+val extension = project.extensions.create<JniHeadersExtension>( "flatlafJniHeaders" )
+
+
+tasks {
+	register<Copy>( "jni-headers" ) {
+		// depend on :flatlaf-core:compileJava because it generates the JNI headers
+		dependsOn( ":flatlaf-core:compileJava" )
+
+		from( project( ":flatlaf-core" ).buildDir.resolve( "generated/jni-headers" ) )
+		into( "src/main/headers" )
+		include( extension.headers )
+		filter<org.apache.tools.ant.filters.FixCrLfFilter>(
+			"eol" to org.apache.tools.ant.filters.FixCrLfFilter.CrLf.newInstance( "lf" )
+		)
+	}
+}

flatlaf-core/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
 	testRuntimeOnly( "org.junit.jupiter:junit-jupiter-engine" )
 
 	// https://github.com/jtulach/netbeans-apitest
-	sigtest( "org.netbeans.tools:sigtest-maven-plugin:1.4" )
+	sigtest( "org.netbeans.tools:sigtest-maven-plugin:1.7" )
 }
 
 java {
@@ -66,6 +66,9 @@ tasks {
 	test {
 		useJUnitPlatform()
 		testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+
+		if( JavaVersion.current() >= JavaVersion.VERSION_1_9 )
+			jvmArgs( listOf( "--add-opens", "java.desktop/javax.swing.plaf.basic=ALL-UNNAMED" ) )
 	}
 
 	register( "sigtestGenerate" ) {

flatlaf-core/flatlaf-core-sigtest.txt

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 2.3
+#Version 2.4
 
 CLSS public abstract interface com.formdev.flatlaf.FlatClientProperties
 fld public final static java.lang.String BUTTON_TYPE = "JButton.buttonType"
@@ -220,7 +220,7 @@ meth public void setExtraDefaults(java.util.Map<java.lang.String,java.lang.Strin
 meth public void uninitialize()
 meth public void unregisterUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
 supr javax.swing.plaf.basic.BasicLookAndFeel
-hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,subMenuUsabilityHelper,uiDefaultsGetters,updateUIPending
+hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,subMenuUsabilityHelperInstalled,uiDefaultsGetters,updateUIPending
 hcls ActiveFont,FlatUIDefaults,ImageIconUIResource
 
 CLSS public abstract interface static com.formdev.flatlaf.FlatLaf$DisabledIconProvider

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

@@ -253,6 +253,19 @@ public interface FlatClientProperties
 	 */
 	String COMPONENT_FOCUS_OWNER = "JComponent.focusOwner";
 
+	/**
+	 * Specifies whether a component in an embedded menu bar should behave as caption
+	 * (left-click allows moving window, right-click shows window system menu).
+	 * The component does not receive mouse pressed/released/clicked/dragged events,
+	 * but it gets mouse entered/exited/moved events.
+	 * <p>
+	 * <strong>Component</strong> {@link javax.swing.JComponent}<br>
+	 * <strong>Value type</strong> {@link java.lang.Boolean}
+	 *
+	 * @since 2.5
+	 */
+	String COMPONENT_TITLE_BAR_CAPTION = "JComponent.titleBarCaption";
+
 	//---- Popup --------------------------------------------------------------
 
 	/**

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

@@ -34,6 +34,8 @@ public class FlatDarculaLaf
 	/**
 	 * Sets the application look and feel to this LaF
 	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 *
+	 * @since 1.2
 	 */
 	public static boolean setup() {
 		return setup( new FlatDarculaLaf() );

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

@@ -33,6 +33,8 @@ public class FlatDarkLaf
 	/**
 	 * Sets the application look and feel to this LaF
 	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 *
+	 * @since 1.2
 	 */
 	public static boolean setup() {
 		return setup( new FlatDarkLaf() );

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

@@ -34,6 +34,8 @@ public class FlatIntelliJLaf
 	/**
 	 * Sets the application look and feel to this LaF
 	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 *
+	 * @since 1.2
 	 */
 	public static boolean setup() {
 		return setup( new FlatIntelliJLaf() );

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

@@ -30,6 +30,9 @@ import java.awt.image.ImageProducer;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
@@ -63,6 +66,7 @@ import javax.swing.UIDefaults.LazyValue;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.IconUIResource;
 import javax.swing.plaf.UIResource;
@@ -73,6 +77,7 @@ import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
 import com.formdev.flatlaf.ui.FlatPopupFactory;
 import com.formdev.flatlaf.ui.FlatRootPaneUI;
 import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.GrayFilter;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.MultiResolutionImageSupport;
@@ -111,6 +116,8 @@ public abstract class FlatLaf
 	/**
 	 * Sets the application look and feel to the given LaF
 	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 *
+	 * @since 1.2
 	 */
 	public static boolean setup( LookAndFeel newLookAndFeel ) {
 		try {
@@ -274,6 +281,9 @@ public abstract class FlatLaf
 		}
 		if( desktopPropertyName != null ) {
 			desktopPropertyListener = e -> {
+				if( !FlatSystemProperties.getBoolean( FlatSystemProperties.UPDATE_UI_ON_SYSTEM_FONT_CHANGE, true ) )
+					return;
+
 				String propertyName = e.getPropertyName();
 				if( desktopPropertyName.equals( propertyName ) || propertyName.equals( desktopPropertyName2 ) )
 					reSetLookAndFeel();
@@ -571,6 +581,7 @@ public abstract class FlatLaf
 
 		// add fonts that are not set in BasicLookAndFeel
 		defaults.put( "RootPane.font", activeFont );
+		defaults.put( "TitlePane.font", activeFont );
 	}
 
 	private void initDefaultFont( UIDefaults defaults ) {
@@ -1225,6 +1236,62 @@ public abstract class FlatLaf
 	 */
 	public static final Object NULL_VALUE = new Object();
 
+	/**
+	 * Returns information about styleable values of a component.
+	 * <p>
+	 * This is equivalent to: {@code ((StyleableUI)c.getUI()).getStyleableInfos(c)}
+	 *
+	 * @since 2.5
+	 */
+	public static Map<String, Class<?>> getStyleableInfos( JComponent c ) {
+		StyleableUI ui = getStyleableUI( c );
+		return (ui != null) ? ui.getStyleableInfos( c ) : null;
+	}
+
+	/**
+	 * Returns the (styled) value for the given key from the given component.
+	 * <p>
+	 * This is equivalent to: {@code ((StyleableUI)c.getUI()).getStyleableValue(c, key)}
+	 *
+	 * @since 2.5
+	 */
+	@SuppressWarnings( "unchecked" )
+	public static <T> T getStyleableValue( JComponent c, String key ) {
+		StyleableUI ui = getStyleableUI( c );
+		return (ui != null) ? (T) ui.getStyleableValue( c, key ) : null;
+	}
+
+	private static StyleableUI getStyleableUI( JComponent c ) {
+		if( !getUIMethodInitialized ) {
+			getUIMethodInitialized = true;
+
+			if( SystemInfo.isJava_9_orLater ) {
+				try {
+					// JComponent.getUI() is available since Java 9
+					getUIMethod = MethodHandles.lookup().findVirtual( JComponent.class, "getUI",
+						MethodType.methodType( ComponentUI.class ) );
+				} catch( Exception ex ) {
+					// ignore
+				}
+			}
+		}
+
+		try {
+			Object ui;
+			if( getUIMethod != null )
+				ui = getUIMethod.invoke( c );
+			else
+				ui = c.getClass().getMethod( "getUI" ).invoke( c );
+			return (ui instanceof StyleableUI) ? (StyleableUI) ui : null;
+		} catch( Throwable ex ) {
+			// ignore
+			return null;
+		}
+	}
+
+	private static boolean getUIMethodInitialized;
+	private static MethodHandle getUIMethod;
+
 	//---- class FlatUIDefaults -----------------------------------------------
 
 	private class FlatUIDefaults

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

@@ -33,6 +33,8 @@ public class FlatLightLaf
 	/**
 	 * Sets the application look and feel to this LaF
 	 * using {@link UIManager#setLookAndFeel(javax.swing.LookAndFeel)}.
+	 *
+	 * @since 1.2
 	 */
 	public static boolean setup() {
 		return setup( new FlatLightLaf() );

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

@@ -16,6 +16,7 @@
 
 package com.formdev.flatlaf;
 
+import javax.swing.SwingUtilities;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -139,6 +140,20 @@ public interface FlatSystemProperties
 	 */
 	String USE_TEXT_Y_CORRECTION = "flatlaf.useTextYCorrection";
 
+	/**
+	 * Specifies whether FlatLaf updates the UI when the system font changes.
+	 * If {@code true}, {@link SwingUtilities#updateComponentTreeUI(java.awt.Component)}
+	 * gets invoked for all windows if the system font has changed.
+	 * This is the similar to when switching to another look and feel (theme).
+	 * Applications that do not work correctly when switching look and feel,
+	 * should disable this option to avoid corrupted UI.
+	 * <p>
+	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
+	 * <strong>Default</strong> {@code true}
+	 * @since 2.5
+	 */
+	String UPDATE_UI_ON_SYSTEM_FONT_CHANGE = "flatlaf.updateUIOnSystemFontChange";
+
 	/**
 	 * Specifies a directory in which the native FlatLaf library have been extracted.
 	 * The path can be absolute or relative to current application working directory.

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

@@ -73,6 +73,8 @@ public class IntelliJTheme
 	 *
 	 * The input stream is automatically closed.
 	 * Using a buffered input stream is not necessary.
+	 *
+	 * @since 1.2
 	 */
 	public static boolean setup( InputStream in ) {
 		try {

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

@@ -312,7 +312,7 @@ debug*/
 			if( window instanceof RootPaneContainer ) {
 				JLayeredPane layeredPane = ((RootPaneContainer)window).getLayeredPane();
 				setSize( layeredPane.getSize() );
-				layeredPane.add( this, new Integer( JLayeredPane.POPUP_LAYER + 1 ) );
+				layeredPane.add( this, Integer.valueOf( JLayeredPane.POPUP_LAYER + 1 ) );
 			}
 		}
 

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

@@ -1052,7 +1052,7 @@ class UIDefaultsLoader
 	 *                 the alpha of this color is used as weight to mix the two colors
 	 *   - background: a background color (e.g. #f00) or a color function
 	 */
-	private static Object parseColorOver( List<String> params, Function<String, String> resolver, boolean reportError ) {
+	private static ColorUIResource parseColorOver( List<String> params, Function<String, String> resolver, boolean reportError ) {
 		String foregroundStr = params.get( 0 );
 		String backgroundStr = params.get( 1 );
 
@@ -1061,7 +1061,8 @@ class UIDefaultsLoader
 		if( foreground == null || foreground.getAlpha() == 255 )
 			return foreground;
 
-		Color foreground2 = new Color( foreground.getRGB() );
+		// foreground color without alpha
+		ColorUIResource foreground2 = new ColorUIResource( foreground.getRGB() );
 
 		// parse background color
 		ColorUIResource background = (ColorUIResource) parseColorOrFunction( resolver.apply( backgroundStr ), resolver, reportError );

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

@@ -49,6 +49,14 @@ public class FlatCapsLockIcon
 		}
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		switch( key ) {
+			case "capsLockIconColor": return color;
+			default: return null;
+		}
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
 		/*

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

@@ -172,6 +172,11 @@ public class FlatCheckBoxIcon
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
 		boolean indeterminate = isIndeterminate( c );

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

@@ -59,6 +59,11 @@ public class FlatCheckBoxMenuItemIcon
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g2 ) {
 		boolean selected = (c instanceof AbstractButton) && ((AbstractButton)c).isSelected();

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

@@ -69,6 +69,11 @@ public class FlatClearIcon
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
 		if( !ignoreButtonState && c instanceof AbstractButton ) {

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

@@ -84,6 +84,11 @@ public class FlatHelpButtonIcon
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g2 ) {
 		/*

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

@@ -61,6 +61,11 @@ public class FlatMenuArrowIcon
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
 		if( c != null && !c.getComponentOrientation().isLeftToRight() )

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

@@ -67,6 +67,11 @@ public class FlatSearchIcon
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
 		/*

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

@@ -76,6 +76,11 @@ public class FlatTabbedPaneCloseIcon
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
 		// paint background

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

@@ -101,6 +101,12 @@ public class FlatBorder
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 		Graphics2D g2 = (Graphics2D) g.create();

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

@@ -181,7 +181,7 @@ public class FlatButtonUI
 	private AtomicBoolean borderShared;
 
 	public static ComponentUI createUI( JComponent c ) {
-		return FlatUIUtils.canUseSharedUI( c )
+		return FlatUIUtils.canUseSharedUI( c ) && !FlatUIUtils.needsLightAWTPeer( c )
 			? FlatUIUtils.createSharedUI( FlatButtonUI.class, () -> new FlatButtonUI( true ) )
 			: new FlatButtonUI( false );
 	}
@@ -193,6 +193,13 @@ public class FlatButtonUI
 
 	@Override
 	public void installUI( JComponent c ) {
+		if( FlatUIUtils.needsLightAWTPeer( c ) )
+			FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> installUIImpl( c ) );
+		else
+			installUIImpl( c );
+	}
+
+	private void installUIImpl( JComponent c ) {
 		super.installUI( c );
 
 		installStyle( (AbstractButton) c );
@@ -366,6 +373,18 @@ public class FlatButtonUI
 		return infos;
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		if( key.startsWith( "help." ) ) {
+			return (helpButtonIcon instanceof FlatHelpButtonIcon)
+				? ((FlatHelpButtonIcon)helpButtonIcon).getStyleableValue( key.substring( "help.".length() ) )
+				: null;
+		}
+
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, c.getBorder(), key );
+	}
+
 	static boolean isContentAreaFilled( Component c ) {
 		return !(c instanceof AbstractButton) || ((AbstractButton)c).isContentAreaFilled();
 	}
@@ -617,6 +636,9 @@ public class FlatButtonUI
 	}
 
 	protected Color getBackgroundBase( JComponent c, boolean def ) {
+		if( FlatUIUtils.isAWTPeer( c ) )
+			return background;
+
 		// use component background if explicitly set
 		Color bg = c.getBackground();
 		if( isCustomBackground( bg ) )

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

@@ -16,18 +16,20 @@
 
 package com.formdev.flatlaf.ui;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.beans.PropertyChangeListener;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicCheckBoxMenuItemUI;
+import javax.swing.plaf.basic.BasicMenuItemUI;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
-import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException;
 import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
@@ -58,9 +60,15 @@ import com.formdev.flatlaf.util.LoggingFacade;
  *
  * @author Karl Tauber
  */
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionBackground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="disabledForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorSelectionForeground" )
+
 public class FlatCheckBoxMenuItemUI
 	extends BasicCheckBoxMenuItemUI
-	implements StyleableUI
+	implements StyleableUI, StyleableLookupProvider
 {
 	private FlatMenuItemRenderer renderer;
 	private Map<String, Object> oldStyleValues;
@@ -119,29 +127,27 @@ public class FlatCheckBoxMenuItemUI
 
 	/** @since 2 */
 	protected Object applyStyleProperty( String key, Object value ) {
-		try {
-			return renderer.applyStyleProperty( key, value );
-		} catch ( UnknownStyleException ex ) {
-			// ignore
-		}
-
-		Object oldValue;
-		switch( key ) {
-			// BasicMenuItemUI
-			case "selectionBackground": oldValue = selectionBackground; selectionBackground = (Color) value; return oldValue;
-			case "selectionForeground": oldValue = selectionForeground; selectionForeground = (Color) value; return oldValue;
-			case "disabledForeground": oldValue = disabledForeground; disabledForeground = (Color) value; return oldValue;
-			case "acceleratorForeground": oldValue = acceleratorForeground; acceleratorForeground = (Color) value; return oldValue;
-			case "acceleratorSelectionForeground": oldValue = acceleratorSelectionForeground; acceleratorSelectionForeground = (Color) value; return oldValue;
-		}
-
-		return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, menuItem, key, value );
+		return FlatMenuItemUI.applyStyleProperty( menuItem, this, renderer, key, value );
 	}
 
 	/** @since 2 */
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
-		return FlatMenuItemUI.getStyleableInfos( renderer );
+		return FlatMenuItemUI.getStyleableInfos( this, renderer );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatMenuItemUI.getStyleableValue( this, renderer, key );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public MethodHandles.Lookup getLookupForStyling() {
+		// MethodHandles.lookup() is caller sensitive and must be invoked in this class,
+		// otherwise it is not possible to access protected fields in JRE superclass
+		return MethodHandles.lookup();
 	}
 
 	@Override

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

@@ -43,7 +43,7 @@ public class FlatCheckBoxUI
 	extends FlatRadioButtonUI
 {
 	public static ComponentUI createUI( JComponent c ) {
-		return FlatUIUtils.canUseSharedUI( c )
+		return FlatUIUtils.canUseSharedUI( c ) && !FlatUIUtils.needsLightAWTPeer( c )
 			? FlatUIUtils.createSharedUI( FlatCheckBoxUI.class, () -> new FlatCheckBoxUI( true ) )
 			: new FlatCheckBoxUI( false );
 	}

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

@@ -42,6 +42,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeListener;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.swing.AbstractAction;
@@ -70,6 +71,8 @@ import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
 import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.SystemInfo;
@@ -117,9 +120,11 @@ import com.formdev.flatlaf.util.SystemInfo;
  *
  * @author Karl Tauber
  */
+@StyleableField( cls=BasicComboBoxUI.class, key="padding" )
+
 public class FlatComboBoxUI
 	extends BasicComboBoxUI
-	implements StyleableUI
+	implements StyleableUI, StyleableLookupProvider
 {
 	@Styleable protected int minimumWidth;
 	@Styleable protected int editorColumns;
@@ -127,6 +132,7 @@ public class FlatComboBoxUI
 	@Styleable protected String arrowType;
 	protected boolean isIntelliJTheme;
 
+	private Color background;
 	@Styleable protected Color editableBackground;
 	@Styleable protected Color focusedBackground;
 	@Styleable protected Color disabledBackground;
@@ -160,6 +166,13 @@ public class FlatComboBoxUI
 
 	@Override
 	public void installUI( JComponent c ) {
+		if( FlatUIUtils.needsLightAWTPeer( c ) )
+			FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> installUIImpl( c ) );
+		else
+			installUIImpl( c );
+	}
+
+	private void installUIImpl( JComponent c ) {
 		super.installUI( c );
 
 		installStyle();
@@ -222,6 +235,7 @@ public class FlatComboBoxUI
 		arrowType = UIManager.getString( "Component.arrowType" );
 		isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" );
 
+		background = UIManager.getColor( "ComboBox.background" );
 		editableBackground = UIManager.getColor( "ComboBox.editableBackground" );
 		focusedBackground = UIManager.getColor( "ComboBox.focusedBackground" );
 		disabledBackground = UIManager.getColor( "ComboBox.disabledBackground" );
@@ -254,6 +268,7 @@ public class FlatComboBoxUI
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();
 
+		background = null;
 		editableBackground = null;
 		focusedBackground = null;
 		disabledBackground = null;
@@ -491,13 +506,6 @@ public class FlatComboBoxUI
 
 	/** @since 2 */
 	protected Object applyStyleProperty( String key, Object value ) {
-		// BasicComboBoxUI
-		if( key.equals( "padding" ) ) {
-			Object oldValue = padding;
-			padding = (Insets) value;
-			return oldValue;
-		}
-
 		if( borderShared == null )
 			borderShared = new AtomicBoolean( true );
 		return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, comboBox, borderShared );
@@ -506,11 +514,21 @@ public class FlatComboBoxUI
 	/** @since 2 */
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
-		Map<String, Class<?>> infos = new FlatStylingSupport.StyleableInfosMap<>();
-		infos.put( "padding", Insets.class );
-		FlatStylingSupport.collectAnnotatedStyleableInfos( this, infos );
-		FlatStylingSupport.collectStyleableInfos( comboBox.getBorder(), infos );
-		return infos;
+		return FlatStylingSupport.getAnnotatedStyleableInfos( this, comboBox.getBorder() );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, comboBox.getBorder(), key );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public MethodHandles.Lookup getLookupForStyling() {
+		// MethodHandles.lookup() is caller sensitive and must be invoked in this class,
+		// otherwise it is not possible to access protected fields in JRE superclass
+		return MethodHandles.lookup();
 	}
 
 	@Override
@@ -623,6 +641,9 @@ public class FlatComboBoxUI
 
 	protected Color getBackground( boolean enabled ) {
 		if( enabled ) {
+			if( FlatUIUtils.isAWTPeer( comboBox ) )
+				return background;
+
 			Color background = comboBox.getBackground();
 
 			// always use explicitly set color

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

@@ -107,6 +107,12 @@ public class FlatDropShadowBorder
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 		if( shadowSize <= 0 )

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

@@ -209,6 +209,12 @@ public class FlatEditorPaneUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	private void updateBackground() {
 		FlatTextFieldUI.updateBackground( getComponent(), background,
 			disabledBackground, inactiveBackground,

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

@@ -76,4 +76,9 @@ public class FlatEmptyBorder
 		right = insets.right;
 		return oldInsets;
 	}
+
+	/** @since 2.5 */
+	public Insets getStyleableValue() {
+		return new Insets( top, left, bottom, right );
+	}
 }

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

@@ -151,9 +151,9 @@ import com.formdev.flatlaf.util.UIScale;
  *
  * @uiDefault FileChooser.shortcuts.buttonSize					Dimension	optional; default is 84,64
  * @uiDefault FileChooser.shortcuts.iconSize					Dimension	optional; default is 32,32
- * @uiDefault FileChooser.shortcuts.filesFunction				Function<File[], File[]>
- * @uiDefault FileChooser.shortcuts.displayNameFunction			Function<File, String>
- * @uiDefault FileChooser.shortcuts.iconFunction				Function<File, Icon>
+ * @uiDefault FileChooser.shortcuts.filesFunction				Function&lt;File[], File[]&gt;
+ * @uiDefault FileChooser.shortcuts.displayNameFunction			Function&lt;File, String&gt;
+ * @uiDefault FileChooser.shortcuts.iconFunction				Function&lt;File, Icon&gt;
  *
  * @author Karl Tauber
  */

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

@@ -179,6 +179,12 @@ public class FlatInternalFrameUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, frame.getBorder() );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, frame.getBorder(), key );
+	}
+
 	@Override
 	public void update( Graphics g, JComponent c ) {
 		// The internal frame actually should be opaque and fill its background,
@@ -253,6 +259,23 @@ public class FlatInternalFrameUI
 			return infos;
 		}
 
+		/** @since 2.5 */
+		@Override
+		public Object getStyleableValue( String key ) {
+			switch( key ) {
+				case "borderMargins": return getStyleableValue();
+
+				case "activeDropShadowColor": return activeDropShadowBorder.getStyleableValue( "shadowColor" );
+				case "activeDropShadowInsets": return activeDropShadowBorder.getStyleableValue( "shadowInsets" );
+				case "activeDropShadowOpacity": return activeDropShadowBorder.getStyleableValue( "shadowOpacity" );
+				case "inactiveDropShadowColor": return inactiveDropShadowBorder.getStyleableValue( "shadowColor" );
+				case "inactiveDropShadowInsets": return inactiveDropShadowBorder.getStyleableValue( "shadowInsets" );
+				case "inactiveDropShadowOpacity": return inactiveDropShadowBorder.getStyleableValue( "shadowOpacity" );
+			}
+
+			return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+		}
+
 		@Override
 		public Insets getBorderInsets( Component c, Insets insets ) {
 			if( c instanceof JInternalFrame && ((JInternalFrame)c).isMaximum() ) {

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

@@ -158,6 +158,12 @@ public class FlatLabelUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	/**
 	 * Checks whether text contains HTML tags that use "absolute-size" keywords
 	 * (e.g. "x-large") for font-size in default style sheet

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

@@ -90,6 +90,13 @@ public class FlatListUI
 
 	@Override
 	public void installUI( JComponent c ) {
+		if( FlatUIUtils.needsLightAWTPeer( c ) )
+			FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> installUIImpl( c ) );
+		else
+			installUIImpl( c );
+	}
+
+	private void installUIImpl( JComponent c ) {
 		super.installUI( c );
 
 		installStyle();
@@ -209,6 +216,12 @@ public class FlatListUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	/**
 	 * Toggle selection colors from focused to inactive and vice versa.
 	 *

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

@@ -51,6 +51,12 @@ public class FlatMenuBarBorder
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 		if( !showBottomSeparator( c ) )

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

@@ -76,6 +76,8 @@ public class FlatMenuBarUI
 
 	// used in FlatMenuUI
 	/** @since 2 */ @Styleable protected Color hoverBackground;
+	/** @since 2.5 */ @Styleable protected Color selectionBackground;
+	/** @since 2.5 */ @Styleable protected Color selectionForeground;
 	/** @since 2 */ @Styleable protected Color underlineSelectionBackground;
 	/** @since 2 */ @Styleable protected Color underlineSelectionColor;
 	/** @since 2 */ @Styleable protected int underlineSelectionHeight = -1;
@@ -174,6 +176,12 @@ public class FlatMenuBarUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, menuBar.getBorder() );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, menuBar.getBorder(), key );
+	}
+
 	@Override
 	public void update( Graphics g, JComponent c ) {
 		// paint background

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

@@ -97,6 +97,7 @@ public class FlatMenuItemRenderer
 	@Styleable protected int underlineSelectionHeight = UIManager.getInt( "MenuItem.underlineSelectionHeight" );
 
 	private boolean iconsShared = true;
+	private final Font menuFont = UIManager.getFont( "Menu.font" );
 
 	protected FlatMenuItemRenderer( JMenuItem menuItem, Icon checkIcon, Icon arrowIcon,
 		Font acceleratorFont, String acceleratorDelimiter )
@@ -169,6 +170,19 @@ public class FlatMenuItemRenderer
 		return infos;
 	}
 
+	/** @since 2.5 */
+	public Object getStyleableValue( String key ) {
+		if( key.startsWith( "icon." ) ) {
+			String key2 = key.substring( "icon.".length() );
+			if( checkIcon instanceof FlatCheckBoxMenuItemIcon )
+				return ((FlatCheckBoxMenuItemIcon)checkIcon).getStyleableValue( key2 );
+			if( arrowIcon instanceof FlatMenuArrowIcon )
+				return ((FlatMenuArrowIcon)arrowIcon).getStyleableValue( key2 );
+		}
+
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	protected Dimension getPreferredMenuItemSize() {
 		int width = 0;
 		int height = 0;
@@ -180,7 +194,8 @@ public class FlatMenuItemRenderer
 
 		// layout icon and text
 		SwingUtilities.layoutCompoundLabel( menuItem,
-			menuItem.getFontMetrics( menuItem.getFont() ), menuItem.getText(), getIconForLayout(),
+			menuItem.getFontMetrics( isTopLevelMenu ? getTopLevelFont() : menuItem.getFont() ),
+			menuItem.getText(), getIconForLayout(),
 			menuItem.getVerticalAlignment(), menuItem.getHorizontalAlignment(),
 			menuItem.getVerticalTextPosition(), menuItem.getHorizontalTextPosition(),
 			viewRect, iconRect, textRect, scale( menuItem.getIconTextGap() ) );
@@ -282,7 +297,8 @@ public class FlatMenuItemRenderer
 
 		// layout icon and text
 		SwingUtilities.layoutCompoundLabel( menuItem,
-			menuItem.getFontMetrics( menuItem.getFont() ), menuItem.getText(), getIconForLayout(),
+			menuItem.getFontMetrics( isTopLevelMenu ? getTopLevelFont() : menuItem.getFont() ),
+			menuItem.getText(), getIconForLayout(),
 			menuItem.getVerticalAlignment(), menuItem.getHorizontalAlignment(),
 			menuItem.getVerticalTextPosition(), menuItem.getHorizontalTextPosition(),
 			labelRect, iconRect, textRect, scale( menuItem.getIconTextGap() ) );
@@ -392,9 +408,10 @@ debug*/
 		}
 
 		int mnemonicIndex = FlatLaf.isShowMnemonics() ? menuItem.getDisplayedMnemonicIndex() : -1;
-		Color foreground = (isTopLevelMenu( menuItem ) ? menuItem.getParent() : menuItem).getForeground();
+		boolean isTopLevelMenu = isTopLevelMenu( menuItem );
+		Color foreground = (isTopLevelMenu ? menuItem.getParent() : menuItem).getForeground();
 
-		paintText( g, menuItem, textRect, text, mnemonicIndex, menuItem.getFont(),
+		paintText( g, menuItem, textRect, text, mnemonicIndex, isTopLevelMenu ? getTopLevelFont() : menuItem.getFont(),
 			foreground, isUnderlineSelection() ? foreground : selectionForeground, disabledForeground );
 	}
 
@@ -481,6 +498,11 @@ debug*/
 		return "underline".equals( UIManager.getString( "MenuItem.selectionType" ) );
 	}
 
+	private Font getTopLevelFont() {
+		Font font = menuItem.getFont();
+		return (font != menuFont) ? font : menuItem.getParent().getFont();
+	}
+
 	private Icon getIconForPainting() {
 		Icon icon = menuItem.getIcon();
 

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

@@ -16,16 +16,19 @@
 
 package com.formdev.flatlaf.ui;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.beans.PropertyChangeListener;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import javax.swing.Icon;
 import javax.swing.JComponent;
+import javax.swing.JMenuItem;
 import javax.swing.LookAndFeel;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicMenuItemUI;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException;
 import com.formdev.flatlaf.util.LoggingFacade;
@@ -58,9 +61,15 @@ import com.formdev.flatlaf.util.LoggingFacade;
  *
  * @author Karl Tauber
  */
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionBackground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="disabledForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorSelectionForeground" )
+
 public class FlatMenuItemUI
 	extends BasicMenuItemUI
-	implements StyleableUI
+	implements StyleableUI, StyleableLookupProvider
 {
 	private FlatMenuItemRenderer renderer;
 	private Map<String, Object> oldStyleValues;
@@ -119,42 +128,54 @@ public class FlatMenuItemUI
 
 	/** @since 2 */
 	protected Object applyStyleProperty( String key, Object value ) {
+		return applyStyleProperty( menuItem, this, renderer, key, value );
+	}
+
+	static Object applyStyleProperty( JMenuItem menuItem, BasicMenuItemUI ui,
+		FlatMenuItemRenderer renderer, String key, Object value )
+	{
 		try {
 			return renderer.applyStyleProperty( key, value );
 		} catch ( UnknownStyleException ex ) {
 			// ignore
 		}
 
-		Object oldValue;
-		switch( key ) {
-			// BasicMenuItemUI
-			case "selectionBackground": oldValue = selectionBackground; selectionBackground = (Color) value; return oldValue;
-			case "selectionForeground": oldValue = selectionForeground; selectionForeground = (Color) value; return oldValue;
-			case "disabledForeground": oldValue = disabledForeground; disabledForeground = (Color) value; return oldValue;
-			case "acceleratorForeground": oldValue = acceleratorForeground; acceleratorForeground = (Color) value; return oldValue;
-			case "acceleratorSelectionForeground": oldValue = acceleratorSelectionForeground; acceleratorSelectionForeground = (Color) value; return oldValue;
-		}
-
-		return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, menuItem, key, value );
+		return FlatStylingSupport.applyToAnnotatedObjectOrComponent( ui, menuItem, key, value );
 	}
 
 	/** @since 2 */
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
-		return getStyleableInfos( renderer );
+		return getStyleableInfos( this, renderer );
 	}
 
-	static Map<String, Class<?>> getStyleableInfos( FlatMenuItemRenderer renderer ) {
-		Map<String, Class<?>> infos = new FlatStylingSupport.StyleableInfosMap<>();
-		infos.put( "selectionBackground", Color.class );
-		infos.put( "selectionForeground", Color.class );
-		infos.put( "disabledForeground", Color.class );
-		infos.put( "acceleratorForeground", Color.class );
-		infos.put( "acceleratorSelectionForeground", Color.class );
+	static Map<String, Class<?>> getStyleableInfos( BasicMenuItemUI ui, FlatMenuItemRenderer renderer ) {
+		Map<String, Class<?>> infos = FlatStylingSupport.getAnnotatedStyleableInfos( ui );
 		infos.putAll( renderer.getStyleableInfos() );
 		return infos;
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return getStyleableValue( this, renderer, key );
+	}
+
+	static Object getStyleableValue( BasicMenuItemUI ui, FlatMenuItemRenderer renderer, String key ) {
+		Object value = renderer.getStyleableValue( key );
+		if( value == null )
+			value = FlatStylingSupport.getAnnotatedStyleableValue( ui, key );
+		return value;
+	}
+
+	/** @since 2.5 */
+	@Override
+	public MethodHandles.Lookup getLookupForStyling() {
+		// MethodHandles.lookup() is caller sensitive and must be invoked in this class,
+		// otherwise it is not possible to access protected fields in JRE superclass
+		return MethodHandles.lookup();
+	}
+
 	@Override
 	protected Dimension getPreferredMenuItemSize( JComponent c, Icon checkIcon, Icon arrowIcon, int defaultTextIconGap ) {
 		return renderer.getPreferredMenuItemSize();

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

@@ -20,8 +20,10 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeListener;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import java.util.function.Function;
 import javax.swing.ButtonModel;
@@ -35,9 +37,11 @@ import javax.swing.UIManager;
 import javax.swing.event.MouseInputListener;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.MenuBarUI;
+import javax.swing.plaf.basic.BasicMenuItemUI;
 import javax.swing.plaf.basic.BasicMenuUI;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
-import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException;
 import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
@@ -72,15 +76,23 @@ import com.formdev.flatlaf.util.LoggingFacade;
  * <!-- FlatMenuRenderer -->
  *
  * @uiDefault MenuBar.hoverBackground								Color
+ * @uiDefault MenuBar.selectionBackground							Color
+ * @uiDefault MenuBar.selectionForeground							Color
  * @uiDefault MenuBar.underlineSelectionBackground					Color
  * @uiDefault MenuBar.underlineSelectionColor						Color
  * @uiDefault MenuBar.underlineSelectionHeight						int
  *
  * @author Karl Tauber
  */
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionBackground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="disabledForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorSelectionForeground" )
+
 public class FlatMenuUI
 	extends BasicMenuUI
-	implements StyleableUI
+	implements StyleableUI, StyleableLookupProvider
 {
 	private FlatMenuItemRenderer renderer;
 	private Map<String, Object> oldStyleValues;
@@ -166,29 +178,27 @@ public class FlatMenuUI
 
 	/** @since 2 */
 	protected Object applyStyleProperty( String key, Object value ) {
-		try {
-			return renderer.applyStyleProperty( key, value );
-		} catch ( UnknownStyleException ex ) {
-			// ignore
-		}
-
-		Object oldValue;
-		switch( key ) {
-			// BasicMenuItemUI
-			case "selectionBackground": oldValue = selectionBackground; selectionBackground = (Color) value; return oldValue;
-			case "selectionForeground": oldValue = selectionForeground; selectionForeground = (Color) value; return oldValue;
-			case "disabledForeground": oldValue = disabledForeground; disabledForeground = (Color) value; return oldValue;
-			case "acceleratorForeground": oldValue = acceleratorForeground; acceleratorForeground = (Color) value; return oldValue;
-			case "acceleratorSelectionForeground": oldValue = acceleratorSelectionForeground; acceleratorSelectionForeground = (Color) value; return oldValue;
-		}
-
-		return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, menuItem, key, value );
+		return FlatMenuItemUI.applyStyleProperty( menuItem, this, renderer, key, value );
 	}
 
 	/** @since 2 */
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
-		return FlatMenuItemUI.getStyleableInfos( renderer );
+		return FlatMenuItemUI.getStyleableInfos( this, renderer );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatMenuItemUI.getStyleableValue( this, renderer, key );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public MethodHandles.Lookup getLookupForStyling() {
+		// MethodHandles.lookup() is caller sensitive and must be invoked in this class,
+		// otherwise it is not possible to access protected fields in JRE superclass
+		return MethodHandles.lookup();
 	}
 
 	@Override
@@ -216,6 +226,8 @@ public class FlatMenuUI
 		extends FlatMenuItemRenderer
 	{
 		protected Color hoverBackground = UIManager.getColor( "MenuBar.hoverBackground" );
+		protected Color menuBarSelectionBackground = UIManager.getColor( "MenuBar.selectionBackground" );
+		protected Color menuBarSelectionForeground = UIManager.getColor( "MenuBar.selectionForeground" );
 		protected Color menuBarUnderlineSelectionBackground = FlatUIUtils.getUIColor( "MenuBar.underlineSelectionBackground", underlineSelectionBackground );
 		protected Color menuBarUnderlineSelectionColor = FlatUIUtils.getUIColor( "MenuBar.underlineSelectionColor", underlineSelectionColor );
 		protected int menuBarUnderlineSelectionHeight = FlatUIUtils.getUIInt( "MenuBar.underlineSelectionHeight", underlineSelectionHeight );
@@ -231,6 +243,10 @@ public class FlatMenuUI
 			if( ((JMenu)menuItem).isTopLevelMenu() ) {
 				if( isUnderlineSelection() )
 					selectionBackground = getStyleFromMenuBarUI( ui -> ui.underlineSelectionBackground, menuBarUnderlineSelectionBackground );
+				else {
+					selectionBackground = getStyleFromMenuBarUI( ui -> ui.selectionBackground,
+						menuBarSelectionBackground != null ? menuBarSelectionBackground : selectionBackground );
+				}
 
 				ButtonModel model = menuItem.getModel();
 				if( model.isRollover() && !model.isArmed() && !model.isSelected() && model.isEnabled() ) {
@@ -243,6 +259,16 @@ public class FlatMenuUI
 			super.paintBackground( g, selectionBackground );
 		}
 
+		@Override
+		protected void paintText( Graphics g, Rectangle textRect, String text, Color selectionForeground, Color disabledForeground ) {
+			if( ((JMenu)menuItem).isTopLevelMenu() && !isUnderlineSelection() ) {
+				selectionForeground = getStyleFromMenuBarUI( ui -> ui.selectionForeground,
+					menuBarSelectionForeground != null ? menuBarSelectionForeground : selectionForeground );
+			}
+
+			super.paintText( g, textRect, text, selectionForeground, disabledForeground );
+		}
+
 		@Override
 		protected void paintUnderlineSelection( Graphics g, Color underlineSelectionColor, int underlineSelectionHeight ) {
 			if( ((JMenu)menuItem).isTopLevelMenu() ) {

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

@@ -55,6 +55,24 @@ class FlatNativeLibrary
 				libraryName += "_64";
 
 			// load jawt native library
+			if( !SystemInfo.isJava_9_orLater ) {
+				// In Java 8, load jawt.dll (part of JRE) explicitly because it
+				// is not found when running application with <jdk>/bin/java.exe.
+				// When using <jdk>/jre/bin/java.exe, it is found.
+				// jawt.dll is located in <jdk>/jre/bin/.
+				// Java 9 and later do not have this problem.
+				loadJAWT();
+			}
+		} else if( SystemInfo.isLinux && SystemInfo.isX86_64 ) {
+			// Linux: requires x86_64
+
+			libraryName = "flatlaf-linux-x86_64";
+
+			// Load jawt.so (part of JRE) explicitly because it is not found
+			// in all Java versions/distributions.
+			// E.g. not found in Java 13 and later from openjdk.java.net.
+			// There seems to be also differences between distributions.
+			// E.g. Adoptium Java 17 does not need this, but Java 17 from openjdk.java.net does.
 			loadJAWT();
 		} else
 			return; // no native library available for current OS or CPU architecture
@@ -77,14 +95,6 @@ class FlatNativeLibrary
 	}
 
 	private static void loadJAWT() {
-		if( SystemInfo.isJava_9_orLater )
-			return;
-
-		// In Java 8, load jawt.dll (part of JRE) explicitly because it
-		// is not found when running application with <jdk>/bin/java.exe.
-		// When using <jdk>/jre/bin/java.exe, it is found.
-		// jawt.dll is located in <jdk>/jre/bin/.
-		// Java 9 and later do not have this problem.
 		try {
 			System.loadLibrary( "jawt" );
 		} catch( UnsatisfiedLinkError ex ) {

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

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2022 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.ui;
+
+import java.awt.Point;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.MouseEvent;
+import java.awt.geom.AffineTransform;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+
+/**
+ * Native methods for Linux.
+ * <p>
+ * <b>Note</b>: This is private API. Do not use!
+ *
+ * @author Karl Tauber
+ * @since 2.5
+ */
+class FlatNativeLinuxLibrary
+{
+	static boolean isLoaded() {
+		return FlatNativeLibrary.isLoaded();
+	}
+
+	// direction for _NET_WM_MOVERESIZE message
+	// see https://specifications.freedesktop.org/wm-spec/wm-spec-latest.html
+	static final int MOVE = 8;
+
+	private static Boolean isXWindowSystem;
+
+	private static boolean isXWindowSystem() {
+		if( isXWindowSystem == null )
+			isXWindowSystem = Toolkit.getDefaultToolkit().getClass().getName().endsWith( ".XToolkit" );
+		return isXWindowSystem;
+	}
+
+	static boolean isWMUtilsSupported( Window window ) {
+		return hasCustomDecoration( window ) && isXWindowSystem() && isLoaded();
+	}
+
+	static boolean moveOrResizeWindow( Window window, MouseEvent e, int direction ) {
+		Point pt = scale( window, e.getLocationOnScreen() );
+		return xMoveOrResizeWindow( window, pt.x, pt.y, direction );
+
+/*
+		try {
+			Class<?> cls = Class.forName( "com.formdev.flatlaf.natives.jna.linux.X11WmUtils" );
+			java.lang.reflect.Method m = cls.getMethod( "xMoveOrResizeWindow", Window.class, int.class, int.class, int.class );
+			return (Boolean) m.invoke( null, window, pt.x, pt.y, direction );
+		} catch (Exception ex) {
+			ex.printStackTrace();
+			return false;
+		}
+*/
+	}
+
+	static boolean showWindowMenu( Window window, MouseEvent e ) {
+		Point pt = scale( window, e.getLocationOnScreen() );
+		return xShowWindowMenu( window, pt.x, pt.y );
+
+/*
+		try {
+			Class<?> cls = Class.forName( "com.formdev.flatlaf.natives.jna.linux.X11WmUtils" );
+			java.lang.reflect.Method m = cls.getMethod( "xShowWindowMenu", Window.class, int.class, int.class );
+			return (Boolean) m.invoke( null, window, pt.x, pt.y );
+		} catch (Exception ex) {
+			ex.printStackTrace();
+			return false;
+		}
+*/
+	}
+
+	private static Point scale( Window window, Point pt ) {
+		AffineTransform transform = window.getGraphicsConfiguration().getDefaultTransform();
+		int x = (int) Math.round( pt.x * transform.getScaleX() );
+		int y = (int) Math.round( pt.y * transform.getScaleY() );
+		return new Point( x, y );
+	}
+
+	// X Window System
+	private static native boolean xMoveOrResizeWindow( Window window, int x, int y, int direction );
+	private static native boolean xShowWindowMenu( Window window, int x, int y );
+
+	private static boolean hasCustomDecoration( Window window ) {
+		return (window instanceof JFrame && JFrame.isDefaultLookAndFeelDecorated() && ((JFrame)window).isUndecorated()) ||
+			(window instanceof JDialog && JDialog.isDefaultLookAndFeelDecorated() && ((JDialog)window).isUndecorated());
+	}
+}

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

@@ -127,6 +127,12 @@ public class FlatPanelUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public void update( Graphics g, JComponent c ) {
 		// fill background

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

@@ -23,6 +23,7 @@ import java.awt.Toolkit;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.beans.PropertyChangeEvent;
 import java.util.Map;
 import javax.swing.Action;
 import javax.swing.ActionMap;
@@ -233,6 +234,14 @@ public class FlatPasswordFieldUI
 		return infos;
 	}
 
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		if( key.equals( "capsLockIconColor" ) && capsLockIcon instanceof FlatCapsLockIcon )
+			return ((FlatCapsLockIcon)capsLockIcon).getStyleableValue( key );
+
+		return super.getStyleableValue( c, key );
+	}
+
 	@Override
 	public View create( Element elem ) {
 		return new PasswordView( elem );
@@ -283,6 +292,7 @@ public class FlatPasswordFieldUI
 	protected void installRevealButton() {
 		if( showRevealButton ) {
 			revealButton = createRevealButton();
+			updateRevealButton();
 			installLayout();
 			getComponent().add( revealButton );
 		}
@@ -290,28 +300,64 @@ public class FlatPasswordFieldUI
 
 	/** @since 2 */
 	protected JToggleButton createRevealButton() {
-		JToggleButton button = new JToggleButton( revealIcon );
+		JPasswordField c = (JPasswordField) getComponent();
+		JToggleButton button = new JToggleButton( revealIcon, !c.echoCharIsSet() );
 		button.setName( "PasswordField.revealButton" );
 		prepareLeadingOrTrailingComponent( button );
 		button.putClientProperty( FlatClientProperties.STYLE_CLASS, "inTextField revealButton" );
-		if( FlatClientProperties.clientPropertyBoolean( getComponent(), KEY_REVEAL_SELECTED, false ) ) {
+		if( FlatClientProperties.clientPropertyBoolean( c, KEY_REVEAL_SELECTED, false ) ) {
 			button.setSelected( true );
 			updateEchoChar( true );
 		}
 		button.addActionListener( e -> {
 			boolean selected = button.isSelected();
 			updateEchoChar( selected );
-			getComponent().putClientProperty( KEY_REVEAL_SELECTED, selected );
+			c.putClientProperty( KEY_REVEAL_SELECTED, selected );
 		} );
 		return button;
 	}
 
+	/** @since 2.5 */
+	protected void updateRevealButton() {
+		if( revealButton == null )
+			return;
+
+		JTextComponent c = getComponent();
+		boolean visible = c.isEnabled();
+		if( visible != revealButton.isVisible() ) {
+			revealButton.setVisible( visible );
+			c.revalidate();
+			c.repaint();
+
+			if( !visible ) {
+				revealButton.setSelected( false );
+				updateEchoChar( false );
+				getComponent().putClientProperty( KEY_REVEAL_SELECTED, null );
+			}
+		}
+	}
+
+	@Override
+	protected void propertyChange( PropertyChangeEvent e ) {
+		super.propertyChange( e );
+
+		switch( e.getPropertyName() ) {
+			case "enabled":
+				updateRevealButton();
+				break;
+		}
+	}
+
 	private void updateEchoChar( boolean selected ) {
 		char newEchoChar = selected
 			? 0
 			: (echoChar != null ? echoChar : '*');
 
 		JPasswordField c = (JPasswordField) getComponent();
+		if( newEchoChar == c.getEchoChar() )
+			return;
+
+		// set echo char
 		LookAndFeel.installProperty( c, "echoChar", newEchoChar );
 
 		// check whether was able to set echo char via LookAndFeel.installProperty()

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

@@ -36,7 +36,9 @@ import java.awt.Window;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 import java.awt.event.MouseEvent;
-import java.lang.reflect.InvocationTargetException;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
@@ -64,8 +66,8 @@ import com.formdev.flatlaf.util.UIScale;
 public class FlatPopupFactory
 	extends PopupFactory
 {
-	private Method java8getPopupMethod;
-	private Method java9getPopupMethod;
+	private MethodHandle java8getPopupMethod;
+	private MethodHandle java9getPopupMethod;
 
 	@Override
 	public Popup getPopup( Component owner, Component contents, int x, int y )
@@ -192,23 +194,25 @@ public class FlatPopupFactory
 	{
 		try {
 			if( SystemInfo.isJava_9_orLater ) {
+				// Java 9: protected Popup getPopup( Component owner, Component contents, int x, int y, boolean isHeavyWeightPopup )
 				if( java9getPopupMethod == null ) {
-					java9getPopupMethod = PopupFactory.class.getDeclaredMethod(
-						"getPopup", Component.class, Component.class, int.class, int.class, boolean.class );
+					MethodType mt = MethodType.methodType( Popup.class, Component.class, Component.class, int.class, int.class, boolean.class );
+					java9getPopupMethod = MethodHandles.lookup().findVirtual( PopupFactory.class, "getPopup", mt );
 				}
 				return (Popup) java9getPopupMethod.invoke( this, owner, contents, x, y, true );
 			} else {
-				// Java 8
+				// Java 8: private Popup getPopup( Component owner, Component contents, int ownerX, int ownerY, int popupType )
 				if( java8getPopupMethod == null ) {
-					java8getPopupMethod = PopupFactory.class.getDeclaredMethod(
+					Method m = PopupFactory.class.getDeclaredMethod(
 						"getPopup", Component.class, Component.class, int.class, int.class, int.class );
-					java8getPopupMethod.setAccessible( true );
+					m.setAccessible( true );
+					java8getPopupMethod = MethodHandles.lookup().unreflect( m );
 				}
 				return (Popup) java8getPopupMethod.invoke( this, owner, contents, x, y, /*HEAVY_WEIGHT_POPUP*/ 2 );
 			}
-		} catch( NoSuchMethodException | SecurityException | IllegalAccessException | InvocationTargetException ex ) {
-			// ignore
-			return null;
+		} catch( Throwable ex ) {
+			// fallback
+			return super.getPopup( owner, contents, x, y );
 		}
 	}
 

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

@@ -66,6 +66,16 @@ public class FlatPopupMenuBorder
 		return infos;
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( String key ) {
+		switch( key ) {
+			case "borderInsets": return getStyleableValue();
+			case "borderColor": return borderColor;
+		}
+		return null;
+	}
+
 	@Override
 	public Color getLineColor() {
 		return (borderColor != null) ? borderColor : super.getLineColor();

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

@@ -184,6 +184,12 @@ public class FlatPopupMenuUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, popupMenu.getBorder() );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, popupMenu.getBorder(), key );
+	}
+
 	@Override
 	public Popup getPopup( JPopupMenu popup, int x, int y ) {
 		// do not add scroller to combobox popups or to popups that already have a scroll pane

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

@@ -160,6 +160,12 @@ public class FlatProgressBarUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public Dimension getPreferredSize( JComponent c ) {
 		Dimension size = super.getPreferredSize( c );

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

@@ -16,18 +16,20 @@
 
 package com.formdev.flatlaf.ui;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.beans.PropertyChangeListener;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
 import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicMenuItemUI;
 import javax.swing.plaf.basic.BasicRadioButtonMenuItemUI;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
-import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException;
 import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
@@ -58,9 +60,15 @@ import com.formdev.flatlaf.util.LoggingFacade;
  *
  * @author Karl Tauber
  */
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionBackground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="selectionForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="disabledForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorForeground" )
+@StyleableField( cls=BasicMenuItemUI.class, key="acceleratorSelectionForeground" )
+
 public class FlatRadioButtonMenuItemUI
 	extends BasicRadioButtonMenuItemUI
-	implements StyleableUI
+	implements StyleableUI, StyleableLookupProvider
 {
 	private FlatMenuItemRenderer renderer;
 	private Map<String, Object> oldStyleValues;
@@ -119,29 +127,27 @@ public class FlatRadioButtonMenuItemUI
 
 	/** @since 2 */
 	protected Object applyStyleProperty( String key, Object value ) {
-		try {
-			return renderer.applyStyleProperty( key, value );
-		} catch ( UnknownStyleException ex ) {
-			// ignore
-		}
-
-		Object oldValue;
-		switch( key ) {
-			// BasicMenuItemUI
-			case "selectionBackground": oldValue = selectionBackground; selectionBackground = (Color) value; return oldValue;
-			case "selectionForeground": oldValue = selectionForeground; selectionForeground = (Color) value; return oldValue;
-			case "disabledForeground": oldValue = disabledForeground; disabledForeground = (Color) value; return oldValue;
-			case "acceleratorForeground": oldValue = acceleratorForeground; acceleratorForeground = (Color) value; return oldValue;
-			case "acceleratorSelectionForeground": oldValue = acceleratorSelectionForeground; acceleratorSelectionForeground = (Color) value; return oldValue;
-		}
-
-		return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, menuItem, key, value );
+		return FlatMenuItemUI.applyStyleProperty( menuItem, this, renderer, key, value );
 	}
 
 	/** @since 2 */
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
-		return FlatMenuItemUI.getStyleableInfos( renderer );
+		return FlatMenuItemUI.getStyleableInfos( this, renderer );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatMenuItemUI.getStyleableValue( this, renderer, key );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public MethodHandles.Lookup getLookupForStyling() {
+		// MethodHandles.lookup() is caller sensitive and must be invoked in this class,
+		// otherwise it is not possible to access protected fields in JRE superclass
+		return MethodHandles.lookup();
 	}
 
 	@Override

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

@@ -18,12 +18,16 @@ package com.formdev.flatlaf.ui;
 
 import static com.formdev.flatlaf.util.UIScale.scale;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.Map;
 import java.util.Objects;
 import javax.swing.AbstractButton;
@@ -31,6 +35,7 @@ import javax.swing.CellRendererPane;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicButtonListener;
@@ -78,7 +83,7 @@ public class FlatRadioButtonUI
 	private Map<String, Object> oldStyleValues;
 
 	public static ComponentUI createUI( JComponent c ) {
-		return FlatUIUtils.canUseSharedUI( c )
+		return FlatUIUtils.canUseSharedUI( c ) && !FlatUIUtils.needsLightAWTPeer( c )
 			? FlatUIUtils.createSharedUI( FlatRadioButtonUI.class, () -> new FlatRadioButtonUI( true ) )
 			: new FlatRadioButtonUI( false );
 	}
@@ -90,11 +95,29 @@ public class FlatRadioButtonUI
 
 	@Override
 	public void installUI( JComponent c ) {
+		if( FlatUIUtils.needsLightAWTPeer( c ) )
+			FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> installUIImpl( c ) );
+		else
+			installUIImpl( c );
+	}
+
+	private void installUIImpl( JComponent c ) {
 		super.installUI( c );
 
+		if( FlatUIUtils.isAWTPeer( c ) )
+			AWTPeerMouseExitedFix.install( c );
+
 		installStyle( (AbstractButton) c );
 	}
 
+	@Override
+	public void uninstallUI( JComponent c ) {
+		super.uninstallUI( c );
+
+		if( FlatUIUtils.isAWTPeer( c ) )
+			AWTPeerMouseExitedFix.uninstall( c );
+	}
+
 	@Override
 	public void installDefaults( AbstractButton b ) {
 		super.installDefaults( b );
@@ -199,6 +222,19 @@ public class FlatRadioButtonUI
 		return infos;
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		// style icon
+		if( key.startsWith( "icon." ) ) {
+			return (icon instanceof FlatCheckBoxIcon)
+				? ((FlatCheckBoxIcon)icon).getStyleableValue( key.substring( "icon.".length() ) )
+				: null;
+		}
+
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	private static final Insets tempInsets = new Insets( 0, 0, 0, 0 );
 
 	@Override
@@ -308,4 +344,69 @@ public class FlatRadioButtonUI
 			FlatRadioButtonUI.this.propertyChange( b, e );
 		}
 	}
+
+	//---- class AWTPeerMouseExitedFix ----------------------------------------
+
+	/**
+	 * Hack for missing mouse-exited event for java.awt.Checkbox on macOS (to fix hover effect).
+	 *
+	 * On macOS, AWT components internally use Swing components.
+	 * This is implemented in class sun.lwawt.LWCheckboxPeer, which uses
+	 * a container component CheckboxDelegate that has a JCheckBox and a JRadioButton
+	 * as children. Only one of them is visible.
+	 *
+	 * The reason that mouse-exited event is not sent to the JCheckBox or JRadioButton
+	 * is that sun.lwawt.LWComponentPeer.createDelegateEvent() uses
+	 * SwingUtilities.getDeepestComponentAt() to find the event target,
+	 * which finds the container component CheckboxDelegate,
+	 * which receives the mouse-exited event.
+	 *
+	 * This class adds listeners and forwards the mouse-exited event
+	 * from CheckboxDelegate to JCheckBox or JRadioButton.
+	 */
+	private static class AWTPeerMouseExitedFix
+		extends MouseAdapter
+		implements PropertyChangeListener
+	{
+		private final JComponent button;
+
+		static void install( JComponent button ) {
+			AWTPeerMouseExitedFix l = new AWTPeerMouseExitedFix( button );
+			button.addPropertyChangeListener( "ancestor", l );
+			Container parent = button.getParent();
+			if( parent != null )
+				parent.addMouseListener( l );
+		}
+
+		static void uninstall( JComponent button ) {
+			for( PropertyChangeListener l : button.getPropertyChangeListeners( "ancestor" ) ) {
+				if( l instanceof AWTPeerMouseExitedFix ) {
+					button.removePropertyChangeListener( "ancestor", l );
+					Container parent = button.getParent();
+					if( parent != null )
+						parent.removeMouseListener( (AWTPeerMouseExitedFix) l );
+					break;
+				}
+			}
+		}
+
+		AWTPeerMouseExitedFix( JComponent button ) {
+			this.button = button;
+		}
+
+		@Override
+		public void propertyChange( PropertyChangeEvent e ) {
+			if( e.getOldValue() instanceof Component )
+				((Component)e.getOldValue()).removeMouseListener( this );
+			if( e.getNewValue() instanceof Component ) {
+				((Component)e.getNewValue()).removeMouseListener( this ); // avoid duplicate listeners
+				((Component)e.getNewValue()).addMouseListener( this );
+			}
+		}
+
+		@Override
+		public void mouseExited( MouseEvent e ) {
+			button.dispatchEvent( SwingUtilities.convertMouseEvent( e.getComponent(), e, button ) );
+		}
+	}
 }

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

@@ -17,6 +17,7 @@
 package com.formdev.flatlaf.ui;
 
 import java.awt.Color;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Insets;
@@ -24,6 +25,7 @@ import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeListener;
+import java.lang.invoke.MethodHandles;
 import java.util.Map;
 import java.util.Objects;
 import javax.swing.InputMap;
@@ -36,9 +38,13 @@ import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicScrollBarUI;
 import com.formdev.flatlaf.FlatClientProperties;
+import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
+import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.LoggingFacade;
+import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -77,9 +83,15 @@ import com.formdev.flatlaf.util.UIScale;
  *
  * @author Karl Tauber
  */
+@StyleableField( cls=BasicScrollBarUI.class, key="track", fieldName="trackColor" )
+@StyleableField( cls=BasicScrollBarUI.class, key="thumb", fieldName="thumbColor" )
+@StyleableField( cls=BasicScrollBarUI.class, key="width", fieldName="scrollBarWidth" )
+@StyleableField( cls=BasicScrollBarUI.class, key="minimumThumbSize" )
+@StyleableField( cls=BasicScrollBarUI.class, key="maximumThumbSize" )
+
 public class FlatScrollBarUI
 	extends BasicScrollBarUI
-	implements StyleableUI
+	implements StyleableUI, StyleableLookupProvider
 {
 	// overrides BasicScrollBarUI.supportsAbsolutePositioning (which is private)
 	@Styleable protected boolean allowsAbsolutePositioning;
@@ -108,6 +120,7 @@ public class FlatScrollBarUI
 	protected boolean hoverThumb;
 
 	private Map<String, Object> oldStyleValues;
+	private boolean isAWTPeer;
 
 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatScrollBarUI();
@@ -221,6 +234,37 @@ public class FlatScrollBarUI
 					}
 					SwingUtilities.replaceUIInputMap( scrollbar, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, inputMap );
 					break;
+
+				case "ancestor":
+					// check whether scroll bar is used as AWT peer on macOS
+					if( SystemInfo.isMacOS ) {
+						Container p = scrollbar.getParent();
+						for( int i = 0; i < 2 && p != null; i++, p = p.getParent() ) {
+							if( FlatUIUtils.isAWTPeer( p ) ) {
+								// Used to disable hover, which does not work correctly
+								// because scroll bars do not receive mouse exited event.
+								// The scroll pane, including its scroll bars, is not part
+								// of the component hierarchy and does not receive mouse events
+								// directly. Instead LWComponentPeer receives mouse events
+								// and delegates them to peers, but entered/exited events
+								// are sent only for the whole scroll pane.
+								// Exited event is only sent when mouse leaves scroll pane.
+								// If mouse enters/exits scroll bar, no entered/exited events are sent.
+								isAWTPeer = true;
+
+								// if dark theme is active, reinstall using light theme
+								if( FlatLaf.isLafDark() ) {
+									FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> {
+										JScrollBar scrollbar = this.scrollbar;
+										uninstallUI( scrollbar );
+										installUI( scrollbar );
+									} );
+								}
+								break;
+							}
+						}
+					}
+					break;
 			}
 		};
 	}
@@ -246,30 +290,27 @@ public class FlatScrollBarUI
 
 	/** @since 2 */
 	protected Object applyStyleProperty( String key, Object value ) {
-		Object oldValue;
-		switch( key ) {
-			// BasicScrollBarUI
-			case "track": oldValue = trackColor; trackColor = (Color) value; return oldValue;
-			case "thumb": oldValue = thumbColor; thumbColor = (Color) value; return oldValue;
-			case "width": oldValue = scrollBarWidth; scrollBarWidth = (int) value; return oldValue;
-			case "minimumThumbSize": oldValue = minimumThumbSize; minimumThumbSize = (Dimension) value; return oldValue;
-			case "maximumThumbSize": oldValue = maximumThumbSize; maximumThumbSize = (Dimension) value; return oldValue;
-		}
-
 		return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, scrollbar, key, value );
 	}
 
 	/** @since 2 */
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
-		Map<String, Class<?>> infos = new FlatStylingSupport.StyleableInfosMap<>();
-		infos.put( "track", Color.class );
-		infos.put( "thumb", Color.class );
-		infos.put( "width", int.class );
-		infos.put( "minimumThumbSize", Dimension.class );
-		infos.put( "maximumThumbSize", Dimension.class );
-		FlatStylingSupport.collectAnnotatedStyleableInfos( this, infos );
-		return infos;
+		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
+	/** @since 2.5 */
+	@Override
+	public MethodHandles.Lookup getLookupForStyling() {
+		// MethodHandles.lookup() is caller sensitive and must be invoked in this class,
+		// otherwise it is not possible to access protected fields in JRE superclass
+		return MethodHandles.lookup();
 	}
 
 	@Override
@@ -357,7 +398,7 @@ public class FlatScrollBarUI
 		Color trackColor = FlatUIUtils.deriveColor( this.trackColor, c.getBackground() );
 		return (pressed && pressedTrackColor != null)
 			? FlatUIUtils.deriveColor( pressedTrackColor, trackColor )
-			: ((hover && hoverTrackColor != null)
+			: ((hover && hoverTrackColor != null && !isAWTPeer)
 				? FlatUIUtils.deriveColor( hoverTrackColor, trackColor )
 				: trackColor);
 	}
@@ -367,7 +408,7 @@ public class FlatScrollBarUI
 		Color thumbColor = FlatUIUtils.deriveColor( this.thumbColor, trackColor );
 		return (pressed && pressedThumbColor != null)
 			? FlatUIUtils.deriveColor( pressedThumbColor, thumbColor )
-			: ((hover && hoverThumbColor != null)
+			: ((hover && hoverThumbColor != null && !isAWTPeer)
 				? FlatUIUtils.deriveColor( hoverThumbColor, thumbColor )
 				: thumbColor);
 	}

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

@@ -87,6 +87,13 @@ public class FlatScrollPaneUI
 
 	@Override
 	public void installUI( JComponent c ) {
+		if( FlatUIUtils.needsLightAWTPeer( c ) )
+			FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> installUIImpl( c ) );
+		else
+			installUIImpl( c );
+	}
+
+	private void installUIImpl( JComponent c ) {
 		super.installUI( c );
 
 		int focusWidth = UIManager.getInt( "Component.focusWidth" );
@@ -343,6 +350,12 @@ public class FlatScrollPaneUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, scrollpane.getBorder() );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, scrollpane.getBorder(), key );
+	}
+
 	@Override
 	protected void updateViewport( PropertyChangeEvent e ) {
 		super.updateViewport( e );

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

@@ -170,6 +170,12 @@ public class FlatSeparatorUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public void paint( Graphics g, JComponent c ) {
 		Graphics2D g2 = (Graphics2D) g.create();

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

@@ -222,6 +222,12 @@ public class FlatSliderUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public int getBaseline( JComponent c, int width, int height ) {
 		if( c == null )

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

@@ -223,6 +223,12 @@ public class FlatSpinnerUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, spinner.getBorder() );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, spinner.getBorder(), key );
+	}
+
 	@Override
 	protected JComponent createEditor() {
 		JComponent editor = super.createEditor();

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

@@ -183,6 +183,17 @@ public class FlatSplitPaneUI
 		return infos;
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		if( divider instanceof FlatSplitPaneDivider ) {
+			Object value = ((FlatSplitPaneDivider)divider).getStyleableValue( key );
+			if( value != null )
+				return value;
+		}
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	//---- class FlatSplitPaneDivider -----------------------------------------
 
 	protected class FlatSplitPaneDivider
@@ -200,20 +211,21 @@ public class FlatSplitPaneUI
 			setLayout( new FlatDividerLayout() );
 		}
 
-		/**
-		 * @since 2
-		 */
+		/** @since 2 */
 		protected Object applyStyleProperty( String key, Object value ) {
 			return FlatStylingSupport.applyToAnnotatedObject( this, key, value );
 		}
 
-		/**
-		 * @since 2
-		 */
+		/** @since 2 */
 		public Map<String, Class<?>> getStyleableInfos() {
 			return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 		}
 
+		/** @since 2.5 */
+		public Object getStyleableValue( String key ) {
+			return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+		}
+
 		void updateStyle() {
 			if( leftButton instanceof FlatOneTouchButton )
 				((FlatOneTouchButton)leftButton).updateStyle();

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

@@ -18,9 +18,11 @@ package com.formdev.flatlaf.ui;
 
 import java.beans.PropertyChangeListener;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -63,15 +65,55 @@ public class FlatStylingSupport
 		Class<?> type() default Void.class;
 	}
 
+	/**
+	 * Indicates that a field in the specified (super) class
+	 * is intended to be used by FlatLaf styling support.
+	 * <p>
+	 * Use this annotation, instead of {@link Styleable}, to style fields
+	 * in superclasses, where it is not possible to use {@link Styleable}.
+	 * <p>
+	 * Classes using this annotation may implement {@link StyleableLookupProvider}
+	 * to give access to protected fields (in JRE) in modular applications.
+	 *
+	 * @since 2.5
+	 */
+	@Target(ElementType.TYPE)
+	@Retention(RetentionPolicy.RUNTIME)
+	@Repeatable(StyleableFields.class)
+	public @interface StyleableField {
+		Class<?> cls();
+		String key();
+		String fieldName() default "";
+	}
+
+	/**
+	 * Container annotation for {@link StyleableField}.
+	 *
+	 * @since 2.5
+	 */
+	@Target(ElementType.TYPE)
+	@Retention(RetentionPolicy.RUNTIME)
+	public @interface StyleableFields {
+		StyleableField[] value();
+	}
+
+
 	/** @since 2 */
 	public interface StyleableUI {
 		Map<String, Class<?>> getStyleableInfos( JComponent c );
+		/** @since 2.5 */ Object getStyleableValue( JComponent c, String key );
 	}
 
 	/** @since 2 */
 	public interface StyleableBorder {
 		Object applyStyleProperty( String key, Object value );
 		Map<String, Class<?>> getStyleableInfos();
+		/** @since 2.5 */ Object getStyleableValue( String key );
+	}
+
+	/** @since 2.5 */
+	public interface StyleableLookupProvider {
+		MethodHandles.Lookup getLookupForStyling();
 	}
 
 
@@ -365,21 +407,25 @@ public class FlatStylingSupport
 	public static Object applyToAnnotatedObject( Object obj, String key, Object value )
 		throws UnknownStyleException, IllegalArgumentException
 	{
-		String fieldName = key;
-		int dotIndex = key.indexOf( '.' );
-		if( dotIndex >= 0 ) {
-			// remove first dot in key and change subsequent character to uppercase
-			fieldName = key.substring( 0, dotIndex )
-				+ Character.toUpperCase( key.charAt( dotIndex + 1 ) )
-				+ key.substring( dotIndex + 2 );
-		}
+		String fieldName = keyToFieldName( key );
 
 		return applyToField( obj, fieldName, key, value, field -> {
 			Styleable styleable = field.getAnnotation( Styleable.class );
-			return styleable != null && styleable.dot() == (dotIndex >= 0);
+			return styleable != null && styleable.dot() == (fieldName != key);
 		} );
 	}
 
+	private static String keyToFieldName( String key ) {
+		int dotIndex = key.indexOf( '.' );
+		if( dotIndex < 0 )
+			return key;
+
+		// remove first dot in key and change subsequent character to uppercase
+		return key.substring( 0, dotIndex )
+			+ Character.toUpperCase( key.charAt( dotIndex + 1 ) )
+			+ key.substring( dotIndex + 2 );
+	}
+
 	/**
 	 * Applies the given value to a field of the given object.
 	 *
@@ -405,26 +451,17 @@ public class FlatStylingSupport
 		for(;;) {
 			try {
 				Field f = cls.getDeclaredField( fieldName );
-				if( predicate == null || predicate.test( f ) ) {
-					if( !isValidField( f ) )
-						throw new IllegalArgumentException( "field '" + cls.getName() + "." + fieldName + "' is final or static" );
-
-					try {
-						// necessary to access protected fields in other packages
-						f.setAccessible( true );
-
-						// get old value and set new value
-						Object oldValue = f.get( obj );
-						f.set( obj, convertToEnum( value, f.getType() ) );
-						return oldValue;
-					} catch( IllegalAccessException ex ) {
-						throw new IllegalArgumentException( "failed to access field '" + cls.getName() + "." + fieldName + "'", ex );
-					}
-				}
+				if( predicate == null || predicate.test( f ) )
+					return applyToField( f, obj, value, false );
 			} catch( NoSuchFieldException ex ) {
 				// field not found in class --> try superclass
 			}
 
+			for( StyleableField styleableField : cls.getAnnotationsByType( StyleableField.class ) ) {
+				if( key.equals( styleableField.key() ) )
+					return applyToField( getStyleableField( styleableField ), obj, value, true );
+			}
+
 			cls = cls.getSuperclass();
 			if( cls == null )
 				throw new UnknownStyleException( key );
@@ -437,11 +474,83 @@ public class FlatStylingSupport
 		}
 	}
 
+	private static Object applyToField( Field f, Object obj, Object value, boolean useMethodHandles ) {
+		checkValidField( f );
+
+		if( useMethodHandles && obj instanceof StyleableLookupProvider ) {
+			try {
+				// use method handles to access protected fields in JRE in modular applications
+				MethodHandles.Lookup lookup = ((StyleableLookupProvider)obj).getLookupForStyling();
+
+				// get old value and set new value
+				Object oldValue = lookup.unreflectGetter( f ).invoke( obj );
+				lookup.unreflectSetter( f ).invoke( obj, convertToEnum( value, f.getType() ) );
+				return oldValue;
+			} catch( Throwable ex ) {
+				throw newFieldAccessFailed( f, ex );
+			}
+		}
+
+		try {
+			// necessary to access protected fields in other packages
+			f.setAccessible( true );
+
+			// get old value and set new value
+			Object oldValue = f.get( obj );
+			f.set( obj, convertToEnum( value, f.getType() ) );
+			return oldValue;
+		} catch( IllegalAccessException ex ) {
+			throw newFieldAccessFailed( f, ex );
+		}
+	}
+
+	private static Object getFieldValue( Field f, Object obj, boolean useMethodHandles ) {
+		checkValidField( f );
+
+		if( useMethodHandles && obj instanceof StyleableLookupProvider ) {
+			// use method handles to access protected fields in JRE in modular applications
+			try {
+				MethodHandles.Lookup lookup = ((StyleableLookupProvider)obj).getLookupForStyling();
+				return lookup.unreflectGetter( f ).invoke( obj );
+			} catch( Throwable ex ) {
+				throw newFieldAccessFailed( f, ex );
+			}
+		}
+
+		try {
+			f.setAccessible( true );
+			return f.get( obj );
+		} catch( IllegalAccessException ex ) {
+			throw newFieldAccessFailed( f, ex );
+		}
+	}
+
+	private static IllegalArgumentException newFieldAccessFailed( Field f, Throwable ex ) {
+		return new IllegalArgumentException( "failed to access field '" + f.getDeclaringClass().getName() + "." + f.getName() + "'", ex );
+	}
+
+	private static void checkValidField( Field f ) {
+		if( !isValidField( f ) )
+			throw new IllegalArgumentException( "field '" + f.getDeclaringClass().getName() + "." + f.getName() + "' is final or static" );
+	}
+
 	private static boolean isValidField( Field f ) {
 		int modifiers = f.getModifiers();
 		return (modifiers & (Modifier.FINAL|Modifier.STATIC)) == 0 && !f.isSynthetic();
 	}
 
+	private static Field getStyleableField( StyleableField styleableField ) {
+		String fieldName = styleableField.fieldName();
+		if( fieldName.isEmpty() )
+			fieldName = styleableField.key();
+
+		try {
+			return styleableField.cls().getDeclaredField( fieldName );
+		} catch( NoSuchFieldException ex ) {
+			throw new IllegalArgumentException( "field '" + styleableField.cls().getName() + "." + fieldName + "' not found", ex );
+		}
+	}
+
 	/**
 	 * Applies the given value to a property of the given object.
 	 * Works only for properties that have public getter and setter methods.
@@ -628,6 +737,7 @@ public class FlatStylingSupport
 		Class<?> cls = obj.getClass();
 
 		for(;;) {
+			// find fields annotated with 'Styleable'
 			for( Field f : cls.getDeclaredFields() ) {
 				if( !isValidField( f ) )
 					continue;
@@ -666,6 +776,20 @@ public class FlatStylingSupport
 				infos.put( name, type );
 			}
 
+			// get fields specified in 'StyleableField' annotation
+			for( StyleableField styleableField : cls.getAnnotationsByType( StyleableField.class ) ) {
+				String name = styleableField.key();
+
+				// for the case that the same field name is used in a class and in
+				// one of its superclasses, do not process field in superclass
+				if( processedFields.contains( name ) )
+					continue;
+				processedFields.add( name );
+
+				Field f = getStyleableField( styleableField );
+				infos.put( name, f.getType() );
+			}
+
 			cls = cls.getSuperclass();
 			if( cls == null )
 				return;
@@ -686,6 +810,52 @@ public class FlatStylingSupport
 			infos.put( keyPrefix.concat( e.getKey() ), e.getValue() );
 	}
 
+	public static Object getAnnotatedStyleableValue( Object obj, String key ) {
+		String fieldName = keyToFieldName( key );
+		Class<?> cls = obj.getClass();
+
+		for(;;) {
+			try {
+				// find field annotated with 'Styleable'
+				Field f = cls.getDeclaredField( fieldName );
+				Styleable styleable = f.getAnnotation( Styleable.class );
+				if( styleable != null ) {
+					if( styleable.dot() != (fieldName != key) )
+						throw new IllegalArgumentException( "'Styleable.dot' on field '" + fieldName + "' does not match key '" + key + "'" );
+					if( styleable.type() != Void.class )
+						throw new IllegalArgumentException( "'Styleable.type' on field '" + fieldName + "' not supported" );
+
+					return getFieldValue( f, obj, false );
+				}
+			} catch( NoSuchFieldException ex ) {
+				// field not found in class --> try superclass
+			}
+
+			// find field specified in 'StyleableField' annotation
+			for( StyleableField styleableField : cls.getAnnotationsByType( StyleableField.class ) ) {
+				if( key.equals( styleableField.key() ) )
+					return getFieldValue( getStyleableField( styleableField ), obj, true );
+			}
+
+			cls = cls.getSuperclass();
+			if( cls == null )
+				return null;
+
+			String superclassName = cls.getName();
+			if( superclassName.startsWith( "java." ) || superclassName.startsWith( "javax." ) )
+				return null;
+		}
+	}
+
+	public static Object getAnnotatedStyleableValue( Object obj, Border border, String key ) {
+		if( border instanceof StyleableBorder ) {
+			Object value = ((StyleableBorder)border).getStyleableValue( key );
+			if( value != null )
+				return value;
+		}
+		return getAnnotatedStyleableValue( obj, key );
+	}
+
 	//---- class UnknownStyleException ----------------------------------------
 
 	public static class UnknownStyleException

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

@@ -145,7 +145,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault TabbedPane.showTabSeparators				boolean
  * @uiDefault TabbedPane.tabSeparatorsFullHeight		boolean
  * @uiDefault TabbedPane.hasFullBorder					boolean
- * @uiDefault TabbedPane.activeTabBorder				boolean
+ * @uiDefault TabbedPane.rotateTabRuns					boolean
  *
  * @uiDefault TabbedPane.tabLayoutPolicy				String	wrap (default) or scroll
  * @uiDefault TabbedPane.tabType						String	underlined (default) or card
@@ -220,6 +220,7 @@ public class FlatTabbedPaneUI
 	@Styleable protected boolean tabSeparatorsFullHeight;
 	@Styleable protected boolean hasFullBorder;
 	@Styleable protected boolean tabsOpaque = true;
+	/** @since 2.5 */ @Styleable protected boolean rotateTabRuns = true;
 
 	@Styleable(type=String.class) private int tabType;
 	@Styleable(type=String.class) private int tabsPopupPolicy;
@@ -342,6 +343,7 @@ public class FlatTabbedPaneUI
 		tabSeparatorsFullHeight = UIManager.getBoolean( "TabbedPane.tabSeparatorsFullHeight" );
 		hasFullBorder = UIManager.getBoolean( "TabbedPane.hasFullBorder" );
 		tabsOpaque = UIManager.getBoolean( "TabbedPane.tabsOpaque" );
+		rotateTabRuns = FlatUIUtils.getUIBoolean( "TabbedPane.rotateTabRuns", true );
 
 		tabType = parseTabType( UIManager.getString( "TabbedPane.tabType" ) );
 		tabsPopupPolicy = parseTabsPopupPolicy( UIManager.getString( "TabbedPane.tabsPopupPolicy" ) );
@@ -687,6 +689,76 @@ public class FlatTabbedPaneUI
 		return infos;
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		// close icon
+		if( key.startsWith( "close" ) ) {
+			return (closeIcon instanceof FlatTabbedPaneCloseIcon)
+				? ((FlatTabbedPaneCloseIcon)closeIcon).getStyleableValue( key )
+				: null;
+		}
+
+		switch( key ) {
+			// BasicTabbedPaneUI
+			case "tabInsets":		return tabInsets;
+			case "tabAreaInsets":	return tabAreaInsets;
+			case "textIconGap":		return textIconGapUnscaled;
+
+			// FlatTabbedPaneUI
+			case "tabType":
+				switch( tabType ) {
+					default:
+					case TAB_TYPE_UNDERLINED:	return TABBED_PANE_TAB_TYPE_UNDERLINED;
+					case TAB_TYPE_CARD:			return TABBED_PANE_TAB_TYPE_CARD;
+				}
+
+			case "tabsPopupPolicy":
+				switch( tabsPopupPolicy ) {
+					default:
+					case AS_NEEDED:				return TABBED_PANE_POLICY_AS_NEEDED;
+					case NEVER:					return TABBED_PANE_POLICY_NEVER;
+				}
+
+			case "scrollButtonsPolicy":
+				switch( scrollButtonsPolicy ) {
+					default:
+					case AS_NEEDED_SINGLE:		return TABBED_PANE_POLICY_AS_NEEDED_SINGLE;
+					case AS_NEEDED:				return TABBED_PANE_POLICY_AS_NEEDED;
+					case NEVER:					return TABBED_PANE_POLICY_NEVER;
+				}
+
+			case "scrollButtonsPlacement":
+				switch( scrollButtonsPlacement ) {
+					default:
+					case BOTH:					return TABBED_PANE_PLACEMENT_BOTH;
+					case TRAILING:				return TABBED_PANE_PLACEMENT_TRAILING;
+				}
+
+			case "tabAreaAlignment":	return alignmentToString( tabAreaAlignment, TABBED_PANE_ALIGN_LEADING );
+			case "tabAlignment":			return alignmentToString( tabAlignment, TABBED_PANE_ALIGN_CENTER );
+
+			case "tabWidthMode":
+				switch( tabWidthMode ) {
+					default:
+					case WIDTH_MODE_PREFERRED:	return TABBED_PANE_TAB_WIDTH_MODE_PREFERRED;
+					case WIDTH_MODE_EQUAL:		return TABBED_PANE_TAB_WIDTH_MODE_EQUAL;
+					case WIDTH_MODE_COMPACT:	return TABBED_PANE_TAB_WIDTH_MODE_COMPACT;
+				}
+
+			case "tabIconPlacement":
+				switch( tabIconPlacement ) {
+					default:
+					case LEADING:				return "leading";
+					case TRAILING:				return "trailing";
+					case TOP:					return "top";
+					case BOTTOM:				return "bottom";
+				}
+		}
+
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	protected void setRolloverTab( int x, int y ) {
 		setRolloverTab( tabForCoordinate( tabPane, x, y ) );
 	}
@@ -1022,7 +1094,7 @@ public class FlatTabbedPaneUI
 
 		// paint selection indicator
 		if( isSelected )
-			paintTabSelection( g, tabPlacement, x, y, w, h );
+			paintTabSelection( g, tabPlacement, tabIndex, x, y, w, h );
 
 		if( tabPane.getTabComponentAt( tabIndex ) != null )
 			return;
@@ -1211,14 +1283,19 @@ public class FlatTabbedPaneUI
 		}
 	}
 
-	protected void paintTabSelection( Graphics g, int tabPlacement, int x, int y, int w, int h ) {
+	protected void paintTabSelection( Graphics g, int tabPlacement, int tabIndex, int x, int y, int w, int h ) {
 		g.setColor( tabPane.isEnabled()
 			? (isTabbedPaneOrChildFocused() ? underlineColor : inactiveUnderlineColor)
 			: disabledUnderlineColor );
 
 		// paint underline selection
 		boolean atBottom = (getTabType() != TAB_TYPE_CARD);
-		Insets contentInsets = getContentBorderInsets( tabPlacement );
+		Insets contentInsets = atBottom
+			? ((!rotateTabRuns && runCount > 1 && !isScrollTabLayout() && getRunForTab( tabPane.getTabCount(), tabIndex ) > 0)
+				? new Insets( 0, 0, 0, 0 )
+				: getContentBorderInsets( tabPlacement ))
+			: null;
+
 		int tabSelectionHeight = scale( atBottom ? this.tabSelectionHeight : cardTabSelectionHeight );
 		int sx, sy;
 		switch( tabPlacement ) {
@@ -1377,7 +1454,7 @@ public class FlatTabbedPaneUI
 			else
 				g.clipRect( 0, vr.y, tabPane.getWidth(), vr.height );
 
-			paintTabSelection( g, tabPlacement, tabRect.x, tabRect.y, tabRect.width, tabRect.height );
+			paintTabSelection( g, tabPlacement, selectedIndex, tabRect.x, tabRect.y, tabRect.width, tabRect.height );
 			g.setClip( oldClip );
 		}
 	}
@@ -1530,6 +1607,11 @@ public class FlatTabbedPaneUI
 		super.getTabRunCount( tabPane );
 	}
 
+	@Override
+	protected boolean shouldRotateTabRuns( int tabPlacement ) {
+		return rotateTabRuns;
+	}
+
 	private boolean isLastInRun( int tabIndex ) {
 		int run = getRunForTab( tabPane.getTabCount(), tabIndex );
 		return lastTabInRun( tabPane.getTabCount(), run ) == tabIndex;
@@ -1685,6 +1767,16 @@ public class FlatTabbedPaneUI
 		}
 	}
 
+	private static String alignmentToString( int value, String defaultValue ) {
+		switch( value ) {
+			case LEADING:		return TABBED_PANE_ALIGN_LEADING;
+			case TRAILING:		return TABBED_PANE_ALIGN_TRAILING;
+			case CENTER:		return TABBED_PANE_ALIGN_CENTER;
+			case FILL:			return TABBED_PANE_ALIGN_FILL;
+			default:			return defaultValue;
+		}
+	}
+
 	protected static int parseTabWidthMode( String str ) {
 		if( str == null )
 			return WIDTH_MODE_PREFERRED;

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

@@ -171,6 +171,22 @@ public class FlatTableHeaderUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		if( key.equals( "sortIconPosition" ) ) {
+			switch( sortIconPosition ) {
+				default:
+				case SwingConstants.RIGHT:	return "right";
+				case SwingConstants.LEFT:	return "left";
+				case SwingConstants.TOP:	return "top";
+				case SwingConstants.BOTTOM:	return "bottom";
+			}
+		}
+
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	private static int parseSortIconPosition( String str ) {
 		if( str == null )
 			str = "";

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

@@ -286,6 +286,12 @@ public class FlatTableUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	/**
 	 * Toggle selection colors from focused to inactive and vice versa.
 	 *

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

@@ -86,6 +86,13 @@ public class FlatTextAreaUI
 
 	@Override
 	public void installUI( JComponent c ) {
+		if( FlatUIUtils.needsLightAWTPeer( c ) )
+			FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> installUIImpl( c ) );
+		else
+			installUIImpl( c );
+	}
+
+	private void installUIImpl( JComponent c ) {
 		super.installUI( c );
 
 		installStyle();
@@ -183,6 +190,12 @@ public class FlatTextAreaUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	private void updateBackground() {
 		FlatTextFieldUI.updateBackground( getComponent(), background,
 			disabledBackground, inactiveBackground,

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

@@ -128,6 +128,13 @@ public class FlatTextFieldUI
 
 	@Override
 	public void installUI( JComponent c ) {
+		if( FlatUIUtils.needsLightAWTPeer( c ) )
+			FlatUIUtils.runWithLightAWTPeerUIDefaults( () -> installUIImpl( c ) );
+		else
+			installUIImpl( c );
+	}
+
+	private void installUIImpl( JComponent c ) {
 		super.installUI( c );
 
 		leadingIcon = clientProperty( c, TEXT_FIELD_LEADING_ICON, null, Icon.class );
@@ -354,6 +361,12 @@ public class FlatTextFieldUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, getComponent().getBorder() );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, getComponent().getBorder(), key );
+	}
+
 	private void updateBackground() {
 		updateBackground( getComponent(), background,
 			disabledBackground, inactiveBackground,

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

@@ -191,6 +191,12 @@ public class FlatTextPaneUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	private void updateBackground() {
 		FlatTextFieldUI.updateBackground( getComponent(), background,
 			disabledBackground, inactiveBackground,

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

@@ -24,6 +24,7 @@ import java.awt.Container;
 import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.EventQueue;
+import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Frame;
 import java.awt.Graphics;
@@ -32,6 +33,7 @@ import java.awt.Image;
 import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentEvent;
@@ -54,6 +56,7 @@ import javax.swing.BoxLayout;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
+import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JMenuBar;
 import javax.swing.JPanel;
@@ -71,6 +74,7 @@ import com.formdev.flatlaf.util.UIScale;
 /**
  * Provides the Flat LaF title bar.
  *
+ * @uiDefault TitlePane.font								Font
  * @uiDefault TitlePane.background							Color
  * @uiDefault TitlePane.inactiveBackground					Color
  * @uiDefault TitlePane.foreground							Color
@@ -79,6 +83,7 @@ import com.formdev.flatlaf.util.UIScale;
  * @uiDefault TitlePane.borderColor							Color	optional
  * @uiDefault TitlePane.unifiedBackground					boolean
  * @uiDefault TitlePane.showIcon							boolean
+ * @uiDefault TitlePane.showIconInDialogs					boolean
  * @uiDefault TitlePane.noIconLeftGap						int
  * @uiDefault TitlePane.iconSize							Dimension
  * @uiDefault TitlePane.iconMargins							Insets
@@ -102,6 +107,7 @@ import com.formdev.flatlaf.util.UIScale;
 public class FlatTitlePane
 	extends JComponent
 {
+	/** @since 2.5 */ protected final Font titleFont = UIManager.getFont( "TitlePane.font" );
 	protected final Color activeBackground = UIManager.getColor( "TitlePane.background" );
 	protected final Color inactiveBackground = UIManager.getColor( "TitlePane.inactiveBackground" );
 	protected final Color activeForeground = UIManager.getColor( "TitlePane.foreground" );
@@ -110,6 +116,7 @@ public class FlatTitlePane
 	protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );
 
 	/** @since 2 */ protected final boolean showIcon = FlatUIUtils.getUIBoolean( "TitlePane.showIcon", true );
+	/** @since 2.5 */ protected final boolean showIconInDialogs = FlatUIUtils.getUIBoolean( "TitlePane.showIconInDialogs", true );
 	/** @since 2 */ protected final int noIconLeftGap = FlatUIUtils.getUIInt( "TitlePane.noIconLeftGap", 8 );
 	protected final Dimension iconSize = UIManager.getDimension( "TitlePane.iconSize" );
 	/** @since 2.4 */ protected final int titleMinimumWidth = FlatUIUtils.getUIInt( "TitlePane.titleMinimumWidth", 60 );
@@ -357,6 +364,7 @@ public class FlatTitlePane
 			restoreButton.setVisible( resizable && maximized );
 
 			if( maximized &&
+				!(SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window )) &&
 				rootPane.getClientProperty( "_flatlaf.maximizedBoundsUpToDate" ) == null )
 			{
 				rootPane.putClientProperty( "_flatlaf.maximizedBoundsUpToDate", null );
@@ -387,9 +395,13 @@ public class FlatTitlePane
 	}
 
 	protected void updateIcon() {
+		boolean defaultShowIcon = showIcon;
+		if( !showIconInDialogs && rootPane.getParent() instanceof JDialog )
+			defaultShowIcon = false;
+
 		// get window images
 		List<Image> images = null;
-		if( clientPropertyBoolean( rootPane, TITLE_BAR_SHOW_ICON, showIcon ) ) {
+		if( clientPropertyBoolean( rootPane, TITLE_BAR_SHOW_ICON, defaultShowIcon ) ) {
 			images = window.getIconImages();
 			if( images.isEmpty() ) {
 				// search in owners
@@ -737,6 +749,17 @@ debug*/
 		}
 	}
 
+	private void maximizeOrRestore() {
+		if( !(window instanceof Frame) || !((Frame)window).isResizable() )
+			return;
+
+		Frame frame = (Frame) window;
+		if( (frame.getExtendedState() & Frame.MAXIMIZED_BOTH) != 0 )
+			restore();
+		else
+			maximize();
+	}
+
 	/**
 	 * Closes the window.
 	 */
@@ -861,26 +884,32 @@ debug*/
 					r.height -= resizeHeight;
 				}
 
-				Component horizontalGlue = findHorizontalGlue( menuBar );
-				if( horizontalGlue != null ) {
-					// If menu bar is embedded and contains a horizontal glue component,
-					// then split the hit test spot into two spots so that
-					// the glue component area can be used to move the window.
+				int count = menuBar.getComponentCount();
+				for( int i = count - 1; i >= 0; i-- ) {
+					Component c = menuBar.getComponent( i );
+					if( c instanceof Box.Filler ||
+						(c instanceof JComponent && clientPropertyBoolean( (JComponent) c, COMPONENT_TITLE_BAR_CAPTION, false ) ) )
+					{
+						// If menu bar is embedded and contains a horizontal glue or caption component,
+						// then split the hit test spot so that
+						// the glue/caption component area can be used to move the window.
 
-					Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, window );
-					int x2 = glueLocation.x + horizontalGlue.getWidth();
-					Rectangle r2;
-					if( getComponentOrientation().isLeftToRight() ) {
-						r2 = new Rectangle( x2, r.y, (r.x + r.width) - x2, r.height );
+						Point glueLocation = SwingUtilities.convertPoint( c, 0, 0, window );
+						int x2 = glueLocation.x + c.getWidth();
+						Rectangle r2;
+						if( getComponentOrientation().isLeftToRight() ) {
+							r2 = new Rectangle( x2, r.y, (r.x + r.width) - x2, r.height );
 
-						r.width = glueLocation.x - r.x;
-					} else {
-						r2 = new Rectangle( r.x, r.y, glueLocation.x - r.x, r.height );
+							r.width = glueLocation.x - r.x;
+						} else {
+							r2 = new Rectangle( r.x, r.y, glueLocation.x - r.x, r.height );
 
-						r.width = (r.x + r.width) - x2;
-						r.x = x2;
+							r.width = (r.x + r.width) - x2;
+							r.x = x2;
+						}
+						if( r2.width > 0 )
+							hitTestSpots.add( r2 );
 					}
-					hitTestSpots.add( r2 );
 				}
 
 				hitTestSpots.add( r );
@@ -986,6 +1015,14 @@ debug*/
 			super( false );
 		}
 
+		@Override
+		protected void installDefaults( JLabel c ) {
+			super.installDefaults( c );
+
+			if( titleFont != null )
+				c.setFont( titleFont );
+		}
+
 		@Override
 		protected String layoutCL( JLabel label, FontMetrics fontMetrics, String text, Icon icon,
 			Rectangle viewR, Rectangle iconR, Rectangle textR )
@@ -1148,23 +1185,30 @@ debug*/
 		//---- interface MouseListener ----
 
 		private Point dragOffset;
+		private boolean nativeMove;
+		private long lastSingleClickWhen;
 
 		@Override
 		public void mouseClicked( MouseEvent e ) {
+			// on Linux, when using native library, the mouse clicked event
+			// is usually not sent and maximize/restore is done in mouse pressed event
+			// this check is here for the case that a mouse clicked event comes thru for some reason
+			if( SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) ) {
+				// see comment in mousePressed()
+				if( lastSingleClickWhen != 0 && (e.getWhen() - lastSingleClickWhen) <= getMultiClickInterval() ) {
+					lastSingleClickWhen = 0;
+					maximizeOrRestore();
+				}
+				return;
+			}
+
 			if( e.getClickCount() == 2 && SwingUtilities.isLeftMouseButton( e ) ) {
 				if( e.getSource() == iconLabel ) {
 					// double-click on icon closes window
 					close();
-				} else if( !hasNativeCustomDecoration() &&
-					window instanceof Frame &&
-					((Frame)window).isResizable() )
-				{
+				} else if( !hasNativeCustomDecoration() ) {
 					// maximize/restore on double-click
-					Frame frame = (Frame) window;
-					if( (frame.getExtendedState() & Frame.MAXIMIZED_BOTH) != 0 )
-						restore();
-					else
-						maximize();
+					maximizeOrRestore();
 				}
 			}
 		}
@@ -1174,10 +1218,56 @@ debug*/
 			if( window == null )
 				return; // should newer occur
 
+			// on Linux, show window menu
+			if( SwingUtilities.isRightMouseButton( e ) &&
+				SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) )
+			{
+				e.consume();
+				FlatNativeLinuxLibrary.showWindowMenu( window, e );
+				return;
+			}
+
 			if( !SwingUtilities.isLeftMouseButton( e ) )
 				return;
 
 			dragOffset = SwingUtilities.convertPoint( FlatTitlePane.this, e.getPoint(), window );
+			nativeMove = false;
+
+			// on Linux, move or maximize/restore window
+			if( SystemInfo.isLinux && FlatNativeLinuxLibrary.isWMUtilsSupported( window ) ) {
+				// The fired Java mouse events, when doing a double-click and the first click
+				// sends a _NET_WM_MOVERESIZE message, are different for various Linux distributions:
+				//   CentOS 7      (GNOME 3.28.2, X11):   PRESSED(clickCount=1) PRESSED(clickCount=2) RELEASED(clickCount=2)
+				//   Ubuntu 20.04  (GNOME 3.36.1, X11):   PRESSED(clickCount=1) PRESSED(clickCount=2) RELEASED(clickCount=2)
+				//   Ubuntu 22.04  (GNOME 42.2, Wayland): PRESSED(clickCount=1)                       RELEASED(clickCount=1) CLICKED(clickCount=1)
+				//   Kubuntu 22.04 (KDE 5.24.4, X11):     PRESSED(clickCount=1) PRESSED(clickCount=1) RELEASED(clickCount=1)
+
+				// double-click is not always recognized in Java when using _NET_WM_MOVERESIZE message
+				int clickCount = e.getClickCount();
+				if( clickCount == 1 && lastSingleClickWhen != 0 && (e.getWhen() - lastSingleClickWhen) <= getMultiClickInterval() )
+					clickCount = 2;
+
+				switch( clickCount ) {
+					case 1:
+						// move window via _NET_WM_MOVERESIZE message
+						e.consume();
+						nativeMove = FlatNativeLinuxLibrary.moveOrResizeWindow( window, e, FlatNativeLinuxLibrary.MOVE );
+						lastSingleClickWhen = e.getWhen();
+						break;
+
+					case 2:
+						// maximize/restore on double-click
+						// also done here because no mouse clicked event is sent when using _NET_WM_MOVERESIZE message
+						lastSingleClickWhen = 0;
+						maximizeOrRestore();
+						break;
+				}
+			}
+		}
+
+		private int getMultiClickInterval() {
+			Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "awt.multiClickInterval" );
+			return (value instanceof Integer) ? (Integer) value : 500;
 		}
 
 		@Override public void mouseReleased( MouseEvent e ) {}
@@ -1188,9 +1278,12 @@ debug*/
 
 		@Override
 		public void mouseDragged( MouseEvent e ) {
-			if( window == null )
+			if( window == null || dragOffset == null )
 				return; // should newer occur
 
+			if( nativeMove )
+				return;
+
 			if( !SwingUtilities.isLeftMouseButton( e ) )
 				return;
 

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

@@ -160,6 +160,12 @@ public class FlatToolBarSeparatorUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	@Override
 	public Dimension getPreferredSize( JComponent c ) {
 		Dimension size = ((JToolBar.Separator)c).getSeparatorSize();

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

@@ -201,6 +201,12 @@ public class FlatToolBarUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	/** @since 1.4 */
 	protected void setButtonsFocusable( boolean focusable ) {
 		for( Component c : toolBar.getComponents() )

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

@@ -340,6 +340,12 @@ public class FlatTreeUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
 	}
 
+	/** @since 2.5 */
+	@Override
+	public Object getStyleableValue( JComponent c, String key ) {
+		return FlatStylingSupport.getAnnotatedStyleableValue( this, key );
+	}
+
 	/**
 	 * Same as super.paintRow(), but supports wide selection and uses
 	 * inactive selection background/foreground if tree is not focused.

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

@@ -33,6 +33,7 @@ import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.Stroke;
+import java.awt.SystemColor;
 import java.awt.Window;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -45,20 +46,27 @@ import java.util.WeakHashMap;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import javax.swing.JComponent;
+import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.JTextField;
 import javax.swing.LookAndFeel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
+import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import com.formdev.flatlaf.FlatClientProperties;
+import com.formdev.flatlaf.FlatIntelliJLaf;
+import com.formdev.flatlaf.FlatLaf;
+import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.FlatSystemProperties;
 import com.formdev.flatlaf.util.DerivedColor;
 import com.formdev.flatlaf.util.Graphics2DProxy;
 import com.formdev.flatlaf.util.HiDPIUtils;
+import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -241,6 +249,11 @@ public class FlatUIUtils
 			}
 		}
 
+		// invoke hasFocus() here because components may have overridden this method
+		// (e.g. Swing delegate components used for AWT components on macOS)
+		if( c.hasFocus() )
+			return true;
+
 		return keyboardFocusManager.getPermanentFocusOwner() == c &&
 			isInActiveWindow( c, keyboardFocusManager.getActiveWindow() );
 	}
@@ -251,6 +264,38 @@ public class FlatUIUtils
 			(window != null && window.getType() == Window.Type.POPUP && window.getOwner() == activeWindow);
 	}
 
+	static boolean isAWTPeer( Component c ) {
+		// on macOS, Swing components are used for AWT components
+		if( SystemInfo.isMacOS )
+			return c.getClass().getName().startsWith( "sun.lwawt.LW" );
+		return false;
+	}
+
+	/**
+	 * Checks whether component is used as peer for AWT (on macOS) and
+	 * whether a dark FlatLaf theme is active, which requires special handling
+	 * because AWT always uses light colors.
+	 */
+	static boolean needsLightAWTPeer( JComponent c ) {
+		return FlatUIUtils.isAWTPeer( c ) && FlatLaf.isLafDark();
+	}
+
+	private static UIDefaults lightAWTPeerDefaults;
+
+	static void runWithLightAWTPeerUIDefaults( Runnable runnable ) {
+		if( lightAWTPeerDefaults == null ) {
+			FlatLaf lightLaf = UIManager.getInt( "Component.focusWidth" ) >= 2
+				? new FlatIntelliJLaf()
+				: new FlatLightLaf();
+			lightAWTPeerDefaults = lightLaf.getDefaults();
+		}
+
+		FlatLaf.runWithUIDefaultsGetter( key -> {
+			Object value = lightAWTPeerDefaults.get( key );
+			return (value != null) ? value : FlatLaf.NULL_VALUE;
+		}, runnable );
+	}
+
 	/**
 	 * Returns whether the given component is in a window that is in full-screen mode.
 	 */
@@ -335,7 +380,7 @@ public class FlatUIUtils
 	 */
 	public static Object[] setRenderingHints( Graphics g ) {
 		Graphics2D g2 = (Graphics2D) g;
-		Object[] oldRenderingHints = new Object[] {
+		Object[] oldRenderingHints = {
 			g2.getRenderingHint( RenderingHints.KEY_ANTIALIASING ),
 			g2.getRenderingHint( RenderingHints.KEY_STROKE_CONTROL ),
 		};
@@ -352,8 +397,10 @@ public class FlatUIUtils
 	 */
 	public static void resetRenderingHints( Graphics g, Object[] oldRenderingHints ) {
 		Graphics2D g2 = (Graphics2D) g;
-		g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, oldRenderingHints[0] );
-		g2.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, oldRenderingHints[1] );
+		if( oldRenderingHints[0] != null )
+			g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, oldRenderingHints[0] );
+		if( oldRenderingHints[1] != null )
+			g2.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, oldRenderingHints[1] );
 	}
 
 	/**
@@ -376,7 +423,7 @@ public class FlatUIUtils
 		}
 
 		Graphics2D g2 = (Graphics2D) g;
-		Object[] oldRenderingHints2 = new Object[] {
+		Object[] oldRenderingHints2 = {
 			g2.getRenderingHint( RenderingHints.KEY_ANTIALIASING ),
 			g2.getRenderingHint( RenderingHints.KEY_STROKE_CONTROL ),
 		};
@@ -664,9 +711,9 @@ public class FlatUIUtils
 	 * is smaller than its bounds (for the focus decoration).
 	 */
 	public static void paintParentBackground( Graphics g, JComponent c ) {
-		Container parent = findOpaqueParent( c );
-		if( parent != null ) {
-			g.setColor( parent.getBackground() );
+		Color background = getParentBackground( c );
+		if( background != null ) {
+			g.setColor( background );
 			g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
 		}
 	}
@@ -676,9 +723,20 @@ public class FlatUIUtils
 	 */
 	public static Color getParentBackground( JComponent c ) {
 		Container parent = findOpaqueParent( c );
-		return (parent != null)
-			? parent.getBackground()
-			: UIManager.getColor( "Panel.background" ); // fallback, probably never used
+		// parent.getBackground() may return null
+		// (e.g. for Swing delegate components used for AWT components on macOS)
+		Color background = (parent != null) ? parent.getBackground() : null;
+		if( background != null )
+			return background;
+
+		if( isAWTPeer( c ) ) {
+			// AWT peers usually use component background, except for TextField and ScrollPane
+			return c instanceof JTextField || c instanceof JScrollPane || c.getBackground() == null
+				? SystemColor.window
+				: c.getBackground();
+		}
+
+		return UIManager.getColor( "Panel.background" );
 	}
 
 	/**

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

@@ -19,8 +19,9 @@ package com.formdev.flatlaf.util;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import javax.swing.JComponent;
 
 /**
@@ -32,8 +33,8 @@ import javax.swing.JComponent;
  */
 public class JavaCompatibility
 {
-	private static Method drawStringUnderlineCharAtMethod;
-	private static Method getClippedStringMethod;
+	private static MethodHandle drawStringUnderlineCharAtMethod;
+	private static MethodHandle getClippedStringMethod;
 
 	/**
 	 * Java 8: sun.swing.SwingUtilities2.drawStringUnderlineCharAt( JComponent c,
@@ -51,9 +52,10 @@ public class JavaCompatibility
 					Class<?> cls = Class.forName( SystemInfo.isJava_9_orLater
 						? "javax.swing.plaf.basic.BasicGraphicsUtils"
 						: "sun.swing.SwingUtilities2" );
-					drawStringUnderlineCharAtMethod = cls.getMethod( "drawStringUnderlineCharAt", SystemInfo.isJava_9_orLater
+					MethodType mt = MethodType.methodType( void.class, SystemInfo.isJava_9_orLater
 						? new Class[] { JComponent.class, Graphics2D.class, String.class, int.class, float.class, float.class }
 						: new Class[] { JComponent.class, Graphics.class, String.class, int.class, int.class, int.class } );
+					drawStringUnderlineCharAtMethod = MethodHandles.publicLookup().findStatic( cls, "drawStringUnderlineCharAt", mt );
 				} catch( Exception ex ) {
 					LoggingFacade.INSTANCE.logSevere( null, ex );
 					throw new RuntimeException( ex );
@@ -63,10 +65,10 @@ public class JavaCompatibility
 
 		try {
 			if( SystemInfo.isJava_9_orLater )
-				drawStringUnderlineCharAtMethod.invoke( null, c, g, text, underlinedIndex, (float) x, (float) y );
+				drawStringUnderlineCharAtMethod.invoke( c, (Graphics2D) g, text, underlinedIndex, (float) x, (float) y );
 			else
-				drawStringUnderlineCharAtMethod.invoke( null, c, g, text, underlinedIndex, x, y );
-		} catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) {
+				drawStringUnderlineCharAtMethod.invoke( c, g, text, underlinedIndex, x, y );
+		} catch( Throwable ex ) {
 			LoggingFacade.INSTANCE.logSevere( null, ex );
 			throw new RuntimeException( ex );
 		}
@@ -86,10 +88,11 @@ public class JavaCompatibility
 					Class<?> cls = Class.forName( SystemInfo.isJava_9_orLater
 						? "javax.swing.plaf.basic.BasicGraphicsUtils"
 						: "sun.swing.SwingUtilities2" );
-					getClippedStringMethod = cls.getMethod( SystemInfo.isJava_9_orLater
+					MethodType mt = MethodType.methodType( String.class, JComponent.class, FontMetrics.class, String.class, int.class );
+					getClippedStringMethod = MethodHandles.publicLookup().findStatic( cls, SystemInfo.isJava_9_orLater
 							? "getClippedString"
 							: "clipStringIfNecessary",
-						JComponent.class, FontMetrics.class, String.class, int.class );
+						mt );
 				} catch( Exception ex ) {
 					LoggingFacade.INSTANCE.logSevere( null, ex );
 					throw new RuntimeException( ex );
@@ -98,8 +101,8 @@ public class JavaCompatibility
 		}
 
 		try {
-			return (String) getClippedStringMethod.invoke( null, c, fm, string, availTextWidth );
-		} catch( IllegalAccessException | IllegalArgumentException | InvocationTargetException ex ) {
+			return (String) getClippedStringMethod.invoke( c, fm, string, availTextWidth );
+		} catch( Throwable ex ) {
 			LoggingFacade.INSTANCE.logSevere( null, ex );
 			throw new RuntimeException( ex );
 		}

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

@@ -138,7 +138,7 @@ public class NativeLibrary
 			System.load( libraryFile.getAbsolutePath() );
 			return true;
 		} catch( Throwable ex ) {
-			log( null, ex );
+			log( ex.getMessage(), ex );
 			return false;
 		}
 	}

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

@@ -442,8 +442,8 @@ MenuItem.iconTextGap = 6
 MenuItem.textAcceleratorGap = 24
 MenuItem.textNoAcceleratorGap = 6
 MenuItem.acceleratorArrowGap = 2
-MenuItem.acceleratorDelimiter = +
-[mac]MenuItem.acceleratorDelimiter = 
+MenuItem.acceleratorDelimiter = "+"
+[mac]MenuItem.acceleratorDelimiter = ""
 
 # for MenuItem.selectionType = underline
 MenuItem.underlineSelectionBackground = @menuHoverBackground
@@ -785,6 +785,7 @@ TitlePane.useWindowDecorations = true
 TitlePane.menuBarEmbedded = true
 TitlePane.unifiedBackground = true
 TitlePane.showIcon = true
+TitlePane.showIconInDialogs = true
 TitlePane.noIconLeftGap = 8
 TitlePane.iconSize = 16,16
 TitlePane.iconMargins = 3,8,3,8

flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java

@@ -284,6 +284,8 @@ public class TestFlatStyleableInfo
 		Map<String, Class<?>> expected = expectedMap(
 			"itemMargins", Insets.class,
 			"hoverBackground", Color.class,
+			"selectionBackground", Color.class,
+			"selectionForeground", Color.class,
 			"underlineSelectionBackground", Color.class,
 			"underlineSelectionColor", Color.class,
 			"underlineSelectionHeight", int.class,
@@ -722,6 +724,7 @@ public class TestFlatStyleableInfo
 			"tabSeparatorsFullHeight", boolean.class,
 			"hasFullBorder", boolean.class,
 			"tabsOpaque", boolean.class,
+			"rotateTabRuns", boolean.class,
 
 			"tabType", String.class,
 			"tabsPopupPolicy", String.class,

flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java

@@ -436,6 +436,8 @@ public class TestFlatStyling
 
 		ui.applyStyle( "itemMargins: 1,2,3,4" );
 		ui.applyStyle( "hoverBackground: #fff" );
+		ui.applyStyle( "selectionBackground: #fff" );
+		ui.applyStyle( "selectionForeground: #fff" );
 		ui.applyStyle( "underlineSelectionBackground: #fff" );
 		ui.applyStyle( "underlineSelectionColor: #fff" );
 		ui.applyStyle( "underlineSelectionHeight: 3" );
@@ -891,6 +893,7 @@ public class TestFlatStyling
 		ui.applyStyle( "tabSeparatorsFullHeight: false" );
 		ui.applyStyle( "hasFullBorder: false" );
 		ui.applyStyle( "tabsOpaque: false" );
+		ui.applyStyle( "rotateTabRuns: false" );
 
 		ui.applyStyle( "tabType: card" );
 		ui.applyStyle( "tabsPopupPolicy: asNeeded" );

flatlaf-core/svg/ArrowButton-chevron.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="4" viewBox="0 0 8 4">
+  <polyline fill="none" stroke="#6E6E6E" points="0 4 4 0 8 4"/>
+</svg>

flatlaf-core/svg/ArrowButton-triangle.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="9" height="5" viewBox="0 0 9 5">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="0 5 4.5 0 9 5"/>
+</svg>

flatlaf-core/svg/AscendingSortIcon-chevron.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="5" viewBox="0 0 10 5">
+  <polyline fill="none" stroke="#6E6E6E" points="1 4 5 0 9 4"/>
+</svg>

flatlaf-core/svg/AscendingSortIcon-triangle.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="5" viewBox="0 0 10 5">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points=".5 5 5 0 9.5 5"/>
+</svg>

flatlaf-core/svg/MenuArrowIcon-chevron.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="10" viewBox="0 0 6 10">
+  <polyline fill="none" stroke="#6E6E6E" points="1 1 5 5 1 9"/>
+</svg>

flatlaf-core/svg/MenuArrowIcon-triangle.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="10" viewBox="0 0 6 10">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="0 .5 5 5 0 9.5"/>
+</svg>

flatlaf-core/svg/TreeCollapsedIcon-chevron.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="3 1 3 2.5 6 5.5 3 8.5 3 10 4.5 10 9 5.5 4.5 1"/>
+</svg>

flatlaf-core/svg/TreeCollapsedIcon-triangle.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <polygon fill="#6E6E6E" fill-rule="evenodd" points="2 1 2 10 10 5.5"/>
+</svg>

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

@@ -2,6 +2,23 @@
   "name": "Hiberbee Dark",
   "author": "Vlad Volkov",
   "dark": true,
+  "icons": {
+    "ColorPalette": {
+      "Actions.Blue": "#78dce8",
+      "Actions.Green": "#92d923",
+      "Actions.Grey": "#93918c",
+      "Actions.Red": "#fb3b45",
+      "Actions.Yellow": "#FFD866",
+      "Objects.Blue": "#78dce8",
+      "Objects.Green": "#92d923",
+      "Objects.Pink": "#ff6188",
+      "Objects.Purple": "#ab9df2",
+      "Objects.Red": "#fb3b45",
+      "Objects.RedStatus": "#fb3b45",
+      "Objects.Yellow": "#FFD866",
+      "Objects.YellowDark": "#FFB900"
+    }
+  },
   "editorScheme": "/colors/Dark.xml",
   "colors": {
     "black": "#000000",
@@ -22,7 +39,7 @@
     "deepBlue": "#3199b3",
     "orangeMonokaiPro": "#fc9867",
     "greenMonokaiPro": "#a9dc76",
-    "yellow": "#FFB900",
+    "yellow": "#ffd64c",
     "purpleWinPalette": "#b4a0ff",
     "purpleMonokaiPro": "#ab9df2",
     "greenWinPalette": "#40c5af",
@@ -49,7 +66,7 @@
     "transparentGreen": "#5B80217f",
     "transparentRed": "#F250227f",
     "transparentViolet": "#242221ff",
-    "transparentYellow": "#FFB9007f"
+    "transparentYellow": "#FFB9007a"
   },
   "ui": {
     "*": {
@@ -78,7 +95,6 @@
       "color": "border"
     },
     "Button": {
-      "arc": 5,
       "default": {
         "endBackground": "greyDot80",
         "endBorderColor": "greyDot70",
@@ -125,7 +141,6 @@
       "selectionInactiveBackground": "greyDot85"
     },
     "Component": {
-      "arc": "4",
       "iconColor": "yellow",
       "disabledBorderColor": "greyDot75",
       "infoForeground": "greyDot50",
@@ -160,22 +175,25 @@
     },
     "EditorTabs": {
       "underlineHeight": 1,
-      "borderColor": "editorDarkerBg",
-      "hoverBackground": "editorBg",
+      "hoverBackground": "greyDot95",
+      "borderColor": "border",
       "background": "editorPaneBg",
+      "inactiveColoredFileBackground": "editorPaneBg",
       "inactiveUnderlineColor": "editorPaneBg",
-      "underlinedTabForeground": "textColor"
+      "underlinedTabBackground": "editorPaneBg",
+      "underlinedTabForeground": "yellow"
     },
-    "EditorTabs.inactiveColoredFileBackground": true,
     "FileColor": {
+      "Gray": "greyDot70",
       "Blue": "#23282d",
       "Green": "#232d28",
       "Orange": "#2d2823",
       "Rose": "#2d2323",
       "Violet": "#2D232D",
-      "Yellow": "#2d2d23"
+      "Yellow": "#3b3b19"
     },
     "FormattedTextField": {
+      "caretForeground": "yellow",
       "foreground": "textColor",
       "selectionBackground": "greyDot95",
       "inactiveBackground": "greyDot80",
@@ -186,14 +204,23 @@
       "infoForeground": "greyDot33",
       "lineSeparatorColor": "greyDot70"
     },
-    "InformationHint.borderColor": "greyDot75",
-    "InplaceRefactoringPopup.borderColor": "greyDot75",
+    "InformationHint": {
+      "borderColor": "border"
+    },
+    "InplaceRefactoringPopup.borderColor": "border",
     "Label": {
       "disabledForeground": "greyDot33",
       "disabledText": "greyDot33",
       "foreground": "greyDot20",
       "infoForeground": "greyDot50"
     },
+    "Link": {
+      "activeForeground": "blue",
+      "hoverForeground": "yellow",
+      "secondaryForeground": "lightBlue",
+      "visitedForeground": "purpleMonokaiPro",
+      "pressedForeground": "deepBlue"
+    },
     "Link.hoverForeground": "yellow",
     "MemoryIndicator.allocatedBackground": "green",
     "MemoryIndicator.usedBackground": "red",
@@ -209,16 +236,20 @@
     "Notification.ToolWindow.errorBackground": "greyDot95",
     "Notification.ToolWindow.errorBorderColor": "red",
     "Notification.ToolWindow.errorForeground": "#EE7762",
-    "Notification.ToolWindow.informativeBackground": "greyDot95",
-    "Notification.ToolWindow.informativeBorderColor": "#92D923",
-    "Notification.ToolWindow.informativeForeground": "#92D923",
+    "Notification.ToolWindow.informativeBackground": "editorPaneBg",
+    "Notification.ToolWindow.informativeBorderColor": "border",
+    "Notification.ToolWindow.informativeForeground": "textColor",
     "Notification.ToolWindow.warningBackground": "greyDot95",
     "Notification.ToolWindow.warningBorderColor": "yellow",
     "Notification.ToolWindow.warningForeground": "yellow",
-    "Notification.background": "greyDot95",
+    "Notification.background": "editorPaneBg",
+    "Notification.borderColor": "border",
     "Notification.errorBackground": "greyDot95",
     "Notification.errorBorderColor": "red",
     "Notification.errorForeground": "#EE7762",
+    "Notification.foreground": "textColor",
+    "NotificationsToolwindow.newNotification.background": "editorPaneBg",
+    "NotificationsToolwindow.newNotification.hoverBackground": "greyDot95",
     "OptionPane": {
       "background": "editorPaneBg",
       "foreground": "greyDot20"
@@ -245,11 +276,11 @@
     "Plugins.Tab.hoverBackground": "editorBg",
     "Plugins.Tab.selectedBackground": "editorPaneBg",
     "Plugins.background": "editorPaneBg",
-    "Plugins.lightSelectionBackground": "#242220",
     "Plugins.disabledForeground": "greyDot50",
+    "Plugins.hoverBackground": "editorBg",
+    "Plugins.lightSelectionBackground": "#242220",
     "Plugins.tagBackground": "editorBg",
     "Plugins.tagForeground": "greyDot33",
-    "Plugins.hoverBackground": "editorBg",
     "Popup.Advertiser.background": "greyDot85",
     "Popup.Advertiser.foreground": "greyDot50",
     "Popup.Header.activeBackground": "greyDot75",

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

@@ -97,9 +97,10 @@
     },
     "EditorPane.inactiveBackground": "#2b303b",
     "EditorTabs": {
-      "underlinedTabBackground": "#2b303b",
-      "underlineHeight": "0",
-      "borderColor": "#2b303b"
+      "borderColor": "#2b303b",
+      "underlinedTabBackground": "2b303b",
+      "background": "#1c1f26",
+      "underlineHeight": "2"
     },
     "Link": {
       "activeForeground": "#7FA1B3",

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

@@ -7,23 +7,23 @@
     "bg30": "#2f343f30",
     "fg": "#D3DAE3",
     "text": "#8b9eb5",
-    "selBg": "#8888FF",
-    "selBg20": "#8888FF20",
+    "selBg": "#414181",
+    "selBg20": "#41418120",
     "selFg": "#FFFFFF",
     "activeFg": "#FFFFFF",
     "border": "#404552",
     "excl": "#37373d",
-    "second": "#393f4c45",
-    "dis": "#D3DAE3",
-    "accent": "#42A5F5",
-    "accent2": "#42A5F52",
-    "accent50": "#42A5F550",
-    "accent70": "#42A5F570",
+    "second": "#393f4c",
+    "dis": "#a2a2a2",
+    "accent": "#5294E2",
+    "accent2": "#5294E22",
+    "accent50": "#5294E250",
+    "accent70": "#5294E270",
     "cs": "#262b33",
     "button": "#383C4A",
     "table": "#41416A",
     "tree": "#09477170",
-    "hl": "#393f4c",
+    "hl": "#444A58",
     "notif": "#262a33",
     "hc": "#262b33",
     "shadow": "undefined",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -7,23 +7,23 @@
     "bg30": "#2f343f30",
     "fg": "#D3DAE3",
     "text": "#8b9eb5",
-    "selBg": "#8888FF",
-    "selBg20": "#8888FF20",
+    "selBg": "#414181",
+    "selBg20": "#41418120",
     "selFg": "#FFFFFF",
     "activeFg": "#FFFFFF",
     "border": "#404552",
     "excl": "#37373d",
-    "second": "#393f4c45",
-    "dis": "#D3DAE3",
-    "accent": "#42A5F5",
-    "accent2": "#42A5F52",
-    "accent50": "#42A5F550",
-    "accent70": "#42A5F570",
+    "second": "#393f4c",
+    "dis": "#a2a2a2",
+    "accent": "#5294E2",
+    "accent2": "#5294E22",
+    "accent50": "#5294E250",
+    "accent70": "#5294E270",
     "cs": "#262b33",
     "button": "#383C4A",
     "table": "#41416A",
     "tree": "#09477170",
-    "hl": "#393f4c",
+    "hl": "#444A58",
     "notif": "#262a33",
     "hc": "#2f343f",
     "shadow": "undefined",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -19,13 +19,13 @@
     "accent2": "#2979ff2",
     "accent50": "#2979ff50",
     "accent70": "#2979ff70",
-    "cs": "#eaeae",
+    "cs": "#eaeaeb",
     "button": "#DBDBDC",
     "table": "#DBDBDC",
     "tree": "#DBDBDC80",
     "hl": "#FFFFFF",
     "notif": "#F2F2F2",
-    "hc": "#eaeae",
+    "hc": "#eaeaeb",
     "shadow": "undefined",
     "white": "#986801",
     "blue": "#4078F2",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -19,7 +19,7 @@
     "accent2": "#2979ff2",
     "accent50": "#2979ff50",
     "accent70": "#2979ff70",
-    "cs": "#eaeae",
+    "cs": "#eaeaeb",
     "button": "#DBDBDC",
     "table": "#DBDBDC",
     "tree": "#DBDBDC80",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -23,17 +23,17 @@
     "button": "#393C4B",
     "table": "#44475A",
     "tree": "#44475A50",
-    "hl": "#6272A4",
+    "hl": "#44475a",
     "notif": "#1D2228",
     "hc": "#191A21",
     "shadow": "undefined",
     "white": "#F8F8F2",
     "blue": "#8aff80",
-    "red": "#f780bf",
+    "red": "#FF79C5",
     "yellow": "#8aff80",
     "green": "#feff80",
     "gray": "#6272A4",
-    "purple": "#f780bf",
+    "purple": "#FF79C5",
     "orange": "#9580ff"
   },
   "editorScheme": "colors/Dracula.xml",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -23,17 +23,17 @@
     "button": "#393C4B",
     "table": "#44475A",
     "tree": "#44475A50",
-    "hl": "#6272A4",
+    "hl": "#44475a",
     "notif": "#1D2228",
     "hc": "#282A36",
     "shadow": "undefined",
     "white": "#F8F8F2",
     "blue": "#8aff80",
-    "red": "#f780bf",
+    "red": "#FF79C5",
     "yellow": "#8aff80",
     "green": "#feff80",
     "gray": "#6272A4",
-    "purple": "#f780bf",
+    "purple": "#FF79C5",
     "orange": "#9580ff"
   },
   "editorScheme": "colors/Dracula.xml",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -7,8 +7,8 @@
     "bg30": "#F7F8FA30",
     "fg": "#5B6168",
     "text": "#292D31",
-    "selBg": "#bbd2f5",
-    "selBg20": "#bbd2f520",
+    "selBg": "#c6e5ff",
+    "selBg20": "#c6e5ff20",
     "selFg": "#111111",
     "activeFg": "#111111",
     "border": "#DFE1E4",
@@ -22,7 +22,7 @@
     "cs": "#fafbfc",
     "button": "#edf1f5",
     "table": "#cce5ff",
-    "tree": "#ebebeb",
+    "tree": "#e1e4e87c",
     "hl": "#CCE5FF",
     "notif": "#DFECFE",
     "hc": "#fafbfc",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },

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

@@ -7,8 +7,8 @@
     "bg30": "#F7F8FA30",
     "fg": "#5B6168",
     "text": "#292D31",
-    "selBg": "#bbd2f5",
-    "selBg20": "#bbd2f520",
+    "selBg": "#c6e5ff",
+    "selBg20": "#c6e5ff20",
     "selFg": "#111111",
     "activeFg": "#111111",
     "border": "#DFE1E4",
@@ -22,7 +22,7 @@
     "cs": "#fafbfc",
     "button": "#edf1f5",
     "table": "#cce5ff",
-    "tree": "#ebebeb",
+    "tree": "#e1e4e87c",
     "hl": "#CCE5FF",
     "notif": "#DFECFE",
     "hc": "#F7F8FA",
@@ -76,6 +76,11 @@
     "ActionToolbar": {
       "background": "hc"
     },
+    "AppInspector.GraphNode": {
+      "background": "second",
+      "borderColor": "border",
+      "focusedBorderColor": "accent"
+    },
     "AssignedMnemonic": {
       "background": "hl",
       "borderColor": "selBg",
@@ -599,7 +604,7 @@
     "link.pressed.foreground": "accent",
     "link.visited.foreground": "accent",
     "List": {
-      "background": "second",
+      "background": "bg",
       "foreground": "fg",
       "hoverBackground": "hl",
       "hoverInactiveBackground": "table",
@@ -884,6 +889,9 @@
       "selectionBackground": "hl",
       "trackColor": "hl"
     },
+    "ProgressIcon": {
+      "color": "accent"
+    },
     "PsiViewer": {
       "referenceHighlightColor": "accent"
     },
@@ -914,6 +922,13 @@
       "selectionBackground": "selBg",
       "selectionForeground": "selFg"
     },
+    "RunWidget": {
+      "Running": {
+        "background": "accent",
+        "leftHoverBackground": "accent70",
+        "leftPressedBackground": "accent"
+      }
+    },
     "ScreenView.borderColor": "border",
     "scrollbar": "bg",
     "ScrollBar": {
@@ -1008,6 +1023,8 @@
       "Repeated.File.Foreground": "fg"
     },
     "SegmentedButton": {
+      "focusedSelectedButtonColor": "hl",
+      "selectedButtonColor": "button",
       "selectedStartBorderColor": "border",
       "selectedEndBorderColor": "border"
     },