AnimatedPainter:

- renamed `getValues()` to `getAnimatableValues()` - renamed `getClientPropertyKey()` to `getAnimationClientPropertyKey()` - AnimatedPainterSupport improvements
LineChartPanel:
2026-02-11 06:27:13 -06:00 · 2025-03-13 11:46:14 +01:00 · 2025-03-12 18:35:56 +01:00 · 2025-03-11 19:33:36 +01:00 · 2021-11-22 22:07:45 +01:00 · 2021-11-22 22:07:20 +01:00
265 changed files with 30036 additions and 33736 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,26 +19,40 @@ jobs:
    strategy:
      matrix:
        # test against
-        # - Java 8 (minimum requirement)
+        # - Java 1.8 (minimum requirement)
+        # - Java 9 (first version with JPMS)
        # - Java LTS versions (11, 17, ...)
        # - lastest Java version(s)
        java:
-          - 8
+          - 1.8
+          - 9
          - 11  # LTS
-          - 17  # LTS
+          - 14
+          - 15

    steps:
      - uses: actions/checkout@v2

      - uses: gradle/wrapper-validation-action@v1
-        if: matrix.java == '8'
+        if: matrix.java == '1.8'

      - name: Setup Java ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v1
        with:
          java-version: ${{ matrix.java }}
-          distribution: adopt  # Java 8 and 11 are pre-installed on ubuntu-latest
-          cache: gradle
+
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Cache Gradle cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle

      - name: Build with Gradle
        run: ./gradlew build
@@ -59,18 +73,29 @@ jobs:
    needs: build
    if: |
      github.event_name == 'push' &&
-      (github.ref == 'refs/heads/main' || startsWith( github.ref, 'refs/heads/develop-' )) &&
+      github.ref == 'refs/heads/main' &&
      github.repository == 'JFormDesigner/FlatLaf'

    steps:
      - uses: actions/checkout@v2

      - name: Setup Java 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v1
        with:
          java-version: 11
-          distribution: adopt  # pre-installed on ubuntu-latest
-          cache: gradle
+
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Cache Gradle cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle

      - name: Publish snapshot to oss.sonatype.org
        run: ./gradlew publish :flatlaf-theme-editor:build -Dorg.gradle.internal.publish.checksums.insecure=true
@@ -102,11 +127,22 @@ jobs:
      - uses: actions/checkout@v2

      - name: Setup Java 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v1
        with:
          java-version: 11
-          distribution: adopt  # pre-installed on ubuntu-latest
-          cache: gradle
+
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Cache Gradle cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: ${{ runner.os }}-gradle

      - name: Release a new stable version to Maven Central
        run: ./gradlew publish :flatlaf-demo:build :flatlaf-theme-editor:build -Drelease=true
--- a/.github/workflows/natives.yml
+++ b/.github/workflows/natives.yml
@@ -11,14 +11,12 @@ on:
        paths:
            - 'flatlaf-natives/flatlaf-natives-windows/**'
            - '.github/workflows/natives.yml'
-            - 'gradle/wrapper/gradle-wrapper.properties'
    pull_request:
        branches:
            - '*'
        paths:
            - 'flatlaf-natives/flatlaf-natives-windows/**'
            - '.github/workflows/natives.yml'
-            - 'gradle/wrapper/gradle-wrapper.properties'

 jobs:
    Windows:
@@ -29,17 +27,28 @@ jobs:

            - uses: gradle/wrapper-validation-action@v1

-            - name: Setup Java 11
-              uses: actions/setup-java@v2
+            - name: Setup Java 1.8
+              uses: actions/setup-java@v1
              with:
-                  java-version: 11
-                  distribution: adopt
-                  cache: gradle
+                  java-version: 1.8
+
+            - name: Cache Gradle wrapper
+              uses: actions/cache@v1
+              with:
+                  path: ~/.gradle/wrapper
+                  key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+
+            - name: Cache Gradle cache
+              uses: actions/cache@v2
+              with:
+                  path: |
+                    ~/.gradle/caches
+                    !~/.gradle/caches/modules-2/modules-2.lock
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
+                  restore-keys: ${{ runner.os }}-gradle

            - name: Build with Gradle
-              # --no-daemon is necessary on Windows otherwise caching Gradle would fail with: 
-              #   tar.exe: Couldn't open ~/.gradle/caches/modules-2/modules-2.lock: Permission denied
-              run: ./gradlew :flatlaf-natives-windows:build --no-daemon
+              run: ./gradlew :flatlaf-natives-windows:build

            - name: Upload artifacts
              uses: actions/upload-artifact@v2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,93 +1,7 @@
 FlatLaf Change Log
 ==================

