Index: openide/src/org/openide/awt/SplittedPanel.java
===================================================================
RCS file: /cvs/openide/src/org/openide/awt/SplittedPanel.java,v
retrieving revision 1.23
diff -u -r1.23 SplittedPanel.java
--- openide/src/org/openide/awt/SplittedPanel.java	10 Jul 2002 11:59:45 -0000	1.23
+++ openide/src/org/openide/awt/SplittedPanel.java	12 Jul 2002 15:22:48 -0000
@@ -689,22 +689,22 @@
             Dimension size = this.getSize();
             if (splitType == HORIZONTAL) {
                 int pos = (size.width-splitterSize) / 2;
-                g.setColor(SystemColor.controlLtHighlight);
+                g.setColor(UIManager.getColor("controlLtHighlight"));
                 g.drawLine(pos, 0, pos, size.height - 1);
-                g.setColor(SystemColor.control);
+                g.setColor(UIManager.getColor("control"));
                 for (int i = 1; i < splitterSize - 2; i++)
                     g.drawLine(pos+i, 0, pos + i, size.height - 1);
-                g.setColor(SystemColor.controlDkShadow);
+                g.setColor(UIManager.getColor("controlDkShadow"));
                 g.drawLine(pos + splitterSize - 1, 0, pos + splitterSize - 1, size.height - 1);
             }
             else if (splitType == VERTICAL) {
                 int pos = (size.height-splitterSize) / 2;
-                g.setColor(SystemColor.controlLtHighlight);
+                g.setColor(UIManager.getColor("controlLtHighlight"));
                 g.drawLine(0, pos, size.width - 1, pos);
-                g.setColor(SystemColor.control);
+                g.setColor(UIManager.getColor("control"));
                 for (int i = 1; i < splitterSize-2; i++)
                     g.drawLine(0,pos + i, size.width - 1, pos + i);
-                g.setColor(SystemColor.controlDkShadow);
+                g.setColor(UIManager.getColor("controlDkShadow"));
                 g.drawLine(0, pos + splitterSize - 1, size.width - 1, pos + splitterSize - 1);
             }
         }
Index: openide/src/org/openide/explorer/propertysheet/PropertyPanel.java
===================================================================
RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertyPanel.java,v
retrieving revision 1.115
diff -u -r1.115 PropertyPanel.java
--- openide/src/org/openide/explorer/propertysheet/PropertyPanel.java	10 Jul 2002 14:28:18 -0000	1.115
+++ openide/src/org/openide/explorer/propertysheet/PropertyPanel.java	12 Jul 2002 15:22:49 -0000
@@ -20,7 +20,6 @@
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Font;
-import java.awt.SystemColor;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -44,6 +43,7 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
 import org.openide.ErrorManager;
 import org.openide.explorer.propertysheet.editors.EnhancedCustomPropertyEditor;
@@ -280,7 +280,7 @@
             // set defaults without P ropertySheetSettings
             paintingStyle = PropertySheet.PAINTING_PREFERRED;
             plastic = false;
-            disabledColor = SystemColor.textInactiveText;;
+            disabledColor = UIManager.getColor("textInactiveText");
             foregroundColor = new Color (0, 0, 128);
         }
         
Index: openide/src/org/openide/explorer/propertysheet/PropertySheet.java
===================================================================
RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertySheet.java,v
retrieving revision 1.94
diff -u -r1.94 PropertySheet.java
--- openide/src/org/openide/explorer/propertysheet/PropertySheet.java	1 Jul 2002 08:45:09 -0000	1.94
+++ openide/src/org/openide/explorer/propertysheet/PropertySheet.java	12 Jul 2002 15:22:49 -0000
@@ -22,6 +22,7 @@
 
 import javax.swing.*;
 import javax.swing.event.*;
+import javax.swing.UIManager;
 
 import org.openide.util.datatransfer.PasteType;
 import org.openide.ErrorManager;
@@ -172,7 +173,7 @@
             propertyPaintingStyle = PAINTING_PREFERRED;
             sortingMode = SORTED_BY_NAMES;
             plastic = false;
-            disabledPropertyColor = SystemColor.textInactiveText;;
+            disabledPropertyColor = UIManager.getColor("textInactiveText");
             valueColor = new Color (0, 0, 128);
         }
 
