Modules: Move utils in darklaf to ui.utils to avoid split packages. Move classes in property-loader to the properties subpackage to avoid split packages.

3 years ago · 6a68876b9a
381 changed files with 329 additions and 304 deletions
--- a/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabbedPane.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabbedPane.java
@ -27,7 +27,7 @@ import java.beans.VetoableChangeListener;

 import javax.swing.*;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** @author Jannis Weis */
 public class ClosableTabbedPane extends JTabbedPane {
--- a/core/src/main/java/com/github/weisj/darklaf/components/CloseButton.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/CloseButton.java
@ -26,7 +26,7 @@ import java.awt.*;
 import javax.swing.*;

 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class CloseButton extends JButton {

--- a/core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java
@ -29,14 +29,14 @@ import javax.swing.plaf.ComponentUI;

 import com.github.weisj.darklaf.DarkLaf;
 import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.PropertyLoader;
-import com.github.weisj.darklaf.icons.IconLoader;
-import com.github.weisj.darklaf.icons.StateIcon;
+import com.github.weisj.darklaf.properties.PropertyLoader;
+import com.github.weisj.darklaf.properties.icons.IconLoader;
+import com.github.weisj.darklaf.properties.icons.StateIcon;
 import com.github.weisj.darklaf.task.AccentColorAdjustmentTask;
 import com.github.weisj.darklaf.task.ForegroundColorGenerationTask;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.ui.togglebutton.radiobutton.DarkRadioButtonUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class ColoredRadioButton extends JRadioButton {

--- a/core/src/main/java/com/github/weisj/darklaf/components/DefaultColorPipette.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/DefaultColorPipette.java
@ -28,10 +28,10 @@ import java.awt.image.BufferedImage;

 import javax.swing.*;

-import com.github.weisj.darklaf.icons.EmptyIcon;
+import com.github.weisj.darklaf.properties.icons.EmptyIcon;
 import com.github.weisj.darklaf.ui.colorchooser.ColorListener;
-import com.github.weisj.darklaf.util.DarkUIUtil;
-import com.github.weisj.darklaf.util.TimerUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.TimerUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/components/JXPopupMenu.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/JXPopupMenu.java
@ -28,7 +28,7 @@ import javax.swing.*;

 import org.pbjar.jxlayer.plaf.ext.TransformUI;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** Popup menu that is aware of {@link org.pbjar.jxlayer.plaf.ext.TransformUI}. */
 public class JXPopupMenu extends JPopupMenu {
--- a/core/src/main/java/com/github/weisj/darklaf/components/RotatableIconAnimator.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/RotatableIconAnimator.java
@ -25,9 +25,9 @@ import java.awt.event.ActionEvent;

 import javax.swing.*;

-import com.github.weisj.darklaf.icons.RotatableIcon;
+import com.github.weisj.darklaf.properties.icons.RotatableIcon;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;

 public class RotatableIconAnimator extends Timer {

--- a/core/src/main/java/com/github/weisj/darklaf/components/color/QuickColorChooser.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/color/QuickColorChooser.java
@ -32,8 +32,8 @@ import java.util.function.Supplier;
 import javax.swing.*;

 import com.github.weisj.darklaf.components.tooltip.ToolTipStyle;
-import com.github.weisj.darklaf.icons.EmptyIcon;
-import com.github.weisj.darklaf.icons.SolidColorIcon;
+import com.github.weisj.darklaf.properties.icons.EmptyIcon;
+import com.github.weisj.darklaf.properties.icons.SolidColorIcon;
 import com.github.weisj.darklaf.transfer.TransferUtil;
 import com.github.weisj.darklaf.ui.tooltip.ToolTipConstants;
 import com.github.weisj.darklaf.util.Pair;
--- a/core/src/main/java/com/github/weisj/darklaf/components/color/SmallColorChooser.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/color/SmallColorChooser.java
@ -32,16 +32,16 @@ import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.text.*;

-import com.github.weisj.darklaf.color.DarkColorModel;
-import com.github.weisj.darklaf.color.DarkColorModelHSB;
-import com.github.weisj.darklaf.color.DarkColorModelHSL;
-import com.github.weisj.darklaf.color.DarkColorModelRGB;
 import com.github.weisj.darklaf.components.DefaultColorPipette;
 import com.github.weisj.darklaf.components.border.DarkBorders;
 import com.github.weisj.darklaf.components.border.MarginBorderWrapper;
 import com.github.weisj.darklaf.components.chooser.ChooserComponent;
 import com.github.weisj.darklaf.layout.LayoutHelper;
 import com.github.weisj.darklaf.listener.UpdateDocumentListener;
+import com.github.weisj.darklaf.properties.color.DarkColorModel;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSB;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSL;
+import com.github.weisj.darklaf.properties.color.DarkColorModelRGB;
 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
 import com.github.weisj.darklaf.ui.colorchooser.ColorPipette;
 import com.github.weisj.darklaf.ui.colorchooser.ColorPreviewComponent;
@ -49,8 +49,8 @@ import com.github.weisj.darklaf.ui.colorchooser.ColorTriangle;
 import com.github.weisj.darklaf.ui.colorchooser.ColorValueFormatter;
 import com.github.weisj.darklaf.ui.slider.DarkSliderUI;
 import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.ColorUtil;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;

 public class SmallColorChooser extends JPanel implements ChooserComponent<Color> {
--- a/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditor.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditor.java
@ -38,18 +38,18 @@ import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.components.border.DarkBorders;
 import com.github.weisj.darklaf.components.button.JSplitButton;
 import com.github.weisj.darklaf.components.renderer.SimpleListCellRenderer;
-import com.github.weisj.darklaf.icons.CustomThemedIcon;
-import com.github.weisj.darklaf.icons.DerivableIcon;
-import com.github.weisj.darklaf.icons.EmptyIcon;
-import com.github.weisj.darklaf.icons.ThemedIcon;
-import com.github.weisj.darklaf.icons.ThemedSVGIcon;
 import com.github.weisj.darklaf.layout.HorizontalLayout;
 import com.github.weisj.darklaf.layout.LayoutHelper;
+import com.github.weisj.darklaf.properties.icons.CustomThemedIcon;
+import com.github.weisj.darklaf.properties.icons.DerivableIcon;
+import com.github.weisj.darklaf.properties.icons.EmptyIcon;
+import com.github.weisj.darklaf.properties.icons.ThemedIcon;
+import com.github.weisj.darklaf.properties.icons.ThemedSVGIcon;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.ui.button.ButtonConstants;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Actions;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Pair;

 public class IconEditor extends JPanel {
--- a/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditorPanel.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditorPanel.java
@ -31,7 +31,6 @@ import javax.swing.*;

 import com.github.weisj.darklaf.DarkLaf;
 import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.PropertyLoader;
 import com.github.weisj.darklaf.components.ComponentHelper;
 import com.github.weisj.darklaf.components.DynamicUI;
 import com.github.weisj.darklaf.components.border.DarkBorders;
@ -40,10 +39,11 @@ import com.github.weisj.darklaf.components.color.QuickColorChooser;
 import com.github.weisj.darklaf.components.popup.AttachedPopupComponent;
 import com.github.weisj.darklaf.components.popup.SharedComponent;
 import com.github.weisj.darklaf.components.renderer.SimpleListCellRenderer;
-import com.github.weisj.darklaf.icons.*;
 import com.github.weisj.darklaf.layout.LayoutHelper;
+import com.github.weisj.darklaf.properties.PropertyLoader;
+import com.github.weisj.darklaf.properties.icons.*;
 import com.github.weisj.darklaf.theme.Theme;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Pair;

 public class IconEditorPanel extends JPanel {
--- a/core/src/main/java/com/github/weisj/darklaf/components/loading/LoadingIndicator.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/loading/LoadingIndicator.java
@ -24,9 +24,9 @@ package com.github.weisj.darklaf.components.loading;
 import javax.swing.*;

 import com.github.weisj.darklaf.components.RotatableIconAnimator;
-import com.github.weisj.darklaf.icons.EmptyIcon;
-import com.github.weisj.darklaf.icons.RotatableIcon;
-import com.github.weisj.darklaf.icons.TwoIcon;
+import com.github.weisj.darklaf.properties.icons.EmptyIcon;
+import com.github.weisj.darklaf.properties.icons.RotatableIcon;
+import com.github.weisj.darklaf.properties.icons.TwoIcon;

 /** Label that functions as an loading indicator. */
 public class LoadingIndicator extends JLabel {
--- a/core/src/main/java/com/github/weisj/darklaf/components/popup/AttachedPopupComponent.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/popup/AttachedPopupComponent.java
@ -38,9 +38,9 @@ import com.github.weisj.darklaf.listener.MouseClickListener;
 import com.github.weisj.darklaf.ui.DarkPopupFactory;
 import com.github.weisj.darklaf.ui.tooltip.DarkToolTipUI;
 import com.github.weisj.darklaf.ui.tooltip.ToolTipConstants;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Actions;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;

 public class AttachedPopupComponent extends JToolTip {
--- a/core/src/main/java/com/github/weisj/darklaf/components/tooltip/ToolTipContext.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/tooltip/ToolTipContext.java
@ -34,8 +34,8 @@ import javax.swing.border.Border;
 import com.github.weisj.darklaf.components.alignment.AlignmentStrategy;
 import com.github.weisj.darklaf.ui.tooltip.AlignableTooltipBorder;
 import com.github.weisj.darklaf.ui.tooltip.DarkToolTipUI;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;

 public class ToolTipContext {

--- a/core/src/main/java/com/github/weisj/darklaf/components/tree/TristateTreeNode.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/tree/TristateTreeNode.java
@ -25,7 +25,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;

 import com.github.weisj.darklaf.components.tristate.TristateState;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class TristateTreeNode extends DefaultMutableTreeNode implements LabeledTreeNode {

--- a/core/src/main/java/com/github/weisj/darklaf/components/treetable/DefaultTreeTableCellRenderer.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/treetable/DefaultTreeTableCellRenderer.java
@ -29,7 +29,7 @@ import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;

 import com.github.weisj.darklaf.ui.tree.DarkTreeUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class DefaultTreeTableCellRenderer extends JComponent implements TableCellRenderer {

--- a/core/src/main/java/com/github/weisj/darklaf/components/treetable/JTreeTable.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/treetable/JTreeTable.java
@ -35,7 +35,7 @@ import com.github.weisj.darklaf.components.treetable.model.DefaultTreeTableSelec
 import com.github.weisj.darklaf.components.treetable.model.TreeTableModel;
 import com.github.weisj.darklaf.ui.cell.hint.CellHintPopupListener;
 import com.github.weisj.darklaf.ui.tree.DarkTreeUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;

 public class JTreeTable extends JTable implements TreeSelectionListener {
--- a/core/src/main/java/com/github/weisj/darklaf/components/treetable/model/DefaultTreeTableModel.java
+++ b/core/src/main/java/com/github/weisj/darklaf/components/treetable/model/DefaultTreeTableModel.java
@ -21,7 +21,7 @@
 */
 package com.github.weisj.darklaf.components.treetable.model;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class DefaultTreeTableModel extends AbstractTreeTableModel {

--- a/core/src/main/java/com/github/weisj/darklaf/graphics/StringPainter.java
+++ b/core/src/main/java/com/github/weisj/darklaf/graphics/StringPainter.java
@ -33,6 +33,8 @@ import javax.swing.plaf.basic.BasicHTML;
 import javax.swing.text.View;

 import com.github.weisj.darklaf.ui.OpacityBufferedUI;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.*;
 import com.github.weisj.darklaf.util.ColorUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
--- a/core/src/main/java/com/github/weisj/darklaf/graphics/ThemedColor.java
+++ b/core/src/main/java/com/github/weisj/darklaf/graphics/ThemedColor.java
@ -22,7 +22,7 @@
 package com.github.weisj.darklaf.graphics;

 import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.color.DynamicColor;
+import com.github.weisj.darklaf.properties.color.DynamicColor;
 import com.github.weisj.darklaf.theme.Theme;

 public class ThemedColor extends DynamicColor {
--- a/core/src/main/java/com/github/weisj/darklaf/layout/LayoutHelper.java
+++ b/core/src/main/java/com/github/weisj/darklaf/layout/LayoutHelper.java
@ -33,8 +33,8 @@ import javax.swing.border.Border;
 import com.github.weisj.darklaf.components.HoveringPanel;
 import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.components.border.DarkBorders;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;

 public final class LayoutHelper {

--- a/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java
+++ b/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java
@ -31,14 +31,14 @@ import javax.swing.*;

 import com.github.weisj.darklaf.LafManager;
 import com.github.weisj.darklaf.components.DefaultButton;
-import com.github.weisj.darklaf.icons.IconLoader;
+import com.github.weisj.darklaf.properties.icons.IconLoader;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.theme.event.ThemePreferenceChangeEvent;
 import com.github.weisj.darklaf.theme.event.ThemePreferenceListener;
 import com.github.weisj.darklaf.theme.info.AccentColorRule;
 import com.github.weisj.darklaf.theme.info.FontSizeRule;
 import com.github.weisj.darklaf.theme.info.PreferredThemeStyle;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.LazyValue;
 import com.github.weisj.darklaf.util.LogUtil;
 import com.github.weisj.darklaf.util.value.WeakShared;
--- a/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsPanel.java
+++ b/core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsPanel.java
@ -32,7 +32,7 @@ import com.github.weisj.darklaf.components.DynamicUI;
 import com.github.weisj.darklaf.components.tristate.TristateCheckBox;
 import com.github.weisj.darklaf.layout.LayoutHelper;
 import com.github.weisj.darklaf.theme.Theme;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.swingdsl.visualpadding.VisualPaddingProvider;

 public class ThemeSettingsPanel extends JPanel {
--- a/core/src/main/java/com/github/weisj/darklaf/swingdsl/DarklafComponentFactory.java
+++ b/core/src/main/java/com/github/weisj/darklaf/swingdsl/DarklafComponentFactory.java
@ -31,7 +31,7 @@ import javax.swing.UIManager;
 import org.jetbrains.annotations.NotNull;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.swingdsl.laf.ComponentFactoryDelegate;
 import com.github.weisj.swingdsl.laf.DefaultComponentFactory;
 import com.github.weisj.swingdsl.laf.DefaultWrappedComponent;
--- a/core/src/main/java/com/github/weisj/darklaf/swingdsl/VisualPaddingUtil.java
+++ b/core/src/main/java/com/github/weisj/darklaf/swingdsl/VisualPaddingUtil.java
@ -27,7 +27,7 @@ import javax.swing.JComponent;
 import javax.swing.border.Border;
 import javax.swing.plaf.InsetsUIResource;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.swingdsl.visualpadding.VisualPaddingProvider;

--- a/core/src/main/java/com/github/weisj/darklaf/task/AccentColorAdjustmentTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/AccentColorAdjustmentTask.java
@ -28,10 +28,10 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Logger;

-import com.github.weisj.darklaf.color.DarkColorModelHSB;
-import com.github.weisj.darklaf.parser.Parser;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSB;
+import com.github.weisj.darklaf.properties.parser.Parser;
+import com.github.weisj.darklaf.properties.uiresource.DarkColorUIResource;
 import com.github.weisj.darklaf.theme.Theme;
-import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
 import com.github.weisj.darklaf.util.LogUtil;
 import com.github.weisj.darklaf.util.Types;

--- a/core/src/main/java/com/github/weisj/darklaf/task/ColorAdjustmentTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/ColorAdjustmentTask.java
@ -28,11 +28,11 @@ import java.util.logging.Logger;

 import javax.swing.*;

-import com.github.weisj.darklaf.parser.ParseResult;
-import com.github.weisj.darklaf.parser.Parser;
-import com.github.weisj.darklaf.parser.ParserContext;
+import com.github.weisj.darklaf.properties.parser.ParseResult;
+import com.github.weisj.darklaf.properties.parser.Parser;
+import com.github.weisj.darklaf.properties.parser.ParserContext;
 import com.github.weisj.darklaf.theme.Theme;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.LogUtil;

 public abstract class ColorAdjustmentTask implements DefaultsAdjustmentTask {
--- a/core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java
@ -34,10 +34,10 @@ import javax.swing.*;
 import javax.swing.plaf.UIResource;

 import com.github.weisj.darklaf.DarkLaf;
-import com.github.weisj.darklaf.PropertyLoader;
+import com.github.weisj.darklaf.properties.PropertyLoader;
+import com.github.weisj.darklaf.properties.uiresource.DarkFontUIResource;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.theme.info.FontSizeRule;
-import com.github.weisj.darklaf.uiresource.DarkFontUIResource;
 import com.github.weisj.darklaf.util.FontUtil;
 import com.github.weisj.darklaf.util.LogUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java
@ -29,11 +29,11 @@ import java.util.logging.Logger;

 import javax.swing.plaf.ColorUIResource;

-import com.github.weisj.darklaf.color.DarkColorModelHSB;
-import com.github.weisj.darklaf.color.DarkColorModelHSL;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSB;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSL;
+import com.github.weisj.darklaf.properties.uiresource.DarkColorUIResource;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.theme.info.AccentColorRule;
-import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
 import com.github.weisj.darklaf.util.ColorUtil;
 import com.github.weisj.darklaf.util.LogUtil;
 import com.github.weisj.darklaf.util.Types;
--- a/core/src/main/java/com/github/weisj/darklaf/task/RemoveUnusedInitTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/RemoveUnusedInitTask.java
@ -26,7 +26,7 @@ import java.util.Properties;
 import javax.swing.*;

 import com.github.weisj.darklaf.DarkLaf;
-import com.github.weisj.darklaf.PropertyLoader;
+import com.github.weisj.darklaf.properties.PropertyLoader;
 import com.github.weisj.darklaf.theme.Theme;

 public class RemoveUnusedInitTask implements DefaultsInitTask {
--- a/core/src/main/java/com/github/weisj/darklaf/task/ResourceBundleInitTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/ResourceBundleInitTask.java
@ -24,7 +24,7 @@ package com.github.weisj.darklaf.task;
 import javax.swing.*;

 import com.github.weisj.darklaf.theme.Theme;
-import com.github.weisj.darklaf.util.ResourceUtil;
+import com.github.weisj.darklaf.ui.util.ResourceUtil;

 public class ResourceBundleInitTask implements DefaultsInitTask {

--- a/core/src/main/java/com/github/weisj/darklaf/task/SystemDefaultsInitTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/SystemDefaultsInitTask.java
@ -26,7 +26,7 @@ import java.util.Properties;
 import javax.swing.*;

 import com.github.weisj.darklaf.DarkLaf;
-import com.github.weisj.darklaf.PropertyLoader;
+import com.github.weisj.darklaf.properties.PropertyLoader;
 import com.github.weisj.darklaf.theme.Theme;

 public class SystemDefaultsInitTask implements DefaultsInitTask {
--- a/core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java
@ -29,8 +29,8 @@ import java.util.Properties;
 import javax.swing.*;

 import com.github.weisj.darklaf.DarkLaf;
-import com.github.weisj.darklaf.PropertyLoader;
 import com.github.weisj.darklaf.platform.DecorationsHandler;
+import com.github.weisj.darklaf.properties.PropertyLoader;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.SystemInfo;
--- a/core/src/main/java/com/github/weisj/darklaf/task/UtilityDefaultsInitTask.java
+++ b/core/src/main/java/com/github/weisj/darklaf/task/UtilityDefaultsInitTask.java
@ -26,8 +26,8 @@ import java.util.function.Supplier;
 import javax.swing.*;

 import com.github.weisj.darklaf.graphics.PaintUtil;
-import com.github.weisj.darklaf.icons.AwareIconStyle;
-import com.github.weisj.darklaf.icons.IconLoader;
+import com.github.weisj.darklaf.properties.icons.AwareIconStyle;
+import com.github.weisj.darklaf.properties.icons.IconLoader;
 import com.github.weisj.darklaf.swingdsl.DarklafComponentFactory;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.ui.cell.CellUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/transfer/TransferUtil.java
+++ b/core/src/main/java/com/github/weisj/darklaf/transfer/TransferUtil.java
@ -34,7 +34,7 @@ import java.util.function.Supplier;

 import javax.swing.*;

-import com.github.weisj.darklaf.icons.IconUtil;
+import com.github.weisj.darklaf.properties.icons.IconUtil;
 import com.github.weisj.darklaf.util.Pair;

 public final class TransferUtil {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/DarkPopupFactory.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/DarkPopupFactory.java
@ -31,8 +31,9 @@ import javax.swing.*;
 import javax.swing.plaf.RootPaneUI;

 import com.github.weisj.darklaf.platform.DecorationsHandler;
+import com.github.weisj.darklaf.properties.uiresource.DarkColorUIResource;
 import com.github.weisj.darklaf.ui.rootpane.DarkRootPaneUI;
-import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.*;
 import com.github.weisj.darklaf.util.ColorUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/WidgetPopupHelper.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/WidgetPopupHelper.java
@ -25,7 +25,7 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public final class WidgetPopupHelper {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonBorder.java
@ -29,8 +29,8 @@ import javax.swing.plaf.InsetsUIResource;
 import javax.swing.plaf.UIResource;

 import com.github.weisj.darklaf.graphics.PaintUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.AlignmentExt;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.swingdsl.visualpadding.VisualPaddingProvider;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
@ -40,8 +40,8 @@ import com.github.weisj.darklaf.graphics.StringPainter;
 import com.github.weisj.darklaf.swingdsl.VisualPaddingListener;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonFocusNavigationActions;
 import com.github.weisj.darklaf.ui.tooltip.ToolTipConstants;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.AlignmentExt;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/cell/CellUtil.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/cell/CellUtil.java
@ -30,8 +30,8 @@ import com.github.weisj.darklaf.ui.list.DarkListUI;
 import com.github.weisj.darklaf.ui.table.DarkTableUI;
 import com.github.weisj.darklaf.ui.table.renderer.IconWrapper;
 import com.github.weisj.darklaf.ui.tree.DarkTreeUI;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.ColorUtil;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererToggleButton.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/cell/DarkCellRendererToggleButton.java
@ -30,7 +30,7 @@ import com.github.weisj.darklaf.components.tree.LabeledTreeNode;
 import com.github.weisj.darklaf.components.tristate.TristateCheckBox;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;
 import com.github.weisj.darklaf.ui.tree.DarkTreeCellRendererDelegate;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** @author Jannis Weis */
 public class DarkCellRendererToggleButton<T extends JToggleButton & CellToggleButton>
--- a/core/src/main/java/com/github/weisj/darklaf/ui/cell/hint/CellHintPopupListener.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/cell/hint/CellHintPopupListener.java
@ -33,9 +33,9 @@ import javax.swing.event.MouseInputAdapter;

 import com.github.weisj.darklaf.graphics.PaintUtil;
 import com.github.weisj.darklaf.ui.DarkPopupFactory;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.WindowUtil;
 import com.github.weisj.darklaf.util.LogUtil;
-import com.github.weisj.darklaf.util.WindowUtil;

 public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAdapter {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorTriangle.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorTriangle.java
@ -32,10 +32,10 @@ import java.util.List;

 import javax.swing.*;

-import com.github.weisj.darklaf.color.DarkColorModel;
-import com.github.weisj.darklaf.color.DarkColorModelHSB;
-import com.github.weisj.darklaf.color.DarkColorModelHSL;
-import com.github.weisj.darklaf.color.DarkColorModelRGB;
+import com.github.weisj.darklaf.properties.color.DarkColorModel;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSB;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSL;
+import com.github.weisj.darklaf.properties.color.DarkColorModelRGB;
 import com.github.weisj.darklaf.util.ColorUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorValueFormatter.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorValueFormatter.java
@ -36,7 +36,7 @@ import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultFormatterFactory;
 import javax.swing.text.DocumentFilter;

-import com.github.weisj.darklaf.color.DarkColorModel;
+import com.github.weisj.darklaf.properties.color.DarkColorModel;
 import com.github.weisj.darklaf.ui.text.DarkTextUI;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorWheelPanel.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorWheelPanel.java
@ -25,7 +25,7 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.color.DarkColorModel;
+import com.github.weisj.darklaf.properties.color.DarkColorModel;

 /**
 * @author pegov
--- a/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserPanel.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserPanel.java
@ -28,10 +28,10 @@ import javax.swing.colorchooser.AbstractColorChooserPanel;
 import javax.swing.colorchooser.ColorSelectionModel;
 import javax.swing.event.AncestorEvent;

-import com.github.weisj.darklaf.color.DarkColorModel;
 import com.github.weisj.darklaf.components.DefaultColorPipette;
 import com.github.weisj.darklaf.listener.AncestorAdapter;
 import com.github.weisj.darklaf.listener.UpdateDocumentListener;
+import com.github.weisj.darklaf.properties.color.DarkColorModel;
 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
 import com.github.weisj.darklaf.util.ColorUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserUI.java
@ -32,12 +32,12 @@ import javax.swing.event.AncestorListener;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicColorChooserUI;

-import com.github.weisj.darklaf.color.DarkColorModelCMYK;
-import com.github.weisj.darklaf.color.DarkColorModelHSB;
-import com.github.weisj.darklaf.color.DarkColorModelHSL;
-import com.github.weisj.darklaf.color.DarkColorModelRGB;
-import com.github.weisj.darklaf.icons.IconLoader;
 import com.github.weisj.darklaf.listener.AncestorAdapter;
+import com.github.weisj.darklaf.properties.color.DarkColorModelCMYK;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSB;
+import com.github.weisj.darklaf.properties.color.DarkColorModelHSL;
+import com.github.weisj.darklaf.properties.color.DarkColorModelRGB;
+import com.github.weisj.darklaf.properties.icons.IconLoader;
 import com.github.weisj.darklaf.util.PropertyKey;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkPreviewPanel.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkPreviewPanel.java
@ -25,7 +25,7 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.util.SwingUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
@ -41,7 +41,7 @@ import com.github.weisj.darklaf.ui.DividedWidgetPainter;
 import com.github.weisj.darklaf.ui.list.DarkDefaultListCellRenderer;
 import com.github.weisj.darklaf.ui.popupmenu.DarkPopupMenuUI;
 import com.github.weisj.darklaf.ui.text.DarkTextUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/internalframe/DarkInternalFrameTitlePane.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/internalframe/DarkInternalFrameTitlePane.java
@ -32,10 +32,10 @@ import javax.swing.plaf.basic.BasicInternalFrameTitlePane;

 import com.github.weisj.darklaf.components.tooltip.ToolTipStyle;
 import com.github.weisj.darklaf.components.uiresource.JButtonUIResource;
-import com.github.weisj.darklaf.icons.ToggleIcon;
+import com.github.weisj.darklaf.properties.icons.ToggleIcon;
 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
 import com.github.weisj.darklaf.ui.tooltip.DarkToolTipUI;
-import com.github.weisj.darklaf.util.SwingUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;

 /** @author Jannis Weis */
 public class DarkInternalFrameTitlePane extends BasicInternalFrameTitlePane implements PropertyChangeListener {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/internalframe/DarkInternalFrameUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/internalframe/DarkInternalFrameUI.java
@ -29,7 +29,7 @@ import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicInternalFrameUI;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** @author Jannis Weis */
 public class DarkInternalFrameUI extends BasicInternalFrameUI implements PropertyChangeListener {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/internalframe/InternalFrameMenuBar.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/internalframe/InternalFrameMenuBar.java
@ -25,7 +25,7 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class InternalFrameMenuBar extends JComponent {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/label/DarkLabelUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/label/DarkLabelUI.java
@ -30,9 +30,9 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicLabelUI;

 import com.github.weisj.darklaf.graphics.StringPainter;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
-import com.github.weisj.darklaf.util.SwingUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/list/DarkListUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/list/DarkListUI.java
@ -30,7 +30,7 @@ import javax.swing.plaf.ComponentUI;

 import com.github.weisj.darklaf.ui.cell.CellConstants;
 import com.github.weisj.darklaf.ui.cell.DarkCellRendererPane;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/list/DarkListUIBridge.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/list/DarkListUIBridge.java
@ -39,11 +39,11 @@ import javax.swing.text.Position;
 import com.github.weisj.darklaf.ui.BasicTransferable;
 import com.github.weisj.darklaf.ui.DragRecognitionSupport;
 import com.github.weisj.darklaf.ui.UIAction;
-import com.github.weisj.darklaf.util.DarkUIUtil;
-import com.github.weisj.darklaf.util.LazyActionMap;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.LazyActionMap;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
-import com.github.weisj.darklaf.util.SwingUtil;

 /**
 * An extensible implementation of {@code ListUI}.
--- a/core/src/main/java/com/github/weisj/darklaf/ui/menu/DarkMenuItemUIBase.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/menu/DarkMenuItemUIBase.java
@ -29,7 +29,8 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicMenuItemUI;

 import com.github.weisj.darklaf.ui.UIAction;
-import com.github.weisj.darklaf.util.LazyActionMap;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.LazyActionMap;
 import com.intellij.util.ui.MenuItemLayoutHelper;

 /**
--- a/core/src/main/java/com/github/weisj/darklaf/ui/menu/MenuItemUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/menu/MenuItemUI.java
@ -35,9 +35,9 @@ import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.StringUtil;
-import com.github.weisj.darklaf.util.SwingUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
 import com.intellij.util.ui.MenuItemLayoutHelper;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/numberingpane/DarkNumberingPaneUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/numberingpane/DarkNumberingPaneUI.java
@ -43,7 +43,7 @@ import com.github.weisj.darklaf.components.text.IconListener;
 import com.github.weisj.darklaf.components.text.IndexListener;
 import com.github.weisj.darklaf.components.text.LineHighlighter;
 import com.github.weisj.darklaf.components.text.NumberingPane;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/DarkPopupMenuUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/DarkPopupMenuUI.java
@ -32,7 +32,7 @@ import javax.swing.plaf.basic.BasicPopupMenuUI;

 import com.github.weisj.darklaf.components.ScrollPopupMenu;
 import com.github.weisj.darklaf.ui.DarkPopupFactory;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;

 /**
--- a/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/MouseGrabber.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/MouseGrabber.java
@ -33,9 +33,9 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
-import com.github.weisj.darklaf.util.SwingUtil;

 public class MouseGrabber implements ChangeListener, AWTEventListener, ComponentListener, WindowListener {

@ -71,7 +71,7 @@ public class MouseGrabber implements ChangeListener, AWTEventListener, Component
        }
        grabbedWindow = DarkUIUtil.getWindow(invoker);
        if (grabbedWindow != null) {
-            if (tk.getClass().getName().equals("SunToolkit")) {
+            if (SwingUtil.isSunToolkit(tk)) {
                SwingUtil.grab(tk, grabbedWindow);
            } else {
                grabbedWindow.addComponentListener(this);
@ -98,7 +98,7 @@ public class MouseGrabber implements ChangeListener, AWTEventListener, Component
    protected void realUngrabWindow() {
        Toolkit tk = Toolkit.getDefaultToolkit();
        if (grabbedWindow != null) {
-            if (tk.getClass().getName().equals("SunToolkit")) {
+            if (SwingUtil.isSunToolkit(tk)) {
                SwingUtil.ungrab(tk, grabbedWindow);
            } else {
                grabbedWindow.removeComponentListener(this);
--- a/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/MouseGrabberUtil.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/MouseGrabberUtil.java
@ -30,7 +30,7 @@ import java.security.PrivilegedAction;
 import javax.swing.*;
 import javax.swing.event.ChangeListener;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public final class MouseGrabberUtil {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/PopupMenuContainer.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/PopupMenuContainer.java
@ -32,7 +32,7 @@ import javax.swing.event.PopupMenuListener;
 import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.listener.PopupMenuAdapter;
 import com.github.weisj.darklaf.ui.scrollpane.DarkScrollBarUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class PopupMenuContainer extends JPanel {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/progressbar/DarkProgressBarUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/progressbar/DarkProgressBarUI.java
@ -32,7 +32,7 @@ import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicProgressBarUI;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/rootpane/DarkRootPaneUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/rootpane/DarkRootPaneUI.java
@ -33,7 +33,7 @@ import javax.swing.plaf.basic.BasicRootPaneUI;
 import com.github.weisj.darklaf.LafManager;
 import com.github.weisj.darklaf.platform.DecorationsHandler;
 import com.github.weisj.darklaf.platform.decorations.CustomTitlePane;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/rootpane/DarkSubstanceRootLayout.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/rootpane/DarkSubstanceRootLayout.java
@ -28,7 +28,7 @@ import javax.swing.*;

 import com.github.weisj.darklaf.platform.DecorationsHandler;
 import com.github.weisj.darklaf.platform.decorations.CustomTitlePane;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.LogUtil;

 /**
--- a/core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java
@ -32,10 +32,10 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicSliderUI;

 import com.github.weisj.darklaf.graphics.PaintUtil;
-import com.github.weisj.darklaf.icons.RotatableIcon;
+import com.github.weisj.darklaf.properties.icons.RotatableIcon;
 import com.github.weisj.darklaf.swingdsl.VisualPaddingUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerBorder.java
@ -29,7 +29,7 @@ import javax.swing.plaf.InsetsUIResource;
 import javax.swing.plaf.UIResource;

 import com.github.weisj.darklaf.ui.DividedWidgetPainter;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.swingdsl.visualpadding.VisualPaddingProvider;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerListener.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerListener.java
@ -28,7 +28,7 @@ import java.beans.PropertyChangeListener;

 import javax.swing.*;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;

 public class DarkSpinnerListener extends MouseAdapter
--- a/core/src/main/java/com/github/weisj/darklaf/ui/splitbutton/DarkSplitButtonBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/splitbutton/DarkSplitButtonBorder.java
@ -28,7 +28,7 @@ import javax.swing.*;
 import com.github.weisj.darklaf.components.button.JSplitButton;
 import com.github.weisj.darklaf.ui.button.ButtonConstants;
 import com.github.weisj.darklaf.ui.button.DarkButtonBorder;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class DarkSplitButtonBorder extends DarkButtonBorder {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/splitbutton/DarkSplitButtonUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/splitbutton/DarkSplitButtonUI.java
@ -28,7 +28,7 @@ import javax.swing.plaf.ComponentUI;

 import com.github.weisj.darklaf.components.ArrowButton;
 import com.github.weisj.darklaf.components.button.JSplitButton;
-import com.github.weisj.darklaf.icons.ToggleIcon;
+import com.github.weisj.darklaf.properties.icons.ToggleIcon;
 import com.github.weisj.darklaf.ui.button.ButtonConstants;
 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
 import com.github.weisj.darklaf.ui.popupmenu.DarkPopupMenuUI;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/splitpane/DarkSplitPaneDivider.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/splitpane/DarkSplitPaneDivider.java
@ -27,7 +27,7 @@ import javax.swing.*;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;

-import com.github.weisj.darklaf.icons.EmptyIcon;
+import com.github.weisj.darklaf.properties.icons.EmptyIcon;

 /** @author Jannis Weis */
 public class DarkSplitPaneDivider extends BasicSplitPaneDivider {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java
@ -36,7 +36,7 @@ import com.github.weisj.darklaf.components.uiresource.UIResourceWrapper;
 import com.github.weisj.darklaf.focus.FocusParentHelper;
 import com.github.weisj.darklaf.graphics.PaintUtil;
 import com.github.weisj.darklaf.graphics.StringPainter;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUIBridge.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUIBridge.java
@ -40,10 +40,10 @@ import javax.swing.plaf.basic.BasicHTML;
 import javax.swing.text.View;

 import com.github.weisj.darklaf.ui.UIAction;
-import com.github.weisj.darklaf.util.DarkUIUtil;
-import com.github.weisj.darklaf.util.LazyActionMap;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.LazyActionMap;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
-import com.github.weisj.darklaf.util.SwingUtil;

 /**
 * A Basic L&amp;F implementation of TabbedPaneUI.
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabButtonContainer.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabButtonContainer.java
@ -26,7 +26,7 @@ import java.awt.*;
 import javax.swing.*;
 import javax.swing.plaf.UIResource;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public abstract class TabButtonContainer extends JPanel implements UIResource {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneHandler.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneHandler.java
@ -34,7 +34,7 @@ import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicHTML;
 import javax.swing.text.View;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneTransferHandler.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneTransferHandler.java
@ -32,7 +32,7 @@ import java.awt.event.MouseEvent;
 import javax.swing.*;
 import javax.swing.plaf.TabbedPaneUI;

-import com.github.weisj.darklaf.util.DnDUtil;
+import com.github.weisj.darklaf.ui.util.DnDUtil;

 /**
 * @author Robert Futrell
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneUtil.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneUtil.java
@ -25,7 +25,7 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** @author Jannis Weis */
 public class TabbedPaneUtil implements SwingConstants {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkPanelPopupUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkPanelPopupUI.java
@ -39,9 +39,9 @@ import com.github.weisj.darklaf.focus.FocusParentHelper;
 import com.github.weisj.darklaf.ui.button.DarkButtonUI;
 import com.github.weisj.darklaf.ui.panel.DarkPanelUI;
 import com.github.weisj.darklaf.ui.tooltip.ToolTipConstants;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Actions;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;

 public class DarkPanelPopupUI extends DarkPanelUI implements PropertyChangeListener, TabFramePopupUI {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameComponentPopupMenu.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameComponentPopupMenu.java
@ -30,7 +30,7 @@ import javax.swing.plaf.UIResource;

 import com.github.weisj.darklaf.components.JXPopupMenu;
 import com.github.weisj.darklaf.components.tabframe.TabFrameTab;
-import com.github.weisj.darklaf.icons.EmptyIcon;
+import com.github.weisj.darklaf.properties.icons.EmptyIcon;
 import com.github.weisj.darklaf.util.Alignment;
 import com.github.weisj.darklaf.util.PropertyKey;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabLabelUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabLabelUI.java
@ -35,8 +35,8 @@ import javax.swing.plaf.UIResource;
 import com.github.weisj.darklaf.components.tabframe.JTabFrame;
 import com.github.weisj.darklaf.components.tabframe.TabFrameTab;
 import com.github.weisj.darklaf.components.tabframe.TabFrameTabLabel;
-import com.github.weisj.darklaf.icons.RotatableIcon;
 import com.github.weisj.darklaf.listener.HoverListener;
+import com.github.weisj.darklaf.properties.icons.RotatableIcon;
 import com.github.weisj.darklaf.ui.label.DarkLabelUI;
 import com.github.weisj.darklaf.util.Alignment;
 import com.github.weisj.darklaf.util.PropertyKey;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/TabDragListener.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/TabDragListener.java
@ -28,8 +28,8 @@ import java.awt.event.MouseEvent;
 import javax.swing.*;

 import com.github.weisj.darklaf.components.tabframe.TabFrameTab;
-import com.github.weisj.darklaf.util.DarkUIUtil;
-import com.github.weisj.darklaf.util.SwingXUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingXUtil;

 public class TabDragListener extends MouseAdapter {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/TabFrameTransferHandler.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/TabFrameTransferHandler.java
@ -35,8 +35,8 @@ import com.github.weisj.darklaf.components.tabframe.JTabFrame;
 import com.github.weisj.darklaf.components.tabframe.TabFramePopup;
 import com.github.weisj.darklaf.components.tabframe.TabFrameTab;
 import com.github.weisj.darklaf.components.tabframe.TabFrameUI;
+import com.github.weisj.darklaf.ui.util.DnDUtil;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DnDUtil;

 /** @author Jannis Weis */
 public class TabFrameTransferHandler extends TransferHandler implements DropTargetListener, SwingConstants {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/TabFrameUtil.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tabframe/TabFrameUtil.java
@ -27,9 +27,9 @@ import javax.swing.*;

 import com.github.weisj.darklaf.components.tabframe.JTabFrame;
 import com.github.weisj.darklaf.components.tabframe.TabFrameTab;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Actions;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;

 public final class TabFrameUtil {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableUI.java
@ -43,10 +43,10 @@ import com.github.weisj.darklaf.ui.table.renderer.DarkColorTableCellRendererEdit
 import com.github.weisj.darklaf.ui.table.renderer.DarkTableCellEditorDelegate;
 import com.github.weisj.darklaf.ui.table.renderer.DarkTableCellRenderer;
 import com.github.weisj.darklaf.ui.table.renderer.DarkTableCellRendererDelegate;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
-import com.github.weisj.darklaf.util.SwingUtil;

 /** @author Jannis Weis */
 public class DarkTableUI extends DarkTableUIBridge implements TableConstants, HasRendererPane {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableUIBridge.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/table/DarkTableUIBridge.java
@ -28,7 +28,7 @@ import javax.swing.table.JTableHeader;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;

-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** @author Jannis Weis */
 public abstract class DarkTableUIBridge extends TableUIBridge {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/table/TableUIBridge.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/table/TableUIBridge.java
@ -38,9 +38,9 @@ import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableColumn;

 import com.github.weisj.darklaf.ui.DragRecognitionSupport;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
-import com.github.weisj.darklaf.util.SwingUtil;

 /** The type Table ui bridge. */
 public abstract class TableUIBridge extends BasicTableUI {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/table/TextTableCellEditorBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/table/TextTableCellEditorBorder.java
@ -29,7 +29,7 @@ import javax.swing.border.Border;
 import com.github.weisj.darklaf.graphics.PaintUtil;
 import com.github.weisj.darklaf.ui.cell.CellUtil;
 import com.github.weisj.darklaf.ui.cell.DarkCellBorder;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** @author Jannis Weis */
 public class TextTableCellEditorBorder extends DarkCellBorder {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/table/header/DarkTableHeaderUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/table/header/DarkTableHeaderUI.java
@ -32,7 +32,7 @@ import javax.swing.table.TableColumnModel;

 import com.github.weisj.darklaf.ui.table.DarkTableScrollPaneBorder;
 import com.github.weisj.darklaf.ui.table.DarkTableUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/table/renderer/DarkTableCellRendererDelegate.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/table/renderer/DarkTableCellRendererDelegate.java
@ -34,7 +34,7 @@ import com.github.weisj.darklaf.ui.cell.CellUtil;
 import com.github.weisj.darklaf.ui.table.DarkTableCellFocusBorder;
 import com.github.weisj.darklaf.ui.table.DarkTableUI;
 import com.github.weisj.darklaf.ui.table.TableConstants;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;

 public class DarkTableCellRendererDelegate extends TableCellRendererDelegate implements TableConstants {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkPasswordFieldUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkPasswordFieldUI.java
@ -30,7 +30,7 @@ import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.text.JTextComponent;

-import com.github.weisj.darklaf.icons.EmptyIcon;
+import com.github.weisj.darklaf.properties.icons.EmptyIcon;
 import com.github.weisj.darklaf.ui.text.bridge.DarkPasswordFieldUIBridge;
 import com.github.weisj.darklaf.util.PropertyUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextBorder.java
@ -31,7 +31,7 @@ import javax.swing.text.JTextComponent;

 import com.github.weisj.darklaf.graphics.Outline;
 import com.github.weisj.darklaf.graphics.PaintUtil;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextFieldUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextFieldUI.java
@ -36,10 +36,10 @@ import com.github.weisj.darklaf.listener.MouseClickListener;
 import com.github.weisj.darklaf.listener.MouseMovementListener;
 import com.github.weisj.darklaf.listener.PopupMenuAdapter;
 import com.github.weisj.darklaf.ui.text.bridge.DarkTextFieldUIBridge;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.FontUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
-import com.github.weisj.darklaf.util.SwingUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/text/DarkTextUI.java
@ -45,7 +45,7 @@ import com.github.weisj.darklaf.ui.text.action.ToggleInsertAction;
 import com.github.weisj.darklaf.ui.text.popup.DarkTextPopupMenu;
 import com.github.weisj.darklaf.ui.tooltip.ToolTipConstants;
 import com.github.weisj.darklaf.ui.tree.DarkTreeUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/ToggleButtonConstants.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/ToggleButtonConstants.java
@ -27,7 +27,7 @@ import javax.swing.*;

 import com.github.weisj.darklaf.ui.table.DarkTableUI;
 import com.github.weisj.darklaf.ui.tree.DarkTreeUI;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;

 public interface ToggleButtonConstants {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/checkbox/DarkCheckBoxBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/checkbox/DarkCheckBoxBorder.java
@ -28,7 +28,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.UIResource;

 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.swingdsl.visualpadding.VisualPaddingProvider;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/radiobutton/DarkRadioButtonBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/radiobutton/DarkRadioButtonBorder.java
@ -28,7 +28,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.UIResource;

 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.swingdsl.visualpadding.VisualPaddingProvider;

 /** @author Jannis Weis */
--- a/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/radiobutton/DarkRadioButtonUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/radiobutton/DarkRadioButtonUI.java
@ -37,8 +37,8 @@ import com.github.weisj.darklaf.swingdsl.VisualPaddingListener;
 import com.github.weisj.darklaf.ui.togglebutton.DarkToggleButtonUI;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonFocusNavigationActions;
+import com.github.weisj.darklaf.ui.util.SwingUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
-import com.github.weisj.darklaf.util.SwingUtil;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;

--- a/core/src/main/java/com/github/weisj/darklaf/ui/toolbar/DarkToolBarUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/toolbar/DarkToolBarUI.java
@ -35,7 +35,7 @@ import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicToolBarUI;

 import com.github.weisj.darklaf.listener.MouseResponder;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 /** @author Jannis Weis */
 public class DarkToolBarUI extends BasicToolBarUI {
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkDefaultToolTipBorder.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkDefaultToolTipBorder.java
@ -27,7 +27,7 @@ import javax.swing.*;
 import javax.swing.plaf.UIResource;

 import com.github.weisj.darklaf.components.border.MutableLineBorder;
-import com.github.weisj.darklaf.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class DarkDefaultToolTipBorder extends MutableLineBorder implements UIResource, AlignableTooltipBorder {

--- a/core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkToolTipUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkToolTipUI.java
@ -35,11 +35,11 @@ import javax.swing.text.View;

 import com.github.weisj.darklaf.components.tooltip.ToolTipStyle;
 import com.github.weisj.darklaf.graphics.*;
+import com.github.weisj.darklaf.properties.uiresource.DarkColorUIResource;
 import com.github.weisj.darklaf.ui.DarkPopupFactory;
-import com.github.weisj.darklaf.uiresource.DarkColorUIResource;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Alignment;
 import com.github.weisj.darklaf.util.ColorUtil;
-import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.graphics.GraphicsContext;
 import com.github.weisj.darklaf.util.graphics.GraphicsUtil;
--- a/core/src/main/java/com/github/weisj/darklaf/ui/tooltip/ToolTipUtil.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/tooltip/ToolTipUtil.java
@ -28,9 +28,9 @@ import javax.swing.*;

 import com.github.weisj.darklaf.components.tooltip.ToolTipContext;
 import com.github.weisj.darklaf.components.tooltip.ToolTipStyle;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
+import com.github.weisj.darklaf.ui.util.WindowUtil;
 import com.github.weisj.darklaf.util.Alignment;
-import com.github.weisj.darklaf.util.DarkUIUtil;
-import com.github.weisj.darklaf.util.WindowUtil;

 public final class ToolTipUtil {

--- a/Show More
+++ b/Show More