diff --git a/base/src/org/compiere/plaf/AquaTheme.java b/base/src/org/compiere/plaf/AquaTheme.java
index 5fc2f07032..4e93e0a27e 100644
--- a/base/src/org/compiere/plaf/AquaTheme.java
+++ b/base/src/org/compiere/plaf/AquaTheme.java
@@ -19,8 +19,8 @@ package org.compiere.plaf;
 /*
  * @(#)AquaTheme.java	1.9 04/07/26
  */
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.metal.DefaultMetalTheme;
 
 
 /**
diff --git a/base/src/org/compiere/plaf/CharcoalTheme.java b/base/src/org/compiere/plaf/CharcoalTheme.java
index 80d8e462aa..26a66d2e19 100644
--- a/base/src/org/compiere/plaf/CharcoalTheme.java
+++ b/base/src/org/compiere/plaf/CharcoalTheme.java
@@ -21,8 +21,8 @@ package org.compiere.plaf;
  */
 
 
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.metal.DefaultMetalTheme;
 
 /**
  * This class describes a theme using gray colors.
diff --git a/base/src/org/compiere/plaf/CompiereButtonListener.java b/base/src/org/compiere/plaf/CompiereButtonListener.java
index cce1c6aba1..fc8da8cd3d 100644
--- a/base/src/org/compiere/plaf/CompiereButtonListener.java
+++ b/base/src/org/compiere/plaf/CompiereButtonListener.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.event.*;
-import java.beans.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
+import java.awt.event.InputEvent;
+import java.beans.PropertyChangeEvent;
+
+import javax.swing.AbstractButton;
+import javax.swing.InputMap;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ComponentInputMapUIResource;
+import javax.swing.plaf.basic.BasicButtonListener;
 
 /**
  * 	Button Listener
diff --git a/base/src/org/compiere/plaf/CompiereButtonUI.java b/base/src/org/compiere/plaf/CompiereButtonUI.java
index 2109dbb939..789cc904a4 100644
--- a/base/src/org/compiere/plaf/CompiereButtonUI.java
+++ b/base/src/org/compiere/plaf/CompiereButtonUI.java
@@ -16,11 +16,16 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.JComponent;
+import javax.swing.JToolBar;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicButtonListener;
+import javax.swing.plaf.metal.MetalButtonUI;
 
 /**
  *  Button UI
diff --git a/base/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java b/base/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java
index 570255797d..6aa71dc36a 100644
--- a/base/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java
+++ b/base/src/org/compiere/plaf/CompiereCheckBoxMenuItemUI.java
@@ -16,9 +16,9 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicCheckBoxMenuItemUI;
 
 /**
  * 	Menu Check Box UI
diff --git a/base/src/org/compiere/plaf/CompiereCheckBoxUI.java b/base/src/org/compiere/plaf/CompiereCheckBoxUI.java
index e155355995..cf2377f7dc 100644
--- a/base/src/org/compiere/plaf/CompiereCheckBoxUI.java
+++ b/base/src/org/compiere/plaf/CompiereCheckBoxUI.java
@@ -19,7 +19,7 @@ package org.compiere.plaf;
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.basic.*;
+import javax.swing.plaf.basic.BasicButtonListener;
 import javax.swing.plaf.metal.MetalCheckBoxUI;
 
 /**
diff --git a/base/src/org/compiere/plaf/CompiereColor.java b/base/src/org/compiere/plaf/CompiereColor.java
index d5e63d2ae3..4dc1242950 100644
--- a/base/src/org/compiere/plaf/CompiereColor.java
+++ b/base/src/org/compiere/plaf/CompiereColor.java
@@ -16,19 +16,37 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.TexturePaint;
+import java.awt.Window;
+import java.awt.image.BufferedImage;
+import java.io.Serializable;
+import java.net.URL;
+import java.util.ResourceBundle;
+import java.util.logging.Logger;
+
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JWindow;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.plaf.ColorUIResource;
 
 import org.adempiere.plaf.AdempierePLAF;
 import org.compiere.swing.ColorBlind;
 import org.compiere.swing.ThemeUtils;
-import org.compiere.util.*;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.ValueNamePair;
 
 /**
  *  Adempiere Background Color
diff --git a/base/src/org/compiere/plaf/CompiereComboBoxUI.java b/base/src/org/compiere/plaf/CompiereComboBoxUI.java
index 57e64879e1..208711736f 100644
--- a/base/src/org/compiere/plaf/CompiereComboBoxUI.java
+++ b/base/src/org/compiere/plaf/CompiereComboBoxUI.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
+import java.awt.event.MouseListener;
+
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.ComboPopup;
+import javax.swing.plaf.metal.MetalComboBoxButton;
+import javax.swing.plaf.metal.MetalComboBoxUI;
 
 
 /**
diff --git a/base/src/org/compiere/plaf/CompiereComboPopup.java b/base/src/org/compiere/plaf/CompiereComboPopup.java
index 49621d0c3a..78b7f871ee 100644
--- a/base/src/org/compiere/plaf/CompiereComboPopup.java
+++ b/base/src/org/compiere/plaf/CompiereComboPopup.java
@@ -16,9 +16,11 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import javax.swing.*;
-import javax.swing.plaf.basic.*;
-import org.compiere.swing.*;
+import javax.swing.JComboBox;
+import javax.swing.plaf.basic.BasicComboPopup;
+
+import org.compiere.swing.CComboBox;
+import org.compiere.swing.CField;
 
 /**
  *  Adempiere Combo Popup - allows to prevent the display of the popup
diff --git a/base/src/org/compiere/plaf/CompiereLabelUI.java b/base/src/org/compiere/plaf/CompiereLabelUI.java
index 28408e01d8..1ab210d3b3 100644
--- a/base/src/org/compiere/plaf/CompiereLabelUI.java
+++ b/base/src/org/compiere/plaf/CompiereLabelUI.java
@@ -16,13 +16,21 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.FocusTraversalPolicy;
+import java.awt.event.ActionEvent;
 
-import sun.swing.*;
+import javax.swing.ActionMap;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ComponentInputMapUIResource;
+import javax.swing.plaf.metal.MetalLabelUI;
+
+import sun.swing.UIAction;
 
 /**
  * 	Adempiere Label UI
diff --git a/base/src/org/compiere/plaf/CompiereLookAndFeel.java b/base/src/org/compiere/plaf/CompiereLookAndFeel.java
index fa6cc6b714..181f000459 100644
--- a/base/src/org/compiere/plaf/CompiereLookAndFeel.java
+++ b/base/src/org/compiere/plaf/CompiereLookAndFeel.java
@@ -16,10 +16,12 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
 
-import javax.swing.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.UIDefaults;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+import javax.swing.plaf.metal.MetalTheme;
 
 /**
  *  Compiere Look & Feel.
diff --git a/base/src/org/compiere/plaf/CompiereMenuBarUI.java b/base/src/org/compiere/plaf/CompiereMenuBarUI.java
index d3929a80c7..f15c14da2b 100644
--- a/base/src/org/compiere/plaf/CompiereMenuBarUI.java
+++ b/base/src/org/compiere/plaf/CompiereMenuBarUI.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import java.awt.Graphics;
+
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalMenuBarUI;
 
 /**
  *  Adempiere Menu Bar UI.
diff --git a/base/src/org/compiere/plaf/CompiereMenuItemUI.java b/base/src/org/compiere/plaf/CompiereMenuItemUI.java
index 5a665e8f82..d76cad0531 100644
--- a/base/src/org/compiere/plaf/CompiereMenuItemUI.java
+++ b/base/src/org/compiere/plaf/CompiereMenuItemUI.java
@@ -16,10 +16,14 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
+import java.awt.Color;
+import java.awt.Graphics;
+
+import javax.swing.ButtonModel;
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicMenuItemUI;
 
 /**
  * 	Menu Item UI
diff --git a/base/src/org/compiere/plaf/CompierePanelUI.java b/base/src/org/compiere/plaf/CompierePanelUI.java
index 0994d8e439..5876c65dee 100644
--- a/base/src/org/compiere/plaf/CompierePanelUI.java
+++ b/base/src/org/compiere/plaf/CompierePanelUI.java
@@ -16,10 +16,12 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
+import java.awt.Graphics;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicPanelUI;
 
 /**
  *  Panel UI.
diff --git a/base/src/org/compiere/plaf/CompiereRadioButtonUI.java b/base/src/org/compiere/plaf/CompiereRadioButtonUI.java
index c9198dbbe4..ceeeafa15c 100644
--- a/base/src/org/compiere/plaf/CompiereRadioButtonUI.java
+++ b/base/src/org/compiere/plaf/CompiereRadioButtonUI.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.AbstractButton;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalRadioButtonUI;
 
 /**
  *  Adempiere Radio Button UI
diff --git a/base/src/org/compiere/plaf/CompiereScrollPaneUI.java b/base/src/org/compiere/plaf/CompiereScrollPaneUI.java
index 1e9ebc33b4..7203664d06 100644
--- a/base/src/org/compiere/plaf/CompiereScrollPaneUI.java
+++ b/base/src/org/compiere/plaf/CompiereScrollPaneUI.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalScrollPaneUI;
 
 /**
  *  Adempiere Scroll Pane UI
diff --git a/base/src/org/compiere/plaf/CompiereSplitPaneDivider.java b/base/src/org/compiere/plaf/CompiereSplitPaneDivider.java
index f15cfd4e5e..28fccd7077 100644
--- a/base/src/org/compiere/plaf/CompiereSplitPaneDivider.java
+++ b/base/src/org/compiere/plaf/CompiereSplitPaneDivider.java
@@ -16,8 +16,10 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.plaf.basic.*;
+import java.awt.Graphics;
+
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
+import javax.swing.plaf.basic.BasicSplitPaneUI;
 
 /**
  *  Split Pane Divider
diff --git a/base/src/org/compiere/plaf/CompiereSplitPaneUI.java b/base/src/org/compiere/plaf/CompiereSplitPaneUI.java
index 0410672185..998115ef97 100644
--- a/base/src/org/compiere/plaf/CompiereSplitPaneUI.java
+++ b/base/src/org/compiere/plaf/CompiereSplitPaneUI.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
+import javax.swing.plaf.basic.BasicSplitPaneUI;
 
 /**
  *  Adempiere Split Pane UI.
diff --git a/base/src/org/compiere/plaf/CompiereTabbedPaneUI.java b/base/src/org/compiere/plaf/CompiereTabbedPaneUI.java
index 5685c36d85..d8b4b8c91f 100644
--- a/base/src/org/compiere/plaf/CompiereTabbedPaneUI.java
+++ b/base/src/org/compiere/plaf/CompiereTabbedPaneUI.java
@@ -16,11 +16,27 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.Shape;
+
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicGraphicsUtils;
+import javax.swing.plaf.metal.MetalTabbedPaneUI;
 
 /**
  *  Same implementation detail as in AdempierePanelUI.
diff --git a/base/src/org/compiere/plaf/CompiereTextAreaUI.java b/base/src/org/compiere/plaf/CompiereTextAreaUI.java
index 25a3e3c26a..5640702942 100644
--- a/base/src/org/compiere/plaf/CompiereTextAreaUI.java
+++ b/base/src/org/compiere/plaf/CompiereTextAreaUI.java
@@ -16,14 +16,24 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.text.*;
+import java.awt.AWTKeyStroke;
+import java.awt.KeyboardFocusManager;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeEvent;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
+import javax.swing.LookAndFeel;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicTextAreaUI;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.EditorKit;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.Keymap;
 
 
 public class CompiereTextAreaUI extends BasicTextAreaUI
diff --git a/base/src/org/compiere/plaf/CompiereTheme.java b/base/src/org/compiere/plaf/CompiereTheme.java
index 97c8584f5d..13e2445dac 100644
--- a/base/src/org/compiere/plaf/CompiereTheme.java
+++ b/base/src/org/compiere/plaf/CompiereTheme.java
@@ -16,12 +16,13 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import java.util.logging.*;
+import java.awt.Font;
+import java.util.logging.Logger;
 
 import javax.swing.UIDefaults;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.metal.MetalTheme;
 
 import org.compiere.swing.ColorBlind;
 import org.compiere.swing.ExtendedTheme;
diff --git a/base/src/org/compiere/plaf/CompiereThemeBlueMetal.java b/base/src/org/compiere/plaf/CompiereThemeBlueMetal.java
index 7df80b878d..1f62296ccb 100644
--- a/base/src/org/compiere/plaf/CompiereThemeBlueMetal.java
+++ b/base/src/org/compiere/plaf/CompiereThemeBlueMetal.java
@@ -16,9 +16,9 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
+import java.awt.Color;
 
-import javax.swing.plaf.*;
+import javax.swing.plaf.ColorUIResource;
 
 /**
  * 	Adempiere default Blue Metal Color Theme
diff --git a/base/src/org/compiere/plaf/CompiereThemeEditor.java b/base/src/org/compiere/plaf/CompiereThemeEditor.java
index e7d9addc4e..0ca1e77bc5 100644
--- a/base/src/org/compiere/plaf/CompiereThemeEditor.java
+++ b/base/src/org/compiere/plaf/CompiereThemeEditor.java
@@ -16,17 +16,26 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ResourceBundle;
 
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.JColorChooser;
+import javax.swing.JDialog;
+import javax.swing.UIManager;
+import javax.swing.border.TitledBorder;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.metal.MetalLookAndFeel;
 
 import org.adempiere.plaf.AdempierePLAF;
-import org.compiere.swing.*;
+import org.compiere.swing.CButton;
+import org.compiere.swing.CDialog;
+import org.compiere.swing.CPanel;
+import org.compiere.swing.FontChooser;
 
 /**
  *  Java Theme Editor.
diff --git a/base/src/org/compiere/plaf/CompiereThemeIce.java b/base/src/org/compiere/plaf/CompiereThemeIce.java
index 23d0c69f28..3b7f0f9c7e 100644
--- a/base/src/org/compiere/plaf/CompiereThemeIce.java
+++ b/base/src/org/compiere/plaf/CompiereThemeIce.java
@@ -16,8 +16,9 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.plaf.*;
+import java.awt.Color;
+
+import javax.swing.plaf.ColorUIResource;
 
 /**
  * 	Adempiere Theme Ice
diff --git a/base/src/org/compiere/plaf/CompiereToggleButtonUI.java b/base/src/org/compiere/plaf/CompiereToggleButtonUI.java
index 1f24e4c3cc..94f1a28cd0 100644
--- a/base/src/org/compiere/plaf/CompiereToggleButtonUI.java
+++ b/base/src/org/compiere/plaf/CompiereToggleButtonUI.java
@@ -16,10 +16,14 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalToggleButtonUI;
 
 /**
  *  Adempiere Toggle Button UI
diff --git a/base/src/org/compiere/plaf/CompiereToolBarUI.java b/base/src/org/compiere/plaf/CompiereToolBarUI.java
index 74a713469a..c2154cd259 100644
--- a/base/src/org/compiere/plaf/CompiereToolBarUI.java
+++ b/base/src/org/compiere/plaf/CompiereToolBarUI.java
@@ -16,9 +16,9 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalToolBarUI;
 
 /**
  *  Adempiere Tool Bar
diff --git a/base/src/org/compiere/plaf/CompiereToolTipUI.java b/base/src/org/compiere/plaf/CompiereToolTipUI.java
index 0488ca4825..60762082b5 100644
--- a/base/src/org/compiere/plaf/CompiereToolTipUI.java
+++ b/base/src/org/compiere/plaf/CompiereToolTipUI.java
@@ -16,12 +16,17 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.event.KeyEvent;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JTabbedPane;
+import javax.swing.JToolTip;
+import javax.swing.KeyStroke;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.metal.MetalToolTipUI;
 
 /**
  * 	Tool Tip
diff --git a/base/src/org/compiere/plaf/CompiereUtils.java b/base/src/org/compiere/plaf/CompiereUtils.java
index dcef39da61..96f2863da5 100644
--- a/base/src/org/compiere/plaf/CompiereUtils.java
+++ b/base/src/org/compiere/plaf/CompiereUtils.java
@@ -16,15 +16,30 @@
  *****************************************************************************/
 package org.compiere.plaf;
 
