diff --git a/reactos/base/setup/reactos/CMakeLists.txt b/reactos/base/setup/reactos/CMakeLists.txt
index aec188d6659..d0ce6603299 100644
--- a/reactos/base/setup/reactos/CMakeLists.txt
+++ b/reactos/base/setup/reactos/CMakeLists.txt
@@ -1,7 +1,13 @@
 
+list(APPEND SOURCE
+    drivepage.c
+    reactos.c
+    reactos.h)
+
 file(GLOB reactos_rc_deps res/*.*)
 add_rc_deps(reactos.rc ${reactos_rc_deps})
-add_executable(reactos reactos.c reactos.rc)
+add_executable(reactos ${SOURCE} reactos.rc)
+add_pch(reactos reactos.h SOURCE)
 target_link_libraries(reactos uuid)
 set_module_type(reactos win32gui UNICODE)
 add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
diff --git a/reactos/base/setup/reactos/drivepage.c b/reactos/base/setup/reactos/drivepage.c
new file mode 100644
index 00000000000..ac38512f176
--- /dev/null
+++ b/reactos/base/setup/reactos/drivepage.c
@@ -0,0 +1,243 @@
+/*
+ *  ReactOS applications
+ *  Copyright (C) 2004-2008 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS GUI first stage setup application
+ * FILE:        base/setup/reactos/drivepage.c
+ * PROGRAMMERS: Eric Kohl
+ *              Matthias Kupfer
+ *              Dmitry Chapyshev (dmitry@reactos.org)
+ */
+
+#include "reactos.h"
+#include "resource.h"
+
+/* GLOBALS ******************************************************************/
+
+static INT_PTR CALLBACK
+MoreOptDlgProc(HWND hwndDlg,
+               UINT uMsg,
+               WPARAM wParam,
+               LPARAM lParam)
+{
+    PSETUPDATA pSetupData;
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
+            CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED);
+            SendMessage(GetDlgItem(hwndDlg, IDC_PATH),
+                        WM_SETTEXT,
+                        (WPARAM)0,
+                        (LPARAM)pSetupData->InstallDir);
+            break;
+
+        case WM_COMMAND:
+            switch(LOWORD(wParam))
+            {
+                case IDOK:
+                    SendMessage(GetDlgItem(hwndDlg, IDC_PATH),
+                                WM_GETTEXT,
+                                (WPARAM)sizeof(pSetupData->InstallDir) / sizeof(TCHAR),
+                                (LPARAM)pSetupData->InstallDir);
+
+                    EndDialog(hwndDlg, IDOK);
+                    return TRUE;
+
+                case IDCANCEL:
+                    EndDialog(hwndDlg, IDCANCEL);
+                    return TRUE;
+            }
+            break;
+    }
+
+    return FALSE;
+}
+
+static INT_PTR CALLBACK
+PartitionDlgProc(HWND hwndDlg,
+                 UINT uMsg,
+                 WPARAM wParam,
+                 LPARAM lParam)
+{
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            break;
+        case WM_COMMAND:
+        {
+            switch(LOWORD(wParam))
+            {
+                case IDOK:
+                    EndDialog(hwndDlg, IDOK);
+                    return TRUE;
+                case IDCANCEL:
+                    EndDialog(hwndDlg, IDCANCEL);
+                    return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+INT_PTR
+CALLBACK
+DriveDlgProc(
+    HWND hwndDlg,
+    UINT uMsg,
+    WPARAM wParam,
+    LPARAM lParam)
+{
+    PSETUPDATA pSetupData;
+#if 1
+    HDEVINFO h;
+    HWND hList;
+    SP_DEVINFO_DATA DevInfoData;
+    DWORD i;
+#endif
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            HWND hwndControl;
+            DWORD dwStyle;
+
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
+            hwndControl = GetParent(hwndDlg);
+
+            dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+            SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+        
+            /* Set title font */
+            /*SendDlgItemMessage(hwndDlg,
+                                 IDC_STARTTITLE,
+                                 WM_SETFONT,
+                                 (WPARAM)hTitleFont,
+                                 (LPARAM)TRUE);*/
+#if 1
+            h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT);
+            if (h != INVALID_HANDLE_VALUE)
+            {
+                hList =GetDlgItem(hwndDlg, IDC_PARTITION); 
+                DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+                for (i=0; SetupDiEnumDeviceInfo(h, i, &DevInfoData); i++)
+                {
+                    DWORD DataT;
+                    LPTSTR buffer = NULL;
+                    DWORD buffersize = 0;
+
+                    while (!SetupDiGetDeviceRegistryProperty(h,
+                                                             &DevInfoData,
+                                                             SPDRP_DEVICEDESC,
+                                                             &DataT,
+                                                             (PBYTE)buffer,
+                                                             buffersize,
+                                                             &buffersize))
+                    {
+                        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+                        {
+                            if (buffer) LocalFree(buffer);
+                            buffer = LocalAlloc(LPTR, buffersize * 2);
+                        }
+                        else
+                            break;
+                    }
+                    if (buffer)
+                    {
+                        SendMessage(hList, LB_ADDSTRING, (WPARAM) 0, (LPARAM) buffer);
+                        LocalFree(buffer);
+                    }
+                }
+                SetupDiDestroyDeviceInfoList(h);
+            }
+#endif
+        }
+        break;
+
+        case WM_COMMAND:
+        {
+            switch(LOWORD(wParam))
+            {
+                case IDC_PARTMOREOPTS:
+                    DialogBoxParam(pSetupData->hInstance,
+                                   MAKEINTRESOURCE(IDD_BOOTOPTIONS),
+                                   hwndDlg,
+                                   (DLGPROC)MoreOptDlgProc,
+                                   (LPARAM)pSetupData);
+                    break;
+                case IDC_PARTCREATE:
+                    DialogBox(pSetupData->hInstance,
+                              MAKEINTRESOURCE(IDD_PARTITION),
+                              hwndDlg,
+                              (DLGPROC) PartitionDlgProc);
+                    break;
+                case IDC_PARTDELETE:
+                    break;
+            }
+            break;
+        }
+
+        case WM_NOTIFY:
+        {
+            LPNMHDR lpnm = (LPNMHDR)lParam;
+
+            switch (lpnm->code)
+            {        
+                case PSN_SETACTIVE:
+                    PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
+                    break;
+
+                case PSN_QUERYCANCEL:
+                    SetWindowLongPtr(hwndDlg,
+                                     DWL_MSGRESULT,
+                                     MessageBox(GetParent(hwndDlg),
+                                                pSetupData->szAbortMessage,
+                                                pSetupData->szAbortTitle,
+                                                MB_YESNO | MB_ICONQUESTION) != IDYES);
+                    return TRUE;
+
+                default:
+                    break;
+            }
+        }
+        break;
+
+        default:
+            break;
+
+    }
+
+    return FALSE;
+}
+
+/* EOF */
diff --git a/reactos/base/setup/reactos/lang/bg-BG.rc b/reactos/base/setup/reactos/lang/bg-BG.rc
index de57a167c57..9d9d35bdaa0 100644
--- a/reactos/base/setup/reactos/lang/bg-BG.rc
+++ b/reactos/base/setup/reactos/lang/bg-BG.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Натиснете „Приключване“ за изход от настройването.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Език за настройването:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 8, 109, 135, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 145, 107, 163, 142
-    CONTROL "Клавиатура или начин на въвеждане:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 8, 142, 135, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 145, 141, 163, 81
-    LTEXT "Натиснете „Напред“ за избор на вида настройване.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Настройка на РеактОС"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Вид настройване", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Слагане на РеактОС", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Поправка или осъвременяване на сложен РеактОС", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Слагане на РеактОС", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Поправка или осъвременяване на сложен РеактОС", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Натиснете „Напред“ за избор на устройство за слагане.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Отказ", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Слагане на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Натиснете „Напред“ за за начало на слагането.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Избор на език"
-    IDS_LANGSUBTITLE "Изберете език за настройването и за крайната уредба."
     IDS_TYPETITLE "РеактОС ви приветства!"
     IDS_TYPESUBTITLE "Изберете вид на настройването."
     IDS_DEVICETITLE "Настройване на основните устройства"
diff --git a/reactos/base/setup/reactos/lang/cs-CZ.rc b/reactos/base/setup/reactos/lang/cs-CZ.rc
index ded0f80f20d..33e711fc027 100644
--- a/reactos/base/setup/reactos/lang/cs-CZ.rc
+++ b/reactos/base/setup/reactos/lang/cs-CZ.rc
@@ -16,31 +16,19 @@ BEGIN
     LTEXT "Klepnutím na Dokončit ukončíte instalaci.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Jazyk instalace:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Klávesnice či metoda zadávání:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Po klepnutí na Další bude možné zvolit typ instalace.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalace systému ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Typ instalace", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Nainstalovat systém ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Nainstalovat systém ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Opravit nebo aktualizovat již nainstalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -55,7 +43,7 @@ BEGIN
     LTEXT "Po klepnutí na Další bude možné nastavit instalační zařízení.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -100,7 +88,7 @@ BEGIN
     PUSHBUTTON "&Storno", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -109,7 +97,7 @@ BEGIN
     LTEXT "Klepnutím na Další zahájíte instalační proces.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -134,8 +122,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Výběr jazyka"
-    IDS_LANGSUBTITLE "Volba jazyka, který bude použit při instalaci a ve výsledném systému."
     IDS_TYPETITLE "Vítejte v průvodci instalace systému ReactOS"
     IDS_TYPESUBTITLE "Volba typu instalace."
     IDS_DEVICETITLE "Nastavení základních zařízení"
diff --git a/reactos/base/setup/reactos/lang/de-DE.rc b/reactos/base/setup/reactos/lang/de-DE.rc
index 7a45413e025..3e2d9a92e41 100644
--- a/reactos/base/setup/reactos/lang/de-DE.rc
+++ b/reactos/base/setup/reactos/lang/de-DE.rc
@@ -10,36 +10,24 @@ BEGIN
     LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Installationssprache:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Tastatur oder Eingabemethode:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Klicken Sie auf Weiter um zum Setuptyp zu gelangen.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS-Setup"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Setuptyp", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Installiere ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repariere oder aktualisiere ein installiertes ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Installiere ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Aktualisiere oder repariere ein installiertes ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Geräteeinstellungen", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
+//    CONTROL "Geräteeinstellungen", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Anzeige:", IDC_STATIC, 20, 35, 80, 10
@@ -49,12 +37,12 @@ BEGIN
     LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partition für die ReactOS-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
+//    CONTROL "Partition für die ReactOS-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
     LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
     PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 20, 155, 50, 15
     PUSHBUTTON "&Löschen", IDC_PARTDELETE, 76, 155, 50, 15
@@ -68,8 +56,8 @@ STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
 CAPTION "Erstelle Partition"
 FONT 8, "MS Shell Dlg"
 BEGIN
+//    CONTROL "Erstelle und formatiere Partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
     CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13
-    CONTROL "Erstelle und formatiere Partition", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57
     LTEXT "Größe:", IDC_STATIC, 13, 24, 27, 9
     EDITTEXT IDC_PARTSIZE, 52, 23, 53, 13, WS_VISIBLE | WS_TABSTOP
     LTEXT "GB", IDC_UNIT, 117, 24, 14, 9