-## 2.1
-
-#### New features and improvements
-
- Menus: Improved usability of submenus. (PR #490; issue #247)
- Menus: Scroll large menus using mouse wheel or up/down arrows. (issue #225)
- Linux: Support using custom window decorations. Enable with
-  `JFrame.setDefaultLookAndFeelDecorated(true)` and
-  `JDialog.setDefaultLookAndFeelDecorated(true)` before creating a window.
-  (issue #482)
- ScrollBar: Added UI value `ScrollBar.minimumButtonSize` to specify minimum
-  scroll arrow button size (if shown). (issue #493)
-
-#### Fixed bugs
-
- PasswordField: Fixed reveal button appearance in IntelliJ themes. (issue #494)
- ScrollBar: Center and scale arrows in scroll up/down buttons (if shown).
-  (issue #493)
- TextArea, TextPane and EditorPane: No longer select all text when component is
-  focused for the first time. (issue #498; regression in FlatLaf 2.0)
- TabbedPane: Disable all items in "Show Hidden Tabs" popup menu if tabbed pane
-  is disabled.
-
-#### Incompatibilities
-
- Method `FlatUIUtils.paintArrow()` (and class `FlatArrowButton`) now paints
-  arrows one pixel smaller than before. To fix this, increase parameter
-  `arrowSize` by one.
-
-
-## 2.0.2
-
- Native window decorations (Windows 10/11 only): Fixed rendering artifacts on
-  HiDPI screens when dragging window partly offscreen and back into screen
-  bounds. (issue #477)
- Repaint component when setting client property `JComponent.outline` (issue
-  #480).
- macOS: Fixed NPE when using some icons in main menu items. (issue #483)
-
-
-## 2.0.1
-
- Fixed memory leak in Panel, Separator and ToolBarSeparator. (issue #471;
-  regression in FlatLaf 2.0)
- ToolTip: Fixed wrong tooltip location if component overrides
-  `JComponent.getToolTipLocation()` and wants place tooltip under mouse
-  location. (issue #468)
- Extras: Added copy constructor to `FlatSVGIcon`. (issue #465)
- Moved `module-info.class` from `META-INF\versions\9\` to root folder of JARs.
-  (issue #466)
-
-
-## 2.0
-
- Added system property `flatlaf.nativeLibraryPath` to load native libraries
-  from a directory. (PR #453)
- Fixed "endless recursion in font" exception in
-  `FlatLaf$ActiveFont.createValue()` if `UIManager.getFont()` is invoked from
-  multiple threads. (issue #456)
- PasswordField: Preserve reveal button state when switching theme. (PR #442;
-  issue #173)
- PasswordField: Reveal button did not show password if
-  `JPasswordField.setEchoChar()` was invoked from application. (PR #442; issue
-  #173)
- Slider: Fixed/improved focused indicator color when changing accent color. (PR
-  #375)
- TextField:
-  - Improved hover/pressed/selected colors of leading/trailing buttons (e.g.
-    "reveal" button in password field). (issue #452)
-  - Clear button no longer paints over round border. (issue #451)
- Extras: Fixed concurrent loading of SVG icons on multiple threads. (issue
-  #459)
- Use FlatLaf native window decorations by default when running in
-  [JetBrains Runtime](https://github.com/JetBrains/JetBrainsRuntime/wiki)
-  (instead of using JetBrains custom decorations). System variable
-  `flatlaf.useJetBrainsCustomDecorations` is now `false` by default (was `true`
-  in FlatLaf 1.x). (issue #454)
- Native window decorations:
-  - Fixed blurry iconify/maximize/close button hover rectangles at 125%, 150% or
-    175% scaling. (issue #431)
-  - Updated maximize and restore icons for Windows 11 style. (requires Java
-    8u321, 11.0.14, 17.0.2 or 18+)
-  - Updated hover and pressed colors of iconify/maximize/close buttons for
-    Windows 11 style.
-
-
-## 2.0-rc1
+## 2.0-SNAPSHOT

 #### New features and improvements

@@ -114,18 +28,9 @@ FlatLaf Change Log
    setting UI default `OptionPane.showIcon` to `true`. (issue #416)
  - No longer show the Java "duke/cup" icon if no window icon image is set.
    (issue #416)
- TextField, FormattedTextField and PasswordField:
-  - Support leading and trailing icons (set client property
-    `JTextField.leadingIcon` or `JTextField.trailingIcon` to a
-    `javax.swing.Icon`). (PR #378; issue #368)
-  - Support leading and trailing components (set client property
-    `JTextField.leadingComponent` or `JTextField.trailingComponent` to a
-    `java.awt.Component`). (PR #386)
-  - Support "clear" (or "cancel") button to empty text field. Only shown if text
-    field is not empty, editable and enabled. (set client property
-    `JTextField.showClearButton` to `true`). (PR #442)
- PasswordField: Support reveal (or "eye") button to show password. (see UI
-  value `PasswordField.showRevealButton`) (PR #442; issue #173)
+- TextField, FormattedTextField and PasswordField: Support leading and trailing
+  icons (set client property `JTextField.leadingIcon` or
+  `JTextField.trailingIcon` to an `Icon`). (PR #378; issue #368)
 - TextComponents: Double/triple-click-and-drag now extends selection by whole
  words/lines.
 - Theming improvements: Reworks core themes to make it easier to create new
@@ -156,10 +61,6 @@ FlatLaf Change Log
 - Slider: Support specifying width of thumb border (see UI value
  `Slider.thumbBorderWidth`).
 - TabbedPane: Optionally paint selected tab as card. (PR #343)
- MenuItem:
-  - Paint the selected icon when the item is selected. (PR #415)
-  - Vertically align text if icons have different widths. (issue #437)
- Panel: Support painting background with rounded corners. (issue #367)
 - Added more color functions to class `ColorFunctions` for easy use in
  applications: `lighten()`, `darken()`, `saturate()`, `desaturate()`, `spin()`,
  `tint()`, `shade()` and `luma()`.
@@ -172,40 +73,6 @@ FlatLaf Change Log
  - `FlatSVGIcon`: Support loading SVG from `URL` (for JPMS), `URI`, `File` or
    `InputStream`. (issues #419 and #325)
  - `FlatSVGUtils`: Support loading SVG from `URL` (for JPMS). (issue #325)
- SwingX:
-  - New "column control" icon for `JXTable` that scales and uses antialiasing.
-    (issue #434)
-
-#### Fixed bugs
-
- Native window decorations: Fixed `UnsatisfiedLinkError` on Windows 11 for ARM
-  processors. (issue #443)
- MenuBar: Do not fill background if non-opaque and having custom background
-  color. (issue #409)
- InternalFrame: Fill background to avoid that parent may shine through internal
-  frame if it contains non-opaque components. (better fix for issue #274)
- SwingX: Fixed `NullPointerException` in `FlatCaret` when using
-  `org.jdesktop.swingx.prompt.PromptSupport.setPrompt()` on a text field and
-  then switching theme.
-
-
-## 1.6.5
-
-#### Fixed bugs
-
- Linux: Fixed font problems when running on Oracle Java (OpenJDK is not
-  affected):
-  - oversized text if system font is "Inter" (issue #427)
-  - missing text if system font is "Cantarell" (on Fedora)
- MenuItem: Changed accelerator delimiter from `-` to `+`. (Windows and Linux).
- ComboBox: Fixed occasional `StackOverflowError` when modifying combo box not
-  on AWT thread. (issue #432)
- macOS: Fixed `NullPointerException` when using AWT component
-  `java.awt.Choice`. (issue #439)
- Native window decorations: Do not exit application with `UnsatisfiedLinkError`
-  in case that FlatLaf DLL cannot be executed because of restrictions on
-  temporary directory. Instead, continue with default window decorations. (issue
-  #436)


 ## 1.6.4
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ scales on **HiDPI** displays and runs on Java 8 or newer.
 The look is heavily inspired by **Darcula** and **IntelliJ** themes from
 IntelliJ IDEA 2019.2+ and uses almost the same colors and icons.

-![FlatLaf Light](images/flat_light.png)
+![Flat Light](images/flat_light.png)

-![FlatLaf Dark](images/flat_dark.png)
+![Flat Dark](images/flat_dark.png)


 IntelliJ Platform Themes
@@ -99,22 +99,10 @@ For more information and documentation visit
 - [Customizing](https://www.formdev.com/flatlaf/customizing/)
 - [How to Customize](https://www.formdev.com/flatlaf/how-to-customize/)
 - [Properties Files](https://www.formdev.com/flatlaf/properties-files/)
- [Components UI Properties](https://www.formdev.com/flatlaf/components/)
- [Typography](https://www.formdev.com/flatlaf/typography/)
 - [Client Properties](https://www.formdev.com/flatlaf/client-properties/)
 - [System Properties](https://www.formdev.com/flatlaf/system-properties/)


-Theme Editor
------------
-
-The Theme Editor that supports editing FlatLaf theme properties files. See
-[Theme Editor documentation](https://www.formdev.com/flatlaf/theme-editor/) for
-details and downloads.
-
-![Theme Editor](images/theme-editor@1.5x.png)
-
-
 Buzz
 ----

@@ -126,13 +114,6 @@ Buzz
 Applications using FlatLaf
 --------------------------

- ![New](images/new.svg) [Ultorg](https://www.ultorg.com/) (**commercial**) - a
-  visual query system for relational databases
- ![New](images/new.svg) [MooInfo](https://github.com/rememberber/MooInfo) -
-  visual implementation of OSHI, to view information about the system and
-  hardware
- ![New](images/new.svg) [Jailer](https://github.com/Wisser/Jailer) 11.2 -
-  database subsetting and relational data browsing tool
 - [Apache NetBeans](https://netbeans.apache.org/) 11.3 - IDE for Java, PHP, HTML
  and much more
 - [jclasslib bytecode viewer](https://github.com/ingokegel/jclasslib) 5.5
@@ -160,16 +141,13 @@ Applications using FlatLaf
  [OpenStreetMap](https://www.openstreetmap.org/) (requires FlatLaf JOSM plugin)
 - [jAlbum](https://jalbum.net/) 21 (**commercial**) - creates photo album
  websites
- ![New](images/new.svg) [PDF Studio](https://www.qoppa.com/pdfstudio/) 2021
-  (**commercial**) - create, review and edit PDF documents
 - [XMLmind XML Editor](https://www.xmlmind.com/xmleditor/) 9.3 (**commercial**)
 - [Total Validator](https://www.totalvalidator.com/) 15 (**commercial**) -
  checks your website
 - [j-lawyer](https://github.com/jlawyerorg/j-lawyer-org) - Kanzleisoftware
- [MegaMek](https://github.com/MegaMek/megamek),
-  [MegaMekLab](https://github.com/MegaMek/megameklab) and
-  [MekHQ](https://github.com/MegaMek/mekhq) v0.47.5+ - a sci-fi tabletop
-  BattleTech simulator suite handling battles, unit building, and campaigns
+- [MegaMek](https://github.com/MegaMek/megamek) v0.47.4 and
+  [MekHQ](https://github.com/MegaMek/mekhq) v0.47.5 - a turn-based sci-fi board
+  game
 - [GUIslice Builder](https://github.com/ImpulseAdventure/GUIslice-Builder)
  0.13.b024 - GUI builder for
  [GUIslice](https://github.com/ImpulseAdventure/GUIslice), a lightweight GUI
@@ -195,7 +173,7 @@ Applications using FlatLaf
  systems development platform
 - [JPass](https://github.com/gaborbata/jpass) - password manager with strong
  encryption
- [Jes - Die Java-EÜR](https://www.jes-eur.de)
+- [Jes - Die Java-EÜR](https://www.jes-eur.de)
 - [Mapton](https://mapton.org/) 2.0
  ([source code](https://github.com/trixon/mapton)) - some kind of map
  application (based on NetBeans platform)
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,8 +14,8 @@
 * limitations under the License.
 */

-val releaseVersion = "2.1"
-val developmentVersion = "2.2-SNAPSHOT"
+val releaseVersion = "1.6.4"
+val developmentVersion = "2.0-SNAPSHOT"

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

--- a/buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts
+++ b/buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts
@@ -28,7 +28,7 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 	}

 	dependencies {
-		add( "java9Implementation", sourceSets.main.get().output )
+		add( "java9Compile", sourceSets.main.get().output )
 	}

 	tasks {
--- a/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts
+++ b/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts
@@ -63,8 +63,10 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 		jar {
 			manifest.attributes( "Multi-Release" to "true" )

-			from( sourceSets["module-info"].output ) {
-				include( "module-info.class" )
+			into( "META-INF/versions/9" ) {
+				from( sourceSets["module-info"].output ) {
+					include( "module-info.class" )
+				}
 			}
 		}
 	}
--- a/compare1.txt
+++ b/compare1.txt
--- a/flatlaf-core/flatlaf-core-sigtest.txt
+++ b/flatlaf-core/flatlaf-core-sigtest.txt
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 2.0
+#Version 1.6

 CLSS public abstract interface com.formdev.flatlaf.FlatClientProperties
 fld public final static java.lang.String BUTTON_TYPE = "JButton.buttonType"
@@ -31,8 +31,6 @@ fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_ALWAYS = "al
 fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_NEVER = "never"
 fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_ONCE = "once"
 fld public final static java.lang.String SQUARE_SIZE = "JButton.squareSize"
-fld public final static java.lang.String STYLE = "FlatLaf.style"
-fld public final static java.lang.String STYLE_CLASS = "FlatLaf.styleClass"
 fld public final static java.lang.String TABBED_PANE_ALIGN_CENTER = "center"
 fld public final static java.lang.String TABBED_PANE_ALIGN_FILL = "fill"
 fld public final static java.lang.String TABBED_PANE_ALIGN_LEADING = "leading"
@@ -61,9 +59,6 @@ fld public final static java.lang.String TABBED_PANE_TAB_CLOSE_TOOLTIPTEXT = "JT
 fld public final static java.lang.String TABBED_PANE_TAB_HEIGHT = "JTabbedPane.tabHeight"
 fld public final static java.lang.String TABBED_PANE_TAB_ICON_PLACEMENT = "JTabbedPane.tabIconPlacement"
 fld public final static java.lang.String TABBED_PANE_TAB_INSETS = "JTabbedPane.tabInsets"
-fld public final static java.lang.String TABBED_PANE_TAB_TYPE = "JTabbedPane.tabType"
-fld public final static java.lang.String TABBED_PANE_TAB_TYPE_CARD = "card"
-fld public final static java.lang.String TABBED_PANE_TAB_TYPE_UNDERLINED = "underlined"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE = "JTabbedPane.tabWidthMode"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_COMPACT = "compact"
 fld public final static java.lang.String TABBED_PANE_TAB_WIDTH_MODE_EQUAL = "equal"
@@ -72,20 +67,12 @@ fld public final static java.lang.String TABBED_PANE_TRAILING_COMPONENT = "JTabb
 fld public final static java.lang.String TAB_BUTTON_SELECTED_BACKGROUND = "JToggleButton.tab.selectedBackground"
 fld public final static java.lang.String TAB_BUTTON_UNDERLINE_COLOR = "JToggleButton.tab.underlineColor"
 fld public final static java.lang.String TAB_BUTTON_UNDERLINE_HEIGHT = "JToggleButton.tab.underlineHeight"
-fld public final static java.lang.String TEXT_FIELD_CLEAR_CALLBACK = "JTextField.clearCallback"
-fld public final static java.lang.String TEXT_FIELD_LEADING_COMPONENT = "JTextField.leadingComponent"
-fld public final static java.lang.String TEXT_FIELD_LEADING_ICON = "JTextField.leadingIcon"
 fld public final static java.lang.String TEXT_FIELD_PADDING = "JTextField.padding"
-fld public final static java.lang.String TEXT_FIELD_SHOW_CLEAR_BUTTON = "JTextField.showClearButton"
-fld public final static java.lang.String TEXT_FIELD_TRAILING_COMPONENT = "JTextField.trailingComponent"
-fld public final static java.lang.String TEXT_FIELD_TRAILING_ICON = "JTextField.trailingIcon"
 fld public final static java.lang.String TITLE_BAR_BACKGROUND = "JRootPane.titleBarBackground"
 fld public final static java.lang.String TITLE_BAR_FOREGROUND = "JRootPane.titleBarForeground"
-fld public final static java.lang.String TITLE_BAR_SHOW_ICON = "JRootPane.titleBarShowIcon"
 fld public final static java.lang.String TREE_PAINT_SELECTION = "JTree.paintSelection"
 fld public final static java.lang.String TREE_WIDE_SELECTION = "JTree.wideSelection"
 fld public final static java.lang.String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations"
-meth public static <%0 extends java.lang.Object> {%%0} clientProperty(javax.swing.JComponent,java.lang.String,{%%0},java.lang.Class<{%%0}>)
 meth public static boolean clientPropertyBoolean(javax.swing.JComponent,java.lang.String,boolean)
 meth public static boolean clientPropertyEquals(javax.swing.JComponent,java.lang.String,java.lang.Object)
 meth public static int clientPropertyInt(javax.swing.JComponent,java.lang.String,int)
@@ -178,7 +165,6 @@ meth public boolean isSupportedLookAndFeel()
 meth public final boolean equals(java.lang.Object)
 meth public final int hashCode()
 meth public java.lang.String getID()
-meth public java.util.Map<java.lang.String,java.lang.String> getExtraDefaults()
 meth public javax.swing.Icon getDisabledIcon(javax.swing.JComponent,javax.swing.Icon)
 meth public javax.swing.UIDefaults getDefaults()
 meth public static boolean install(javax.swing.LookAndFeel)
@@ -188,8 +174,6 @@ meth public static boolean isShowMnemonics()
 meth public static boolean isUseNativeWindowDecorations()
 meth public static boolean setup(javax.swing.LookAndFeel)
 meth public static boolean supportsNativeWindowDecorations()
-meth public static java.lang.Object parseDefaultsValue(java.lang.String,java.lang.String,java.lang.Class<?>)
-meth public static java.util.Map<java.lang.String,java.lang.String> getGlobalExtraDefaults()
 meth public static javax.swing.UIDefaults$ActiveValue createActiveFontValue(float)
 meth public static void hideMnemonics()
 meth public static void initIconColors(javax.swing.UIDefaults,boolean)
@@ -197,26 +181,22 @@ meth public static void installLafInfo(java.lang.String,java.lang.Class<? extend
 meth public static void registerCustomDefaultsSource(java.io.File)
 meth public static void registerCustomDefaultsSource(java.lang.String)
 meth public static void registerCustomDefaultsSource(java.lang.String,java.lang.ClassLoader)
-meth public static void registerCustomDefaultsSource(java.net.URL)
 meth public static void repaintAllFramesAndDialogs()
 meth public static void revalidateAndRepaintAllFramesAndDialogs()
 meth public static void runWithUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>,java.lang.Runnable)
-meth public static void setGlobalExtraDefaults(java.util.Map<java.lang.String,java.lang.String>)
 meth public static void setUseNativeWindowDecorations(boolean)
 meth public static void showMnemonics(java.awt.Component)
 meth public static void unregisterCustomDefaultsSource(java.io.File)
 meth public static void unregisterCustomDefaultsSource(java.lang.String)
 meth public static void unregisterCustomDefaultsSource(java.lang.String,java.lang.ClassLoader)
-meth public static void unregisterCustomDefaultsSource(java.net.URL)
 meth public static void updateUI()
 meth public static void updateUILater()
 meth public void initialize()
 meth public void registerUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
-meth public void setExtraDefaults(java.util.Map<java.lang.String,java.lang.String>)
 meth public void uninitialize()
 meth public void unregisterUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
 supr javax.swing.plaf.basic.BasicLookAndFeel
-hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,uiDefaultsGetters,updateUIPending
+hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,mnemonicHandler,oldPopupFactory,postInitialization,uiDefaultsGetters,updateUIPending
 hcls ActiveFont,FlatUIDefaults,ImageIconUIResource

 CLSS public abstract interface static com.formdev.flatlaf.FlatLaf$DisabledIconProvider
@@ -251,7 +231,6 @@ hfds baseTheme,dark,name,properties
 CLSS public abstract interface com.formdev.flatlaf.FlatSystemProperties
 fld public final static java.lang.String ANIMATION = "flatlaf.animation"
 fld public final static java.lang.String MENUBAR_EMBEDDED = "flatlaf.menuBarEmbedded"
-fld public final static java.lang.String NATIVE_LIBRARY_PATH = "flatlaf.nativeLibraryPath"
 fld public final static java.lang.String UI_SCALE = "flatlaf.uiScale"
 fld public final static java.lang.String UI_SCALE_ALLOW_SCALE_DOWN = "flatlaf.uiScale.allowScaleDown"
 fld public final static java.lang.String UI_SCALE_ENABLED = "flatlaf.uiScale.enabled"
@@ -351,15 +330,7 @@ innr public static HSLIncreaseDecrease
 innr public static Mix
 meth public !varargs static java.awt.Color applyFunctions(java.awt.Color,com.formdev.flatlaf.util.ColorFunctions$ColorFunction[])
 meth public static float clamp(float)
-meth public static float luma(java.awt.Color)
-meth public static java.awt.Color darken(java.awt.Color,float)
-meth public static java.awt.Color desaturate(java.awt.Color,float)
-meth public static java.awt.Color lighten(java.awt.Color,float)
 meth public static java.awt.Color mix(java.awt.Color,java.awt.Color,float)
-meth public static java.awt.Color saturate(java.awt.Color,float)
-meth public static java.awt.Color shade(java.awt.Color,float)
-meth public static java.awt.Color spin(java.awt.Color,float)
-meth public static java.awt.Color tint(java.awt.Color,float)
 supr java.lang.Object

 CLSS public abstract interface static com.formdev.flatlaf.util.ColorFunctions$ColorFunction
@@ -595,7 +566,6 @@ meth public static java.util.List<java.awt.Image> getResolutionVariants(java.awt
 supr java.lang.Object

 CLSS public com.formdev.flatlaf.util.NativeLibrary
-cons public init(java.io.File,boolean)
 cons public init(java.lang.String,java.lang.ClassLoader,boolean)
 meth public boolean isLoaded()
 supr java.lang.Object
@@ -619,52 +589,18 @@ meth public void paintIcon(java.awt.Component,java.awt.Graphics,int,int)
 supr java.lang.Object
 hfds iconHeight,iconWidth,imageIcon,lastImage,lastSystemScaleFactor,lastUserScaleFactor

-CLSS public com.formdev.flatlaf.util.SoftCache<%0 extends java.lang.Object, %1 extends java.lang.Object>
-cons public init()
-cons public init(int)
-intf java.util.Map<{com.formdev.flatlaf.util.SoftCache%0},{com.formdev.flatlaf.util.SoftCache%1}>
-meth public boolean containsKey(java.lang.Object)
-meth public boolean containsValue(java.lang.Object)
-meth public boolean isEmpty()
-meth public int size()
-meth public java.util.Collection<{com.formdev.flatlaf.util.SoftCache%1}> values()
-meth public java.util.Set<java.util.Map$Entry<{com.formdev.flatlaf.util.SoftCache%0},{com.formdev.flatlaf.util.SoftCache%1}>> entrySet()
-meth public java.util.Set<{com.formdev.flatlaf.util.SoftCache%0}> keySet()
-meth public void clear()
-meth public void forEach(java.util.function.BiConsumer<? super {com.formdev.flatlaf.util.SoftCache%0},? super {com.formdev.flatlaf.util.SoftCache%1}>)
-meth public void putAll(java.util.Map<? extends {com.formdev.flatlaf.util.SoftCache%0},? extends {com.formdev.flatlaf.util.SoftCache%1}>)
-meth public void replaceAll(java.util.function.BiFunction<? super {com.formdev.flatlaf.util.SoftCache%0},? super {com.formdev.flatlaf.util.SoftCache%1},? extends {com.formdev.flatlaf.util.SoftCache%1}>)
-meth public {com.formdev.flatlaf.util.SoftCache%1} get(java.lang.Object)
-meth public {com.formdev.flatlaf.util.SoftCache%1} put({com.formdev.flatlaf.util.SoftCache%0},{com.formdev.flatlaf.util.SoftCache%1})
-meth public {com.formdev.flatlaf.util.SoftCache%1} remove(java.lang.Object)
-supr java.lang.Object
-hfds map,queue
-hcls CacheReference
-
 CLSS public com.formdev.flatlaf.util.StringUtils
 cons public init()
 meth public static boolean isEmpty(java.lang.String)
-meth public static boolean isTrimmedEmpty(java.lang.String)
 meth public static java.lang.String removeLeading(java.lang.String,java.lang.String)
 meth public static java.lang.String removeTrailing(java.lang.String,java.lang.String)
-meth public static java.lang.String substringTrimmed(java.lang.String,int)
-meth public static java.lang.String substringTrimmed(java.lang.String,int,int)
 meth public static java.util.List<java.lang.String> split(java.lang.String,char)
-meth public static java.util.List<java.lang.String> split(java.lang.String,char,boolean,boolean)
-supr java.lang.Object
-
-CLSS public com.formdev.flatlaf.util.SwingUtils
-cons public init()
-meth public static <%0 extends java.awt.Component> {%%0} getComponentByName(java.awt.Container,java.lang.String)
 supr java.lang.Object

 CLSS public com.formdev.flatlaf.util.SystemInfo
 cons public init()
-fld public final static boolean isAARCH64
 fld public final static boolean isJava_11_orLater
 fld public final static boolean isJava_15_orLater
-fld public final static boolean isJava_17_orLater
-fld public final static boolean isJava_18_orLater
 fld public final static boolean isJava_9_orLater
 fld public final static boolean isJetBrainsJVM
 fld public final static boolean isJetBrainsJVM_11_orLater
@@ -679,8 +615,6 @@ fld public final static boolean isWebswing
 fld public final static boolean isWinPE
 fld public final static boolean isWindows
 fld public final static boolean isWindows_10_orLater
-fld public final static boolean isWindows_11_orLater
-fld public final static boolean isX86
 fld public final static boolean isX86_64
 fld public final static long javaVersion
 fld public final static long osVersion
@@ -693,7 +627,6 @@ cons public init()
 meth public static boolean isSystemScalingEnabled()
 meth public static double getSystemScaleFactor(java.awt.Graphics2D)
 meth public static double getSystemScaleFactor(java.awt.GraphicsConfiguration)
-meth public static float computeFontScaleFactor(java.awt.Font)
 meth public static float getUserScaleFactor()
 meth public static float scale(float)
 meth public static float unscale(float)
@@ -1000,34 +933,6 @@ CLSS public abstract interface !annotation java.lang.annotation.Target
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.annotation.ElementType[] value()

-CLSS public abstract interface java.util.Map<%0 extends java.lang.Object, %1 extends java.lang.Object>
-innr public abstract interface static Entry
-meth public abstract boolean containsKey(java.lang.Object)
-meth public abstract boolean containsValue(java.lang.Object)
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract boolean isEmpty()
-meth public abstract int hashCode()
-meth public abstract int size()
-meth public abstract java.util.Collection<{java.util.Map%1}> values()
-meth public abstract java.util.Set<java.util.Map$Entry<{java.util.Map%0},{java.util.Map%1}>> entrySet()
-meth public abstract java.util.Set<{java.util.Map%0}> keySet()
-meth public abstract void clear()
-meth public abstract void putAll(java.util.Map<? extends {java.util.Map%0},? extends {java.util.Map%1}>)
-meth public abstract {java.util.Map%1} get(java.lang.Object)
-meth public abstract {java.util.Map%1} put({java.util.Map%0},{java.util.Map%1})
-meth public abstract {java.util.Map%1} remove(java.lang.Object)
-meth public boolean remove(java.lang.Object,java.lang.Object)
-meth public boolean replace({java.util.Map%0},{java.util.Map%1},{java.util.Map%1})
-meth public void forEach(java.util.function.BiConsumer<? super {java.util.Map%0},? super {java.util.Map%1}>)
-meth public void replaceAll(java.util.function.BiFunction<? super {java.util.Map%0},? super {java.util.Map%1},? extends {java.util.Map%1}>)
-meth public {java.util.Map%1} compute({java.util.Map%0},java.util.function.BiFunction<? super {java.util.Map%0},? super {java.util.Map%1},? extends {java.util.Map%1}>)
-meth public {java.util.Map%1} computeIfAbsent({java.util.Map%0},java.util.function.Function<? super {java.util.Map%0},? extends {java.util.Map%1}>)
-meth public {java.util.Map%1} computeIfPresent({java.util.Map%0},java.util.function.BiFunction<? super {java.util.Map%0},? super {java.util.Map%1},? extends {java.util.Map%1}>)
-meth public {java.util.Map%1} getOrDefault(java.lang.Object,{java.util.Map%1})
-meth public {java.util.Map%1} merge({java.util.Map%0},{java.util.Map%1},java.util.function.BiFunction<? super {java.util.Map%1},? super {java.util.Map%1},? extends {java.util.Map%1}>)
-meth public {java.util.Map%1} putIfAbsent({java.util.Map%0},{java.util.Map%1})
-meth public {java.util.Map%1} replace({java.util.Map%0},{java.util.Map%1})
-
 CLSS public abstract interface javax.swing.Icon
 meth public abstract int getIconHeight()
 meth public abstract int getIconWidth()
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
@@ -763,9 +763,9 @@ public interface FlatClientProperties
 	/**
 	 * Specifies a component that will be placed at the leading edge of the tabs area.
 	 * <p>
-	 * For top and bottom tab placement, the laid out component size will be
+	 * For top and bottom tab placement, the layed out component size will be
 	 * the preferred component width and the tab area height.<br>
-	 * For left and right tab placement, the laid out component size will be
+	 * For left and right tab placement, the layed out component size will be
 	 * the tab area width and the preferred component height.
 	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
@@ -776,9 +776,9 @@ public interface FlatClientProperties
 	/**
 	 * Specifies a component that will be placed at the trailing edge of the tabs area.
 	 * <p>
-	 * For top and bottom tab placement, the laid out component size will be
+	 * For top and bottom tab placement, the layed out component size will be
 	 * the available horizontal space (minimum is preferred component width) and the tab area height.<br>
-	 * For left and right tab placement, the laid out component size will be
+	 * For left and right tab placement, the layed out component size will be
 	 * the tab area width and the available vertical space (minimum is preferred component height).
 	 * <p>
 	 * <strong>Component</strong> {@link javax.swing.JTabbedPane}<br>
@@ -863,98 +863,6 @@ public interface FlatClientProperties
 	 */
 	String TEXT_FIELD_TRAILING_ICON = "JTextField.trailingIcon";

-	/**
-	 * Specifies a component that will be placed at the leading edge of the text field.
-	 * <p>
-	 * The component will be positioned inside and aligned to the visible text field border.
-	 * There is no gap between the visible border and the component.
-	 * The laid out component size will be the preferred component width
-	 * and the inner text field height.
-	 * <p>
-	 * The component should be not opaque because the text field border is painted
-	 * slightly inside the usually visible border in some cases.
-	 * E.g. when focused (in some themes) or when an outline color is specified
-	 * (see {@link #OUTLINE}).
-	 * <p>
-	 * The component is prepared in the following way:
-	 * <ul>
-	 * <li>Component client property {@link #STYLE_CLASS} is set to {@code inTextField}.
-	 * <li>If component is a button or toggle button, client property {@link #BUTTON_TYPE}
-	 *     is set to {@link #BUTTON_TYPE_TOOLBAR_BUTTON}
-	 *     and button cursor is set to default cursor (if not set).
-	 * <li>If component is a toolbar, client property {@link #STYLE_CLASS}
-	 *     is set to {@code inTextField} on all toolbar children
-	 *     and toolbar cursor is set to default cursor (if not set).
-	 * </ul>
-	 * Because text fields use the text cursor by default and the cursor is inherited by child components,
-	 * it may be necessary to explicitly set component cursor if you e.g. need the default arrow cursor.
-	 * E.g. {@code comp.setCursor( Cursor.getDefaultCursor() )}.
-	 * <p>
-	 * Styling is used to modify insets/margins and appearance of buttons and toolbars
-	 * so that they fit nicely into the text field and do not increase text field height.
-	 * See styles {@code [style]Button.inTextField} and {@code [style]ToolBar.inTextField}
-	 * in {@code Flat[Light|Dark]Laf.properties}.
-	 * <p>
-	 * <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
-	 * <strong>Value type</strong> {@link javax.swing.JComponent}
-	 *
-	 * @since 2
-	 */
-	String TEXT_FIELD_LEADING_COMPONENT = "JTextField.leadingComponent";
-
-	/**
-	 * Specifies a component that will be placed at the trailing edge of the text field.
-	 * <p>
-	 * See {@link #TEXT_FIELD_LEADING_COMPONENT} for details.
-	 * <p>
-	 * <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
-	 * <strong>Value type</strong> {@link javax.swing.JComponent}
-	 *
-	 * @since 2
-	 */
-	String TEXT_FIELD_TRAILING_COMPONENT = "JTextField.trailingComponent";
-
-	/**
-	 * Specifies whether a "clear" (or "cancel") button is shown on the trailing side
-	 * if the text field is not empty, editable and enabled. Default is {@code false}.
-	 * <p>
-	 * <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
-	 * <strong>Value type</strong> {@link java.lang.Boolean}
-	 *
-	 * @since 2
-	 */
-	String TEXT_FIELD_SHOW_CLEAR_BUTTON = "JTextField.showClearButton";
-
-	/**
-	 * Specifies the callback that is invoked when a "clear" (or "cancel") button is clicked.
-	 * If a callback is specified than it is responsible for clearing the text field.
-	 * Without callback, the text field clears itself.
-	 * <p>
-	 * Either use a {@link java.lang.Runnable}:
-	 * <pre>{@code
-	 * myTextField.putClientProperty( "JTextField.clearCallback",
-	 *     (Runnable) () -> {
-	 *         // clear field here or cancel search
-	 *     } );
-	 * }</pre>
-	 * Or use a {@link java.util.function.Consumer}&lt;javax.swing.text.JTextComponent&gt;
-	 * that receives the text field as parameter:
-	 * <pre>{@code
-	 * myTextField.putClientProperty( "JTextField.clearCallback",
-	 *     (Consumer<JTextComponent>) textField -> {
-	 *         // clear field here or cancel search
-	 *     } );
-	 * }</pre>
-	 * <p>
-	 * <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
-	 * <strong>Value type</strong> {@link java.lang.Runnable}
-	 * or {@link java.util.function.Consumer}&lt;javax.swing.text.JTextComponent&gt;
-	 *
-	 * @see #TEXT_FIELD_SHOW_CLEAR_BUTTON
-	 * @since 2
-	 */
-	String TEXT_FIELD_CLEAR_CALLBACK = "JTextField.clearCallback";
-
 	//---- JToggleButton ------------------------------------------------------

 	/**
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatDefaultsAddon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatDefaultsAddon.java
@@ -26,7 +26,7 @@ import javax.swing.UIDefaults;
 * Allows loading of additional .properties files from addon JARs.
 * {@link java.util.ServiceLoader} is used to load extensions of this class from addon JARs.
 * <p>
- * If you extend this class in an addon JAR, you also have to add a text file named
+ * If you extend this class in a addon JAR, you also have to add a text file named
 * {@code META-INF/services/com.formdev.flatlaf.FlatDefaultsAddon}
 * to the addon JAR. The file must contain a single line with the class name.
 * <p>
@@ -61,7 +61,7 @@ public abstract class FlatDefaultsAddon

 	/**
 	 * Returns the priority used to sort addon loading.
-	 * The order is only important if you want to overwrite UI defaults of other addons.
+	 * The order is only important if you want overwrite UI defaults of other addons.
 	 * Lower numbers mean higher priority.
 	 * Returns 10000 by default.
 	 */
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatIconColors.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatIconColors.java
@@ -19,7 +19,7 @@ package com.formdev.flatlaf;
 /**
 * Default color palette for action icons and object icons.
 * <p>
- * The idea is to use only this well-defined set of colors in SVG icons, and
+ * The idea is to use only this well defined set of colors in SVG icons and
 * then they are replaced at runtime to dark variants or to other theme colors.
 * Then a single SVG icon (light variant) can be used for dark themes too.
 * IntelliJ Platform uses this mechanism to allow themes to change IntelliJ Platform icons.
@@ -35,7 +35,7 @@ package com.formdev.flatlaf;
 * <p>
 * You may use these colors also in your application (outside of SVG icons), but do
 * not use the RGB values defined in this enum.<br>
- * Instead, use {@code UIManager.getColor( FlatIconColors.ACTIONS_GREY.key )}.
+ * Instead use {@code UIManager.getColor( FlatIconColors.ACTIONS_GREY.key )}.
 *
 * @author Karl Tauber
 */
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatInputMaps.java
@@ -596,7 +596,7 @@ class FlatInputMaps
 	//---- class LazyInputMapEx -----------------------------------------------

 	/**
-	 * Lazily creates an input map.
+	 * Lazily creates a input map.
 	 * Similar to {@link UIDefaults.LazyInputMap}, but can use multiple bindings arrays.
 	 */
 	private static class LazyInputMapEx
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -52,7 +52,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.JMenuBar;
 import javax.swing.LookAndFeel;
 import javax.swing.PopupFactory;
 import javax.swing.RootPaneContainer;
@@ -103,7 +102,6 @@ public abstract class FlatLaf

 	private PopupFactory oldPopupFactory;
 	private MnemonicHandler mnemonicHandler;
-	private SubMenuUsabilityHelper subMenuUsabilityHelper;

 	private Consumer<UIDefaults> postInitialization;
 	private List<Function<Object, Object>> uiDefaultsGetters;
@@ -167,19 +165,18 @@ public abstract class FlatLaf
 	 * Returns whether FlatLaf supports custom window decorations.
 	 * This depends on the operating system and on the used Java runtime.
 	 * <p>
-	 * This method returns {@code true} on Windows 10/11 (see exception below)
-	 * and on Linux, {@code false} otherwise.
+	 * This method returns {@code true} on Windows 10 (see exception below), {@code false} otherwise.
 	 * <p>
-	 * Returns also {@code false} on Windows 10/11 if:
+	 * Returns also {@code false} on Windows 10 if:
 	 * <ul>
-	 * <li>FlatLaf native window border support is available (requires Windows 10/11)</li>
+	 * <li>FlatLaf native window border support is available (requires Windows 10)</li>
 	 * <li>running in
 	 * <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime 11 (or later)</a>
 	 * (<a href="https://github.com/JetBrains/JetBrainsRuntime">source code on github</a>)
 	 * and JBR supports custom window decorations
 	 * </li>
 	 * </ul>
-	 * In these cases, custom decorations are enabled by the root pane.
+	 * In this cases, custom decorations are enabled by the root pane.
 	 * Usage of {@link JFrame#setDefaultLookAndFeelDecorated(boolean)} or
 	 * {@link JDialog#setDefaultLookAndFeelDecorated(boolean)} is not necessary.
 	 */
@@ -192,7 +189,7 @@ public abstract class FlatLaf
 			FlatNativeWindowBorder.isSupported() )
 		  return false;

-		return SystemInfo.isWindows_10_orLater || SystemInfo.isLinux;
+		return SystemInfo.isWindows_10_orLater;
 	}

 	@Override
@@ -245,10 +242,6 @@ public abstract class FlatLaf
 		mnemonicHandler = new MnemonicHandler();
 		mnemonicHandler.install();

-		// install submenu usability helper
-		subMenuUsabilityHelper = new SubMenuUsabilityHelper();
-		subMenuUsabilityHelper.install();
-
 		// listen to desktop property changes to update UI if system font or scaling changes
 		if( SystemInfo.isWindows ) {
 			// Windows 10 allows increasing font size independent of scaling:
@@ -328,12 +321,6 @@ public abstract class FlatLaf
 			mnemonicHandler = null;
 		}

-		// uninstall submenu usability helper
-		if( subMenuUsabilityHelper != null ) {
-			subMenuUsabilityHelper.uninstall();
-			subMenuUsabilityHelper = null;
-		}
-
 		// restore default link color
 		new HTMLEditorKit().getStyleSheet().addRule( "a, address { color: blue; }" );
 		postInitialization = null;
@@ -617,7 +604,7 @@ public abstract class FlatLaf
 			uiFont = ((ActiveFont)defaultFont).derive( baseFont, fontSize -> {
 				return Math.round( fontSize * UIScale.computeFontScaleFactor( baseFont ) );
 			} );
-		}
+		};

 		// increase font size if system property "flatlaf.uiScale" is set
 		uiFont = UIScale.applyCustomScaleFactor( uiFont );
@@ -772,7 +759,7 @@ public abstract class FlatLaf
 	 * Invoke this method before setting the look and feel.
 	 * <p>
 	 * If using Java modules, the package must be opened in {@code module-info.java}.
-	 * Otherwise, use {@link #registerCustomDefaultsSource(URL)}.
+	 * Otherwise use {@link #registerCustomDefaultsSource(URL)}.
 	 *
 	 * @param packageName a package name (e.g. "com.myapp.resources")
 	 */
@@ -874,7 +861,7 @@ public abstract class FlatLaf
 	 * E.g. using {@link UIManager#setLookAndFeel(LookAndFeel)} or {@link #setup(LookAndFeel)}.
 	 * <p>
 	 * The global extra defaults are useful for smaller additional defaults that may change.
-	 * E.g. accent color. Otherwise, FlatLaf properties files should be used.
+	 * E.g. accent color. Otherwise FlatLaf properties files should be used.
 	 * See {@link #registerCustomDefaultsSource(String)}.
 	 * <p>
 	 * The keys and values are strings in same format as in FlatLaf properties files.
@@ -906,7 +893,7 @@ public abstract class FlatLaf
 	 * E.g. using {@link UIManager#setLookAndFeel(LookAndFeel)} or {@link #setup(LookAndFeel)}.
 	 * <p>
 	 * The extra defaults are useful for smaller additional defaults that may change.
-	 * E.g. accent color. Otherwise, FlatLaf properties files should be used.
+	 * E.g. accent color. Otherwise FlatLaf properties files should be used.
 	 * See {@link #registerCustomDefaultsSource(String)}.
 	 * <p>
 	 * The keys and values are strings in same format as in FlatLaf properties files.
@@ -963,7 +950,7 @@ public abstract class FlatLaf
 				// re-set current LaF
 				UIManager.setLookAndFeel( lookAndFeel );

-				// must fire property change events ourselves because old and new LaF are the same
+				// must fire property change events ourself because old and new LaF are the same
 				PropertyChangeEvent e = new PropertyChangeEvent( UIManager.class, "lookAndFeel", lookAndFeel, lookAndFeel );
 				for( PropertyChangeListener l : UIManager.getPropertyChangeListeners() )
 					l.propertyChange( e );
@@ -1007,7 +994,7 @@ public abstract class FlatLaf
 	/**
 	 * Returns whether native window decorations are supported on current platform.
 	 * <p>
-	 * This requires Windows 10/11, but may be disabled if running in special environments
+	 * This requires Windows 10, but may be disabled if running in special environments
 	 * (JetBrains Projector, Webswing or WinPE) or if loading native library fails.
 	 * If system property {@link FlatSystemProperties#USE_WINDOW_DECORATIONS} is set to
 	 * {@code false}, then this method also returns {@code false}.
@@ -1049,23 +1036,12 @@ public abstract class FlatLaf

 	/**
 	 * Revalidate and repaint all displayable frames and dialogs.
-	 * <p>
-	 * Useful to update UI after changing {@code TitlePane.menuBarEmbedded}.
 	 *
 	 * @since 1.1.2
 	 */
 	public static void revalidateAndRepaintAllFramesAndDialogs() {
 		for( Window w : Window.getWindows() ) {
 			if( isDisplayableFrameOrDialog( w ) ) {
-				// revalidate menu bar
-				JMenuBar menuBar = (w instanceof JFrame)
-					? ((JFrame)w).getJMenuBar()
-					: (w instanceof JDialog
-						? ((JDialog)w).getJMenuBar()
-						: null);
-				if( menuBar != null )
-					menuBar.revalidate();
-
 				w.revalidate();
 				w.repaint();
 			}
@@ -1074,9 +1050,6 @@ public abstract class FlatLaf

 	/**
 	 * Repaint all displayable frames and dialogs.
-	 * <p>
-	 * Useful to update UI after changing {@code TitlePane.unifiedBackground},
-	 * {@code MenuItem.selectionType} or {@code Component.hideMnemonics}.
 	 *
 	 * @since 1.1.2
 	 */
@@ -1235,9 +1208,6 @@ public abstract class FlatLaf
 		}

 		private Object getValue( Object key ) {
-			// use local variable for getters to avoid potential multi-threading issues
-			List<Function<Object, Object>> uiDefaultsGetters = FlatLaf.this.uiDefaultsGetters;
-
 			if( uiDefaultsGetters == null )
 				return null;

@@ -1291,9 +1261,8 @@ public abstract class FlatLaf
 			this.scaleSize = scaleSize;
 		}

-		// using synchronized to avoid exception if invoked at the same time on multiple threads
 		@Override
-		public synchronized Object createValue( UIDefaults table ) {
+		public Object createValue( UIDefaults table ) {
 			if( inCreateValue )
 				throw new IllegalStateException( "FlatLaf: endless recursion in font" );

@@ -1355,19 +1324,9 @@ public abstract class FlatLaf
 			}

 			// derive font
-			if( newStyle != baseStyle || newSize != baseSize ) {
-				// hack for font "Ubuntu Medium" on Linux, which curiously belongs
-				// to family "Ubuntu Light" and using deriveFont() would create a light font
-				if( "Ubuntu Medium".equalsIgnoreCase( baseFont.getName() ) &&
-					"Ubuntu Light".equalsIgnoreCase( baseFont.getFamily() ) )
-				{
-					Font font = createCompositeFont( "Ubuntu Medium", newStyle, newSize );
-					if( !isFallbackFont( font ) )
-						return toUIResource( font );
-				}
-
+			if( newStyle != baseStyle || newSize != baseSize )
 				return toUIResource( baseFont.deriveFont( newStyle, newSize ) );
-			} else
+			else
 				return toUIResource( baseFont );
 		}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
@@ -34,7 +34,7 @@ public interface FlatSystemProperties
 	 * To replace the Java 9+ system scale factor, use system property "sun.java2d.uiScale",
 	 * which has the same syntax as this one.
 	 * <p>
-	 * Since FlatLaf 1.1.2: Scale factors less than 100% are allowed.
+	 * Since FlatLaf 1.1.2: Scale factors less then 100% are allowed.
 	 * <p>
 	 * <strong>Allowed Values</strong> e.g. {@code 1.5}, {@code 1.5x}, {@code 150%} or {@code 144dpi} (96dpi is 100%)<br>
 	 */
@@ -81,7 +81,7 @@ public interface FlatSystemProperties
 	 * {@link FlatClientProperties#USE_WINDOW_DECORATIONS} and
 	 * UI default {@code TitlePane.useWindowDecorations}.
 	 * <p>
-	 * (requires Window 10/11)
+	 * (requires Window 10)
 	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
 	 * <strong>Default</strong> none
@@ -92,16 +92,16 @@ public interface FlatSystemProperties
 	 * Specifies whether JetBrains Runtime custom window decorations should be used
 	 * when creating {@code JFrame} or {@code JDialog}.
 	 * Requires that the application runs in a
-	 * <a href="https://github.com/JetBrains/JetBrainsRuntime/wiki">JetBrains Runtime</a>
+	 * <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime</a>
 	 * (based on OpenJDK).
 	 * <p>
 	 * Setting this to {@code false} disables using JetBrains Runtime custom window decorations.
 	 * Then FlatLaf native window decorations are used.
 	 * <p>
-	 * (requires Window 10/11)
+	 * (requires Window 10)
 	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
-	 * <strong>Default</strong> {@code false} (since v2; was {@code true} in v1)
+	 * <strong>Default</strong> {@code true}
 	 */
 	String USE_JETBRAINS_CUSTOM_DECORATIONS = "flatlaf.useJetBrainsCustomDecorations";

@@ -116,7 +116,7 @@ public interface FlatSystemProperties
 	 * {@link FlatClientProperties#MENU_BAR_EMBEDDED} and
 	 * UI default {@code TitlePane.menuBarEmbedded}.
 	 * <p>
-	 * (requires Window 10/11)
+	 * (requires Window 10)
 	 * <p>
 	 * <strong>Allowed Values</strong> {@code false} and {@code true}<br>
 	 * <strong>Default</strong> none
@@ -139,15 +139,6 @@ public interface FlatSystemProperties
 	 */
 	String USE_TEXT_Y_CORRECTION = "flatlaf.useTextYCorrection";

-	/**
-	 * Specifies a directory in which the native FlatLaf library have been extracted.
-	 * The path can be absolute or relative to current application working directory.
-	 * This can be used to avoid extraction of the native libraries to the temporary directory at runtime.
-	 *
-	 * @since 2
-	 */
-	String NATIVE_LIBRARY_PATH = "flatlaf.nativeLibraryPath";
-
 	/**
 	 * Checks whether a system property is set and returns {@code true} if its value
 	 * is {@code "true"} (case-insensitive), otherwise it returns {@code false}.
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
@@ -175,7 +175,7 @@ public class IntelliJTheme
 		defaults.put( "Button.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );
 		defaults.put( "HelpButton.hoverBorderColor", defaults.get( "Button.focusedBorderColor" ) );

-		// IDEA uses an SVG icon for the help button, but paints the background with Button.startBackground and Button.endBackground
+		// IDEA uses a SVG icon for the help button, but paints the background with Button.startBackground and Button.endBackground
 		Object helpButtonBackground = defaults.get( "Button.startBackground" );
 		Object helpButtonBorderColor = defaults.get( "Button.startBorderColor" );
 		if( helpButtonBackground == null )
@@ -242,19 +242,7 @@ public class IntelliJTheme
 			defaults.put( "Tree.rowHeight", 22 );

 		// apply theme specific UI defaults at the end to allow overwriting
-		for( Map.Entry<Object, Object> e : themeSpecificDefaults.entrySet() ) {
-			Object key = e.getKey();
-			Object value = e.getValue();
-
-			// append styles to existing styles
-			if( key instanceof String && ((String)key).startsWith( "[style]" ) ) {
-				Object oldValue = defaults.get( key );
-				if( oldValue != null )
-					value = oldValue + "; " + value;
-			}
-
-			defaults.put( key, value );
-		}
+		defaults.putAll( themeSpecificDefaults );
 	}

 	private Map<Object, Object> removeThemeSpecificDefaults( UIDefaults defaults ) {
@@ -546,12 +534,12 @@ public class IntelliJTheme
 	}

 	/** Rename UI default keys (key --> value). */
-	private static final Map<String, String> uiKeyMapping = new HashMap<>();
+	private static Map<String, String> uiKeyMapping = new HashMap<>();
 	/** Copy UI default keys (value --> key). */
-	private static final Map<String, String> uiKeyCopying = new HashMap<>();
-	private static final Map<String, String> uiKeyInverseMapping = new HashMap<>();
-	private static final Map<String, String> checkboxKeyMapping = new HashMap<>();
-	private static final Map<String, String> checkboxDuplicateColors = new HashMap<>();
+	private static Map<String, String> uiKeyCopying = new HashMap<>();
+	private static Map<String, String> uiKeyInverseMapping = new HashMap<>();
+	private static Map<String, String> checkboxKeyMapping = new HashMap<>();
+	private static Map<String, String> checkboxDuplicateColors = new HashMap<>();

 	static {
 		// ComboBox
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/LinuxFontPolicy.java
@@ -17,7 +17,6 @@
 package com.formdev.flatlaf;

 import java.awt.Font;
-import java.awt.FontMetrics;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
@@ -29,7 +28,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
-import javax.swing.text.StyleContext;
+
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.StringUtils;
 import com.formdev.flatlaf.util.SystemInfo;
@@ -122,25 +121,14 @@ class LinuxFontPolicy
 		for(;;) {
 			Font font = createFont( family, style, size, dsize );

-			if( Font.DIALOG.equals( family ) )
-				return font;
-
 			// if the font family does not match any font on the system, "Dialog" family is returned
-			if( !Font.DIALOG.equals( font.getFamily() ) ) {
-				// check for font problems
-				// - font height much larger than expected (e.g. font Inter; Oracle Java 8)
-				// - character width is zero (e.g. font Cantarell; Fedora; Oracle Java 8)
-				FontMetrics fm = StyleContext.getDefaultStyleContext().getFontMetrics( font );
-				if( fm.getHeight() > size * 2 || fm.stringWidth( "a" ) == 0 )
-					return createFont( Font.DIALOG, style, size, dsize );
-
+			if( !"Dialog".equals( font.getFamily() ) || "Dialog".equals( family ) )
 				return font;
-			}

 			// find last word in family
 			int index = family.lastIndexOf( ' ' );
 			if( index < 0 )
-				return createFont( Font.DIALOG, style, size, dsize );
+				return createFont( "Dialog", style, size, dsize );

 			// check whether last work contains some font weight (e.g. Ultra-Bold or Heavy)
 			String lastWord = family.substring( index + 1 ).toLowerCase();
@@ -170,7 +158,7 @@ class LinuxFontPolicy

 		Object value = Toolkit.getDefaultToolkit().getDesktopProperty( "gnome.Xft/DPI" );
 		if( value instanceof Integer ) {
-			int dpi = (Integer) value / 1024;
+			int dpi = ((Integer)value).intValue() / 1024;
 			if( dpi == -1 )
 				dpi = 96;
 			if( dpi < 50 )
@@ -197,7 +185,7 @@ class LinuxFontPolicy
 	}

 	/**
-	 * Gets the default font for KDE from KDE configuration files.
+	 * Gets the default font for KDE for KDE configuration files.
 	 *
 	 * The Swing fonts are not updated when the user changes system font size
 	 * (System Settings > Fonts > Force Font DPI). A application restart is necessary.
@@ -278,7 +266,7 @@ class LinuxFontPolicy
 		// read config file
 		ArrayList<String> lines = new ArrayList<>( 200 );
 		try( BufferedReader reader = new BufferedReader( new FileReader( file ) ) ) {
-			String line;
+			String line = null;
 			while( (line = reader.readLine()) != null )
 				lines.add( line );
 		} catch( IOException ex ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/SubMenuUsabilityHelper.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/SubMenuUsabilityHelper.java
@@ -1,322 +0,0 @@
-/*
- * Copyright 2022 FormDev Software GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.formdev.flatlaf;
-
-import java.awt.AWTEvent;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.MouseInfo;
-import java.awt.Point;
-import java.awt.PointerInfo;
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.event.MouseEvent;
-import javax.swing.JComponent;
-import javax.swing.JLayeredPane;
-import javax.swing.JMenu;
-import javax.swing.JPopupMenu;
-import javax.swing.MenuElement;
-import javax.swing.MenuSelectionManager;
-import javax.swing.RootPaneContainer;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import com.formdev.flatlaf.ui.FlatUIUtils;
-
-/**
- * Improves usability of submenus by using a
- * <a href="https://height.app/blog/guide-to-build-context-menus#safe-triangle">safe triangle</a>
- * to avoid that the submenu closes while the user moves the mouse to it.
- *
- * @author Karl Tauber
- */
-class SubMenuUsabilityHelper
-	implements ChangeListener
-{
-	private static final String KEY_USE_SAFE_TRIANGLE = "Menu.useSafeTriangle";
-	private static final String KEY_SHOW_SAFE_TRIANGLE = "FlatLaf.debug.menu.showSafeTriangle";
-
-	private SubMenuEventQueue subMenuEventQueue;
-	private SafeTrianglePainter safeTrianglePainter;
-	private boolean changePending;
-
-	// mouse location in screen coordinates
-	private int mouseX;
-	private int mouseY;
-
-	// target popup bounds in screen coordinates
-	private int targetX;
-	private int targetTopY;
-	private int targetBottomY;
-
-	private Rectangle invokerBounds;
-
-	void install() {
-		MenuSelectionManager.defaultManager().addChangeListener( this );
-	}
-
-	void uninstall() {
-		MenuSelectionManager.defaultManager().removeChangeListener( this );
-		uninstallEventQueue();
-	}
-
-	@Override
-	public void stateChanged( ChangeEvent e ) {
-		if( !FlatUIUtils.getUIBoolean( KEY_USE_SAFE_TRIANGLE, true ))
-			return;
-
-		// handle menu selection change later, but only once in case of temporary changes
-		// e.g. moving mouse from one menu item to another one, fires two events:
-		//    1. old menu item is removed from menu selection
-		//    2. new menu item is added to menu selection
-		synchronized( this ) {
-			if( changePending )
-				return;
-			changePending = true;
-		}
-
-		EventQueue.invokeLater( () -> {
-			synchronized( this ) {
-				changePending = false;
-			}
-			menuSelectionChanged();
-		} );
-	}
-
-	private void menuSelectionChanged() {
-		MenuElement[] path = MenuSelectionManager.defaultManager().getSelectedPath();
-
-/*debug
-		System.out.println( "--- " + path.length );
-		for( int i = 0; i < path.length; i++ )
-			System.out.println( "   " + i + ": " + path[i].getClass().getName() );
-debug*/
-
-		// find submenu in menu selection
-		int subMenuIndex = findSubMenu( path );
-
-		// uninstall if there is no submenu in selection
-		if( subMenuIndex < 0 || subMenuIndex != path.length - 1 ) {
-			uninstallEventQueue();
-			return;
-		}
-
-		// get current mouse location
-		PointerInfo pointerInfo = MouseInfo.getPointerInfo();
-		Point mouseLocation = (pointerInfo != null) ? pointerInfo.getLocation() : new Point();
-		mouseX = mouseLocation.x;
-		mouseY = mouseLocation.y;
-
-		// check whether popup is showing, which is e.g. not the case if it is empty
-		JPopupMenu popup = (JPopupMenu) path[subMenuIndex];
-		if( !popup.isShowing() ) {
-			uninstallEventQueue();
-			return;
-		}
-
-		// get invoker screen bounds
-		Component invoker = popup.getInvoker();
-		invokerBounds = (invoker != null)
-			? new Rectangle( invoker.getLocationOnScreen(), invoker.getSize() )
-			: null;
-
-		// check whether mouse location is within invoker
-		if( invokerBounds != null && !invokerBounds.contains( mouseX, mouseY ) ) {
-			uninstallEventQueue();
-			return;
-		}
-
-		// compute top/bottom target locations
-		Point popupLocation = popup.getLocationOnScreen();
-		Dimension popupSize = popup.getSize();
-		targetX = (mouseX < popupLocation.x + (popupSize.width / 2))
-			? popupLocation.x
-			: popupLocation.x + popupSize.width;
-		targetTopY = popupLocation.y;
-		targetBottomY = popupLocation.y + popupSize.height;
-
-		// install own event queue to supress mouse events when mouse is moved within safe triangle
-		if( subMenuEventQueue == null )
-			subMenuEventQueue = new SubMenuEventQueue();
-
-		// create safe triangle painter
-		if( safeTrianglePainter == null && UIManager.getBoolean( KEY_SHOW_SAFE_TRIANGLE ) )
-			safeTrianglePainter = new SafeTrianglePainter( popup );
-	}
-
-	private void uninstallEventQueue() {
-		if( subMenuEventQueue != null ) {
-			subMenuEventQueue.uninstall();
-			subMenuEventQueue = null;
-		}
-
-		if( safeTrianglePainter != null ) {
-			safeTrianglePainter.uninstall();
-			safeTrianglePainter = null;
-		}
-	}
-
-	private int findSubMenu( MenuElement[] path ) {
-		for( int i = path.length - 1; i >= 1; i-- ) {
-			if( path[i] instanceof JPopupMenu &&
-				path[i - 1] instanceof JMenu &&
-				!((JMenu)path[i - 1]).isTopLevelMenu() )
-			  return i;
-		}
-		return -1;
-	}
-
-	private Polygon createSafeTriangle() {
-		return new Polygon(
-			new int[] { mouseX, targetX, targetX },
-			new int[] { mouseY, targetTopY, targetBottomY },
-			3 );
-	}
-
-	//---- class SubMenuEventQueue --------------------------------------------
-
-	private class SubMenuEventQueue
-		extends EventQueue
-	{
-		private Timer mouseUpdateTimer;
-		private Timer timeoutTimer;
-
-		private int newMouseX;
-		private int newMouseY;
-		private AWTEvent lastMouseEvent;
-
-		SubMenuEventQueue() {
-			// timer used to slightly delay update of mouse location used for safe triangle
-			mouseUpdateTimer = new Timer( 50, e -> {
-				mouseX = newMouseX;
-				mouseY = newMouseY;
-
-				if( safeTrianglePainter != null )
-					safeTrianglePainter.repaint();
-			} );
-			mouseUpdateTimer.setRepeats( false );
-
-			// timer used to timeout safe triangle when mouse stops moving
-			timeoutTimer = new Timer( 200, e -> {
-				if( invokerBounds != null && !invokerBounds.contains( newMouseX, newMouseY ) ) {
-					// post last mouse event, which selects menu item at mouse location
-					if( lastMouseEvent != null ) {
-						postEvent( lastMouseEvent );
-						lastMouseEvent = null;
-					}
-
-					uninstallEventQueue();
-					return;
-				}
-			} );
-			timeoutTimer.setRepeats( false );
-
-			Toolkit.getDefaultToolkit().getSystemEventQueue().push( this );
-		}
-
-		void uninstall() {
-			mouseUpdateTimer.stop();
-			mouseUpdateTimer = null;
-
-			timeoutTimer.stop();
-			timeoutTimer = null;
-
-			lastMouseEvent = null;
-
-			super.pop();
-		}
-
-		@Override
-		protected void dispatchEvent( AWTEvent e ) {
-			int id = e.getID();
-
-			if( e instanceof MouseEvent &&
-				(id == MouseEvent.MOUSE_MOVED || id == MouseEvent.MOUSE_DRAGGED) )
-			{
-				newMouseX = ((MouseEvent)e).getXOnScreen();
-				newMouseY = ((MouseEvent)e).getYOnScreen();
-
-				if( safeTrianglePainter != null )
-					safeTrianglePainter.repaint();
-
-				mouseUpdateTimer.stop();
-				timeoutTimer.stop();
-
-				// check whether mouse moved within safe triangle
-				if( createSafeTriangle().contains( newMouseX, newMouseY ) ) {
-					// update mouse location delayed (this changes the safe triangle)
-					mouseUpdateTimer.start();
-
-					timeoutTimer.start();
-
-					// remember last mouse event, which will be posted if the mouse stops moving
-					lastMouseEvent = e;
-
-					// ignore mouse event
-					return;
-				}
-
-				// update mouse location immediately (this changes the safe triangle)
-				mouseX = newMouseX;
-				mouseY = newMouseY;
-			}
-
-			super.dispatchEvent( e );
-		}
-	}
-
-	//---- class SafeTrianglePainter ------------------------------------------
-
-	private class SafeTrianglePainter
-		extends JComponent
-	{
-		SafeTrianglePainter( JPopupMenu popup ) {
-			Window window = SwingUtilities.windowForComponent( popup.getInvoker() );
-			if( window instanceof RootPaneContainer ) {
-				JLayeredPane layeredPane = ((RootPaneContainer)window).getLayeredPane();
-				setSize( layeredPane.getSize() );
-				layeredPane.add( this, new Integer( JLayeredPane.POPUP_LAYER + 1 ) );
-			}
-		}
-
-		void uninstall() {
-			Container parent = getParent();
-			if( parent != null ) {
-				parent.remove( this );
-				parent.repaint();
-			}
-		}
-
-		@Override
-		protected void paintComponent( Graphics g ) {
-			Point locationOnScreen = getLocationOnScreen();
-			g.translate( -locationOnScreen.x, -locationOnScreen.y );
-
-			g.setColor( Color.red );
-			((Graphics2D)g).draw( createSafeTriangle() );
-		}
-	}
-}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
@@ -80,7 +80,7 @@ class UIDefaultsLoader
 	private static final String OPTIONAL_PREFIX = "?";
 	private static final String WILDCARD_PREFIX = "*.";

-	static final String KEY_VARIABLES = "FlatLaf.internal.variables";
+	private static final String KEY_VARIABLES = "FlatLaf.internal.variables";

 	private static int parseColorDepth;

@@ -350,7 +350,7 @@ class UIDefaultsLoader
 	enum ValueType { UNKNOWN, STRING, BOOLEAN, CHARACTER, INTEGER, INTEGERORFLOAT, FLOAT, BORDER, ICON, INSETS, DIMENSION, COLOR, FONT,
 		SCALEDINTEGER, SCALEDFLOAT, SCALEDINSETS, SCALEDDIMENSION, INSTANCE, CLASS, GRAYFILTER, NULL, LAZY }

-	private static final ValueType[] tempResultValueType = new ValueType[1];
+	private static ValueType[] tempResultValueType = new ValueType[1];
 	private static Map<Class<?>, ValueType> javaValueTypes;
 	private static Map<String, ValueType> knownValueTypes;

@@ -364,12 +364,6 @@ class UIDefaultsLoader
 		if( resultValueType == null )
 			resultValueType = tempResultValueType;

-		// do not parse styles here
-		if( key.startsWith( "[style]" ) ) {
-			resultValueType[0] = ValueType.STRING;
-			return value;
-		}
-
 		value = value.trim();

 		// null
@@ -588,18 +582,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[,lineThickness[,arc]]]
+			// top,left,bottom,right[,lineColor[,lineThickness]]
 			List<String> parts = splitFunctionParams( value, ',' );
 			Insets insets = parseInsets( value );
 			ColorUIResource lineColor = (parts.size() >= 5)
 				? (ColorUIResource) parseColorOrFunction( resolver.apply( parts.get( 4 ) ), resolver, true )
 				: null;
-			float lineThickness = (parts.size() >= 6 && !parts.get( 5 ).isEmpty()) ? parseFloat( parts.get( 5 ), true ) : 1f;
-			int arc = (parts.size() >= 7) ? parseInteger( parts.get( 6 ), true ) : 0;
+			float lineThickness = (parts.size() >= 6) ? parseFloat( parts.get( 5 ), true ) : 1f;

 			return (LazyValue) t -> {
 				return (lineColor != null)
-					? new FlatLineBorder( insets, lineColor, lineThickness, arc )
+					? new FlatLineBorder( insets, lineColor, lineThickness )
 					: new FlatEmptyBorder( insets );
 			};
 		} else
@@ -792,7 +785,7 @@ class UIDefaultsLoader
 	 * Syntax: if(condition,trueValue,falseValue)
 	 * <p>
 	 * This "if" function is only used if the "if" is passed as parameter to another
-	 * color function. Otherwise, the general "if" function is used.
+	 * color function. Otherwise the general "if" function is used.
 	 */
 	private static Object parseColorIf( String value, List<String> params, Function<String, String> resolver, boolean reportError ) {
 		if( params.size() != 3 )
@@ -902,32 +895,21 @@ class UIDefaultsLoader
 	 * Syntax: fade(color,amount[,options])
 	 *   - color: a color (e.g. #f00) or a color function
 	 *   - amount: percentage 0-100%
-	 *   - options: [derived] [lazy]
+	 *   - options: [derived]
 	 */
 	private static Object parseColorFade( List<String> params, Function<String, String> resolver, boolean reportError ) {
 		String colorStr = params.get( 0 );
 		int amount = parsePercentage( params.get( 1 ) );
 		boolean derived = false;
-		boolean lazy = false;

 		if( params.size() > 2 ) {
 			String options = params.get( 2 );
 			derived = options.contains( "derived" );
-			lazy = options.contains( "lazy" );
 		}

 		// create function
 		ColorFunction function = new ColorFunctions.Fade( amount );

-		if( lazy ) {
-			return (LazyValue) t -> {
-				Object color = lazyUIManagerGet( colorStr );
-				return (color instanceof Color)
-					? new ColorUIResource( ColorFunctions.applyFunctions( (Color) color, function ) )
-					: null;
-			};
-		}
-
 		// parse base color, apply function and create derived color
 		return parseFunctionBaseColor( colorStr, function, derived, resolver, reportError );
 	}
@@ -1209,7 +1191,7 @@ class UIDefaultsLoader
 		}

 		Integer integer = parseInteger( value, true );
-		if( integer < min || integer > max )
+		if( integer.intValue() < min || integer.intValue() > max )
 			throw new NumberFormatException( "integer '" + value + "' out of range (" + min + '-' + max + ')' );
 		return integer;
 	}
@@ -1250,28 +1232,28 @@ class UIDefaultsLoader

 	private static ActiveValue parseScaledInteger( String value ) {
 		int val = parseInteger( value, true );
-		return t -> {
+		return (ActiveValue) t -> {
 			return UIScale.scale( val );
 		};
 	}

 	private static ActiveValue parseScaledFloat( String value ) {
 		float val = parseFloat( value, true );
-		return t -> {
+		return (ActiveValue) t -> {
 			return UIScale.scale( val );
 		};
 	}

 	private static ActiveValue parseScaledInsets( String value ) {
 		Insets insets = parseInsets( value );
-		return t -> {
+		return (ActiveValue) t -> {
 			return UIScale.scale( insets );
 		};
 	}

 	private static ActiveValue parseScaledDimension( String value ) {
 		Dimension dimension = parseDimension( value );
-		return t -> {
+		return (ActiveValue) t -> {
 			return UIScale.scale( dimension );
 		};
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatAbstractIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatAbstractIcon.java
@@ -69,7 +69,13 @@ public abstract class FlatAbstractIcon
 		}
 	}

-	protected abstract void paintIcon( Component c, Graphics2D g2 );
+	/**
+	 * Paint the icon at {@code [0,0]} location.
+	 * <p>
+	 * The given graphics context is scaled.
+	 * Use unscaled coordinates, width and height for painting.
+	 */
+	protected abstract void paintIcon( Component c, Graphics2D g );

 	@Override
 	public int getIconWidth() {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatAnimatedIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatAnimatedIcon.java
@@ -21,16 +21,17 @@ import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import com.formdev.flatlaf.util.AnimatedIcon;
+import com.formdev.flatlaf.util.AnimatedPainter;

 /**
- * Base class for animated icons that scale width and height, creates and initializes
+ * Base class for animated icons that scales width and height, creates and initializes
 * a scaled graphics context for icon painting.
 * <p>
 * Subclasses do not need to scale icon painting.
 * <p>
 * This class does not store any state information (needed for animation) in its instance.
- * Instead, a client property is set on the painted component.
- * This makes it possible to use a share icon instance for multiple components.
+ * Instead a client property is set on the painted component.
+ * This makes it possible to use a shared icon instance for multiple components.
 *
 * @author Karl Tauber
 */
@@ -45,11 +46,34 @@ public abstract class FlatAnimatedIcon
 	@Override
 	public void paintIcon( Component c, Graphics g, int x, int y ) {
 		super.paintIcon( c, g, x, y );
-		AnimatedIcon.AnimationSupport.saveIconLocation( this, c, x, y );
+		AnimatedPainter.saveRepaintLocation( this, c, x, y );
 	}

 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
-		AnimatedIcon.AnimationSupport.paintIcon( this, c, g, 0, 0 );
+		paintWithAnimation( c, g, 0, 0, getIconWidth(), getIconHeight() );
 	}
+
+	/**
+	 * Delegates painting to {@link #paintIconAnimated(Component, Graphics2D, float[])}.
+	 * Ignores the given bounds because {@code [x,y]} are always {@code [0,0]} and
+	 * {@code [width,height]} are scaled, but painting code should use unscaled width
+	 * and height because given graphics context is scaled.
+	 *
+	 * @since 2
+	 */
+	@Override
+	public void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float[] animatedValues ) {
+		paintIconAnimated( c, g, animatedValues );
+	}
+
+	/**
+	 * Paint the icon at {@code 0,0} location.
+	 * <p>
+	 * The given graphics context is scaled.
+	 * Use unscaled coordinates, width and height for painting.
+	 *
+	 * @since 2
+	 */
+	protected abstract void paintIconAnimated( Component c, Graphics2D g, float[] animatedValues );
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatAscendingSortIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatAscendingSortIcon.java
@@ -51,7 +51,7 @@ public class FlatAscendingSortIcon
 		boolean chevron = this.chevron;
 		Color sortIconColor = this.sortIconColor;

-		// Because this icon is always shared for all table headers,
+		// Because this icons are always shared for all table headers,
 		// get icon specific style from FlatTableHeaderUI.
 		JTableHeader tableHeader = (JTableHeader) SwingUtilities.getAncestorOfClass( JTableHeader.class, c );
 		if( tableHeader != null ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatClearIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatClearIcon.java
@@ -47,16 +47,8 @@ public class FlatClearIcon
 	@Styleable protected Color clearIconHoverColor = UIManager.getColor( "SearchField.clearIconHoverColor" );
 	@Styleable protected Color clearIconPressedColor = UIManager.getColor( "SearchField.clearIconPressedColor" );

-	private final boolean ignoreButtonState;
-
 	public FlatClearIcon() {
-		this( false );
-	}
-
-	/** @since 2 */
-	public FlatClearIcon( boolean ignoreButtonState ) {
 		super( 16, 16, null );
-		this.ignoreButtonState = ignoreButtonState;
 	}

 	/** @since 2 */
@@ -71,7 +63,7 @@ public class FlatClearIcon

 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
-		if( !ignoreButtonState && c instanceof AbstractButton ) {
+		if( c instanceof AbstractButton ) {
 			ButtonModel model = ((AbstractButton)c).getModel();
 			if( model.isPressed() || model.isRollover() ) {
 				/*
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java
@@ -96,8 +96,8 @@ public class FlatHelpButtonIcon
 			</svg>
 		*/

-		boolean enabled = c == null || c.isEnabled();
-		boolean focused = c != null && FlatUIUtils.isPermanentFocusOwner( c );
+		boolean enabled = c.isEnabled();
+		boolean focused = FlatUIUtils.isPermanentFocusOwner( c );

 		float xy = 0.5f;
 		float wh = iconSize() - 1;
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuArrowIcon.java
@@ -63,7 +63,7 @@ public class FlatMenuArrowIcon

 	@Override
 	protected void paintIcon( Component c, Graphics2D g ) {
-		if( c != null && !c.getComponentOrientation().isLeftToRight() )
+		if( !c.getComponentOrientation().isLeftToRight() )
 			g.rotate( Math.toRadians( 180 ), width / 2., height / 2. );

 		g.setColor( getArrowColor( c ) );
@@ -82,7 +82,7 @@ public class FlatMenuArrowIcon
 		if( c instanceof JMenu && ((JMenu)c).isSelected() && !isUnderlineSelection() )
 			return selectionForeground;

-		return c == null || c.isEnabled() ? arrowColor : disabledArrowColor;
+		return c.isEnabled() ? arrowColor : disabledArrowColor;
 	}

 	protected boolean isUnderlineSelection() {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuItemArrowIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatMenuItemArrowIcon.java
@@ -21,16 +21,14 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;

 /**
- * "arrow" icon for {@link javax.swing.JMenuItem}, {@link javax.swing.JCheckBoxMenuItem}
- * and {@link javax.swing.JRadioButtonMenuItem}.
+ * "arrow" icon for {@link javax.swing.JMenuItem}.
 *
 * @author Karl Tauber
 */
 public class FlatMenuItemArrowIcon
-	extends FlatAbstractIcon
+	extends FlatMenuArrowIcon
 {
 	public FlatMenuItemArrowIcon() {
-		super( 6, 10, null );
 	}

 	@Override
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatRevealIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatRevealIcon.java
@@ -1,56 +0,0 @@
-/*
- * Copyright 2021 FormDev Software GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.formdev.flatlaf.icons;
-
-import java.awt.Component;
-import java.awt.Graphics2D;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
-import javax.swing.UIManager;
-
-/**
- * "eye" icon for {@link javax.swing.JPasswordField}.
- *
- * @uiDefault PasswordField.revealIconColor				Color
- *
- * @author Karl Tauber
- * @since 2
- */
-public class FlatRevealIcon
-	extends FlatAbstractIcon
-{
-	public FlatRevealIcon() {
-		super( 16, 16, UIManager.getColor( "PasswordField.revealIconColor" ) );
-	}
-
-	@Override
-	protected void paintIcon( Component c, Graphics2D g ) {
-		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
-		path.append( new Ellipse2D.Float( 5.15f, 6.15f, 5.7f, 5.7f ), false );
-		path.append( new Ellipse2D.Float( 6, 7, 4, 4 ), false );
-		g.fill( path );
-
-		Path2D path2 = new Path2D.Float( Path2D.WIND_EVEN_ODD );
-		path2.append( new Ellipse2D.Float( 2.15f, 4.15f, 11.7f, 11.7f ), false );
-		path2.append( new Ellipse2D.Float( 3, 5, 10, 10 ), false );
-		Area area = new Area( path2 );
-		area.subtract( new Area( new Rectangle2D.Float( 0, 9.5f, 16, 16 ) ) );
-		g.fill( area );
-	}
-}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchIcon.java
@@ -45,16 +45,8 @@ public class FlatSearchIcon
 	@Styleable protected Color searchIconHoverColor = UIManager.getColor( "SearchField.searchIconHoverColor" );
 	@Styleable protected Color searchIconPressedColor = UIManager.getColor( "SearchField.searchIconPressedColor" );

-	private final boolean ignoreButtonState;
-
 	public FlatSearchIcon() {
-		this( false );
-	}
-
-	/** @since 2 */
-	public FlatSearchIcon( boolean ignoreButtonState ) {
 		super( 16, 16, null );
-		this.ignoreButtonState = ignoreButtonState;
 	}

 	/** @since 2 */
@@ -78,10 +70,8 @@ public class FlatSearchIcon
 			</svg>
 		*/

-		g.setColor( ignoreButtonState
-			? searchIconColor
-			: FlatButtonUI.buttonStateColor( c, searchIconColor, searchIconColor,
-				null, searchIconHoverColor, searchIconPressedColor ) );
+		g.setColor( FlatButtonUI.buttonStateColor( c, searchIconColor, searchIconColor,
+			null, searchIconHoverColor, searchIconPressedColor ) );

 		// paint magnifier
 		Area area = new Area( new Ellipse2D.Float( 2, 2, 10, 10 ) );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchWithHistoryIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatSearchWithHistoryIcon.java
@@ -30,12 +30,6 @@ public class FlatSearchWithHistoryIcon
 	extends FlatSearchIcon
 {
 	public FlatSearchWithHistoryIcon() {
-		this( false );
-	}
-
-	/** @since 2 */
-	public FlatSearchWithHistoryIcon( boolean ignoreButtonState ) {
-		super( ignoreButtonState );
 	}

 	@Override
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeCollapsedIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeCollapsedIcon.java
@@ -76,7 +76,7 @@ public class FlatTreeCollapsedIcon
 	}

 	/**
-	 * Because this icon is always shared for all trees,
+	 * Because this icons are always shared for all trees,
 	 * get icon specific style from FlatTreeUI.
 	 */
 	static <T> T getStyleFromTreeUI( Component c, Function<FlatTreeUI, T> f ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowAbstractIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowAbstractIcon.java
@@ -20,7 +20,6 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.RenderingHints;
 import javax.swing.UIManager;
 import com.formdev.flatlaf.ui.FlatButtonUI;
 import com.formdev.flatlaf.ui.FlatUIUtils;
@@ -66,14 +65,8 @@ public abstract class FlatWindowAbstractIcon
 	protected void paintBackground( Component c, Graphics2D g ) {
 		Color background = FlatButtonUI.buttonStateColor( c, null, null, null, hoverBackground, pressedBackground );
 		if( background != null ) {
-			// disable antialiasing for background rectangle painting to avoid blury edges when scaled (e.g. at 125% or 175%)
-			Object oldHint = g.getRenderingHint( RenderingHints.KEY_ANTIALIASING );
-			g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF );
-
 			g.setColor( FlatUIUtils.deriveColor( background, c.getBackground() ) );
 			g.fillRect( 0, 0, width, height );
-
-			g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, oldHint );
 		}
 	}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowCloseIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowCloseIcon.java
@@ -24,7 +24,6 @@ import java.awt.geom.Line2D;
 import java.awt.geom.Path2D;
 import javax.swing.UIManager;
 import com.formdev.flatlaf.ui.FlatButtonUI;
-import com.formdev.flatlaf.util.SystemInfo;

 /**
 * "close" icon for windows (frames and dialogs).
@@ -55,7 +54,7 @@ public class FlatWindowCloseIcon
 		int iy = y + ((height - iwh) / 2);
 		int ix2 = ix + iwh - 1;
 		int iy2 = iy + iwh - 1;
-		float thickness = SystemInfo.isWindows_11_orLater ? (float) scaleFactor : (int) scaleFactor;
+		int thickness = (int) scaleFactor;

 		Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD );
 		path.append( new Line2D.Float( ix, iy, ix2, iy2 ), false );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowMaximizeIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowMaximizeIcon.java
@@ -18,7 +18,6 @@ package com.formdev.flatlaf.icons;

 import java.awt.Graphics2D;
 import com.formdev.flatlaf.ui.FlatUIUtils;
-import com.formdev.flatlaf.util.SystemInfo;

 /**
 * "maximize" icon for windows (frames and dialogs).
@@ -36,11 +35,8 @@ public class FlatWindowMaximizeIcon
 		int iwh = (int) (10 * scaleFactor);
 		int ix = x + ((width - iwh) / 2);
 		int iy = y + ((height - iwh) / 2);
-		float thickness = SystemInfo.isWindows_11_orLater ? (float) scaleFactor : (int) scaleFactor;
-		int arc = Math.max( (int) (1.5 * scaleFactor), 2 );
+		int thickness = (int) scaleFactor;

-		g.fill( SystemInfo.isWindows_11_orLater
-			? FlatUIUtils.createRoundRectangle( ix, iy, iwh, iwh, thickness, arc, arc, arc, arc )
-			: FlatUIUtils.createRectangle( ix, iy, iwh, iwh, thickness ) );
+		g.fill( FlatUIUtils.createRectangle( ix, iy, iwh, iwh, thickness ) );
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowRestoreIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatWindowRestoreIcon.java
@@ -21,7 +21,6 @@ import java.awt.geom.Area;
 import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 import com.formdev.flatlaf.ui.FlatUIUtils;
-import com.formdev.flatlaf.util.SystemInfo;

 /**
 * "restore" icon for windows (frames and dialogs).
@@ -39,33 +38,18 @@ public class FlatWindowRestoreIcon
 		int iwh = (int) (10 * scaleFactor);
 		int ix = x + ((width - iwh) / 2);
 		int iy = y + ((height - iwh) / 2);
-		float thickness = SystemInfo.isWindows_11_orLater ? (float) scaleFactor : (int) scaleFactor;
-		int arc = Math.max( (int) (1.5 * scaleFactor), 2 );
-		int arcOuter = (int) (arc + (1.5 * scaleFactor));
+		int thickness = (int) scaleFactor;

 		int rwh = (int) (8 * scaleFactor);
 		int ro2 = iwh - rwh;

-		// upper-right rectangle
-		Path2D r1 = SystemInfo.isWindows_11_orLater
-			? FlatUIUtils.createRoundRectangle( ix + ro2, iy, rwh, rwh, thickness, arc, arcOuter, arc, arc )
-			: FlatUIUtils.createRectangle( ix + ro2, iy, rwh, rwh, thickness );
+		Path2D r1 = FlatUIUtils.createRectangle( ix + ro2, iy, rwh, rwh, thickness );
+		Path2D r2 = FlatUIUtils.createRectangle( ix, iy + ro2, rwh, rwh, thickness );

-		// lower-left rectangle
-		Path2D r2 = SystemInfo.isWindows_11_orLater
-			? FlatUIUtils.createRoundRectangle( ix, iy + ro2, rwh, rwh, thickness, arc, arc, arc, arc )
-			: FlatUIUtils.createRectangle( ix, iy + ro2, rwh, rwh, thickness );
-
-		// paint upper-right rectangle
 		Area area = new Area( r1 );
-		if( SystemInfo.isWindows_11_orLater ) {
-			area.subtract( new Area( new Rectangle2D.Float( ix, (float) (iy + scaleFactor), rwh, rwh ) ) );
-			area.subtract( new Area( new Rectangle2D.Float( (float) (ix + scaleFactor), iy + ro2, rwh, rwh ) ) );
-		} else
-			area.subtract( new Area( new Rectangle2D.Float( ix, iy + ro2, rwh, rwh ) ) );
+		area.subtract( new Area( new Rectangle2D.Float( ix, iy + ro2, rwh, rwh ) ) );
 		g.fill( area );

-		// paint lower-left rectangle
 		g.fill( r2 );
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/resources/EmptyPackage.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/resources/EmptyPackage.java
@@ -18,8 +18,8 @@ package com.formdev.flatlaf.resources;

 /**
 * The only purpose of this file is to add a .class file to this package to make it non-empty.
- * Otherwise, the compiler outputs a warning because this package is opened in module-info.java.
- * Also, when using --patch-module (e.g. from an IDE), an error would occur for empty packages.
+ * Otherwise the compiler outputs a warning because this package is opend in module-info.java.
+ * Also when using --patch-module (e.g. from an IDE), an error would occur for empty packages.
 *
 * @author Karl Tauber
 */
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatArrowButton.java
@@ -37,7 +37,7 @@ public class FlatArrowButton
 	extends BasicArrowButton
 	implements UIResource
 {
-	public static final int DEFAULT_ARROW_WIDTH = 9;
+	public static final int DEFAULT_ARROW_WIDTH = 8;

 	protected boolean chevron;
 	protected Color foreground;
@@ -211,6 +211,6 @@ public class FlatArrowButton
 		if( vert && parent instanceof JComponent && FlatUIUtils.hasRoundBorder( (JComponent) parent ) )
 			x -= scale( parent.getComponentOrientation().isLeftToRight() ? 1 : -1 );

-		FlatUIUtils.paintArrow( g, x, 0, getWidth(), getHeight(), getDirection(), chevron, getArrowWidth(), getXOffset(), getYOffset() );
+		FlatUIUtils.paintArrow( g, x, 0, getWidth(), getHeight(), getDirection(), chevron, arrowWidth, xOffset, yOffset );
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
@@ -159,7 +159,7 @@ public class FlatButtonBorder
 	public Insets getBorderInsets( Component c, Insets insets ) {
 		if( FlatButtonUI.isToolBarButton( c ) ) {
 			// In toolbars, use button margin only if explicitly set.
-			// Otherwise, use toolbar margin specified in UI defaults.
+			// Otherwise use toolbar margin specified in UI defaults.
 			Insets margin = (c instanceof AbstractButton)
 				? ((AbstractButton)c).getMargin()
 				: null;
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java
@@ -38,18 +38,15 @@ import javax.swing.ButtonModel;
 import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
-import javax.swing.JTextField;
 import javax.swing.JToggleButton;
 import javax.swing.JToolBar;
 import javax.swing.LookAndFeel;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicButtonListener;
 import javax.swing.plaf.basic.BasicButtonUI;
-import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.icons.FlatHelpButtonIcon;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
@@ -262,15 +259,11 @@ public class FlatButtonUI
 				b.repaint();
 				break;

-			case OUTLINE:
-				b.repaint();
-				break;
-
 			case STYLE:
 			case STYLE_CLASS:
 				if( shared && FlatStylingSupport.hasStyleProperty( b ) ) {
 					// unshare component UI if necessary
-					// updateUI() invokes installStyle() from installUI()
+					// updateUI() invokes applyStyle() from installUI()
 					b.updateUI();
 				} else
 					installStyle( b );
@@ -343,7 +336,7 @@ public class FlatButtonUI

 	/**
 	 * Returns true if the button has an icon but no text,
-	 * or it does not have an icon and the text is either "..." or one character.
+	 * or it it does not have an icon and the text is either "..." or one character.
 	 */
 	static boolean isIconOnlyOrSingleCharacterButton( Component c ) {
 		if( !(c instanceof JButton) && !(c instanceof JToggleButton) )
@@ -427,21 +420,11 @@ public class FlatButtonUI
 		try {
 			FlatUIUtils.setRenderingHints( g2 );

-			boolean def = isDefaultButton( c );
 			boolean isToolBarButton = isToolBarButton( c );
 			float focusWidth = isToolBarButton ? 0 : FlatUIUtils.getBorderFocusWidth( c );
 			float arc = FlatUIUtils.getBorderArc( c );
-			float textFieldArc = 0;

-			// if toolbar button is in leading/trailing component of a text field,
-			// increase toolbar button arc to match text field arc (if necessary)
-			if( isToolBarButton &&
-				FlatClientProperties.clientProperty( c, STYLE_CLASS, "", String.class ).contains( "inTextField" ) )
-			{
-				JTextField textField = (JTextField) SwingUtilities.getAncestorOfClass( JTextField.class, c );
-				if( textField != null )
-					textFieldArc = FlatUIUtils.getBorderArc( textField );
-			}
+			boolean def = isDefaultButton( c );

 			int x = 0;
 			int y = 0;
@@ -454,15 +437,8 @@ public class FlatButtonUI
 				y += spacing.top;
 				width -= spacing.left + spacing.right;
 				height -= spacing.top + spacing.bottom;
-
-				// reduce text field arc
-				textFieldArc -= spacing.top + spacing.bottom;
 			}

-			// increase toolbar button arc to match text field arc (if necessary)
-			if( arc < textFieldArc )
-				arc = textFieldArc;
-
 			// paint shadow
 			Color shadowColor = def ? defaultShadowColor : this.shadowColor;
 			if( paintShadow &&
@@ -573,9 +549,6 @@ public class FlatButtonUI
 	public static Color buttonStateColor( Component c, Color enabledColor, Color disabledColor,
 		Color focusedColor, Color hoverColor, Color pressedColor )
 	{
-		if( c == null )
-			return enabledColor;
-
 		if( !c.isEnabled() )
 			return disabledColor;

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCaret.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCaret.java
@@ -96,14 +96,11 @@ public class FlatCaret

 			// if text component is focused, then caret and selection are visible,
 			// but when switching theme, the component does not yet have
-			// a highlighter and the selection is not painted
+			// an highlighter and the selection is not painted
 			// --> make selection temporary invisible later, then the caret
 			//     adds selection highlights to the text component highlighter
 			if( isSelectionVisible() ) {
 				EventQueue.invokeLater( () -> {
-					if( getComponent() == null )
-						return; // was deinstalled
-
 					if( isSelectionVisible() ) {
 						setSelectionVisible( false );
 						setSelectionVisible( true );
@@ -236,7 +233,7 @@ public class FlatCaret
 		if( selectAllOnFocusPolicy == null )
 			selectAllOnFocusPolicy = this.selectAllOnFocusPolicy;

-		if( selectAllOnFocusPolicy == null || SELECT_ALL_ON_FOCUS_POLICY_NEVER.equals( selectAllOnFocusPolicy ) )
+		if( SELECT_ALL_ON_FOCUS_POLICY_NEVER.equals( selectAllOnFocusPolicy ) )
 			return;

 		if( !SELECT_ALL_ON_FOCUS_POLICY_ALWAYS.equals( selectAllOnFocusPolicy ) ) {
@@ -256,9 +253,6 @@ public class FlatCaret
 		// select all
 		if( c instanceof JFormattedTextField ) {
 			EventQueue.invokeLater( () -> {
-				if( getComponent() == null )
-					return; // was deinstalled
-
 				select( 0, doc.getLength() );
 			} );
 		} else {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatCheckBoxMenuItemUI.java
@@ -89,7 +89,6 @@ public class FlatCheckBoxMenuItemUI
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();

-		FlatMenuItemRenderer.clearClientProperties( menuItem.getParent() );
 		renderer = null;
 		oldStyleValues = null;
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
@@ -98,8 +98,8 @@ import com.formdev.flatlaf.util.SystemInfo;
 * @uiDefault ComboBox.focusedBackground		Color	optional
 * @uiDefault ComboBox.disabledBackground		Color
 * @uiDefault ComboBox.disabledForeground		Color
- * @uiDefault ComboBox.buttonBackground			Color	optional
- * @uiDefault ComboBox.buttonEditableBackground	Color	optional
+ * @uiDefault ComboBox.buttonBackground			Color
+ * @uiDefault ComboBox.buttonEditableBackground	Color
 * @uiDefault ComboBox.buttonFocusedBackground	Color	optional; defaults to ComboBox.focusedBackground
 * @uiDefault ComboBox.buttonSeparatorWidth		int or float	optional; defaults to Component.borderWidth
 * @uiDefault ComboBox.buttonSeparatorColor		Color	optional
@@ -281,10 +281,7 @@ public class FlatComboBoxUI
 			public void layoutContainer( Container parent ) {
 				super.layoutContainer( parent );

-				// on macOS, a Swing combo box is used for AWT component java.awt.Choice
-				// and the font may be (temporary) null
-
-				if( arrowButton != null && comboBox.getFont() != null ) {
+				if( arrowButton != null ) {
 					// limit button width to height of a raw combobox (without insets)
 					FontMetrics fm = comboBox.getFontMetrics( comboBox.getFont() );
 					int maxButtonWidth = fm.getHeight() + scale( padding.top ) + scale( padding.bottom );
@@ -354,7 +351,6 @@ public class FlatComboBoxUI
 						break;

 					case COMPONENT_ROUND_RECT:
-					case OUTLINE:
 						comboBox.repaint();
 						break;

@@ -544,27 +540,24 @@ public class FlatComboBoxUI

 			// paint arrow button background
 			if( enabled && !isCellRenderer ) {
-				Color buttonColor = paintButton
+				g2.setColor( paintButton
 					? buttonEditableBackground
 					: (buttonFocusedBackground != null || focusedBackground != null) && isPermanentFocusOwner( comboBox )
 						? (buttonFocusedBackground != null ? buttonFocusedBackground : focusedBackground)
-						: buttonBackground;
-				if( buttonColor != null ) {
-					g2.setColor( buttonColor );
-					Shape oldClip = g2.getClip();
-					if( isLeftToRight )
-						g2.clipRect( arrowX, 0, width - arrowX, height );
-					else
-						g2.clipRect( 0, 0, arrowX + arrowWidth, height );
-					FlatUIUtils.paintComponentBackground( g2, 0, 0, width, height, focusWidth, arc );
-					g2.setClip( oldClip );
-				}
+						: buttonBackground );
+				Shape oldClip = g2.getClip();
+				if( isLeftToRight )
+					g2.clipRect( arrowX, 0, width - arrowX, height );
+				else
+					g2.clipRect( 0, 0, arrowX + arrowWidth, height );
+				FlatUIUtils.paintComponentBackground( g2, 0, 0, width, height, focusWidth, arc );
+				g2.setClip( oldClip );
 			}

 			// paint vertical line between value and arrow button
 			if( paintButton ) {
 				Color separatorColor = enabled ? buttonSeparatorColor : buttonDisabledSeparatorColor;
-				if( separatorColor != null && buttonSeparatorWidth > 0 ) {
+				if( separatorColor != null ) {
 					g2.setColor( separatorColor );
 					float lw = scale( buttonSeparatorWidth );
 					float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw;
@@ -700,7 +693,7 @@ public class FlatComboBoxUI
 				return true;

 			Component editorComponent = comboBox.getEditor().getEditorComponent();
-			return editorComponent != null && FlatUIUtils.isPermanentFocusOwner( editorComponent );
+			return (editorComponent != null) ? FlatUIUtils.isPermanentFocusOwner( editorComponent ) : false;
 		} else
 			return FlatUIUtils.isPermanentFocusOwner( comboBox );
 	}
@@ -813,12 +806,9 @@ public class FlatComboBoxUI
 			// make opaque to avoid that background shines thru border (e.g. at 150% scaling)
 			setOpaque( true );

-	        // set popup border
-	        // use non-UIResource to avoid that it is overwritten when making
-	        // popup visible (see JPopupMenu.setInvoker()) in theme editor preview
 			Border border = UIManager.getBorder( "PopupMenu.border" );
 			if( border != null )
-				setBorder( FlatUIUtils.nonUIResource( border ) );
+				setBorder( border );
 		}

 		@Override
@@ -832,11 +822,6 @@ public class FlatComboBoxUI
 		void updateStyle() {
 			if( popupBackground != null )
 		        list.setBackground( popupBackground );
-
-	        // set popup background because it may shine thru when scaled (e.g. at 150%)
-	        // use non-UIResource to avoid that it is overwritten when making
-	        // popup visible (see JPopupMenu.setInvoker()) in theme editor preview
-	        setBackground( FlatUIUtils.nonUIResource( list.getBackground() ) );
 		}

 		@Override
@@ -923,9 +908,7 @@ public class FlatComboBoxUI
 			this.padding = padding;
 		}

-		// using synchronized to avoid problems with code that modifies combo box
-		// (model, selection, etc) not on AWT thread (which should be not done)
-		synchronized void install( Component c ) {
+		void install( Component c ) {
 			if( !(c instanceof JComponent) )
 				return;

@@ -957,7 +940,7 @@ public class FlatComboBoxUI
 		 * there is no single place to uninstall it.
 		 * This is the reason why this method is called from various places.
 		 */
-		synchronized void uninstall() {
+		void uninstall() {
 			if( rendererComponent == null )
 				return;

@@ -968,9 +951,9 @@ public class FlatComboBoxUI
 		}

 		@Override
-		synchronized public Insets getBorderInsets( Component c, Insets insets ) {
+		public Insets getBorderInsets( Component c, Insets insets ) {
 			Insets padding = scale( this.padding );
-			if( rendererBorder != null && !(rendererBorder instanceof CellPaddingBorder) ) {
+			if( rendererBorder != null ) {
 				Insets insideInsets = rendererBorder.getBorderInsets( c );
 				insets.top = Math.max( padding.top, insideInsets.top );
 				insets.left = Math.max( padding.left, insideInsets.left );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java
@@ -44,8 +44,8 @@ import com.formdev.flatlaf.util.LoggingFacade;
 * <!-- BasicEditorPaneUI -->
 *
 * @uiDefault EditorPane.font					Font
- * @uiDefault EditorPane.background				Color
- * @uiDefault EditorPane.foreground				Color	also used if not editable
+ * @uiDefault EditorPane.background				Color	also used if not editable
+ * @uiDefault EditorPane.foreground				Color
 * @uiDefault EditorPane.caretForeground		Color
 * @uiDefault EditorPane.selectionBackground	Color
 * @uiDefault EditorPane.selectionForeground	Color
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java
@@ -275,10 +275,7 @@ public class FlatFileChooserUI

 	private boolean doNotUseSystemIcons() {
 		// Java 17 32bit craches on Windows when using system icons
-		// fixed in Java 18+ (see https://bugs.openjdk.java.net/browse/JDK-8277299)
-		return SystemInfo.isWindows &&
-			SystemInfo.isX86 &&
-			(SystemInfo.isJava_17_orLater && !SystemInfo.isJava_18_orLater);
+		return SystemInfo.isWindows && SystemInfo.isJava_17_orLater && !SystemInfo.isX86_64;
 	}

 	//---- class FlatFileView -------------------------------------------------
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameTitlePane.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameTitlePane.java
@@ -213,13 +213,6 @@ public class FlatInternalFrameTitlePane
 				case "componentOrientation":
 					applyComponentOrientation( frame.getComponentOrientation() );
 					break;
-
-				case "opaque":
-					// Do not invoke super.propertyChange() here because it always
-					// invokes repaint(), which would cause endless repainting.
-					// The opaque flag is temporary changed in FlatUIUtils.hasOpaqueBeenExplicitlySet(),
-					// invoked from FlatInternalFrameUI.update().
-					return;
 			}

 			super.propertyChange( e );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatInternalFrameUI.java
@@ -179,26 +179,6 @@ public class FlatInternalFrameUI
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, frame.getBorder() );
 	}

-	@Override
-	public void update( Graphics g, JComponent c ) {
-		// The internal frame actually should be opaque and fill its background,
-		// but it must be non-opaque to allow translucent resize handles (outside of visual bounds).
-		// To avoid that parent may shine through internal frame (e.g. if menu bar is non-opaque),
-		// fill background excluding insets (translucent resize handles),
-		// but only if opaque was not set explicitly by application to false.
-		// If applications has set internal frame opacity to false, do not fill background (for compatibility).
-		if( !c.isOpaque() && !FlatUIUtils.hasOpaqueBeenExplicitlySet( c ) ) {
-			Insets insets = c.getInsets();
-
-			g.setColor( c.getBackground() );
-			g.fillRect( insets.left, insets.top,
-				c.getWidth() - insets.left - insets.right,
-				c.getHeight() - insets.top - insets.bottom );
-		}
-
-		super.update( g, c );
-	}
-
 	//---- class FlatInternalFrameBorder --------------------------------------

 	public static class FlatInternalFrameBorder
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java
@@ -122,7 +122,7 @@ public class FlatLabelUI
 			JLabel label = (JLabel) e.getSource();
 			if( shared && FlatStylingSupport.hasStyleProperty( label ) ) {
 				// unshare component UI if necessary
-				// updateUI() invokes installStyle() from installUI()
+				// updateUI() invokes applyStyle() from installUI()
 				label.updateUI();
 			} else
 				installStyle( label );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLineBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLineBorder.java
@@ -37,18 +37,15 @@ public class FlatLineBorder
 {
 	private final Color lineColor;
 	private final float lineThickness;
-	/** @since 2 */ private final int arc;

 	public FlatLineBorder( Insets insets, Color lineColor ) {
-		this( insets, lineColor, 1f, 0 );
+		this( insets, lineColor, 1f );
 	}

-	/** @since 2 */
-	public FlatLineBorder( Insets insets, Color lineColor, float lineThickness, int arc ) {
+	public FlatLineBorder( Insets insets, Color lineColor, float lineThickness ) {
 		super( insets );
 		this.lineColor = lineColor;
 		this.lineThickness = lineThickness;
-		this.arc = arc;
 	}

 	public Color getLineColor() {
@@ -59,18 +56,13 @@ public class FlatLineBorder
 		return lineThickness;
 	}

-	/** @since 2 */
-	public int getArc() {
-		return arc;
-	}
-
 	@Override
 	public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 		Graphics2D g2 = (Graphics2D) g.create();
 		try {
 			FlatUIUtils.setRenderingHints( g2 );
 			FlatUIUtils.paintOutlinedComponent( g2, x, y, width, height,
-				0, 0, 0, scale( getLineThickness() ), scale( getArc() ), null, getLineColor(), null );
+				0, 0, 0, scale( getLineThickness() ), 0, null, getLineColor(), null );
 		} finally {
 			g2.dispose();
 		}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListCellBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListCellBorder.java
@@ -37,7 +37,7 @@ import javax.swing.plaf.ListUI;
 public class FlatListCellBorder
 	extends FlatLineBorder
 {
-	/** @since 2 */ protected boolean showCellFocusIndicator = UIManager.getBoolean( "List.showCellFocusIndicator" );
+	protected boolean showCellFocusIndicator = UIManager.getBoolean( "List.showCellFocusIndicator" );

 	private Component c;

@@ -72,7 +72,7 @@ public class FlatListCellBorder
 	}

 	/**
-	 * Because this border is always shared for all lists,
+	 * Because this borders are always shared for all lists,
 	 * get border specific style from FlatListUI.
 	 */
 	static <T> T getStyleFromListUI( Component c, Function<FlatListUI, T> f ) {
@@ -113,7 +113,7 @@ public class FlatListCellBorder

 	/**
 	 * Border for selected cell that uses margins and paints focus indicator border
-	 * if enabled (List.showCellFocusIndicator=true) and multiple items are selected.
+	 * if enabled (List.showCellFocusIndicator=true) and exactly one item is selected.
 	 */
 	public static class Selected
 		extends FlatListCellBorder
@@ -125,7 +125,7 @@ public class FlatListCellBorder
 			if( !showCellFocusIndicator )
 				return;

-			// paint focus indicator border only if multiple items are selected
+			// paint focus indicator border only if exactly one item is selected
 			JList<?> list = (JList<?>) SwingUtilities.getAncestorOfClass( JList.class, c );
 			if( list != null && list.getMinSelectionIndex() == list.getMaxSelectionIndex() )
 				return;
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java
@@ -78,9 +78,9 @@ public class FlatListUI
 	@Styleable protected Color selectionInactiveForeground;

 	// for FlatListCellBorder
-	/** @since 2 */ @Styleable protected Insets cellMargins;
-	/** @since 2 */ @Styleable protected Color cellFocusColor;
-	/** @since 2 */ @Styleable protected Boolean showCellFocusIndicator;
+	@Styleable protected Insets cellMargins;
+	@Styleable protected Color cellFocusColor;
+	@Styleable protected boolean showCellFocusIndicator;

 	private Map<String, Object> oldStyleValues;

@@ -212,7 +212,7 @@ public class FlatListUI
 	/**
 	 * Toggle selection colors from focused to inactive and vice versa.
 	 *
-	 * This is not an optimal solution but much easier than rewriting the whole paint methods.
+	 * This is not a optimal solution but much easier than rewriting the whole paint methods.
 	 *
 	 * Using a LaF specific renderer was avoided because often a custom renderer is
 	 * already used in applications. Then either the inactive colors are not used,
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuBarUI.java
@@ -180,15 +180,11 @@ public class FlatMenuBarUI
 	protected Color getBackground( JComponent c ) {
 		Color background = c.getBackground();

-		// paint background if opaque
-		if( c.isOpaque() )
+		// paint background if opaque or if having custom background color
+		if( c.isOpaque() || !(background instanceof UIResource) )
 			return background;

-		// do not paint background if non-opaque and having custom background color
-		if( !(background instanceof UIResource) )
-			return null;
-
-		// paint background if menu bar is not the "main" menu bar (e.g. in internal frame)
+		// paint background if menu bar is not the "main" menu bar
 		JRootPane rootPane = SwingUtilities.getRootPane( c );
 		if( rootPane == null || !(rootPane.getParent() instanceof Window) || rootPane.getJMenuBar() != c )
 			return background;
@@ -210,7 +206,7 @@ public class FlatMenuBarUI
 		// check whether:
 		// - TitlePane.unifiedBackground is true and
 		// - menu bar is the "main" menu bar and
-		// - window root pane has custom decoration style
+		// - window has custom decorations enabled

 		JRootPane rootPane;
 		// (not storing value of "TitlePane.unifiedBackground" in class to allow changing at runtime)
@@ -218,7 +214,7 @@ public class FlatMenuBarUI
 			(rootPane = SwingUtilities.getRootPane( c )) != null &&
 			rootPane.getParent() instanceof Window &&
 			rootPane.getJMenuBar() == c &&
-			rootPane.getWindowDecorationStyle() != JRootPane.NONE;
+			FlatNativeWindowBorder.hasCustomDecoration( (Window) rootPane.getParent() );
 	}

 	//---- class TakeFocus ----------------------------------------------------
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemBorder.java
@@ -35,7 +35,7 @@ import javax.swing.plaf.MenuBarUI;
 public class FlatMenuItemBorder
 	extends FlatMarginBorder
 {
-	// only used if parent menubar is not an instance of FlatMenuBarUI
+	// only used if parent menubar is not a instance of FlatMenuBarUI
 	private final Insets menuBarItemMargins = UIManager.getInsets( "MenuBar.itemMargins" );

 	@Override
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemRenderer.java
@@ -19,7 +19,6 @@ package com.formdev.flatlaf.ui;
 import static com.formdev.flatlaf.util.UIScale.scale;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -33,7 +32,6 @@ import java.awt.event.KeyEvent;
 import java.text.AttributedCharacterIterator;
 import java.util.Map;
 import javax.swing.Icon;
-import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.KeyStroke;
@@ -41,7 +39,6 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicHTML;
 import javax.swing.text.View;
-import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon;
 import com.formdev.flatlaf.icons.FlatMenuArrowIcon;
@@ -55,15 +52,12 @@ import com.formdev.flatlaf.util.SystemInfo;
 /**
 * Renderer for menu items.
 *
- * @uiDefault MenuItem.verticallyAlignText							boolean
 * @uiDefault MenuItem.minimumWidth									int
 * @uiDefault MenuItem.minimumIconSize								Dimension
 * @uiDefault MenuItem.textAcceleratorGap							int
 * @uiDefault MenuItem.textNoAcceleratorGap							int
 * @uiDefault MenuItem.acceleratorArrowGap							int
 * @uiDefault MenuItem.checkBackground								Color
- * @uiDefault MenuItem.checkMargins									Insets
- * @uiDefault MenuItem.selectionType								String	null (default) or underline
 * @uiDefault MenuItem.underlineSelectionBackground					Color
 * @uiDefault MenuItem.underlineSelectionCheckBackground			Color
 * @uiDefault MenuItem.underlineSelectionColor						Color
@@ -73,15 +67,12 @@ import com.formdev.flatlaf.util.SystemInfo;
 */
 public class FlatMenuItemRenderer
 {
-	private static final String KEY_MAX_ICONS_WIDTH = "FlatLaf.internal.FlatMenuItemRenderer.maxIconWidth";
-
 	protected final JMenuItem menuItem;
 	protected Icon checkIcon;
 	protected Icon arrowIcon;
-	@Styleable protected Font acceleratorFont;
+	protected final Font acceleratorFont;
 	protected final String acceleratorDelimiter;

-	/** @since 2 */ @Styleable protected boolean verticallyAlignText = FlatUIUtils.getUIBoolean( "MenuItem.verticallyAlignText", true );
 	@Styleable protected int minimumWidth = UIManager.getInt( "MenuItem.minimumWidth" );
 	@Styleable protected Dimension minimumIconSize;
 	@Styleable protected int textAcceleratorGap = FlatUIUtils.getUIInt( "MenuItem.textAcceleratorGap", 28 );
@@ -414,10 +405,11 @@ debug*/
 			return;

 		// center because the real icon may be smaller than dimension in iconRect
+		int x = iconRect.x + centerOffset( iconRect.width, icon.getIconWidth() );
 		int y = iconRect.y + centerOffset( iconRect.height, icon.getIconHeight() );

 		// paint
-		icon.paintIcon( menuItem, g, iconRect.x, y );
+		icon.paintIcon( menuItem, g, x, y );
 	}

 	protected static void paintText( Graphics g, JMenuItem menuItem,
@@ -452,10 +444,6 @@ debug*/
 		htmlView.paint( HiDPIUtils.createGraphicsTextYCorrection( (Graphics2D) g ), textRect );
 	}

-	/**
-	 * Returns {@code true} if either the menu item is armed (mouse over item)
-	 * or it is a {@code JMenu} and selected (shows submenu).
-	 */
 	protected static boolean isArmedOrSelected( JMenuItem menuItem ) {
 		return menuItem.isArmed() || (menuItem instanceof JMenu && menuItem.isSelected());
 	}
@@ -486,12 +474,6 @@ debug*/
 				return pressedIcon;
 		}

-		if( isArmedOrSelected( menuItem ) ) {
-			Icon selectedIcon = menuItem.getSelectedIcon();
-			if( selectedIcon != null )
-				return selectedIcon;
-		}
-
 		return icon;
 	}

@@ -578,44 +560,6 @@ debug*/
 		shiftGlyph = 0x21E7,
 		commandGlyph = 0x2318;

-	/**
-	 * Calculates the maximum width of all menu item icons in the popup.
-	 */
-	private int getMaxIconsWidth() {
-		if( !verticallyAlignText )
-			return 0;
-
-		Container parent = menuItem.getParent();
-		if( !(parent instanceof JComponent) )
-			return 0;
-
-		int maxWidth = FlatClientProperties.clientPropertyInt( (JComponent) parent, KEY_MAX_ICONS_WIDTH, -1 );
-		if( maxWidth >= 0 )
-			return maxWidth;
-
-		maxWidth = 0;
-
-		for( Component c : parent.getComponents() ) {
-			if( !(c instanceof JMenuItem) )
-				continue;
-
-			Icon icon = ((JMenuItem)c).getIcon();
-			if( icon != null )
-				maxWidth = Math.max( maxWidth, icon.getIconWidth() );
-		}
-
-		((JComponent)parent).putClientProperty( KEY_MAX_ICONS_WIDTH, maxWidth );
-		return maxWidth;
-	}
-
-	static void clearClientProperties( Component c ) {
-		if( !(c instanceof JComponent) )
-			return;
-
-		JComponent jc = (JComponent) c;
-		jc.putClientProperty( FlatMenuItemRenderer.KEY_MAX_ICONS_WIDTH, null );
-	}
-
 	//---- class MinSizeIcon --------------------------------------------------

 	private class MinSizeIcon
@@ -630,7 +574,6 @@ debug*/
 		@Override
 		public int getIconWidth() {
 			int iconWidth = (delegate != null) ? delegate.getIconWidth() : 0;
-			iconWidth = Math.max( iconWidth, getMaxIconsWidth() );
 			return Math.max( iconWidth, scale( minimumIconSize.width ) );
 		}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuItemUI.java
@@ -89,7 +89,6 @@ public class FlatMenuItemUI
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();

-		FlatMenuItemRenderer.clearClientProperties( menuItem.getParent() );
 		renderer = null;
 		oldStyleValues = null;
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java
@@ -111,7 +111,6 @@ public class FlatMenuUI
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();

-		FlatMenuItemRenderer.clearClientProperties( menuItem.getParent() );
 		renderer = null;
 		oldStyleValues = null;
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
@@ -56,7 +56,7 @@ public class FlatNativeWindowBorder
 	private static final boolean canUseJBRCustomDecorations =
 		canUseWindowDecorations &&
 		SystemInfo.isJetBrainsJVM_11_orLater &&
-		FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, false );
+		FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, true );

 	private static Boolean supported;
 	private static Provider nativeProvider;
@@ -313,10 +313,6 @@ public class FlatNativeWindowBorder

 	//---- class WindowTopBorder -------------------------------------------

-	/**
-	 * Window top border used on Windows 10.
-	 * No longer needed since Windows 11.
-	 */
 	static class WindowTopBorder
 		extends JBRCustomDecorations.JBRWindowTopBorder
 	{
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatOptionPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatOptionPaneUI.java
@@ -19,7 +19,9 @@ package com.formdev.flatlaf.ui;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.Graphics;
 import java.awt.GridBagConstraints;
+import java.awt.Insets;
 import java.beans.PropertyChangeListener;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -36,7 +38,6 @@ import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicHTML;
 import javax.swing.plaf.basic.BasicOptionPaneUI;
 import com.formdev.flatlaf.FlatClientProperties;
-import com.formdev.flatlaf.util.SwingUtils;
 import com.formdev.flatlaf.util.UIScale;

 /**
@@ -157,7 +158,7 @@ public class FlatOptionPaneUI

 		// set icon-message gap
 		if( iconMessageGap > 0 ) {
-			Component iconMessageSeparator = SwingUtils.getComponentByName( messageArea, "OptionPane.separator" );
+			Component iconMessageSeparator = findByName( messageArea, "OptionPane.separator" );
 			if( iconMessageSeparator != null )
 				iconMessageSeparator.setPreferredSize( new Dimension( UIScale.scale( iconMessageGap ), 1 ) );
 		}
@@ -229,7 +230,7 @@ public class FlatOptionPaneUI
 				// use non-UIResource borders to avoid that they are replaced when switching LaF
 				Border border = panel.getBorder();
 				if( border instanceof UIResource )
-					panel.setBorder( FlatUIUtils.nonUIResource( border ) );
+					panel.setBorder( new NonUIResourceBorder( border ) );
 			}

 			if( child instanceof Container )
@@ -237,8 +238,49 @@ public class FlatOptionPaneUI
 		}
 	}

+	private Component findByName( Container c, String name ) {
+		for( Component child : c.getComponents() ) {
+			if( name.equals( child.getName() ) )
+				return child;
+
+			if( child instanceof Container ) {
+				Component c2 = findByName( (Container) child, name );
+				if( c2 != null )
+					return c2;
+			}
+		}
+		return null;
+	}
+
 	@Override
 	protected boolean getSizeButtonsToSameWidth() {
 		return sameSizeButtons;
 	}
+
+	//---- class NonUIResourceBorder ------------------------------------------
+
+	private static class NonUIResourceBorder
+		implements Border
+	{
+		private final Border delegate;
+
+		NonUIResourceBorder( Border delegate ) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
+			delegate.paintBorder( c, g, x, y, width, height );
+		}
+
+		@Override
+		public Insets getBorderInsets( Component c ) {
+			return delegate.getBorderInsets( c );
+		}
+
+		@Override
+		public boolean isBorderOpaque() {
+			return delegate.isBorderOpaque();
+		}
+	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPanelUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPanelUI.java
@@ -16,20 +16,9 @@

 package com.formdev.flatlaf.ui;

-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Map;
 import javax.swing.JComponent;
-import javax.swing.JPanel;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicPanelUI;
-import com.formdev.flatlaf.FlatClientProperties;
-import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
-import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
-import com.formdev.flatlaf.util.LoggingFacade;
-import com.formdev.flatlaf.util.UIScale;

 /**
 * Provides the Flat LaF UI delegate for {@link javax.swing.JPanel}.
@@ -38,122 +27,15 @@ import com.formdev.flatlaf.util.UIScale;
 *
 * @uiDefault Panel.font				Font	unused
 * @uiDefault Panel.background			Color	only used if opaque
- * @uiDefault Panel.foreground			Color	unused
+ * @uiDefault Panel.foreground			Color
 * @uiDefault Panel.border				Border
 *
 * @author Karl Tauber
 */
 public class FlatPanelUI
 	extends BasicPanelUI
-	implements StyleableUI, PropertyChangeListener
 {
-	// only used via styling (not in UI defaults)
-	/** @since 2 */ @Styleable protected int arc = -1;
-
-	private final boolean shared;
-	private Map<String, Object> oldStyleValues;
-
 	public static ComponentUI createUI( JComponent c ) {
-		return FlatUIUtils.canUseSharedUI( c )
-			? FlatUIUtils.createSharedUI( FlatPanelUI.class, () -> new FlatPanelUI( true ) )
-			: new FlatPanelUI( false );
-	}
-
-	/** @since 2 */
-	protected FlatPanelUI( boolean shared ) {
-		this.shared = shared;
-	}
-
-	@Override
-	public void installUI( JComponent c ) {
-		super.installUI( c );
-
-		c.addPropertyChangeListener( this );
-
-		installStyle( (JPanel) c );
-	}
-
-	@Override
-	public void uninstallUI( JComponent c ) {
-		super.uninstallUI( c );
-
-		c.removePropertyChangeListener( this );
-
-		oldStyleValues = null;
-	}
-
-	/** @since 2.0.1 */
-	@Override
-	public void propertyChange( PropertyChangeEvent e ) {
-		switch( e.getPropertyName() ) {
-			case FlatClientProperties.STYLE:
-			case FlatClientProperties.STYLE_CLASS:
-				JPanel c = (JPanel) e.getSource();
-				if( shared && FlatStylingSupport.hasStyleProperty( c ) ) {
-					// unshare component UI if necessary
-					// updateUI() invokes installStyle() from installUI()
-					c.updateUI();
-				} else
-					installStyle( c );
-				c.revalidate();
-				c.repaint();
-				break;
-		}
-	}
-
-	/** @since 2 */
-	protected void installStyle( JPanel c ) {
-		try {
-			applyStyle( c, FlatStylingSupport.getResolvedStyle( c, "Panel" ) );
-		} catch( RuntimeException ex ) {
-			LoggingFacade.INSTANCE.logSevere( null, ex );
-		}
-	}
-
-	/** @since 2 */
-	protected void applyStyle( JPanel c, Object style ) {
-		oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style,
-			(key, value) -> applyStyleProperty( c, key, value ) );
-	}
-
-	/** @since 2 */
-	protected Object applyStyleProperty( JPanel c, String key, Object value ) {
-		return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, c, key, value );
-	}
-
-	/** @since 2 */
-	@Override
-	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
-		return FlatStylingSupport.getAnnotatedStyleableInfos( this );
-	}
-
-	@Override
-	public void update( Graphics g, JComponent c ) {
-		// fill background
-		if( c.isOpaque() ) {
-			int width = c.getWidth();
-			int height = c.getHeight();
-			int arc = (this.arc >= 0)
-				? this.arc
-				: ((c.getBorder() instanceof FlatLineBorder)
-					? ((FlatLineBorder)c.getBorder()).getArc()
-					: 0);
-
-			// fill background with parent color to avoid garbage in rounded corners
-			if( arc > 0 )
-				FlatUIUtils.paintParentBackground( g, c );
-
-			g.setColor( c.getBackground() );
-			if( arc > 0 ) {
-				// fill rounded rectangle if having rounded corners
-				Object[] oldRenderingHints = FlatUIUtils.setRenderingHints( g );
-				FlatUIUtils.paintComponentBackground( (Graphics2D) g, 0, 0, width, height,
-					0, UIScale.scale( arc ) );
-				FlatUIUtils.resetRenderingHints( g, oldRenderingHints );
-			} else
-				g.fillRect( 0, 0, width, height );
-		}
-
-		paint( g, c );
+		return FlatUIUtils.createSharedUI( FlatPanelUI.class, FlatPanelUI::new );
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java
@@ -28,8 +28,6 @@ import javax.swing.Action;
 import javax.swing.ActionMap;
 import javax.swing.Icon;
 import javax.swing.JComponent;
-import javax.swing.JPasswordField;
-import javax.swing.JToggleButton;
 import javax.swing.LookAndFeel;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -39,7 +37,6 @@ import javax.swing.text.Element;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PasswordView;
 import javax.swing.text.View;
-import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.icons.FlatCapsLockIcon;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.util.UIScale;
@@ -76,29 +73,18 @@ import com.formdev.flatlaf.util.UIScale;
 *
 * @uiDefault PasswordField.echoChar				character
 * @uiDefault PasswordField.showCapsLock			boolean
- * @uiDefault PasswordField.showRevealButton		boolean
 * @uiDefault PasswordField.capsLockIcon			Icon
- * @uiDefault PasswordField.revealIcon				Icon
 *
 * @author Karl Tauber
 */
 public class FlatPasswordFieldUI
 	extends FlatTextFieldUI
 {
-	// used to preserve reveal button state when switching theme
-	private static final String KEY_REVEAL_SELECTED = "FlatLaf.internal.FlatPasswordFieldUI.revealSelected";
-
-	private Character echoChar;
-
 	@Styleable protected boolean showCapsLock;
-	/** @since 2 */ @Styleable protected boolean showRevealButton;
 	protected Icon capsLockIcon;
-	/** @since 2 */ protected Icon revealIcon;

 	private KeyListener capsLockListener;
 	private boolean capsLockIconShared = true;
-	private JToggleButton revealButton;
-	private boolean uninstallEchoChar;

 	public static ComponentUI createUI( JComponent c ) {
 		return new FlatPasswordFieldUI();
@@ -109,33 +95,17 @@ public class FlatPasswordFieldUI
 		return "PasswordField";
 	}

-	@Override
-	public void installUI( JComponent c ) {
-		super.installUI( c );
-
-		installRevealButton();
-	}
-
-	@Override
-	public void uninstallUI( JComponent c ) {
-		uninstallRevealButton();
-
-		super.uninstallUI( c );
-	}
-
 	@Override
 	protected void installDefaults() {
 		super.installDefaults();

 		String prefix = getPropertyPrefix();
-		echoChar = (Character) UIManager.get( prefix + ".echoChar" );
+		Character echoChar = (Character) UIManager.get( prefix + ".echoChar" );
 		if( echoChar != null )
 			LookAndFeel.installProperty( getComponent(), "echoChar", echoChar );

 		showCapsLock = UIManager.getBoolean( "PasswordField.showCapsLock" );
-		showRevealButton = UIManager.getBoolean( "PasswordField.showRevealButton" );
 		capsLockIcon = UIManager.getIcon( "PasswordField.capsLockIcon" );
-		revealIcon = UIManager.getIcon( "PasswordField.revealIcon" );
 		capsLockIconShared = true;
 	}

@@ -144,7 +114,6 @@ public class FlatPasswordFieldUI
 		super.uninstallDefaults();

 		capsLockIcon = null;
-		revealIcon = null;
 	}

 	@Override
@@ -199,18 +168,6 @@ public class FlatPasswordFieldUI
 		return "PasswordField";
 	}

-	@Override
-	protected void applyStyle( Object style ) {
-		boolean oldShowRevealButton = showRevealButton;
-
-		super.applyStyle( style );
-
-		if( showRevealButton != oldShowRevealButton ) {
-			uninstallRevealButton();
-			installRevealButton();
-		}
-	}
-
 	/** @since 2 */
 	@Override
 	protected Object applyStyleProperty( String key, Object value ) {
@@ -275,72 +232,8 @@ public class FlatPasswordFieldUI
 		if( !showCapsLock )
 			return false;

-		return FlatUIUtils.isPermanentFocusOwner( getComponent() ) &&
+		JTextComponent c = getComponent();
+		return FlatUIUtils.isPermanentFocusOwner( c ) &&
 			Toolkit.getDefaultToolkit().getLockingKeyState( KeyEvent.VK_CAPS_LOCK );
 	}
-
-	/** @since 2 */
-	protected void installRevealButton() {
-		if( showRevealButton ) {
-			revealButton = createRevealButton();
-			installLayout();
-			getComponent().add( revealButton );
-		}
-	}
-
-	/** @since 2 */
-	protected JToggleButton createRevealButton() {
-		JToggleButton button = new JToggleButton( revealIcon );
-		button.setName( "PasswordField.revealButton" );
-		prepareLeadingOrTrailingComponent( button );
-		button.putClientProperty( FlatClientProperties.STYLE_CLASS, "inTextField revealButton" );
-		if( FlatClientProperties.clientPropertyBoolean( getComponent(), KEY_REVEAL_SELECTED, false ) ) {
-			button.setSelected( true );
-			updateEchoChar( true );
-		}
-		button.addActionListener( e -> {
-			boolean selected = button.isSelected();
-			updateEchoChar( selected );
-			getComponent().putClientProperty( KEY_REVEAL_SELECTED, selected );
-		} );
-		return button;
-	}
-
-	private void updateEchoChar( boolean selected ) {
-		char newEchoChar = selected
-			? 0
-			: (echoChar != null ? echoChar : '*');
-
-		JPasswordField c = (JPasswordField) getComponent();
-		LookAndFeel.installProperty( c, "echoChar", newEchoChar );
-
-		// check whether was able to set echo char via LookAndFeel.installProperty()
-		// if not, then echo char was explicitly changed via JPasswordField.setEchoChar()
-		char actualEchoChar = c.getEchoChar();
-		if( actualEchoChar != newEchoChar ) {
-			if( selected && actualEchoChar != 0 ) {
-				// use explicitly set echo char
-				echoChar = actualEchoChar;
-				uninstallEchoChar = true;
-			}
-
-			c.setEchoChar( newEchoChar );
-		}
-	}
-
-	/** @since 2 */
-	protected void uninstallRevealButton() {
-		if( revealButton != null ) {
-			if( uninstallEchoChar && revealButton.isSelected() )
-				((JPasswordField)getComponent()).setEchoChar( echoChar );
-
-			getComponent().remove( revealButton );
-			revealButton = null;
-		}
-	}
-
-	@Override
-	protected JComponent[] getTrailingComponents() {
-		return new JComponent[] { trailingComponent, revealButton, clearButton };
-	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupFactory.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupFactory.java
@@ -16,12 +16,10 @@

 package com.formdev.flatlaf.ui;

-import java.awt.AWTEvent;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.EventQueue;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -35,7 +33,6 @@ import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
-import java.awt.event.MouseEvent;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import javax.swing.JComponent;
@@ -124,10 +121,6 @@ public class FlatPopupFactory
 				popupWindow.getGraphicsConfiguration() == owner.getGraphicsConfiguration() )
 			  return popup;

-			// avoid endless loop (should newer happen; PopupFactory cache size is 5)
-			if( ++count > 10 )
-				return popup;
-
 			// remove contents component from popup window
 			if( popupWindow instanceof JWindow )
 				((JWindow)popupWindow).getContentPane().removeAll();
@@ -135,6 +128,10 @@ public class FlatPopupFactory
 			// dispose unused popup
 			// (do not invoke popup.hide() because this would cache the popup window)
 			popupWindow.dispose();
+
+			// avoid endless loop (should newer happen; PopupFactory cache size is 5)
+			if( ++count > 10 )
+				return popup;
 		}
 	}

@@ -143,7 +140,7 @@ public class FlatPopupFactory
 	 * <p>
 	 * On a dual screen setup, where screens use different scale factors, it may happen
 	 * that the window location changes when showing a heavy weight popup window.
-	 * E.g. when opening a dialog on the secondary screen and making combobox popup visible.
+	 * E.g. when opening an dialog on the secondary screen and making combobox popup visible.
 	 * <p>
 	 * This is a workaround for https://bugs.openjdk.java.net/browse/JDK-8224608
 	 */
@@ -222,7 +219,7 @@ public class FlatPopupFactory
 	 * and corrects the y-location so that the tooltip is placed above the mouse location.
 	 */
 	private Point fixToolTipLocation( Component owner, Component contents, int x, int y ) {
-		if( !(contents instanceof JToolTip) || !wasInvokedFromToolTipManager() || hasTipLocation( owner ) )
+		if( !(contents instanceof JToolTip) || !wasInvokedFromToolTipManager() )
 			return null;

 		PointerInfo pointerInfo = MouseInfo.getPointerInfo();
@@ -267,35 +264,6 @@ public class FlatPopupFactory
 		return StackUtils.wasInvokedFrom( ToolTipManager.class.getName(), "showTipWindow", 8 );
 	}

-	/**
-	 * Checks whether the owner component returns a tooltip location in
-	 * JComponent.getToolTipLocation(MouseEvent).
-	 */
-	private boolean hasTipLocation( Component owner ) {
-		if( !(owner instanceof JComponent) )
-			return false;
-
-		AWTEvent e = EventQueue.getCurrentEvent();
-		MouseEvent me;
-		if( e instanceof MouseEvent )
-			me = (MouseEvent) e;
-		else {
-			// no mouse event available because a timer is used to show the tooltip
-			// --> create mouse event from current mouse location
-			PointerInfo pointerInfo = MouseInfo.getPointerInfo();
-			if( pointerInfo == null )
-				return false;
-
-			Point location = new Point( pointerInfo.getLocation());
-			SwingUtilities.convertPointFromScreen( location, owner );
-			me = new MouseEvent( owner, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(),
-				0, location.x, location.y, 0, false );
-		}
-
-		return me.getSource() == owner &&
-			((JComponent)owner).getToolTipLocation( me ) != null;
-	}
-
 	//---- class NonFlashingPopup ---------------------------------------------

 	private class NonFlashingPopup
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuUI.java
@@ -16,58 +16,12 @@

 package com.formdev.flatlaf.ui;

-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Insets;
-import java.awt.LayoutManager;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
 import java.beans.PropertyChangeListener;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
 import javax.swing.JComponent;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JViewport;
-import javax.swing.MenuElement;
-import javax.swing.MenuSelectionManager;
-import javax.swing.Popup;
-import javax.swing.PopupFactory;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-import javax.swing.UIManager;
-import javax.swing.event.MenuKeyEvent;
-import javax.swing.event.MenuKeyListener;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.UIResource;
-import javax.swing.plaf.basic.BasicComboPopup;
-import javax.swing.plaf.basic.BasicMenuItemUI;
 import javax.swing.plaf.basic.BasicPopupMenuUI;
-import javax.swing.plaf.basic.DefaultMenuLayout;
-import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.LoggingFacade;

@@ -81,22 +35,12 @@ import com.formdev.flatlaf.util.LoggingFacade;
 * @uiDefault PopupMenu.foreground						Color
 * @uiDefault PopupMenu.border							Border
 *
- * <!-- FlatPopupMenuUI -->
- *
- * @uiDefault Component.arrowType					String	chevron (default) or triangle
- * @uiDefault PopupMenu.scrollArrowColor			Color
- * @uiDefault PopupMenu.hoverScrollArrowBackground	Color	optional
- *
 * @author Karl Tauber
 */
 public class FlatPopupMenuUI
 	extends BasicPopupMenuUI
 	implements StyleableUI
 {
-	/** @since 2.1 */ @Styleable protected String arrowType;
-	/** @since 2.1 */ @Styleable protected Color scrollArrowColor;
-	/** @since 2.1 */ @Styleable protected Color hoverScrollArrowBackground;
-
 	private PropertyChangeListener propertyChangeListener;
 	private Map<String, Object> oldStyleValues;
 	private AtomicBoolean borderShared;
@@ -120,27 +64,6 @@ public class FlatPopupMenuUI
 		borderShared = null;
 	}

-	@Override
-	public void installDefaults() {
-		super.installDefaults();
-
-		arrowType = UIManager.getString( "Component.arrowType" );
-		scrollArrowColor = UIManager.getColor( "PopupMenu.scrollArrowColor" );
-		hoverScrollArrowBackground = UIManager.getColor( "PopupMenu.hoverScrollArrowBackground" );
-
-		LayoutManager layout = popupMenu.getLayout();
-		if( layout == null || layout instanceof UIResource )
-			popupMenu.setLayout( new FlatMenuLayout( popupMenu, BoxLayout.Y_AXIS ) );
-	}
-
-	@Override
-	protected void uninstallDefaults() {
-		super.uninstallDefaults();
-
-		scrollArrowColor = null;
-		hoverScrollArrowBackground = null;
-	}
-
 	@Override
 	protected void installListeners() {
 		super.installListeners();
@@ -183,269 +106,4 @@ public class FlatPopupMenuUI
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
 		return FlatStylingSupport.getAnnotatedStyleableInfos( this, popupMenu.getBorder() );
 	}
-
-	@Override
-	public Popup getPopup( JPopupMenu popup, int x, int y ) {
-		// do not add scroller to combobox popups or to popups that already have a scroll pane
-		if( popup instanceof BasicComboPopup ||
-			(popup.getComponentCount() > 0 && popup.getComponent( 0 ) instanceof JScrollPane) )
-		  return super.getPopup( popup, x, y );
-
-		// do not add scroller if popup fits into screen
-		Dimension prefSize = popup.getPreferredSize();
-		int screenHeight = getScreenHeightAt( x, y );
-		if( prefSize.height <= screenHeight )
-			return super.getPopup( popup, x, y );
-
-		// create scroller
-		FlatPopupScroller scroller = new FlatPopupScroller( popup );
-		scroller.setPreferredSize( new Dimension( prefSize.width, screenHeight ) );
-
-		// create popup
-		PopupFactory popupFactory = PopupFactory.getSharedInstance();
-		return popupFactory.getPopup( popup.getInvoker(), scroller, x, y );
-	}
-
-	private int getScreenHeightAt( int x, int y ) {
-		// find GraphicsConfiguration at popup location (similar to JPopupMenu.getCurrentGraphicsConfiguration())
-		GraphicsConfiguration gc = null;
-		for( GraphicsDevice device : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices() ) {
-			if( device.getType() == GraphicsDevice.TYPE_RASTER_SCREEN ) {
-				GraphicsConfiguration dgc = device.getDefaultConfiguration();
-				if( dgc.getBounds().contains( x, y ) ) {
-					gc = dgc;
-					break;
-				}
-			}
-		}
-		if( gc == null && popupMenu.getInvoker() != null )
-			gc = popupMenu.getInvoker().getGraphicsConfiguration();
-
-		// compute screen height
-		// (always subtract screen insets because there is no API to detect whether
-		// the popup can overlap the taskbar; see JPopupMenu.canPopupOverlapTaskBar())
-		Toolkit toolkit = Toolkit.getDefaultToolkit();
-		Rectangle screenBounds = (gc != null) ? gc.getBounds() : new Rectangle( toolkit.getScreenSize() );
-		Insets screenInsets = Toolkit.getDefaultToolkit().getScreenInsets( gc );
-		return screenBounds.height - screenInsets.top - screenInsets.bottom;
-	}
-
-	//---- class FlatMenuLayout -----------------------------------------------
-
-	protected static class FlatMenuLayout
-		extends DefaultMenuLayout
-	{
-		public FlatMenuLayout( Container target, int axis ) {
-			super( target, axis );
-		}
-
-		@Override
-		public Dimension preferredLayoutSize( Container target ) {
-			FlatMenuItemRenderer.clearClientProperties( target );
-
-			return super.preferredLayoutSize( target );
-		}
-	}
-
-	//---- class FlatPopupScroller --------------------------------------------
-
-	private class FlatPopupScroller
-		extends JPanel
-		implements MouseWheelListener, PopupMenuListener, MenuKeyListener
-	{
-		private final JPopupMenu popup;
-
-		private final JScrollPane scrollPane;
-		private final JButton scrollUpButton;
-		private final JButton scrollDownButton;
-		private int unitIncrement;
-
-		FlatPopupScroller( JPopupMenu popup ) {
-			super( new BorderLayout() );
-			this.popup = popup;
-
-			// this panel is required to avoid that JPopupMenu.setLocation() will be invoked
-			// while scrolling, because this would call JPopupMenu.showPopup()
-			JPanel view = new JPanel( new BorderLayout() );
-			view.add( popup, BorderLayout.CENTER );
-
-			scrollPane = new JScrollPane( view, JScrollPane.VERTICAL_SCROLLBAR_NEVER, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
-			scrollPane.setBorder( null );
-
-			scrollUpButton = new ArrowButton( SwingConstants.NORTH );
-			scrollDownButton = new ArrowButton( SwingConstants.SOUTH );
-
-			add( scrollPane, BorderLayout.CENTER );
-			add( scrollUpButton, BorderLayout.NORTH );
-			add( scrollDownButton, BorderLayout.SOUTH );
-
-			setBackground( popup.getBackground() );
-			setBorder( popup.getBorder() );
-			popup.setBorder( null );
-
-			popup.addPopupMenuListener( this );
-			popup.addMouseWheelListener( this );
-			popup.addMenuKeyListener( this );
-
-			updateArrowButtons();
-		}
-
-		void scroll( int unitsToScroll ) {
-			if( unitIncrement == 0 )
-				unitIncrement = new JMenuItem( "X" ).getPreferredSize().height;
-
-			JViewport viewport = scrollPane.getViewport();
-			Point viewPosition = viewport.getViewPosition();
-			int newY = viewPosition.y + (unitIncrement * unitsToScroll);
-			if( newY < 0 )
-				newY = 0;
-			else
-				newY = Math.min( newY, viewport.getViewSize().height - viewport.getExtentSize().height );
-			viewport.setViewPosition( new Point( viewPosition.x, newY ) );
-
-			updateArrowButtons();
-		}
-
-		void updateArrowButtons() {
-			JViewport viewport = scrollPane.getViewport();
-			Point viewPosition = viewport.getViewPosition();
-
-			scrollUpButton.setVisible( viewPosition.y > 0 );
-			scrollDownButton.setVisible( viewPosition.y < viewport.getViewSize().height - viewport.getExtentSize().height );
-		}
-
-		//---- interface PopupMenuListener ----
-
-		@Override
-		public void popupMenuWillBecomeInvisible( PopupMenuEvent e ) {
-			// restore popup border
-			popup.setBorder( getBorder() );
-
-			popup.removePopupMenuListener( this );
-			popup.removeMouseWheelListener( this );
-			popup.removeMenuKeyListener( this );
-		}
-
-		@Override public void popupMenuWillBecomeVisible( PopupMenuEvent e ) {}
-		@Override public void popupMenuCanceled( PopupMenuEvent e ) {}
-
-		//---- interface MouseWheelListener ----
-
-		/**
-		 * Scroll when user rotates mouse wheel.
-		 */
-		@Override
-		public void mouseWheelMoved( MouseWheelEvent e ) {
-			// convert mouse location before scrolling
-			Point mouseLocation = SwingUtilities.convertPoint( (Component) e.getSource(), e.getPoint(), this );
-
-			// scroll
-			scroll( e.getUnitsToScroll() );
-
-			// select menu item at mouse location
-			Component c = SwingUtilities.getDeepestComponentAt( this, mouseLocation.x, mouseLocation.y );
-			if( c instanceof JMenuItem ) {
-				ButtonUI ui = ((JMenuItem)c).getUI();
-				if( ui instanceof BasicMenuItemUI )
-					MenuSelectionManager.defaultManager().setSelectedPath( ((BasicMenuItemUI)ui).getPath() );
-			}
-
-			// this avoids that the popup is closed when running on Java 8
-			// https://bugs.openjdk.java.net/browse/JDK-8075063
-			e.consume();
-		}
-
-		//---- interface MenuKeyListener ----
-
-		/**
-		 * Scroll when user presses Up or Down keys.
-		 */
-		@Override
-		public void menuKeyPressed( MenuKeyEvent e ) {
-			// use invokeLater() because menu selection is not yet updated because
-			// this listener is invoked before another listener that updates the menu selection
-			EventQueue.invokeLater( () -> {
-				if( !isDisplayable() )
-					return;
-
-				MenuElement[] path = MenuSelectionManager.defaultManager().getSelectedPath();
-				if( path.length == 0 )
-					return;
-
-				// scroll selected menu item to visible area
-				Component c = path[path.length - 1].getComponent();
-				JViewport viewport = scrollPane.getViewport();
-				Point pt = SwingUtilities.convertPoint( c, 0, 0, viewport );
-				viewport.scrollRectToVisible( new Rectangle( pt, c.getSize() ) );
-
-				// update arrow buttons
-				boolean upVisible = scrollUpButton.isVisible();
-				updateArrowButtons();
-				if( !upVisible && scrollUpButton.isVisible() ) {
-					// if "up" button becomes visible, make sure that bottom menu item stays visible
-					Point viewPosition = viewport.getViewPosition();
-					int newY = viewPosition.y + scrollUpButton.getPreferredSize().height;
-					viewport.setViewPosition( new Point( viewPosition.x, newY ) );
-				}
-			} );
-		}
-
-		@Override public void menuKeyTyped( MenuKeyEvent e ) {}
-		@Override public void menuKeyReleased( MenuKeyEvent e ) {}
-
-		//---- class ArrowButton ----------------------------------------------
-
-		private class ArrowButton
-			extends FlatArrowButton
-			implements MouseListener, ActionListener
-		{
-			private Timer timer;
-
-			ArrowButton( int direction ) {
-				super( direction, arrowType, scrollArrowColor, null, null, hoverScrollArrowBackground, null, null );
-
-				addMouseListener( this );
-			}
-
-			@Override
-			public void paint( Graphics g ) {
-				// always fill background to paint over border on HiDPI screens
-				g.setColor( popup.getBackground() );
-				g.fillRect( 0, 0, getWidth(), getHeight() );
-
-				super.paint( g );
-			}
-
-			//---- interface MouseListener ----
-
-			@Override public void mouseClicked( MouseEvent e ) {}
-			@Override public void mousePressed( MouseEvent e ) {}
-			@Override public void mouseReleased( MouseEvent e ) {}
-
-			@Override
-			public void mouseEntered( MouseEvent e ) {
-				if( timer == null )
-					timer = new Timer( 50, this );
-				timer.start();
-			}
-
-			@Override
-			public void mouseExited( MouseEvent e ) {
-				if( timer != null )
-					timer.stop();
-			}
-
-			//---- interface ActionListener ----
-
-			@Override
-			public void actionPerformed( ActionEvent e ) {
-				if( timer != null && !isDisplayable() ) {
-					timer.stop();
-					return;
-				}
-
-				scroll( direction == SwingConstants.NORTH ? -1 : 1 );
-			}
-		}
-	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonMenuItemUI.java
@@ -89,7 +89,6 @@ public class FlatRadioButtonMenuItemUI
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();

-		FlatMenuItemRenderer.clearClientProperties( menuItem.getParent() );
 		renderer = null;
 		oldStyleValues = null;
 	}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java
@@ -139,7 +139,7 @@ public class FlatRadioButtonUI
 			case FlatClientProperties.STYLE_CLASS:
 				if( shared && FlatStylingSupport.hasStyleProperty( b ) ) {
 					// unshare component UI if necessary
-					// updateUI() invokes installStyle() from installUI()
+					// updateUI() invokes applyStyle() from installUI()
 					b.updateUI();
 				} else
 					installStyle( b );
@@ -199,7 +199,7 @@ public class FlatRadioButtonUI
 		return infos;
 	}

-	private static final Insets tempInsets = new Insets( 0, 0, 0, 0 );
+	private static Insets tempInsets = new Insets( 0, 0, 0, 0 );

 	@Override
 	public Dimension getPreferredSize( JComponent c ) {
@@ -212,7 +212,7 @@ public class FlatRadioButtonUI
 		if( focusWidth > 0 ) {
 			// Increase preferred width and height if insets were explicitly reduced (e.g. with
 			// an EmptyBorder) and icon has a focus width, which is not included in icon size.
-			// Otherwise, the component may be too small and outer focus border may be cut off.
+			// Otherwise the component may be too small and outer focus border may be cut off.
 			Insets insets = c.getInsets( tempInsets );
 			size.width += Math.max( focusWidth - insets.left, 0 ) + Math.max( focusWidth - insets.right, 0 );
 			size.height += Math.max( focusWidth - insets.top, 0 ) + Math.max( focusWidth - insets.bottom, 0 );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRootPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRootPaneUI.java
@@ -161,26 +161,13 @@ public class FlatRootPaneUI
 			c.putClientProperty( "jetbrains.awt.windowDarkAppearance", FlatLaf.isLafDark() );
 	}

-	@Override
-	protected void uninstallDefaults( JRootPane c ) {
-		super.uninstallDefaults( c );
-
-		// uninstall background, foreground and font because not all Lafs set them
-		if( c.isBackgroundSet() && c.getBackground() instanceof UIResource )
-			c.setBackground( null );
-		if( c.isForegroundSet() && c.getForeground() instanceof UIResource )
-			c.setForeground( null );
-		if( c.isFontSet() && c.getFont() instanceof UIResource )
-			c.setFont( null );
-	}
-
 	@Override
 	protected void installListeners( JRootPane root ) {
 		super.installListeners( root );

 		if( SystemInfo.isJava_9_orLater ) {
-			// On HiDPI screens, where scaling is used, there may be white lines on the
-			// bottom and on the right side of the window when it is initially shown.
+			// On HiDPI screens, where scaling is used, there may be white lines at the
+			// bottom and at the right side of the window when it is initially shown.
 			// This is very disturbing in dark themes, but hard to notice in light themes.
 			// Seems to be a rounding issue when Swing adds dirty region of window
 			// using RepaintManager.nativeAddDirtyRegion().
@@ -510,7 +497,7 @@ public class FlatRootPaneUI
 				return;

 			Container parent = c.getParent();
-			boolean active = parent instanceof Window && ((Window)parent).isActive();
+			boolean active = parent instanceof Window ? ((Window)parent).isActive() : false;

 			g.setColor( FlatUIUtils.deriveColor( active ? activeBorderColor : inactiveBorderColor, baseBorderColor ) );
 			HiDPIUtils.paintAtScale1x( (Graphics2D) g, x, y, width, height, this::paintImpl );
@@ -522,7 +509,9 @@ public class FlatRootPaneUI

 		protected boolean isWindowMaximized( Component c ) {
 			Container parent = c.getParent();
-			return parent instanceof Frame && (((Frame)parent).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0;
+			return parent instanceof Frame
+				? (((Frame)parent).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0
+				: false;
 		}
 	}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
@@ -47,7 +47,7 @@ import com.formdev.flatlaf.util.UIScale;
 * <!-- BasicScrollBarUI -->
 *
 * @uiDefault ScrollBar.background			Color
- * @uiDefault ScrollBar.foreground			Color	unused
+ * @uiDefault ScrollBar.foreground			Color
 * @uiDefault ScrollBar.track				Color
 * @uiDefault ScrollBar.thumb				Color
 * @uiDefault ScrollBar.width				int
@@ -57,7 +57,6 @@ import com.formdev.flatlaf.util.UIScale;
 *
 * <!-- FlatScrollBarUI -->
 *
- * @uiDefault ScrollBar.minimumButtonSize			Dimension
 * @uiDefault ScrollBar.trackInsets					Insets
 * @uiDefault ScrollBar.thumbInsets					Insets
 * @uiDefault ScrollBar.trackArc					int
@@ -84,7 +83,6 @@ public class FlatScrollBarUI
 	// overrides BasicScrollBarUI.supportsAbsolutePositioning (which is private)
 	@Styleable protected boolean allowsAbsolutePositioning;

-	/** @since 2.1 */ @Styleable protected Dimension minimumButtonSize;
 	@Styleable protected Insets trackInsets;
 	@Styleable protected Insets thumbInsets;
 	@Styleable protected int trackArc;
@@ -144,7 +142,6 @@ public class FlatScrollBarUI

 		allowsAbsolutePositioning = super.getSupportsAbsolutePositioning();

-		minimumButtonSize = UIManager.getDimension( "ScrollBar.minimumButtonSize" );
 		trackInsets = UIManager.getInsets( "ScrollBar.trackInsets" );
 		thumbInsets = UIManager.getInsets( "ScrollBar.thumbInsets" );
 		trackArc = UIManager.getInt( "ScrollBar.trackArc" );
@@ -174,7 +171,6 @@ public class FlatScrollBarUI
 	protected void uninstallDefaults() {
 		super.uninstallDefaults();

-		minimumButtonSize = null;
 		trackInsets = null;
 		thumbInsets = null;
 		hoverTrackColor = null;
@@ -455,6 +451,7 @@ public class FlatScrollBarUI
 			super( direction, type, foreground, disabledForeground,
 				hoverForeground, hoverBackground, pressedForeground, pressedBackground );

+			setArrowWidth( FlatArrowButton.DEFAULT_ARROW_WIDTH - 2 );
 			setFocusable( false );
 			setRequestFocusEnabled( false );
 		}
@@ -464,18 +461,6 @@ public class FlatScrollBarUI
 				null, hoverButtonBackground, null, pressedButtonBackground );
 		}

-		@Override
-		public int getArrowWidth() {
-			// scale arrow size depending on scroll bar width
-			// (6 is default arrow width; 10 is base scroll bar width)
-			int arrowWidth = Math.round( 6 * (scrollBarWidth / 10f) );
-
-			// compute arrow size that leaves equal space on both sides (arrow is centered)
-			arrowWidth = scrollBarWidth - (((scrollBarWidth - arrowWidth) / 2) * 2);
-
-			return arrowWidth;
-		}
-
 		@Override
 		protected Color deriveBackground( Color background ) {
 			return FlatUIUtils.deriveColor( background, scrollbar.getBackground() );
@@ -484,9 +469,8 @@ public class FlatScrollBarUI
 		@Override
 		public Dimension getPreferredSize() {
 			if( isShowButtons() ) {
-				int w = UIScale.scale( Math.max( scrollBarWidth, (minimumButtonSize != null) ? minimumButtonSize.width : 0 ) );
-				int h = UIScale.scale( Math.max( scrollBarWidth, (minimumButtonSize != null) ? minimumButtonSize.height : 0 ) );
-				return new Dimension( w, h );
+				int w = UIScale.scale( scrollBarWidth );
+				return new Dimension( w, w );
 			} else
 				return new Dimension();
 		}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java
@@ -291,10 +291,6 @@ public class FlatScrollPaneUI
 					}
 					break;

-				case FlatClientProperties.OUTLINE:
-					scrollpane.repaint();
-					break;
-
 				case FlatClientProperties.STYLE:
 				case FlatClientProperties.STYLE_CLASS:
 					installStyle();
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java
@@ -21,7 +21,6 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Map;
 import javax.swing.JComponent;
@@ -29,7 +28,6 @@ import javax.swing.JSeparator;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicSeparatorUI;
-import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.LoggingFacade;
@@ -52,7 +50,7 @@ import com.formdev.flatlaf.util.LoggingFacade;
 */
 public class FlatSeparatorUI
 	extends BasicSeparatorUI
-	implements StyleableUI, PropertyChangeListener
+	implements StyleableUI
 {
 	@Styleable protected int height;
 	@Styleable protected int stripeWidth;
@@ -60,6 +58,7 @@ public class FlatSeparatorUI

 	private final boolean shared;
 	private boolean defaults_initialized = false;
+	private PropertyChangeListener propertyChangeListener;
 	private Map<String, Object> oldStyleValues;

 	public static ComponentUI createUI( JComponent c ) {
@@ -110,33 +109,28 @@ public class FlatSeparatorUI
 	protected void installListeners( JSeparator s ) {
 		super.installListeners( s );

-		s.addPropertyChangeListener( this );
+		propertyChangeListener = FlatStylingSupport.createPropertyChangeListener(
+			s, () -> stylePropertyChange( s ), null );
+		s.addPropertyChangeListener( propertyChangeListener );
 	}

 	@Override
 	protected void uninstallListeners( JSeparator s ) {
 		super.uninstallListeners( s );

-		s.removePropertyChangeListener( this );
+		s.removePropertyChangeListener( propertyChangeListener );
+		propertyChangeListener = null;
 	}

-	/** @since 2.0.1 */
-	@Override
-	public void propertyChange( PropertyChangeEvent e ) {
-		switch( e.getPropertyName() ) {
-			case FlatClientProperties.STYLE:
-			case FlatClientProperties.STYLE_CLASS:
-				JSeparator s = (JSeparator) e.getSource();
-				if( shared && FlatStylingSupport.hasStyleProperty( s ) ) {
-					// unshare component UI if necessary
-					// updateUI() invokes installStyle() from installUI()
-					s.updateUI();
-				} else
-					installStyle( s );
-				s.revalidate();
-				s.repaint();
-				break;
-		}
+	private void stylePropertyChange( JSeparator s ) {
+		if( shared && FlatStylingSupport.hasStyleProperty( s ) ) {
+			// unshare component UI if necessary
+			// updateUI() invokes applyStyle() from installUI()
+			s.updateUI();
+		} else
+			installStyle( s );
+		s.revalidate();
+		s.repaint();
 	}

 	/** @since 2 */
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java
@@ -234,7 +234,7 @@ public class FlatSliderUI
 			return -1;

 		// use default font (instead of slider font) because the slider font size
-		// may be different to label font size, but we want to align the track/thumb with labels
+		// may be different to label font size, but we want align the track/thumb with labels
 		Font font = UIManager.getFont( "defaultFont" );
 		if( font == null )
 			font = slider.getFont();
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java
@@ -71,7 +71,7 @@ import com.formdev.flatlaf.util.LoggingFacade;
 * @uiDefault Spinner.disabledBackground		Color
 * @uiDefault Spinner.disabledForeground		Color
 * @uiDefault Spinner.focusedBackground			Color	optional
- * @uiDefault Spinner.buttonBackground			Color	optional
+ * @uiDefault Spinner.buttonBackground			Color
 * @uiDefault Spinner.buttonSeparatorWidth		int or float	optional; defaults to Component.borderWidth
 * @uiDefault Spinner.buttonSeparatorColor		Color	optional
 * @uiDefault Spinner.buttonDisabledSeparatorColor Color	optional
@@ -293,7 +293,9 @@ public class FlatSpinnerUI
 			return true;

 		JTextField textField = getEditorTextField( spinner.getEditor() );
-		return textField != null && FlatUIUtils.isPermanentFocusOwner( textField );
+		return (textField != null)
+			? FlatUIUtils.isPermanentFocusOwner( textField )
+			: false;
 	}

 	protected Color getBackground( boolean enabled ) {
@@ -383,7 +385,7 @@ public class FlatSpinnerUI
 			boolean isLeftToRight = spinner.getComponentOrientation().isLeftToRight();

 			// paint arrow buttons background
-			if( enabled && buttonBackground != null ) {
+			if( enabled ) {
 				g2.setColor( buttonBackground );
 				Shape oldClip = g2.getClip();
 				if( isLeftToRight )
@@ -396,7 +398,7 @@ public class FlatSpinnerUI

 			// paint vertical line between value and arrow buttons
 			Color separatorColor = enabled ? buttonSeparatorColor : buttonDisabledSeparatorColor;
-			if( separatorColor != null && buttonSeparatorWidth > 0 ) {
+			if( separatorColor != null ) {
 				g2.setColor( separatorColor );
 				float lw = scale( buttonSeparatorWidth );
 				float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw;
@@ -445,7 +447,7 @@ public class FlatSpinnerUI
 			Insets padding = scale( FlatSpinnerUI.this.padding );
 			Dimension editorSize = (editor != null) ? editor.getPreferredSize() : new Dimension( 0, 0 );

-			// the arrow buttons width is the same as the inner height so that the arrow buttons area is square
+			// the arrows width is the same as the inner height so that the arrows area is square
 			int minimumWidth = FlatUIUtils.minimumWidth( spinner, FlatSpinnerUI.this.minimumWidth );
 			int innerHeight = editorSize.height + padding.top + padding.bottom;
 			float focusWidth = FlatUIUtils.getBorderFocusWidth( spinner );
@@ -536,7 +538,6 @@ public class FlatSpinnerUI
 					break;

 				case FlatClientProperties.COMPONENT_ROUND_RECT:
-				case FlatClientProperties.OUTLINE:
 					spinner.repaint();
 					break;

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStylingSupport.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStylingSupport.java
@@ -359,7 +359,7 @@ public class FlatStylingSupport
 	 * @param key the name of the field
 	 * @param value the new value
 	 * @return the old value of the field
-	 * @throws UnknownStyleException if object does not have an annotated field with given name
+	 * @throws UnknownStyleException if object does not have a annotated field with given name
 	 * @throws IllegalArgumentException if value type does not fit to expected type
 	 */
 	public static Object applyToAnnotatedObject( Object obj, String key, Object value )
@@ -517,7 +517,7 @@ public class FlatStylingSupport
 	 * @param key the name of the field
 	 * @param value the new value
 	 * @return the old value of the field
-	 * @throws UnknownStyleException if object does not have an annotated field with given name
+	 * @throws UnknownStyleException if object does not have a annotated field with given name
 	 * @throws IllegalArgumentException if value type does not fit to expected type
 	 */
 	public static Object applyToAnnotatedObjectOrComponent( Object obj, Object comp, String key, Object value )
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
@@ -650,7 +650,7 @@ public class FlatTabbedPaneUI
 				case "tabIconPlacement": value = parseTabIconPlacement( (String) value ); break;
 			}
 		} else {
-			Object oldValue;
+			Object oldValue = null;
 			switch( key ) {
 				// BasicTabbedPaneUI
 				case "tabInsets": oldValue = tabInsets; tabInsets = (Insets) value; return oldValue;
@@ -1841,7 +1841,7 @@ public class FlatTabbedPaneUI
 			super( direction, arrowType,
 				FlatTabbedPaneUI.this.foreground, FlatTabbedPaneUI.this.disabledForeground,
 				null, buttonHoverBackground, null, buttonPressedBackground );
-			setArrowWidth( 11 );
+			setArrowWidth( 10 );
 		}

 		protected void updateStyle() {
@@ -1983,7 +1983,7 @@ public class FlatTabbedPaneUI
 		}

 		protected JMenuItem createTabMenuItem( int tabIndex ) {
-			// search for tab name in these places
+			// search for tab name in this places
 			//   1. tab title
 			//   2. text of label or text component in custom tab component (including children)
 			//   3. accessible name of tab
@@ -2016,7 +2016,7 @@ public class FlatTabbedPaneUI
 				menuItem.setOpaque( true );
 			}

-			if( !tabPane.isEnabled() || !tabPane.isEnabledAt( tabIndex ) )
+			if( !tabPane.isEnabledAt( tabIndex ) )
 				menuItem.setEnabled( false );

 			menuItem.addActionListener( e -> selectTab( tabIndex ) );
@@ -2412,7 +2412,7 @@ public class FlatTabbedPaneUI
 			if( tabPane == null || tabViewport == null )
 				return;

-			if( !scrolled )
+			if( !scrolled || tabViewport == null )
 				return;
 			scrolled = false;

@@ -2525,7 +2525,9 @@ public class FlatTabbedPaneUI
 			setRolloverTab( tabIndex );

 			// check whether mouse hit tab close area
-			boolean hitClose = isTabClosable( tabIndex ) && getTabCloseHitArea( tabIndex ).contains( x, y );
+			boolean hitClose = isTabClosable( tabIndex )
+				? getTabCloseHitArea( tabIndex ).contains( x, y )
+				: false;
 			if( e.getID() == MouseEvent.MOUSE_PRESSED )
 				pressedTabIndex = hitClose ? tabIndex : -1;
 			setRolloverTabClose( hitClose );
@@ -2548,7 +2550,8 @@ public class FlatTabbedPaneUI
 			if( tabIndex == lastTipTabIndex )
 				return; // closeTip already set

-			restoreTabToolTip();
+			if( tabIndex != lastTipTabIndex )
+				restoreTabToolTip();

 			lastTipTabIndex = tabIndex;
 			lastTip = tabPane.getToolTipTextAt( lastTipTabIndex );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableCellBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableCellBorder.java
@@ -37,7 +37,7 @@ import javax.swing.plaf.TableUI;
 public class FlatTableCellBorder
 	extends FlatLineBorder
 {
-	/** @since 2 */ protected boolean showCellFocusIndicator = UIManager.getBoolean( "Table.showCellFocusIndicator" );
+	protected boolean showCellFocusIndicator = UIManager.getBoolean( "Table.showCellFocusIndicator" );

 	private Component c;

@@ -72,7 +72,7 @@ public class FlatTableCellBorder
 	}

 	/**
-	 * Because this border is always shared for all tables,
+	 * Because this borders are always shared for all tables,
 	 * get border specific style from FlatTableUI.
 	 */
 	static <T> T getStyleFromTableUI( Component c, Function<FlatTableUI, T> f ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderBorder.java
@@ -141,8 +141,8 @@ public class FlatTableHeaderBorder
 	protected boolean hideTrailingVerticalLine( JTableHeader header ) {
 		if( header.getUI() instanceof FlatTableHeaderUI ) {
 			FlatTableHeaderUI ui = (FlatTableHeaderUI) header.getUI();
-			if( ui.showTrailingVerticalLine != null )
-				return !ui.showTrailingVerticalLine;
+			if( ui.showTrailingVerticalLine )
+				return false;
 		}

 		if( showTrailingVerticalLine )
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableHeaderUI.java
@@ -84,14 +84,14 @@ public class FlatTableHeaderUI
 	@Styleable(type=String.class) protected int sortIconPosition;

 	// for FlatTableHeaderBorder
-	/** @since 2 */ @Styleable protected Insets cellMargins;
-	/** @since 2 */ @Styleable protected Color separatorColor;
-	/** @since 2 */ @Styleable protected Boolean showTrailingVerticalLine;
+	@Styleable protected Insets cellMargins;
+	@Styleable protected Color separatorColor;
+	/** @since 2 */ @Styleable protected boolean showTrailingVerticalLine;

 	// for FlatAscendingSortIcon and FlatDescendingSortIcon
 	// (needs to be public because icon classes are in another package)
-	/** @since 2 */ @Styleable public String arrowType;
-	/** @since 2 */ @Styleable public Color sortIconColor;
+	@Styleable public String arrowType;
+	@Styleable public Color sortIconColor;

 	private PropertyChangeListener propertyChangeListener;
 	private Map<String, Object> oldStyleValues;
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java
@@ -108,9 +108,9 @@ public class FlatTableUI
 	@Styleable protected Color selectionInactiveForeground;

 	// for FlatTableCellBorder
-	/** @since 2 */ @Styleable protected Insets cellMargins;
-	/** @since 2 */ @Styleable protected Color cellFocusColor;
-	/** @since 2 */ @Styleable protected Boolean showCellFocusIndicator;
+	@Styleable protected Insets cellMargins;
+	@Styleable protected Color cellFocusColor;
+	@Styleable protected boolean showCellFocusIndicator;

 	private boolean oldShowHorizontalLines;
 	private boolean oldShowVerticalLines;
@@ -288,7 +288,7 @@ public class FlatTableUI
 	/**
 	 * Toggle selection colors from focused to inactive and vice versa.
 	 *
-	 * This is not an optimal solution but much easier than rewriting the whole paint methods.
+	 * This is not a optimal solution but much easier than rewriting the whole paint methods.
 	 *
 	 * Using a LaF specific renderer was avoided because often a custom renderer is
 	 * already used in applications. Then either the inactive colors are not used,
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
@@ -19,40 +19,29 @@ package com.formdev.flatlaf.ui;
 import static com.formdev.flatlaf.FlatClientProperties.*;
 import static com.formdev.flatlaf.util.UIScale.scale;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Container;
-import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
-import java.awt.LayoutManager;
-import java.awt.LayoutManager2;
 import java.awt.Rectangle;
 import java.awt.event.FocusListener;
 import java.beans.PropertyChangeEvent;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
 import javax.swing.Icon;
-import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JSpinner;
 import javax.swing.JTextField;
-import javax.swing.JToggleButton;
-import javax.swing.JToolBar;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicTextFieldUI;
 import javax.swing.text.Caret;
-import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
@@ -105,12 +94,6 @@ public class FlatTextFieldUI

 	/** @since 2 */ @Styleable protected Icon leadingIcon;
 	/** @since 2 */ @Styleable protected Icon trailingIcon;
-	/** @since 2 */ protected JComponent leadingComponent;
-	/** @since 2 */ protected JComponent trailingComponent;
-	/** @since 2 */ protected JComponent clearButton;
-
-	// only used via styling (not in UI defaults, but has likewise client properties)
-	/** @since 2 */ @Styleable protected boolean showClearButton;

 	private Color oldDisabledBackground;
 	private Color oldInactiveBackground;
@@ -118,7 +101,6 @@ public class FlatTextFieldUI
 	private Insets defaultMargin;

 	private FocusListener focusListener;
-	private DocumentListener documentListener;
 	private Map<String, Object> oldStyleValues;
 	private AtomicBoolean borderShared;

@@ -133,19 +115,11 @@ public class FlatTextFieldUI
 		leadingIcon = clientProperty( c, TEXT_FIELD_LEADING_ICON, null, Icon.class );
 		trailingIcon = clientProperty( c, TEXT_FIELD_TRAILING_ICON, null, Icon.class );

-		installLeadingComponent();
-		installTrailingComponent();
-		installClearButton();
-
 		installStyle();
 	}

 	@Override
 	public void uninstallUI( JComponent c ) {
-		uninstallLeadingComponent();
-		uninstallTrailingComponent();
-		uninstallClearButton();
-
 		super.uninstallUI( c );

 		leadingIcon = null;
@@ -207,11 +181,6 @@ public class FlatTextFieldUI

 		getComponent().removeFocusListener( focusListener );
 		focusListener = null;
-
-		if( documentListener != null ) {
-			getComponent().getDocument().removeDocumentListener( documentListener );
-			documentListener = null;
-		}
 	}

 	@Override
@@ -232,7 +201,6 @@ public class FlatTextFieldUI
 		switch( e.getPropertyName() ) {
 			case PLACEHOLDER_TEXT:
 			case COMPONENT_ROUND_RECT:
-			case OUTLINE:
 			case TEXT_FIELD_PADDING:
 				c.repaint();
 				break;
@@ -257,61 +225,9 @@ public class FlatTextFieldUI
 				trailingIcon = (e.getNewValue() instanceof Icon) ? (Icon) e.getNewValue() : null;
 				c.repaint();
 				break;
-
-			case TEXT_FIELD_LEADING_COMPONENT:
-				uninstallLeadingComponent();
-				installLeadingComponent();
-				c.revalidate();
-				c.repaint();
-				break;
-
-			case TEXT_FIELD_TRAILING_COMPONENT:
-				uninstallTrailingComponent();
-				installTrailingComponent();
-				c.revalidate();
-				c.repaint();
-				break;
-
-			case TEXT_FIELD_SHOW_CLEAR_BUTTON:
-				uninstallClearButton();
-				installClearButton();
-				c.revalidate();
-				c.repaint();
-				break;
-
-			case "enabled":
-			case "editable":
-				updateClearButton();
-				break;
-
-			case "document":
-				if( documentListener != null ) {
-					if( e.getOldValue() instanceof Document )
-						((Document)e.getOldValue()).removeDocumentListener( documentListener );
-					if( e.getNewValue() instanceof Document )
-						((Document)e.getNewValue()).addDocumentListener( documentListener );
-
-					updateClearButton();
-				}
-				break;
 		}
 	}

-	/** @since 2 */
-	protected void installDocumentListener() {
-		if( documentListener != null )
-			return;
-
-		documentListener = new FlatDocumentListener();
-		getComponent().getDocument().addDocumentListener( documentListener );
-	}
-
-	/** @since 2 */
-	protected void documentChanged( DocumentEvent e ) {
-		if( clearButton != null )
-			updateClearButton();
-	}
-
 	/** @since 2 */
 	protected void installStyle() {
 		try {
@@ -330,15 +246,10 @@ public class FlatTextFieldUI
 	protected void applyStyle( Object style ) {
 		oldDisabledBackground = disabledBackground;
 		oldInactiveBackground = inactiveBackground;
-		boolean oldShowClearButton = showClearButton;

 		oldStyleValues = FlatStylingSupport.parseAndApply( oldStyleValues, style, this::applyStyleProperty );

 		updateBackground();
-		if( showClearButton != oldShowClearButton ) {
-			uninstallClearButton();
-			installClearButton();
-		}
 	}

 	/** @since 2 */
@@ -369,7 +280,7 @@ public class FlatTextFieldUI
 		if( !(oldBackground instanceof UIResource) )
 			return;

-		// do not update background if it currently has an unknown color (assigned from outside)
+		// do not update background if it currently has a unknown color (assigned from outside)
 		if( oldBackground != background &&
 			oldBackground != disabledBackground &&
 			oldBackground != inactiveBackground &&
@@ -533,16 +444,6 @@ debug*/
 		// add width of leading and trailing icons
 		size.width += getLeadingIconWidth() + getTrailingIconWidth();

-		// add width of leading and trailing components
-		for( JComponent comp : getLeadingComponents() ) {
-			if( comp != null && comp.isVisible() )
-				size.width += comp.getPreferredSize().width;
-		}
-		for( JComponent comp : getTrailingComponents() ) {
-			if( comp != null && comp.isVisible() )
-				size.width += comp.getPreferredSize().width;
-		}
-
 		return size;
 	}

@@ -609,8 +510,7 @@ debug*/
 	/**
 	 * Returns the rectangle used to paint leading and trailing icons.
 	 * It invokes {@code super.getVisibleEditorRect()} and reduces left and/or
-	 * right margin if the text field has leading or trailing icons or components.
-	 * Also, the preferred widths of leading and trailing components are removed.
+	 * right margin if the text field has leading or trailing icons.
 	 *
 	 * @since 2
 	 */
@@ -619,31 +519,10 @@ debug*/
 		if( r == null )
 			return null;

-		boolean ltr = isLeftToRight();
-
-		// remove width of leading/trailing components
-		JComponent[] leftComponents = ltr ? getLeadingComponents() : getTrailingComponents();
-		JComponent[] rightComponents = ltr ? getTrailingComponents() : getLeadingComponents();
-		boolean leftVisible = false;
-		boolean rightVisible = false;
-		for( JComponent leftComponent : leftComponents ) {
-			if( leftComponent != null && leftComponent.isVisible() ) {
-				int w = leftComponent.getPreferredSize().width;
-				r.x += w;
-				r.width -= w;
-				leftVisible = true;
-			}
-		}
-		for( JComponent rightComponent : rightComponents ) {
-			if( rightComponent != null && rightComponent.isVisible() ) {
-				r.width -= rightComponent.getPreferredSize().width;
-				rightVisible = true;
-			}
-		}
-
-		// if a leading/trailing icons (or components) are shown, then the left/right margins are reduced
+		// if a leading/trailing icon is shown, then the left/right margin is reduced
 		// to the top margin, which places the icon nicely centered on left/right side
-		if( leftVisible || (ltr ? hasLeadingIcon() : hasTrailingIcon()) ) {
+		boolean ltr = isLeftToRight();
+		if( ltr ? hasLeadingIcon() : hasTrailingIcon() ) {
 			// reduce left margin
 			Insets margin = getComponent().getMargin();
 			int newLeftMargin = Math.min( margin.left, margin.top );
@@ -653,7 +532,7 @@ debug*/
 				r.width += diff;
 			}
 		}
-		if( rightVisible || (ltr ? hasTrailingIcon() : hasLeadingIcon()) ) {
+		if( ltr ? hasTrailingIcon() : hasLeadingIcon() ) {
 			// reduce right margin
 			Insets margin = getComponent().getMargin();
 			int newRightMargin = Math.min( margin.right, margin.top );
@@ -661,10 +540,6 @@ debug*/
 				r.width += scale( margin.right - newRightMargin );
 		}

-		// make sure that width and height are not negative
-		r.width = Math.max( r.width, 0 );
-		r.height = Math.max( r.height, 0 );
-
 		return r;
 	}

@@ -703,266 +578,4 @@ debug*/
 		if( caret instanceof FlatCaret )
 			((FlatCaret)caret).scrollCaretToVisible();
 	}
-
-	/** @since 2 */
-	protected void installLeadingComponent() {
-		JTextComponent c = getComponent();
-		leadingComponent = clientProperty( c, TEXT_FIELD_LEADING_COMPONENT, null, JComponent.class );
-		if( leadingComponent != null ) {
-			prepareLeadingOrTrailingComponent( leadingComponent );
-			installLayout();
-			c.add( leadingComponent );
-		}
-	}
-
-	/** @since 2 */
-	protected void installTrailingComponent() {
-		JTextComponent c = getComponent();
-		trailingComponent = clientProperty( c, TEXT_FIELD_TRAILING_COMPONENT, null, JComponent.class );
-		if( trailingComponent != null ) {
-			prepareLeadingOrTrailingComponent( trailingComponent );
-			installLayout();
-			c.add( trailingComponent );
-		}
-	}
-
-	/** @since 2 */
-	protected void uninstallLeadingComponent() {
-		if( leadingComponent != null ) {
-			getComponent().remove( leadingComponent );
-			leadingComponent = null;
-		}
-	}
-
-	/** @since 2 */
-	protected void uninstallTrailingComponent() {
-		if( trailingComponent != null ) {
-			getComponent().remove( trailingComponent );
-			trailingComponent = null;
-		}
-	}
-
-	/** @since 2 */
-	protected void installClearButton() {
-		JTextComponent c = getComponent();
-		if( clientPropertyBoolean( c, TEXT_FIELD_SHOW_CLEAR_BUTTON, showClearButton ) ) {
-			clearButton = createClearButton();
-			updateClearButton();
-			installDocumentListener();
-			installLayout();
-			c.add( clearButton );
-		}
-	}
-
-	/** @since 2 */
-	protected void uninstallClearButton() {
-		if( clearButton != null ) {
-			getComponent().remove( clearButton );
-			clearButton = null;
-		}
-	}
-
-	/** @since 2 */
-	protected JComponent createClearButton() {
-		JButton button = new JButton();
-		button.setName( "TextField.clearButton" );
-		button.putClientProperty( STYLE_CLASS, "clearButton" );
-		button.putClientProperty( BUTTON_TYPE, BUTTON_TYPE_TOOLBAR_BUTTON );
-		button.setCursor( Cursor.getDefaultCursor() );
-		button.addActionListener( e -> clearButtonClicked() );
-		return button;
-	}
-
-	/** @since 2 */
-	@SuppressWarnings( "unchecked" )
-	protected void clearButtonClicked() {
-		JTextComponent c = getComponent();
-		Object callback = c.getClientProperty( TEXT_FIELD_CLEAR_CALLBACK );
-		if( callback instanceof Runnable )
-			((Runnable)callback).run();
-		else if( callback instanceof Consumer )
-			((Consumer<JTextComponent>)callback).accept( c );
-		else
-			c.setText( "" );
-	}
-
-	/** @since 2 */
-	protected void updateClearButton() {
-		if( clearButton == null )
-			return;
-
-		JTextComponent c = getComponent();
-		boolean visible = c.isEnabled() && c.isEditable() && c.getDocument().getLength() > 0;
-		if( visible != clearButton.isVisible() ) {
-			clearButton.setVisible( visible );
-			c.revalidate();
-			c.repaint();
-		}
-	}
-
-	/**
-	 * Returns components placed at the leading side of the text field.
-	 * The returned array may contain {@code null}.
-	 * The default implementation returns {@link #leadingComponent}.
-	 *
-	 * @since 2
-	 */
-	protected JComponent[] getLeadingComponents() {
-		return new JComponent[] { leadingComponent };
-	}
-
-	/**
-	 * Returns components placed at the trailing side of the text field.
-	 * The returned array may contain {@code null}.
-	 * The default implementation returns {@link #trailingComponent} and {@link #clearButton}.
-	 * <p>
-	 * <strong>Note</strong>: The components in the array must be in reverse (visual) order.
-	 *
-	 * @since 2
-	 */
-	protected JComponent[] getTrailingComponents() {
-		return new JComponent[] { trailingComponent, clearButton };
-	}
-
-	/** @since 2 */
-	protected void prepareLeadingOrTrailingComponent( JComponent c ) {
-		c.putClientProperty( STYLE_CLASS, "inTextField" );
-
-		if( c instanceof JButton || c instanceof JToggleButton ) {
-			c.putClientProperty( BUTTON_TYPE, BUTTON_TYPE_TOOLBAR_BUTTON );
-
-			if( !c.isCursorSet() )
-				c.setCursor( Cursor.getDefaultCursor() );
-		} else if( c instanceof JToolBar ) {
-			for( Component child : c.getComponents() ) {
-				if( child instanceof JComponent )
-					((JComponent)child).putClientProperty( STYLE_CLASS, "inTextField" );
-			}
-
-			if( !c.isCursorSet() )
-				c.setCursor( Cursor.getDefaultCursor() );
-		}
-	}
-
-	/** @since 2 */
-	protected void installLayout() {
-		JTextComponent c = getComponent();
-		LayoutManager oldLayout = c.getLayout();
-		if( !(oldLayout instanceof FlatTextFieldLayout) )
-			c.setLayout( new FlatTextFieldLayout( oldLayout ) );
-	}
-
-	//---- class FlatTextFieldLayout ------------------------------------------
-
-	private class FlatTextFieldLayout
-		implements LayoutManager2, UIResource
-	{
-		private final LayoutManager delegate;
-
-		FlatTextFieldLayout( LayoutManager delegate ) {
-			this.delegate = delegate;
-		}
-
-		@Override
-		public void addLayoutComponent( String name, Component comp ) {
-			if( delegate != null )
-				delegate.addLayoutComponent( name, comp );
-		}
-
-		@Override
-		public void removeLayoutComponent( Component comp ) {
-			if( delegate != null )
-				delegate.removeLayoutComponent( comp );
-		}
-
-		@Override
-		public Dimension preferredLayoutSize( Container parent ) {
-			return (delegate != null) ? delegate.preferredLayoutSize( parent ) : null;
-		}
-
-		@Override
-		public Dimension minimumLayoutSize( Container parent ) {
-			return (delegate != null) ? delegate.minimumLayoutSize( parent ) : null;
-		}
-
-		@Override
-		public void layoutContainer( Container parent ) {
-			if( delegate != null )
-				delegate.layoutContainer( parent );
-
-			int ow = FlatUIUtils.getBorderFocusAndLineWidth( getComponent() );
-			int h = parent.getHeight() - ow - ow;
-			boolean ltr = isLeftToRight();
-			JComponent[] leftComponents = ltr ? getLeadingComponents() : getTrailingComponents();
-			JComponent[] rightComponents = ltr ? getTrailingComponents() : getLeadingComponents();
-
-			// layout left components
-			int x = ow;
-			for( JComponent leftComponent : leftComponents ) {
-				if( leftComponent != null && leftComponent.isVisible() ) {
-					int cw = leftComponent.getPreferredSize().width;
-					leftComponent.setBounds( x, ow, cw, h );
-					x += cw;
-				}
-			}
-
-			// layout right components
-			x = parent.getWidth() - ow;
-			for( JComponent rightComponent : rightComponents ) {
-				if( rightComponent != null && rightComponent.isVisible() ) {
-					int cw = rightComponent.getPreferredSize().width;
-					x -= cw;
-					rightComponent.setBounds( x, ow, cw, h );
-				}
-			}
-		}
-
-		@Override
-		public void addLayoutComponent( Component comp, Object constraints ) {
-			if( delegate instanceof LayoutManager2 )
-				((LayoutManager2)delegate).addLayoutComponent( comp, constraints );
-		}
-
-		@Override
-		public Dimension maximumLayoutSize( Container target ) {
-			return (delegate instanceof LayoutManager2) ? ((LayoutManager2)delegate).maximumLayoutSize( target ) : null;
-		}
-
-		@Override
-		public float getLayoutAlignmentX( Container target ) {
-			return (delegate instanceof LayoutManager2) ? ((LayoutManager2)delegate).getLayoutAlignmentX( target ) : 0.5f;
-		}
-
-		@Override
-		public float getLayoutAlignmentY( Container target ) {
-			return (delegate instanceof LayoutManager2) ? ((LayoutManager2)delegate).getLayoutAlignmentY( target ) : 0.5f;
-		}
-
-		@Override
-		public void invalidateLayout( Container target ) {
-			if( delegate instanceof LayoutManager2 )
-				((LayoutManager2)delegate).invalidateLayout( target );
-		}
-	}
-
-	//---- class FlatDocumentListener -----------------------------------------
-
-	private class FlatDocumentListener
-		implements DocumentListener
-	{
-		@Override
-		public void insertUpdate( DocumentEvent e ) {
-			documentChanged( e );
-		}
-
-		@Override
-		public void removeUpdate( DocumentEvent e ) {
-			documentChanged( e );
-		}
-
-		@Override
-		public void changedUpdate( DocumentEvent e ) {
-			documentChanged( e );
-		}
-	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTitlePane.java
@@ -248,7 +248,7 @@ public class FlatTitlePane
 		if( rootPane.getWindowDecorationStyle() == JRootPane.FRAME ) {
 			// JRootPane.FRAME works only for frames (and not for dialogs)
 			// but at this time the owner window type is unknown (not yet added)
-			// so we add the iconify/maximize/restore buttons, and they are shown
+			// so we add the iconify/maximize/restore buttons and they are shown
 			// later in frameStateChanged(), which is invoked from addNotify()

 			buttonPanel.add( iconifyButton );
@@ -360,7 +360,7 @@ public class FlatTitlePane

 		// show/hide icon
 		iconLabel.setVisible( hasIcon );
-		leftPanel.setBorder( hasIcon ? null : FlatUIUtils.nonUIResource( new FlatEmptyBorder( 0, noIconLeftGap, 0, 0 ) ) );
+		leftPanel.setBorder( hasIcon ? null : new FlatEmptyBorder( 0, noIconLeftGap, 0, 0 ) );

 		updateNativeTitleBarHeightAndHitTestSpotsLater();
 	}
@@ -420,7 +420,7 @@ public class FlatTitlePane
 	}

 	/**
-	 * Returns whether this title pane currently has a visible and embedded menubar.
+	 * Returns whether this title pane currently has an visible and embedded menubar.
 	 */
 	protected boolean hasVisibleEmbeddedMenuBar( JMenuBar menuBar ) {
 		return menuBar != null && menuBar.isVisible() && isMenuBarEmbedded();
@@ -615,7 +615,7 @@ debug*/
 			int maximizedWidth = screenBounds.width;
 			int maximizedHeight = screenBounds.height;

-			if( SystemInfo.isWindows && !isMaximizedBoundsFixed() ) {
+			if( !isMaximizedBoundsFixed() ) {
 				// on Java 8 to 14, maximized x,y are 0,0 based on all screens in a multi-screen environment
 				maximizedX = 0;
 				maximizedY = 0;
@@ -772,7 +772,7 @@ debug*/
 				if( horizontalGlue != null ) {
 					// If menu bar is embedded and contains a horizontal glue component,
 					// then split the hit test spot into two spots so that
-					// the glue component area can be used to move the window.
+					// the glue component area can used to move the window.

 					Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, window );
 					int x2 = glueLocation.x + horizontalGlue.getWidth();
@@ -854,7 +854,7 @@ debug*/
 			} else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) )
 				insets.bottom += UIScale.scale( 1 );

-			if( !SystemInfo.isWindows_11_orLater && hasNativeCustomDecoration() && !isWindowMaximized( c ) )
+			if( hasNativeCustomDecoration() && !isWindowMaximized( c ) )
 				insets = FlatUIUtils.addInsets( insets, WindowTopBorder.getInstance().getBorderInsets() );

 			return insets;
@@ -873,7 +873,7 @@ debug*/
 				FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight );
 			}

-			if( !SystemInfo.isWindows_11_orLater && hasNativeCustomDecoration() && !isWindowMaximized( c ) )
+			if( hasNativeCustomDecoration() && !isWindowMaximized( c ) )
 				WindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height );
 		}

@@ -883,7 +883,9 @@ debug*/
 		}

 		protected boolean isWindowMaximized( Component c ) {
-			return window instanceof Frame && (((Frame) window).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0;
+			return window instanceof Frame
+				? (((Frame)window).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0
+				: false;
 		}
 	}

@@ -909,7 +911,7 @@ debug*/
 			boolean center = hasEmbeddedMenuBar ? centerTitleIfMenuBarEmbedded : centerTitle;
 			if( center ) {
 				// If window is wide enough, center title within window bounds.
-				// Otherwise, leave it centered within free space (label bounds).
+				// Otherwise leave it centered within free space (label bounds).
 				int centeredTextX = ((l.getParent().getWidth() - textWidth) / 2) - l.getX();
 				if( centeredTextX >= gap && centeredTextX + textWidth <= labelWidth - gap )
 					textX = centeredTextX;
@@ -964,7 +966,7 @@ debug*/
 			activeChanged( true );
 			updateNativeTitleBarHeightAndHitTestSpots();

-			if( !SystemInfo.isWindows_11_orLater && hasNativeCustomDecoration() )
+			if( hasNativeCustomDecoration() )
 				WindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );

 			repaintWindowBorder();
@@ -975,7 +977,7 @@ debug*/
 			activeChanged( false );
 			updateNativeTitleBarHeightAndHitTestSpots();

-			if( !SystemInfo.isWindows_11_orLater && hasNativeCustomDecoration() )
+			if( hasNativeCustomDecoration() )
 				WindowTopBorder.getInstance().repaintBorder( FlatTitlePane.this );

 			repaintWindowBorder();
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java
@@ -21,6 +21,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.beans.PropertyChangeEvent;
+import java.util.Iterator;
 import java.util.Map;
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
@@ -163,7 +164,11 @@ public class FlatToggleButtonUI
 	@Override
 	public Map<String, Class<?>> getStyleableInfos( JComponent c ) {
 		Map<String, Class<?>> infos = super.getStyleableInfos( c );
-		infos.keySet().removeIf( s -> s.startsWith( "help." ) );
+		Iterator<String> it = infos.keySet().iterator();
+		while( it.hasNext() ) {
+			if( it.next().startsWith( "help." ) )
+				it.remove();
+		}
 		return infos;
 	}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarSeparatorUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarSeparatorUI.java
@@ -22,7 +22,6 @@ import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Map;
 import javax.swing.JComponent;
@@ -32,7 +31,6 @@ import javax.swing.SwingConstants;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicToolBarSeparatorUI;
-import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.LoggingFacade;
@@ -49,7 +47,7 @@ import com.formdev.flatlaf.util.LoggingFacade;
 */
 public class FlatToolBarSeparatorUI
 	extends BasicToolBarSeparatorUI
-	implements StyleableUI, PropertyChangeListener
+	implements StyleableUI
 {
 	private static final int LINE_WIDTH = 1;

@@ -58,6 +56,7 @@ public class FlatToolBarSeparatorUI

 	private final boolean shared;
 	private boolean defaults_initialized = false;
+	private PropertyChangeListener propertyChangeListener;
 	private Map<String, Object> oldStyleValues;

 	public static ComponentUI createUI( JComponent c ) {
@@ -106,33 +105,28 @@ public class FlatToolBarSeparatorUI
 	protected void installListeners( JSeparator s ) {
 		super.installListeners( s );

-		s.addPropertyChangeListener( this );
+		propertyChangeListener = FlatStylingSupport.createPropertyChangeListener(
+			s, () -> stylePropertyChange( s ), null );
+		s.addPropertyChangeListener( propertyChangeListener );
 	}

 	@Override
 	protected void uninstallListeners( JSeparator s ) {
 		super.uninstallListeners( s );

-		s.removePropertyChangeListener( this );
+		s.removePropertyChangeListener( propertyChangeListener );
+		propertyChangeListener = null;
 	}

-	/** @since 2.0.1 */
-	@Override
-	public void propertyChange( PropertyChangeEvent e ) {
-		switch( e.getPropertyName() ) {
-			case FlatClientProperties.STYLE:
-			case FlatClientProperties.STYLE_CLASS:
-				JSeparator s = (JSeparator) e.getSource();
-				if( shared && FlatStylingSupport.hasStyleProperty( s ) ) {
-					// unshare component UI if necessary
-					// updateUI() invokes installStyle() from installUI()
-					s.updateUI();
-				} else
-					installStyle( s );
-				s.revalidate();
-				s.repaint();
-				break;
-		}
+	private void stylePropertyChange( JSeparator s ) {
+		if( shared && FlatStylingSupport.hasStyleProperty( s ) ) {
+			// unshare component UI if necessary
+			// updateUI() invokes applyStyle() from installUI()
+			s.updateUI();
+		} else
+			installStyle( s );
+		s.revalidate();
+		s.repaint();
 	}

 	/** @since 2 */
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java
@@ -282,7 +282,7 @@ public class FlatToolBarUI
 			return comboBox.getUI().isFocusTraversable( comboBox );
 		}

-		// check whether component has an empty input map to skip components that
+		// check whether component has a empty input map to skip components that
 		// are focusable, but do nothing when focused (e.g. JLabel)
 		// see LayoutFocusTraversalPolicy.accept()
 		if( c instanceof JComponent ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolTipUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolTipUI.java
@@ -21,7 +21,6 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Insets;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.List;
 import javax.swing.JComponent;
@@ -50,8 +49,9 @@ import com.formdev.flatlaf.util.StringUtils;
 */
 public class FlatToolTipUI
 	extends BasicToolTipUI
-	implements PropertyChangeListener
 {
+	private static PropertyChangeListener sharedPropertyChangedListener;
+
 	public static ComponentUI createUI( JComponent c ) {
 		return FlatUIUtils.createSharedUI( FlatToolTipUI.class, FlatToolTipUI::new );
 	}
@@ -68,24 +68,24 @@ public class FlatToolTipUI
 	protected void installListeners( JComponent c ) {
 		super.installListeners( c );

-		c.addPropertyChangeListener( this );
+		if( sharedPropertyChangedListener == null ) {
+			sharedPropertyChangedListener = e -> {
+				String name = e.getPropertyName();
+				if( name == "tiptext" || name == "font" || name == "foreground" ) {
+					JToolTip toolTip = (JToolTip) e.getSource();
+					FlatLabelUI.updateHTMLRenderer( toolTip, toolTip.getTipText(), false );
+				}
+			};
+		}
+
+		c.addPropertyChangeListener( sharedPropertyChangedListener );
 	}

 	@Override
 	protected void uninstallListeners( JComponent c ) {
 		super.uninstallListeners( c );

-		c.removePropertyChangeListener( this );
-	}
-
-	/** @since 2.0.1 */
-	@Override
-	public void propertyChange( PropertyChangeEvent e ) {
-		String name = e.getPropertyName();
-		if( name == "tiptext" || name == "font" || name == "foreground" ) {
-			JToolTip toolTip = (JToolTip) e.getSource();
-			FlatLabelUI.updateHTMLRenderer( toolTip, toolTip.getTipText(), false );
-		}
+		c.removePropertyChangeListener( sharedPropertyChangedListener );
 	}

 	@Override
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java
@@ -52,7 +52,6 @@ import com.formdev.flatlaf.util.UIScale;
 *
 * @uiDefault Tree.font								Font
 * @uiDefault Tree.background						Color
- * @uiDefault Tree.foreground						Color	unused
 * @uiDefault Tree.hash								Color
 * @uiDefault Tree.dropLineColor					Color
 * @uiDefault Tree.expandedIcon						Icon
@@ -137,12 +136,12 @@ public class FlatTreeUI

 	// for icons
 	// (needs to be public because icon classes are in another package)
-	/** @since 2 */ @Styleable(dot=true) public String iconArrowType;
-	/** @since 2 */ @Styleable(dot=true) public Color iconExpandedColor;
-	/** @since 2 */ @Styleable(dot=true) public Color iconCollapsedColor;
-	/** @since 2 */ @Styleable(dot=true) public Color iconLeafColor;
-	/** @since 2 */ @Styleable(dot=true) public Color iconClosedColor;
-	/** @since 2 */ @Styleable(dot=true) public Color iconOpenColor;
+	@Styleable(dot=true) public String iconArrowType;
+	@Styleable(dot=true) public Color iconExpandedColor;
+	@Styleable(dot=true) public Color iconCollapsedColor;
+	@Styleable(dot=true) public Color iconLeafColor;
+	@Styleable(dot=true) public Color iconClosedColor;
+	@Styleable(dot=true) public Color iconOpenColor;

 	// only used via styling (not in UI defaults, but has likewise client properties)
 	/** @since 2 */ @Styleable protected boolean paintSelection = true;
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
@@ -71,7 +71,7 @@ public class FlatUIUtils
 	public static final boolean MAC_USE_QUARTZ = Boolean.getBoolean( "apple.awt.graphics.UseQuartz" );

 	private static boolean useSharedUIs = true;
-	private static final WeakHashMap<LookAndFeel, IdentityHashMap<Object, ComponentUI>> sharedUIinstances = new WeakHashMap<>();
+	private static WeakHashMap<LookAndFeel, IdentityHashMap<Object, ComponentUI>> sharedUIinstances = new WeakHashMap<>();

 	public static Rectangle addInsets( Rectangle r, Insets insets ) {
 		return new Rectangle(
@@ -188,11 +188,6 @@ public class FlatUIUtils
 		return (font instanceof UIResource) ? font.deriveFont( font.getStyle() ) : font;
 	}

-	/** @since 2 */
-	public static Border nonUIResource( Border border ) {
-		return (border instanceof UIResource) ? new NonUIResourceBorder( border ) : border;
-	}
-
 	public static int minimumWidth( JComponent c, int minimumWidth ) {
 		return FlatClientProperties.clientPropertyInt( c, FlatClientProperties.MINIMUM_WIDTH, minimumWidth );
 	}
@@ -278,32 +273,6 @@ public class FlatUIUtils
 			: 0;
 	}

-	/**
-	 * Returns the scaled line thickness used to compute the border insets.
-	 *
-	 * @since 2
-	 */
-	public static float getBorderLineWidth( JComponent c ) {
-		FlatBorder border = getOutsideFlatBorder( c );
-		return (border != null)
-			? UIScale.scale( (float) border.getLineWidth( c ) )
-			: 0;
-	}
-
-	/**
-	 * Returns the scaled thickness of the border.
-	 * This includes the outer focus border and the actual component border.
-	 *
-	 * @since 2
-	 */
-	public static int getBorderFocusAndLineWidth( JComponent c ) {
-		FlatBorder border = getOutsideFlatBorder( c );
-		return (border != null)
-			? Math.round( UIScale.scale( (float) border.getFocusWidth( c ) )
-				+ UIScale.scale( (float) border.getLineWidth( c ) ) )
-			: 0;
-	}
-
 	/**
 	 * Returns the scaled arc diameter of the border for the given component.
 	 */
@@ -777,8 +746,8 @@ public class FlatUIUtils
 	 *        {@link SwingConstants#WEST} or {@link SwingConstants#EAST})
 	 * @param chevron {@code true} for chevron arrow, {@code false} for triangle arrow
 	 * @param arrowSize the width of the painted arrow (for vertical direction) (will be scaled)
-	 * @param xOffset an offset added to the x coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
-	 * @param yOffset an offset added to the y coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
+	 * @param xOffset a offset added to the x coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
+	 * @param yOffset a offset added to the y coordinate of the arrow to paint it out-of-center. Usually zero. (will be scaled)
 	 *
 	 * @since 1.1
 	 */
@@ -786,15 +755,13 @@ public class FlatUIUtils
 		int direction, boolean chevron, int arrowSize, float xOffset, float yOffset )
 	{
 		// compute arrow width/height
-		// - make chevron arrows one pixel smaller because coordinates are based on center of pixels (0.5/0.5)
-		// - make triangle arrows one pixel taller (and round height up) to make them look stronger
-		float aw = UIScale.scale( arrowSize + (chevron ? -1 : 0) );
-		float ah = chevron ? (aw / 2) : UIScale.scale( (arrowSize / 2) + 1 );
+		int aw = UIScale.scale( arrowSize + (chevron ? 0 : 1) );
+		int ah = UIScale.scale( (arrowSize / 2) + (chevron ? 0 : 1) );

 		// rotate arrow width/height for horizontal directions
 		boolean vert = (direction == SwingConstants.NORTH || direction == SwingConstants.SOUTH);
 		if( !vert ) {
-			float temp = aw;
+			int temp = aw;
 			aw = ah;
 			ah = temp;
 		}
@@ -806,19 +773,19 @@ public class FlatUIUtils
 		// compute arrow location
 		float ox = ((width - (aw + extra)) / 2f) + UIScale.scale( xOffset );
 		float oy = ((height - (ah + extra)) / 2f) + UIScale.scale( yOffset );
-		float ax = x + ((direction == SwingConstants.WEST) ? -Math.round( -(ox + aw) ) - aw : Math.round( ox ));
-		float ay = y + ((direction == SwingConstants.NORTH) ? -Math.round( -(oy + ah) ) - ah : Math.round( oy ));
+		int ax = x + ((direction == SwingConstants.WEST) ? -Math.round( -ox ) : Math.round( ox ));
+		int ay = y + ((direction == SwingConstants.NORTH) ? -Math.round( -oy ) : Math.round( oy ));

 		// paint arrow
 		g.translate( ax, ay );
 /*debug
-		debugPaintArrow( g, Color.red, vert, Math.round( aw + extra ), Math.round( ah + extra ) );
+		debugPaintArrow( g, Color.red, vert, aw + extra, ah + extra );
 debug*/
 		Shape arrowShape = createArrowShape( direction, chevron, aw, ah );
 		if( chevron ) {
 			Stroke oldStroke = g.getStroke();
 			g.setStroke( new BasicStroke( UIScale.scale( 1f ) ) );
-			drawShapePure( g, arrowShape );
+			g.draw( arrowShape );
 			g.setStroke( oldStroke );
 		} else {
 			// triangle
@@ -830,7 +797,7 @@ debug*/
 	/**
 	 * Creates a chevron or triangle arrow shape for the given direction and size.
 	 * <p>
-	 * The chevron shape is an open path that can be painted with {@link Graphics2D#draw(Shape)}.
+	 * The chevron shape is a open path that can be painted with {@link Graphics2D#draw(Shape)}.
 	 * The triangle shape is a close path that can be painted with {@link Graphics2D#fill(Shape)}.
 	 *
 	 * @param direction the arrow direction ({@link SwingConstants#NORTH}, {@link SwingConstants#SOUTH}
@@ -882,7 +849,7 @@ debug*/
 	}

 	/**
-	 * Creates an open or closed path for the given points.
+	 * Creates a open or closed path for the given points.
 	 */
 	public static Path2D createPath( boolean close, double... points ) {
 		Path2D path = new Path2D.Float();
@@ -894,23 +861,6 @@ debug*/
 		return path;
 	}

-	/**
-	 * Draws the given shape with disabled stroke normalization.
-	 * The x/y coordinates of the shape are translated by a half pixel.
-	 *
-	 * @since 2.1
-	 */
-	public static void drawShapePure( Graphics2D g, Shape shape ) {
-		Object oldStrokeControl = g.getRenderingHint( RenderingHints.KEY_STROKE_CONTROL );
-		g.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE );
-
-		g.translate( 0.5, 0.5 );
-		g.draw( shape );
-		g.translate( -0.5, -0.5 );
-
-		g.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, oldStrokeControl );
-	}
-
 	/**
 	 * Draws the given string at the specified location.
 	 * The provided component is used to query text properties and anti-aliasing hints.
@@ -1032,31 +982,4 @@ debug*/
 				repaintComponent.repaint();
 		}
 	}
-
-	//---- class NonUIResourceBorder ------------------------------------------
-
-	private static class NonUIResourceBorder
-		implements Border
-	{
-		private final Border delegate;
-
-		NonUIResourceBorder( Border delegate ) {
-			this.delegate = delegate;
-		}
-
-		@Override
-		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
-			delegate.paintBorder( c, g, x, y, width, height );
-		}
-
-		@Override
-		public Insets getBorderInsets( Component c ) {
-			return delegate.getBorderInsets( c );
-		}
-
-		@Override
-		public boolean isBorderOpaque() {
-			return delegate.isBorderOpaque();
-		}
-	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java
@@ -23,7 +23,6 @@ import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
@@ -44,7 +43,6 @@ import javax.swing.JInternalFrame;
 import javax.swing.JLayeredPane;
 import javax.swing.JRootPane;
 import javax.swing.UIManager;
-import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;

 /**
@@ -233,15 +231,8 @@ public abstract class FlatWindowResizer
 	{
 		protected Window window;

-		private final boolean limitResizeToScreenBounds;
-
 		public WindowResizer( JRootPane rootPane ) {
 			super( rootPane );
-
-			// On Linux, limit window resizing to screen bounds because otherwise
-			// there would be a strange effect when the mouse is moved over a sidebar
-			// while resizing and the opposite window side is also resized.
-			limitResizeToScreenBounds = SystemInfo.isLinux;
 		}

 		@Override
@@ -298,19 +289,11 @@ public abstract class FlatWindowResizer

 		@Override
 		protected boolean limitToParentBounds() {
-			return limitResizeToScreenBounds && window != null;
+			return false;
 		}

 		@Override
 		protected Rectangle getParentBounds() {
-			if( limitResizeToScreenBounds && window != null ) {
-				GraphicsConfiguration gc = window.getGraphicsConfiguration();
-				Rectangle bounds = gc.getBounds();
-				Insets insets = window.getToolkit().getScreenInsets( gc );
-				return new Rectangle( bounds.x + insets.left, bounds.y + insets.top,
-					bounds.width - insets.left - insets.right,
-					bounds.height - insets.top - insets.bottom );
-			}
 			return null;
 		}

@@ -402,7 +385,7 @@ public abstract class FlatWindowResizer

 		@Override
 		protected Rectangle getParentBounds() {
-			return new Rectangle( getFrame().getParent().getSize() );
+			return getFrame().getParent().getBounds();
 		}

 		@Override
@@ -596,8 +579,8 @@ debug*/
 			// top
 			if( resizeDir == N_RESIZE_CURSOR || resizeDir == NW_RESIZE_CURSOR || resizeDir == NE_RESIZE_CURSOR ) {
 				newBounds.y = yOnScreen - dragTopOffset;
-				if( limitToParentBounds() )
-					newBounds.y = Math.max( newBounds.y, getParentBounds().y );
+				if( limitToParentBounds() && newBounds.y < 0 )
+					newBounds.y = 0;
 				newBounds.height += (oldBounds.y - newBounds.y);
 			}

@@ -614,8 +597,8 @@ debug*/
 			// left
 			if( resizeDir == W_RESIZE_CURSOR || resizeDir == NW_RESIZE_CURSOR || resizeDir == SW_RESIZE_CURSOR ) {
 				newBounds.x = xOnScreen - dragLeftOffset;
-				if( limitToParentBounds() )
-					newBounds.x = Math.max( newBounds.x, getParentBounds().x );
+				if( limitToParentBounds() && newBounds.x < 0 )
+					newBounds.x = 0;
 				newBounds.width += (oldBounds.x - newBounds.x);
 			}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowsNativeWindowBorder.java
@@ -27,7 +27,6 @@ import java.awt.Window;
 import java.awt.geom.AffineTransform;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.io.File;
 import java.util.Collections;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -38,7 +37,6 @@ import javax.swing.Timer;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.EventListenerList;
-import com.formdev.flatlaf.FlatSystemProperties;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.NativeLibrary;
 import com.formdev.flatlaf.util.SystemInfo;
@@ -92,10 +90,6 @@ class FlatWindowsNativeWindowBorder
 		if( !SystemInfo.isWindows_10_orLater )
 			return null;

-		// requires x86 architecture
-		if( !SystemInfo.isX86 && !SystemInfo.isX86_64 )
-			return null;
-
 		// load native library
 		if( nativeLibrary == null ) {
 			if( !SystemInfo.isJava_9_orLater ) {
@@ -116,7 +110,11 @@ class FlatWindowsNativeWindowBorder
 				}
 			}

-			nativeLibrary = createNativeLibrary();
+			String libraryName = "com/formdev/flatlaf/natives/flatlaf-windows-x86";
+			if( SystemInfo.isX86_64 )
+				libraryName += "_64";
+
+			nativeLibrary = new NativeLibrary( libraryName, null, true );
 		}

 		// check whether native library was successfully loaded
@@ -129,23 +127,6 @@ class FlatWindowsNativeWindowBorder
 		return instance;
 	}

-	private static NativeLibrary createNativeLibrary() {
-		String libraryName = "flatlaf-windows-x86";
-		if( SystemInfo.isX86_64 )
-			libraryName += "_64";
-
-		String libraryPath = System.getProperty( FlatSystemProperties.NATIVE_LIBRARY_PATH );
-		if( libraryPath != null ) {
-			File libraryFile = new File( libraryPath, libraryName + ".dll" );
-			if( libraryFile.exists() )
-				return new NativeLibrary( libraryFile, true );
-			else
-				LoggingFacade.INSTANCE.logSevere( "Did not find external library " + libraryFile + ", using extracted library instead", null );
-		}
-
-		return new NativeLibrary( "com/formdev/flatlaf/natives/" + libraryName, null, true );
-	}
-
 	private FlatWindowsNativeWindowBorder() {
 	}

@@ -155,7 +136,7 @@ class FlatWindowsNativeWindowBorder
 	}

 	/**
-	 * Tell the window whether the application wants to use custom decorations.
+	 * Tell the window whether the application wants use custom decorations.
 	 * If {@code true}, the Windows 10 title bar is hidden (including minimize,
 	 * maximize and close buttons), but not the resize borders (including drop shadow).
 	 */
@@ -186,18 +167,11 @@ class FlatWindowsNativeWindowBorder
 			return;

 		// install
-		try {
-			WndProc wndProc = new WndProc( window );
-			if( wndProc.hwnd == 0 )
-				return;
+		WndProc wndProc = new WndProc( window );
+		if( wndProc.hwnd == 0 )
+			return;

-			windowsMap.put( window, wndProc );
-		} catch( UnsatisfiedLinkError ex ) {
-			// catch for the case that the operating system prevents execution of DLL
-			// (e.g. if DLLs in temp folder are restricted)
-			// --> continue application without custom decorations
-			LoggingFacade.INSTANCE.logSevere( null, ex );
-		}
+		windowsMap.put( window, wndProc );
 	}

 	private void uninstall( Window window ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/JBRCustomDecorations.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/JBRCustomDecorations.java
@@ -284,7 +284,7 @@ public class JBRCustomDecorations
 		@Override
 		public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
 			Window window = SwingUtilities.windowForComponent( c );
-			boolean active = window != null && window.isActive();
+			boolean active = (window != null) ? window.isActive() : false;

 			// paint top border
 			//  - in light themes
@@ -298,7 +298,7 @@ public class JBRCustomDecorations
 		}

 		private void paintImpl( Graphics2D g, int x, int y, int width, int height, double scaleFactor ) {
-			g.fillRect( x, y, width, 1 );
+			g.drawRect( x, y, width - 1, 0 );
 		}

 		void repaintBorder( Component c ) {
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedBorder.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.util;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import javax.swing.JComponent;
+import javax.swing.border.Border;
+
+/**
+ * Border that automatically animates painting on component value changes.
+ * <p>
+ * {@link #getAnimatableValues(Component)} returns the animatable value(s) of the component.
+ * If the value(s) have changed, then {@link #paintAnimated(Component, Graphics2D, int, int, int, int, float[])}
+ * is invoked multiple times with animated value(s) (from old value(s) to new value(s)).
+ * If {@link #getAnimatableValues(Component)} returns multiple values, then each value
+ * gets its own independent animation, which may start/end at different points in time,
+ * may have different duration, resolution and interpolator.
+ * <p>
+ * Example for an animated border:
+ * <pre>
+ * private class MyAnimatedBorder
+ *     implements AnimatedBorder
+ * {
+ *     &#64;Override
+ *     public float[] getAnimatableValues( Component c ) {
+ *         return new float[] { c.isFocusOwner() ? 1 : 0 };
+ *     }
+ *
+ *     &#64;Override
+ *     public void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float[] animatedValues ) {
+ *         int lh = UIScale.scale( 2 );
+ *
+ *         g.setColor( Color.blue );
+ *         g.fillRect( x, y + height - lh, Math.round( width * animatedValues[0] ), lh );
+ *     }
+ *
+ *     &#64;Override
+ *     public Insets getBorderInsets( Component c ) {
+ *         return UIScale.scale( new Insets( 4, 4, 4, 4 ) );
+ *     }
+ *
+ *     &#64;Override public boolean isBorderOpaque() { return false; }
+ * }
+ *
+ * // sample usage
+ * JTextField textField = new JTextField();
+ * textField.setBorder( new MyAnimatedBorder() );
+ * </pre>
+ *
+ * Animation works only if the component passed to {@link #paintBorder(Component, Graphics, int, int, int, int)}
+ * is a instance of {@link JComponent}.
+ * A client property is set on the component to store the animation state.
+ *
+ * @author Karl Tauber
+ * @since 2
+ */
+public interface AnimatedBorder
+	extends Border, AnimatedPainter
+{
+	/**
+	 * Invokes {@link #paintWithAnimation(Component, Graphics, int, int, int, int)}.
+	 */
+	@Override
+	default void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
+		paintWithAnimation( c, g, x, y, width, height );
+	}
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedIcon.java
@@ -18,44 +18,44 @@ package com.formdev.flatlaf.util;

 import java.awt.Component;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import javax.swing.Icon;
 import javax.swing.JComponent;
-import com.formdev.flatlaf.util.Animator.Interpolator;

 /**
 * Icon that automatically animates painting on component value changes.
 * <p>
- * {@link #getValue(Component)} returns the value of the component.
- * If the value changes, then {@link #paintIconAnimated(Component, Graphics, int, int, float)}
- * is invoked multiple times with animated value (from old value to new value).
+ * {@link #getAnimatableValues(Component)} returns the animatable value(s) of the component.
+ * If the value(s) have changed, then {@link #paintAnimated(Component, Graphics2D, int, int, int, int, float[])}
+ * is invoked multiple times with animated value(s) (from old value(s) to new value(s)).
+ * If {@link #getAnimatableValues(Component)} returns multiple values, then each value
+ * gets its own independent animation, which may start/end at different points in time,
+ * may have different duration, resolution and interpolator.
 * <p>
 * Example for an animated icon:
 * <pre>
- * private class AnimatedMinimalTestIcon
+ * private class MyAnimatedIcon
 *     implements AnimatedIcon
 * {
+ *     &#64;Override
+ *     public float[] getAnimatableValues( Component c ) {
+ *         return new float[] { ((AbstractButton)c).isSelected() ? 1 : 0 };
+ *     }
+ *
 *     &#64;Override public int getIconWidth() { return 100; }
 *     &#64;Override public int getIconHeight() { return 20; }
 *
 *     &#64;Override
- *     public void paintIconAnimated( Component c, Graphics g, int x, int y, float animatedValue ) {
- *         int w = getIconWidth();
- *         int h = getIconHeight();
- *
+ *     public void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float[] animatedValues ) {
 *         g.setColor( Color.red );
- *         g.drawRect( x, y, w - 1, h - 1 );
- *         g.fillRect( x, y, Math.round( w * animatedValue ), h );
- *     }
- *
- *     &#64;Override
- *     public float getValue( Component c ) {
- *         return ((AbstractButton)c).isSelected() ? 1 : 0;
+ *         g.drawRect( x, y, width - 1, height - 1 );
+ *         g.fillRect( x, y, Math.round( width * animatedValues[0] ), height );
 *     }
 * }
 *
 * // sample usage
 * JCheckBox checkBox = new JCheckBox( "test" );
- * checkBox.setIcon( new AnimatedMinimalTestIcon() );
+ * checkBox.setIcon( new MyAnimatedIcon() );
 * </pre>
 *
 * Animation works only if the component passed to {@link #paintIcon(Component, Graphics, int, int)}
@@ -65,15 +65,40 @@ import com.formdev.flatlaf.util.Animator.Interpolator;
 * @author Karl Tauber
 */
 public interface AnimatedIcon
-	extends Icon
+	extends Icon, AnimatedPainter
 {
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @since 2
+	 */
 	@Override
-	default void paintIcon( Component c, Graphics g, int x, int y ) {
-		AnimationSupport.paintIcon( this, c, g, x, y );
+	default float[] getAnimatableValues( Component c ) {
+		// for compatibility
+		return new float[] { getValue( c ) };
 	}

 	/**
-	 * Paints the icon for the given animated value.
+	 * Invokes {@link #paintWithAnimation(Component, Graphics, int, int, int, int)}.
+	 */
+	@Override
+	default void paintIcon( Component c, Graphics g, int x, int y ) {
+		paintWithAnimation( c, g, x, y, getIconWidth(), getIconHeight() );
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @since 2
+	 */
+	@Override
+	default void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float[] animatedValues ) {
+		// for compatibility
+		paintIconAnimated( c, g, x, y, animatedValues[0] );
+	}
+
+	/**
+	 * Paints the icon for the given (animated) value.
 	 *
 	 * @param c the component that this icon belongs to
 	 * @param g the graphics context
@@ -82,52 +107,45 @@ public interface AnimatedIcon
 	 * @param animatedValue the animated value, which is either equal to what {@link #getValue(Component)}
 	 *     returned, or somewhere between the previous value and the latest value
 	 *     that {@link #getValue(Component)} returned
+	 *
+	 * @deprecated override {@link #paintAnimated(Component, Graphics2D, int, int, int, int, float[])} instead
 	 */
-	void paintIconAnimated( Component c, Graphics g, int x, int y, float animatedValue );
+	@Deprecated
+	default void paintIconAnimated( Component c, Graphics g, int x, int y, float animatedValue ) {
+	}

 	/**
-	 * Gets the value of the component.
+	 * Gets the animatable value of the component.
 	 * <p>
 	 * This can be any value and depends on the component.
 	 * If the value changes, then this class animates from the old value to the new one.
 	 * <p>
 	 * For a toggle button this could be {@code 0} for off and {@code 1} for on.
+	 *
+	 * @deprecated override {@link #getAnimatableValues(Component)} instead
 	 */
-	float getValue( Component c );
-
-	/**
-	 * Returns whether animation is enabled for this icon (default is {@code true}).
-	 */
-	default boolean isAnimationEnabled() {
-		return true;
+	@Deprecated
+	default float getValue( Component c ) {
+		return 0;
 	}

 	/**
-	 * Returns the duration of the animation in milliseconds (default is 150).
+	 * {@inheritDoc}
+	 *
+	 * @since TODO
 	 */
-	default int getAnimationDuration() {
-		return 150;
-	}
-
-	/**
-	 * Returns the resolution of the animation in milliseconds (default is 10).
-	 * Resolution is the amount of time between timing events.
-	 */
-	default int getAnimationResolution() {
-		return 10;
-	}
-
-	/**
-	 * Returns the interpolator for the animation.
-	 * Default is {@link CubicBezierEasing#STANDARD_EASING}.
-	 */
-	default Interpolator getAnimationInterpolator() {
-		return CubicBezierEasing.STANDARD_EASING;
+	@Override
+	default Object getAnimationClientPropertyKey() {
+		// for compatibility
+		return getClientPropertyKey();
 	}

 	/**
 	 * Returns the client property key used to store the animation support.
+	 *
+	 * @deprecated override {@link #getAnimationClientPropertyKey()} instead
 	 */
+	@Deprecated
 	default Object getClientPropertyKey() {
 		return getClass();
 	}
@@ -135,115 +153,25 @@ public interface AnimatedIcon
 	//---- class AnimationSupport ---------------------------------------------

 	/**
-	 * Animation support class that stores the animation state and implements the animation.
+	 * Animation support.
 	 */
+	@Deprecated
 	class AnimationSupport
 	{
-		private float startValue;
-		private float targetValue;
-		private float animatedValue;
-		private float fraction;
-
-		private Animator animator;
-
-		// last x,y coordinates of the icon needed to repaint while animating
-		private int x;
-		private int y;
-
+		/**
+		 * @deprecated use {@link AnimatedPainter#paintWithAnimation(Component, Graphics, int, int, int, int)} instead
+		 */
+		@Deprecated
 		public static void paintIcon( AnimatedIcon icon, Component c, Graphics g, int x, int y ) {
-			if( !isAnimationEnabled( icon, c ) ) {
-				// paint without animation if animation is disabled or
-				// component is not a JComponent and therefore does not support
-				// client properties, which are required to keep animation state
-				paintIconImpl( icon, c, g, x, y, null );
-				return;
-			}
-
-			JComponent jc = (JComponent) c;
-			Object key = icon.getClientPropertyKey();
-			AnimationSupport as = (AnimationSupport) jc.getClientProperty( key );
-			if( as == null ) {
-				// painted first time --> do not animate, but remember current component value
-				as = new AnimationSupport();
-				as.startValue = as.targetValue = as.animatedValue = icon.getValue( c );
-				as.x = x;
-				as.y = y;
-				jc.putClientProperty( key, as );
-			} else {
-				// get component value
-				float value = icon.getValue( c );
-
-				if( value != as.targetValue ) {
-					// value changed --> (re)start animation
-
-					if( as.animator == null ) {
-						// create animator
-						AnimationSupport as2 = as;
-						as.animator = new Animator( icon.getAnimationDuration(), fraction -> {
-							// check whether component was removed while animation is running
-							if( !c.isDisplayable() ) {
-								as2.animator.stop();
-								return;
-							}
-
-							// compute animated value
-							as2.animatedValue = as2.startValue + ((as2.targetValue - as2.startValue) * fraction);
-							as2.fraction = fraction;
-
-							// repaint icon
-							c.repaint( as2.x, as2.y, icon.getIconWidth(), icon.getIconHeight() );
-						}, () -> {
-							as2.startValue = as2.animatedValue = as2.targetValue;
-							as2.animator = null;
-						} );
-					}
-
-					if( as.animator.isRunning() ) {
-						// if animation is still running, restart it from the current
-						// animated value to the new target value with reduced duration
-						as.animator.cancel();
-						int duration2 = (int) (icon.getAnimationDuration() * as.fraction);
-						if( duration2 > 0 )
-							as.animator.setDuration( duration2 );
-						as.startValue = as.animatedValue;
-					} else {
-						// new animation
-						as.animator.setDuration( icon.getAnimationDuration() );
-						as.animator.setResolution( icon.getAnimationResolution() );
-						as.animator.setInterpolator( icon.getAnimationInterpolator() );
-
-						as.animatedValue = as.startValue;
-					}
-
-					as.targetValue = value;
-					as.animator.start();
-				}
-
-				as.x = x;
-				as.y = y;
-			}
-
-			paintIconImpl( icon, c, g, x, y, as );
-		}
-
-		private static void paintIconImpl( AnimatedIcon icon, Component c, Graphics g, int x, int y, AnimationSupport as ) {
-			float value = (as != null) ? as.animatedValue : icon.getValue( c );
-			icon.paintIconAnimated( c, g, x, y, value );
-		}
-
-		private static boolean isAnimationEnabled( AnimatedIcon icon, Component c ) {
-			return Animator.useAnimation() && icon.isAnimationEnabled() && c instanceof JComponent;
+			AnimatedPainterSupport.paint( icon, c, (Graphics2D) g, x, y, icon.getIconWidth(), icon.getIconHeight() );
 		}

+		/**
+		 * @deprecated use {@link AnimatedPainter#saveRepaintLocation(AnimatedPainter, Component, int, int)} instead
+		 */
+		@Deprecated
 		public static void saveIconLocation( AnimatedIcon icon, Component c, int x, int y ) {
-			if( !isAnimationEnabled( icon, c ) )
-				return;
-
-			AnimationSupport as = (AnimationSupport) ((JComponent)c).getClientProperty( icon.getClientPropertyKey() );
-			if( as != null ) {
-				as.x = x;
-				as.y = y;
-			}
+			AnimatedPainterSupport.saveRepaintLocation( icon, c, x, y );
 		}
 	}
 }
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedPainter.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedPainter.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.util;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import javax.swing.JComponent;
+import com.formdev.flatlaf.util.Animator.Interpolator;
+
+/**
+ * Painter that automatically animates painting on component value(s) changes.
+ * <p>
+ * {@link #getAnimatableValues(Component)} returns the animatable value(s) of the component.
+ * If the value(s) have changed, then {@link #paintAnimated(Component, Graphics2D, int, int, int, int, float[])}
+ * is invoked multiple times with animated value(s) (from old value(s) to new value(s)).
+ * If {@link #getAnimatableValues(Component)} returns multiple values, then each value
+ * gets its own independent animation, which may start/end at different points in time,
+ * may have different duration, resolution and interpolator.
+ * <p>
+ * See {@link AnimatedBorder} or {@link AnimatedIcon} for examples.
+ * <p>
+ * Animation works only if the component passed to {@link #paintWithAnimation(Component, Graphics, int, int, int, int)}
+ * is an instance of {@link JComponent}.
+ * A client property is set on the component to store the animation state.
+ *
+ * @author Karl Tauber
+ * @since 2
+ */
+public interface AnimatedPainter
+{
+	/**
+	 * Gets the animatable value(s) of the component.
+	 * <p>
+	 * This can be any value(s) and depends on the component.
+	 * If the value(s) changes, then this class animates from the old value(s) to the new ones.
+	 * If multiple values are returned, then each value gets its own independent animation.
+	 * <p>
+	 * For a toggle button this could be {@code 0} for off and {@code 1} for on.
+	 * A complex check box could return values for selected, hover, pressed and focused states.
+	 * The painter then can show independent animations for those states.
+	 */
+	float[] getAnimatableValues( Component c );
+
+	/**
+	 * Starts painting.
+	 * Either invokes {@link #paintAnimated(Component, Graphics2D, int, int, int, int, float[])}
+	 * once to paint current value(s) (see {@link #getAnimatableValues(Component)}. Or if value(s) has
+	 * changed, compared to last painting, then it starts an animation and invokes
+	 * {@link #paintAnimated(Component, Graphics2D, int, int, int, int, float[])}
+	 * multiple times with animated value(s) (from old value(s) to new value(s)).
+	 *
+	 * @param c the component that this painter belongs to
+	 * @param g the graphics context
+	 * @param x the x coordinate of the paint area
+	 * @param y the y coordinate of the paint area
+	 * @param width the width of the paint area
+	 * @param height the height of the paint area
+	 */
+	default void paintWithAnimation( Component c, Graphics g, int x, int y, int width, int height ) {
+		AnimatedPainterSupport.paint( this, c, (Graphics2D) g, x, y, width, height );
+	}
+
+	/**
+	 * Paints the given (animated) value(s).
+	 * <p>
+	 * Invoked from {@link #paintWithAnimation(Component, Graphics, int, int, int, int)}.
+	 *
+	 * @param c the component that this painter belongs to
+	 * @param g the graphics context
+	 * @param x the x coordinate of the paint area
+	 * @param y the y coordinate of the paint area
+	 * @param width the width of the paint area
+	 * @param height the height of the paint area
+	 * @param animatedValues the animated values, which are either equal to what {@link #getAnimatableValues(Component)}
+	 *     returned, or somewhere between the previous values and the latest values
+	 *     that {@link #getAnimatableValues(Component)} returned
+	 */
+	void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float[] animatedValues );
+
+	/**
+	 * Invoked from animator to repaint an area.
+	 * <p>
+	 * Useful to limit the repaint region. E.g. if only the bottom border is animated.
+	 * If more than one border side is animated (e.g. bottom and right side), then it
+	 * makes no sense to do separate repaints because the Swing repaint manager unions
+	 * the regions and the whole component is repainted.
+	 * <p>
+	 * The default implementation repaints the whole given area.
+	 */
+	default void repaintDuringAnimation( Component c, int x, int y, int width, int height ) {
+		c.repaint( x, y, width, height );
+	}
+
+	/**
+	 * Returns whether animation is enabled for this painter (default is {@code true}).
+	 */
+	default boolean isAnimationEnabled() {
+		return true;
+	}
+
+	/**
+	 * Returns the duration of the animation in milliseconds (default is 150).
+	 */
+	default int getAnimationDuration() {
+		return 150;
+	}
+
+	/**
+	 * Returns the resolution of the animation in milliseconds (default is 10).
+	 * Resolution is the amount of time between timing events.
+	 */
+	default int getAnimationResolution() {
+		return 10;
+	}
+
+	/**
+	 * Returns the interpolator for the animation.
+	 * Default is {@link CubicBezierEasing#STANDARD_EASING}.
+	 */
+	default Interpolator getAnimationInterpolator() {
+		return CubicBezierEasing.STANDARD_EASING;
+	}
+
+	/**
+	 * Returns the duration of the animation in milliseconds (default is 150)
+	 * for the given value index and value.
+	 */
+	default int getAnimationDuration( int valueIndex, float value ) {
+		return getAnimationDuration();
+	}
+
+	/**
+	 * Returns the resolution of the animation in milliseconds (default is 10)
+	 * for the given value index and value.
+	 * Resolution is the amount of time between timing events.
+	 */
+	default int getAnimationResolution( int valueIndex, float value ) {
+		return getAnimationResolution();
+	}
+
+	/**
+	 * Returns the interpolator for the animation
+	 * for the given value index and value.
+	 * Default is {@link CubicBezierEasing#STANDARD_EASING}.
+	 */
+	default Interpolator getAnimationInterpolator( int valueIndex, float value ) {
+		return getAnimationInterpolator();
+	}
+
+	/**
+	 * Returns the client property key used to store the animation support.
+	 */
+	default Object getAnimationClientPropertyKey() {
+		return getClass();
+	}
+
+	/**
+	 * Saves location for repainting animated area with
+	 * {@link AnimatedPainter#repaintDuringAnimation(Component, int, int, int, int)}.
+	 * Only needed when graphics context passed to {@link #paintWithAnimation(Component, Graphics, int, int, int, int)}
+	 * uses transformed location.
+	 */
+	static void saveRepaintLocation( AnimatedPainter painter, Component c, int x, int y ) {
+		AnimatedPainterSupport.saveRepaintLocation( painter, c, x, y );
+	}
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedPainterSupport.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/AnimatedPainterSupport.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2021 FormDev Software GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.formdev.flatlaf.util;
+
+import java.awt.Component;
+import java.awt.Graphics2D;
+import javax.swing.JComponent;
+
+/**
+ * Animation support class that stores the animation state and implements the animation.
+ *
+ * @author Karl Tauber
+ * @since 2
+ */
+class AnimatedPainterSupport
+{
+	private final int valueIndex;
+
+	private float startValue;
+	private float targetValue;
+	private float animatedValue;
+	private float fraction;
+
+	private Animator animator;
+
+	// last bounds of the paint area needed to repaint while animating
+	private int x;
+	private int y;
+	private int width;
+	private int height;
+
+	private AnimatedPainterSupport( int valueIndex ) {
+		this.valueIndex = valueIndex;
+	}
+
+	static void paint( AnimatedPainter painter, Component c, Graphics2D g,
+		int x, int y, int width, int height )
+	{
+		// get animatable component values
+		float[] values = painter.getAnimatableValues( c );
+
+		if( !isAnimationEnabled( painter, c ) ) {
+			// paint without animation if animation is disabled or
+			// component is not a JComponent and therefore does not support
+			// client properties, which are required to keep animation state
+			painter.paintAnimated( c, g, x, y, width, height, values );
+			return;
+		}
+
+		JComponent jc = (JComponent) c;
+		Object key = painter.getAnimationClientPropertyKey();
+		AnimatedPainterSupport[] ass = (AnimatedPainterSupport[]) jc.getClientProperty( key );
+
+		// check whether length of values array has changed
+		if( ass != null && ass.length != values.length ) {
+			// cancel all running animations
+			for( int i = 0; i < ass.length; i++ ) {
+				AnimatedPainterSupport as = ass[i];
+				if( as.animator != null )
+					as.animator.cancel();
+			}
+			ass = null;
+		}
+
+		if( ass == null ) {
+			ass = new AnimatedPainterSupport[values.length];
+			jc.putClientProperty( key, ass );
+		}
+
+		for( int i = 0; i < ass.length; i++ ) {
+			AnimatedPainterSupport as = ass[i];
+			float value = values[i];
+
+			if( as == null ) {
+				// painted first time --> do not animate, but remember current component value
+				as = new AnimatedPainterSupport( i );
+				as.startValue = as.targetValue = as.animatedValue = value;
+				ass[i] = as;
+			} else if( value != as.targetValue ) {
+				// value changed --> (re)start animation
+
+				int animationDuration = painter.getAnimationDuration( as.valueIndex, value );
+
+				// do not animate if animation duration (for current value) is zero
+				if( animationDuration <= 0 ) {
+					if( as.animator != null ) {
+						as.animator.cancel();
+						as.animator = null;
+					}
+					as.startValue = as.targetValue = as.animatedValue = value;
+					as.fraction = 0;
+					continue;
+				}
+
+				if( as.animator == null ) {
+					// create animator
+					AnimatedPainterSupport as2 = as;
+					as.animator = new Animator( 1, fraction -> {
+						// check whether component was removed while animation is running
+						if( !c.isDisplayable() ) {
+							as2.animator.stop();
+							return;
+						}
+
+						// compute animated value
+						as2.animatedValue = as2.startValue + ((as2.targetValue - as2.startValue) * fraction);
+						as2.fraction = fraction;
+
+						// repaint
+						painter.repaintDuringAnimation( c, as2.x, as2.y, as2.width, as2.height );
+					}, () -> {
+						as2.startValue = as2.animatedValue = as2.targetValue;
+						as2.animator = null;
+					} );
+				}
+
+				if( as.animator.isRunning() ) {
+					// if animation is still running, restart it from the current
+					// animated value to the new target value with reduced duration
+					as.animator.cancel();
+					int duration2 = (int) (animationDuration * as.fraction);
+					if( duration2 > 0 )
+						as.animator.setDuration( duration2 );
+					as.startValue = as.animatedValue;
+				} else {
+					// new animation
+					as.animator.setDuration( animationDuration );
+
+					as.animatedValue = as.startValue;
+				}
+
+				// update animator for new value
+				as.animator.setResolution( painter.getAnimationResolution( as.valueIndex, value ) );
+				as.animator.setInterpolator( painter.getAnimationInterpolator( as.valueIndex, value ) );
+
+				// start animation
+				as.targetValue = value;
+				as.animator.start();
+			}
+
+			as.x = x;
+			as.y = y;
+			as.width = width;
+			as.height = height;
+		}
+
+		float[] animatedValues = new float[ass.length];
+		for( int i = 0; i < ass.length; i++ )
+			animatedValues[i] = ass[i].animatedValue;
+
+		painter.paintAnimated( c, g, x, y, width, height, animatedValues );
+	}
+
+	private static boolean isAnimationEnabled( AnimatedPainter painter, Component c ) {
+		return Animator.useAnimation() && painter.isAnimationEnabled() && c instanceof JComponent;
+	}
+
+	static void saveRepaintLocation( AnimatedPainter painter, Component c, int x, int y ) {
+		if( !isAnimationEnabled( painter, c ) )
+			return;
+
+		AnimatedPainterSupport[] ass = (AnimatedPainterSupport[]) ((JComponent)c).getClientProperty( painter.getAnimationClientPropertyKey() );
+		if( ass != null ) {
+			for( int i = 0; i < ass.length; i++ ) {
+				AnimatedPainterSupport as = ass[i];
+				as.x = x;
+				as.y = y;
+			}
+		}
+	}
+}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java
@@ -122,8 +122,6 @@ public class ColorFunctions
 			return color1;
 		if( weight <= 0 )
 			return color2;
-		if( color1.equals( color2 ) )
-			return color1;

 		int r1 = color1.getRed();
 		int g1 = color1.getGreen();
@@ -198,9 +196,6 @@ public class ColorFunctions
 			: (float) Math.pow( (value + 0.055) / 1.055, 2.4 );
 	}

-	/**
-	 * Applies the given color functions to the given color and returns the new color.
-	 */
 	public static Color applyFunctions( Color color, ColorFunction... functions ) {
 		// if having only a single function of type Mix, then avoid four unnecessary conversions:
 		//     1. RGB to HSL in this method
@@ -226,9 +221,6 @@ public class ColorFunctions
 		return HSLColor.toRGB( hsla[0], hsla[1], hsla[2], hsla[3] / 100 );
 	}

-	/**
-	 * Clamps the given value between 0 and 100.
-	 */
 	public static float clamp( float value ) {
 		return (value < 0)
 			? 0
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/DerivedColor.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/DerivedColor.java
@@ -47,7 +47,7 @@ public class DerivedColor
 		Color result = ColorFunctions.applyFunctions( baseColor, functions );

 		// if the result is equal to the default color, then the original base color
-		// was passed, and we can cache this to avoid color calculations
+		// was passed and we can cache this to avoid color calculations
 		if( !hasBaseOfDefaultColor && result.getRGB() == this.getRGB() ) {
 			hasBaseOfDefaultColor = true;
 			baseOfDefaultColorRGB = baseColor.getRGB();
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HSLColor.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HSLColor.java
@@ -76,7 +76,7 @@ public class HSLColor
 	}

 	/**
-	 *  Create a HSLColor object using an array containing the
+	 *  Create a HSLColor object using an an array containing the
 	 *  individual HSL values and with a default alpha value of 1.
 	 *
 	 *  @param hsl  array containing HSL values
@@ -87,7 +87,7 @@ public class HSLColor
 	}

 	/**
-	 *  Create a HSLColor object using an array containing the
+	 *  Create a HSLColor object using an an array containing the
 	 *  individual HSL values.
 	 *
 	 *  @param hsl  array containing HSL values
@@ -291,7 +291,7 @@ public class HSLColor

 		//  Calculate the Saturation

-		float s;
+		float s = 0;

 		if (max == min)
 			s = 0;
@@ -386,7 +386,7 @@ public class HSLColor
 		s /= 100f;
 		l /= 100f;

-		float q;
+		float q = 0;

 		if (l < 0.5)
 			q = l * (1 + s);
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/HiDPIUtils.java
@@ -31,7 +31,7 @@ import com.formdev.flatlaf.FlatSystemProperties;
 public class HiDPIUtils
 {
 	public interface Painter {
-		void paint( Graphics2D g, int x, int y, int width, int height, double scaleFactor );
+		public void paint( Graphics2D g, int x, int y, int width, int height, double scaleFactor );
 	}

 	public static void paintAtScale1x( Graphics2D g, JComponent c, Painter painter ) {
@@ -114,7 +114,7 @@ public class HiDPIUtils
 	 * painted too far down on some operating systems.
 	 * The higher the system scale factor is, the more.
 	 * <p>
-	 * This method computes a correction value for the Y position.
+	 * This methods computes a correction value for the Y position.
 	 */
 	public static float computeTextYCorrection( Graphics2D g ) {
 		if( !useTextYCorrection() || !SystemInfo.isWindows )
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/JavaCompatibility.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/JavaCompatibility.java
@@ -89,7 +89,7 @@ public class JavaCompatibility
 					getClippedStringMethod = cls.getMethod( SystemInfo.isJava_9_orLater
 							? "getClippedString"
 							: "clipStringIfNecessary",
-						JComponent.class, FontMetrics.class, String.class, int.class );
+						new Class[] { JComponent.class, FontMetrics.class, String.class, int.class } );
 				} catch( Exception ex ) {
 					LoggingFacade.INSTANCE.logSevere( null, ex );
 					throw new RuntimeException( ex );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/MultiResolutionImageSupport.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/MultiResolutionImageSupport.java
@@ -72,7 +72,7 @@ public class MultiResolutionImageSupport
 	 * <p>
 	 * The given dimensions array is only used for {@link #getResolutionVariants(Image)}.
 	 * The producer function may be invoked with any dimension (that is not contained in 
-	 * dimensions array) and is expected to produce an image for the passed in dimension.
+	 * dimensions array) and is expected to produce a image for the passed in dimension.
 	 * 
 	 * @param baseImageIndex index of the base image in the dimensions array
 	 * @param dimensions dimensions of resolution variants (sorted by size; smallest first)
@@ -92,7 +92,7 @@ public class MultiResolutionImageSupport
 	 * for "disabled" state.  
 	 * 
 	 * @param image a multi-resolution image that is mapped using the given mapper function
-	 * @param mapper mapper function that maps a single resolution variant to a new image (e.g. applying a filter)
+	 * @param mapper mapper function that maps a single resolution variant to a new image (e.g. applying an filter)
 	 * @return a multi-resolution image on Java 9 or later; a mapped image on Java 8
 	 */
 	public static Image map( Image image, Function<Image, Image> mapper ) {
@@ -104,7 +104,7 @@ public class MultiResolutionImageSupport
 	 * <p>
 	 * If the given image is a multi-resolution image then invokes
 	 * {@code java.awt.image.MultiResolutionImage.getResolutionVariant(destImageWidth, destImageHeight)}.
-	 * Otherwise, returns the given image.
+	 * Otherwise returns the given image.
 	 */
 	public static Image getResolutionVariant( Image image, int destImageWidth, int destImageHeight ) {
 		return image;
@@ -115,7 +115,7 @@ public class MultiResolutionImageSupport
 	 * <p>
 	 * If the given image is a multi-resolution image then invokes
 	 * {@code java.awt.image.MultiResolutionImage.getResolutionVariants()}.
-	 * Otherwise, returns a list containing only the given image.
+	 * Otherwise returns a list containing only the given image.
 	 */
 	public static List<Image> getResolutionVariants( Image image ) {
 		return Collections.singletonList( image );
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/NativeLibrary.java
@@ -60,19 +60,6 @@ public class NativeLibrary
 			: false;
 	}

-	/**
-	 * Load native library from given file.
-	 *
-	 * @param libraryFile the file of the native library
-	 * @param supported whether the native library is supported on the current platform
-	 * @since 2
-	 */
-	public NativeLibrary( File libraryFile, boolean supported ) {
-		this.loaded = supported
-			? loadLibraryFromFile( libraryFile )
-			: false;
-	}
-
 	/**
 	 * Returns whether the native library is loaded.
 	 * <p>
@@ -133,16 +120,6 @@ public class NativeLibrary
 		}
 	}

-	private boolean loadLibraryFromFile( File libraryFile ) {
-		try {
-			System.load( libraryFile.getAbsolutePath() );
-			return true;
-		} catch( Throwable ex ) {
-			log( null, ex );
-			return false;
-		}
-	}
-
 	private static String decorateLibraryName( String libraryName ) {
 		if( SystemInfo.isWindows )
 			return libraryName.concat( ".dll" );
@@ -195,7 +172,7 @@ public class NativeLibrary
 			// for loaded native libraries, they will be deleted on next application startup.
 			// The default temporary directory may contain hundreds or thousands of files.
 			// To make searching for "marked for deletion" files as fast as possible,
-			// use a subdirectory that contains only our temporary native libraries.
+			// use a sub directory that contains only our temporary native libraries.
 			tmpdir += "\\flatlaf.temp";
 		}

--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SwingUtils.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SwingUtils.java
@@ -1,50 +0,0 @@
-/*
- * Copyright 2022 FormDev Software GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.formdev.flatlaf.util;
-
-import java.awt.Component;
-import java.awt.Container;
-
-/**
- * Utility methods for Swing.
- *
- * @author Karl Tauber
- * @since 2
- */
-public class SwingUtils
-{
-	/**
-	 * Search for a (grand) child component with the given name.
-	 *
-	 * @return a component; or {@code null}
-	 */
-	@SuppressWarnings( "unchecked" )
-	public static <T extends Component> T getComponentByName( Container parent, String name ) {
-		for( Component child : parent.getComponents() ) {
-			if( name.equals( child.getName() ) )
-				return (T) child;
-
-			if( child instanceof Container ) {
-				T c = getComponentByName( (Container) child, name );
-				if( c != null )
-					return c;
-			}
-		}
-
-		return null;
-	}
-}
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java
@@ -34,17 +34,12 @@ public class SystemInfo
 	// OS versions
 	public static final long osVersion;
 	public static final boolean isWindows_10_orLater;
-	/** <strong>Note</strong>: This requires Java 8u321, 11.0.14, 17.0.2 or 18 (or later).
-	 * (see https://bugs.openjdk.java.net/browse/JDK-8274840)
-	 * @since 2 */ public static final boolean isWindows_11_orLater;
 	public static final boolean isMacOS_10_11_ElCapitan_orLater;
 	public static final boolean isMacOS_10_14_Mojave_orLater;
 	public static final boolean isMacOS_10_15_Catalina_orLater;

 	// OS architecture
-	/** @since 2 */ public static final boolean isX86;
 	/** @since 1.1 */ public static final boolean isX86_64;
-	/** @since 2 */ public static final boolean isAARCH64;

 	// Java versions
 	public static final long javaVersion;
@@ -52,7 +47,6 @@ public class SystemInfo
 	public static final boolean isJava_11_orLater;
 	public static final boolean isJava_15_orLater;
 	/** @since 2 */ public static final boolean isJava_17_orLater;
-	/** @since 2 */ public static final boolean isJava_18_orLater;

 	// Java VMs
 	public static final boolean isJetBrainsJVM;
@@ -76,17 +70,13 @@ public class SystemInfo
 		// OS versions
 		osVersion = scanVersion( System.getProperty( "os.version" ) );
 		isWindows_10_orLater = (isWindows && osVersion >= toVersion( 10, 0, 0, 0 ));
-		isWindows_11_orLater = (isWindows_10_orLater && osName.length() > "windows ".length() &&
-			scanVersion( osName.substring( "windows ".length() ) ) >= toVersion( 11, 0, 0, 0 ));
 		isMacOS_10_11_ElCapitan_orLater = (isMacOS && osVersion >= toVersion( 10, 11, 0, 0 ));
 		isMacOS_10_14_Mojave_orLater = (isMacOS && osVersion >= toVersion( 10, 14, 0, 0 ));
 		isMacOS_10_15_Catalina_orLater = (isMacOS && osVersion >= toVersion( 10, 15, 0, 0 ));

 		// OS architecture
 		String osArch = System.getProperty( "os.arch" );
-		isX86 = osArch.equals( "x86" );
 		isX86_64 = osArch.equals( "amd64" ) || osArch.equals( "x86_64" );
-		isAARCH64 = osArch.equals( "aarch64" );

 		// Java versions
 		javaVersion = scanVersion( System.getProperty( "java.version" ) );
@@ -94,7 +84,6 @@ public class SystemInfo
 		isJava_11_orLater = (javaVersion >= toVersion( 11, 0, 0, 0 ));
 		isJava_15_orLater = (javaVersion >= toVersion( 15, 0, 0, 0 ));
 		isJava_17_orLater = (javaVersion >= toVersion( 17, 0, 0, 0 ));
-		isJava_18_orLater = (javaVersion >= toVersion( 18, 0, 0, 0 ));

 		// Java VMs
 		isJetBrainsJVM = System.getProperty( "java.vm.vendor", "Unknown" )
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/UIScale.java
@@ -103,7 +103,7 @@ public class UIScale
 			// Java 9 and later supports per-monitor scaling
 			jreHiDPI = true;
 		} else if( SystemInfo.isJetBrainsJVM ) {
-			// IntelliJ IDEA ships its own JetBrains Java 8 JRE that may support per-monitor scaling
+			// IntelliJ IDEA ships its own JetBrains Java 8 JRE that may supports per-monitor scaling
 			// see com.intellij.ui.JreHiDpiUtil.isJreHiDPIEnabled()
 			try {
 				GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -411,7 +411,7 @@ public class UIScale
 	 * Scales the given dimension with the user scale factor.
 	 * <p>
 	 * If user scale factor is 1, then the given dimension is simply returned.
-	 * Otherwise, a new instance of {@link Dimension} or {@link DimensionUIResource}
+	 * Otherwise a new instance of {@link Dimension} or {@link DimensionUIResource}
 	 * is returned, depending on whether the passed dimension implements {@link UIResource}.
 	 */
 	public static Dimension scale( Dimension dimension ) {
@@ -427,7 +427,7 @@ public class UIScale
 	 * Scales the given insets with the user scale factor.
 	 * <p>
 	 * If user scale factor is 1, then the given insets is simply returned.
-	 * Otherwise, a new instance of {@link Insets} or {@link InsetsUIResource}
+	 * Otherwise a new instance of {@link Insets} or {@link InsetsUIResource}
 	 * is returned, depending on whether the passed dimension implements {@link UIResource}.
 	 */
 	public static Insets scale( Insets insets ) {
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties
@@ -24,7 +24,7 @@
 #
 # NOTE: Avoid copying the whole content of this file to own properties files.
 #       This will make upgrading to newer FlatLaf versions complex and error-prone.
-#       Instead, copy and modify only those properties that you need to alter.
+#       Instead copy and modify only those properties that you need to alter.
 #

 # Colors and style mostly based on Darcula theme from IntelliJ IDEA Community Edition,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Karl Tauber	4d7a6ff331	AnimatedPainter: - renamed `getValues()` to `getAnimatableValues()` - renamed `getClientPropertyKey()` to `getAnimationClientPropertyKey()` - AnimatedPainterSupport improvements	2025-03-13 11:46:14 +01:00
Karl Tauber	23fc3674c9	LineChartPanel: - support "synchron" charts - reworked to make code easier to understand/maintain - added some JavaBean properties to make it configurable in JFormDesigner - fixes some bugs removed `FlatAnimatorTest.LineChartPanel` and replaced it with `LineChartPanel`	2025-03-12 18:35:56 +01:00
Karl Tauber	34a7214dd8	LineChartPanel copied from branch `smooth-scrolling`, commit `44a04cca2c`	2025-03-11 19:33:36 +01:00
Karl Tauber	26d7008c04	AnimatedPainter: support individual animation duration, resolution and interpolator depending on value(s)	2021-11-22 22:07:45 +01:00
Karl Tauber	3b489e8e1a	AnimatedPainter: support independent animation of multiple values	2021-11-22 22:07:20 +01:00
Karl Tauber	ccbf577f46	AnimatedBorder: demo for labeled material border	2021-11-21 23:20:47 +01:00
Karl Tauber	b903f18130	FlatAnimatorTest: - support synchronized line chart - LineChartPanel: added slider to change horizontal scaling - FlatAnimatedIconTest: added line chart panel - FlatAnimatedBorderTest: added line chart panel	2021-11-21 12:27:31 +01:00
Karl Tauber	9523c89c51	FlatAnimatorTest: added standard-easing and line chart (line chart copied from `FlatSmoothScrollingTest.LineChartPanel` in branch `smooth-scrolling` commit 331ab06b0087d3a70f7c131368b88e5e7c92102f)	2021-11-20 15:14:03 +01:00
Karl Tauber	aa6fb2fcce	AnimatedPainter added (refactored from AnimatedBorder and AnimatedIcon) (checked API compatibility of AnimatedIcon with gradle task sigtestCheck)	2021-11-20 11:13:06 +01:00
Karl Tauber	e4fa2e28ea	AnimatedBorder: - support repainting only necessary region while animating - use AbstractBorder in test app and fixed insets	2021-11-19 18:02:54 +01:00
Karl Tauber	b2245e2246	AnimatedBorder added (for future animations) (issue #66 )	2021-11-19 18:02:54 +01:00