Modules: Fix resource loading when running on the module path.

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 val skipJavadoc by props()
 val enableMavenLocal by props(false)
 val enableGradleMetadata by props()
-val skipAutostyle by props(false)
+val skipAutostyle by props(true)
 val isRelease = project.stringProperty("release").toBool()
 val snapshotName by props("")
 

core/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     api(projects.darklafPropertyLoader)
     api(projects.darklafUtils)
     implementation(projects.darklafCompatibility)
+    implementation(projects.darklafIconset)
     implementation(projects.darklafNativeUtils)
     implementation(projects.darklafPlatformBase)
     implementation(projects.darklafWindows)
@@ -42,7 +43,8 @@ tasks.test {
         workingDir.mkdirs()
     }
     useJUnitPlatform()
-    val verboseTest by props(false)
+    patchTestExecParams()
+    val verboseTest by props(true)
     if (!verboseTest) {
         exclude("**/DemoTest*")
     }
@@ -72,7 +74,7 @@ val makeDocumentation by tasks.registering(JavaExec::class) {
 
     workingDir = File(project.rootDir, "build")
     workingDir.mkdirs()
-    main = "com.github.weisj.darklaf.documentation.CreateUITable"
+    main = "com.github.weisj.darklaf.core.documentation.CreateUITable"
     classpath(sourceSets.main.get().runtimeClasspath, sourceSets.test.get().runtimeClasspath)
 }
 
@@ -90,7 +92,8 @@ abstract class DemoTask : JavaExec() {
 
 val runDemo by tasks.registering(DemoTask::class) {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
-    description = "Launches demo (e.g. com.github.weisj.darklaf.ui.table.TableDemo, com.github.weisj.darklaf.ui.button.ButtonDemo, ...)"
+    description =
+        "Launches demo (e.g. com.github.weisj.darklaf.ui.table.TableDemo, com.github.weisj.darklaf.ui.button.ButtonDemo, ...)"
 
     classpath(sourceSets.test.map { it.runtimeClasspath })
 

core/src/main/java/com/github/weisj/darklaf/DarkLaf.java

@@ -43,6 +43,7 @@ public class DarkLaf extends ThemedLookAndFeel {
     public static final String SYSTEM_PROPERTY_PREFIX = "darklaf.";
     public static final String ALLOW_NATIVE_CODE_FLAG = DarkLaf.SYSTEM_PROPERTY_PREFIX + "allowNativeCode";
     private static final Logger LOGGER = LogUtil.getLogger(DarkLaf.class);
+
     /*
      * All tasks for initializing the ui defaults in order of execution.
      */
@@ -100,7 +101,7 @@ public class DarkLaf extends ThemedLookAndFeel {
                     UIManager.setLookAndFeel(systemLafClassName);
                     baseLaf = currentOrFallback(UIManager.getLookAndFeel());
                 } catch (final Exception e) {
-                    LOGGER.log(Level.SEVERE, e.getMessage(), e.getStackTrace());
+                    LOGGER.log(Level.SEVERE, e.getMessage(), e);
                     throw new IllegalStateException("Could not load base LaF class." + e.getMessage());
                 }
             }

core/src/main/java/com/github/weisj/darklaf/LafManager.java

@@ -261,6 +261,7 @@ public final class LafManager {
      * @param theme the theme to register.
      */
     public static void registerTheme(final Theme theme) {
+        LOGGER.fine("Registering " + theme);
         registeredThemes.add(theme);
     }
 

core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java

@@ -29,6 +29,7 @@ import javax.swing.plaf.ComponentUI;
 
 import com.github.weisj.darklaf.DarkLaf;
 import com.github.weisj.darklaf.LafManager;
+import com.github.weisj.darklaf.iconset.IconSet;
 import com.github.weisj.darklaf.properties.PropertyLoader;
 import com.github.weisj.darklaf.properties.icons.IconLoader;
 import com.github.weisj.darklaf.properties.icons.StateIcon;
@@ -193,14 +194,14 @@ public class ColoredRadioButton extends JRadioButton {
             Theme theme = LafManager.getInstalledTheme();
             Properties props = new Properties();
             UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-            theme.loadDefaults(props, defaults);
+            theme.loadDefaults(props, defaults, DarkUIUtil.ICON_LOADER);
             Color accentCol = color == DEFAULT_COLOR ? (Color) props.get("widgetFillDefault") : color;
             Color focusCol = focusColor == DEFAULT_COLOR ? accentCol : focusColor;
             adjustment.applyColors(theme, props, accentCol, null);
-            PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "radioButton", "properties/ui/"),
+            PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "radioButton", "ui/"),
-                    props, defaults);
+                    props, defaults, DarkUIUtil.ICON_LOADER);
-            PropertyLoader.putProperties(
+            PropertyLoader.putProperties(PropertyLoader.loadProperties(IconSet.class, "radioButton", ""),
-                    PropertyLoader.loadProperties(DarkLaf.class, "radioButton", "properties/icons/"), props, defaults);
+                    props, defaults, DarkUIUtil.ICON_LOADER);
             propertyMap = new Properties();
             for (String prop : PROPERTIES) {
                 propertyMap.put(prop, props.get(prop));

core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditor.java

@@ -118,9 +118,9 @@ public class IconEditor extends JPanel {
                 DarkUIUtil.ICON_LOADER.getIcon("navigation/add.svg", addIconSize, addIconSize, true));
         int overlaySize = (2 * addIconSize) / 3;
         addEditorButton.setOverlayDropDownIcon(
-                DarkUIUtil.ICON_LOADER.getIcon("indicator/dropDown.svg", overlaySize, overlaySize, true));
+                DarkUIUtil.ICON_LOADER.getIcon("indicator/dropdown.svg", overlaySize, overlaySize, true));
         addEditorButton.setOverlayDropDownDisabledIcon(
-                DarkUIUtil.ICON_LOADER.getIcon("indicator/dropDownDisabled.svg", overlaySize, overlaySize, true));
+                DarkUIUtil.ICON_LOADER.getIcon("indicator/dropdownDisabled.svg", overlaySize, overlaySize, true));
         addEditorButton.putClientProperty(ButtonConstants.KEY_ARC_MULTIPLIER, 3);
         JPopupMenu menu = addEditorButton.getActionMenu();
 

