diff --git a/base/src/org/adempiere/plaf/AdempiereButtonListener.java b/base/src/org/adempiere/plaf/AdempiereButtonListener.java
index 897823eb2f..c025962544 100644
--- a/base/src/org/adempiere/plaf/AdempiereButtonListener.java
+++ b/base/src/org/adempiere/plaf/AdempiereButtonListener.java
@@ -13,11 +13,17 @@
  *****************************************************************************/
 package org.adempiere.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/adempiere/plaf/AdempiereComboBoxUI.java b/base/src/org/adempiere/plaf/AdempiereComboBoxUI.java
index 4599f7d04f..0ebb0ee66b 100644
--- a/base/src/org/adempiere/plaf/AdempiereComboBoxUI.java
+++ b/base/src/org/adempiere/plaf/AdempiereComboBoxUI.java
@@ -13,11 +13,15 @@
  *****************************************************************************/
 package org.adempiere.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 com.jgoodies.looks.plastic.PlasticComboBoxUI;
 
 /**
diff --git a/base/src/org/adempiere/plaf/AdempiereComboPopup.java b/base/src/org/adempiere/plaf/AdempiereComboPopup.java
index 468613de47..4d0afe0c9c 100644
--- a/base/src/org/adempiere/plaf/AdempiereComboPopup.java
+++ b/base/src/org/adempiere/plaf/AdempiereComboPopup.java
@@ -16,9 +16,11 @@
  *****************************************************************************/
 package org.adempiere.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/adempiere/plaf/AdempiereLabelUI.java b/base/src/org/adempiere/plaf/AdempiereLabelUI.java
index 95a422508b..3d0cf3d054 100644
--- a/base/src/org/adempiere/plaf/AdempiereLabelUI.java
+++ b/base/src/org/adempiere/plaf/AdempiereLabelUI.java
@@ -13,13 +13,21 @@
  *****************************************************************************/
 package org.adempiere.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/adempiere/plaf/AdempiereLookAndFeel.java b/base/src/org/adempiere/plaf/AdempiereLookAndFeel.java
index 07518ac7c9..d522fafee1 100644
--- a/base/src/org/adempiere/plaf/AdempiereLookAndFeel.java
+++ b/base/src/org/adempiere/plaf/AdempiereLookAndFeel.java
@@ -13,9 +13,11 @@
  *****************************************************************************/
 package org.adempiere.plaf;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+
+import javax.swing.UIDefaults;
 
-import javax.swing.*;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
 import com.jgoodies.looks.plastic.PlasticTheme;
 
diff --git a/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java b/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
index 21ee7b2d40..c3050e3910 100644
--- a/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
+++ b/base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
@@ -1,17 +1,13 @@
 package org.adempiere.plaf;
 
-import java.awt.Color;
-import java.awt.Component;
 import java.awt.GradientPaint;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Insets;
 import java.awt.Paint;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 
 import javax.swing.JComponent;
-import javax.swing.LookAndFeel;
 import javax.swing.border.Border;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.ComponentUI;
diff --git a/base/src/org/adempiere/plaf/AdempiereTheme.java b/base/src/org/adempiere/plaf/AdempiereTheme.java
index 45c62a1dfd..00176c919e 100644
--- a/base/src/org/adempiere/plaf/AdempiereTheme.java
+++ b/base/src/org/adempiere/plaf/AdempiereTheme.java
@@ -25,7 +25,6 @@ import javax.swing.UIDefaults;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
 
-//import org.compiere.plaf.ColorBlind;
 import org.compiere.swing.ColorBlind;
 import org.compiere.swing.ExtendedTheme;
 
diff --git a/base/src/org/adempiere/plaf/AdempiereThemeInnova.java b/base/src/org/adempiere/plaf/AdempiereThemeInnova.java
index d49785171b..3ac52054b3 100644
--- a/base/src/org/adempiere/plaf/AdempiereThemeInnova.java
+++ b/base/src/org/adempiere/plaf/AdempiereThemeInnova.java
@@ -13,7 +13,7 @@
  *****************************************************************************/
 package org.adempiere.plaf;
 
-import javax.swing.plaf.*;
+import javax.swing.plaf.ColorUIResource;
 
 /**
  * 	Adempiere default Blue Metal Color Theme
diff --git a/base/src/org/adempiere/plaf/PLAFEditor.java b/base/src/org/adempiere/plaf/PLAFEditor.java
index 6f5c447698..78c4db59e2 100644
--- a/base/src/org/adempiere/plaf/PLAFEditor.java
+++ b/base/src/org/adempiere/plaf/PLAFEditor.java
@@ -16,20 +16,64 @@
  *****************************************************************************/
 package org.adempiere.plaf;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.plaf.metal.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPasswordField;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.JTree;
+import javax.swing.LookAndFeel;
+import javax.swing.UIManager;
+import javax.swing.WindowConstants;
+import javax.swing.border.TitledBorder;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+import javax.swing.plaf.metal.MetalTheme;
 
 import org.compiere.plaf.CompiereColor;
 import org.compiere.plaf.CompiereLookAndFeel;
-import org.compiere.swing.*;
-import org.compiere.util.*;
+import org.compiere.swing.CButton;
+import org.compiere.swing.CCheckBox;
+import org.compiere.swing.CComboBox;
+import org.compiere.swing.CLabel;
+import org.compiere.swing.CPanel;
+import org.compiere.swing.CTabbedPane;
+import org.compiere.swing.CTextField;
+import org.compiere.swing.CToggleButton;
+import org.compiere.swing.ColorBlind;
+import org.compiere.util.Ini;
+import org.compiere.util.MiniBrowser;
+import org.compiere.util.ValueNamePair;
 
-import sun.awt.*;
+import sun.awt.AppContext;
 
 /**
  *  Adempiere PLAF Editor.