Index: openide/src/org/openide/explorer/propertysheet/PropertySheetSettings.java
===================================================================
RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertySheetSettings.java,v
retrieving revision 1.10
diff -u -r1.10 PropertySheetSettings.java
--- openide/src/org/openide/explorer/propertysheet/PropertySheetSettings.java	12 Jun 2001 14:35:58 -0000	1.10
+++ openide/src/org/openide/explorer/propertysheet/PropertySheetSettings.java	12 Jul 2002 15:22:49 -0000
@@ -14,11 +14,11 @@
 package org.openide.explorer.propertysheet;
 
 import java.awt.Color;
-import java.awt.SystemColor;
 
 import org.openide.options.SystemOption;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
+import javax.swing.UIManager;
 
 /**
 * Settings for the property sheet.
@@ -142,7 +142,7 @@
     */
     public Color getDisabledPropertyColor () {
         if (disabledColor == null) {
-            disabledColor = SystemColor.textInactiveText;
+            disabledColor = UIManager.getColor("textInactiveText");
         }
         return disabledColor;
     }
Index: openide/src/org/openide/explorer/propertysheet/SheetButton.java
===================================================================
RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/SheetButton.java,v
retrieving revision 1.31
diff -u -r1.31 SheetButton.java
--- openide/src/org/openide/explorer/propertysheet/SheetButton.java	17 Apr 2002 09:54:06 -0000	1.31
+++ openide/src/org/openide/explorer/propertysheet/SheetButton.java	12 Jul 2002 15:22:49 -0000
@@ -32,7 +32,6 @@
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.Rectangle;
-import java.awt.SystemColor;
 import java.util.Vector;
 import javax.swing.border.EmptyBorder;
 import javax.swing.FocusManager;
@@ -82,9 +81,9 @@
     /** Is true if mouseEntered and mouseExited actions should be propagated. */
     private boolean plasticNotify;
     /** Active foreground color. */
-    private Color foreground = SystemColor.controlText;
+    private Color foreground;
     /** Inactive foreground color. */
-    private Color inForeground = SystemColor.textInactiveText;
+    private Color inForeground;
     /** Flag indicating invalidity. Invalid mark. */
     private boolean invalidMark;
     /** Flag indicating that button is used as renderer. */
@@ -133,6 +132,8 @@
         innerListener = new IL ();
         addMouseListener (innerListener);
         addKeyListener (innerListener);
+        foreground = UIManager.getColor ("controlText");
+        inForeground = UIManager.getColor ("Button.disabledText");
     }
 
 
@@ -372,11 +373,11 @@
                 }
             }
         } else {
-            g.setColor (SystemColor.controlLtHighlight);
+            g.setColor (UIManager.getColor ("controlLtHighlight"));
             g.drawLine (0, 0, size.width - 1, 0);
             g.drawLine (0, 0, 0, size.height - 1);
 
-            g.setColor (SystemColor.controlDkShadow);
+            g.setColor (UIManager.getColor("controlDkShadow"));
             g.drawLine (size.width - 1, 0, size.width - 1, size.height - 1);
             g.drawLine (0, size.height - 1, size.width - 1, size.height - 1);
 
Index: openide/src/org/openide/explorer/view/TableSheetCell.java
===================================================================
RCS file: /cvs/openide/src/org/openide/explorer/view/TableSheetCell.java,v
retrieving revision 1.3
diff -u -r1.3 TableSheetCell.java
--- openide/src/org/openide/explorer/view/TableSheetCell.java	13 May 2002 13:23:51 -0000	1.3
+++ openide/src/org/openide/explorer/view/TableSheetCell.java	12 Jul 2002 15:22:50 -0000
@@ -61,8 +61,8 @@
         nullPanelBorder =
             f ? (Border)new EmptyBorder(1, 1, 1, 1)
               : (Border)new CompoundBorder(
-                    new MatteBorder(0, 0, 1, 1, java.awt.SystemColor.controlDkShadow),
-                    new MatteBorder(1, 1, 0, 0, java.awt.SystemColor.controlLtHighlight)
+                    new MatteBorder(0, 0, 1, 1, UIManager.getColor("controlDkShadow")),
+                    new MatteBorder(1, 1, 0, 0, UIManager.getColor("controlLtHighlight"))
                 );
         nullPanelFocusBorder = 
             new CompoundBorder(