core/src/main/java/com/github/weisj/darklaf/components/iconeditor/IconEditorPanel.java

@@ -377,7 +377,7 @@ public class IconEditorPanel extends JPanel {
                     }.getDefaults();
                 }
                 Properties props = new Properties();
-                theme.loadIconTheme(props, defaults);
+                theme.loadIconTheme(props, defaults, DarkUIUtil.ICON_LOADER);
                 props.entrySet().forEach(e -> e.setValue(defaults.get(e.getKey())));
                 return new ThemeIconDefaults(defaults, props);
             });

core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java

@@ -371,19 +371,19 @@ public class ThemeSettings implements ThemePreferenceListener {
 
     protected Component createButtonPanel() {
         Locale l = Locale.getDefault();
-        JButton ok = new DefaultButton(UIManager.getString("dialog_ok", l));
+        JButton ok = new DefaultButton(UIManager.getString("settings.dialog_ok", l));
         ok.setDefaultCapable(true);
         ok.addActionListener(e -> {
             apply();
             dialog.dispatchEvent(new WindowEvent(dialog, WindowEvent.WINDOW_CLOSING));
         });
 
-        JButton cancel = new JButton(UIManager.getString("dialog_cancel", l));
+        JButton cancel = new JButton(UIManager.getString("settings.dialog_cancel", l));
         cancel.addActionListener(e -> {
             revert();
             dialog.dispatchEvent(new WindowEvent(dialog, WindowEvent.WINDOW_CLOSING));
         });
-        JButton apply = new JButton(UIManager.getString("dialog_apply", l));
+        JButton apply = new JButton(UIManager.getString("settings.dialog_apply", l));
         apply.addActionListener(e -> apply());
 
         Box box = Box.createHorizontalBox();
@@ -531,7 +531,7 @@ public class ThemeSettings implements ThemePreferenceListener {
      * @return the title
      */
     public String getTitle() {
-        return UIManager.getString("title", Locale.getDefault());
+        return UIManager.getString("settings.title", Locale.getDefault());
     }
 
     @Override

core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsUI.java

@@ -62,12 +62,12 @@ import com.github.weisj.darklaf.util.Alignment;
 
 public class ThemeSettingsUI {
 
-    public final static String THEME_LABEL_KEY = "label_theme";
+    public final static String THEME_LABEL_KEY = "settings.label_theme";
-    public final static String SELECTION_COLOR_LABEL_KEY = "label_selection_color";
+    public final static String SELECTION_COLOR_LABEL_KEY = "settings.label_selection_color";
-    public final static String ACCENT_COLOR_LABEL_KEY = "label_accent_color";
+    public final static String ACCENT_COLOR_LABEL_KEY = "settings.label_accent_color";
-    public final static String FONT_SIZE_LABEL_KEY = "label_font_size";
+    public final static String FONT_SIZE_LABEL_KEY = "settings.label_font_size";
-    public final static String GENERAL_LABEL_KEY = "title_general";
+    public final static String GENERAL_LABEL_KEY = "settings.title_general";
-    public final static String MONITORING_LABEL_KEY = "title_monitoring";
+    public final static String MONITORING_LABEL_KEY = "settings.title_monitoring";
 
     private final SettingsUIConfiguration settingsConfiguration;
     private final List<ChangeListener> listeners = new ArrayList<>();
@@ -108,14 +108,14 @@ public class ThemeSettingsUI {
         fontSlider = createFontSlider();
 
         enabledSystemPreferences = DynamicUI.withDynamic(new TristateCheckBox(),
-                c -> c.setText(UIManager.getString("check_system_preferences", c.getLocale())));
+                c -> c.setText(UIManager.getString("settings.check_system_preferences", c.getLocale())));
-        accentColorFollowsSystem = createSystemSettingCheckBox("check_system_accent_color",
+        accentColorFollowsSystem = createSystemSettingCheckBox("settings.check_system_accent_color",
                 ThemePreferencesHandler::supportsNativeAccentColor);
-        selectionColorFollowsSystem = createSystemSettingCheckBox("check_system_selection_color",
+        selectionColorFollowsSystem = createSystemSettingCheckBox("settings.check_system_selection_color",
                 ThemePreferencesHandler::supportsNativeSelectionColor);
-        fontSizeFollowsSystem = createSystemSettingCheckBox("check_system_font",
+        fontSizeFollowsSystem = createSystemSettingCheckBox("settings.check_system_font",
                 ThemePreferencesHandler::supportsNativeFontSize);
-        themeFollowsSystem = createSystemSettingCheckBox("check_system_theme",
+        themeFollowsSystem = createSystemSettingCheckBox("settings.check_system_theme",
                 ThemePreferencesHandler::supportsNativeTheme);
 
         setupListeners();
@@ -256,25 +256,25 @@ public class ThemeSettingsUI {
         return new RadioColorChooser(
                 Arrays.asList(
                         new RadioColorChooser.ColorSpec(
-                                ColoredRadioButton.DEFAULT_COLOR, defaultAccentColor, "color_default"),
+                                ColoredRadioButton.DEFAULT_COLOR, defaultAccentColor, "settings.color_default"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_BLUE, null, "color_blue"),
+                                MacOSColors.ACCENT_BLUE, null, "settings.color_blue"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_LILAC, null, "color_lilac"),
+                                MacOSColors.ACCENT_LILAC, null, "settings.color_lilac"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_ROSE, null, "color_rose"),
+                                MacOSColors.ACCENT_ROSE, null, "settings.color_rose"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_RED, null, "color_red"),
+                                MacOSColors.ACCENT_RED, null, "settings.color_red"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_ORANGE, null, "color_orange"),
+                                MacOSColors.ACCENT_ORANGE, null, "settings.color_orange"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_YELLOW, null, "color_yellow"),
+                                MacOSColors.ACCENT_YELLOW, null, "settings.color_yellow"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_GREEN, null, "color_green"),
+                                MacOSColors.ACCENT_GREEN, null, "settings.color_green"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.ACCENT_GRAPHITE, null, "color_gray")),
+                                MacOSColors.ACCENT_GRAPHITE, null, "settings.color_gray")),
                 new RadioColorChooser.ColorSpec(
-                        currentAccentColor, null, "color_custom"),
+                        currentAccentColor, null, "settings.color_custom"),
                 currentAccentColor, defaultAccentColor);
     }
 
