diff --git a/reactos/lib/user32/windows/draw.c b/reactos/lib/user32/windows/draw.c
index 107a69eb9fc..d3a10d17bcf 100644
--- a/reactos/lib/user32/windows/draw.c
+++ b/reactos/lib/user32/windows/draw.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: draw.c,v 1.28 2003/09/27 12:32:52 gvg Exp $
+/* $Id: draw.c,v 1.29 2003/10/22 14:02:54 navaraf Exp $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -1652,10 +1652,6 @@ int STDCALL
 FillRect(HDC hDC, CONST RECT *lprc, HBRUSH hbr)
 {
   HBRUSH prevhbr;
-  /*if (hbr <= (HBRUSH)(COLOR_MAX + 1))
-    {
-      hbr = GetSysColorBrush((INT)hbr - 1);
-      }*/
   if ((prevhbr = SelectObject(hDC, hbr)) == NULL)
     {
       return(FALSE);
diff --git a/reactos/subsys/win32k/ntuser/class.c b/reactos/subsys/win32k/ntuser/class.c
index f2ad6efdb4d..2f2afeb1f36 100644
--- a/reactos/subsys/win32k/ntuser/class.c
+++ b/reactos/subsys/win32k/ntuser/class.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: class.c,v 1.36 2003/09/14 09:03:53 hbirr Exp $
+/* $Id: class.c,v 1.37 2003/10/22 14:02:54 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -37,6 +37,7 @@
 #include <include/object.h>
 #include <include/guicheck.h>
 #include <include/window.h>
+#include <include/color.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -420,6 +421,10 @@ IntGetClassLong(struct _WINDOW_OBJECT *WindowObject, ULONG Offset, BOOL Ansi)
       break;
     case GCL_HBRBACKGROUND:
       Ret = (ULONG)WindowObject->Class->hbrBackground;
+      if (Ret != 0 && Ret < 0x4000)
+        {
+          Ret = (ULONG)NtGdiGetSysColorBrush(Ret - 1);
+        }
       break;
     case GCL_HCURSOR:
       Ret = (ULONG)WindowObject->Class->hCursor;
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsys/win32k/objects/color.c
index 29e6e361780..f1e72ca10c6 100644
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: color.c,v 1.25 2003/09/25 15:12:42 fireball Exp $ */
+/* $Id: color.c,v 1.26 2003/10/22 14:02:54 navaraf Exp $ */
 
 // FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
 
@@ -32,6 +32,7 @@
 #include <include/inteng.h>
 #include <include/color.h>
 #include <include/palette.h>
+#include <include/error.h>
 
 #define NDEBUG
 #include <win32k/debug1.h>
@@ -75,24 +76,105 @@ const PALETTEENTRY COLOR_sysPalTemplate[NB_RESERVED_COLORS] =
   { 0xff, 0xff, 0xff, PC_SYS_USED }     // last 10
 };
 
