release 0.29

ComboBox: no longer ignore JComboBox.prototypeDisplayValue when computing popup width (issue #80 )
ComboBox: made class FlatComboPopup protected to allow subclassing (issue #80 )
2025-12-06 14:00:55 +03:00 · 2020-04-01 23:26:47 +02:00 · 2020-03-31 18:53:55 +02:00 · 2020-03-31 17:29:12 +02:00 · 2020-03-31 12:17:05 +02:00 · 2020-03-31 12:15:51 +02:00
35 changed files with 1274 additions and 880 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,23 @@
 FlatLaf Change Log
 ==================

+## 0.29
+
+- Linux: Fixed scaling if `GDK_SCALE` environment variable is set or if running
+  on JetBrains Runtime. (issue #69)
+- Tree: Fixed repainting wide selection on focus gained/lost.
+- ComboBox: No longer ignore `JComboBox.prototypeDisplayValue` when computing
+  popup width. (issue #80)
+- Support changing default font used for all components with automatic scaling
+  UI if using larger font. Use `UIManager.put( "defaultFont", myFont );`
+- No longer use system property `sun.java2d.uiScale`. (Java 8 only)
+- Support specifying custom scale factor in system property `flatlaf.uiScale`
+  also for Java 9 and later.
+- Demo: Support using own FlatLaf themes (`.properties` files) that are located
+  in working directory of Demo application. Shown in the "Themes" list under
+  category "Current Directory".
+
+
 ## 0.28

 - PasswordField: Warn about enabled Caps Lock.
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,8 +14,8 @@
 * limitations under the License.
 */

-val releaseVersion = "0.28"
-val developmentVersion = "0.29-SNAPSHOT"
+val releaseVersion = "0.29"
+val developmentVersion = "0.30-SNAPSHOT"

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

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatDefaultsAddon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatDefaultsAddon.java
@@ -17,6 +17,8 @@
 package com.formdev.flatlaf;

 import java.io.InputStream;
+import javax.swing.LookAndFeel;
+import javax.swing.UIDefaults;

 /**
 * Addon for FlatLaf UI defaults.
@@ -50,6 +52,13 @@ public abstract class FlatDefaultsAddon
 		return addonClass.getResourceAsStream( propertiesName );
 	}

+	/**
+	 * Allows modifying UI defaults after loading UI defaults.
+	 * The default implementation does nothing.
+	 */
+	public void afterDefaultsLoading( LookAndFeel laf, UIDefaults defaults ) {
+	}
+
 	/**
 	 * Returns the priority used to sort addon loading.
 	 * The order is only important if you want overwrite UI defaults of other addons.
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -31,8 +31,11 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -46,8 +49,10 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.UIDefaults.ActiveValue;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicLookAndFeel;
 import javax.swing.text.html.HTMLEditorKit;
 import com.formdev.flatlaf.util.SystemInfo;
@@ -266,12 +271,19 @@ public abstract class FlatLaf
 		initIconColors( defaults, isDark() );
 		FlatInputMaps.initInputMaps( defaults );

+		// get addons and sort them by priority
+		ServiceLoader<FlatDefaultsAddon> addonLoader = ServiceLoader.load( FlatDefaultsAddon.class );
+		List<FlatDefaultsAddon> addons = new ArrayList<>();
+		for( FlatDefaultsAddon addon : addonLoader )
+			addons.add( addon );
+		addons.sort( (addon1, addon2) -> addon1.getPriority() - addon2.getPriority() );
+
 		// load defaults from properties
 		List<Class<?>> lafClassesForDefaultsLoading = getLafClassesForDefaultsLoading();
 		if( lafClassesForDefaultsLoading != null )
-			UIDefaultsLoader.loadDefaultsFromProperties( lafClassesForDefaultsLoading, defaults );
+			UIDefaultsLoader.loadDefaultsFromProperties( lafClassesForDefaultsLoading, addons, getAdditionalDefaults(), defaults );
 		else
-			UIDefaultsLoader.loadDefaultsFromProperties( getClass(), defaults );
+			UIDefaultsLoader.loadDefaultsFromProperties( getClass(), addons, getAdditionalDefaults(), defaults );

 		// use Aqua MenuBarUI if Mac screen menubar is enabled
 		if( SystemInfo.IS_MAC && Boolean.getBoolean( "apple.laf.useScreenMenuBar" ) )
@@ -280,19 +292,29 @@ public abstract class FlatLaf
 		// initialize text antialiasing
 		putAATextInfo( defaults );

-		invokePostInitialization( defaults );
+		// apply additional defaults (e.g. from IntelliJ themes)
+		applyAdditionalDefaults( defaults );

-		return defaults;
-	}
+		// allow addons modifying UI defaults
+		for( FlatDefaultsAddon addon : addons )
+			addon.afterDefaultsLoading( this, defaults );

-	void invokePostInitialization( UIDefaults defaults ) {
 		if( postInitialization != null ) {
 			postInitialization.accept( defaults );
 			postInitialization = null;
 		}
+
+		return defaults;
 	}

-	List<Class<?>> getLafClassesForDefaultsLoading() {
+	void applyAdditionalDefaults( UIDefaults defaults ) {
+	}
+
+	protected List<Class<?>> getLafClassesForDefaultsLoading() {
+		return null;
+	}
+
+	protected Properties getAdditionalDefaults() {
 		return null;
 	}

@@ -325,14 +347,22 @@ public abstract class FlatLaf

 		uiFont = UIScale.applyCustomScaleFactor( uiFont );

+		// use active value for all fonts to allow changing fonts in all components
+		// (similar as in Nimbus L&F) with:
+		//     UIManager.put( "defaultFont", myFont );
+		Object activeFont =  new ActiveFont( 1 );
+
 		// override fonts
 		for( Object key : defaults.keySet() ) {
 			if( key instanceof String && (((String)key).endsWith( ".font" ) || ((String)key).endsWith( "Font" )) )
-				defaults.put( key, uiFont );
+				defaults.put( key, activeFont );
 		}

 		// use smaller font for progress bar
-		defaults.put( "ProgressBar.font", UIScale.scaleFont( uiFont, 0.85f ) );
+		defaults.put( "ProgressBar.font", new ActiveFont( 0.85f ) );
+
+		// set default font
+		defaults.put( "defaultFont", uiFont );
 	}

 	/**
@@ -542,4 +572,42 @@ public abstract class FlatLaf

 		return false;
 	}
+
+	//---- class ActiveFont ---------------------------------------------------
+
+	private static class ActiveFont
+		implements ActiveValue
+	{
+		private final float scaleFactor;
+
+		// cache (scaled) font
+		private Font font;
+		private Font lastDefaultFont;
+
+		ActiveFont( float scaleFactor ) {
+			this.scaleFactor = scaleFactor;
+		}
+
+		@Override
+		public Object createValue( UIDefaults table ) {
+			Font defaultFont = UIManager.getFont( "defaultFont" );
+
+			if( lastDefaultFont != defaultFont ) {
+				lastDefaultFont = defaultFont;
+
+				if( scaleFactor != 1 ) {
+					// scale font
+					int newFontSize = Math.round( defaultFont.getSize() * scaleFactor );
+					font = new FontUIResource( defaultFont.deriveFont( (float) newFontSize ) );
+				} else {
+					// make sure that font is a UIResource for LaF switching
+					font = (defaultFont instanceof UIResource)
+						? defaultFont
+						: new FontUIResource( defaultFont );
+				}
+			}
+
+			return font;
+		}
+	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
@@ -513,19 +513,12 @@ public class IntelliJTheme
 		}

 		@Override
-		public UIDefaults getDefaults() {
-			UIDefaults defaults = super.getDefaults();
+		void applyAdditionalDefaults( UIDefaults defaults ) {
 			theme.applyProperties( defaults );
-			super.invokePostInitialization( defaults );
-			return defaults;
 		}

 		@Override
-		void invokePostInitialization( UIDefaults defaults ) {
-		}
-
-		@Override
-		ArrayList<Class<?>> getLafClassesForDefaultsLoading() {
+		protected ArrayList<Class<?>> getLafClassesForDefaultsLoading() {
 			ArrayList<Class<?>> lafClasses = new ArrayList<>();
 			lafClasses.add( FlatLaf.class );
 			lafClasses.add( theme.dark ? FlatDarkLaf.class : FlatLightLaf.class );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java
@@ -17,6 +17,7 @@
 package com.formdev.flatlaf;

 import java.awt.Font;
+import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 import java.io.BufferedReader;
@@ -31,6 +32,7 @@ import java.util.logging.Level;
 import javax.swing.text.StyleContext;
 import com.formdev.flatlaf.util.StringUtils;
 import com.formdev.flatlaf.util.SystemInfo;
+import com.formdev.flatlaf.util.UIScale;

 /**
 * @author Karl Tauber
@@ -99,6 +101,10 @@ class LinuxFontPolicy
 	}

 	private static double getGnomeFontScale() {
+		// do not scale font here if JRE scales
+		if( isSystemScaling() )
+			return 96. / 72.;
+
 		// see class com.sun.java.swing.plaf.gtk.PangoFonts background information

 		Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "gnome.Xft/DPI" );
@@ -168,7 +174,7 @@ class LinuxFontPolicy

 		// font dpi
 		int dpi = 96;
-		if( forceFontDPI != null ) {
+		if( forceFontDPI != null && !isSystemScaling() ) {
 			try {
 				dpi = Integer.parseInt( forceFontDPI );
 				if( dpi <= 0 )
@@ -247,4 +253,15 @@ class LinuxFontPolicy
 		}
 		return null;
 	}
+
+	/**
+	 * Returns true if the JRE scales, which is the case if:
+	 *   - environment variable GDK_SCALE is set and running on Java 9 or later
+	 *   - running on JetBrains Runtime 11 or later and scaling is enabled in system Settings
+	 */
+	private static boolean isSystemScaling() {
+		GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
+			.getDefaultScreenDevice().getDefaultConfiguration();
+		return UIScale.getSystemScaleFactor( gc ) > 1;
+	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
-import java.util.ServiceLoader;
 import java.util.function.Function;
 import java.util.logging.Level;
 import javax.swing.UIDefaults;
@@ -69,7 +68,9 @@ class UIDefaultsLoader
 	private static final String OPTIONAL_PREFIX = "?";
 	private static final String GLOBAL_PREFIX = "*.";

-	static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, UIDefaults defaults ) {
+	static void loadDefaultsFromProperties( Class<?> lookAndFeelClass, List<FlatDefaultsAddon> addons,
+		Properties additionalDefaults, UIDefaults defaults )
+	{
 		// determine classes in class hierarchy in reverse order
 		ArrayList<Class<?>> lafClasses = new ArrayList<>();
 		for( Class<?> lafClass = lookAndFeelClass;
@@ -79,10 +80,12 @@ class UIDefaultsLoader
 			lafClasses.add( 0, lafClass );
 		}

-		loadDefaultsFromProperties( lafClasses, defaults );
+		loadDefaultsFromProperties( lafClasses, addons, additionalDefaults, defaults );
 	}

-	static void loadDefaultsFromProperties( List<Class<?>> lafClasses, UIDefaults defaults ) {
+	static void loadDefaultsFromProperties( List<Class<?>> lafClasses, List<FlatDefaultsAddon> addons,
+		Properties additionalDefaults, UIDefaults defaults )
+	{
 		try {
 			// load core properties files
 			Properties properties = new Properties();
@@ -94,15 +97,8 @@ class UIDefaultsLoader
 				}
 			}

-			// get addons and sort them by priority
-			ServiceLoader<FlatDefaultsAddon> addonLoader = ServiceLoader.load( FlatDefaultsAddon.class );
-			List<FlatDefaultsAddon> addonList = new ArrayList<>();
-			for( FlatDefaultsAddon addon : addonLoader )
-				addonList.add( addon );
-			addonList.sort( (addon1, addon2) -> addon1.getPriority() - addon2.getPriority() );
-
 			// load properties from addons
-			for( FlatDefaultsAddon addon : addonList ) {
+			for( FlatDefaultsAddon addon : addons ) {
 				for( Class<?> lafClass : lafClasses ) {
 					try( InputStream in = addon.getDefaults( lafClass ) ) {
 						if( in != null )
@@ -113,12 +109,16 @@ class UIDefaultsLoader

 			// collect addon class loaders
 			List<ClassLoader> addonClassLoaders = new ArrayList<>();
-			for( FlatDefaultsAddon addon : addonList ) {
+			for( FlatDefaultsAddon addon : addons ) {
 				ClassLoader addonClassLoader = addon.getClass().getClassLoader();
 				if( !addonClassLoaders.contains( addonClassLoader ) )
 					addonClassLoaders.add( addonClassLoader );
 			}

+			// add additional defaults
+			if( additionalDefaults != null )
+				properties.putAll( additionalDefaults );
+
 			// collect all platform specific keys (but do not modify properties)
 			ArrayList<String> platformSpecificKeys = new ArrayList<>();
 			for( Object key : properties.keySet() ) {
@@ -332,16 +332,17 @@ class UIDefaultsLoader

 	private static Object parseBorder( String value, Function<String, String> resolver, List<ClassLoader> addonClassLoaders ) {
 		if( value.indexOf( ',' ) >= 0 ) {
-			// top,left,bottom,right[,lineColor]
+			// top,left,bottom,right[,lineColor[,lineThickness]]
 			List<String> parts = split( value, ',' );
 			Insets insets = parseInsets( value );
-			ColorUIResource lineColor = (parts.size() == 5)
+			ColorUIResource lineColor = (parts.size() >= 5)
 				? (ColorUIResource) parseColorOrFunction( resolver.apply( parts.get( 4 ) ), resolver, true )
 				: null;
+			float lineThickness = (parts.size() >= 6) ? parseFloat( parts.get( 5 ), true ) : 1f;

 			return (LazyValue) t -> {
 				return (lineColor != null)
-					? new FlatLineBorder( insets, lineColor )
+					? new FlatLineBorder( insets, lineColor, lineThickness )
 					: new FlatEmptyBorder( insets );
 			};
 		} else
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
@@ -460,12 +460,12 @@ public class FlatComboBoxUI
 	//---- class FlatComboPopup -----------------------------------------------

 	@SuppressWarnings( { "rawtypes", "unchecked" } )
-	private class FlatComboPopup
+	protected class FlatComboPopup
 		extends BasicComboPopup
 	{
 		private CellPaddingBorder paddingBorder;

-		FlatComboPopup( JComboBox combo ) {
+		protected FlatComboPopup( JComboBox combo ) {
 			super( combo );

 			// BasicComboPopup listens to JComboBox.componentOrientation and updates
@@ -480,13 +480,8 @@ public class FlatComboBoxUI

 		@Override
 		protected Rectangle computePopupBounds( int px, int py, int pw, int ph ) {
-			// get maximum display size of all items, ignoring prototype value
-			Object prototype = comboBox.getPrototypeDisplayValue();
-			if( prototype != null )
-				comboBox.setPrototypeDisplayValue( null );
+			// get maximum display size of all items
 			Dimension displaySize = getDisplaySize();
-			if( prototype != null )
-				comboBox.setPrototypeDisplayValue( prototype );

 			// make popup wider if necessary
 			if( displaySize.width > pw ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLineBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLineBorder.java
@@ -26,9 +26,9 @@ import java.awt.Insets;
 /**
 * Line border for various components.
 *
- * Paints a scaled 1px thick line around the component.
- * The line thickness is not included in the border insets.
- * The insets should be at least 1,1,1,1.
+ * Paints a scaled (usually 1px thick) line around the component.
+ * The line thickness is not added to the border insets.
+ * The insets should be at least have line thickness (usually 1,1,1,1).
 *
 * @author Karl Tauber
 */
@@ -36,10 +36,16 @@ public class FlatLineBorder
 	extends FlatEmptyBorder
 {
 	private final Color lineColor;
+	private final float lineThickness;

 	public FlatLineBorder( Insets insets, Color lineColor ) {
+		this( insets, lineColor, 1f );
+	}
+
+	public FlatLineBorder( Insets insets, Color lineColor, float lineThickness ) {
 		super( insets );
 		this.lineColor = lineColor;
+		this.lineThickness = lineThickness;
 	}

 	@Override
@@ -48,7 +54,7 @@ public class FlatLineBorder
 		try {
 			FlatUIUtils.setRenderingHints( g2 );
 			g2.setColor( lineColor );
-			FlatUIUtils.paintComponentBorder( g2, x, y, width, height, 0f, scale( 1f ), 0f );
+			FlatUIUtils.paintComponentBorder( g2, x, y, width, height, 0f, scale( lineThickness ), 0f );
 		} finally {
 			g2.dispose();
 		}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java
@@ -24,6 +24,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.Insets;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.lang.reflect.Method;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
@@ -48,12 +49,15 @@ import javax.swing.plaf.UIResource;
 *
 * 2) user scaling mode
 *
- * This mode is mainly for Java 8 compatibility, but is also used on Linux.
+ * This mode is mainly for Java 8 compatibility, but is also used on Linux
+ * or if the default font is changed.
 * The user scale factor is computed based on the used font.
 * The JRE does not scale anything.
 * So we have to invoke {@link #scale(float)} where necessary.
 * There is only one user scale factor for all displays.
- * The user scale factor may change if the active LaF or "Label.font" has changed.
+ * The user scale factor may change if the active LaF, "defaultFont" or "Label.font" has changed.
+ * If system scaling mode is available the user scale factor is usually 1,
+ * but may be larger on Linux or if the default font is changed.
 *
 * @author Karl Tauber
 */
@@ -61,6 +65,20 @@ public class UIScale
 {
 	private static final boolean DEBUG = false;

+	private static PropertyChangeSupport changeSupport;
+
+	public static void addPropertyChangeListener( PropertyChangeListener listener ) {
+		if( changeSupport == null )
+			changeSupport = new PropertyChangeSupport( UIScale.class );
+		changeSupport.addPropertyChangeListener( listener );
+	}
+
+	public static void removePropertyChangeListener( PropertyChangeListener listener ) {
+		if( changeSupport == null )
+			return;
+		changeSupport.removePropertyChangeListener( listener );
+	}
+
 	//---- system scaling (Java 9) --------------------------------------------

 	private static Boolean jreHiDPI;
@@ -110,27 +128,33 @@ public class UIScale
 			return;
 		initialized = true;

-		if( isUserScalingEnabled() ) {
-			// listener to update scale factor if LaF changed or if Label.font changed
-			// (e.g. option "Override default fonts" in IntelliJ IDEA)
-			PropertyChangeListener listener = new PropertyChangeListener() {
-				@Override
-				public void propertyChange( PropertyChangeEvent e ) {
-					String propName = e.getPropertyName();
-					if( "lookAndFeel".equals( propName ) ) {
+		if( !isUserScalingEnabled() )
+			return;
+
+		// listener to update scale factor if LaF changed, "defaultFont" or "Label.font" changed
+		PropertyChangeListener listener = new PropertyChangeListener() {
+			@Override
+			public void propertyChange( PropertyChangeEvent e ) {
+				switch( e.getPropertyName() ) {
+					case "lookAndFeel":
 						// it is not necessary (and possible) to remove listener of old LaF defaults
 						if( e.getNewValue() instanceof LookAndFeel )
 							UIManager.getLookAndFeelDefaults().addPropertyChangeListener( this );
 						updateScaleFactor();
-					} else if( "Label.font".equals( propName ) )
-						updateScaleFactor();
-				}
-			};
-			UIManager.addPropertyChangeListener( listener );
-			UIManager.getLookAndFeelDefaults().addPropertyChangeListener( listener );
+						break;

-			updateScaleFactor();
-		}
+					case "defaultFont":
+					case "Label.font":
+						updateScaleFactor();
+						break;
+				}
+			}
+		};
+		UIManager.addPropertyChangeListener( listener );
+		UIManager.getDefaults().addPropertyChangeListener( listener );
+		UIManager.getLookAndFeelDefaults().addPropertyChangeListener( listener );
+
+		updateScaleFactor();
 	}

 	private static void updateScaleFactor() {
@@ -141,7 +165,9 @@ public class UIScale
 		// because even if we are on a HiDPI display it is not sure
 		// that a larger font size is set by the current LaF
 		// (e.g. can avoid large icons with small text)
-		Font font = UIManager.getFont( "Label.font" );
+		Font font = UIManager.getFont( "defaultFont" );
+		if( font == null )
+			font = UIManager.getFont( "Label.font" );

 		setUserScaleFactor( computeScaleFactor( font ) );
 	}
@@ -168,26 +194,17 @@ public class UIScale
 	}

 	private static boolean isUserScalingEnabled() {
-		if( isSystemScalingEnabled() && !SystemInfo.IS_LINUX )
-			return false; // disable user scaling if JRE scales
-
 		// same as in IntelliJ IDEA
 		String hidpi = System.getProperty( "hidpi" );
 		return (hidpi != null) ? Boolean.parseBoolean( hidpi ) : true;
 	}

 	/**
-	 * Applies a custom scale factor given in system properties "flatlaf.uiScale"
-	 * or "sun.java2d.uiScale" to the given font.
+	 * Applies a custom scale factor given in system property "flatlaf.uiScale"
+	 * to the given font.
 	 */
 	public static FontUIResource applyCustomScaleFactor( FontUIResource font ) {
-		if( UIScale.isSystemScalingEnabled() )
-			return font;
-
 		String uiScale = System.getProperty( "flatlaf.uiScale" );
-		if( uiScale == null )
-			uiScale = System.getProperty( "sun.java2d.uiScale" );
-
 		float scaleFactor = parseScaleFactor( uiScale );
 		if( scaleFactor <= 0 )
 			return font;
@@ -200,14 +217,6 @@ public class UIScale
 		return new FontUIResource( font.deriveFont( (float) newFontSize ) );
 	}

-	/**
-	 * Scales the given font.
-	 */
-	public static FontUIResource scaleFont( FontUIResource font, float scaleFactor ) {
-		int newFontSize = Math.round( font.getSize() * scaleFactor );
-		return new FontUIResource( font.deriveFont( (float) newFontSize ) );
-	}
-
 	/**
 	 * Similar to sun.java2d.SunGraphicsEnvironment.getScaleFactor(String)
 	 */
@@ -245,10 +254,14 @@ public class UIScale
 		else // round scale factor to 1/4
 			scaleFactor = Math.round( scaleFactor * 4f ) / 4f;

+		float oldScaleFactor = UIScale.scaleFactor;
 		UIScale.scaleFactor = scaleFactor;

 		if( DEBUG )
 			System.out.println( "HiDPI scale factor " + scaleFactor );
+
+		if( changeSupport != null )
+			changeSupport.firePropertyChange( "userScaleFactor", oldScaleFactor, scaleFactor );
 	}

 	public static float scale( float value ) {
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -269,7 +269,6 @@ InternalFrameTitlePane.border=0,8,0,0

 #---- List ----

-List.border=1,0,1,0
 List.border=0,0,0,0
 List.cellMargins=1,6,1,6
 List.cellFocusColor=@cellFocusColor
@@ -599,6 +598,7 @@ Tree.dropLineColor=@dropLineColor
 Tree.rendererFillBackground=false
 Tree.rendererMargins=1,2,1,2
 Tree.wideSelection=true
+Tree.repaintWholeRow=true
 Tree.paintLines=false
 Tree.leftChildIndent=7
 Tree.rightChildIndent=11
--- a/flatlaf-demo/DemoLaf.properties
+++ b/flatlaf-demo/DemoLaf.properties
@@ -0,0 +1,13 @@
+# This file demonstrates using a FlatLaf theme file in the FlatLaf Demo application.
+# Must be in the working directory of the Demo application.
+# Shown in the "Themes" list under category "Current Directory".
+#
+# Modifications to this file are automatically loaded by the FlatLaf Demo application
+# when the Demo window is activated.
+
+
+# base theme (light, dark, intellij or darcula)
+@baseTheme=light
+
+# add you theme defaults here
+@background=#ccc
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.java
@@ -310,14 +310,13 @@ class BasicComponentsPanel
 		add(comboBox4, "cell 4 4,growx");

 		//---- comboBox5 ----
-		comboBox5.setPrototypeDisplayValue("12345");
 		comboBox5.setModel(new DefaultComboBoxModel<>(new String[] {
 			"wide popup if text is longer",
 			"aa",
 			"bbb",
 			"cccc"
 		}));
-		add(comboBox5, "cell 5 4,growx");
+		add(comboBox5, "cell 5 4,growx,wmax 100");

 		//---- spinnerLabel ----
 		spinnerLabel.setText("JSpinner:");
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.jfd
@@ -242,7 +242,6 @@ new FormModel {
 			} )
 			add( new FormComponent( "javax.swing.JComboBox" ) {
 				name: "comboBox5"
-				"prototypeDisplayValue": "12345"
 				"model": new javax.swing.DefaultComboBoxModel {
 					selectedItem: "wide popup if text is longer"
 					addElement( "wide popup if text is longer" )
@@ -251,7 +250,7 @@ new FormModel {
 					addElement( "cccc" )
 				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 4,growx"
+				"value": "cell 5 4,growx,wmax 100"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "spinnerLabel"
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java
@@ -83,6 +83,11 @@ class ControlBar
 				} );
 			}
 		} );
+
+		UIScale.addPropertyChangeListener( e -> {
+			// update info label because user scale factor may change
+			updateInfoLabel();
+		} );
 	}

 	void initialize( JFrame frame, JTabbedPane tabbedPane ) {
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
@@ -20,6 +20,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.text.DefaultEditorKit;
+import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.demo.intellijthemes.*;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import net.miginfocom.swing.*;
@@ -52,12 +53,53 @@ class DemoFrame
 		DemoPrefs.getState().putInt( FlatLafDemo.KEY_TAB, tabbedPane.getSelectedIndex() );
 	}

-	private void menuItemActionPerformed(ActionEvent e) {
+	private void menuItemActionPerformed( ActionEvent e ) {
 		SwingUtilities.invokeLater( () -> {
 			JOptionPane.showMessageDialog( this, e.getActionCommand(), "Menu Item", JOptionPane.PLAIN_MESSAGE );
 		} );
 	}

+	private void fontFamilyChanged( ActionEvent e ) {
+		String fontFamily = e.getActionCommand();
+
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = new Font( fontFamily, font.getStyle(), font.getSize() );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
+	private void fontSizeChanged( ActionEvent e ) {
+		String fontSizeStr = e.getActionCommand();
+
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = font.deriveFont( (float) Integer.parseInt( fontSizeStr ) );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
+	private void restoreFont() {
+		UIManager.put( "defaultFont", null );
+		FlatLaf.updateUI();
+	}
+
+	private void incrFont() {
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = font.deriveFont( (float) (font.getSize() + 1) );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
+	private void decrFont() {
+		Font font = UIManager.getFont( "defaultFont" );
+		Font newFont = font.deriveFont( (float) Math.max( font.getSize() - 1, 8 ) );
+		UIManager.put( "defaultFont", newFont );
+
+		FlatLaf.updateUI();
+	}
+
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		JMenuBar menuBar1 = new JMenuBar();
@@ -86,6 +128,10 @@ class DemoFrame
 		JRadioButtonMenuItem radioButtonMenuItem1 = new JRadioButtonMenuItem();
 		JRadioButtonMenuItem radioButtonMenuItem2 = new JRadioButtonMenuItem();
 		JRadioButtonMenuItem radioButtonMenuItem3 = new JRadioButtonMenuItem();
+		fontMenu = new JMenu();
+		JMenuItem restoreFontMenuItem = new JMenuItem();
+		JMenuItem incrFontMenuItem = new JMenuItem();
+		JMenuItem decrFontMenuItem = new JMenuItem();
 		JMenu helpMenu = new JMenu();
 		JMenuItem aboutMenuItem = new JMenuItem();
 		JToolBar toolBar1 = new JToolBar();
@@ -285,6 +331,30 @@ class DemoFrame
 			}
 			menuBar1.add(viewMenu);

+			//======== fontMenu ========
+			{
+				fontMenu.setText("Font");
+
+				//---- restoreFontMenuItem ----
+				restoreFontMenuItem.setText("Restore Font");
+				restoreFontMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_0, KeyEvent.CTRL_MASK));
+				restoreFontMenuItem.addActionListener(e -> restoreFont());
+				fontMenu.add(restoreFontMenuItem);
+
+				//---- incrFontMenuItem ----
+				incrFontMenuItem.setText("Increase Font Size");
+				incrFontMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, KeyEvent.CTRL_MASK));
+				incrFontMenuItem.addActionListener(e -> incrFont());
+				fontMenu.add(incrFontMenuItem);
+
+				//---- decrFontMenuItem ----
+				decrFontMenuItem.setText("Decrease Font Size");
+				decrFontMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, KeyEvent.CTRL_MASK));
+				decrFontMenuItem.addActionListener(e -> decrFont());
+				fontMenu.add(decrFontMenuItem);
+			}
+			menuBar1.add(fontMenu);
+
 			//======== helpMenu ========
 			{
 				helpMenu.setText("Help");
@@ -387,9 +457,30 @@ class DemoFrame
 		cutMenuItem.addActionListener( new DefaultEditorKit.CutAction() );
 		copyMenuItem.addActionListener( new DefaultEditorKit.CopyAction() );
 		pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() );
+
+		// add font families
+		fontMenu.addSeparator();
+		String[] fontFamilies = { "Arial", "Comic Sans MS", "Courier New", "Dialog",
+			"Monospaced", "SansSerif", "Serif", "Tahoma", "Verdana" };
+		for( String fontFamily : fontFamilies ) {
+			JMenuItem fontItem = new JMenuItem( fontFamily );
+			fontItem.addActionListener( this::fontFamilyChanged );
+			fontMenu.add( fontItem );
+		}
+
+		// add font sizes
+		fontMenu.addSeparator();
+		int[] fontSizes = { 8, 10, 12, 14, 16, 18, 20, 24, 28 };
+		for( int fontSize : fontSizes ) {
+			String fontSizeStr = Integer.toString( fontSize );
+			JMenuItem fontItem = new JMenuItem( fontSizeStr );
+			fontItem.addActionListener( this::fontSizeChanged );
+			fontMenu.add( fontItem );
+		}
 	}

 	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
+	private JMenu fontMenu;
 	private JTabbedPane tabbedPane;
 	private ControlBar controlBar;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"

 new FormModel {
 	contentType: "form/swing"
@@ -285,6 +285,31 @@ new FormModel {
 						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuItemActionPerformed", true ) )
 					} )
 				} )
+				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
+					name: "fontMenu"
+					"text": "Font"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "restoreFontMenuItem"
+						"text": "Restore Font"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 48, 130, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "restoreFont", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "incrFontMenuItem"
+						"text": "Increase Font Size"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 521, 130, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "incrFont", false ) )
+					} )
+					add( new FormComponent( "javax.swing.JMenuItem" ) {
+						name: "decrFontMenuItem"
+						"text": "Decrease Font Size"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 45, 130, false )
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "decrFont", false ) )
+					} )
+				} )
 				add( new FormContainer( "javax.swing.JMenu", new FormLayoutManager( class javax.swing.JMenu ) ) {
 					name: "helpMenu"
 					"text": "Help"
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java
@@ -16,6 +16,7 @@

 package com.formdev.flatlaf.demo;

+import java.io.File;
 import java.io.FileInputStream;
 import java.util.prefs.Preferences;
 import javax.swing.UIManager;
@@ -23,6 +24,8 @@ import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.IntelliJTheme;
 import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel;
+import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel.PropertiesLaf;
+import com.formdev.flatlaf.util.StringUtils;

 /**
 * @author Karl Tauber
@@ -30,12 +33,12 @@ import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel;
 public class DemoPrefs
 {
 	public static final String KEY_LAF = "laf";
-	public static final String KEY_LAF_INTELLIJ_THEME = "lafIntelliJTheme";
+	public static final String KEY_LAF_THEME = "lafTheme";

 	public static final String RESOURCE_PREFIX = "res:";
 	public static final String FILE_PREFIX = "file:";

-	public static final String INTELLIJ_THEME_UI_KEY = "__FlatLaf.demo.intelliJTheme";
+	public static final String THEME_UI_KEY = "__FlatLaf.demo.theme";

 	private static Preferences state;

@@ -55,16 +58,27 @@ public class DemoPrefs
 			else {
 				String lafClassName = state.get( KEY_LAF, FlatLightLaf.class.getName() );
 				if( IntelliJTheme.ThemeLaf.class.getName().equals( lafClassName ) ) {
-					String intelliJTheme = state.get( KEY_LAF_INTELLIJ_THEME, "" );
-					if( intelliJTheme.startsWith( RESOURCE_PREFIX ) )
-						IntelliJTheme.install( IJThemesPanel.class.getResourceAsStream( intelliJTheme.substring( RESOURCE_PREFIX.length() ) ) );
-					else if( intelliJTheme.startsWith( FILE_PREFIX ) )
-					    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( intelliJTheme.substring( FILE_PREFIX.length() ) ) ) );
+					String theme = state.get( KEY_LAF_THEME, "" );
+					if( theme.startsWith( RESOURCE_PREFIX ) )
+						IntelliJTheme.install( IJThemesPanel.class.getResourceAsStream( theme.substring( RESOURCE_PREFIX.length() ) ) );
+					else if( theme.startsWith( FILE_PREFIX ) )
+					    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( theme.substring( FILE_PREFIX.length() ) ) ) );
 					else
 						FlatLightLaf.install();

-					if( !intelliJTheme.isEmpty() )
-						UIManager.getLookAndFeelDefaults().put( INTELLIJ_THEME_UI_KEY, intelliJTheme );
+					if( !theme.isEmpty() )
+						UIManager.getLookAndFeelDefaults().put( THEME_UI_KEY, theme );
+				} else if( IJThemesPanel.PropertiesLaf.class.getName().equals( lafClassName ) ) {
+					String theme = state.get( KEY_LAF_THEME, "" );
+					if( theme.startsWith( FILE_PREFIX ) ) {
+						File themeFile = new File( theme.substring( FILE_PREFIX.length() ) );
+						String themeName = StringUtils.removeTrailing( themeFile.getName(), ".properties" );
+						FlatLaf.install( new PropertiesLaf( themeName, themeFile ) );
+					} else
+						FlatLightLaf.install();
+
+					if( !theme.isEmpty() )
+						UIManager.getLookAndFeelDefaults().put( THEME_UI_KEY, theme );
 				} else
 					UIManager.setLookAndFeel( lafClassName );
 			}
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.jfd
@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "11.0.2" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"

 new FormModel {
 	contentType: "form/swing"
@@ -243,7 +243,7 @@ new FormModel {
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 790, 840 )
+			"size": new java.awt.Dimension( 840, 900 )
 		} )
 	}
 }
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java
@@ -68,7 +68,9 @@ class IJThemesManager
 		// get current working directory
 		File directory = new File( "" ).getAbsoluteFile();

-		File[] themeFiles = directory.listFiles( (dir, name) -> name.endsWith( ".theme.json" ) );
+		File[] themeFiles = directory.listFiles( (dir, name) -> {
+			return name.endsWith( ".theme.json" ) || name.endsWith( ".properties" );
+		} );
 		if( themeFiles == null )
 			return;

@@ -77,7 +79,10 @@ class IJThemesManager

 		moreThemes.clear();
 		for( File f : themeFiles ) {
-			String name = StringUtils.removeTrailing( f.getName(), ".theme.json" );
+			String fname = f.getName();
+			String name = fname.endsWith( ".properties" )
+				? StringUtils.removeTrailing( fname, ".properties" )
+				: StringUtils.removeTrailing( fname, ".theme.json" );
 			moreThemes.add( new IJThemeInfo( name, null, null, null, null, null, f, null ) );
 			lastModifiedMap.put( f, f.lastModified() );
 		}
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java
@@ -28,6 +28,7 @@ import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -37,6 +38,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
+import java.util.Properties;
 import java.util.function.Predicate;
 import javax.swing.*;
 import javax.swing.border.CompoundBorder;
@@ -71,6 +73,7 @@ public class IJThemesPanel
 	private Window window;

 	private File lastDirectory;
+	private boolean isAdjustingThemesList;

 	public IJThemesPanel() {
 		initComponents();
@@ -134,6 +137,10 @@ public class IJThemesPanel
 		themes.add( new IJThemeInfo( "Flat IntelliJ", null, null, null, null, null, null, FlatIntelliJLaf.class.getName() ) );
 		themes.add( new IJThemeInfo( "Flat Darcula", null, null, null, null, null, null, FlatDarculaLaf.class.getName() ) );

+		// add themes from directory
+		categories.put( themes.size(), "Current Directory" );
+		themes.addAll( themesManager.moreThemes );
+
 		// add uncategorized bundled themes
 		categories.put( themes.size(), "IntelliJ Themes" );
 		for( IJThemeInfo ti : themesManager.bundledThemes ) {
@@ -157,10 +164,6 @@ public class IJThemesPanel
 			themes.add( ti );
 		}

-		// add themes from directory
-		categories.put( themes.size(), "Current Directory" );
-		themes.addAll( themesManager.moreThemes );
-
 		// remember selection
 		IJThemeInfo oldSel = themesList.getSelectedValue();

@@ -193,7 +196,7 @@ public class IJThemesPanel
 	}

 	private void themesListValueChanged( ListSelectionEvent e ) {
-		if( e.getValueIsAdjusting() )
+		if( e.getValueIsAdjusting() || isAdjustingThemesList )
 			return;

 		IJThemeInfo themeInfo = themesList.getSelectedValue();
@@ -223,15 +226,19 @@ public class IJThemesPanel
 			}
 		} else if( themeInfo.themeFile != null ) {
 			try {
-			    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( themeInfo.themeFile ) ) );
-			    DemoPrefs.getState().put( DemoPrefs.KEY_LAF_INTELLIJ_THEME, DemoPrefs.FILE_PREFIX + themeInfo.themeFile );
+				if( themeInfo.themeFile.getName().endsWith( ".properties" ) ) {
+				    FlatLaf.install( new PropertiesLaf( themeInfo.name, themeInfo.themeFile ) );
+				} else
+				    FlatLaf.install( IntelliJTheme.createLaf( new FileInputStream( themeInfo.themeFile ) ) );
+
+				DemoPrefs.getState().put( DemoPrefs.KEY_LAF_THEME, DemoPrefs.FILE_PREFIX + themeInfo.themeFile );
 			} catch( Exception ex ) {
 				ex.printStackTrace();
 				showInformationDialog( "Failed to load '" + themeInfo.themeFile + "'.", ex );
 			}
 		} else {
 			IntelliJTheme.install( getClass().getResourceAsStream( themeInfo.resourceName ) );
-		    DemoPrefs.getState().put( DemoPrefs.KEY_LAF_INTELLIJ_THEME, DemoPrefs.RESOURCE_PREFIX + themeInfo.resourceName );
+		    DemoPrefs.getState().put( DemoPrefs.KEY_LAF_THEME, DemoPrefs.RESOURCE_PREFIX + themeInfo.resourceName );
 		}

 		// update all components
@@ -331,17 +338,17 @@ public class IJThemesPanel

 	private void selectedCurrentLookAndFeel() {
 		LookAndFeel lookAndFeel = UIManager.getLookAndFeel();
-		String intelliJTheme = UIManager.getLookAndFeelDefaults().getString( DemoPrefs.INTELLIJ_THEME_UI_KEY );
+		String theme = UIManager.getLookAndFeelDefaults().getString( DemoPrefs.THEME_UI_KEY );

-		if( intelliJTheme == null && lookAndFeel instanceof IntelliJTheme.ThemeLaf )
+		if( theme == null && (lookAndFeel instanceof IntelliJTheme.ThemeLaf || lookAndFeel instanceof PropertiesLaf) )
 			return;

 		Predicate<IJThemeInfo> test;
-		if( intelliJTheme != null && intelliJTheme.startsWith( DemoPrefs.RESOURCE_PREFIX ) ) {
-			String resourceName = intelliJTheme.substring( DemoPrefs.RESOURCE_PREFIX.length() );
+		if( theme != null && theme.startsWith( DemoPrefs.RESOURCE_PREFIX ) ) {
+			String resourceName = theme.substring( DemoPrefs.RESOURCE_PREFIX.length() );
 			test = ti -> Objects.equals( ti.resourceName, resourceName );
-		} else if( intelliJTheme != null && intelliJTheme.startsWith( DemoPrefs.FILE_PREFIX ) ) {
-			File themeFile = new File( intelliJTheme.substring( DemoPrefs.FILE_PREFIX.length() ) );
+		} else if( theme != null && theme.startsWith( DemoPrefs.FILE_PREFIX ) ) {
+			File themeFile = new File( theme.substring( DemoPrefs.FILE_PREFIX.length() ) );
 			test = ti -> Objects.equals( ti.themeFile, themeFile );
 		} else {
 			String lafClassName = lookAndFeel.getClass().getName();
@@ -356,11 +363,13 @@ public class IJThemesPanel
 			}
 		}

+		isAdjustingThemesList = true;
 		if( newSel >= 0 ) {
 			if( newSel != themesList.getSelectedIndex() )
 				themesList.setSelectedIndex( newSel );
 		} else
 			themesList.clearSelection();
+		isAdjustingThemesList = false;
 	}

 	private void initComponents() {
@@ -420,4 +429,78 @@ public class IJThemesPanel
 	private JScrollPane themesScrollPane;
 	private JList<IJThemeInfo> themesList;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
+
+	//---- class PropertiesLaf ------------------------------------------------
+
+	public static class PropertiesLaf
+		extends FlatLaf
+	{
+		private final String name;
+		private final String baseTheme;
+		private final boolean dark;
+		private final Properties properties;
+
+		public PropertiesLaf( String name, File propertiesFile )
+			throws IOException
+		{
+			this.name = name;
+
+			properties = new Properties();
+			try( InputStream in = new FileInputStream( propertiesFile ) ) {
+				if( in != null )
+					properties.load( in );
+			}
+
+			baseTheme = properties.getProperty( "@baseTheme", "light" );
+			dark = "dark".equalsIgnoreCase( baseTheme ) || "darcula".equalsIgnoreCase( baseTheme );
+		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		@Override
+		public String getDescription() {
+			return name;
+		}
+
+		@Override
+		public boolean isDark() {
+			return dark;
+		}
+
+		@Override
+		protected ArrayList<Class<?>> getLafClassesForDefaultsLoading() {
+			ArrayList<Class<?>> lafClasses = new ArrayList<>();
+			lafClasses.add( FlatLaf.class );
+			switch( baseTheme.toLowerCase() ) {
+				default:
+				case "light":
+					lafClasses.add( FlatLightLaf.class );
+					break;
+
+				case "dark":
+					lafClasses.add( FlatDarkLaf.class );
+					break;
+
+				case "intellij":
+					lafClasses.add( FlatLightLaf.class );
+					lafClasses.add( FlatIntelliJLaf.class );
+					break;
+
+				case "darcula":
+					lafClasses.add( FlatDarkLaf.class );
+					lafClasses.add( FlatDarculaLaf.class );
+					break;
+			}
+			lafClasses.add( PropertiesLaf.class );
+			return lafClasses;
+		}
+
+		@Override
+		protected Properties getAdditionalDefaults() {
+			return properties;
+		}
+	}
 }
--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.theme.json
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.theme.json
@@ -1,114 +1,124 @@
 {
+  "name": "Hiberbee",
  "author": "Vlad Volkov",
+  "dark": true,
+  "editorScheme": "/colors/Hiberbee.xml",
  "colors": {
    "accent": "#FFC83C",
+    "desaturatedBlue": "#1e282d",
+    "desaturatedOrange": "#8049117f",
+    "green": "#5B8021",
    "greyDot15": "#d8d8d8",
+    "greyDot20": "#cccccc",
    "greyDot25": "#bfbfbf",
    "greyDot33": "#aaaaaa",
    "greyDot50": "#7d7d7d",
+    "greyDot60": "#666666",
    "greyDot65": "#5a5a5a",
    "greyDot70": "#4d4d4d",
    "greyDot75": "#434343",
    "greyDot80": "#323232",
    "greyDot85": "#252525",
-    "greyDot90": "#191919",
+    "greyDot90": "#1f2021",
+    "lightBlue": "#57D1EB",
    "navyDot85": "#191d21",
    "navyDot90": "#1f2021",
-    "lightBlue": "#90dae6",
-    "green": "#5B8021",
    "red": "#800040",
-    "desaturatedBlue": "#1e282d",
-    "desaturatedOrange": "#8049117f",
    "transparentGreen": "#5B80217f",
    "transparentRed": "#8000407f",
-    "transparentYellow": "#8066357f",
    "transparentViolet": "#9478F67f",
+    "transparentYellow": "#8066357f",
    "yellow": "#806635"
  },
-  "dark": true,
-  "editorScheme": "/Hiberbee.xml",
  "icons": {
    "ColorPalette": {
+      "Actions.Blue": "#57D1EB",
+      "Actions.Green": "#92D923",
      "Actions.Grey": "#afafaf",
-      "Actions.Red": "#ff0072",
-      "Actions.Yellow": "#f7cd46",
-      "Actions.Green": "#A6E22E",
-      "Actions.Blue": "#307bf6",
-      "Actions.GreyInline": "#afafaf",
-      "Actions.GreyInline.Dark": "#7d7d7d",
-      "Objects.Grey": "#c8c8c8",
-      "Objects.RedStatus": "#EC5F5D",
-      "Objects.Red": "#ff0072",
+      "Actions.GreyInline": "#7f7f7f",
+      "Actions.GreyInline.Dark": "#646464",
+      "Actions.Red": "#ff6188",
+      "Actions.Yellow": "#FFC83C",
+      "Objects.BlackText": "greyDot33",
+      "Objects.Blue": "#57D1EB",
+      "Objects.Green": "#92D923",
+      "Objects.GreenAndroid": "#92D923",
+      "Objects.Grey": "#7f7f7f",
      "Objects.Pink": "#ffa9ca",
-      "Objects.Yellow": "#f7cd46",
-      "Objects.Green": "#78b756",
-      "Objects.Purple": "#9478f6",
-      "Objects.BlackText": "#4d4d4d",
-      "Objects.Blue": "#49b0f1",
-      "Objects.YellowDark": "#fd971f",
-      "Objects.GreenAndroid": "#78c856"
+      "Objects.Purple": "#9380FF",
+      "Objects.Red": "#ed005c",
+      "Objects.RedStatus": "#EC5F5D",
+      "Objects.Yellow": "#FFC83C",
+      "Objects.YellowDark": "#FD971F"
    }
  },
-  "name": "Hiberbee",
  "ui": {
-    "ActionButton.hoverBackground": "greyDot65",
-    "ActionButton.hoverBorderColor": "greyDot50",
-    "ActionButton.pressedBackground": "greyDot65",
-    "Borders.ContrastBorderColor": "greyDot65",
-    "ActionButton.pressedBorderColor": "lightBlue",
-    "Borders.color": "greyDot65",
-    "Button.arc": "5",
-    "Button.background": "greyDot80",
+    "*": {
+      "arc": "3",
+      "shadow": "greyDot75",
+      "background": "greyDot80",
+      "borderColor": "greyDot70",
+      "caretForeground": "accent",
+      "color": "greyDot50",
+      "foreground": "greyDot20",
+      "hoverBackground": "greyDot70",
+      "selectedBackground": "greyDot85",
+      "selectedForeground": "greyDot15",
+      "selectedInactiveBackground": "greyDot70",
+      "selectionBackground": "navyDot85",
+      "selectionForeground": "accent",
+      "separatorColor": "greyDot75",
+      "underlineHeight": 1
+    },
+    "ActionButton": {
+      "hoverBorderColor": "greyDot50",
+      "pressedBackground": "greyDot65",
+      "pressedBorderColor": "greyDot50"
+    },
+    "Borders": {
+      "ContrastBorderColor": "greyDot65",
+      "color": "greyDot70"
+    },
    "Button.default.endBackground": "greyDot80",
    "Button.default.endBorderColor": "greyDot65",
-    "Button.default.startBorderColor": "greyDot65",
-    "Button.default.focusColor": "greyDot50",
-    "Button.default.focusedBorderColor": "lightBlue",
-    "Button.default.foreground": "greyDot25",
-    "Button.default.shadowColor": "navyDot90",
+    "Button.default.focusColor": "greyDot80",
+    "Button.default.focusedBorderColor": "greyDot15",
+    "Button.default.foreground": "greyDot15",
    "Button.default.startBackground": "greyDot80",
+    "Button.default.startBorderColor": "greyDot65",
    "Button.endBackground": "greyDot80",
-    "Button.startBorderColor": "greyDot65",
    "Button.endBorderColor": "greyDot65",
    "Button.focusedBorderColor": "accent",
-    "Button.foreground": "greyDot25",
-    "Button.shadowColor": "navyDot90",
-    "Button.shadowWidth": "0",
    "Button.startBackground": "greyDot80",
-    "CheckBox.background": "greyDot80",
-    "CheckBoxMenuItem.background": "greyDot80",
-    "CheckBoxMenuItem.disabledBackground": "greyDot85",
-    "CheckBoxMenuItem.selectionForeground": "accent",
+    "Button.startBorderColor": "greyDot65",
+    "CheckBox.disabledText": "greyDot33",
+    "CheckBox.select": "greyDot50",
+    "CheckBoxMenuItem.disabledBackground": "greyDot80",
    "ComboBox.ArrowButton.disabledIconColor": "greyDot50",
    "ComboBox.ArrowButton.iconColor": "accent",
    "ComboBox.ArrowButton.nonEditableBackground": "greyDot70",
-    "ComboBox.background": "greyDot80",
    "ComboBox.modifiedItemForeground": "accent",
+    "ComboBox.disabledForeground": "greyDot70",
    "ComboBox.nonEditableBackground": "greyDot75",
-    "ComboPopup.border": "1,1,1,1,5a5a5a",
-    "CompletionPopup.foreground": "greyDot25",
-    "CompletionPopup.matchForeground": "accent",
-    "CompletionPopup.selectionBackground": "navyDot85",
-    "CompletionPopup.selectionInactiveBackground": "greyDot80",
-    "Component.arc": "5",
-    "Component.borderColor": "greyDot65",
-    "Component.errorFocusColor": "red",
-    "Component.focusColor": "accent",
+    "ComboPopup.border": "1,1,1,1,4d4d4d",
+    "CompletionPopup": {
+      "foreground": "greyDot20",
+      "matchForeground": "accent"
+    },
+    "Component.arc": "3",
+    "Label.foreground": "greyDot15",
+    "Component.disabledBorderColor": "greyDot70",
+    "Component.infoForeground": "greyDot50",
+    "Component.errorFocusColor": "#F65F87",
+    "Component.focusColor": "greyDot50",
    "Component.focusWidth": "0",
    "Component.focusedBorderColor": "greyDot50",
    "Component.hoverIconColor": "accent",
-    "Component.iconColor": "lightBlue",
    "Component.inactiveErrorFocusColor": "transparentRed",
    "Component.inactiveWarningFocusColor": "transparentYellow",
    "Component.warningFocusColor": "yellow",
-    "Counter.background": "greyDot80",
-    "Counter.foreground": "greyDot25",
    "Debugger.Variables.changedValueForeground": "accent",
    "Debugger.Variables.evaluatingExpressionForeground": "lightBlue",
-    "DebuggerPopup.borderColor": "greyDot65",
-    "DefaultTabs.background": "greyDot80",
-    "DefaultTabs.borderColor": "greyDot65",
-    "DefaultTabs.hoverBackground": "navyDot85",
    "DefaultTabs.underlineColor": "accent",
    "DefaultTabs.underlineHeight": 1,
    "DefaultTabs.underlinedTabBackground": "greyDot75",
@@ -116,14 +126,8 @@
    "DragAndDrop.areaBackground": "greyDot75",
    "DragAndDrop.areaForeground": "greyDot25",
    "Editor.background": "greyDot90",
-    "Editor.foreground": "greyDot25",
-    "EditorPane.background": "greyDot80",
-    "EditorPane.caretForeground": "accent",
-    "EditorPane.foreground": "greyDot25",
    "EditorPane.inactiveBackground": "greyDot85",
    "EditorPane.inactiveForeground": "greyDot50",
-    "EditorPane.selectionBackground": "navyDot85",
-    "EditorPane.selectionForeground": "accent",
    "EditorTabs.underlineHeight": 1,
    "FileColor.Blue": "#23282d",
    "FileColor.Green": "#232d28",
@@ -131,55 +135,45 @@
    "FileColor.Rose": "#2d2323",
    "FileColor.Violet": "#2D232D",
    "FileColor.Yellow": "#2d2d23",
+    "FormattedTextField.inactiveBackground": "greyDot80",
+    "FormattedTextField.background": "greyDot75",
    "GutterTooltip.infoForeground": "greyDot50",
-    "InplaceRefactoringPopup.borderColor": "lightBlue",
-    "Label.background": "greyDot80",
+    "Label": {
+      "foreground": "greyDot25",
+      "infoForeground": "greyDot50"
+    },
    "Link.activeForeground": "lightBlue",
    "Link.hoverForeground": "accent",
    "Link.pressedForeground": "lightBlue",
    "Link.visitedForeground": "greyDot25",
-    "List.background": "greyDot80",
-    "List.selectionBackground": "navyDot85",
-    "List.selectionForeground": "accent",
    "MemoryIndicator.allocatedBackground": "green",
    "MemoryIndicator.usedBackground": "red",
    "Menu.acceleratorForeground": "greyDot25",
-    "Menu.acceleratorSelectionForeground": "accent",
-    "Menu.background": "greyDot80",
-    "Menu.borderColor": "greyDot65",
-    "Menu.foreground": "greyDot25",
-    "Menu.selectionForeground": "accent",
-    "Menu.separatorColor": "greyDot65",
-    "MenuBar.borderColor": "greyDot65",
-    "MenuBar.selectionBackground": "navyDot85",
-    "MenuBar.shadow": "navyDot90",
-    "MenuItem.selectionForeground": "accent",
-    "Notification.MoreButton.background": "greyDot85",
    "Notification.MoreButton.innerBorderColor": "greyDot65",
-    "Notification.ToolWindow.errorBackground": "red",
-    "Notification.ToolWindow.errorBorderColor": "greyDot50",
-    "Notification.ToolWindow.errorForeground": "greyDot15",
-    "Notification.ToolWindow.informativeBackground": "#304000",
-    "Notification.ToolWindow.informativeBorderColor": "greyDot65",
-    "Notification.ToolWindow.informativeForeground": "greyDot15",
-    "Notification.ToolWindow.warningBackground": "yellow",
-    "Notification.ToolWindow.warningBorderColor": "greyDot65",
-    "Notification.ToolWindow.warningForeground": "greyDot15",
+    "Notification.ToolWindow.errorBackground": "greyDot85",
+    "Notification.ToolWindow.errorBorderColor": "#ed005c",
+    "Notification.ToolWindow.errorForeground": "#F65F87",
+    "Notification.ToolWindow.informativeBackground": "greyDot85",
+    "Notification.ToolWindow.informativeBorderColor": "#92D923",
+    "Notification.ToolWindow.informativeForeground": "#92D923",
+    "Notification.ToolWindow.warningBackground": "greyDot85",
+    "Notification.ToolWindow.warningBorderColor": "accent",
+    "Notification.ToolWindow.warningForeground": "accent",
    "Notification.background": "greyDot85",
-    "Notification.errorBackground": "red",
-    "Notification.errorBorderColor": "greyDot65",
-    "Notification.errorForeground": "greyDot15",
-    "Notification.foreground": "greyDot25",
+    "Notification.errorBackground": "greyDot85",
+    "Notification.errorBorderColor": "#ed005c",
+    "Notification.errorForeground": "#F65F87",
    "OptionPane.background": "greyDot80",
-    "OptionPane.foreground": "greyDot25",
+    "OptionPane.foreground": "greyDot33",
    "Panel.background": "greyDot80",
-    "Panel.foreground": "greyDot25",
+    "Panel.foreground": "greyDot20",
    "ParameterInfo.background": "greyDot85",
-    "ParameterInfo.currentOverloadBackground": "lightBlue",
-    "ParameterInfo.currentParameterForeground": "accent",
    "ParameterInfo.foreground": "greyDot25",
+    "ParameterInfo.currentOverloadBackground": "greyDot65",
+    "ParameterInfo.currentParameterForeground": "accent",
    "ParameterInfo.infoForeground": "greyDot33",
-    "ParameterInfo.lineSeparatorColor": "greyDot70",
+    "ParameterInfo.lineSeparatorColor": "greyDot75",
+    "PasswordField.background": "greyDot75",
    "Plugins.Button.installBackground": "greyDot80",
    "Plugins.Button.installBorderColor": "greyDot65",
    "Plugins.Button.installFillBackground": "greyDot80",
@@ -187,136 +181,99 @@
    "Plugins.Button.installForeground": "accent",
    "Plugins.SearchField.background": "greyDot75",
    "Plugins.SectionHeader.background": "greyDot75",
-    "Plugins.SectionHeader.foreground": "greyDot25",
-    "Plugins.Tab.hoverBackground": "navyDot85",
-    "Plugins.Tab.selectedBackground": "greyDot85",
+    "Plugins.Tab.hoverBackground": "greyDot65",
    "Plugins.background": "greyDot80",
    "Plugins.disabledForeground": "greyDot50",
-    "Plugins.lightSelectionBackground": "greyDot70",
+    "Plugins.lightSelectionBackground": "navyDot85",
    "Plugins.tagBackground": "greyDot85",
-    "Plugins.tagForeground": "greyDot25",
    "Popup.Advertiser.background": "greyDot85",
    "Popup.Advertiser.foreground": "greyDot50",
    "Popup.Header.activeBackground": "greyDot75",
    "Popup.Header.inactiveBackground": "greyDot85",
    "Popup.paintBorder": true,
    "PopupMenu.background": "greyDot80",
-    "PopupMenu.foreground": "greyDot25",
-    "PopupMenu.selectionBackground": "navyDot85",
-    "PopupMenu.selectionForeground": "lightBlue",
    "PopupMenuSeparator.stripeWidth": 1,
-    "ProgressBar.failedColor": "red",
-    "ProgressBar.failedEndColor": "greyDot65",
-    "ProgressBar.indeterminateEndColor": "greyDot25",
+    "ProgressBar.failedColor": "#ed005c",
+    "ProgressBar.failedEndColor": "greyDot75",
    "ProgressBar.indeterminateStartColor": "accent",
-    "ProgressBar.passedColor": "green",
-    "ProgressBar.passedEndColor": "greyDot65",
+    "ProgressBar.indeterminateEndColor": "#FD971F",
+    "ProgressBar.passedColor": "#92D923",
+    "ProgressBar.passedEndColor": "greyDot75",
    "ProgressBar.progressColor": "accent",
    "ProgressBar.trackColor": "greyDot75",
-    "RadioButton.background": "greyDot75",
-    "ScrollBar.Mac.hoverTrackColor": "greyDot75",
-    "ScrollBar.Mac.trackColor": "greyDot75",
-    "ScrollPane.background": "greyDot85",
-    "ScrollPane.foreground": "greyDot25",
-    "SearchEverywhere.Advertiser.background": "greyDot85",
-    "SearchEverywhere.Advertiser.foreground": "greyDot33",
-    "SearchEverywhere.Header.background": "greyDot85",
-    "SearchEverywhere.List.separatorColor": "greyDot70",
-    "SearchEverywhere.List.separatorForeground": "greyDot70",
+    "RadioButton.background": "greyDot80",
+    "RadioButtonMenuItem.disabledBackground": "greyDot80",
+    "ScrollPane.background": "greyDot80",
+    "SearchEverywhere.Advertiser.foreground": "greyDot50",
+    "SearchEverywhere.List.separatorForeground": "greyDot50",
+    "SearchEverywhere.SearchField.infoForeground": "greyDot33",
    "SearchEverywhere.SearchField.background": "greyDot75",
-    "SearchEverywhere.SearchField.borderColor": "greyDot70",
-    "SearchEverywhere.SearchField.infoForeground": "greyDot50",
-    "SearchEverywhere.Tab.selectedBackground": "greyDot70",
-    "SearchEverywhere.Tab.selectedForeground": "accent",
+    "SearchEverywhere.Header.background": "greyDot80",
+    "SearchEverywhere.Tab.selectedBackground": "greyDot80",
    "SearchMatch.endBackground": "accent",
    "SearchMatch.startBackground": "accent",
-    "Separator.separatorColor": "greyDot70",
    "SidePanel.background": "greyDot85",
-    "Slider.background": "greyDot80",
-    "Slider.focus": "greyDot65",
-    "SpeedSearch.background": "greyDot80",
-    "SpeedSearch.borderColor": "greyDot70",
-    "SpeedSearch.errorForeground": "red",
+    "SpeedSearch.errorForeground": "#F65F87",
    "SpeedSearch.foreground": "accent",
-    "SplitPane.background": "greyDot80",
-    "SplitPane.darkShadow": "navyDot90",
    "SplitPane.highlight": "accent",
-    "SplitPane.shadow": "navyDot90",
-    "TabbedPane.background": "greyDot80",
-    "TabbedPane.contentAreaColor": "greyDot80",
-    "TabbedPane.disabledUnderlineColor": "greyDot75",
+    "PopupMenu.translucentBackground": "greyDot50",
+    "TabbedPane.disabledUnderlineColor": "greyDot65",
    "TabbedPane.focusColor": "greyDot65",
-    "TabbedPane.foreground": "greyDot25",
-    "TabbedPane.hoverColor": "navyDot85",
    "TabbedPane.tabSelectionHeight": 1,
    "TabbedPane.underlineColor": "accent",
-    "Table.background": "greyDot80",
    "Table.dropLineColor": "greyDot75",
    "Table.dropLineShortColor": "greyDot70",
+    "Table.focusCellBackground": "greyDot85",
    "Table.focusCellForeground": "accent",
-    "Table.selectionBackground": "navyDot85",
-    "Table.selectionForeground": "accent",
    "Table.sortIconColor": "accent",
    "Table.stripeColor": "greyDot75",
    "TableHeader.background": "greyDot85",
-    "TableHeader.bottomSeparatorColor": "greyDot75",
-    "TableHeader.separatorColor": "greyDot70",
-    "TextArea.background": "greyDot85",
+    "TableHeader.bottomSeparatorColor": "greyDot65",
+    "TextArea.background": "greyDot75",
    "TextArea.caretForeground": "accent",
-    "TextArea.foreground": "greyDot25",
-    "TextArea.selectionBackground": "navyDot85",
+    "TextArea.inactiveBackground": "greyDot80",
    "TextField.background": "greyDot75",
-    "TextField.caretForeground": "accent",
-    "TextField.darkShadow": "navyDot90",
    "TextField.foreground": "greyDot25",
+    "TextField.caretForeground": "accent",
    "TextField.highlight": "greyDot15",
-    "TextField.selectionBackground": "navyDot85",
-    "TextPane.background": "greyDot80",
+    "TextField.inactiveForeground": "greyDot33",
+    "TextPane.inactiveBackground": "greyDot80",
    "TitlePane.background": "greyDot85",
-    "ToggleButton.borderColor": "greyDot70",
-    "ToggleButton.buttonColor": "greyDot75",
+    "ToggleButton.buttonColor": "greyDot65",
    "ToggleButton.offBackground": "greyDot75",
    "ToggleButton.offForeground": "greyDot25",
-    "ToggleButton.onBackground": "greyDot50",
-    "ToggleButton.onForeground": "accent",
-    "ToolBar.background": "greyDot80",
-    "ToolBar.borderHandleColor": "greyDot70",
-    "ToolBar.darkShadow": "navyDot90",
-    "ToolBar.shadow": "navyDot90",
+    "ToggleButton.onBackground": "accent",
+    "ToggleButton.onForeground": "greyDot80",
+    "ToolBar.borderHandleColor": "greyDot65",
    "ToolTip.Actions.background": "greyDot80",
    "ToolTip.Actions.infoForeground": "greyDot50",
    "ToolTip.background": "greyDot75",
-    "ToolTip.foreground": "greyDot25",
    "ToolTip.infoForeground": "greyDot50",
-    "ToolWindow.Button.hoverBackground": "navyDot85",
-    "ToolWindow.Button.selectedBackground": "greyDot70",
-    "ToolWindow.Button.selectedForeground": "accent",
+    "ToolWindow.Button.hoverBackground": "greyDot65",
+    "ToolWindow.Button.selectedBackground": "greyDot85",
+    "ToolWindow.Button.selectedForeground": "lightBlue",
    "ToolWindow.Header.background": "greyDot85",
    "ToolWindow.Header.inactiveBackground": "greyDot80",
-    "ToolWindow.HeaderTab.hoverBackground": "navyDot85",
-    "ToolWindow.HeaderTab.hoverInactiveBackground": "navyDot90",
+    "ToolWindow.HeaderTab.hoverBackground": "greyDot65",
+    "ToolWindow.HeaderTab.hoverInactiveBackground": "greyDot85",
    "ToolWindow.HeaderTab.inactiveUnderlineColor": "greyDot75",
-    "ToolWindow.HeaderTab.selectedInactiveBackground": "greyDot80",
    "ToolWindow.HeaderTab.underlineColor": "accent",
    "ToolWindow.HeaderTab.underlineHeight": 1,
+    "ToolWindow.HeaderTab.underlinedTabBackground": "greyDot90",
    "ToolWindow.HeaderTab.underlinedTabInactiveBackground": "greyDot75",
    "Tree.background": "greyDot85",
+    "Tree.foreground": "greyDot15",
    "Tree.modifiedItemForeground": "accent",
-    "Tree.paintLines": 0,
-    "Tree.rowHeight": 20,
-    "Tree.selectionBackground": "navyDot85",
-    "Tree.selectionForeground": "accent",
-    "Tree.selectionInactiveBackground": "navyDot90",
-    "ValidationTooltip.errorBackground": "red",
-    "ValidationTooltip.errorBorderColor": "greyDot65",
-    "ValidationTooltip.warningBackground": "#805e00",
-    "ValidationTooltip.warningBorderColor": "greyDot65",
+    "ValidationTooltip.errorBackground": "greyDot85",
+    "ValidationTooltip.errorBorderColor": "#ed005c",
+    "ValidationTooltip.warningBackground": "greyDot85",
+    "ValidationTooltip.warningBorderColor": "accent",
    "VersionControl.FileHistory.Commit.selectedBranchBackground": "greyDot70",
    "VersionControl.Log.Commit.currentBranchBackground": "greyDot85",
    "VersionControl.Log.Commit.unmatchedForeground": "greyDot25",
    "WelcomeScreen.Projects.selectionBackground": "navyDot85",
    "WelcomeScreen.Projects.selectionInactiveBackground": "navyDot90",
    "WelcomeScreen.separatorColor": "greyDot65",
-    "Window.border": "0,0,0,0,5a5a5a"
+    "Window.border": "1,1,1,1,4d4d4d"
  }
 }
--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme-orange.theme.json
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme-orange.theme.json
@@ -36,6 +36,8 @@
 	  }
 	},

+	"ToolBar.background" : "#F5F5F5",
+	"Popup.Toolbar.background" : "#F5F5F5",
 	"Panel.background": "#F5F5F5",
 	"Panel.foreground" : "#5c616c",
 	"Window.border" : "1,1,1,1,#5c616c",
@@ -53,7 +55,6 @@
 	"Group.separatorColor" : "#9ba2ab",

 	"Tree.background" : "#ffffff",
-	"Tree.rowHeight": "23",

 	"ProgressBar.background" : "#f57900",
 	"ProgressBar.foreground" : "#f57900",
--- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme.theme.json
+++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/arc-theme.theme.json
@@ -36,6 +36,8 @@
      }
    },

+    "ToolBar.background" : "#F5F5F5",
+    "Popup.Toolbar.background" : "#F5F5F5",
    "Panel.background": "#F5F5F5",
    "Panel.foreground" : "#5c616c",
    "Window.border" : "1,1,1,1,#5c616c",
@@ -53,7 +55,6 @@
    "Group.separatorColor" : "#9ba2ab",

    "Tree.background" : "#ffffff",
-    "Tree.rowHeight": "23",

    "ProgressBar.background" : "#2679db",
    "ProgressBar.foreground" : "#2679db",
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java
@@ -513,14 +513,13 @@ public class FlatComponentsTest
 		add(comboBox4, "cell 4 5,growx");

 		//---- comboBox5 ----
-		comboBox5.setPrototypeDisplayValue("12345");
 		comboBox5.setModel(new DefaultComboBoxModel<>(new String[] {
 			"wide popup if text is longer",
 			"aa",
 			"bbb",
 			"cccc"
 		}));
-		add(comboBox5, "cell 5 5,growx");
+		add(comboBox5, "cell 5 5,growx,wmax 100");

 		//---- spinnerLabel ----
 		spinnerLabel.setText("JSpinner:");
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd
@@ -373,7 +373,6 @@ new FormModel {
 			} )
 			add( new FormComponent( "javax.swing.JComboBox" ) {
 				name: "comboBox5"
-				"prototypeDisplayValue": "12345"
 				"model": new javax.swing.DefaultComboBoxModel {
 					selectedItem: "wide popup if text is longer"
 					addElement( "wide popup if text is longer" )
@@ -382,7 +381,7 @@ new FormModel {
 					addElement( "cccc" )
 				}
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 5 5,growx"
+				"value": "cell 5 5,growx,wmax 100"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "spinnerLabel"
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java
@@ -21,13 +21,14 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import javax.swing.*;
 import javax.swing.border.*;
+import com.formdev.flatlaf.demo.ScrollablePanel;
 import net.miginfocom.swing.*;

 /**
 * @author Karl Tauber
 */
 public class FlatOptionPaneTest
-	extends FlatTestPanel
+	extends JScrollPane
 {
 	public static void main( String[] args ) {
 		SwingUtilities.invokeLater( () -> {
@@ -55,6 +56,7 @@ public class FlatOptionPaneTest

 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
+		ScrollablePanel panel9 = new ScrollablePanel();
 		JLabel plainLabel = new JLabel();
 		JPanel panel1 = new JPanel();
 		JOptionPane plainOptionPane = new JOptionPane();
@@ -89,194 +91,200 @@ public class FlatOptionPaneTest
 		FlatOptionPaneTest.ShowDialogLinkLabel customShowDialogLabel = new FlatOptionPaneTest.ShowDialogLinkLabel();

 		//======== this ========
-		setLayout(new MigLayout(
-			"flowy,ltr,insets dialog,hidemode 3",
-			// columns
-			"[]" +
-			"[]" +
-			"[fill]",
-			// rows
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]" +
-			"[top]"));
+		setBorder(BorderFactory.createEmptyBorder());

-		//---- plainLabel ----
-		plainLabel.setText("Plain");
-		add(plainLabel, "cell 0 0");
-
-		//======== panel1 ========
+		//======== panel9 ========
 		{
-			panel1.setBorder(LineBorder.createGrayLineBorder());
-			panel1.setLayout(new BorderLayout());
+			panel9.setLayout(new MigLayout(
+				"flowy,ltr,insets dialog,hidemode 3",
+				// columns
+				"[]" +
+				"[]" +
+				"[fill]",
+				// rows
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]" +
+				"[top]"));

-			//---- plainOptionPane ----
-			plainOptionPane.setMessage("Hello world.");
-			panel1.add(plainOptionPane, BorderLayout.CENTER);
+			//---- plainLabel ----
+			plainLabel.setText("Plain");
+			panel9.add(plainLabel, "cell 0 0");
+
+			//======== panel1 ========
+			{
+				panel1.setBorder(LineBorder.createGrayLineBorder());
+				panel1.setLayout(new BorderLayout());
+
+				//---- plainOptionPane ----
+				plainOptionPane.setMessage("Hello world.");
+				panel1.add(plainOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel1, "cell 1 0");
+
+			//---- plainShowDialogLabel ----
+			plainShowDialogLabel.setOptionPane(plainOptionPane);
+			plainShowDialogLabel.setTitleLabel(plainLabel);
+			panel9.add(plainShowDialogLabel, "cell 2 0");
+
+			//---- errorLabel ----
+			errorLabel.setText("Error");
+			panel9.add(errorLabel, "cell 0 1");
+
+			//======== panel2 ========
+			{
+				panel2.setBorder(LineBorder.createGrayLineBorder());
+				panel2.setLayout(new BorderLayout());
+
+				//---- errorOptionPane ----
+				errorOptionPane.setMessageType(JOptionPane.ERROR_MESSAGE);
+				errorOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				errorOptionPane.setMessage("Your PC ran into a problem. Buy a new one.");
+				panel2.add(errorOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel2, "cell 1 1");
+
+			//---- errorShowDialogLabel ----
+			errorShowDialogLabel.setTitleLabel(errorLabel);
+			errorShowDialogLabel.setOptionPane(errorOptionPane);
+			panel9.add(errorShowDialogLabel, "cell 2 1");
+
+			//---- informationLabel ----
+			informationLabel.setText("Information");
+			panel9.add(informationLabel, "cell 0 2");
+
+			//======== panel3 ========
+			{
+				panel3.setBorder(LineBorder.createGrayLineBorder());
+				panel3.setLayout(new BorderLayout());
+
+				//---- informationOptionPane ----
+				informationOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
+				informationOptionPane.setOptionType(JOptionPane.YES_NO_OPTION);
+				informationOptionPane.setMessage("Text with\nmultiple lines\n(use \\n to separate lines)");
+				panel3.add(informationOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel3, "cell 1 2");
+
+			//---- informationShowDialogLabel ----
+			informationShowDialogLabel.setOptionPane(informationOptionPane);
+			informationShowDialogLabel.setTitleLabel(informationLabel);
+			panel9.add(informationShowDialogLabel, "cell 2 2");
+
+			//---- questionLabel ----
+			questionLabel.setText("Question");
+			panel9.add(questionLabel, "cell 0 3");
+
+			//======== panel4 ========
+			{
+				panel4.setBorder(LineBorder.createGrayLineBorder());
+				panel4.setLayout(new BorderLayout());
+
+				//---- questionOptionPane ----
+				questionOptionPane.setMessageType(JOptionPane.QUESTION_MESSAGE);
+				questionOptionPane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
+				questionOptionPane.setMessage("Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters.");
+				panel4.add(questionOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel4, "cell 1 3");
+
+			//---- questionShowDialogLabel ----
+			questionShowDialogLabel.setOptionPane(questionOptionPane);
+			questionShowDialogLabel.setTitleLabel(questionLabel);
+			panel9.add(questionShowDialogLabel, "cell 2 3");
+
+			//---- warningLabel ----
+			warningLabel.setText("Warning");
+			panel9.add(warningLabel, "cell 0 4");
+
+			//======== panel5 ========
+			{
+				panel5.setBorder(LineBorder.createGrayLineBorder());
+				panel5.setLayout(new BorderLayout());
+
+				//---- warningOptionPane ----
+				warningOptionPane.setMessageType(JOptionPane.WARNING_MESSAGE);
+				warningOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				warningOptionPane.setMessage("<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines.");
+				panel5.add(warningOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel5, "cell 1 4");
+
+			//---- warningShowDialogLabel ----
+			warningShowDialogLabel.setOptionPane(warningOptionPane);
+			warningShowDialogLabel.setTitleLabel(warningLabel);
+			panel9.add(warningShowDialogLabel, "cell 2 4");
+
+			//---- inputLabel ----
+			inputLabel.setText("Input");
+			panel9.add(inputLabel, "cell 0 5");
+
+			//======== panel7 ========
+			{
+				panel7.setBorder(LineBorder.createGrayLineBorder());
+				panel7.setLayout(new BorderLayout());
+
+				//---- inputOptionPane ----
+				inputOptionPane.setWantsInput(true);
+				inputOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				inputOptionPane.setMessage("Enter whatever you want:");
+				panel7.add(inputOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel7, "cell 1 5");
+
+			//---- inputShowDialogLabel ----
+			inputShowDialogLabel.setOptionPane(inputOptionPane);
+			inputShowDialogLabel.setTitleLabel(inputLabel);
+			panel9.add(inputShowDialogLabel, "cell 2 5");
+
+			//---- inputIconLabel ----
+			inputIconLabel.setText("Input + icon");
+			panel9.add(inputIconLabel, "cell 0 6");
+
+			//======== panel8 ========
+			{
+				panel8.setBorder(LineBorder.createGrayLineBorder());
+				panel8.setLayout(new BorderLayout());
+
+				//---- inputIconOptionPane ----
+				inputIconOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
+				inputIconOptionPane.setWantsInput(true);
+				inputIconOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
+				inputIconOptionPane.setMessage("Enter something:");
+				panel8.add(inputIconOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel8, "cell 1 6");
+
+			//---- inputIconShowDialogLabel ----
+			inputIconShowDialogLabel.setTitleLabel(inputIconLabel);
+			inputIconShowDialogLabel.setOptionPane(inputIconOptionPane);
+			panel9.add(inputIconShowDialogLabel, "cell 2 6");
+
+			//---- customLabel ----
+			customLabel.setText("Custom");
+			panel9.add(customLabel, "cell 0 7");
+
+			//======== panel6 ========
+			{
+				panel6.setBorder(LineBorder.createGrayLineBorder());
+				panel6.setLayout(new BorderLayout());
+
+				//---- customOptionPane ----
+				customOptionPane.setIcon(UIManager.getIcon("Tree.leafIcon"));
+				panel6.add(customOptionPane, BorderLayout.CENTER);
+			}
+			panel9.add(panel6, "cell 1 7");
+
+			//---- customShowDialogLabel ----
+			customShowDialogLabel.setOptionPane(customOptionPane);
+			customShowDialogLabel.setTitleLabel(customLabel);
+			panel9.add(customShowDialogLabel, "cell 2 7");
 		}
-		add(panel1, "cell 1 0");
-
-		//---- plainShowDialogLabel ----
-		plainShowDialogLabel.setOptionPane(plainOptionPane);
-		plainShowDialogLabel.setTitleLabel(plainLabel);
-		add(plainShowDialogLabel, "cell 2 0");
-
-		//---- errorLabel ----
-		errorLabel.setText("Error");
-		add(errorLabel, "cell 0 1");
-
-		//======== panel2 ========
-		{
-			panel2.setBorder(LineBorder.createGrayLineBorder());
-			panel2.setLayout(new BorderLayout());
-
-			//---- errorOptionPane ----
-			errorOptionPane.setMessageType(JOptionPane.ERROR_MESSAGE);
-			errorOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			errorOptionPane.setMessage("Your PC ran into a problem. Buy a new one.");
-			panel2.add(errorOptionPane, BorderLayout.CENTER);
-		}
-		add(panel2, "cell 1 1");
-
-		//---- errorShowDialogLabel ----
-		errorShowDialogLabel.setTitleLabel(errorLabel);
-		errorShowDialogLabel.setOptionPane(errorOptionPane);
-		add(errorShowDialogLabel, "cell 2 1");
-
-		//---- informationLabel ----
-		informationLabel.setText("Information");
-		add(informationLabel, "cell 0 2");
-
-		//======== panel3 ========
-		{
-			panel3.setBorder(LineBorder.createGrayLineBorder());
-			panel3.setLayout(new BorderLayout());
-
-			//---- informationOptionPane ----
-			informationOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
-			informationOptionPane.setOptionType(JOptionPane.YES_NO_OPTION);
-			informationOptionPane.setMessage("Text with\nmultiple lines\n(use \\n to separate lines)");
-			panel3.add(informationOptionPane, BorderLayout.CENTER);
-		}
-		add(panel3, "cell 1 2");
-
-		//---- informationShowDialogLabel ----
-		informationShowDialogLabel.setOptionPane(informationOptionPane);
-		informationShowDialogLabel.setTitleLabel(informationLabel);
-		add(informationShowDialogLabel, "cell 2 2");
-
-		//---- questionLabel ----
-		questionLabel.setText("Question");
-		add(questionLabel, "cell 0 3");
-
-		//======== panel4 ========
-		{
-			panel4.setBorder(LineBorder.createGrayLineBorder());
-			panel4.setLayout(new BorderLayout());
-
-			//---- questionOptionPane ----
-			questionOptionPane.setMessageType(JOptionPane.QUESTION_MESSAGE);
-			questionOptionPane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
-			questionOptionPane.setMessage("Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters.");
-			panel4.add(questionOptionPane, BorderLayout.CENTER);
-		}
-		add(panel4, "cell 1 3");
-
-		//---- questionShowDialogLabel ----
-		questionShowDialogLabel.setOptionPane(questionOptionPane);
-		questionShowDialogLabel.setTitleLabel(questionLabel);
-		add(questionShowDialogLabel, "cell 2 3");
-
-		//---- warningLabel ----
-		warningLabel.setText("Warning");
-		add(warningLabel, "cell 0 4");
-
-		//======== panel5 ========
-		{
-			panel5.setBorder(LineBorder.createGrayLineBorder());
-			panel5.setLayout(new BorderLayout());
-
-			//---- warningOptionPane ----
-			warningOptionPane.setMessageType(JOptionPane.WARNING_MESSAGE);
-			warningOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			warningOptionPane.setMessage("<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines.");
-			panel5.add(warningOptionPane, BorderLayout.CENTER);
-		}
-		add(panel5, "cell 1 4");
-
-		//---- warningShowDialogLabel ----
-		warningShowDialogLabel.setOptionPane(warningOptionPane);
-		warningShowDialogLabel.setTitleLabel(warningLabel);
-		add(warningShowDialogLabel, "cell 2 4");
-
-		//---- inputLabel ----
-		inputLabel.setText("Input");
-		add(inputLabel, "cell 0 5");
-
-		//======== panel7 ========
-		{
-			panel7.setBorder(LineBorder.createGrayLineBorder());
-			panel7.setLayout(new BorderLayout());
-
-			//---- inputOptionPane ----
-			inputOptionPane.setWantsInput(true);
-			inputOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			inputOptionPane.setMessage("Enter whatever you want:");
-			panel7.add(inputOptionPane, BorderLayout.CENTER);
-		}
-		add(panel7, "cell 1 5");
-
-		//---- inputShowDialogLabel ----
-		inputShowDialogLabel.setOptionPane(inputOptionPane);
-		inputShowDialogLabel.setTitleLabel(inputLabel);
-		add(inputShowDialogLabel, "cell 2 5");
-
-		//---- inputIconLabel ----
-		inputIconLabel.setText("Input + icon");
-		add(inputIconLabel, "cell 0 6");
-
-		//======== panel8 ========
-		{
-			panel8.setBorder(LineBorder.createGrayLineBorder());
-			panel8.setLayout(new BorderLayout());
-
-			//---- inputIconOptionPane ----
-			inputIconOptionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
-			inputIconOptionPane.setWantsInput(true);
-			inputIconOptionPane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
-			inputIconOptionPane.setMessage("Enter something:");
-			panel8.add(inputIconOptionPane, BorderLayout.CENTER);
-		}
-		add(panel8, "cell 1 6");
-
-		//---- inputIconShowDialogLabel ----
-		inputIconShowDialogLabel.setTitleLabel(inputIconLabel);
-		inputIconShowDialogLabel.setOptionPane(inputIconOptionPane);
-		add(inputIconShowDialogLabel, "cell 2 6");
-
-		//---- customLabel ----
-		customLabel.setText("Custom");
-		add(customLabel, "cell 0 7");
-
-		//======== panel6 ========
-		{
-			panel6.setBorder(LineBorder.createGrayLineBorder());
-			panel6.setLayout(new BorderLayout());
-
-			//---- customOptionPane ----
-			customOptionPane.setIcon(UIManager.getIcon("Tree.leafIcon"));
-			panel6.add(customOptionPane, BorderLayout.CENTER);
-		}
-		add(panel6, "cell 1 7");
-
-		//---- customShowDialogLabel ----
-		customShowDialogLabel.setOptionPane(customOptionPane);
-		customShowDialogLabel.setTitleLabel(customLabel);
-		add(customShowDialogLabel, "cell 2 7");
+		setViewportView(panel9);
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}

--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.jfd
@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "11.0.2" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"

 new FormModel {
 	contentType: "form/swing"
@@ -6,240 +6,244 @@ new FormModel {
 		auxiliary() {
 			"JavaCodeGenerator.defaultVariableLocal": true
 		}
-		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
-			"$layoutConstraints": "flowy,ltr,insets dialog,hidemode 3"
-			"$columnConstraints": "[][][fill]"
-			"$rowConstraints": "[top][top][top][top][top][top][top][top]"
-		} ) {
+		add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
 			name: "this"
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "plainLabel"
-				"text": "Plain"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 0"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel1"
-				"border": &LineBorder0 new javax.swing.border.LineBorder( sfield java.awt.Color gray, 1, false )
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "plainOptionPane"
-					"message": "Hello world."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
+			"border": new javax.swing.border.EmptyBorder( 0, 0, 0, 0 )
+			add( new FormContainer( "com.formdev.flatlaf.demo.ScrollablePanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
+				"$layoutConstraints": "flowy,ltr,insets dialog,hidemode 3"
+				"$columnConstraints": "[][][fill]"
+				"$rowConstraints": "[top][top][top][top][top][top][top][top]"
+			} ) {
+				name: "panel9"
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "plainLabel"
+					"text": "Plain"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 0"
 				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 0"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "plainShowDialogLabel"
-				"optionPane": new FormReference( "plainOptionPane" )
-				"titleLabel": new FormReference( "plainLabel" )
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 0"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "errorLabel"
-				"text": "Error"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 1"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel2"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "errorOptionPane"
-					"messageType": 0
-					"optionType": 2
-					"message": "Your PC ran into a problem. Buy a new one."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel1"
+					"border": &LineBorder0 new javax.swing.border.LineBorder( sfield java.awt.Color gray, 1, false )
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "plainOptionPane"
+						"message": "Hello world."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 0"
 				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 1"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "errorShowDialogLabel"
-				"titleLabel": new FormReference( "errorLabel" )
-				"optionPane": new FormReference( "errorOptionPane" )
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 1"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "informationLabel"
-				"text": "Information"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 2"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel3"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "informationOptionPane"
-					"messageType": 1
-					"optionType": 0
-					"message": "Text with\nmultiple lines\n(use \\n to separate lines)"
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 2"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "informationShowDialogLabel"
-				"optionPane": new FormReference( "informationOptionPane" )
-				"titleLabel": new FormReference( "informationLabel" )
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 2"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "questionLabel"
-				"text": "Question"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 3"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel4"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "questionOptionPane"
-					"messageType": 3
-					"optionType": 1
-					"message": "Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 3"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "questionShowDialogLabel"
-				"optionPane": new FormReference( "questionOptionPane" )
-				"titleLabel": new FormReference( "questionLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 3"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "warningLabel"
-				"text": "Warning"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 4"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel5"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "warningOptionPane"
-					"messageType": 2
-					"optionType": 2
-					"message": "<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines."
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 4"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "warningShowDialogLabel"
-				"optionPane": new FormReference( "warningOptionPane" )
-				"titleLabel": new FormReference( "warningLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 4"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "inputLabel"
-				"text": "Input"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 5"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel7"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "inputOptionPane"
-					"wantsInput": true
-					"optionType": 2
-					"message": "Enter whatever you want:"
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 5"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "inputShowDialogLabel"
-				"optionPane": new FormReference( "inputOptionPane" )
-				"titleLabel": new FormReference( "inputLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 5"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "inputIconLabel"
-				"text": "Input + icon"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 6"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel8"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "inputIconOptionPane"
-					"messageType": 1
-					"wantsInput": true
-					"optionType": 2
-					"message": "Enter something:"
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
-				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 6"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "inputIconShowDialogLabel"
-				"titleLabel": new FormReference( "inputIconLabel" )
-				"optionPane": new FormReference( "inputIconOptionPane" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 6"
-			} )
-			add( new FormComponent( "javax.swing.JLabel" ) {
-				name: "customLabel"
-				"text": "Custom"
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 7"
-			} )
-			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
-				name: "panel6"
-				"border": #LineBorder0
-				add( new FormComponent( "javax.swing.JOptionPane" ) {
-					name: "customOptionPane"
-					"icon": new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "plainShowDialogLabel"
+					"optionPane": new FormReference( "plainOptionPane" )
+					"titleLabel": new FormReference( "plainLabel" )
 					auxiliary() {
 						"JavaCodeGenerator.variableLocal": false
 					}
-				}, new FormLayoutConstraints( class java.lang.String ) {
-					"value": "Center"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 0"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "errorLabel"
+					"text": "Error"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel2"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "errorOptionPane"
+						"messageType": 0
+						"optionType": 2
+						"message": "Your PC ran into a problem. Buy a new one."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 1"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "errorShowDialogLabel"
+					"titleLabel": new FormReference( "errorLabel" )
+					"optionPane": new FormReference( "errorOptionPane" )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "informationLabel"
+					"text": "Information"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel3"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "informationOptionPane"
+						"messageType": 1
+						"optionType": 0
+						"message": "Text with\nmultiple lines\n(use \\n to separate lines)"
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 2"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "informationShowDialogLabel"
+					"optionPane": new FormReference( "informationOptionPane" )
+					"titleLabel": new FormReference( "informationLabel" )
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 2"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "questionLabel"
+					"text": "Question"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel4"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "questionOptionPane"
+						"messageType": 3
+						"optionType": 1
+						"message": "Answer the question. What question? Don't know. Just writing useless text to make this longer than 80 characters."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 3"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "questionShowDialogLabel"
+					"optionPane": new FormReference( "questionOptionPane" )
+					"titleLabel": new FormReference( "questionLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 3"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "warningLabel"
+					"text": "Warning"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel5"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "warningOptionPane"
+						"messageType": 2
+						"optionType": 2
+						"message": "<html>I like <b>bold</b>,<br> and I like <i>italic</i>,<br> and I like to have<br> many lines.<br> Lots of lines."
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 4"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "warningShowDialogLabel"
+					"optionPane": new FormReference( "warningOptionPane" )
+					"titleLabel": new FormReference( "warningLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 4"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "inputLabel"
+					"text": "Input"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel7"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "inputOptionPane"
+						"wantsInput": true
+						"optionType": 2
+						"message": "Enter whatever you want:"
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 5"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "inputShowDialogLabel"
+					"optionPane": new FormReference( "inputOptionPane" )
+					"titleLabel": new FormReference( "inputLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 5"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "inputIconLabel"
+					"text": "Input + icon"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 6"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel8"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "inputIconOptionPane"
+						"messageType": 1
+						"wantsInput": true
+						"optionType": 2
+						"message": "Enter something:"
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 6"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "inputIconShowDialogLabel"
+					"titleLabel": new FormReference( "inputIconLabel" )
+					"optionPane": new FormReference( "inputIconOptionPane" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 6"
+				} )
+				add( new FormComponent( "javax.swing.JLabel" ) {
+					name: "customLabel"
+					"text": "Custom"
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7"
+				} )
+				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class java.awt.BorderLayout ) ) {
+					name: "panel6"
+					"border": #LineBorder0
+					add( new FormComponent( "javax.swing.JOptionPane" ) {
+						name: "customOptionPane"
+						"icon": new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
+						auxiliary() {
+							"JavaCodeGenerator.variableLocal": false
+						}
+					}, new FormLayoutConstraints( class java.lang.String ) {
+						"value": "Center"
+					} )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 1 7"
+				} )
+				add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
+					name: "customShowDialogLabel"
+					"optionPane": new FormReference( "customOptionPane" )
+					"titleLabel": new FormReference( "customLabel" )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 2 7"
 				} )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7"
-			} )
-			add( new FormComponent( "com.formdev.flatlaf.testing.FlatOptionPaneTest$ShowDialogLinkLabel" ) {
-				name: "customShowDialogLabel"
-				"optionPane": new FormReference( "customOptionPane" )
-				"titleLabel": new FormReference( "customLabel" )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 2 7"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 790, 920 )
+			"size": new java.awt.Dimension( 840, 900 )
 		} )
 	}
 }
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java
@@ -142,6 +142,8 @@ public class FlatTestFrame
 		if( scaleFactor != null )
 			scaleFactorComboBox.setSelectedItem( scaleFactor );

+		updateSizeVariantComboBox();
+
 		// register F1, F2, ... keys to switch to Light, Dark or other LaFs
 		registerSwitchToLookAndFeel( KeyEvent.VK_F1, FlatLightLaf.class.getName() );
 		registerSwitchToLookAndFeel( KeyEvent.VK_F2, FlatDarkLaf.class.getName() );
@@ -198,11 +200,19 @@ public class FlatTestFrame
 					// enable/disable scale factor combobox
 					updateScaleFactorComboBox();

+					// show/hide size variant combobox
+					updateSizeVariantComboBox();
+
 					// this is necessary because embedded JOptionPane's "steal" the default button
 					getRootPane().setDefaultButton( closeButton );
 				} );
 			}
 		} );
+
+		UIScale.addPropertyChangeListener( e -> {
+			// update title because user scale factor may change
+			updateTitle();
+		} );
 	}

 	private void updateTitle() {
@@ -398,7 +408,24 @@ public class FlatTestFrame
 	}

 	private void updateScaleFactorComboBox() {
-		scaleFactorComboBox.setEnabled( !UIScale.isSystemScalingEnabled() && UIManager.getLookAndFeel() instanceof FlatLaf );
+		scaleFactorComboBox.setEnabled( UIManager.getLookAndFeel() instanceof FlatLaf );
+	}
+
+	private void sizeVariantChanged() {
+		String sel = (String) sizeVariantComboBox.getSelectedItem();
+		String sizeVariant = "default".equals( sel ) ? null : sel;
+
+		updateComponentsRecur( content, (c, type) -> {
+			if( c instanceof JComponent )
+				((JComponent)c).putClientProperty( "JComponent.sizeVariant", sizeVariant );
+		} );
+	}
+
+	private void updateSizeVariantComboBox() {
+		LookAndFeel lookAndFeel = UIManager.getLookAndFeel();
+		boolean visible = lookAndFeel instanceof NimbusLookAndFeel ||
+			"com.apple.laf.AquaLookAndFeel".equals( lookAndFeel.getClass().getName() );
+		sizeVariantComboBox.setVisible( visible );
 	}

 	private void updateComponentsRecur( Container container, BiConsumer<Component, String> action ) {
@@ -471,6 +498,7 @@ public class FlatTestFrame
 		explicitColorsCheckBox = new JCheckBox();
 		backgroundCheckBox = new JCheckBox();
 		opaqueTriStateCheckBox = new TriStateCheckBox();
+		sizeVariantComboBox = new JComboBox<>();
 		closeButton = new JButton();
 		themesPanel = new IJThemesPanel();

@@ -508,6 +536,7 @@ public class FlatTestFrame
 					"[fill]" +
 					"[fill]" +
 					"[fill]" +
+					"[fill]" +
 					"[grow,fill]" +
 					"[button,fill]",
 					// rows
@@ -573,9 +602,20 @@ public class FlatTestFrame
 				opaqueTriStateCheckBox.addActionListener(e -> opaqueChanged());
 				buttonBar.add(opaqueTriStateCheckBox, "cell 7 0");

+				//---- sizeVariantComboBox ----
+				sizeVariantComboBox.setModel(new DefaultComboBoxModel<>(new String[] {
+					"mini",
+					"small",
+					"default",
+					"large"
+				}));
+				sizeVariantComboBox.setSelectedIndex(2);
+				sizeVariantComboBox.addActionListener(e -> sizeVariantChanged());
+				buttonBar.add(sizeVariantComboBox, "cell 8 0");
+
 				//---- closeButton ----
 				closeButton.setText("Close");
-				buttonBar.add(closeButton, "cell 9 0");
+				buttonBar.add(closeButton, "cell 10 0");
 			}
 			dialogPane.add(buttonBar, BorderLayout.SOUTH);
 			dialogPane.add(themesPanel, BorderLayout.EAST);
@@ -596,6 +636,7 @@ public class FlatTestFrame
 	private JCheckBox explicitColorsCheckBox;
 	private JCheckBox backgroundCheckBox;
 	private TriStateCheckBox opaqueTriStateCheckBox;
+	private JComboBox<String> sizeVariantComboBox;
 	private JButton closeButton;
 	private IJThemesPanel themesPanel;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.jfd
@@ -1,4 +1,4 @@
-JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
+JFDML JFormDesigner: "7.0.1.0.272" Java: "13.0.2" encoding: "UTF-8"

 new FormModel {
 	contentType: "form/swing"
@@ -21,7 +21,7 @@ new FormModel {
 				} )
 				add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 					"$layoutConstraints": "insets dialog"
-					"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill][fill][grow,fill][button,fill]"
+					"$columnConstraints": "[fill][fill][fill][fill][fill][fill][fill][fill][fill][grow,fill][button,fill]"
 					"$rowSpecs": "[fill]"
 				} ) {
 					name: "buttonBar"
@@ -105,11 +105,25 @@ new FormModel {
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 						"value": "cell 7 0"
 					} )
+					add( new FormComponent( "javax.swing.JComboBox" ) {
+						name: "sizeVariantComboBox"
+						"model": new javax.swing.DefaultComboBoxModel {
+							selectedItem: "mini"
+							addElement( "mini" )
+							addElement( "small" )
+							addElement( "default" )
+							addElement( "large" )
+						}
+						"selectedIndex": 2
+						addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "sizeVariantChanged", false ) )
+					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+						"value": "cell 8 0"
+					} )
 					add( new FormComponent( "javax.swing.JButton" ) {
 						name: "closeButton"
 						"text": "Close"
 					}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-						"value": "cell 9 0"
+						"value": "cell 10 0"
 					} )
 				}, new FormLayoutConstraints( class java.lang.String ) {
 					"value": "South"
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
@@ -368,7 +368,16 @@ public class UIDefaultsDump

 	private void dumpActiveValue( PrintWriter out, ActiveValue value ) {
 		out.print( "[active] " );
-		dumpValue( out, value.createValue( defaults ) );
+		Object realValue = value.createValue( defaults );
+
+		if( realValue instanceof Font && realValue == UIManager.getFont( "defaultFont" ) ) {
+			// dump "$defaultFont" for the default font to make it easier to
+			// compare Windows/Linux dumps with macOS dumps
+			out.print( "$defaultFont" );
+			if( realValue instanceof UIResource )
+				out.print( " [UI]" );
+		} else
+			dumpValue( out, realValue );
 	}

 	private String dumpClass( Object value ) {
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt
@@ -80,7 +80,7 @@ Button.defaultButtonFollowsFocus false
 Button.disabledBorderColor     #5e6060    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledText            #777777    javax.swing.plaf.ColorUIResource [UI]
 Button.focusedBorderColor      #466d94    javax.swing.plaf.ColorUIResource [UI]
-Button.font                    .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Button.font                    [active] $defaultFont [UI]
 Button.foreground              #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Button.highlight               #242424    javax.swing.plaf.ColorUIResource [UI]
 Button.hoverBackground         #ff0000    com.formdev.flatlaf.util.DerivedColor [UI]
@@ -112,7 +112,7 @@ CheckBox.arc                   4
 CheckBox.background            #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 CheckBox.disabledText          #777777    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+CheckBox.font                  [active] $defaultFont [UI]
 CheckBox.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.background       #43494a    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.borderColor      #6b6b6b    javax.swing.plaf.ColorUIResource [UI]
@@ -137,7 +137,7 @@ CheckBox.textShiftOffset       0

 #---- CheckBoxMenuItem ----

-CheckBoxMenuItem.acceleratorFont .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.acceleratorFont [active] $defaultFont [UI]
 CheckBoxMenuItem.acceleratorForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.arrowIcon     [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -146,7 +146,7 @@ CheckBoxMenuItem.border        [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 CheckBoxMenuItem.borderPainted true
 CheckBoxMenuItem.checkIcon     [lazy] 15,15    com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI]
 CheckBoxMenuItem.disabledForeground #777777    javax.swing.plaf.ColorUIResource [UI]
-CheckBoxMenuItem.font          .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.font          [active] $defaultFont [UI]
 CheckBoxMenuItem.foreground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.margin        2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 CheckBoxMenuItem.opaque        false
@@ -163,7 +163,7 @@ CheckBoxUI                     com.formdev.flatlaf.ui.FlatCheckBoxUI
 #---- ColorChooser ----

 ColorChooser.background        #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-ColorChooser.font              .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ColorChooser.font              [active] $defaultFont [UI]
 ColorChooser.foreground        #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesDefaultRecentColor #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesRecentSwatchSize [active] 16,16    javax.swing.plaf.DimensionUIResource [UI]
@@ -185,7 +185,7 @@ ComboBox.buttonHoverArrowColor #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonShadow          #646464    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledForeground    #777777    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ComboBox.font                  [active] $defaultFont [UI]
 ComboBox.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.isEnterSelectablePopup false
 ComboBox.noActionOnKeyNavigation false
@@ -246,7 +246,7 @@ EditorPane.border              [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 EditorPane.caretBlinkRate      500
 EditorPane.caretForeground     #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.disabledBackground  #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-EditorPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+EditorPane.font                [active] $defaultFont [UI]
 EditorPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveBackground  #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -285,7 +285,7 @@ FormattedTextField.border      [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 FormattedTextField.caretBlinkRate 500
 FormattedTextField.caretForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-FormattedTextField.font        .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+FormattedTextField.font        [active] $defaultFont [UI]
 FormattedTextField.foreground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -352,7 +352,7 @@ InternalFrame.inactiveTitleBackground #303234    javax.swing.plaf.ColorUIResourc
 InternalFrame.inactiveTitleForeground #777777    javax.swing.plaf.ColorUIResource [UI]
 InternalFrame.maximizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon [UI]
 InternalFrame.minimizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMinimizeIcon [UI]
-InternalFrame.titleFont        .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+InternalFrame.titleFont        [active] $defaultFont [UI]


 #---- InternalFrameTitlePane ----
@@ -429,7 +429,7 @@ JideTabbedPaneUI               com.formdev.flatlaf.jideoss.ui.FlatJideTabbedPane
 Label.background               #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledForeground       #777777    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledShadow           #646464    javax.swing.plaf.ColorUIResource [UI]
-Label.font                     .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Label.font                     [active] $defaultFont [UI]
 Label.foreground               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 LabelUI                        com.formdev.flatlaf.ui.FlatLabelUI

@@ -447,7 +447,7 @@ List.dropCellForeground        [lazy] #bbbbbb    javax.swing.plaf.ColorUIResourc
 List.dropLineColor             [lazy] #6d8ac0    javax.swing.plaf.ColorUIResource [UI]
 List.focusCellHighlightBorder  [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Focused [UI]
 List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Selected [UI]
-List.font                      .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+List.font                      [active] $defaultFont [UI]
 List.foreground                #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 List.noFocusBorder             1,1,1,1  false    javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI]
 List.selectionBackground       #4b6eaf    javax.swing.plaf.ColorUIResource [UI]
@@ -460,7 +460,7 @@ ListUI                         com.formdev.flatlaf.ui.FlatListUI

 #---- Menu ----

-Menu.acceleratorFont           .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Menu.acceleratorFont           [active] $defaultFont [UI]
 Menu.acceleratorForeground     #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Menu.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Menu.arrowIcon                 [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuArrowIcon [UI]
@@ -470,7 +470,7 @@ Menu.borderPainted             true
 Menu.cancelMode                hideLastSubmenu
 Menu.crossMenuMnemonic         true
 Menu.disabledForeground        #777777    javax.swing.plaf.ColorUIResource [UI]
-Menu.font                      .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Menu.font                      [active] $defaultFont [UI]
 Menu.foreground                #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.arrowColor           #a7a7a7    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.disabledArrowColor   #606060    javax.swing.plaf.ColorUIResource [UI]
@@ -492,7 +492,7 @@ Menu.submenuPopupOffsetY       [active] -4
 MenuBar.background             #303234    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.border                 [lazy] 0,0,1,0  false    com.formdev.flatlaf.ui.FlatMenuBarBorder [UI]
 MenuBar.borderColor            #515151    javax.swing.plaf.ColorUIResource [UI]
-MenuBar.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+MenuBar.font                   [active] $defaultFont [UI]
 MenuBar.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.highlight              #242424    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.hoverBackground        #484c4f    javax.swing.plaf.ColorUIResource [UI]
@@ -507,7 +507,7 @@ MenuBarUI                      com.formdev.flatlaf.ui.FlatMenuBarUI
 #---- MenuItem ----

 MenuItem.acceleratorDelimiter  
-MenuItem.acceleratorFont       .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+MenuItem.acceleratorFont       [active] $defaultFont [UI]
 MenuItem.acceleratorForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.arrowIcon             [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -515,7 +515,7 @@ MenuItem.background            #303234    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
 MenuItem.borderPainted         true
 MenuItem.disabledForeground    #777777    javax.swing.plaf.ColorUIResource [UI]
-MenuItem.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+MenuItem.font                  [active] $defaultFont [UI]
 MenuItem.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.margin                2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 MenuItem.opaque                false
@@ -569,7 +569,7 @@ OptionPane.buttonMinimumWidth  [active] 72
 OptionPane.buttonOrientation   4
 OptionPane.buttonPadding       8
 OptionPane.errorIcon           [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon [UI]
-OptionPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+OptionPane.font                [active] $defaultFont [UI]
 OptionPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 OptionPane.iconMessageGap      16
 OptionPane.informationIcon     [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon [UI]
@@ -591,7 +591,7 @@ OptionPaneUI                   com.formdev.flatlaf.ui.FlatOptionPaneUI
 #---- Panel ----

 Panel.background               #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-Panel.font                     .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Panel.font                     [active] $defaultFont [UI]
 Panel.foreground               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PanelUI                        com.formdev.flatlaf.ui.FlatPanelUI

@@ -606,7 +606,7 @@ PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.echoChar         '\u2022'
-PasswordField.font             .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+PasswordField.font             [active] $defaultFont [UI]
 PasswordField.foreground       #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -624,7 +624,7 @@ PopupMenu.border               [lazy] 4,1,4,1  false    com.formdev.flatlaf.ui.F
 PopupMenu.borderColor          #5e5e5e    javax.swing.plaf.ColorUIResource [UI]
 PopupMenu.borderInsets         4,1,4,1    javax.swing.plaf.InsetsUIResource [UI]
 PopupMenu.consumeEventOnClose  false
-PopupMenu.font                 .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+PopupMenu.font                 [active] $defaultFont [UI]
 PopupMenu.foreground           #bbbbbb    javax.swing.plaf.ColorUIResource [UI]


@@ -649,7 +649,7 @@ ProgressBar.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 ProgressBar.cellLength         1
 ProgressBar.cellSpacing        0
 ProgressBar.cycleTime          4000
-ProgressBar.font               .SF NS Text plain 11    javax.swing.plaf.FontUIResource [UI]
+ProgressBar.font               [active] .SF NS Text plain 11    javax.swing.plaf.FontUIResource [UI]
 ProgressBar.foreground         #4a88c7    javax.swing.plaf.ColorUIResource [UI]
 ProgressBar.horizontalSize     146,4    javax.swing.plaf.DimensionUIResource [UI]
 ProgressBar.repaintInterval    15
@@ -665,7 +665,7 @@ RadioButton.background         #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 RadioButton.darkShadow         #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.disabledText       #777777    javax.swing.plaf.ColorUIResource [UI]
-RadioButton.font               .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+RadioButton.font               [active] $defaultFont [UI]
 RadioButton.foreground         #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.highlight          #242424    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.icon.centerDiameter 8
@@ -681,7 +681,7 @@ RadioButton.textShiftOffset    0

 #---- RadioButtonMenuItem ----

-RadioButtonMenuItem.acceleratorFont .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.acceleratorFont [active] $defaultFont [UI]
 RadioButtonMenuItem.acceleratorForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.arrowIcon  [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -690,7 +690,7 @@ RadioButtonMenuItem.border     [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 RadioButtonMenuItem.borderPainted true
 RadioButtonMenuItem.checkIcon  [lazy] 15,15    com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI]
 RadioButtonMenuItem.disabledForeground #777777    javax.swing.plaf.ColorUIResource [UI]
-RadioButtonMenuItem.font       .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.font       [active] $defaultFont [UI]
 RadioButtonMenuItem.foreground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.margin     2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 RadioButtonMenuItem.opaque     false
@@ -751,7 +751,7 @@ ScrollBarUI                    com.formdev.flatlaf.ui.FlatScrollBarUI
 ScrollPane.background          #3f4244    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.border              [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatBorder [UI]
 ScrollPane.fillUpperCorner     true
-ScrollPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ScrollPane.font                [active] $defaultFont [UI]
 ScrollPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.smoothScrolling     true
 ScrollPaneUI                   com.formdev.flatlaf.ui.FlatScrollPaneUI
@@ -775,7 +775,7 @@ Slider.background              #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Slider.disabledForeground      #4c5052    javax.swing.plaf.ColorUIResource [UI]
 Slider.focus                   #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 Slider.focusInsets             0,0,0,0    javax.swing.plaf.InsetsUIResource [UI]
-Slider.font                    .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #242424    javax.swing.plaf.ColorUIResource [UI]
 Slider.horizontalSize          200,21    java.awt.Dimension
@@ -806,7 +806,7 @@ Spinner.disabledBackground     #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #777777    javax.swing.plaf.ColorUIResource [UI]
 Spinner.editorAlignment        11
 Spinner.editorBorderPainted    false
-Spinner.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Spinner.font                   [active] $defaultFont [UI]
 Spinner.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Spinner.padding                2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 SpinnerUI                      com.formdev.flatlaf.ui.FlatSpinnerUI
@@ -848,7 +848,7 @@ TabbedPane.disabledForeground  #777777    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.disabledUnderlineColor #7a7a7a    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focus               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focusColor          #3d4b5c    javax.swing.plaf.ColorUIResource [UI]
-TabbedPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TabbedPane.font                [active] $defaultFont [UI]
 TabbedPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.hasFullBorder       false
 TabbedPane.highlight           #242424    javax.swing.plaf.ColorUIResource [UI]
@@ -887,7 +887,7 @@ Table.focusCellBackground      #45494a    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellForeground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Focused [UI]
 Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI]
-Table.font                     .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Table.font                     [active] $defaultFont [UI]
 Table.foreground               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Table.gridColor                #4c5152    javax.swing.plaf.ColorUIResource [UI]
 Table.intercellSpacing         0,0    javax.swing.plaf.DimensionUIResource [UI]
@@ -908,7 +908,7 @@ TableHeader.background         #45494a    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.bottomSeparatorColor #5e6364    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.cellBorder         [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatEmptyBorder [UI]
 TableHeader.focusCellBackground #45494a    javax.swing.plaf.ColorUIResource [UI]
-TableHeader.font               .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TableHeader.font               [active] $defaultFont [UI]
 TableHeader.foreground         #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.height             25
 TableHeader.separatorColor     #5e6364    javax.swing.plaf.ColorUIResource [UI]
@@ -946,7 +946,7 @@ TextArea.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextArea.caretBlinkRate        500
 TextArea.caretForeground       #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextArea.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextArea.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TextArea.font                  [active] $defaultFont [UI]
 TextArea.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveForeground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -970,7 +970,7 @@ TextField.caretBlinkRate       500
 TextField.caretForeground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextField.darkShadow           #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 TextField.disabledBackground   #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextField.font                 .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TextField.font                 [active] $defaultFont [UI]
 TextField.foreground           #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextField.highlight            #242424    javax.swing.plaf.ColorUIResource [UI]
 TextField.inactiveBackground   #3c3f41    javax.swing.plaf.ColorUIResource [UI]
@@ -991,7 +991,7 @@ TextPane.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextPane.caretBlinkRate        500
 TextPane.caretForeground       #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextPane.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextPane.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TextPane.font                  [active] $defaultFont [UI]
 TextPane.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveForeground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -1004,7 +1004,7 @@ TextPaneUI                     com.formdev.flatlaf.ui.FlatTextPaneUI
 #---- TitledBorder ----

 TitledBorder.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatLineBorder [UI]
-TitledBorder.font              .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TitledBorder.font              [active] $defaultFont [UI]
 TitledBorder.titleColor        #bbbbbb    javax.swing.plaf.ColorUIResource [UI]


@@ -1020,7 +1020,7 @@ ToggleButton.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 ToggleButton.darkShadow        #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledSelectedBackground #525658    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledText      #777777    javax.swing.plaf.ColorUIResource [UI]
-ToggleButton.font              .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ToggleButton.font              [active] $defaultFont [UI]
 ToggleButton.foreground        #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.highlight         #242424    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.iconTextGap       4
@@ -1054,7 +1054,7 @@ ToolBar.dockingBackground      #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.dockingForeground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingBackground     #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingForeground     #777777    javax.swing.plaf.ColorUIResource [UI]
-ToolBar.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ToolBar.font                   [active] $defaultFont [UI]
 ToolBar.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.gripColor              #adadad    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.highlight              #242424    javax.swing.plaf.ColorUIResource [UI]
@@ -1081,7 +1081,7 @@ ToolBarUI                      com.formdev.flatlaf.ui.FlatToolBarUI
 ToolTip.background             #1e2123    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.backgroundInactive     #1e2123    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.border                 [lazy] 4,6,4,6  false    com.formdev.flatlaf.ui.FlatEmptyBorder [UI]
-ToolTip.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ToolTip.font                   [active] $defaultFont [UI]
 ToolTip.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.foregroundInactive     #777777    javax.swing.plaf.ColorUIResource [UI]

@@ -1109,7 +1109,7 @@ Tree.dropCellForeground        [lazy] #bbbbbb    javax.swing.plaf.ColorUIResourc
 Tree.dropLineColor             [lazy] #6d8ac0    javax.swing.plaf.ColorUIResource [UI]
 Tree.editorBorder              [lazy] line: #000000    java.awt.Color 1 false    1,1,1,1  true    javax.swing.plaf.BorderUIResource$LineBorderUIResource [UI]
 Tree.expandedIcon              [lazy] 11,11    com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI]
-Tree.font                      .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Tree.font                      [active] $defaultFont [UI]
 Tree.foreground                #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Tree.hash                      #505355    javax.swing.plaf.ColorUIResource [UI]
 Tree.icon.closedColor          #adadad    javax.swing.plaf.ColorUIResource [UI]
@@ -1124,6 +1124,7 @@ Tree.openIcon                  [lazy] 16,16    com.formdev.flatlaf.icons.FlatTre
 Tree.paintLines                false
 Tree.rendererFillBackground    false
 Tree.rendererMargins           1,2,1,2    javax.swing.plaf.InsetsUIResource [UI]
+Tree.repaintWholeRow           true
 Tree.rightChildIndent          11
 Tree.rowHeight                 0
 Tree.scrollsOnExpand           true
@@ -1142,7 +1143,7 @@ TreeUI                         com.formdev.flatlaf.ui.FlatTreeUI
 #---- Viewport ----

 Viewport.background            #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-Viewport.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Viewport.font                  [active] $defaultFont [UI]
 Viewport.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ViewportUI                     com.formdev.flatlaf.ui.FlatViewportUI

@@ -1158,6 +1159,7 @@ controlHighlight               #313131    javax.swing.plaf.ColorUIResource [UI]
 controlLtHighlight             #242424    javax.swing.plaf.ColorUIResource [UI]
 controlShadow                  #646464    javax.swing.plaf.ColorUIResource [UI]
 controlText                    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+defaultFont                    .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
 desktop                        #45494a    javax.swing.plaf.ColorUIResource [UI]


--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
@@ -80,7 +80,7 @@ Button.defaultButtonFollowsFocus true
 Button.disabledBorderColor     #5e6060    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledText            #777777    javax.swing.plaf.ColorUIResource [UI]
 Button.focusedBorderColor      #466d94    javax.swing.plaf.ColorUIResource [UI]
-Button.font                    Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Button.font                    [active] $defaultFont [UI]
 Button.foreground              #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Button.highlight               #242424    javax.swing.plaf.ColorUIResource [UI]
 Button.hoverBackground         #ff0000    com.formdev.flatlaf.util.DerivedColor [UI]
@@ -112,7 +112,7 @@ CheckBox.arc                   4
 CheckBox.background            #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 CheckBox.disabledText          #777777    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+CheckBox.font                  [active] $defaultFont [UI]
 CheckBox.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.background       #43494a    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.borderColor      #6b6b6b    javax.swing.plaf.ColorUIResource [UI]
@@ -137,7 +137,7 @@ CheckBox.textShiftOffset       0

 #---- CheckBoxMenuItem ----

-CheckBoxMenuItem.acceleratorFont Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.acceleratorFont [active] $defaultFont [UI]
 CheckBoxMenuItem.acceleratorForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.arrowIcon     [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -146,7 +146,7 @@ CheckBoxMenuItem.border        [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 CheckBoxMenuItem.borderPainted true
 CheckBoxMenuItem.checkIcon     [lazy] 15,15    com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI]
 CheckBoxMenuItem.disabledForeground #777777    javax.swing.plaf.ColorUIResource [UI]
-CheckBoxMenuItem.font          Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.font          [active] $defaultFont [UI]
 CheckBoxMenuItem.foreground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.margin        2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 CheckBoxMenuItem.opaque        false
@@ -163,7 +163,7 @@ CheckBoxUI                     com.formdev.flatlaf.ui.FlatCheckBoxUI
 #---- ColorChooser ----

 ColorChooser.background        #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-ColorChooser.font              Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ColorChooser.font              [active] $defaultFont [UI]
 ColorChooser.foreground        #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesDefaultRecentColor #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesRecentSwatchSize [active] 16,16    javax.swing.plaf.DimensionUIResource [UI]
@@ -185,7 +185,7 @@ ComboBox.buttonHoverArrowColor #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonShadow          #646464    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledForeground    #777777    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ComboBox.font                  [active] $defaultFont [UI]
 ComboBox.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.isEnterSelectablePopup false
 ComboBox.noActionOnKeyNavigation false
@@ -245,7 +245,7 @@ EditorPane.border              [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 EditorPane.caretBlinkRate      500
 EditorPane.caretForeground     #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.disabledBackground  #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-EditorPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+EditorPane.font                [active] $defaultFont [UI]
 EditorPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveBackground  #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -284,7 +284,7 @@ FormattedTextField.border      [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 FormattedTextField.caretBlinkRate 500
 FormattedTextField.caretForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-FormattedTextField.font        Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+FormattedTextField.font        [active] $defaultFont [UI]
 FormattedTextField.foreground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -351,7 +351,7 @@ InternalFrame.inactiveTitleBackground #303234    javax.swing.plaf.ColorUIResourc
 InternalFrame.inactiveTitleForeground #777777    javax.swing.plaf.ColorUIResource [UI]
 InternalFrame.maximizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon [UI]
 InternalFrame.minimizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMinimizeIcon [UI]
-InternalFrame.titleFont        Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+InternalFrame.titleFont        [active] $defaultFont [UI]


 #---- InternalFrameTitlePane ----
@@ -428,7 +428,7 @@ JideTabbedPaneUI               com.formdev.flatlaf.jideoss.ui.FlatJideTabbedPane
 Label.background               #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledForeground       #777777    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledShadow           #646464    javax.swing.plaf.ColorUIResource [UI]
-Label.font                     Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Label.font                     [active] $defaultFont [UI]
 Label.foreground               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 LabelUI                        com.formdev.flatlaf.ui.FlatLabelUI

@@ -446,7 +446,7 @@ List.dropCellForeground        [lazy] #bbbbbb    javax.swing.plaf.ColorUIResourc
 List.dropLineColor             [lazy] #6d8ac0    javax.swing.plaf.ColorUIResource [UI]
 List.focusCellHighlightBorder  [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Focused [UI]
 List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Selected [UI]
-List.font                      Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+List.font                      [active] $defaultFont [UI]
 List.foreground                #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 List.noFocusBorder             1,1,1,1  false    javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI]
 List.selectionBackground       #4b6eaf    javax.swing.plaf.ColorUIResource [UI]
@@ -459,7 +459,7 @@ ListUI                         com.formdev.flatlaf.ui.FlatListUI

 #---- Menu ----

-Menu.acceleratorFont           Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Menu.acceleratorFont           [active] $defaultFont [UI]
 Menu.acceleratorForeground     #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Menu.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Menu.arrowIcon                 [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuArrowIcon [UI]
@@ -469,7 +469,7 @@ Menu.borderPainted             true
 Menu.cancelMode                hideLastSubmenu
 Menu.crossMenuMnemonic         true
 Menu.disabledForeground        #777777    javax.swing.plaf.ColorUIResource [UI]
-Menu.font                      Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Menu.font                      [active] $defaultFont [UI]
 Menu.foreground                #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.arrowColor           #a7a7a7    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.disabledArrowColor   #606060    javax.swing.plaf.ColorUIResource [UI]
@@ -491,7 +491,7 @@ Menu.submenuPopupOffsetY       [active] -4
 MenuBar.background             #303234    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.border                 [lazy] 0,0,1,0  false    com.formdev.flatlaf.ui.FlatMenuBarBorder [UI]
 MenuBar.borderColor            #515151    javax.swing.plaf.ColorUIResource [UI]
-MenuBar.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+MenuBar.font                   [active] $defaultFont [UI]
 MenuBar.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.highlight              #242424    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.hoverBackground        #484c4f    javax.swing.plaf.ColorUIResource [UI]
@@ -506,7 +506,7 @@ MenuBarUI                      com.formdev.flatlaf.ui.FlatMenuBarUI
 #---- MenuItem ----

 MenuItem.acceleratorDelimiter  -
-MenuItem.acceleratorFont       Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+MenuItem.acceleratorFont       [active] $defaultFont [UI]
 MenuItem.acceleratorForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.arrowIcon             [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -514,7 +514,7 @@ MenuItem.background            #303234    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
 MenuItem.borderPainted         true
 MenuItem.disabledForeground    #777777    javax.swing.plaf.ColorUIResource [UI]
-MenuItem.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+MenuItem.font                  [active] $defaultFont [UI]
 MenuItem.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.margin                2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 MenuItem.opaque                false
@@ -568,7 +568,7 @@ OptionPane.buttonMinimumWidth  [active] 72
 OptionPane.buttonOrientation   4
 OptionPane.buttonPadding       8
 OptionPane.errorIcon           [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon [UI]
-OptionPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+OptionPane.font                [active] $defaultFont [UI]
 OptionPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 OptionPane.iconMessageGap      16
 OptionPane.informationIcon     [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon [UI]
@@ -589,7 +589,7 @@ OptionPaneUI                   com.formdev.flatlaf.ui.FlatOptionPaneUI
 #---- Panel ----

 Panel.background               #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-Panel.font                     Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Panel.font                     [active] $defaultFont [UI]
 Panel.foreground               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PanelUI                        com.formdev.flatlaf.ui.FlatPanelUI

@@ -604,7 +604,7 @@ PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.echoChar         '\u2022'
-PasswordField.font             Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+PasswordField.font             [active] $defaultFont [UI]
 PasswordField.foreground       #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -622,7 +622,7 @@ PopupMenu.border               [lazy] 4,1,4,1  false    com.formdev.flatlaf.ui.F
 PopupMenu.borderColor          #5e5e5e    javax.swing.plaf.ColorUIResource [UI]
 PopupMenu.borderInsets         4,1,4,1    javax.swing.plaf.InsetsUIResource [UI]
 PopupMenu.consumeEventOnClose  false
-PopupMenu.font                 Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+PopupMenu.font                 [active] $defaultFont [UI]
 PopupMenu.foreground           #bbbbbb    javax.swing.plaf.ColorUIResource [UI]


@@ -647,7 +647,7 @@ ProgressBar.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 ProgressBar.cellLength         1
 ProgressBar.cellSpacing        0
 ProgressBar.cycleTime          4000
-ProgressBar.font               Segoe UI plain 10    javax.swing.plaf.FontUIResource [UI]
+ProgressBar.font               [active] Segoe UI plain 10    javax.swing.plaf.FontUIResource [UI]
 ProgressBar.foreground         #4a88c7    javax.swing.plaf.ColorUIResource [UI]
 ProgressBar.horizontalSize     146,4    javax.swing.plaf.DimensionUIResource [UI]
 ProgressBar.repaintInterval    15
@@ -663,7 +663,7 @@ RadioButton.background         #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 RadioButton.darkShadow         #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.disabledText       #777777    javax.swing.plaf.ColorUIResource [UI]
-RadioButton.font               Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+RadioButton.font               [active] $defaultFont [UI]
 RadioButton.foreground         #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.highlight          #242424    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.icon.centerDiameter 8
@@ -679,7 +679,7 @@ RadioButton.textShiftOffset    0

 #---- RadioButtonMenuItem ----

-RadioButtonMenuItem.acceleratorFont Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.acceleratorFont [active] $defaultFont [UI]
 RadioButtonMenuItem.acceleratorForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.acceleratorSelectionForeground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.arrowIcon  [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -688,7 +688,7 @@ RadioButtonMenuItem.border     [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 RadioButtonMenuItem.borderPainted true
 RadioButtonMenuItem.checkIcon  [lazy] 15,15    com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI]
 RadioButtonMenuItem.disabledForeground #777777    javax.swing.plaf.ColorUIResource [UI]
-RadioButtonMenuItem.font       Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.font       [active] $defaultFont [UI]
 RadioButtonMenuItem.foreground #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.margin     2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 RadioButtonMenuItem.opaque     false
@@ -749,7 +749,7 @@ ScrollBarUI                    com.formdev.flatlaf.ui.FlatScrollBarUI
 ScrollPane.background          #3f4244    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.border              [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatBorder [UI]
 ScrollPane.fillUpperCorner     true
-ScrollPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ScrollPane.font                [active] $defaultFont [UI]
 ScrollPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.smoothScrolling     true
 ScrollPaneUI                   com.formdev.flatlaf.ui.FlatScrollPaneUI
@@ -773,7 +773,7 @@ Slider.background              #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Slider.disabledForeground      #4c5052    javax.swing.plaf.ColorUIResource [UI]
 Slider.focus                   #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 Slider.focusInsets             0,0,0,0    javax.swing.plaf.InsetsUIResource [UI]
-Slider.font                    Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #242424    javax.swing.plaf.ColorUIResource [UI]
 Slider.horizontalSize          200,21    java.awt.Dimension
@@ -804,7 +804,7 @@ Spinner.disabledBackground     #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #777777    javax.swing.plaf.ColorUIResource [UI]
 Spinner.editorAlignment        11
 Spinner.editorBorderPainted    false
-Spinner.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Spinner.font                   [active] $defaultFont [UI]
 Spinner.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Spinner.padding                2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 SpinnerUI                      com.formdev.flatlaf.ui.FlatSpinnerUI
@@ -846,7 +846,7 @@ TabbedPane.disabledForeground  #777777    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.disabledUnderlineColor #7a7a7a    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focus               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focusColor          #3d4b5c    javax.swing.plaf.ColorUIResource [UI]
-TabbedPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TabbedPane.font                [active] $defaultFont [UI]
 TabbedPane.foreground          #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.hasFullBorder       false
 TabbedPane.highlight           #242424    javax.swing.plaf.ColorUIResource [UI]
@@ -885,7 +885,7 @@ Table.focusCellBackground      #45494a    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellForeground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Focused [UI]
 Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI]
-Table.font                     Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Table.font                     [active] $defaultFont [UI]
 Table.foreground               #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Table.gridColor                #4c5152    javax.swing.plaf.ColorUIResource [UI]
 Table.intercellSpacing         0,0    javax.swing.plaf.DimensionUIResource [UI]
@@ -906,7 +906,7 @@ TableHeader.background         #45494a    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.bottomSeparatorColor #5e6364    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.cellBorder         [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatEmptyBorder [UI]
 TableHeader.focusCellBackground #45494a    javax.swing.plaf.ColorUIResource [UI]
-TableHeader.font               Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TableHeader.font               [active] $defaultFont [UI]
 TableHeader.foreground         #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.height             25
 TableHeader.separatorColor     #5e6364    javax.swing.plaf.ColorUIResource [UI]
@@ -944,7 +944,7 @@ TextArea.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextArea.caretBlinkRate        500
 TextArea.caretForeground       #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextArea.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextArea.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TextArea.font                  [active] $defaultFont [UI]
 TextArea.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveForeground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -968,7 +968,7 @@ TextField.caretBlinkRate       500
 TextField.caretForeground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextField.darkShadow           #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 TextField.disabledBackground   #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextField.font                 Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TextField.font                 [active] $defaultFont [UI]
 TextField.foreground           #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextField.highlight            #242424    javax.swing.plaf.ColorUIResource [UI]
 TextField.inactiveBackground   #3c3f41    javax.swing.plaf.ColorUIResource [UI]
@@ -989,7 +989,7 @@ TextPane.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextPane.caretBlinkRate        500
 TextPane.caretForeground       #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextPane.disabledBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-TextPane.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TextPane.font                  [active] $defaultFont [UI]
 TextPane.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveBackground    #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveForeground    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
@@ -1002,7 +1002,7 @@ TextPaneUI                     com.formdev.flatlaf.ui.FlatTextPaneUI
 #---- TitledBorder ----

 TitledBorder.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatLineBorder [UI]
-TitledBorder.font              Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TitledBorder.font              [active] $defaultFont [UI]
 TitledBorder.titleColor        #bbbbbb    javax.swing.plaf.ColorUIResource [UI]


@@ -1018,7 +1018,7 @@ ToggleButton.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 ToggleButton.darkShadow        #7e7e7e    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledSelectedBackground #525658    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledText      #777777    javax.swing.plaf.ColorUIResource [UI]
-ToggleButton.font              Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ToggleButton.font              [active] $defaultFont [UI]
 ToggleButton.foreground        #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.highlight         #242424    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.iconTextGap       4
@@ -1052,7 +1052,7 @@ ToolBar.dockingBackground      #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.dockingForeground      #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingBackground     #3c3f41    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingForeground     #777777    javax.swing.plaf.ColorUIResource [UI]
-ToolBar.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ToolBar.font                   [active] $defaultFont [UI]
 ToolBar.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.gripColor              #adadad    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.highlight              #242424    javax.swing.plaf.ColorUIResource [UI]
@@ -1079,7 +1079,7 @@ ToolBarUI                      com.formdev.flatlaf.ui.FlatToolBarUI
 ToolTip.background             #1e2123    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.backgroundInactive     #1e2123    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.border                 [lazy] 4,6,4,6  false    com.formdev.flatlaf.ui.FlatEmptyBorder [UI]
-ToolTip.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ToolTip.font                   [active] $defaultFont [UI]
 ToolTip.foreground             #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.foregroundInactive     #777777    javax.swing.plaf.ColorUIResource [UI]

@@ -1107,7 +1107,7 @@ Tree.dropCellForeground        [lazy] #bbbbbb    javax.swing.plaf.ColorUIResourc
 Tree.dropLineColor             [lazy] #6d8ac0    javax.swing.plaf.ColorUIResource [UI]
 Tree.editorBorder              [lazy] line: #000000    java.awt.Color 1 false    1,1,1,1  true    javax.swing.plaf.BorderUIResource$LineBorderUIResource [UI]
 Tree.expandedIcon              [lazy] 11,11    com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI]
-Tree.font                      Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Tree.font                      [active] $defaultFont [UI]
 Tree.foreground                #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 Tree.hash                      #505355    javax.swing.plaf.ColorUIResource [UI]
 Tree.icon.closedColor          #adadad    javax.swing.plaf.ColorUIResource [UI]
@@ -1122,6 +1122,7 @@ Tree.openIcon                  [lazy] 16,16    com.formdev.flatlaf.icons.FlatTre
 Tree.paintLines                false
 Tree.rendererFillBackground    false
 Tree.rendererMargins           1,2,1,2    javax.swing.plaf.InsetsUIResource [UI]
+Tree.repaintWholeRow           true
 Tree.rightChildIndent          11
 Tree.rowHeight                 0
 Tree.scrollsOnExpand           true
@@ -1140,7 +1141,7 @@ TreeUI                         com.formdev.flatlaf.ui.FlatTreeUI
 #---- Viewport ----

 Viewport.background            #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-Viewport.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Viewport.font                  [active] $defaultFont [UI]
 Viewport.foreground            #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 ViewportUI                     com.formdev.flatlaf.ui.FlatViewportUI

@@ -1156,6 +1157,7 @@ controlHighlight               #313131    javax.swing.plaf.ColorUIResource [UI]
 controlLtHighlight             #242424    javax.swing.plaf.ColorUIResource [UI]
 controlShadow                  #646464    javax.swing.plaf.ColorUIResource [UI]
 controlText                    #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
+defaultFont                    Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
 desktop                        #45494a    javax.swing.plaf.ColorUIResource [UI]


--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
@@ -81,7 +81,7 @@ Button.disabledBorderColor     #cfcfcf    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledText            #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 Button.focusedBackground       #e3f1fa    javax.swing.plaf.ColorUIResource [UI]
 Button.focusedBorderColor      #87afda    javax.swing.plaf.ColorUIResource [UI]
-Button.font                    .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Button.font                    [active] $defaultFont [UI]
 Button.foreground              #000000    javax.swing.plaf.ColorUIResource [UI]
 Button.highlight               #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Button.hoverBackground         #ff0000    com.formdev.flatlaf.util.DerivedColor [UI]
@@ -113,7 +113,7 @@ CheckBox.arc                   4
 CheckBox.background            #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 CheckBox.disabledText          #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+CheckBox.font                  [active] $defaultFont [UI]
 CheckBox.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.borderColor      #b0b0b0    javax.swing.plaf.ColorUIResource [UI]
@@ -138,7 +138,7 @@ CheckBox.textShiftOffset       0

 #---- CheckBoxMenuItem ----

-CheckBoxMenuItem.acceleratorFont .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.acceleratorFont [active] $defaultFont [UI]
 CheckBoxMenuItem.acceleratorForeground #505050    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.arrowIcon     [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -147,7 +147,7 @@ CheckBoxMenuItem.border        [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 CheckBoxMenuItem.borderPainted true
 CheckBoxMenuItem.checkIcon     [lazy] 15,15    com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI]
 CheckBoxMenuItem.disabledForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-CheckBoxMenuItem.font          .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.font          [active] $defaultFont [UI]
 CheckBoxMenuItem.foreground    #000000    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.margin        2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 CheckBoxMenuItem.opaque        false
@@ -164,7 +164,7 @@ CheckBoxUI                     com.formdev.flatlaf.ui.FlatCheckBoxUI
 #---- ColorChooser ----

 ColorChooser.background        #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-ColorChooser.font              .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ColorChooser.font              [active] $defaultFont [UI]
 ColorChooser.foreground        #000000    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesDefaultRecentColor #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesRecentSwatchSize [active] 16,16    javax.swing.plaf.DimensionUIResource [UI]
@@ -186,7 +186,7 @@ ComboBox.buttonHoverArrowColor #999999    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonShadow          #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ComboBox.font                  [active] $defaultFont [UI]
 ComboBox.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.isEnterSelectablePopup false
 ComboBox.noActionOnKeyNavigation false
@@ -247,7 +247,7 @@ EditorPane.border              [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 EditorPane.caretBlinkRate      500
 EditorPane.caretForeground     #000000    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.disabledBackground  #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-EditorPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+EditorPane.font                [active] $defaultFont [UI]
 EditorPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveBackground  #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveForeground  #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -286,7 +286,7 @@ FormattedTextField.border      [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 FormattedTextField.caretBlinkRate 500
 FormattedTextField.caretForeground #000000    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.disabledBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-FormattedTextField.font        .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+FormattedTextField.font        [active] $defaultFont [UI]
 FormattedTextField.foreground  #000000    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -354,7 +354,7 @@ InternalFrame.inactiveTitleBackground #fafafa    javax.swing.plaf.ColorUIResourc
 InternalFrame.inactiveTitleForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 InternalFrame.maximizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon [UI]
 InternalFrame.minimizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMinimizeIcon [UI]
-InternalFrame.titleFont        .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+InternalFrame.titleFont        [active] $defaultFont [UI]


 #---- InternalFrameTitlePane ----
@@ -431,7 +431,7 @@ JideTabbedPaneUI               com.formdev.flatlaf.jideoss.ui.FlatJideTabbedPane
 Label.background               #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledForeground       #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledShadow           #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
-Label.font                     .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Label.font                     [active] $defaultFont [UI]
 Label.foreground               #000000    javax.swing.plaf.ColorUIResource [UI]
 LabelUI                        com.formdev.flatlaf.ui.FlatLabelUI

@@ -449,7 +449,7 @@ List.dropCellForeground        [lazy] #ffffff    javax.swing.plaf.ColorUIResourc
 List.dropLineColor             [lazy] #6aa7e1    javax.swing.plaf.ColorUIResource [UI]
 List.focusCellHighlightBorder  [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Focused [UI]
 List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Selected [UI]
-List.font                      .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+List.font                      [active] $defaultFont [UI]
 List.foreground                #000000    javax.swing.plaf.ColorUIResource [UI]
 List.noFocusBorder             1,1,1,1  false    javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI]
 List.selectionBackground       #2675bf    javax.swing.plaf.ColorUIResource [UI]
@@ -462,7 +462,7 @@ ListUI                         com.formdev.flatlaf.ui.FlatListUI

 #---- Menu ----

-Menu.acceleratorFont           .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Menu.acceleratorFont           [active] $defaultFont [UI]
 Menu.acceleratorForeground     #505050    javax.swing.plaf.ColorUIResource [UI]
 Menu.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Menu.arrowIcon                 [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuArrowIcon [UI]
@@ -472,7 +472,7 @@ Menu.borderPainted             true
 Menu.cancelMode                hideLastSubmenu
 Menu.crossMenuMnemonic         true
 Menu.disabledForeground        #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-Menu.font                      .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Menu.font                      [active] $defaultFont [UI]
 Menu.foreground                #000000    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.arrowColor           #666666    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.disabledArrowColor   #ababab    javax.swing.plaf.ColorUIResource [UI]
@@ -494,7 +494,7 @@ Menu.submenuPopupOffsetY       [active] -4
 MenuBar.background             #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.border                 [lazy] 0,0,1,0  false    com.formdev.flatlaf.ui.FlatMenuBarBorder [UI]
 MenuBar.borderColor            #cdcdcd    javax.swing.plaf.ColorUIResource [UI]
-MenuBar.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+MenuBar.font                   [active] $defaultFont [UI]
 MenuBar.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.highlight              #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.hoverBackground        #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
@@ -509,7 +509,7 @@ MenuBarUI                      com.formdev.flatlaf.ui.FlatMenuBarUI
 #---- MenuItem ----

 MenuItem.acceleratorDelimiter  
-MenuItem.acceleratorFont       .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+MenuItem.acceleratorFont       [active] $defaultFont [UI]
 MenuItem.acceleratorForeground #505050    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.arrowIcon             [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -517,7 +517,7 @@ MenuItem.background            #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
 MenuItem.borderPainted         true
 MenuItem.disabledForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-MenuItem.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+MenuItem.font                  [active] $defaultFont [UI]
 MenuItem.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.margin                2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 MenuItem.opaque                false
@@ -571,7 +571,7 @@ OptionPane.buttonMinimumWidth  [active] 72
 OptionPane.buttonOrientation   4
 OptionPane.buttonPadding       8
 OptionPane.errorIcon           [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon [UI]
-OptionPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+OptionPane.font                [active] $defaultFont [UI]
 OptionPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 OptionPane.iconMessageGap      16
 OptionPane.informationIcon     [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon [UI]
@@ -593,7 +593,7 @@ OptionPaneUI                   com.formdev.flatlaf.ui.FlatOptionPaneUI
 #---- Panel ----

 Panel.background               #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-Panel.font                     .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Panel.font                     [active] $defaultFont [UI]
 Panel.foreground               #000000    javax.swing.plaf.ColorUIResource [UI]
 PanelUI                        com.formdev.flatlaf.ui.FlatPanelUI

@@ -608,7 +608,7 @@ PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.echoChar         '\u2022'
-PasswordField.font             .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+PasswordField.font             [active] $defaultFont [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -626,7 +626,7 @@ PopupMenu.border               [lazy] 4,1,4,1  false    com.formdev.flatlaf.ui.F
 PopupMenu.borderColor          #adadad    javax.swing.plaf.ColorUIResource [UI]
 PopupMenu.borderInsets         4,1,4,1    javax.swing.plaf.InsetsUIResource [UI]
 PopupMenu.consumeEventOnClose  false
-PopupMenu.font                 .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+PopupMenu.font                 [active] $defaultFont [UI]
 PopupMenu.foreground           #000000    javax.swing.plaf.ColorUIResource [UI]


@@ -651,7 +651,7 @@ ProgressBar.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 ProgressBar.cellLength         1
 ProgressBar.cellSpacing        0
 ProgressBar.cycleTime          4000
-ProgressBar.font               .SF NS Text plain 11    javax.swing.plaf.FontUIResource [UI]
+ProgressBar.font               [active] .SF NS Text plain 11    javax.swing.plaf.FontUIResource [UI]
 ProgressBar.foreground         #1e82e6    javax.swing.plaf.ColorUIResource [UI]
 ProgressBar.horizontalSize     146,4    javax.swing.plaf.DimensionUIResource [UI]
 ProgressBar.repaintInterval    15
@@ -667,7 +667,7 @@ RadioButton.background         #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 RadioButton.darkShadow         #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.disabledText       #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-RadioButton.font               .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+RadioButton.font               [active] $defaultFont [UI]
 RadioButton.foreground         #000000    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.highlight          #ffffff    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.icon.centerDiameter 8
@@ -683,7 +683,7 @@ RadioButton.textShiftOffset    0

 #---- RadioButtonMenuItem ----

-RadioButtonMenuItem.acceleratorFont .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.acceleratorFont [active] $defaultFont [UI]
 RadioButtonMenuItem.acceleratorForeground #505050    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.arrowIcon  [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -692,7 +692,7 @@ RadioButtonMenuItem.border     [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 RadioButtonMenuItem.borderPainted true
 RadioButtonMenuItem.checkIcon  [lazy] 15,15    com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI]
 RadioButtonMenuItem.disabledForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-RadioButtonMenuItem.font       .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.font       [active] $defaultFont [UI]
 RadioButtonMenuItem.foreground #000000    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.margin     2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 RadioButtonMenuItem.opaque     false
@@ -753,7 +753,7 @@ ScrollBarUI                    com.formdev.flatlaf.ui.FlatScrollBarUI
 ScrollPane.background          #f5f5f5    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.border              [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatBorder [UI]
 ScrollPane.fillUpperCorner     true
-ScrollPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ScrollPane.font                [active] $defaultFont [UI]
 ScrollPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.smoothScrolling     true
 ScrollPaneUI                   com.formdev.flatlaf.ui.FlatScrollPaneUI
@@ -777,7 +777,7 @@ Slider.background              #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Slider.disabledForeground      #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
 Slider.focus                   #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 Slider.focusInsets             0,0,0,0    javax.swing.plaf.InsetsUIResource [UI]
-Slider.font                    .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #000000    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Slider.horizontalSize          200,21    java.awt.Dimension
@@ -808,7 +808,7 @@ Spinner.disabledBackground     #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 Spinner.editorAlignment        11
 Spinner.editorBorderPainted    false
-Spinner.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Spinner.font                   [active] $defaultFont [UI]
 Spinner.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 Spinner.padding                2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 SpinnerUI                      com.formdev.flatlaf.ui.FlatSpinnerUI
@@ -850,7 +850,7 @@ TabbedPane.disabledForeground  #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.disabledUnderlineColor #ababab    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focus               #000000    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focusColor          #dae4ed    javax.swing.plaf.ColorUIResource [UI]
-TabbedPane.font                .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TabbedPane.font                [active] $defaultFont [UI]
 TabbedPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.hasFullBorder       false
 TabbedPane.highlight           #ffffff    javax.swing.plaf.ColorUIResource [UI]
@@ -889,7 +889,7 @@ Table.focusCellBackground      #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellForeground      #000000    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Focused [UI]
 Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI]
-Table.font                     .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Table.font                     [active] $defaultFont [UI]
 Table.foreground               #000000    javax.swing.plaf.ColorUIResource [UI]
 Table.gridColor                #f7f7f7    javax.swing.plaf.ColorUIResource [UI]
 Table.intercellSpacing         0,0    javax.swing.plaf.DimensionUIResource [UI]
@@ -910,7 +910,7 @@ TableHeader.background         #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.bottomSeparatorColor #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.cellBorder         [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatEmptyBorder [UI]
 TableHeader.focusCellBackground #ffffff    javax.swing.plaf.ColorUIResource [UI]
-TableHeader.font               .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TableHeader.font               [active] $defaultFont [UI]
 TableHeader.foreground         #000000    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.height             25
 TableHeader.separatorColor     #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
@@ -948,7 +948,7 @@ TextArea.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextArea.caretBlinkRate        500
 TextArea.caretForeground       #000000    javax.swing.plaf.ColorUIResource [UI]
 TextArea.disabledBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-TextArea.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TextArea.font                  [active] $defaultFont [UI]
 TextArea.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -972,7 +972,7 @@ TextField.caretBlinkRate       500
 TextField.caretForeground      #000000    javax.swing.plaf.ColorUIResource [UI]
 TextField.darkShadow           #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 TextField.disabledBackground   #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-TextField.font                 .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TextField.font                 [active] $defaultFont [UI]
 TextField.foreground           #000000    javax.swing.plaf.ColorUIResource [UI]
 TextField.highlight            #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TextField.inactiveBackground   #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
@@ -993,7 +993,7 @@ TextPane.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextPane.caretBlinkRate        500
 TextPane.caretForeground       #000000    javax.swing.plaf.ColorUIResource [UI]
 TextPane.disabledBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-TextPane.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TextPane.font                  [active] $defaultFont [UI]
 TextPane.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -1006,7 +1006,7 @@ TextPaneUI                     com.formdev.flatlaf.ui.FlatTextPaneUI
 #---- TitledBorder ----

 TitledBorder.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatLineBorder [UI]
-TitledBorder.font              .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+TitledBorder.font              [active] $defaultFont [UI]
 TitledBorder.titleColor        #000000    javax.swing.plaf.ColorUIResource [UI]


@@ -1022,7 +1022,7 @@ ToggleButton.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 ToggleButton.darkShadow        #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledSelectedBackground #dfdfdf    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledText      #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-ToggleButton.font              .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ToggleButton.font              [active] $defaultFont [UI]
 ToggleButton.foreground        #000000    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.highlight         #ffffff    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.iconTextGap       4
@@ -1056,7 +1056,7 @@ ToolBar.dockingBackground      #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.dockingForeground      #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingBackground     #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingForeground     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-ToolBar.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ToolBar.font                   [active] $defaultFont [UI]
 ToolBar.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.gripColor              #afafaf    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.highlight              #ffffff    javax.swing.plaf.ColorUIResource [UI]
@@ -1083,7 +1083,7 @@ ToolBarUI                      com.formdev.flatlaf.ui.FlatToolBarUI
 ToolTip.background             #fafafa    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.backgroundInactive     #fafafa    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.border                 [lazy] 4,6,4,6  false    com.formdev.flatlaf.ui.FlatLineBorder [UI]
-ToolTip.font                   .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+ToolTip.font                   [active] $defaultFont [UI]
 ToolTip.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.foregroundInactive     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]

@@ -1111,7 +1111,7 @@ Tree.dropCellForeground        [lazy] #ffffff    javax.swing.plaf.ColorUIResourc
 Tree.dropLineColor             [lazy] #6aa7e1    javax.swing.plaf.ColorUIResource [UI]
 Tree.editorBorder              [lazy] line: #000000    java.awt.Color 1 false    1,1,1,1  true    javax.swing.plaf.BorderUIResource$LineBorderUIResource [UI]
 Tree.expandedIcon              [lazy] 11,11    com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI]
-Tree.font                      .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Tree.font                      [active] $defaultFont [UI]
 Tree.foreground                #000000    javax.swing.plaf.ColorUIResource [UI]
 Tree.hash                      #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
 Tree.icon.closedColor          #afafaf    javax.swing.plaf.ColorUIResource [UI]
@@ -1126,6 +1126,7 @@ Tree.openIcon                  [lazy] 16,16    com.formdev.flatlaf.icons.FlatTre
 Tree.paintLines                false
 Tree.rendererFillBackground    false
 Tree.rendererMargins           1,2,1,2    javax.swing.plaf.InsetsUIResource [UI]
+Tree.repaintWholeRow           true
 Tree.rightChildIndent          11
 Tree.rowHeight                 0
 Tree.scrollsOnExpand           true
@@ -1144,7 +1145,7 @@ TreeUI                         com.formdev.flatlaf.ui.FlatTreeUI
 #---- Viewport ----

 Viewport.background            #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-Viewport.font                  .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
+Viewport.font                  [active] $defaultFont [UI]
 Viewport.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 ViewportUI                     com.formdev.flatlaf.ui.FlatViewportUI

@@ -1160,6 +1161,7 @@ controlHighlight               #e3e3e3    javax.swing.plaf.ColorUIResource [UI]
 controlLtHighlight             #ffffff    javax.swing.plaf.ColorUIResource [UI]
 controlShadow                  #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
 controlText                    #000000    javax.swing.plaf.ColorUIResource [UI]
+defaultFont                    .SF NS Text plain 13    javax.swing.plaf.FontUIResource [UI]
 desktop                        #ffffff    javax.swing.plaf.ColorUIResource [UI]


--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt
@@ -81,7 +81,7 @@ Button.disabledBorderColor     #cfcfcf    javax.swing.plaf.ColorUIResource [UI]
 Button.disabledText            #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 Button.focusedBackground       #e3f1fa    javax.swing.plaf.ColorUIResource [UI]
 Button.focusedBorderColor      #87afda    javax.swing.plaf.ColorUIResource [UI]
-Button.font                    Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Button.font                    [active] $defaultFont [UI]
 Button.foreground              #000000    javax.swing.plaf.ColorUIResource [UI]
 Button.highlight               #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Button.hoverBackground         #ff0000    com.formdev.flatlaf.util.DerivedColor [UI]
@@ -113,7 +113,7 @@ CheckBox.arc                   4
 CheckBox.background            #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 CheckBox.disabledText          #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-CheckBox.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+CheckBox.font                  [active] $defaultFont [UI]
 CheckBox.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 CheckBox.icon.borderColor      #b0b0b0    javax.swing.plaf.ColorUIResource [UI]
@@ -138,7 +138,7 @@ CheckBox.textShiftOffset       0

 #---- CheckBoxMenuItem ----

-CheckBoxMenuItem.acceleratorFont Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.acceleratorFont [active] $defaultFont [UI]
 CheckBoxMenuItem.acceleratorForeground #505050    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.arrowIcon     [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -147,7 +147,7 @@ CheckBoxMenuItem.border        [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 CheckBoxMenuItem.borderPainted true
 CheckBoxMenuItem.checkIcon     [lazy] 15,15    com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI]
 CheckBoxMenuItem.disabledForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-CheckBoxMenuItem.font          Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+CheckBoxMenuItem.font          [active] $defaultFont [UI]
 CheckBoxMenuItem.foreground    #000000    javax.swing.plaf.ColorUIResource [UI]
 CheckBoxMenuItem.margin        2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 CheckBoxMenuItem.opaque        false
@@ -164,7 +164,7 @@ CheckBoxUI                     com.formdev.flatlaf.ui.FlatCheckBoxUI
 #---- ColorChooser ----

 ColorChooser.background        #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-ColorChooser.font              Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ColorChooser.font              [active] $defaultFont [UI]
 ColorChooser.foreground        #000000    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesDefaultRecentColor #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ColorChooser.swatchesRecentSwatchSize [active] 16,16    javax.swing.plaf.DimensionUIResource [UI]
@@ -186,7 +186,7 @@ ComboBox.buttonHoverArrowColor #999999    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.buttonShadow          #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.disabledForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-ComboBox.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ComboBox.font                  [active] $defaultFont [UI]
 ComboBox.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 ComboBox.isEnterSelectablePopup false
 ComboBox.noActionOnKeyNavigation false
@@ -246,7 +246,7 @@ EditorPane.border              [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 EditorPane.caretBlinkRate      500
 EditorPane.caretForeground     #000000    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.disabledBackground  #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-EditorPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+EditorPane.font                [active] $defaultFont [UI]
 EditorPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveBackground  #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 EditorPane.inactiveForeground  #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -285,7 +285,7 @@ FormattedTextField.border      [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 FormattedTextField.caretBlinkRate 500
 FormattedTextField.caretForeground #000000    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.disabledBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-FormattedTextField.font        Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+FormattedTextField.font        [active] $defaultFont [UI]
 FormattedTextField.foreground  #000000    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 FormattedTextField.inactiveForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -353,7 +353,7 @@ InternalFrame.inactiveTitleBackground #fafafa    javax.swing.plaf.ColorUIResourc
 InternalFrame.inactiveTitleForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 InternalFrame.maximizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon [UI]
 InternalFrame.minimizeIcon     [lazy] 24,24    com.formdev.flatlaf.icons.FlatInternalFrameMinimizeIcon [UI]
-InternalFrame.titleFont        Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+InternalFrame.titleFont        [active] $defaultFont [UI]


 #---- InternalFrameTitlePane ----
@@ -430,7 +430,7 @@ JideTabbedPaneUI               com.formdev.flatlaf.jideoss.ui.FlatJideTabbedPane
 Label.background               #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledForeground       #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 Label.disabledShadow           #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
-Label.font                     Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Label.font                     [active] $defaultFont [UI]
 Label.foreground               #000000    javax.swing.plaf.ColorUIResource [UI]
 LabelUI                        com.formdev.flatlaf.ui.FlatLabelUI

@@ -448,7 +448,7 @@ List.dropCellForeground        [lazy] #ffffff    javax.swing.plaf.ColorUIResourc
 List.dropLineColor             [lazy] #6aa7e1    javax.swing.plaf.ColorUIResource [UI]
 List.focusCellHighlightBorder  [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Focused [UI]
 List.focusSelectedCellHighlightBorder [lazy] 1,6,1,6  false    com.formdev.flatlaf.ui.FlatListCellBorder$Selected [UI]
-List.font                      Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+List.font                      [active] $defaultFont [UI]
 List.foreground                #000000    javax.swing.plaf.ColorUIResource [UI]
 List.noFocusBorder             1,1,1,1  false    javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI]
 List.selectionBackground       #2675bf    javax.swing.plaf.ColorUIResource [UI]
@@ -461,7 +461,7 @@ ListUI                         com.formdev.flatlaf.ui.FlatListUI

 #---- Menu ----

-Menu.acceleratorFont           Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Menu.acceleratorFont           [active] $defaultFont [UI]
 Menu.acceleratorForeground     #505050    javax.swing.plaf.ColorUIResource [UI]
 Menu.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Menu.arrowIcon                 [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuArrowIcon [UI]
@@ -471,7 +471,7 @@ Menu.borderPainted             true
 Menu.cancelMode                hideLastSubmenu
 Menu.crossMenuMnemonic         true
 Menu.disabledForeground        #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-Menu.font                      Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Menu.font                      [active] $defaultFont [UI]
 Menu.foreground                #000000    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.arrowColor           #666666    javax.swing.plaf.ColorUIResource [UI]
 Menu.icon.disabledArrowColor   #ababab    javax.swing.plaf.ColorUIResource [UI]
@@ -493,7 +493,7 @@ Menu.submenuPopupOffsetY       [active] -4
 MenuBar.background             #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.border                 [lazy] 0,0,1,0  false    com.formdev.flatlaf.ui.FlatMenuBarBorder [UI]
 MenuBar.borderColor            #cdcdcd    javax.swing.plaf.ColorUIResource [UI]
-MenuBar.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+MenuBar.font                   [active] $defaultFont [UI]
 MenuBar.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.highlight              #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuBar.hoverBackground        #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
@@ -508,7 +508,7 @@ MenuBarUI                      com.formdev.flatlaf.ui.FlatMenuBarUI
 #---- MenuItem ----

 MenuItem.acceleratorDelimiter  -
-MenuItem.acceleratorFont       Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+MenuItem.acceleratorFont       [active] $defaultFont [UI]
 MenuItem.acceleratorForeground #505050    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.arrowIcon             [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -516,7 +516,7 @@ MenuItem.background            #ffffff    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
 MenuItem.borderPainted         true
 MenuItem.disabledForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-MenuItem.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+MenuItem.font                  [active] $defaultFont [UI]
 MenuItem.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 MenuItem.margin                2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 MenuItem.opaque                false
@@ -570,7 +570,7 @@ OptionPane.buttonMinimumWidth  [active] 72
 OptionPane.buttonOrientation   4
 OptionPane.buttonPadding       8
 OptionPane.errorIcon           [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneErrorIcon [UI]
-OptionPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+OptionPane.font                [active] $defaultFont [UI]
 OptionPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 OptionPane.iconMessageGap      16
 OptionPane.informationIcon     [lazy] 32,32    com.formdev.flatlaf.icons.FlatOptionPaneInformationIcon [UI]
@@ -591,7 +591,7 @@ OptionPaneUI                   com.formdev.flatlaf.ui.FlatOptionPaneUI
 #---- Panel ----

 Panel.background               #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-Panel.font                     Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Panel.font                     [active] $defaultFont [UI]
 Panel.foreground               #000000    javax.swing.plaf.ColorUIResource [UI]
 PanelUI                        com.formdev.flatlaf.ui.FlatPanelUI

@@ -606,7 +606,7 @@ PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.echoChar         '\u2022'
-PasswordField.font             Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+PasswordField.font             [active] $defaultFont [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -624,7 +624,7 @@ PopupMenu.border               [lazy] 4,1,4,1  false    com.formdev.flatlaf.ui.F
 PopupMenu.borderColor          #adadad    javax.swing.plaf.ColorUIResource [UI]
 PopupMenu.borderInsets         4,1,4,1    javax.swing.plaf.InsetsUIResource [UI]
 PopupMenu.consumeEventOnClose  false
-PopupMenu.font                 Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+PopupMenu.font                 [active] $defaultFont [UI]
 PopupMenu.foreground           #000000    javax.swing.plaf.ColorUIResource [UI]


@@ -649,7 +649,7 @@ ProgressBar.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 ProgressBar.cellLength         1
 ProgressBar.cellSpacing        0
 ProgressBar.cycleTime          4000
-ProgressBar.font               Segoe UI plain 10    javax.swing.plaf.FontUIResource [UI]
+ProgressBar.font               [active] Segoe UI plain 10    javax.swing.plaf.FontUIResource [UI]
 ProgressBar.foreground         #1e82e6    javax.swing.plaf.ColorUIResource [UI]
 ProgressBar.horizontalSize     146,4    javax.swing.plaf.DimensionUIResource [UI]
 ProgressBar.repaintInterval    15
@@ -665,7 +665,7 @@ RadioButton.background         #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.border             [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.FlatMarginBorder [UI]
 RadioButton.darkShadow         #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.disabledText       #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-RadioButton.font               Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+RadioButton.font               [active] $defaultFont [UI]
 RadioButton.foreground         #000000    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.highlight          #ffffff    javax.swing.plaf.ColorUIResource [UI]
 RadioButton.icon.centerDiameter 8
@@ -681,7 +681,7 @@ RadioButton.textShiftOffset    0

 #---- RadioButtonMenuItem ----

-RadioButtonMenuItem.acceleratorFont Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.acceleratorFont [active] $defaultFont [UI]
 RadioButtonMenuItem.acceleratorForeground #505050    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.acceleratorSelectionForeground #ffffff    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.arrowIcon  [lazy] 6,10    com.formdev.flatlaf.icons.FlatMenuItemArrowIcon [UI]
@@ -690,7 +690,7 @@ RadioButtonMenuItem.border     [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 RadioButtonMenuItem.borderPainted true
 RadioButtonMenuItem.checkIcon  [lazy] 15,15    com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI]
 RadioButtonMenuItem.disabledForeground #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-RadioButtonMenuItem.font       Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+RadioButtonMenuItem.font       [active] $defaultFont [UI]
 RadioButtonMenuItem.foreground #000000    javax.swing.plaf.ColorUIResource [UI]
 RadioButtonMenuItem.margin     2,8,2,8    javax.swing.plaf.InsetsUIResource [UI]
 RadioButtonMenuItem.opaque     false
@@ -751,7 +751,7 @@ ScrollBarUI                    com.formdev.flatlaf.ui.FlatScrollBarUI
 ScrollPane.background          #f5f5f5    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.border              [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatBorder [UI]
 ScrollPane.fillUpperCorner     true
-ScrollPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ScrollPane.font                [active] $defaultFont [UI]
 ScrollPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 ScrollPane.smoothScrolling     true
 ScrollPaneUI                   com.formdev.flatlaf.ui.FlatScrollPaneUI
@@ -775,7 +775,7 @@ Slider.background              #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Slider.disabledForeground      #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
 Slider.focus                   #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 Slider.focusInsets             0,0,0,0    javax.swing.plaf.InsetsUIResource [UI]
-Slider.font                    Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Slider.font                    [active] $defaultFont [UI]
 Slider.foreground              #000000    javax.swing.plaf.ColorUIResource [UI]
 Slider.highlight               #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Slider.horizontalSize          200,21    java.awt.Dimension
@@ -806,7 +806,7 @@ Spinner.disabledBackground     #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 Spinner.disabledForeground     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 Spinner.editorAlignment        11
 Spinner.editorBorderPainted    false
-Spinner.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Spinner.font                   [active] $defaultFont [UI]
 Spinner.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 Spinner.padding                2,6,2,6    javax.swing.plaf.InsetsUIResource [UI]
 SpinnerUI                      com.formdev.flatlaf.ui.FlatSpinnerUI
@@ -848,7 +848,7 @@ TabbedPane.disabledForeground  #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.disabledUnderlineColor #ababab    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focus               #000000    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.focusColor          #dae4ed    javax.swing.plaf.ColorUIResource [UI]
-TabbedPane.font                Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TabbedPane.font                [active] $defaultFont [UI]
 TabbedPane.foreground          #000000    javax.swing.plaf.ColorUIResource [UI]
 TabbedPane.hasFullBorder       false
 TabbedPane.highlight           #ffffff    javax.swing.plaf.ColorUIResource [UI]
@@ -887,7 +887,7 @@ Table.focusCellBackground      #ffffff    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellForeground      #000000    javax.swing.plaf.ColorUIResource [UI]
 Table.focusCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Focused [UI]
 Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI]
-Table.font                     Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Table.font                     [active] $defaultFont [UI]
 Table.foreground               #000000    javax.swing.plaf.ColorUIResource [UI]
 Table.gridColor                #f7f7f7    javax.swing.plaf.ColorUIResource [UI]
 Table.intercellSpacing         0,0    javax.swing.plaf.DimensionUIResource [UI]
@@ -908,7 +908,7 @@ TableHeader.background         #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.bottomSeparatorColor #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.cellBorder         [lazy] 2,3,2,3  false    com.formdev.flatlaf.ui.FlatEmptyBorder [UI]
 TableHeader.focusCellBackground #ffffff    javax.swing.plaf.ColorUIResource [UI]
-TableHeader.font               Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TableHeader.font               [active] $defaultFont [UI]
 TableHeader.foreground         #000000    javax.swing.plaf.ColorUIResource [UI]
 TableHeader.height             25
 TableHeader.separatorColor     #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
@@ -946,7 +946,7 @@ TextArea.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextArea.caretBlinkRate        500
 TextArea.caretForeground       #000000    javax.swing.plaf.ColorUIResource [UI]
 TextArea.disabledBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-TextArea.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TextArea.font                  [active] $defaultFont [UI]
 TextArea.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 TextArea.inactiveForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -970,7 +970,7 @@ TextField.caretBlinkRate       500
 TextField.caretForeground      #000000    javax.swing.plaf.ColorUIResource [UI]
 TextField.darkShadow           #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 TextField.disabledBackground   #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-TextField.font                 Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TextField.font                 [active] $defaultFont [UI]
 TextField.foreground           #000000    javax.swing.plaf.ColorUIResource [UI]
 TextField.highlight            #ffffff    javax.swing.plaf.ColorUIResource [UI]
 TextField.inactiveBackground   #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
@@ -991,7 +991,7 @@ TextPane.border                [lazy] 0,0,0,0  false    com.formdev.flatlaf.ui.F
 TextPane.caretBlinkRate        500
 TextPane.caretForeground       #000000    javax.swing.plaf.ColorUIResource [UI]
 TextPane.disabledBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-TextPane.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TextPane.font                  [active] $defaultFont [UI]
 TextPane.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveBackground    #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 TextPane.inactiveForeground    #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
@@ -1004,7 +1004,7 @@ TextPaneUI                     com.formdev.flatlaf.ui.FlatTextPaneUI
 #---- TitledBorder ----

 TitledBorder.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.FlatLineBorder [UI]
-TitledBorder.font              Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+TitledBorder.font              [active] $defaultFont [UI]
 TitledBorder.titleColor        #000000    javax.swing.plaf.ColorUIResource [UI]


@@ -1020,7 +1020,7 @@ ToggleButton.border            [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 ToggleButton.darkShadow        #9e9e9e    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledSelectedBackground #dfdfdf    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.disabledText      #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-ToggleButton.font              Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ToggleButton.font              [active] $defaultFont [UI]
 ToggleButton.foreground        #000000    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.highlight         #ffffff    javax.swing.plaf.ColorUIResource [UI]
 ToggleButton.iconTextGap       4
@@ -1054,7 +1054,7 @@ ToolBar.dockingBackground      #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.dockingForeground      #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingBackground     #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.floatingForeground     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]
-ToolBar.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ToolBar.font                   [active] $defaultFont [UI]
 ToolBar.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.gripColor              #afafaf    javax.swing.plaf.ColorUIResource [UI]
 ToolBar.highlight              #ffffff    javax.swing.plaf.ColorUIResource [UI]
@@ -1081,7 +1081,7 @@ ToolBarUI                      com.formdev.flatlaf.ui.FlatToolBarUI
 ToolTip.background             #fafafa    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.backgroundInactive     #fafafa    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.border                 [lazy] 4,6,4,6  false    com.formdev.flatlaf.ui.FlatLineBorder [UI]
-ToolTip.font                   Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+ToolTip.font                   [active] $defaultFont [UI]
 ToolTip.foreground             #000000    javax.swing.plaf.ColorUIResource [UI]
 ToolTip.foregroundInactive     #8c8c8c    javax.swing.plaf.ColorUIResource [UI]

@@ -1109,7 +1109,7 @@ Tree.dropCellForeground        [lazy] #ffffff    javax.swing.plaf.ColorUIResourc
 Tree.dropLineColor             [lazy] #6aa7e1    javax.swing.plaf.ColorUIResource [UI]
 Tree.editorBorder              [lazy] line: #000000    java.awt.Color 1 false    1,1,1,1  true    javax.swing.plaf.BorderUIResource$LineBorderUIResource [UI]
 Tree.expandedIcon              [lazy] 11,11    com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI]
-Tree.font                      Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Tree.font                      [active] $defaultFont [UI]
 Tree.foreground                #000000    javax.swing.plaf.ColorUIResource [UI]
 Tree.hash                      #e6e6e6    javax.swing.plaf.ColorUIResource [UI]
 Tree.icon.closedColor          #afafaf    javax.swing.plaf.ColorUIResource [UI]
@@ -1124,6 +1124,7 @@ Tree.openIcon                  [lazy] 16,16    com.formdev.flatlaf.icons.FlatTre
 Tree.paintLines                false
 Tree.rendererFillBackground    false
 Tree.rendererMargins           1,2,1,2    javax.swing.plaf.InsetsUIResource [UI]
+Tree.repaintWholeRow           true
 Tree.rightChildIndent          11
 Tree.rowHeight                 0
 Tree.scrollsOnExpand           true
@@ -1142,7 +1143,7 @@ TreeUI                         com.formdev.flatlaf.ui.FlatTreeUI
 #---- Viewport ----

 Viewport.background            #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-Viewport.font                  Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
+Viewport.font                  [active] $defaultFont [UI]
 Viewport.foreground            #000000    javax.swing.plaf.ColorUIResource [UI]
 ViewportUI                     com.formdev.flatlaf.ui.FlatViewportUI

@@ -1158,6 +1159,7 @@ controlHighlight               #e3e3e3    javax.swing.plaf.ColorUIResource [UI]
 controlLtHighlight             #ffffff    javax.swing.plaf.ColorUIResource [UI]
 controlShadow                  #c4c4c4    javax.swing.plaf.ColorUIResource [UI]
 controlText                    #000000    javax.swing.plaf.ColorUIResource [UI]
+defaultFont                    Segoe UI plain 12    javax.swing.plaf.FontUIResource [UI]
 desktop                        #ffffff    javax.swing.plaf.ColorUIResource [UI]
Author	SHA1	Message	Date
Karl Tauber	152f235ca1	release 0.29	2020-04-01 23:26:47 +02:00
Karl Tauber	d094709dc8	ComboBox: no longer ignore `JComboBox.prototypeDisplayValue` when computing popup width (issue #80 )	2020-03-31 18:53:55 +02:00
Karl Tauber	97d5792341	ComboBox: made class FlatComboPopup protected to allow subclassing (issue #80 )	2020-03-31 17:29:12 +02:00
Karl Tauber	9429ba7d48	support specifying custom scale factor in system property `flatlaf.uiScale` also for Java 9 and later	2020-03-31 12:17:05 +02:00
Karl Tauber	af89dd13c1	support changing default font used for all components with automatic scaling UI if using larger font	2020-03-31 12:15:51 +02:00
Karl Tauber	60c6c5b37a	FlatLineBorder: support specifying painted line thickness	2020-03-29 23:30:04 +02:00
Karl Tauber	5ed40cab1d	Demo: support using own FlatLaf themes (`.properties` files) that are located in working directory of Demo application	2020-03-29 18:02:35 +02:00
Karl Tauber	1bebfe9cf2	IntelliJ Themes Demo: updated Arc, Arc Orange and Hiberbee themes (used IJThemesUpdater)	2020-03-28 09:41:51 +01:00
Karl Tauber	e2618c37a2	Testing: added "size variant" combobox to control bar if Aqua or Nimbus LaF are active	2020-03-28 09:41:03 +01:00
Karl Tauber	f2ab848c46	FlatOptionPaneTest: scroll pane added	2020-03-27 23:49:25 +01:00
Karl Tauber	93b82c0e97	FlatDefaultsAddon: added afterDefaultsLoading() method to allow modification of UI defaults by Addons	2020-03-27 23:21:55 +01:00
Karl Tauber	4ac5ad06f2	IntelliJ Themes: simplified applying theme properties to UI defaults	2020-03-27 18:54:30 +01:00
Karl Tauber	a3788038bb	Tree: fixed repainting wide selection on focus gained/lost	2020-03-27 10:51:20 +01:00
Karl Tauber	12af2de99e	no longer use system property `sun.java2d.uiScale` (Java 8 only)	2020-03-27 10:44:43 +01:00
Karl Tauber	225b722b1b	Linux: fixed wrong font size if `GDK_SCALE` environment variable is set or if running on JetBrains Runtime (issue #69 )	2020-03-26 17:20:09 +01:00
Karl Tauber	1d9c8ca65e	Linux: fixed scaling if `GDK_SCALE` environment variable is set or if running on JetBrains Runtime (issue #69 )	2020-03-26 13:06:12 +01:00