@@ -84,7 +72,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION
 CAPTION "Erweiterte Partitionseinstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installationsverzeichnis", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
+//    CONTROL "Installationsverzeichnis", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30
     EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE
     CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52
     CONTROL "Installiere Bootloader auf Festplatte (MBR und VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11
@@ -94,21 +82,21 @@ BEGIN
     PUSHBUTTON "&Abbrechen", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installationszusammenfassung", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
+//    CONTROL "Installationszusammenfassung", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Klicken Sie auf Weiter um die Installation zu starten.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installationsaktion", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
+//    CONTROL "Installationsaktion", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Installation der Dateien...", IDC_ACTIVITY, 20, 50, 277, 10
     LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10
     CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -119,7 +107,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Vervollständige ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Abschließen der ersten Stufe der ReactOS-Installation", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172
+//    CONTROL "Abschließen der ersten Stufe der ReactOS-Installation", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich abgeschlossen.", IDC_STATIC, 20, 50, 277, 10
     LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 20, 80, 277, 10
     CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Sprachauswahl"
-    IDS_LANGSUBTITLE "Wählen Sie eine Sprache für das Setup und das Endsystem aus."
     IDS_TYPETITLE "Willkommen zum ReactOS-Setup"
     IDS_TYPESUBTITLE "Wählen Sie einen Setuptyp."
     IDS_DEVICETITLE "Einstellen der Basisgeräte"
@@ -144,6 +130,6 @@ BEGIN
     IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die Geräte auf"
     IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, dann müssen Sie das Setup nochmals ausführen, um ReactOS zu installieren. Wirklich beenden?"
     IDS_ABORTSETUP2 "Installation abbrechen?"
-    IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue."
+    IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden werden.\nSetup kann nicht fortfahren."
     IDS_CAPTION "ReactOS Setup"
 END
diff --git a/reactos/base/setup/reactos/lang/el-GR.rc b/reactos/base/setup/reactos/lang/el-GR.rc
index edaf6e40f0d..7df16075032 100644
--- a/reactos/base/setup/reactos/lang/el-GR.rc
+++ b/reactos/base/setup/reactos/lang/el-GR.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Πατήστε Ολοκλήρωση για να βγείτε από την Εγκατάσταση.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Γλώσσα εγκατάστασης:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Πληκτρολόγιο ή μέθοδος εισόδου:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Πατήστε Επόμενο για να επιλέξετε τον τύπο εγκατάστασης.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Εγκατάσταση του ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Πατήστε Επόμενο για να ρυθμίσετε τις συσκευές.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Άκυρο", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Επιλογή Γλώσσας"
-    IDS_LANGSUBTITLE "Επιλέξτε γλώσσα για την εγκατάσταση και το τελικό σύστημα."
     IDS_TYPETITLE "Καλώς ήλθατε στην Εγκατάσταση του ReactOS"
     IDS_TYPESUBTITLE "Επιλέξτε τύπο εγκατάστασης."
     IDS_DEVICETITLE "Setup the basic devices"
diff --git a/reactos/base/setup/reactos/lang/en-US.rc b/reactos/base/setup/reactos/lang/en-US.rc
index af85af4a2fe..3f66b86172a 100644
--- a/reactos/base/setup/reactos/lang/en-US.rc
+++ b/reactos/base/setup/reactos/lang/en-US.rc
@@ -10,57 +10,43 @@ BEGIN
     LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180, 297, 10
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Update or repair ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
+    LTEXT "Click Next to continue.", IDC_STATIC, 7, 128, 297, 8
 END
 
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
-    LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Computer:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Keyboard:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
+/*    LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 277, 8 */
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Create", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Delete", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218, 155, 80, 15
-    LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
+    LISTBOX IDC_PARTITION, 7, 7, 303, 112, LBS_HASSTRINGS | WS_VSCROLL
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 14
+    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 14
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 14, WS_DISABLED
+    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 14
+/*    LTEXT "Click Next to check the summary.", IDC_STATIC, 7, 128, 277, 8 */
 END
 
 IDD_PARTITION DIALOGEX 0, 0, 145, 90
@@ -94,24 +80,23 @@ BEGIN
     PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Click Next to start the installation process.", IDC_STATIC, 7, 128, 277, 8
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
+/*    CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172 */
     LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10
     LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10
-    CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
+    CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 7, 120, 303, 8
 END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
@@ -119,17 +104,15 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Completing ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10
-    LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10
-    CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
-    LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20
+/*    CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172 */
+    LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 115, 50, 195, 10
+    LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 115, 80, 195, 10
+    CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8
+    LTEXT "If there is a CD in a drive, remove it. Then, to restart your computer, click Finish.", IDC_STATIC, 115, 169, 195, 17
 END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Language Selection"
-    IDS_LANGSUBTITLE "Choose language for setup and final system."
     IDS_TYPETITLE "Welcome to ReactOS Setup"
     IDS_TYPESUBTITLE "Choose setup type."
     IDS_DEVICETITLE "Setup the basic devices"
diff --git a/reactos/base/setup/reactos/lang/es-ES.rc b/reactos/base/setup/reactos/lang/es-ES.rc
index fadd0111cc1..369654450ca 100644
--- a/reactos/base/setup/reactos/lang/es-ES.rc
+++ b/reactos/base/setup/reactos/lang/es-ES.rc
@@ -12,31 +12,19 @@ BEGIN
     LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Selección de idioma:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Teclado o dispositivo de entrada:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Presione Siguiente para seleccionar el tipo de instalación.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalación de ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tipo de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Instalar ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Reparar o actualizar una versión instalada de ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Actualizar o reparar una versión instalada de ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +39,7 @@ BEGIN
     LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -96,7 +84,7 @@ BEGIN
     PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -105,7 +93,7 @@ BEGIN
     LTEXT "Presione Siguiente para comenzar con el proceso de instalación.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -130,8 +118,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Selección del idioma"
-    IDS_LANGSUBTITLE "Seleccione el idioma para la instalación y para el sistema."
     IDS_TYPETITLE "Bienvenido a la instalación de ReactOS"
     IDS_TYPESUBTITLE "Seleccione el tipo de instalación."
     IDS_DEVICETITLE "Instalación de los dispositivos básicos"
diff --git a/reactos/base/setup/reactos/lang/et-EE.rc b/reactos/base/setup/reactos/lang/et-EE.rc
index 91b3be0403d..69b6a36da56 100644
--- a/reactos/base/setup/reactos/lang/et-EE.rc
+++ b/reactos/base/setup/reactos/lang/et-EE.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Vajuta lõpeta, et installeerimine lõpetada.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Paigaldamise keel:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Klaviatuur või sisestusmeetod:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Vajuta Järgmine, et valida paigalduse tüüp.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOSi paigaldamine"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Paigalduse tüüp", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Installeeri ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Paranda või uuenda installeeritud ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Installeeri ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Paranda või uuenda installeeritud ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Tühista", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Vajuta Järgmine, et paigaldamist alustada.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Keele valimine"
-    IDS_LANGSUBTITLE "Vali paigaldamise ja süsteemi keel."
     IDS_TYPETITLE "Tere tulemast ReactOSi paigaldama"
     IDS_TYPESUBTITLE "Vali paigalduse tüüp."
     IDS_DEVICETITLE "Põhiliste seadmete paigaldamine"
diff --git a/reactos/base/setup/reactos/lang/fi-FI.rc b/reactos/base/setup/reactos/lang/fi-FI.rc
index 7c5b45de07d..e52e115e534 100644
--- a/reactos/base/setup/reactos/lang/fi-FI.rc
+++ b/reactos/base/setup/reactos/lang/fi-FI.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -114,7 +102,7 @@ BEGIN
     CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
 END
 
-IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
+IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Completing ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Language Selection"
-    IDS_LANGSUBTITLE "Choose language for setup and final system."
     IDS_TYPETITLE "Welcome to ReactOS Setup"
     IDS_TYPESUBTITLE "Choose setup type."
     IDS_DEVICETITLE "Setup the basic devices"
diff --git a/reactos/base/setup/reactos/lang/fr-FR.rc b/reactos/base/setup/reactos/lang/fr-FR.rc
index f83376e31e1..850686ca47d 100644
--- a/reactos/base/setup/reactos/lang/fr-FR.rc
+++ b/reactos/base/setup/reactos/lang/fr-FR.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Cliquez sur Terminer pour quitter l'installation.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Installation de ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installation de ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Language Selection"
-    IDS_LANGSUBTITLE "Choose language for setup and final system."
     IDS_TYPETITLE "Welcome to ReactOS Setup"
     IDS_TYPESUBTITLE "Choose setup type."
     IDS_DEVICETITLE "Setup the basic devices"
diff --git a/reactos/base/setup/reactos/lang/he-IL.rc b/reactos/base/setup/reactos/lang/he-IL.rc
index 6c2826bd7eb..25d0ff4d205 100644
--- a/reactos/base/setup/reactos/lang/he-IL.rc
+++ b/reactos/base/setup/reactos/lang/he-IL.rc
@@ -12,31 +12,19 @@ BEGIN
     LTEXT "לחץ על סיום כדי לסיים את ההתקנה.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "שפת התקנה:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "מקלדת או שיטת הזנה:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "לחץ על הבא כדי לבחור סוג התקנה:", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "התקנת ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "סוג התקנה", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "התקנת ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "תיקון או עדכון גרסה קיימת", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "התקנת ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "תיקון או עדכון גרסה קיימת", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "לחץ על הבא כדי להגדיר את ההתקנים", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +39,7 @@ BEGIN
     LTEXT "לחץ על הבא כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -96,7 +84,7 @@ BEGIN
     PUSHBUTTON "ביטול", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -105,7 +93,7 @@ BEGIN
     LTEXT "לחץ על הבא כדי להתחיל בתהליך ההתקנה.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -130,8 +118,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "בחירת שפה"
-    IDS_LANGSUBTITLE "Choose language for setup and final system."
     IDS_TYPETITLE "ברוכים הבאים אל תכנית ההתקנה של ReactOS"
     IDS_TYPESUBTITLE "בחירת סוג התקנה."
     IDS_DEVICETITLE "Setup the basic devices"
diff --git a/reactos/base/setup/reactos/lang/hu-HU.rc b/reactos/base/setup/reactos/lang/hu-HU.rc
index 92269276786..4298e2878c8 100644
--- a/reactos/base/setup/reactos/lang/hu-HU.rc
+++ b/reactos/base/setup/reactos/lang/hu-HU.rc
@@ -12,31 +12,19 @@ BEGIN
     LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Setup"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Install ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Update or repair an installed ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +39,7 @@ BEGIN
     LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -96,7 +84,7 @@ BEGIN
     PUSHBUTTON "&Cancel", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -105,7 +93,7 @@ BEGIN
     LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
@@ -130,8 +118,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Language Selection"
-    IDS_LANGSUBTITLE "Choose language for setup and final system."
     IDS_TYPETITLE "Welcome to ReactOS Setup"
     IDS_TYPESUBTITLE "Choose setup type."
     IDS_DEVICETITLE "Setup the basic devices"