@@ -283,25 +283,25 @@ public class ThemeSettingsUI {
         return new RadioColorChooser(
                 Arrays.asList(
                         new RadioColorChooser.ColorSpec(
-                                defaultSelectionColor, ColoredRadioButton.DEFAULT_COLOR, "color_default"),
+                                defaultSelectionColor, ColoredRadioButton.DEFAULT_COLOR, "settings.color_default"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_BLUE, MacOSColors.ACCENT_BLUE, "color_blue"),
+                                MacOSColors.SELECTION_BLUE, MacOSColors.ACCENT_BLUE, "settings.color_blue"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_PURPLE, MacOSColors.ACCENT_LILAC, "color_purple"),
+                                MacOSColors.SELECTION_PURPLE, MacOSColors.ACCENT_LILAC, "settings.color_purple"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_PINK, MacOSColors.ACCENT_ROSE, "color_pink"),
+                                MacOSColors.SELECTION_PINK, MacOSColors.ACCENT_ROSE, "settings.color_pink"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_RED, MacOSColors.ACCENT_RED, "color_red"),
+                                MacOSColors.SELECTION_RED, MacOSColors.ACCENT_RED, "settings.color_red"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_ORANGE, MacOSColors.ACCENT_ORANGE, "color_orange"),
+                                MacOSColors.SELECTION_ORANGE, MacOSColors.ACCENT_ORANGE, "settings.color_orange"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_YELLOW, MacOSColors.ACCENT_YELLOW, "color_yellow"),
+                                MacOSColors.SELECTION_YELLOW, MacOSColors.ACCENT_YELLOW, "settings.color_yellow"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_GREEN, MacOSColors.ACCENT_GREEN, "color_green"),
+                                MacOSColors.SELECTION_GREEN, MacOSColors.ACCENT_GREEN, "settings.color_green"),
                         new RadioColorChooser.ColorSpec(
-                                MacOSColors.SELECTION_GRAPHITE, MacOSColors.ACCENT_GRAPHITE, "color_gray")),
+                                MacOSColors.SELECTION_GRAPHITE, MacOSColors.ACCENT_GRAPHITE, "settings.color_gray")),
                 new RadioColorChooser.ColorSpec(
-                        currentSelectionColor, defaultSelectionColor, "color_custom"),
+                        currentSelectionColor, defaultSelectionColor, "settings.color_custom"),
                 currentSelectionColor, defaultSelectionColor);
     }
 