-import java.awt.*;
-import java.awt.geom.*;
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import java.util.logging.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.Paint;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.geom.RectangularShape;
+import java.awt.geom.RoundRectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.logging.Logger;
 
-import com.sun.image.codec.jpeg.*;
+import javax.swing.JComponent;
+
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGImageDecoder;
 
 /**
  *  UI utilities
diff --git a/base/src/org/compiere/plaf/ContrastTheme.java b/base/src/org/compiere/plaf/ContrastTheme.java
index b2937c3241..4c6a1c547e 100644
--- a/base/src/org/compiere/plaf/ContrastTheme.java
+++ b/base/src/org/compiere/plaf/ContrastTheme.java
@@ -19,11 +19,14 @@ package org.compiere.plaf;
 /*
  * @(#)ContrastTheme.java 1.10 04/07/26
  */
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
-import javax.swing.*;
-import javax.swing.border.*;
+import javax.swing.UIDefaults;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.LineBorder;
+import javax.swing.plaf.BorderUIResource;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.basic.BasicBorders;
+import javax.swing.plaf.metal.DefaultMetalTheme;
 
 /**
  * This class describes a higher-contrast Metal Theme.
diff --git a/base/src/org/compiere/plaf/EmeraldTheme.java b/base/src/org/compiere/plaf/EmeraldTheme.java
index b1af55b8c8..40be20f635 100644
--- a/base/src/org/compiere/plaf/EmeraldTheme.java
+++ b/base/src/org/compiere/plaf/EmeraldTheme.java
@@ -20,8 +20,8 @@ package org.compiere.plaf;
  * @(#)EmeraldTheme.java	1.9 04/07/26
  */
  
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.metal.DefaultMetalTheme;
 
 /**
  * This class describes a theme using glowing green colors.
diff --git a/base/src/org/compiere/plaf/RubyTheme.java b/base/src/org/compiere/plaf/RubyTheme.java
index cd804ea184..bc7123cf29 100644
--- a/base/src/org/compiere/plaf/RubyTheme.java
+++ b/base/src/org/compiere/plaf/RubyTheme.java
@@ -20,8 +20,8 @@ package org.compiere.plaf;
  * @(#)RubyTheme.java	1.9 04/07/26
  */
  
-import javax.swing.plaf.*;
-import javax.swing.plaf.metal.*;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.metal.DefaultMetalTheme;
 
 /**
  * This class describes a theme using red colors.