diff --git a/reactos/base/setup/reactos/lang/it-IT.rc b/reactos/base/setup/reactos/lang/it-IT.rc
index 6b91e625625..c7e4b85b784 100644
--- a/reactos/base/setup/reactos/lang/it-IT.rc
+++ b/reactos/base/setup/reactos/lang/it-IT.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Cliccare Fine per uscire.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Lingua per l'installazione:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Tastiera o metodo di input:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Cliccare Avanti per selezionare il tipo di installazione.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Installazione di ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tipo di installazione", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Installa ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Ripara o aggiorna una installazione precedente di ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Installa ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Aggiorna o ripara una installazione precedente di ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Cliccare Avanti per scegliere dove effettuare l'installazione.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Annulla", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Selezione della lingua"
-    IDS_LANGSUBTITLE "Scegliere la lingua per la installazione e per il sistema finale."
     IDS_TYPETITLE "Benvenuti alla installazione di ReactOS"
     IDS_TYPESUBTITLE "Scegliere il tipo di installazione."
     IDS_DEVICETITLE "Impostazione dei dispositivi di base"
diff --git a/reactos/base/setup/reactos/lang/ms-MY.rc b/reactos/base/setup/reactos/lang/ms-MY.rc
index bb8f7bae480..56c5a99408d 100644
--- a/reactos/base/setup/reactos/lang/ms-MY.rc
+++ b/reactos/base/setup/reactos/lang/ms-MY.rc
@@ -12,31 +12,19 @@ BEGIN
     LTEXT "Klik Selesai untuk keluar persediaan.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Persediaan Bahasa:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Kaedah input atau papan kekunci:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Klik seterusnya untuk memilih jenis persediaan.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Persediaan"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Jenis persediaan", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Pasang ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Membaiki atau mengemaskini ReactOS yang dipasang", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Pasang ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Membaiki atau mengemaskini ReactOS yang dipasang", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Klik Seterusnya untuk memasang peranti.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +39,7 @@ BEGIN
     LTEXT "Klik di sebelah persediaan peranti pemasangan tersebut.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
@@ -96,7 +84,7 @@ BEGIN
     PUSHBUTTON "Batal(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
@@ -105,7 +93,7 @@ BEGIN
     LTEXT "Klik Seterusnya untuk memulakan proses pemasangan.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
@@ -130,8 +118,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Pemilihan Bahasa"
-    IDS_LANGSUBTITLE "Memilih bahasa untuk persediaan dan sistem akhir."
     IDS_TYPETITLE "Selamat datang ke persediaan ReactOS"
     IDS_TYPESUBTITLE "Pilih jenis persediaan."
     IDS_DEVICETITLE "Sediakan peranti asas"
diff --git a/reactos/base/setup/reactos/lang/no-NO.rc b/reactos/base/setup/reactos/lang/no-NO.rc
index 8d2b43fb808..8de485c02e6 100644
--- a/reactos/base/setup/reactos/lang/no-NO.rc
+++ b/reactos/base/setup/reactos/lang/no-NO.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Trykk på Fullført for å avslutte installeringen.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Installering språk:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Tastatur eller inndataspråk:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Trykk på Neste for å velge installering type.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS installering"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Installeringsvalg", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Installere ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Reparere eller oppdatere en installert ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Installere ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Reparere eller oppdatere en installert ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Trykk på Neste for installere enhetene.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Trykk på Neste for å installere enhetene.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Avbryt", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Språkvalg"
-    IDS_LANGSUBTITLE "Velg språk for installering og til ferdig system."
     IDS_TYPETITLE "Velkommen til ReactOS installering"
     IDS_TYPESUBTITLE "Velg installering type."
     IDS_DEVICETITLE "Installer grunnleggende enheter"
diff --git a/reactos/base/setup/reactos/lang/pl-PL.rc b/reactos/base/setup/reactos/lang/pl-PL.rc
index ef591d3947e..bfc2cf5bddd 100644
--- a/reactos/base/setup/reactos/lang/pl-PL.rc
+++ b/reactos/base/setup/reactos/lang/pl-PL.rc
@@ -20,31 +20,19 @@ BEGIN
     LTEXT "Naciśnij przycisk aby zakończyć pracę Instalatora.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Język instalacji:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Układ klawiatury:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Naciśnij Dalej, aby wybrać rodzaj instalacji.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalator ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Rodzaj instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Zainstaluj ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Napraw lub zaktualizuj zainstalowany wcześniej ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Zainstaluj ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Napraw lub zaktualizuj zainstalowany wcześniej ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Naciśnij Dalej, aby zmienić ustawienia sprzętu.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -59,7 +47,7 @@ BEGIN
     LTEXT "Naciśnij Dalej, aby ustalić miejsce instalacji.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -104,7 +92,7 @@ BEGIN
     PUSHBUTTON "&Anuluj", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -113,7 +101,7 @@ BEGIN
     LTEXT "Kliknij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -138,8 +126,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Wybór języka"
-    IDS_LANGSUBTITLE "Wybierz język instalacji i docelowego systemu."
     IDS_TYPETITLE "Witamy w Instalatorze ReactOS"
     IDS_TYPESUBTITLE "Wybierz typ instalacji."
     IDS_DEVICETITLE "Ustawienia podstawowych urządzeń"
diff --git a/reactos/base/setup/reactos/lang/pt-BR.rc b/reactos/base/setup/reactos/lang/pt-BR.rc
index d3af53fba65..85ec35033cb 100644
--- a/reactos/base/setup/reactos/lang/pt-BR.rc
+++ b/reactos/base/setup/reactos/lang/pt-BR.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Clique em Finalizar para sair da Instalação.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Idioma de instalação:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Teclado ou método de entrada:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Clique em Próximo e selecione o modo de instalação.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalação do ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Modo de instalação", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Instalar ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Reparar ou atualizar uma instalação do ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Instalar ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Reparar ou atualizar uma instalação do ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Clique em Próximo para configurar o dispositivo de instalação.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Cancelar", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Clique em Próximo para iniciar o processo de instalação.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Seleção de Idioma"
-    IDS_LANGSUBTITLE "Escolher idioma de instalação e do sistema."
     IDS_TYPETITLE "Bem-vindo(a) a Instalação do ReactOS"
     IDS_TYPESUBTITLE "Escolha o modo de instalação."
     IDS_DEVICETITLE "Instalar dispositivos básicos"
diff --git a/reactos/base/setup/reactos/lang/ro-RO.rc b/reactos/base/setup/reactos/lang/ro-RO.rc
index 635569a4219..7284b412422 100644
--- a/reactos/base/setup/reactos/lang/ro-RO.rc
+++ b/reactos/base/setup/reactos/lang/ro-RO.rc
@@ -19,31 +19,19 @@ BEGIN
     LTEXT "Apăsați pe „Sfârșit” pentru a ieși.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Limba de instalare:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Tastatura sau metoda de introducere:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Apăsați pe „Înainte” pentru a specifica tipul instalării.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistent de instalare ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tipul de instalare", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Instalează ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Repară sau actualizează ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Instalează ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Repară sau actualizează ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Apăsați pe „Înainte” pentru configurarea de dispozitive.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -58,7 +46,7 @@ BEGIN
     LTEXT "Apăsați pe „Înainte” pentru configurarea dispozitivului de instalare.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     PUSHBUTTON "A&nulează", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -112,7 +100,7 @@ BEGIN
     LTEXT "Apăsați „Înainte” pentru a continua procesul de instalare.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -137,8 +125,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Selecție limbă"
-    IDS_LANGSUBTITLE "Alegeți limba pentru procesul de instalare și pentru sistemul final."
     IDS_TYPETITLE "Bun venit la instalarea ReactOS"
     IDS_TYPESUBTITLE "Alegeți tipul de instalare."
     IDS_DEVICETITLE "Instalare dispozitive de bază"
diff --git a/reactos/base/setup/reactos/lang/ru-RU.rc b/reactos/base/setup/reactos/lang/ru-RU.rc
index eecb7650a4d..c543b49a3c9 100644
--- a/reactos/base/setup/reactos/lang/ru-RU.rc
+++ b/reactos/base/setup/reactos/lang/ru-RU.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "Нажмите кнопку ""Завершить"" для выхода.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Язык системы:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Раскладка клавиатуры:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Для выбора типа установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Установка ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Тип установки", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Установка ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Восстановить или изменить установленный ранее ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Установка ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Восстановить или изменить установленный ранее ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "&Отмена", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Выбор языка"
-    IDS_LANGSUBTITLE "Выберите язык по умолчанию в системе."
     IDS_TYPETITLE "Вас приветствует программа установки ReactOS"
     IDS_TYPESUBTITLE "Выберите тип установки."
     IDS_DEVICETITLE "Установка базовых устройств"
diff --git a/reactos/base/setup/reactos/lang/sk-SK.rc b/reactos/base/setup/reactos/lang/sk-SK.rc
index 338c51f000f..db9a210b85a 100644
--- a/reactos/base/setup/reactos/lang/sk-SK.rc
+++ b/reactos/base/setup/reactos/lang/sk-SK.rc
@@ -15,31 +15,19 @@ BEGIN
     LTEXT "Inštaláciu ukončíte kliknutím na tlačidlo Dokončiť.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Jazyk inštalácie:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Inštalácia systému ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Typ inštalácie", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Nainštalovať systém ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Opraviť alebo aktualizovať nainštalovaný systém ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Nainštalovať systém ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Opraviť alebo aktualizovať nainštalovaný systém ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -54,7 +42,7 @@ BEGIN
     LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -99,7 +87,7 @@ BEGIN
     PUSHBUTTON "&Zrušiť", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -108,7 +96,7 @@ BEGIN
     LTEXT "Kliknutím na tlačidlo Ďalej spustíte inštalačný proces.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -133,8 +121,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Výber jazyka" //Voľba jazyka
-    IDS_LANGSUBTITLE "Voľba jazyka pre inštalátor a výsledný systém." //Choose lang., Vyberte, Zvoľte
     IDS_TYPETITLE "Víta Vás inštalátor systému ReactOS" //Welcome to ReactOS Setup
     IDS_TYPESUBTITLE "Choose setup type."
     IDS_DEVICETITLE "Setup the basic devices"
diff --git a/reactos/base/setup/reactos/lang/sq-AL.rc b/reactos/base/setup/reactos/lang/sq-AL.rc
index f94dbd4cdb4..9d8c2983ccd 100644
--- a/reactos/base/setup/reactos/lang/sq-AL.rc
+++ b/reactos/base/setup/reactos/lang/sq-AL.rc
@@ -12,31 +12,19 @@ BEGIN
     LTEXT "Kliko Finish për të dalë nga instalimi.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Gjuha e Instalimit:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Tastiera ose metoda hyrëse:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Klikoni vazhdim për të zgjedhur llojin e konfigurimit.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Instalimi i ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tipi i instalimit", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "InstalO ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Riparo ose apdejto ReactOS'in e instaluar", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "InstalO ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Riparo ose apdejto ReactOS'in e instaluar", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Kliko vazhdo për të konfiguruar pajisjet.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +39,7 @@ BEGIN
     LTEXT "Klikoni vazhdo për instalim të pajisjeve.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -96,7 +84,7 @@ BEGIN
     PUSHBUTTON "&Anulo", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -105,7 +93,7 @@ BEGIN
     LTEXT "Kliko vazhdo për të filluar instalimin.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -130,8 +118,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Përzgjedhja e Gjuhës"
