diff --git a/reactos/subsys/system/vmwinst/De.rc b/reactos/subsys/system/vmwinst/De.rc
index cfd38ecb0c6..dc8dfe7ad1e 100644
--- a/reactos/subsys/system/vmwinst/De.rc
+++ b/reactos/subsys/system/vmwinst/De.rc
@@ -38,7 +38,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Grafikreiberinstallation"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "Das ReactOS Setup hat festgestellt, das Sie ReactOS in VMware(r) installierem.\n\n\nWenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.",-1,25,25,225,85
+  LTEXT "Das ReactOS Setup hat festgestellt, das Sie ReactOS in VMware(r) installieren.", -1, 115, 8, 160, 24
+  LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 115, 140, 160, 17
 END
 
 IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/subsys/system/vmwinst/En.rc b/reactos/subsys/system/vmwinst/En.rc
index b08df3bd359..3f55f20e1ea 100644
--- a/reactos/subsys/system/vmwinst/En.rc
+++ b/reactos/subsys/system/vmwinst/En.rc
@@ -5,7 +5,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Video Driver Installation"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "The ReactOS setup detected that you run ReactOS inside of VMware(r).\n\n\nIf you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.",-1,25,25,225,85
+  LTEXT "The ReactOS setup detected that you run ReactOS inside of VMware(r).", -1, 115, 8, 160, 24
+  LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 115, 140, 160, 17
 END
 
 IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/subsys/system/vmwinst/Es.rc b/reactos/subsys/system/vmwinst/Es.rc
index 19c2a830a94..6d2db7cd504 100644
--- a/reactos/subsys/system/vmwinst/Es.rc
+++ b/reactos/subsys/system/vmwinst/Es.rc
@@ -38,7 +38,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Instalación del Controlador de Video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "El instalador de ReactOS ha detectado que husted está ejecutando ReactOS sobre el emulador VMware(r).\n\n\nSi husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.",-1,25,25,225,85
+  LTEXT "El instalador de ReactOS ha detectado que husted está ejecutando ReactOS sobre el emulador VMware(r).", -1, 115, 8, 160, 24
+  LTEXT "Si husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.", -1, 115, 140, 160, 17
 END
 
 IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
diff --git a/reactos/subsys/system/vmwinst/resources/header.bmp b/reactos/subsys/system/vmwinst/resources/header.bmp
new file mode 100644
index 00000000000..af7bf7a5935
Binary files /dev/null and b/reactos/subsys/system/vmwinst/resources/header.bmp differ
diff --git a/reactos/subsys/system/vmwinst/resources/watermark.bmp b/reactos/subsys/system/vmwinst/resources/watermark.bmp
new file mode 100644
index 00000000000..1b42e5b4bd0
Binary files /dev/null and b/reactos/subsys/system/vmwinst/resources/watermark.bmp differ
diff --git a/reactos/subsys/system/vmwinst/vmwinst.c b/reactos/subsys/system/vmwinst/vmwinst.c
index 5ec20c8d712..7c6161bae9f 100644
--- a/reactos/subsys/system/vmwinst/vmwinst.c
+++ b/reactos/subsys/system/vmwinst/vmwinst.c
@@ -18,7 +18,7 @@
  *
  * VMware is a registered trademark of VMware, Inc.
  */