+const COLORREF SysColours[] =
+{
+  RGB(224, 224, 224) /* COLOR_SCROLLBAR */,
+  RGB(58, 110, 165) /* COLOR_BACKGROUND */,
+  RGB(0, 0, 128) /* COLOR_ACTIVECAPTION */,
+  RGB(128, 128, 128) /* COLOR_INACTIVECAPTION */,
+  RGB(192, 192, 192) /* COLOR_MENU */,
+  RGB(255, 255, 255) /* COLOR_WINDOW */,
+  RGB(0, 0, 0) /* COLOR_WINDOWFRAME */,
+  RGB(0, 0, 0) /* COLOR_MENUTEXT */,
+  RGB(0, 0, 0) /* COLOR_WINDOWTEXT */,
+  RGB(255, 255, 255) /* COLOR_CAPTIONTEXT */,
+  RGB(128, 128, 128) /* COLOR_ACTIVEBORDER */,
+  RGB(255, 255, 255) /* COLOR_INACTIVEBORDER */,
+  RGB(255, 255, 232) /* COLOR_APPWORKSPACE */,
+  RGB(224, 224, 224) /* COLOR_HILIGHT */,
+  RGB(0, 0, 128) /* COLOR_HILIGHTTEXT */,
+  RGB(192, 192, 192) /* COLOR_BTNFACE */,
+  RGB(128, 128, 128) /* COLOR_BTNSHADOW */,
+  RGB(192, 192, 192) /* COLOR_GRAYTEXT */,
+  RGB(0, 0, 0) /* COLOR_BTNTEXT */,
+  RGB(192, 192, 192) /* COLOR_INACTIVECAPTIONTEXT */,
+  RGB(255, 255, 255) /* COLOR_BTNHILIGHT */,
+  RGB(32, 32, 32) /* COLOR_3DDKSHADOW */,
+  RGB(192, 192, 192) /* COLOR_3DLIGHT */,
+  RGB(0, 0, 0) /* COLOR_INFOTEXT */,
+  RGB(255, 255, 192) /* COLOR_INFOBK */,
+  RGB(184, 180, 184) /* COLOR_ALTERNATEBTNFACE */,
+  RGB(0, 0, 255) /* COLOR_HOTLIGHT */,
+  RGB(16, 132, 208) /* COLOR_GRADIENTACTIVECAPTION */,
+  RGB(181, 181, 181) /* COLOR_GRADIENTINACTIVECAPTION */,
+};
+
 ULONG FASTCALL NtGdiGetSysColor(int nIndex)
 {
+#if 0
    const PALETTEENTRY *p = COLOR_sysPalTemplate + (nIndex * sizeof(PALETTEENTRY));
    return RGB(p->peRed, p->peGreen, p->peBlue);
+#else
+  if (nIndex < 0 || sizeof(SysColours) / sizeof(SysColours[0]) < nIndex)
+    {
+      SetLastWin32Error(ERROR_INVALID_PARAMETER);
+      return 0;
+    }
+
+  return SysColours[nIndex];
+#endif
 }
 
 HPEN STDCALL NtGdiGetSysColorPen(int nIndex)
 {
+#if 0
   COLORREF Col;
   memcpy(&Col, COLOR_sysPalTemplate + nIndex, sizeof(COLORREF));
   return(NtGdiCreatePen(PS_SOLID, 1, Col));
+#else
+  static HPEN SysPens[sizeof(SysColours) / sizeof(SysColours[0])];
+
+  if (nIndex < 0 || sizeof(SysColours) / sizeof(SysColours[0]) < nIndex)
+    {
+      SetLastWin32Error(ERROR_INVALID_PARAMETER);
+      return NULL;
+    }
+
+  /* FIXME should register this object with DeleteObject() so it
+     can't be deleted */
+  if (NULL == SysPens[nIndex])
+    {
+      SysPens[nIndex] = (HPEN)((DWORD)NtGdiCreatePen(PS_SOLID, 0, SysColours[nIndex]) | 0x00800000);
+    }
+
+  return SysPens[nIndex];
+#endif
 }
 
 HBRUSH STDCALL NtGdiGetSysColorBrush(int nIndex)
 {
+#if 0
   COLORREF Col;
   memcpy(&Col, COLOR_sysPalTemplate + nIndex, sizeof(COLORREF));
   return(NtGdiCreateSolidBrush(Col));
+#else
+  static HBRUSH SysBrushes[sizeof(SysColours) / sizeof(SysColours[0])];
+
+  if (nIndex < 0 || sizeof(SysColours) / sizeof(SysColours[0]) < nIndex)
+    {
+      SetLastWin32Error(ERROR_INVALID_PARAMETER);
+      return NULL;
+    }
+
+  /* FIXME should register this object with DeleteObject() so it
+     can't be deleted */
+  if (NULL == SysBrushes[nIndex])
+    {
+      SysBrushes[nIndex] = (HBRUSH) ((DWORD)NtGdiCreateSolidBrush(SysColours[nIndex]) | 0x00800000);
+    }
+
+  return SysBrushes[nIndex];
+#endif
 }