-    IDS_LANGSUBTITLE "Zgjidhni gjuhën për instalimin dhe gjuhën e sistemit final."
     IDS_TYPETITLE "Mirë se vini në instalimin e ReactOS"
     IDS_TYPESUBTITLE "Zgjidhni llojin e instalimit."
     IDS_DEVICETITLE "Instaloni pajisjet themelore"
diff --git a/reactos/base/setup/reactos/lang/tr-TR.rc b/reactos/base/setup/reactos/lang/tr-TR.rc
index 8e72a6b30f6..b86dc8c5ecb 100644
--- a/reactos/base/setup/reactos/lang/tr-TR.rc
+++ b/reactos/base/setup/reactos/lang/tr-TR.rc
@@ -12,31 +12,19 @@ BEGIN
     LTEXT "Kur'dan çıkmak için İptal'e tıklayınız.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Kurulum Dili:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Düğme Takımı Giriş Yöntemi:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Kurulum türünü seçmek için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Kur"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Kurulum Türü", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "ReactOS'u Yükleme", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Kurulu ReactOS'u Onarma ya da Yükseltme", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "ReactOS'u Yükleme", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Kurulu ReactOS'u Onarma ya da Yükseltme", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Aygıtları kurmak için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
@@ -51,7 +39,7 @@ BEGIN
     LTEXT "Kurulum aygıtını kurmak için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
@@ -96,7 +84,7 @@ BEGIN
     PUSHBUTTON "İptal", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
@@ -105,7 +93,7 @@ BEGIN
     LTEXT "Kurulumu işlemini başlatmak için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
@@ -130,8 +118,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Dil Seçimi"
-    IDS_LANGSUBTITLE "Kurulum ve son dizge dilini seçiniz."
     IDS_TYPETITLE "ReactOS Kur'a Hoş Geldiniz"
     IDS_TYPESUBTITLE "Kurulum türünü seçiniz."
     IDS_DEVICETITLE "Ana Aygıtların Kurulumu"
diff --git a/reactos/base/setup/reactos/lang/uk-UA.rc b/reactos/base/setup/reactos/lang/uk-UA.rc
index c3017f45b0a..868c8d375d6 100644
--- a/reactos/base/setup/reactos/lang/uk-UA.rc
+++ b/reactos/base/setup/reactos/lang/uk-UA.rc
@@ -18,31 +18,19 @@ BEGIN
     LTEXT "Натисніть кнопку Завершити для виходу.", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "Мова системи:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "Розкладка клавіатури:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "Для вибору типу встановлення натисніть Далі.", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Встановлення ReactOS"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Тип встановлення", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "Встановлення ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "Відновити або змінити встановлений раніше ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "Встановлення ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "Відновити або змінити встановлений раніше ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -57,7 +45,7 @@ BEGIN
     LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -102,7 +90,7 @@ BEGIN
     PUSHBUTTON "&Скасувати", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -111,7 +99,7 @@ BEGIN
     LTEXT "Для початку встановлення натисніть Далі.", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
@@ -136,8 +124,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "Вибір мови"
-    IDS_LANGSUBTITLE "Виберіть мову за замовчуванням в системі."
     IDS_TYPETITLE "Вас вітає програма встановлення ReactOS"
     IDS_TYPESUBTITLE "Виберіть тип встановлення."
     IDS_DEVICETITLE "Встановлення базових пристроїв"
diff --git a/reactos/base/setup/reactos/lang/zh-CN.rc b/reactos/base/setup/reactos/lang/zh-CN.rc
index db74ff4d41e..81172d8a273 100644
--- a/reactos/base/setup/reactos/lang/zh-CN.rc
+++ b/reactos/base/setup/reactos/lang/zh-CN.rc
@@ -10,31 +10,19 @@ BEGIN
     LTEXT "点击完成退出安装。", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安装"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "安装语言:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "键盘或输入法:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "点击下一步选择安装类型。", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 安装"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    CONTROL "安装类型", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "安装 ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "修复或更新已安装的 ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "修复或更新已安装的 ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "点击下一步安装设备。", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安装"
 FONT 9, "MS Shell Dlg"
@@ -49,7 +37,7 @@ BEGIN
     LTEXT "点击下一步设置安装驱动器。", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安装"
 FONT 9, "MS Shell Dlg"
@@ -94,7 +82,7 @@ BEGIN
     PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安装"
 FONT 9, "MS Shell Dlg"
@@ -103,7 +91,7 @@ BEGIN
     LTEXT "点击下一步开始安装过程。", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安装"
 FONT 9, "MS Shell Dlg"
@@ -128,8 +116,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "语言选择"
-    IDS_LANGSUBTITLE "选择安装过程中和最终系统所使用的语言"
     IDS_TYPETITLE "ReactOS 安装"
     IDS_TYPESUBTITLE "选择安装类型。"
     IDS_DEVICETITLE "设置基本设备。"
diff --git a/reactos/base/setup/reactos/lang/zh-TW.rc b/reactos/base/setup/reactos/lang/zh-TW.rc
index 8c5a281c5ff..a1b2d0e548a 100644
--- a/reactos/base/setup/reactos/lang/zh-TW.rc
+++ b/reactos/base/setup/reactos/lang/zh-TW.rc
@@ -12,31 +12,19 @@ BEGIN
     LTEXT "點選完成退出安裝。", IDC_STATIC, 115, 169, 195, 17
 END
 
-IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
+IDD_TYPEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安裝"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    CONTROL "安裝語言:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11
-    CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142
-    CONTROL "鍵盤或輸入法:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11
-    CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81
-    LTEXT "點選下一步選擇安裝類型。", IDC_STATIC, 10, 180, 297, 10
-END
-
-IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS 安裝"
-FONT 9, "MS Shell Dlg"
-BEGIN
-    CONTROL "安裝類型", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    CONTROL "安裝 ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10
-    CONTROL "修復或更新已安裝的 ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 20, 30, 277, 10
+    AUTORADIOBUTTON "安裝 ReactOS", IDC_INSTALL, 7, 7, 277, 10
+    LTEXT "Install a new copy of ReactOS. This option does not keep your files, settions and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 19, 18, 269, 25
+    AUTORADIOBUTTON "修復或更新已安裝的 ReactOS", IDC_UPDATE, 7, 50, 277, 10
+    LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settions and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 19, 61, 269, 30
     LTEXT "點選下一步安裝裝置。", IDC_STATIC, 10, 180, 297, 10
 END
 
-IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安裝"
 FONT 9, "MS Shell Dlg"
@@ -51,7 +39,7 @@ BEGIN
     LTEXT "點選下一步設定安裝驅動器。", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
+IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安裝"
 FONT 9, "MS Shell Dlg"
@@ -96,7 +84,7 @@ BEGIN
     PUSHBUTTON "取消(&C)", IDCANCEL, 240, 94, 50, 15, WS_TABSTOP | WS_VISIBLE
 END
 
-IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
+IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安裝"
 FONT 9, "MS Shell Dlg"
@@ -105,7 +93,7 @@ BEGIN
     LTEXT "點選下一步開始安裝過程。", IDC_STATIC, 10, 180, 277, 20
 END
 
-IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
+IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安裝"
 FONT 9, "MS Shell Dlg"
@@ -130,8 +118,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LANGTITLE "語言選擇"
-    IDS_LANGSUBTITLE "選擇安裝過程中和最終系統所使用的語言"
     IDS_TYPETITLE "ReactOS 安裝"
     IDS_TYPESUBTITLE "選擇安裝類型。"
     IDS_DEVICETITLE "設定基本裝置。"
diff --git a/reactos/base/setup/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c
index 2f81fc4618a..c6d71c15609 100644
--- a/reactos/base/setup/reactos/reactos.c
+++ b/reactos/base/setup/reactos/reactos.c
@@ -25,85 +25,11 @@
  *              Dmitry Chapyshev (dmitry@reactos.org)
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <tchar.h>
-#include <setupapi.h>
-#include <devguid.h>
-#include <wine/unicode.h>
-
+#include "reactos.h"
 #include "resource.h"
 
 /* GLOBALS ******************************************************************/
 
-HFONT hTitleFont;
-
-typedef struct _LANG
-{
-    TCHAR LangId[9];
-    TCHAR LangName[128];
-} LANG, *PLANG;
-
-typedef struct _KBLAYOUT
-{
-    TCHAR LayoutId[9];
-    TCHAR LayoutName[128];
-    TCHAR DllName[128];
-} KBLAYOUT, *PKBLAYOUT;
-
-
-// generic entries with simple 1:1 mapping
-typedef struct _GENENTRY
-{
-    TCHAR Id[24];
-    TCHAR Value[128];
-} GENENTRY, *PGENENTRY;
-
-struct
-{
-    // Settings
-    LONG DestDiskNumber; // physical disk
-    LONG DestPartNumber; // partition on disk
-    LONG DestPartSize; // if partition doesn't exist, size of partition
-    LONG FSType; // file system type on partition 
-    LONG MBRInstallType; // install bootloader
-    LONG FormatPart; // type of format the partition
-    LONG SelectedLangId; // selected language (table index)
-    LONG SelectedKBLayout; // selected keyboard layout (table index)
-    TCHAR InstallDir[MAX_PATH]; // installation directory on hdd
-    LONG SelectedComputer; // selected computer type (table index)
-    LONG SelectedDisplay; // selected display type (table index)
-    LONG SelectedKeyboard; // selected keyboard type (table index)
-    BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos
-    // txtsetup.sif data
-    LONG DefaultLang; // default language (table index)
-    PLANG pLanguages;
-    LONG LangCount;
-    LONG DefaultKBLayout; // default keyboard layout (table index)
-    PKBLAYOUT pKbLayouts;
-    LONG KbLayoutCount;
-    PGENENTRY pComputers;
-    LONG CompCount;
-    PGENENTRY pDisplays;
-    LONG DispCount;
-    PGENENTRY pKeyboards;
-    LONG KeybCount;
-} SetupData;
-
-typedef struct _IMGINFO
-{
-    HBITMAP hBitmap;
-    INT cxSource;
-    INT cySource;
-} IMGINFO, *PIMGINFO;
-
-TCHAR abort_msg[512], abort_title[64];
-HINSTANCE hInstance;
-BOOL isUnattend;
 
 LONG LoadGenentry(HINF hinf,PCTSTR name,PGENENTRY *gen,PINFCONTEXT context);
 
@@ -157,35 +83,17 @@ CreateTitleFont(VOID)
     return hFont;
 }
 