@@ -337,7 +337,8 @@ public class ThemeSettingsUI {
         Dictionary<Integer, JComponent> dict = fontSlider.createStandardLabels(tickSpacing);
         JLabel min = ((JLabel) dict.get(fontSlider.getMinimum()));
         UIUpdater.registerComponent(min);
-        DynamicUI.withDynamic(min, c -> c.setText(UIManager.getString("label_font_smaller", fontSlider.getLocale())));
+        DynamicUI.withDynamic(min,
+                c -> c.setText(UIManager.getString("settings.label_font_smaller", fontSlider.getLocale())));
         min.setAlignmentX(JComponent.LEFT_ALIGNMENT);
         min.putClientProperty(DarkSliderUI.KEY_MANUAL_LABEL_ALIGN, true);
 
@@ -345,14 +346,16 @@ public class ThemeSettingsUI {
         UIUpdater.registerComponent(mid);
         dict.remove(fontSlider.getMinimum() + tickSpacing);
         dict.put(FontSizePreset.NORMAL.getPercentage(), mid);
-        DynamicUI.withDynamic(mid, c -> c.setText(UIManager.getString("label_font_default", fontSlider.getLocale())));
+        DynamicUI.withDynamic(mid,
+                c -> c.setText(UIManager.getString("settings.label_font_default", fontSlider.getLocale())));
 
         mid.setAlignmentX(JComponent.CENTER_ALIGNMENT);
         mid.setHorizontalTextPosition(JLabel.RIGHT);
 
         JLabel max = ((JLabel) dict.get(fontSlider.getMaximum()));
         max.putClientProperty(DarkSliderUI.KEY_MANUAL_LABEL_ALIGN, true);
-        DynamicUI.withDynamic(max, c -> c.setText(UIManager.getString("label_font_bigger", fontSlider.getLocale())));
+        DynamicUI.withDynamic(max,
+                c -> c.setText(UIManager.getString("settings.label_font_bigger", fontSlider.getLocale())));
         max.setAlignmentX(JComponent.RIGHT_ALIGNMENT);
         max.putClientProperty(DarkSliderUI.KEY_MANUAL_LABEL_ALIGN, true);
         UIUpdater.registerComponent(max);

core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java

@@ -38,6 +38,7 @@ 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.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.FontUtil;
 import com.github.weisj.darklaf.util.LogUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
@@ -49,7 +50,7 @@ public class FontDefaultsInitTask implements DefaultsInitTask {
     private static final Logger LOGGER = LogUtil.getLogger(FontDefaultsInitTask.class);
     private static final String SWING_AA_KEY = "swing.aatext";
     private static final String SWING_AA_DEFAULT_VALUE = "true";
-    private static final String FONT_PROPERTY_PATH = "properties/";
+    private static final String FONT_PROPERTY_PATH = "";
     private static final String FONT_SIZE_DEFAULTS_NAME = "font_sizes";
     private static final String FONT_DEFAULTS_NAME = "font";
     private static final String KERNING_ALLOW_LIST = "kerning.allowList";
@@ -176,9 +177,9 @@ public class FontDefaultsInitTask implements DefaultsInitTask {
     private void loadFontProperties(final UIDefaults defaults) {
         Properties fontSizeProps =
                 PropertyLoader.loadProperties(DarkLaf.class, FONT_SIZE_DEFAULTS_NAME, FONT_PROPERTY_PATH);
-        PropertyLoader.putProperties(fontSizeProps, defaults);
+        PropertyLoader.putProperties(fontSizeProps, defaults, DarkUIUtil.ICON_LOADER);
         Properties fontProps = PropertyLoader.loadProperties(DarkLaf.class, FONT_DEFAULTS_NAME, FONT_PROPERTY_PATH);
-        PropertyLoader.putProperties(fontProps, defaults);
+        PropertyLoader.putProperties(fontProps, defaults, DarkUIUtil.ICON_LOADER);
     }
 
     private void patchOSFonts(final UIDefaults defaults, final Function<Map.Entry<Object, Font>, Font> mapper) {

core/src/main/java/com/github/weisj/darklaf/task/RemoveUnusedInitTask.java

@@ -33,7 +33,7 @@ public class RemoveUnusedInitTask implements DefaultsInitTask {
 
     @Override
     public void run(final Theme currentTheme, final UIDefaults defaults) {
-        Properties props = PropertyLoader.loadProperties(DarkLaf.class, "unused", "properties/");
+        Properties props = PropertyLoader.loadProperties(DarkLaf.class, "unused", "");
         props.keySet().forEach(defaults::remove);
     }
 }

core/src/main/java/com/github/weisj/darklaf/task/ResourceBundleInitTask.java

@@ -33,9 +33,9 @@ public class ResourceBundleInitTask implements DefaultsInitTask {
      */
     private static final String PLAF_BUNDLE_NAME = "com.sun.swing.internal.plaf.basic.resources.basic";
     private static final String METAL_BUNDLE_NAME = "com.sun.swing.internal.plaf.metal.resources.metal";
-    private static final String DARKLAF_BUNDLE_NAME = ResourceUtil.getBundleName("darklaf");
+    private static final String DARKLAF_BUNDLE_NAME = ResourceUtil.getBundleName("task/darklaf");
-    private static final String SETTING_BUNDLE_NAME = ResourceUtil.getBundleName("theme_settings");
+    private static final String SETTING_BUNDLE_NAME = ResourceUtil.getBundleName("task/theme_settings");
-    private static final String TAB_FRAME_BUNDLE_NAME = ResourceUtil.getBundleName("tabFrame");
+    private static final String TAB_FRAME_BUNDLE_NAME = ResourceUtil.getBundleName("task/tabFrame");
 
     @Override
     public void run(final Theme currentTheme, final UIDefaults defaults) {

core/src/main/java/com/github/weisj/darklaf/task/SystemDefaultsInitTask.java

@@ -28,10 +28,11 @@ import javax.swing.*;
 import com.github.weisj.darklaf.DarkLaf;
 import com.github.weisj.darklaf.properties.PropertyLoader;
 import com.github.weisj.darklaf.theme.Theme;
+import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 
 public class SystemDefaultsInitTask implements DefaultsInitTask {
 
-    private static final String OVERWRITES_PATH = "properties/";
+    private static final String OVERWRITES_PATH = "";
     private static final String OVERWRITES_NAME = "overwrites";
 
     @Override
@@ -44,6 +45,6 @@ public class SystemDefaultsInitTask implements DefaultsInitTask {
         overwrites.values().removeIf(v -> System.getProperty(DarkLaf.SYSTEM_PROPERTY_PREFIX + v.toString()) == null);
         overwrites.entrySet()
                 .forEach(e -> e.setValue(System.getProperty(DarkLaf.SYSTEM_PROPERTY_PREFIX + e.getValue().toString())));
-        PropertyLoader.putProperties(overwrites, defaults);
+        PropertyLoader.putProperties(overwrites, defaults, DarkUIUtil.ICON_LOADER);
     }
 }

core/src/main/java/com/github/weisj/darklaf/task/ThemeDefaultsInitTask.java

@@ -29,9 +29,11 @@ import java.util.Properties;
 import javax.swing.*;
 
 import com.github.weisj.darklaf.DarkLaf;
+import com.github.weisj.darklaf.iconset.IconSet;
 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.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.SystemInfo;
 
@@ -63,7 +65,7 @@ public class ThemeDefaultsInitTask implements DefaultsInitTask {
 
     private void loadThemeDefaults(final Theme currentTheme, final UIDefaults defaults) {
         Properties uiProps = new Properties();
-        currentTheme.loadDefaults(uiProps, defaults);
+        currentTheme.loadDefaults(uiProps, defaults, DarkUIUtil.ICON_LOADER);
 
         backupAccentColors(uiProps);
 
@@ -108,10 +110,10 @@ public class ThemeDefaultsInitTask implements DefaultsInitTask {
     }
 
     private void initGlobals(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) {
-        PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "globals", "properties/"), uiProps,
+        PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, "globals", ""),
-                defaults);
+                uiProps, defaults, DarkUIUtil.ICON_LOADER);
 
-        currentTheme.customizeGlobals(uiProps, defaults);
+        currentTheme.customizeGlobals(uiProps, defaults, DarkUIUtil.ICON_LOADER);
         installGlobals(uiProps, defaults);
     }
 
@@ -132,26 +134,26 @@ public class ThemeDefaultsInitTask implements DefaultsInitTask {
 
     private void initUIProperties(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) {
         for (String property : UI_PROPERTIES) {
-            PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, property, "properties/ui/"),
+            PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, property, "ui/"),
-                    uiProps, defaults);
+                    uiProps, defaults, DarkUIUtil.ICON_LOADER);
         }
-        currentTheme.customizeUIProperties(uiProps, defaults);
+        currentTheme.customizeUIProperties(uiProps, defaults, DarkUIUtil.ICON_LOADER);
     }
 
     private void initIconTheme(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) {
-        currentTheme.loadIconTheme(uiProps, defaults);
+        currentTheme.loadIconTheme(uiProps, defaults, DarkUIUtil.ICON_LOADER);
         for (String property : ICON_PROPERTIES) {
-            PropertyLoader.putProperties(PropertyLoader.loadProperties(DarkLaf.class, property, "properties/icons/"),
+            PropertyLoader.putProperties(PropertyLoader.loadProperties(IconSet.class, property, ""),
-                    uiProps, defaults);
+                    uiProps, defaults, DarkUIUtil.ICON_LOADER);
         }
-        currentTheme.customizeIconTheme(uiProps, defaults);
+        currentTheme.customizeIconTheme(uiProps, defaults, DarkUIUtil.ICON_LOADER);
     }
 
     private void initPlatformProperties(final Theme currentTheme, final UIDefaults defaults, final Properties uiProps) {
         PropertyLoader.putProperties(
-                PropertyLoader.loadProperties(DarkLaf.class, SystemInfo.getOsName(), "properties/platform/"), uiProps,
+                PropertyLoader.loadProperties(DarkLaf.class, SystemInfo.getOsName(), "platform/"),
-                defaults);
+                uiProps, defaults, DarkUIUtil.ICON_LOADER);
-        currentTheme.customizePlatformProperties(uiProps, defaults);
+        currentTheme.customizePlatformProperties(uiProps, defaults, DarkUIUtil.ICON_LOADER);
     }
 
     private void adjustPlatformSpecifics(final Properties uiProps) {

core/src/main/java/com/github/weisj/darklaf/ui/util/DarkUIUtil.java

@@ -42,6 +42,7 @@ import javax.swing.tree.TreeCellEditor;
 import javax.swing.tree.TreeCellRenderer;
 
 import com.github.weisj.darklaf.focus.FocusParentHelper;
+import com.github.weisj.darklaf.iconset.IconSet;
 import com.github.weisj.darklaf.properties.icons.IconLoader;
 import com.github.weisj.darklaf.ui.cell.CellRenderer;
 import com.github.weisj.darklaf.ui.popupmenu.DarkPopupMenuUI;
@@ -55,7 +56,7 @@ import com.github.weisj.darklaf.util.PropertyUtil;
 public final class DarkUIUtil {
 
     private static final int CELL_SEARCH_DEPTH = 3;
-    public static final IconLoader ICON_LOADER = IconLoader.get(IconLoader.class);
+    public static final IconLoader ICON_LOADER = IconSet.ICON_LOADER;
     private static final Rectangle iconRect = new Rectangle();
     private static final Rectangle textRect = new Rectangle();
 

core/src/main/java/com/github/weisj/darklaf/ui/util/ResourceUtil.java

@@ -21,15 +21,11 @@
  */
 package com.github.weisj.darklaf.ui.util;
 
-import java.awt.*;
-
 import com.github.weisj.darklaf.DarkLaf;
 
 public final class ResourceUtil {
 
-    private static final String BUNDLE_DIR = "bundles";
-
     public static String getBundleName(final String name) {
-        return DarkLaf.class.getPackage().getName() + "." + BUNDLE_DIR + "." + name;
+        return DarkLaf.class.getPackage().getName() + "." + name.replace('/', '.');
     }
 }

core/src/main/java/org/pbjar/jxlayer/plaf/ext/TransformUI.java

@@ -132,7 +132,7 @@ import com.github.weisj.darklaf.util.SystemInfo;
 public class TransformUI extends MouseEventUI<JComponent> {
 
     public static final String BUFFERED_REPAINT_FLAG = "darklaf.useBufferedRepaintManager";
-    private static final String EXPORTS_FLAG = "--add-exports java.desktop/com.sun.java.swing=ALL-UNNAMED";
+    private static final String EXPORTS_FLAG = "--add-exports java.desktop/com.sun.java.swing=darklaf.core";
     private static final LayoutManager transformLayout = new TransformLayout();
     private static final String KEY_VIEW = "view";
     private static final boolean delegatePossible;

core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings.properties

@@ -1,62 +0,0 @@
-#
-# MIT License
-#
-# Copyright (c) 2021 Jannis Weis
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# suppress inspection "UnusedProperty" for whole file
-#
-title                        = Theme Settings
-color_default                = Default
-color_blue                   = Blue
-color_lilac                  = Lilac
-color_rose                   = Rose
-color_red                    = Red
-color_orange                 = Orange
-color_yellow                 = Yellow
-color_green                  = Green
-color_gray                   = Graphite
-color_custom                 = Custom
-color_purple                 = Purple
-color_pink                   = Pink
-
-label_theme                  = Theme
-
-label_accent_color           = Accent Color
-label_selection_color        = Selection Color
-
-label_font_size              = Font size
-label_font_smaller           = Smaller
-label_font_default           = Default
-label_font_bigger            = Bigger
-
-check_system_preferences     = Follow system preferences
-check_system_accent_color    = Apply accent color
-check_system_selection_color = Apply selection color
-check_system_theme           = Apply theme
-check_system_font            = Apply font size
-
-title_general                = General
-title_monitoring             = System
-
-dialog_ok                    = OK
-dialog_cancel                = Cancel
-dialog_apply                 = Apply

core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_de.properties

@@ -1,62 +0,0 @@
-#
-# MIT License
-#
-# Copyright (c) 2021 Jannis Weis
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# suppress inspection "UnusedProperty" for whole file
-#
-title                        = Thema Einstellungen
-color_default                = Standard
-color_blue                   = Blau
-color_lilac                  = Lila
-color_rose                   = Rosa
-color_red                    = Rot
-color_orange                 = Orange
-color_yellow                 = Gelb
-color_green                  = Grün
-color_gray                   = Graphit
-color_custom                 = Benutzerdefiniert
-color_purple                 = Lila
-color_pink                   = Pink
-
-label_theme                  = Farbschema
-
-label_accent_color           = Akzentfarbe
-label_selection_color        = Auswahlfarbe
-
-label_font_size              = Schriftgröße
-label_font_smaller           = Kleiner
-label_font_default           = Standard
-label_font_bigger            = Größer
-
-check_system_preferences     = Systemeinstellungen folgen
-check_system_accent_color    = Akzentfarbe anwenden
-check_system_selection_color = Auswahlfarbe anwenden
-check_system_theme           = Thema anwenden
-check_system_font            = Schriftgröße anwenden
-
-title_general                = Allgemein
-title_monitoring             = System
-
-dialog_ok                    = OK
-dialog_cancel                = Abbrechen
-dialog_apply                 = Übernehmen

core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_GB.properties

@@ -1,62 +0,0 @@
-#
-# MIT License
-#
-# Copyright (c) 2021 Jannis Weis
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# suppress inspection "UnusedProperty" for whole file
-#
-title                        = Theme Settings
-color_default                = Default
-color_blue                   = Blue
-color_lilac                  = Lilac
-color_rose                   = Rose
-color_red                    = Red
-color_orange                 = Orange
-color_yellow                 = Yellow
-color_green                  = Green
-color_gray                   = Graphite
-color_custom                 = Custom
-color_purple                 = Purple
-color_pink                   = Pink
-
-label_theme                  = Theme
-
-label_accent_color           = Accent Colour
-label_selection_color        = Selection Colour
-
-label_font_size              = Font size
-label_font_smaller           = Smaller
-label_font_default           = Default
-label_font_bigger            = Bigger
-
-check_system_preferences     = Follow system preferences
-check_system_accent_color    = Apply accent colour
-check_system_selection_color = Apply selection colour
-check_system_theme           = Apply theme
-check_system_font            = Apply font size
-
-title_general                = General
-title_monitoring             = System
-
-dialog_ok                    = OK
-dialog_cancel                = Cancel
-dialog_apply                 = Apply

core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_en_US.properties

@@ -1,62 +0,0 @@
-#
-# MIT License
-#
-# Copyright (c) 2021 Jannis Weis
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# suppress inspection "UnusedProperty" for whole file
-#
-title                        = Theme Settings
-color_default                = Default
-color_blue                   = Blue
-color_lilac                  = Lilac
-color_rose                   = Rose
-color_red                    = Red
-color_orange                 = Orange
-color_yellow                 = Yellow
-color_green                  = Green
-color_gray                   = Graphite
-color_custom                 = Custom
-color_purple                 = Purple
-color_pink                   = Pink
-
-label_theme                  = Theme
-
-label_accent_color           = Accent Color
-label_selection_color        = Selection Color
-
-label_font_size              = Font size
-label_font_smaller           = Smaller
-label_font_default           = Default
-label_font_bigger            = Bigger
-
-check_system_preferences     = Follow system preferences
-check_system_accent_color    = Apply accent color
-check_system_selection_color = Apply selection color
-check_system_theme           = Apply theme
-check_system_font            = Apply font size
-
-title_general                = General
-title_monitoring             = System
-
-dialog_ok                    = OK
-dialog_cancel                = Cancel
-dialog_apply                 = Apply

core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_es.properties

@@ -1,62 +0,0 @@
-#
-# MIT License
-#
-# Copyright (c) 2021 Jannis Weis
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# suppress inspection "UnusedProperty" for whole file
-#
-title                        = Configuración de Temas
-color_default                = Defecto
-color_blue                   = Azul
-color_lilac                  = Lila
-color_rose                   = Rosa
-color_red                    = Rojo
-color_orange                 = Naranja
-color_yellow                 = Amarillo
-color_green                  = Verde
-color_gray                   = Grafito
-color_custom                 = Personalizado
-color_purple                 = Lila
-color_pink                   = Rosa
-
-label_theme                  = Tema:
-
-label_accent_color           = Color de acento
-label_selection_color        = Color de selección
-
-label_font_size              = Tamaño  de fuente
-label_font_smaller           = Mas pequeño
-label_font_default           = Defecto
-label_font_bigger            = Mas grande
-
-check_system_preferences     = Siga las preferencias del sistema
-check_system_accent_color    = Aplicar color de acento
-check_system_selection_color = Aplicar color de selección
-check_system_theme           = Aplicar tema
-check_system_font            = Aplicar tamaño de fuente
-
-title_general                = General
-title_monitoring             = Sistema
-
-dialog_ok                    = OK
-dialog_cancel                = Cancelar
-dialog_apply                 = Aplicar

core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_fr.properties

@@ -1,62 +0,0 @@
-#
-# MIT License
-#
-# Copyright (c) 2021 Jannis Weis
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# suppress inspection "UnusedProperty" for whole file
-#
-title                        = Réglage des Thèmes
-color_default                = Défaut
-color_blue                   = Bleu
-color_lilac                  = Lilas
-color_rose                   = Rose
-color_red                    = Rouge
-color_orange                 = Orange
-color_yellow                 = Jaune
-color_green                  = Vert
-color_gray                   = Graphite
-color_custom                 = Personnalisé
-color_purple                 = Lilas
-color_pink                   = Rose
-
-label_theme                  = Thème
-
-label_accent_color           = Couleur accentuée
-label_selection_color        = Couleur de sélection
-
-label_font_size              = Taille de police
-label_font_smaller           = Plus petite
-label_font_default           = Défaut
-label_font_bigger            = Plus gros
-
-check_system_preferences     = Suivez les préférences du système
-check_system_accent_color    = Appliquer une couleur d'accent
-check_system_selection_color = Appliquer la couleur de sélection
-check_system_theme           = Appliquer le thème
-check_system_font            = Appliquer la taille de police
-
-title_general                = Général
-title_monitoring             = Système
-
-dialog_ok                    = OK
-dialog_cancel                = Annuler
-dialog_apply                 = Appliquer

core/src/main/resources/com/github/weisj/darklaf/bundles/theme_settings_ru.properties

@@ -1,62 +0,0 @@
-#
-# MIT License
-#
-# Copyright (c) 2021 Jannis Weis
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# suppress inspection "UnusedProperty" for whole file
-#
-title                        = Настройки Темы
-color_default                = По умолчанию
-color_blue                   = Синий
-color_lilac                  = Сирень
-color_rose                   = Розовый
-color_red                    = Красный
-color_orange                 = Оранжевый
-color_yellow                 = Жёлтый
-color_green                  = Зелёный
-color_gray                   = Графит
-color_custom                 = Другой
-color_purple                 = Сирень
-color_pink                   = Розовый
-
-label_theme                  = Тема:
-
-label_accent_color           = Цветовой акцент
-label_selection_color        = Цвет выделения
-
-label_font_size              = Размер шрифта
-label_font_smaller           = Меньше
-label_font_default           = По умолчанию
-label_font_bigger            = Больше
-
-check_system_preferences     = Использовать настройки операционной системы
-check_system_accent_color    = Применить акцент цвет
-check_system_selection_color = Применить выделение цвета
-check_system_theme           = Применить тему
-check_system_font            = Применить размер шрифта
-
-title_general                = Общее
-title_monitoring             = Система
-
-dialog_ok                    = ОК
-dialog_cancel                = Отмена
-dialog_apply                 = Применить

core/src/main/resources/com/github/weisj/darklaf/properties/icons/dark/info.md

@@ -1 +0,0 @@
-Theme aware icons will looks from this sub directory for the dark version of the icon.

core/src/main/resources/com/github/weisj/darklaf/properties/icons/light/info.md

@@ -1 +0,0 @@
-Theme aware icons will looks from this sub directory for the light version of the icon.

core/src/main/resources/com/github/weisj/darklaf/task/theme_settings.properties

@@ -0,0 +1,62 @@
+#
+# MIT License
+#
+# Copyright (c) 2021 Jannis Weis
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+#
+# suppress inspection "UnusedProperty" for whole file
+#
+settings.title                        = Theme Settings
+settings.color_default                = Default
+settings.color_blue                   = Blue
+settings.color_lilac                  = Lilac
+settings.color_rose                   = Rose
+settings.color_red                    = Red
+settings.color_orange                 = Orange
+settings.color_yellow                 = Yellow
+settings.color_green                  = Green
+settings.color_gray                   = Graphite
+settings.color_custom                 = Custom
+settings.color_purple                 = Purple
+settings.color_pink                   = Pink
+
+settings.label_theme                  = Theme
+
+settings.label_accent_color           = Accent Color
+settings.label_selection_color        = Selection Color
+
+settings.label_font_size              = Font size
+settings.label_font_smaller           = Smaller
+settings.label_font_default           = Default
+settings.label_font_bigger            = Bigger
+
+settings.check_system_preferences     = Follow system preferences
+settings.check_system_accent_color    = Apply accent color
+settings.check_system_selection_color = Apply selection color
+settings.check_system_theme           = Apply theme
+settings.check_system_font            = Apply font size
+
+settings.title_general                = General
+settings.title_monitoring             = System
+
+settings.dialog_ok                    = OK
+settings.dialog_cancel                = Cancel
+settings.dialog_apply                 = Apply

core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_de.properties

@@ -0,0 +1,62 @@
+#
+# MIT License
+#
+# Copyright (c) 2021 Jannis Weis
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+#
+# suppress inspection "UnusedProperty" for whole file
+#
+settings.title                        = Thema Einstellungen
+settings.color_default                = Standard
+settings.color_blue                   = Blau
+settings.color_lilac                  = Lila
+settings.color_rose                   = Rosa
+settings.color_red                    = Rot
+settings.color_orange                 = Orange
+settings.color_yellow                 = Gelb
+settings.color_green                  = Grün
+settings.color_gray                   = Graphit
+settings.color_custom                 = Benutzerdefiniert
+settings.color_purple                 = Lila
+settings.color_pink                   = Pink
+
+settings.label_theme                  = Farbschema
+
+settings.label_accent_color           = Akzentfarbe
+settings.label_selection_color        = Auswahlfarbe
+
+settings.label_font_size              = Schriftgröße
+settings.label_font_smaller           = Kleiner
+settings.label_font_default           = Standard
+settings.label_font_bigger            = Größer
+
+settings.check_system_preferences     = Systemeinstellungen folgen
+settings.check_system_accent_color    = Akzentfarbe anwenden
+settings.check_system_selection_color = Auswahlfarbe anwenden
+settings.check_system_theme           = Thema anwenden
+settings.check_system_font            = Schriftgröße anwenden
+
+settings.title_general                = Allgemein
+settings.title_monitoring             = System
+
+settings.dialog_ok                    = OK
+settings.dialog_cancel                = Abbrechen
+settings.dialog_apply                 = Übernehmen

core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_GB.properties

@@ -0,0 +1,62 @@
+#
+# MIT License
+#
+# Copyright (c) 2021 Jannis Weis
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+#
+# suppress inspection "UnusedProperty" for whole file
+#
+settings.title                        = Theme Settings
+settings.color_default                = Default
+settings.color_blue                   = Blue
+settings.color_lilac                  = Lilac
+settings.color_rose                   = Rose
+settings.color_red                    = Red
+settings.color_orange                 = Orange
+settings.color_yellow                 = Yellow
+settings.color_green                  = Green
+settings.color_gray                   = Graphite
+settings.color_custom                 = Custom
+settings.color_purple                 = Purple
+settings.color_pink                   = Pink
+
+settings.label_theme                  = Theme
+
+settings.label_accent_color           = Accent Colour
+settings.label_selection_color        = Selection Colour
+
+settings.label_font_size              = Font size
+settings.label_font_smaller           = Smaller
+settings.label_font_default           = Default
+settings.label_font_bigger            = Bigger
+
+settings.check_system_preferences     = Follow system preferences
+settings.check_system_accent_color    = Apply accent colour
+settings.check_system_selection_color = Apply selection colour
+settings.check_system_theme           = Apply theme
+settings.check_system_font            = Apply font size
+
+settings.title_general                = General
+settings.title_monitoring             = System
+
+settings.dialog_ok                    = OK
+settings.dialog_cancel                = Cancel
+settings.dialog_apply                 = Apply

core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_en_US.properties

@@ -0,0 +1,62 @@
+#
+# MIT License
+#
+# Copyright (c) 2021 Jannis Weis
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+#
+# suppress inspection "UnusedProperty" for whole file
+#
+settings.title                        = Theme Settings
+settings.color_default                = Default
+settings.color_blue                   = Blue
+settings.color_lilac                  = Lilac
+settings.color_rose                   = Rose
+settings.color_red                    = Red
+settings.color_orange                 = Orange
+settings.color_yellow                 = Yellow
+settings.color_green                  = Green
+settings.color_gray                   = Graphite
+settings.color_custom                 = Custom
+settings.color_purple                 = Purple
+settings.color_pink                   = Pink
+
+settings.label_theme                  = Theme
+
+settings.label_accent_color           = Accent Color
+settings.label_selection_color        = Selection Color
+
+settings.label_font_size              = Font size
+settings.label_font_smaller           = Smaller
+settings.label_font_default           = Default
+settings.label_font_bigger            = Bigger
+
+settings.check_system_preferences     = Follow system preferences
+settings.check_system_accent_color    = Apply accent color
+settings.check_system_selection_color = Apply selection color
+settings.check_system_theme           = Apply theme
+settings.check_system_font            = Apply font size
+
+settings.title_general                = General
+settings.title_monitoring             = System
+
+settings.dialog_ok                    = OK
+settings.dialog_cancel                = Cancel
+settings.dialog_apply                 = Apply

core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_es.properties

@@ -0,0 +1,62 @@
+#
+# MIT License
+#
+# Copyright (c) 2021 Jannis Weis
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+#
+# suppress inspection "UnusedProperty" for whole file
+#
+settings.title                        = Configuración de Temas
+settings.color_default                = Defecto
+settings.color_blue                   = Azul
+settings.color_lilac                  = Lila
+settings.color_rose                   = Rosa
+settings.color_red                    = Rojo
+settings.color_orange                 = Naranja
+settings.color_yellow                 = Amarillo
+settings.color_green                  = Verde
+settings.color_gray                   = Grafito
+settings.color_custom                 = Personalizado
+settings.color_purple                 = Lila
+settings.color_pink                   = Rosa
+
+settings.label_theme                  = Tema:
+
+settings.label_accent_color           = Color de acento
+settings.label_selection_color        = Color de selección
+
+settings.label_font_size              = Tamaño  de fuente
+settings.label_font_smaller           = Mas pequeño
+settings.label_font_default           = Defecto
+settings.label_font_bigger            = Mas grande
+
+settings.check_system_preferences     = Siga las preferencias del sistema
+settings.check_system_accent_color    = Aplicar color de acento
+settings.check_system_selection_color = Aplicar color de selección
+settings.check_system_theme           = Aplicar tema
+settings.check_system_font            = Aplicar tamaño de fuente
+
+settings.title_general                = General
+settings.title_monitoring             = Sistema
+
+settings.dialog_ok                    = OK
+settings.dialog_cancel                = Cancelar
+settings.dialog_apply                 = Aplicar

core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_fr.properties

@@ -0,0 +1,62 @@
+#
+# MIT License
+#
+# Copyright (c) 2021 Jannis Weis
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+#
+# suppress inspection "UnusedProperty" for whole file
+#
+settings.title                        = Réglage des Thèmes
+settings.color_default                = Défaut
+settings.color_blue                   = Bleu
+settings.color_lilac                  = Lilas
+settings.color_rose                   = Rose
+settings.color_red                    = Rouge
+settings.color_orange                 = Orange
+settings.color_yellow                 = Jaune
+settings.color_green                  = Vert
+settings.color_gray                   = Graphite
+settings.color_custom                 = Personnalisé
+settings.color_purple                 = Lilas
+settings.color_pink                   = Rose
+
+settings.label_theme                  = Thème
+
+settings.label_accent_color           = Couleur accentuée
+settings.label_selection_color        = Couleur de sélection
+
+settings.label_font_size              = Taille de police
+settings.label_font_smaller           = Plus petite
+settings.label_font_default           = Défaut
+settings.label_font_bigger            = Plus gros
+
+settings.check_system_preferences     = Suivez les préférences du système
+settings.check_system_accent_color    = Appliquer une couleur d'accent
+settings.check_system_selection_color = Appliquer la couleur de sélection
+settings.check_system_theme           = Appliquer le thème
+settings.check_system_font            = Appliquer la taille de police
+
+settings.title_general                = Général
+settings.title_monitoring             = Système
+
+settings.dialog_ok                    = OK
+settings.dialog_cancel                = Annuler
+settings.dialog_apply                 = Appliquer

core/src/main/resources/com/github/weisj/darklaf/task/theme_settings_ru.properties

@@ -0,0 +1,62 @@
+#
+# MIT License
+#
+# Copyright (c) 2021 Jannis Weis
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+#
+# suppress inspection "UnusedProperty" for whole file
+#
+settings.title                        = Настройки Темы
+settings.color_default                = По умолчанию
+settings.color_blue                   = Синий
+settings.color_lilac                  = Сирень
+settings.color_rose                   = Розовый
+settings.color_red                    = Красный
+settings.color_orange                 = Оранжевый
+settings.color_yellow                 = Жёлтый
+settings.color_green                  = Зелёный
+settings.color_gray                   = Графит
+settings.color_custom                 = Другой
+settings.color_purple                 = Сирень
+settings.color_pink                   = Розовый
+
+settings.label_theme                  = Тема:
+
+settings.label_accent_color           = Цветовой акцент
+settings.label_selection_color        = Цвет выделения
+
+settings.label_font_size              = Размер шрифта
+settings.label_font_smaller           = Меньше
+settings.label_font_default           = По умолчанию
+settings.label_font_bigger            = Больше
+
+settings.check_system_preferences     = Использовать настройки операционной системы
+settings.check_system_accent_color    = Применить акцент цвет
+settings.check_system_selection_color = Применить выделение цвета
+settings.check_system_theme           = Применить тему
+settings.check_system_font            = Применить размер шрифта
+
+settings.title_general                = Общее
+settings.title_monitoring             = Система
+
+settings.dialog_ok                    = ОК
+settings.dialog_cancel                = Отмена
+settings.dialog_apply                 = Применить