-/* $Id: vmwinst.c,v 1.9 2004/08/14 00:50:27 weiden Exp $
+/* $Id: vmwinst.c,v 1.10 2004/09/24 20:18:15 weiden Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS VMware(r) driver installation utility
@@ -70,6 +70,7 @@ DetectVMware(int *Version)
   magic = 0;
   ver = 0;
   
+return TRUE;
   /* Try using a VMware I/O port. If not running in VMware this'll throw an
      exception! */
   __asm__ __volatile__("inl  %%dx, %%eax"
@@ -358,11 +359,11 @@ EnableVmwareDriver(BOOL VBE, BOOL VGA, BOOL VMX)
 /* GUI */
 
 void
-InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
+InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc)
 {
   ZeroMemory(psp, sizeof(PROPSHEETPAGE));
   psp->dwSize = sizeof(PROPSHEETPAGE);
-  psp->dwFlags = PSP_DEFAULT;
+  psp->dwFlags = PSP_DEFAULT | Flags;
   psp->hInstance = hAppInstance;
   psp->pszTemplate = MAKEINTRESOURCE(idDlg);
   psp->pfnDlgProc = DlgProc;
@@ -862,7 +863,7 @@ PageSelectDriverProc(
   switch(uMsg)
   {
     case WM_INITDIALOG:
-      SendDlgItemMessage(hwndDlg, IDC_VGA, BM_SETCHECK, BST_CHECKED, 0);
+      SendDlgItemMessage(hwndDlg, IDC_VBE, BM_SETCHECK, BST_CHECKED, 0);
       break;
     case WM_NOTIFY:
     {
@@ -975,7 +976,7 @@ CreateWizard(VOID)
   
   ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
   psh.dwSize = sizeof(PROPSHEETHEADER);
-  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_WIZARD;
+  psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER;
   psh.hwndParent = NULL;
   psh.hInstance = hAppInstance;
   psh.hIcon = 0;
@@ -983,15 +984,17 @@ CreateWizard(VOID)
   psh.nPages = 7;
   psh.nStartPage = (StartVMwConfigWizard ? 5 : 0);
   psh.ppsp = psp;
+  psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
+  psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER);
   
-  InitPropSheetPage(&psp[0], IDD_WELCOMEPAGE, PageWelcomeProc);
-  InitPropSheetPage(&psp[1], IDD_INSERT_VMWARE_TOOLS, PageInsertDiscProc);
-  InitPropSheetPage(&psp[2], IDD_INSTALLING_VMWARE_TOOLS, PageInstallingProc);
-  InitPropSheetPage(&psp[3], IDD_CONFIG, PageConfigProc);
-  InitPropSheetPage(&psp[4], IDD_INSTALLATION_FAILED, PageInstallFailedProc);
-  InitPropSheetPage(&psp[5], IDD_CHOOSEACTION, PageChooseActionProc);
-  InitPropSheetPage(&psp[6], IDD_SELECTDRIVER, PageSelectDriverProc);
-  InitPropSheetPage(&psp[7], IDD_DOUNINSTALL, PageDoUninstallProc);
+  InitPropSheetPage(&psp[0], IDD_WELCOMEPAGE, PSP_HIDEHEADER, PageWelcomeProc);
+  InitPropSheetPage(&psp[1], IDD_INSERT_VMWARE_TOOLS, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageInsertDiscProc);
+  InitPropSheetPage(&psp[2], IDD_INSTALLING_VMWARE_TOOLS, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageInstallingProc);
+  InitPropSheetPage(&psp[3], IDD_CONFIG, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageConfigProc);
+  InitPropSheetPage(&psp[4], IDD_INSTALLATION_FAILED, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageInstallFailedProc);
+  InitPropSheetPage(&psp[5], IDD_CHOOSEACTION, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageChooseActionProc);
+  InitPropSheetPage(&psp[6], IDD_SELECTDRIVER, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageSelectDriverProc);
+  InitPropSheetPage(&psp[7], IDD_DOUNINSTALL, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageDoUninstallProc);
   
   return (LONG)(PropertySheet(&psh) != -1);
 }
diff --git a/reactos/subsys/system/vmwinst/vmwinst.h b/reactos/subsys/system/vmwinst/vmwinst.h
index c433fb26324..bda52df2141 100644
--- a/reactos/subsys/system/vmwinst/vmwinst.h
+++ b/reactos/subsys/system/vmwinst/vmwinst.h
@@ -49,4 +49,7 @@
 #define IDC_INSTALLINGSTATUS	206
 #define IDC_INSTALLINGPROGRESS	207
 
+#define IDB_WATERMARK	100
+#define IDB_HEADER	101
+
 #endif /* __VMWINST_H */
diff --git a/reactos/subsys/system/vmwinst/vmwinst.rc b/reactos/subsys/system/vmwinst/vmwinst.rc
index 65ac983ab62..1ed2861dc74 100644
--- a/reactos/subsys/system/vmwinst/vmwinst.rc
+++ b/reactos/subsys/system/vmwinst/vmwinst.rc
@@ -39,6 +39,10 @@ END
 
 1 24 DISCARDABLE "manifest.xml"
 
+/* Bitmaps */
+IDB_WATERMARK BITMAP "resources/watermark.bmp"
+IDB_HEADER    BITMAP "resources/header.bmp"
+
 #include "En.rc"
 #include "Es.rc"
 #include "De.rc"