-static VOID
-InitImageInfo(PIMGINFO ImgInfo)
-{
-    BITMAP bitmap;
-
-    ZeroMemory(ImgInfo, sizeof(*ImgInfo));
-
-    ImgInfo->hBitmap = LoadImage(hInstance,
-                                 MAKEINTRESOURCE(IDB_ROSLOGO),
-                                 IMAGE_BITMAP,
-                                 0,
-                                 0,
-                                 LR_DEFAULTCOLOR);
-
-    if (ImgInfo->hBitmap != NULL)
-    {
-        GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap);
-
-        ImgInfo->cxSource = bitmap.bmWidth;
-        ImgInfo->cySource = bitmap.bmHeight;
-    }
-}
-
 static INT_PTR CALLBACK
 StartDlgProc(HWND hwndDlg,
              UINT uMsg,
              WPARAM wParam,
              LPARAM lParam)
 {
+    PSETUPDATA pSetupData;
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
     switch (uMsg)
     {
         case WM_INITDIALOG:
@@ -193,6 +101,10 @@ StartDlgProc(HWND hwndDlg,
             HWND hwndControl;
             DWORD dwStyle;
 
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
             hwndControl = GetParent(hwndDlg);
 
             /* Center the wizard window */
@@ -213,7 +125,7 @@ StartDlgProc(HWND hwndDlg,
             SendDlgItemMessage(hwndDlg,
                                IDC_STARTTITLE,
                                WM_SETFONT,
-                               (WPARAM)hTitleFont,
+                               (WPARAM)pSetupData->hTitleFont,
                                (LPARAM)TRUE);
         }
         break;
@@ -223,168 +135,11 @@ StartDlgProc(HWND hwndDlg,
             LPNMHDR lpnm = (LPNMHDR)lParam;
 
             switch (lpnm->code)
-            {        
+            {
                 case PSN_SETACTIVE:
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
-                break;
-                default:
-                break;
-            }
-        }
-        break;
-
-        default:
-            break;
-
-    }
-
-    return FALSE;
-}
-
-static INT_PTR CALLBACK
-LangSelDlgProc(HWND hwndDlg,
-               UINT uMsg,
-               WPARAM wParam,
-               LPARAM lParam)
-{
-    PIMGINFO pImgInfo;
-    LONG i;
-    LRESULT tindex;
-    HWND hList;
-
-    pImgInfo = (PIMGINFO)GetWindowLongPtr(hwndDlg, DWLP_USER);
-
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-        {
-            HWND hwndControl;
-            DWORD dwStyle;
-
-            hwndControl = GetParent(hwndDlg);
-
-            dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
-            SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
-            
-            hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
-            ShowWindow (hwndControl, SW_SHOW);
-            EnableWindow (hwndControl, TRUE);
-
-            pImgInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMGINFO));
-            if (pImgInfo == NULL)
-            {
-                EndDialog(hwndDlg, 0);
-                return FALSE;
-            }
-
-            SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pImgInfo);
-
-            InitImageInfo(pImgInfo);
-
-            /* Set title font */
-            /*SendDlgItemMessage(hwndDlg,
-                                 IDC_STARTTITLE,
-                                 WM_SETFONT,
-                                 (WPARAM)hTitleFont,
-                                 (LPARAM)TRUE);*/
-
-            hList = GetDlgItem(hwndDlg, IDC_LANGUAGES);
-
-            for (i=0; i < SetupData.LangCount; i++)
-            {
-                tindex = SendMessage(hList, CB_ADDSTRING, (WPARAM) 0, (LPARAM) SetupData.pLanguages[i].LangName);
-                SendMessage(hList, CB_SETITEMDATA, tindex, i);
-                if (SetupData.DefaultLang == i)
-                SendMessage(hList, CB_SETCURSEL, (WPARAM) tindex,(LPARAM) 0);
-            }
-
-            hList = GetDlgItem(hwndDlg, IDC_KEYLAYOUT);
-
-            for (i=0; i < SetupData.KbLayoutCount; i++)
-            {
-                tindex = SendMessage(hList, CB_ADDSTRING, (WPARAM) 0, (LPARAM)SetupData.pKbLayouts[i].LayoutName);
-                SendMessage(hList, CB_SETITEMDATA, tindex, i);
-                if (SetupData.DefaultKBLayout == i)
-                SendMessage(hList,CB_SETCURSEL,(WPARAM)tindex,(LPARAM)0);
-            }
-        }
-        break;
-
-        case WM_DRAWITEM:
-        {
-            LPDRAWITEMSTRUCT lpDrawItem;
-            lpDrawItem = (LPDRAWITEMSTRUCT) lParam;
-
-            if (lpDrawItem->CtlID == IDB_ROSLOGO)
-            {
-                HDC hdcMem;
-                LONG left;
-
-                /* position image in centre of dialog */
-                left = (lpDrawItem->rcItem.right - pImgInfo->cxSource) / 2;
-
-                hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
-                if (hdcMem != NULL)
-                {
-                    SelectObject(hdcMem, pImgInfo->hBitmap);
-                    BitBlt(lpDrawItem->hDC,
-                           left,
-                           lpDrawItem->rcItem.top,
-                           lpDrawItem->rcItem.right - lpDrawItem->rcItem.left,
-                           lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top,
-                           hdcMem,
-                           0,
-                           0,
-                           SRCCOPY);
-                    DeleteDC(hdcMem);
-                }
-            }
-            return TRUE;
-        }
-
-        case WM_NOTIFY:
-        {
-            LPNMHDR lpnm = (LPNMHDR)lParam;
-
-            switch (lpnm->code)
-            {        
-                case PSN_SETACTIVE:
-                    PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
                     break;
 
-                case PSN_QUERYCANCEL:
-                    SetWindowLongPtr(hwndDlg,
-                                     DWL_MSGRESULT,
-                                     MessageBox(GetParent(hwndDlg),
-                                             abort_msg,
-                                             abort_title,
-                                             MB_YESNO | MB_ICONQUESTION) != IDYES);
-                    return TRUE;
-
-                case PSN_WIZNEXT: // set the selected data
-                {
-                    hList =GetDlgItem(hwndDlg, IDC_LANGUAGES); 
-                    tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0);
-
-                    if (tindex != CB_ERR)
-                    {
-                        WORD LangID;
-                        SetupData.SelectedLangId = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0);
-                        LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16);
-                        SetThreadLocale(MAKELCID(LangID, SORT_DEFAULT));
-                        // FIXME: need to reload all resource to force
-                        // the new language setting
-                    }
-
-                    hList = GetDlgItem(hwndDlg, IDC_KEYLAYOUT); 
-                    tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0);
-                    if (tindex != CB_ERR)
-                    {
-                        SetupData.SelectedKBLayout = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0);
-                    }
-                    return TRUE;
-                }
-
                 default:
                     break;
             }
@@ -395,6 +150,7 @@ LangSelDlgProc(HWND hwndDlg,
             break;
 
     }
+
     return FALSE;
 }
 
@@ -404,6 +160,11 @@ TypeDlgProc(HWND hwndDlg,
             WPARAM wParam,
             LPARAM lParam)
 {
+    PSETUPDATA pSetupData;
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
     switch (uMsg)
     {
         case WM_INITDIALOG:
@@ -411,19 +172,19 @@ TypeDlgProc(HWND hwndDlg,
             HWND hwndControl;
             DWORD dwStyle;
 
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
             hwndControl = GetParent(hwndDlg);
 
             dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
             SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
-        
+
             CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED);
-            
-            /* Set title font */
-            /*SendDlgItemMessage(hwndDlg,
-                                 IDC_STARTTITLE,
-                                 WM_SETFONT,
-                                 (WPARAM)hTitleFont,
-                                 (LPARAM)TRUE);*/
+
+            EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), FALSE);
+            EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATETEXT), FALSE);
         }
         break;
 
