diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c3a740b6c4..e4e0296a69 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,8 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-22 20:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/gtwvt/gtwvt.h
+  * src/rtl/gtwvt/gtwvt.c
+    ! Fixed to use standard VGA RGB values, just like in GTXWC.
+    ! Fixed color constant names (no "bright white" anymore).
+
+  * include/hbdefs.h
+    % Minor cleanup.
+
 2010-02-22 09:16 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
-  * contrib/hbqt/qtcore/*.cpp 
+  * contrib/hbqt/qtcore/*.cpp
   * contrib/hbqt/qtcore/*.cpp
   * contrib/hbqt/qtcore/*.cpp
     ! Regenerated sources after recent changes in headers implementation.
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 9ce91ff92f..2b6ce53a28 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -91,13 +91,10 @@
 #define HB_LONG_LONG_OFF
 */
 
-#if defined( HB_OS_WIN ) || defined( HB_OS_WIN_64 )
+#if defined( HB_OS_WIN )
    #if defined( HB_OS_WIN_64 )
       #undef HB_LONG_LONG_OFF
       #define HB_STRICT_ALIGNMENT
-      #if !defined( HB_OS_WIN )
-         #define HB_OS_WIN
-      #endif
    #endif
 
    #if !defined( HB_IO_WIN_OFF )
diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c
index f69ef08bb6..2ecc4c52fa 100644
--- a/harbour/src/rtl/gtwvt/gtwvt.c
+++ b/harbour/src/rtl/gtwvt/gtwvt.c
@@ -282,15 +282,15 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow )
    pWVT->COLORS[ 4]        = RED;
    pWVT->COLORS[ 5]        = MAGENTA;
    pWVT->COLORS[ 6]        = BROWN;
-   pWVT->COLORS[ 7]        = WHITE;
-   pWVT->COLORS[ 8]        = LIGHT_GRAY;
+   pWVT->COLORS[ 7]        = LIGHT_GRAY;
+   pWVT->COLORS[ 8]        = GRAY;
    pWVT->COLORS[ 9]        = BRIGHT_BLUE;
    pWVT->COLORS[10]        = BRIGHT_GREEN;
    pWVT->COLORS[11]        = BRIGHT_CYAN;
    pWVT->COLORS[12]        = BRIGHT_RED;
    pWVT->COLORS[13]        = BRIGHT_MAGENTA;
    pWVT->COLORS[14]        = YELLOW;
-   pWVT->COLORS[15]        = BRIGHT_WHITE;
+   pWVT->COLORS[15]        = WHITE;
 
    /* THESE are the default font parameters, if not changed by user */
    pWVT->PTEXTSIZE.x       = WVT_DEFAULT_FONT_WIDTH;
diff --git a/harbour/src/rtl/gtwvt/gtwvt.h b/harbour/src/rtl/gtwvt/gtwvt.h
index 99d198cc44..d652c4a312 100644
--- a/harbour/src/rtl/gtwvt/gtwvt.h
+++ b/harbour/src/rtl/gtwvt/gtwvt.h
@@ -88,22 +88,22 @@
 #endif
 #define WVT_DEFAULT_FONT_NAME    "Courier New"
 
-#define BLACK          RGB( 0x0 ,0x0 ,0x0  )
-#define BLUE           RGB( 0x0 ,0x0 ,0x85 )
-#define GREEN          RGB( 0x0 ,0x85,0x0  )
-#define CYAN           RGB( 0x0 ,0x85,0x85 )
-#define RED            RGB( 0x85,0x0 ,0x0  )
-#define MAGENTA        RGB( 0x85,0x0 ,0x85 )
-#define BROWN          RGB( 0x85,0x85,0x0  )
-#define WHITE          RGB( 0xC6,0xC6,0xC6 )
-#define LIGHT_GRAY     RGB( 0x60,0x60,0x60 )
-#define BRIGHT_BLUE    RGB( 0x00,0x00,0xFF )
-#define BRIGHT_GREEN   RGB( 0x60,0xFF,0x60 )
-#define BRIGHT_CYAN    RGB( 0x60,0xFF,0xFF )
-#define BRIGHT_RED     RGB( 0xF8,0x00,0x26 )
-#define BRIGHT_MAGENTA RGB( 0xFF,0x60,0xFF )
-#define YELLOW         RGB( 0xFF,0xFF,0x00 )
-#define BRIGHT_WHITE   RGB( 0xFF,0xFF,0xFF )
+#define BLACK          RGB( 0x00, 0x00, 0x00 )
+#define BLUE           RGB( 0x00, 0x00, 0xAA )
+#define GREEN          RGB( 0x00, 0xAA, 0x00 )
+#define CYAN           RGB( 0x00, 0xAA, 0xAA )
+#define RED            RGB( 0xAA, 0x00, 0x00 )
+#define MAGENTA        RGB( 0xAA, 0x00, 0xAA )
+#define BROWN          RGB( 0xAA, 0x55, 0x00 )
+#define LIGHT_GRAY     RGB( 0xAA, 0xAA, 0xAA )
+#define GRAY           RGB( 0x55, 0x55, 0x55 )
+#define BRIGHT_BLUE    RGB( 0x55, 0x55, 0xFF )
+#define BRIGHT_GREEN   RGB( 0x55, 0xFF, 0x55 )
+#define BRIGHT_CYAN    RGB( 0x55, 0xFF, 0xFF )
+#define BRIGHT_RED     RGB( 0xFF, 0x55, 0x55 )
+#define BRIGHT_MAGENTA RGB( 0xFF, 0x55, 0xFF )
+#define YELLOW         RGB( 0xFF, 0xFF, 0x55 )
+#define WHITE          RGB( 0xFF, 0xFF, 0xFF )
 
 #define WM_MY_UPDATE_CARET ( WM_USER + 0x0101 )