@@ -432,7 +193,7 @@ TypeDlgProc(HWND hwndDlg,
             LPNMHDR lpnm = (LPNMHDR)lParam;
 
             switch (lpnm->code)
-            {        
+            {
                 case PSN_SETACTIVE:
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
                 break;
@@ -441,16 +202,16 @@ TypeDlgProc(HWND hwndDlg,
                     SetWindowLongPtr(hwndDlg,
                                      DWL_MSGRESULT,
                                      MessageBox(GetParent(hwndDlg),
-                                             abort_msg,
-                                             abort_title,
-                                             MB_YESNO | MB_ICONQUESTION) != IDYES);
+                                                pSetupData->szAbortMessage,
+                                                pSetupData->szAbortTitle,
+                                                MB_YESNO | MB_ICONQUESTION) != IDYES);
                     return TRUE;
 
                 case PSN_WIZNEXT: // set the selected data
-                    SetupData.RepairUpdateFlag = !(SendMessage(GetDlgItem(hwndDlg, IDC_INSTALL),
-                                                               BM_GETCHECK,
-                                                               (WPARAM) 0,
-                                                               (LPARAM) 0) == BST_CHECKED);
+                    pSetupData->RepairUpdateFlag = !(SendMessage(GetDlgItem(hwndDlg, IDC_INSTALL),
+                                                                 BM_GETCHECK,
+                                                                 (WPARAM) 0,
+                                                                 (LPARAM) 0) == BST_CHECKED);
                     return TRUE;
 
                 default:
@@ -472,10 +233,14 @@ DeviceDlgProc(HWND hwndDlg,
               WPARAM wParam,
               LPARAM lParam)
 {
+    PSETUPDATA pSetupData;
     LONG i;
     LRESULT tindex;
     HWND hList;
 
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
     switch (uMsg)
     {
         case WM_INITDIALOG:
@@ -483,11 +248,15 @@ DeviceDlgProc(HWND hwndDlg,
             HWND hwndControl;
             DWORD dwStyle;
 
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
             hwndControl = GetParent(hwndDlg);
 
             dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
             SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
-        
+
             /* Set title font */
             /*SendDlgItemMessage(hwndDlg,
                                  IDC_STARTTITLE,
@@ -497,27 +266,27 @@ DeviceDlgProc(HWND hwndDlg,
 
             hList = GetDlgItem(hwndDlg, IDC_COMPUTER);
 
-            for (i=0; i < SetupData.CompCount; i++)
+            for (i=0; i < pSetupData->CompCount; i++)
             {
-                tindex = SendMessage(hList, CB_ADDSTRING, (WPARAM) 0, (LPARAM) SetupData.pComputers[i].Value);
+                tindex = SendMessage(hList, CB_ADDSTRING, (WPARAM) 0, (LPARAM) pSetupData->pComputers[i].Value);
                 SendMessage(hList, CB_SETITEMDATA, tindex, i);
             }
             SendMessage(hList, CB_SETCURSEL, 0, 0); // set first as default
 
             hList = GetDlgItem(hwndDlg, IDC_DISPLAY);
 
-            for (i=0; i < SetupData.DispCount; i++)
+            for (i=0; i < pSetupData->DispCount; i++)
             {
-                tindex = SendMessage(hList, CB_ADDSTRING, (WPARAM) 0, (LPARAM) SetupData.pDisplays[i].Value);
+                tindex = SendMessage(hList, CB_ADDSTRING, (WPARAM) 0, (LPARAM) pSetupData->pDisplays[i].Value);
                 SendMessage(hList, CB_SETITEMDATA, tindex, i);
             }
             SendMessage(hList, CB_SETCURSEL, 0, 0); // set first as default
 
             hList = GetDlgItem(hwndDlg, IDC_KEYBOARD);
 
-            for (i=0; i < SetupData.KeybCount; i++)
+            for (i=0; i < pSetupData->KeybCount; i++)
             {
-                tindex = SendMessage(hList,CB_ADDSTRING,(WPARAM)0,(LPARAM)SetupData.pKeyboards[i].Value);
+                tindex = SendMessage(hList,CB_ADDSTRING,(WPARAM)0,(LPARAM)pSetupData->pKeyboards[i].Value);
                 SendMessage(hList,CB_SETITEMDATA,tindex,i);
             }
             SendMessage(hList,CB_SETCURSEL,0,0); // set first as default
@@ -529,7 +298,7 @@ DeviceDlgProc(HWND hwndDlg,
             LPNMHDR lpnm = (LPNMHDR)lParam;
 
             switch (lpnm->code)
-            {        
+            {
                 case PSN_SETACTIVE:
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
                     break;
@@ -538,8 +307,8 @@ DeviceDlgProc(HWND hwndDlg,
                     SetWindowLongPtr(hwndDlg,
                                      DWL_MSGRESULT,
                                      MessageBox(GetParent(hwndDlg),
-                                             abort_msg,
-                                             abort_title,
+                                                pSetupData->szAbortMessage,
+                                                pSetupData->szAbortTitle,
                                              MB_YESNO | MB_ICONQUESTION) != IDYES);
                     return TRUE;
 
@@ -550,7 +319,7 @@ DeviceDlgProc(HWND hwndDlg,
                     tindex = SendMessage(hList, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
                     if (tindex != CB_ERR)
                     {
-                        SetupData.SelectedComputer = SendMessage(hList,
+                        pSetupData->SelectedComputer = SendMessage(hList,
                                                                  CB_GETITEMDATA,
                                                                  (WPARAM) tindex,
                                                                  (LPARAM) 0);
@@ -561,7 +330,7 @@ DeviceDlgProc(HWND hwndDlg,
                     tindex = SendMessage(hList, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
                     if (tindex != CB_ERR)
                     {
-                        SetupData.SelectedDisplay = SendMessage(hList,
+                        pSetupData->SelectedDisplay = SendMessage(hList,
                                                                 CB_GETITEMDATA,
                                                                 (WPARAM) tindex,
                                                                 (LPARAM) 0);
@@ -572,7 +341,7 @@ DeviceDlgProc(HWND hwndDlg,
                     tindex = SendMessage(hList, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0);
                     if (tindex != CB_ERR)
                     {
-                        SetupData.SelectedKeyboard = SendMessage(hList,
+                        pSetupData->SelectedKeyboard = SendMessage(hList,
                                                                  CB_GETITEMDATA,
                                                                  (WPARAM) tindex,
                                                                  (LPARAM) 0);
@@ -593,208 +362,17 @@ DeviceDlgProc(HWND hwndDlg,
     return FALSE;
 }
 
-static INT_PTR CALLBACK
-MoreOptDlgProc(HWND hwndDlg,
-               UINT uMsg,
-               WPARAM wParam,
-               LPARAM lParam)
-{
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-        {
-            CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED);
-            SendMessage(GetDlgItem(hwndDlg, IDC_PATH),
-                        WM_SETTEXT,
-                        (WPARAM) 0,
-                        (LPARAM) SetupData.InstallDir);
-        }
-        break;
-
-        case WM_COMMAND:
-        {
-            switch(LOWORD(wParam))
-            {
-                case IDOK:
-                {
-                    SendMessage(GetDlgItem(hwndDlg, IDC_PATH),
-                                WM_GETTEXT,
-                                (WPARAM) sizeof(SetupData.InstallDir) / sizeof(TCHAR),
-                                (LPARAM) SetupData.InstallDir);
-                    
-                    EndDialog(hwndDlg, IDOK);
-                    return TRUE;
-                }
-
-                case IDCANCEL:
-                {
-                    EndDialog(hwndDlg, IDCANCEL);
-                    return TRUE;
-                }
-            }
-        }
-    }
-
-    return FALSE;
-}
-
-static INT_PTR CALLBACK
-PartitionDlgProc(HWND hwndDlg,
-                 UINT uMsg,
-                 WPARAM wParam,
-                 LPARAM lParam)
-{
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-            break;
-        case WM_COMMAND:
-        {
-            switch(LOWORD(wParam))
-            {
-                case IDOK:
-                    EndDialog(hwndDlg, IDOK);
-                    return TRUE;
-                case IDCANCEL:
-                    EndDialog(hwndDlg, IDCANCEL);
-                    return TRUE;
-            }
-        }
-    }
-    return FALSE;
-}
-
-static INT_PTR CALLBACK
-DriveDlgProc(HWND hwndDlg,
-             UINT uMsg,
-             WPARAM wParam,
-             LPARAM lParam)
-{
-#if 1
-    HDEVINFO h;
-    HWND hList;
-    SP_DEVINFO_DATA DevInfoData;
-    DWORD i;
-#endif
-    switch (uMsg)
-    {
-        case WM_INITDIALOG:
-        {
-            HWND hwndControl;
-            DWORD dwStyle;
-
-            hwndControl = GetParent(hwndDlg);
-
-            dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
-            SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
-        
-            /* Set title font */
-            /*SendDlgItemMessage(hwndDlg,
-                                 IDC_STARTTITLE,
-                                 WM_SETFONT,
-                                 (WPARAM)hTitleFont,
-                                 (LPARAM)TRUE);*/
-#if 1
-            h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT);
-            if (h != INVALID_HANDLE_VALUE)
-            {
-                hList =GetDlgItem(hwndDlg, IDC_PARTITION); 
-                DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
-                for (i=0; SetupDiEnumDeviceInfo(h, i, &DevInfoData); i++)
-                {
-                    DWORD DataT;
-                    LPTSTR buffer = NULL;
-                    DWORD buffersize = 0;
-
-                    while (!SetupDiGetDeviceRegistryProperty(h,
-                                                             &DevInfoData,
-                                                             SPDRP_DEVICEDESC,
-                                                             &DataT,
-                                                             (PBYTE)buffer,
-                                                             buffersize,
-                                                             &buffersize))
-                    {
-                        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-                        {
-                            if (buffer) LocalFree(buffer);
-                            buffer = LocalAlloc(LPTR, buffersize * 2);
-                        }
-                        else
-                            break;
-                    }
-                    if (buffer)
-                    {
-                        SendMessage(hList, LB_ADDSTRING, (WPARAM) 0, (LPARAM) buffer);
-                        LocalFree(buffer);
-                    }
-                }
-                SetupDiDestroyDeviceInfoList(h);
-            }
-#endif
-        }
-        break;
-
-        case WM_COMMAND:
-        {
-            switch(LOWORD(wParam))
-            {
-                case IDC_PARTMOREOPTS:
-                    DialogBox(hInstance,
-                              MAKEINTRESOURCE(IDD_BOOTOPTIONS),
-                              hwndDlg,
-                              (DLGPROC) MoreOptDlgProc);
-                    break;
-                case IDC_PARTCREATE:
-                    DialogBox(hInstance,
-                              MAKEINTRESOURCE(IDD_PARTITION),
-                              hwndDlg,
-                              (DLGPROC) PartitionDlgProc);
-                    break;
-                case IDC_PARTDELETE:
-                    break;
-            }
-            break;
-        }
-
-        case WM_NOTIFY:
-        {
-            LPNMHDR lpnm = (LPNMHDR)lParam;
-
-            switch (lpnm->code)
-            {        
-                case PSN_SETACTIVE:
-                    PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
-                    break;
-
-                case PSN_QUERYCANCEL:
-                    SetWindowLongPtr(hwndDlg,
-                                     DWL_MSGRESULT,
-                                     MessageBox(GetParent(hwndDlg),
-                                             abort_msg,
-                                             abort_title,
-                                             MB_YESNO | MB_ICONQUESTION) != IDYES);
-                    return TRUE;
-
-                default:
-                    break;
-            }
-        }
-        break;
-
-        default:
-            break;
-
-    }
-
-    return FALSE;
-}
-
 static INT_PTR CALLBACK
 SummaryDlgProc(HWND hwndDlg,
                UINT uMsg,
                WPARAM wParam,
                LPARAM lParam)
 {
+    PSETUPDATA pSetupData;
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
     switch (uMsg)
     {
         case WM_INITDIALOG:
@@ -802,6 +380,10 @@ SummaryDlgProc(HWND hwndDlg,
             HWND hwndControl;
             DWORD dwStyle;
 
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
             hwndControl = GetParent(hwndDlg);
 
             dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
@@ -821,7 +403,7 @@ SummaryDlgProc(HWND hwndDlg,
             LPNMHDR lpnm = (LPNMHDR)lParam;
 
             switch (lpnm->code)
-            {        
+            {
                 case PSN_SETACTIVE: 
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
                     break;
@@ -830,9 +412,9 @@ SummaryDlgProc(HWND hwndDlg,
                     SetWindowLongPtr(hwndDlg,
                                      DWL_MSGRESULT,
                                      MessageBox(GetParent(hwndDlg),
-                                             abort_msg,
-                                             abort_title,
-                                             MB_YESNO | MB_ICONQUESTION) != IDYES);
+                                                pSetupData->szAbortMessage,
+                                                pSetupData->szAbortTitle,
+                                                MB_YESNO | MB_ICONQUESTION) != IDYES);
                     return TRUE;
                 default:
                     break;
@@ -853,6 +435,11 @@ ProcessDlgProc(HWND hwndDlg,
                WPARAM wParam,
                LPARAM lParam)
 {
+    PSETUPDATA pSetupData;
+
+    /* Retrieve pointer to the global setup data */
+    pSetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
     switch (uMsg)
     {
         case WM_INITDIALOG:
@@ -860,6 +447,10 @@ ProcessDlgProc(HWND hwndDlg,
             HWND hwndControl;
             DWORD dwStyle;
 
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
+
             hwndControl = GetParent(hwndDlg);
 
             dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
@@ -879,8 +470,8 @@ ProcessDlgProc(HWND hwndDlg,
             LPNMHDR lpnm = (LPNMHDR)lParam;
 
             switch (lpnm->code)
-            {        
-                case PSN_SETACTIVE: 
+            {
+                case PSN_SETACTIVE:
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
                    // disable all buttons during installation process
                    // PropSheet_SetWizButtons(GetParent(hwndDlg), 0 );
@@ -889,9 +480,9 @@ ProcessDlgProc(HWND hwndDlg,
                     SetWindowLongPtr(hwndDlg,
                                      DWL_MSGRESULT,
                                      MessageBox(GetParent(hwndDlg),
-                                             abort_msg,
-                                             abort_title,
-                                             MB_YESNO | MB_ICONQUESTION) != IDYES);
+                                                pSetupData->szAbortMessage,
+                                                pSetupData->szAbortTitle,
+                                                MB_YESNO | MB_ICONQUESTION) != IDYES);
                     return TRUE;
                 default:
                    break;
@@ -965,7 +556,7 @@ RestartDlgProc(HWND hwndDlg,
             LPNMHDR lpnm = (LPNMHDR)lParam;
 
             switch (lpnm->code)
-            {        
+            {
                 case PSN_SETACTIVE: // Only "Finish" for closing the App
                 {
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH);
@@ -989,7 +580,8 @@ RestartDlgProc(HWND hwndDlg,
     return FALSE;
 }
 
-BOOL LoadSetupData(void)
+BOOL LoadSetupData(
+    PSETUPDATA pSetupData)
 {
     WCHAR szPath[MAX_PATH];
     TCHAR tmp[10];
@@ -1012,19 +604,19 @@ BOOL LoadSetupData(void)
         TCHAR message[512], caption[64];
 
         // txtsetup.sif cannot be found
-        LoadString(hInstance, IDS_NO_TXTSETUP_SIF, message, sizeof(message)/sizeof(TCHAR));
-        LoadString(hInstance, IDS_CAPTION, caption, sizeof(caption)/sizeof(TCHAR));
+        LoadString(pSetupData->hInstance, IDS_NO_TXTSETUP_SIF, message, sizeof(message)/sizeof(TCHAR));
+        LoadString(pSetupData->hInstance, IDS_CAPTION, caption, sizeof(caption)/sizeof(TCHAR));
 
         MessageBox(NULL, message, caption, MB_OK | MB_ICONERROR);
         return FALSE;
     }
 
     // get language list
-    SetupData.LangCount = SetupGetLineCount(hTxtsetupSif, _T("Language"));
-    if (SetupData.LangCount > 0)
+    pSetupData->LangCount = SetupGetLineCount(hTxtsetupSif, _T("Language"));
+    if (pSetupData->LangCount > 0)
     {
-        SetupData.pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * SetupData.LangCount);
-        if (SetupData.pLanguages != NULL)
+        pSetupData->pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * pSetupData->LangCount);
+        if (pSetupData->pLanguages != NULL)
         {
             Count = 0;
             if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), NULL, &InfContext))
@@ -1033,28 +625,28 @@ BOOL LoadSetupData(void)
                 {
                     SetupGetStringField(&InfContext,
                                         0,
-                                        SetupData.pLanguages[Count].LangId,
-                                        sizeof(SetupData.pLanguages[Count].LangId) / sizeof(TCHAR),
+                                        pSetupData->pLanguages[Count].LangId,
+                                        sizeof(pSetupData->pLanguages[Count].LangId) / sizeof(TCHAR),
                                         &LineLength);
 
                     SetupGetStringField(&InfContext,
                                         1,
-                                        SetupData.pLanguages[Count].LangName,
-                                        sizeof(SetupData.pLanguages[Count].LangName) / sizeof(TCHAR),
+                                        pSetupData->pLanguages[Count].LangName,
+                                        sizeof(pSetupData->pLanguages[Count].LangName) / sizeof(TCHAR),
                                         &LineLength);
                     ++Count;
                 }
-                while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount);
+                while (SetupFindNextLine(&InfContext, &InfContext) && Count < pSetupData->LangCount);
             }
         }
     }
 
     // get keyboard layout list
-    SetupData.KbLayoutCount = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout"));
-    if (SetupData.KbLayoutCount > 0)
+    pSetupData->KbLayoutCount = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout"));
+    if (pSetupData->KbLayoutCount > 0)
     {
-        SetupData.pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * SetupData.KbLayoutCount);
-        if (SetupData.pKbLayouts != NULL)
+        pSetupData->pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * pSetupData->KbLayoutCount);
+        if (pSetupData->pKbLayouts != NULL)
         {
             Count = 0;
             if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), NULL, &InfContext))
@@ -1063,34 +655,34 @@ BOOL LoadSetupData(void)
                 {
                     SetupGetStringField(&InfContext,
                                         0,
-                                        SetupData.pKbLayouts[Count].LayoutId,
-                                        sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(TCHAR),
+                                        pSetupData->pKbLayouts[Count].LayoutId,
+                                        sizeof(pSetupData->pKbLayouts[Count].LayoutId) / sizeof(TCHAR),
                                         &LineLength);
 
                     SetupGetStringField(&InfContext,
                                         1,
-                                        SetupData.pKbLayouts[Count].LayoutName,
-                                        sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(TCHAR),
+                                        pSetupData->pKbLayouts[Count].LayoutName,
+                                        sizeof(pSetupData->pKbLayouts[Count].LayoutName) / sizeof(TCHAR),
                                         &LineLength);
                     ++Count;
                 }
-                while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.KbLayoutCount);
+                while (SetupFindNextLine(&InfContext, &InfContext) && Count < pSetupData->KbLayoutCount);
             }
         }
     }
 
     // get default for keyboard and language
-    SetupData.DefaultKBLayout = -1;
-    SetupData.DefaultLang = -1;
+    pSetupData->DefaultKBLayout = -1;
+    pSetupData->DefaultLang = -1;
 
     // TODO: get defaults from underlaying running system
     if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLayout"), &InfContext))
     {
         SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength);
-        for (Count = 0; Count < SetupData.KbLayoutCount; Count++)
-            if (_tcscmp(tmp, SetupData.pKbLayouts[Count].LayoutId) == 0)
+        for (Count = 0; Count < pSetupData->KbLayoutCount; Count++)
+            if (_tcscmp(tmp, pSetupData->pKbLayouts[Count].LayoutId) == 0)
             {
-                SetupData.DefaultKBLayout = Count;
+                pSetupData->DefaultKBLayout = Count;
                 break;
             }
     }
@@ -1098,30 +690,30 @@ BOOL LoadSetupData(void)
     if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLanguage"), &InfContext))
     {
         SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength);
-        for (Count = 0; Count < SetupData.LangCount; Count++)
-            if (_tcscmp(tmp, SetupData.pLanguages[Count].LangId) == 0)
+        for (Count = 0; Count < pSetupData->LangCount; Count++)
+            if (_tcscmp(tmp, pSetupData->pLanguages[Count].LangId) == 0)
             {
-                SetupData.DefaultLang = Count;
+                pSetupData->DefaultLang = Count;
                 break;
             }
     }
 
     // get computers list
-    SetupData.CompCount = LoadGenentry(hTxtsetupSif,_T("Computer"),&SetupData.pComputers,&InfContext);
+    pSetupData->CompCount = LoadGenentry(hTxtsetupSif,_T("Computer"),&pSetupData->pComputers,&InfContext);
 
     // get display list
-    SetupData.DispCount = LoadGenentry(hTxtsetupSif,_T("Display"),&SetupData.pDisplays,&InfContext);
+    pSetupData->DispCount = LoadGenentry(hTxtsetupSif,_T("Display"),&pSetupData->pDisplays,&InfContext);
 
     // get keyboard list
-    SetupData.KeybCount = LoadGenentry(hTxtsetupSif, _T("Keyboard"),&SetupData.pKeyboards,&InfContext);
+    pSetupData->KeybCount = LoadGenentry(hTxtsetupSif, _T("Keyboard"),&pSetupData->pKeyboards,&InfContext);
 
     // get install directory
     if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), _T("DefaultPath"), &InfContext))
     {
         SetupGetStringField(&InfContext,
                             1,
-                            SetupData.InstallDir,
-                            sizeof(SetupData.InstallDir) / sizeof(TCHAR),
+                            pSetupData->InstallDir,
+                            sizeof(pSetupData->InstallDir) / sizeof(TCHAR),
                             &LineLength);
     }
     SetupCloseInfFile(hTxtsetupSif);
@@ -1211,47 +803,48 @@ _tWinMain(HINSTANCE hInst,
           LPTSTR lpszCmdLine,
           int nCmdShow)
 {
+    PSETUPDATA pSetupData = NULL;
     PROPSHEETHEADER psh;
     HPROPSHEETPAGE ahpsp[8];
     PROPSHEETPAGE psp = {0};
     UINT nPages = 0;
-    hInstance = hInst;
-    isUnattend = isUnattendSetup();
 
-    LoadString(hInst,IDS_ABORTSETUP, abort_msg, sizeof(abort_msg)/sizeof(TCHAR));
-    LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR));
-    if (!isUnattend)
+    pSetupData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SETUPDATA));
+    if (pSetupData == NULL)
     {
-        if (!LoadSetupData())
+        return 1;
+    }
+
+    pSetupData->hInstance = hInst;
+    pSetupData->bUnattend = isUnattendSetup();
+
+    LoadString(hInst,IDS_ABORTSETUP, pSetupData->szAbortMessage, sizeof(pSetupData->szAbortMessage)/sizeof(TCHAR));
+    LoadString(hInst,IDS_ABORTSETUP2, pSetupData->szAbortTitle, sizeof(pSetupData->szAbortTitle)/sizeof(TCHAR));
+
+    /* Create title font */
+    pSetupData->hTitleFont = CreateTitleFont();
+
+    if (!pSetupData->bUnattend)
+    {
+        if (!LoadSetupData(pSetupData))
             return 0;
 
         /* Create the Start page, until setup is working */
         psp.dwSize = sizeof(PROPSHEETPAGE);
         psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
         psp.hInstance = hInst;
-        psp.lParam = 0;
+        psp.lParam = (LPARAM)pSetupData;
         psp.pfnDlgProc = StartDlgProc;
         psp.pszTemplate = MAKEINTRESOURCE(IDD_STARTPAGE);
         ahpsp[nPages++] = CreatePropertySheetPage(&psp);
 
-        /* Create language selection page */
-        psp.dwSize = sizeof(PROPSHEETPAGE);
-        psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-        psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_LANGTITLE);
-        psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_LANGSUBTITLE);
-        psp.hInstance = hInst;
-        psp.lParam = 0;
-        psp.pfnDlgProc = LangSelDlgProc;
-        psp.pszTemplate = MAKEINTRESOURCE(IDD_LANGSELPAGE);
-        ahpsp[nPages++] = CreatePropertySheetPage(&psp);
-
         /* Create install type selection page */
         psp.dwSize = sizeof(PROPSHEETPAGE);
         psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
         psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_TYPETITLE);
         psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_TYPESUBTITLE);
         psp.hInstance = hInst;
-        psp.lParam = 0;
+        psp.lParam = (LPARAM)pSetupData;
         psp.pfnDlgProc = TypeDlgProc;
         psp.pszTemplate = MAKEINTRESOURCE(IDD_TYPEPAGE);
         ahpsp[nPages++] = CreatePropertySheetPage(&psp);
@@ -1262,7 +855,7 @@ _tWinMain(HINSTANCE hInst,
         psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DEVICETITLE);
         psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DEVICESUBTITLE);
         psp.hInstance = hInst;
-        psp.lParam = 0;
+        psp.lParam = (LPARAM)pSetupData;
         psp.pfnDlgProc = DeviceDlgProc;
         psp.pszTemplate = MAKEINTRESOURCE(IDD_DEVICEPAGE);
         ahpsp[nPages++] = CreatePropertySheetPage(&psp);
@@ -1273,7 +866,7 @@ _tWinMain(HINSTANCE hInst,
         psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DRIVETITLE);
         psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DRIVESUBTITLE);
         psp.hInstance = hInst;
-        psp.lParam = 0;
+        psp.lParam = (LPARAM)pSetupData;
         psp.pfnDlgProc = DriveDlgProc;
         psp.pszTemplate = MAKEINTRESOURCE(IDD_DRIVEPAGE);
         ahpsp[nPages++] = CreatePropertySheetPage(&psp);
@@ -1284,7 +877,7 @@ _tWinMain(HINSTANCE hInst,
         psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_SUMMARYTITLE);
         psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_SUMMARYSUBTITLE);
         psp.hInstance = hInst;
-        psp.lParam = 0;
+        psp.lParam = (LPARAM)pSetupData;
         psp.pfnDlgProc = SummaryDlgProc;
         psp.pszTemplate = MAKEINTRESOURCE(IDD_SUMMARYPAGE);
         ahpsp[nPages++] = CreatePropertySheetPage(&psp);
@@ -1296,18 +889,16 @@ _tWinMain(HINSTANCE hInst,
     psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_PROCESSTITLE);
     psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_PROCESSSUBTITLE);
     psp.hInstance = hInst;
-    psp.lParam = 0;
+    psp.lParam = (LPARAM)pSetupData;
     psp.pfnDlgProc = ProcessDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_PROCESSPAGE);
     ahpsp[nPages++] = CreatePropertySheetPage(&psp);
 
     /* Create finish to reboot page */
     psp.dwSize = sizeof(PROPSHEETPAGE);
-    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_RESTARTTITLE);
-    psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_RESTARTSUBTITLE);
+    psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
     psp.hInstance = hInst;
-    psp.lParam = 0;
+    psp.lParam = (LPARAM)pSetupData;
     psp.pfnDlgProc = RestartDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_RESTARTPAGE);
     ahpsp[nPages++] = CreatePropertySheetPage(&psp);
@@ -1323,13 +914,14 @@ _tWinMain(HINSTANCE hInst,
     psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
     psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER);
 
-    /* Create title font */
-    hTitleFont = CreateTitleFont();
-
     /* Display the wizard */
     PropertySheet(&psh);
 
-    DeleteObject(hTitleFont);
+    if (pSetupData->hTitleFont)
+        DeleteObject(pSetupData->hTitleFont);
+
+    if (pSetupData != NULL)
+        HeapFree(GetProcessHeap(), 0, pSetupData);
 
     return 0;
 }
diff --git a/reactos/base/setup/reactos/reactos.h b/reactos/base/setup/reactos/reactos.h
new file mode 100644
index 00000000000..bb507032c0b
--- /dev/null
+++ b/reactos/base/setup/reactos/reactos.h
@@ -0,0 +1,124 @@
+/*
+ *  ReactOS applications
+ *  Copyright (C) 2004-2008 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS GUI first stage setup application
+ * FILE:        base/setup/reactos/reactos.c
+ * PROGRAMMERS: Eric Kohl
+ *              Matthias Kupfer
+ *              Dmitry Chapyshev (dmitry@reactos.org)
+ */
+
+#ifndef _REACTOS_PCH_
+#define _REACTOS_PCH_
+
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <tchar.h>
+#include <setupapi.h>
+#include <devguid.h>
+#include <wine/unicode.h>
+
+
+typedef struct _LANG
+{
+    TCHAR LangId[9];
+    TCHAR LangName[128];
+} LANG, *PLANG;
+
+typedef struct _KBLAYOUT
+{
+    TCHAR LayoutId[9];
+    TCHAR LayoutName[128];
+    TCHAR DllName[128];
+} KBLAYOUT, *PKBLAYOUT;
+
+
+// generic entries with simple 1:1 mapping
+typedef struct _GENENTRY
+{
+    TCHAR Id[24];
+    TCHAR Value[128];
+} GENENTRY, *PGENENTRY;
+
+typedef struct _SETUPDATA
+{
+    /* General */
+    HINSTANCE hInstance;
+    BOOL bUnattend;
+
+    HFONT hTitleFont;
+
+    TCHAR szAbortMessage[512];
+    TCHAR szAbortTitle[64];
+
+    // Settings
+    LONG DestDiskNumber; // physical disk
+    LONG DestPartNumber; // partition on disk
+    LONG DestPartSize; // if partition doesn't exist, size of partition
+    LONG FSType; // file system type on partition 
+    LONG MBRInstallType; // install bootloader
+    LONG FormatPart; // type of format the partition
+    LONG SelectedLangId; // selected language (table index)
+    LONG SelectedKBLayout; // selected keyboard layout (table index)
+    TCHAR InstallDir[MAX_PATH]; // installation directory on hdd
+    LONG SelectedComputer; // selected computer type (table index)
+    LONG SelectedDisplay; // selected display type (table index)
+    LONG SelectedKeyboard; // selected keyboard type (table index)
+    BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos
+    // txtsetup.sif data
+    LONG DefaultLang; // default language (table index)
+    PLANG pLanguages;
+    LONG LangCount;
+    LONG DefaultKBLayout; // default keyboard layout (table index)
+    PKBLAYOUT pKbLayouts;
+    LONG KbLayoutCount;
+    PGENENTRY pComputers;
+    LONG CompCount;
+    PGENENTRY pDisplays;
+    LONG DispCount;
+    PGENENTRY pKeyboards;
+    LONG KeybCount;
+} SETUPDATA, *PSETUPDATA;
+
+typedef struct _IMGINFO
+{
+    HBITMAP hBitmap;
+    INT cxSource;
+    INT cySource;
+} IMGINFO, *PIMGINFO;
+
+
+
+/* drivepage.c */
+INT_PTR
+CALLBACK
+DriveDlgProc(
+    HWND hwndDlg,
+    UINT uMsg,
+    WPARAM wParam,
+    LPARAM lParam);
+
+#endif /* _REACTOS_PCH_ */
+
+/* EOP */
diff --git a/reactos/base/setup/reactos/reactos.rc b/reactos/base/setup/reactos/reactos.rc
index c65c60c604b..3ca6e6daaa4 100644
--- a/reactos/base/setup/reactos/reactos.rc
+++ b/reactos/base/setup/reactos/reactos.rc
@@ -17,7 +17,6 @@ IDI_MAIN ICON "res/setup.ico"
 /* Bitmaps */
 IDB_WATERMARK BITMAP "res/watermark.bmp"
 IDB_HEADER BITMAP "res/header.bmp"
-IDB_ROSLOGO BITMAP "res/rosbitmap.bmp"
 
 #include <reactos/manifest_exe.rc>
 
diff --git a/reactos/base/setup/reactos/res/rosbitmap.bmp b/reactos/base/setup/reactos/res/rosbitmap.bmp
deleted file mode 100644
index 8a94a6ec9df..00000000000
Binary files a/reactos/base/setup/reactos/res/rosbitmap.bmp and /dev/null differ
diff --git a/reactos/base/setup/reactos/resource.h b/reactos/base/setup/reactos/resource.h
index 3d3114e193e..250c0e37cce 100644
--- a/reactos/base/setup/reactos/resource.h
+++ b/reactos/base/setup/reactos/resource.h
@@ -1,32 +1,32 @@
 #pragma once
 
+/* Bitmaps */
 #define IDB_WATERMARK 100
 #define IDB_HEADER    101
-#define IDB_ROSLOGO   102
+
+/* Icons */
+#define IDI_MAIN 3000
+
 
 #define IDC_STATIC -1
 
+/* Dialogs */
 #define IDD_STARTPAGE        2000
 #define IDC_STARTTITLE       2001
-#define IDD_LANGSELPAGE      2002
-#define IDS_LANGTITLE        2003
-#define IDS_LANGSUBTITLE     2004
-#define IDC_LANGUAGES        2005
-#define IDD_TYPEPAGE         2006
-#define IDS_TYPETITLE        2007
-#define IDS_TYPESUBTITLE     2008
-#define IDC_INSTALL          2009
-#define IDC_SETUP            2010
+
+#define IDD_TYPEPAGE         2005
+#define IDC_INSTALL          2006
+#define IDC_INSTALLTEXT      2007
+#define IDC_UPDATE           2008
+#define IDC_UPDATETEXT       2009
+
 #define IDD_DEVICEPAGE       2011
-#define IDS_DEVICETITLE      2012
-#define IDS_DEVICESUBTITLE   2013
 #define IDC_COMPUTER         2014
 #define IDC_DISPLAY          2015
 #define IDC_KEYBOARD         2016
 #define IDC_KEYLAYOUT        2017
+
 #define IDD_DRIVEPAGE        2018
-#define IDS_DRIVETITLE       2019
-#define IDS_DRIVESUBTITLE    2020
 #define IDC_PARTITION        2021
 #define IDC_PARTCREATE       2022
 #define IDC_PARTDELETE       2023
@@ -34,32 +34,43 @@
 #define IDC_INSTVBRONLY      2025
 #define IDC_NOINSTFREELDR    2026
 #define IDC_PATH             2027
+
 #define IDD_PROCESSPAGE      2028
-#define IDS_PROCESSTITLE     2029
-#define IDS_PROCESSSUBTITLE  2030
 #define IDC_ACTIVITY         2031
 #define IDC_ITEM             2032
 #define IDC_PROCESSPROGRESS  2033
+
 #define IDD_RESTARTPAGE      2034
-#define IDS_RESTARTTITLE     2035
-#define IDS_RESTARTSUBTITLE  2036
 #define IDC_FINISHTITLE      2037
 #define IDC_RESTART_PROGRESS 2038
-#define IDS_ABORTSETUP       2039
-#define IDS_ABORTSETUP2      2040
 #define IDC_ACTION           2041
 #define IDC_PARTMOREOPTS     2042
+
 #define IDD_BOOTOPTIONS      2043
+
 #define IDD_PARTITION        2044
 #define IDC_UPDOWN1          2045
 #define IDC_PARTSIZE         2046
 #define IDC_UNIT             2047
 #define IDC_FSTYPE           2048
-#define IDD_SUMMARYPAGE      2049
-#define IDS_SUMMARYTITLE     2050
-#define IDS_SUMMARYSUBTITLE  2051
-#define IDC_DEVICEDRIVER     2052
-#define IDS_NO_TXTSETUP_SIF  2053
-#define IDS_CAPTION          2054
 
-#define IDI_MAIN 3000
+#define IDD_SUMMARYPAGE      2049
+#define IDC_DEVICEDRIVER     2052
+
+/* Strings */
+#define IDS_TYPETITLE        5007
+#define IDS_TYPESUBTITLE     5008
+#define IDS_DEVICETITLE      5012
+#define IDS_DEVICESUBTITLE   5013
+#define IDS_DRIVETITLE       5019
+#define IDS_DRIVESUBTITLE    5020
+#define IDS_PROCESSTITLE     5029
+#define IDS_PROCESSSUBTITLE  5030
+#define IDS_RESTARTTITLE     5035
+#define IDS_RESTARTSUBTITLE  5036
+#define IDS_ABORTSETUP       5039
+#define IDS_ABORTSETUP2      5040
+#define IDS_SUMMARYTITLE     5050
+#define IDS_SUMMARYSUBTITLE  5051
+#define IDS_NO_TXTSETUP_SIF  5053
+#define IDS_CAPTION          5054