diff --git a/reactos/base/setup/reactos/CMakeLists.txt b/reactos/base/setup/reactos/CMakeLists.txt
index d0ce6603299..8aaa7baa63c 100644
--- a/reactos/base/setup/reactos/CMakeLists.txt
+++ b/reactos/base/setup/reactos/CMakeLists.txt
@@ -10,5 +10,5 @@ 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)
+add_importlibs(reactos advapi32 gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
 add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)
diff --git a/reactos/base/setup/reactos/drivepage.c b/reactos/base/setup/reactos/drivepage.c
index ac38512f176..619bfc33470 100644
--- a/reactos/base/setup/reactos/drivepage.c
+++ b/reactos/base/setup/reactos/drivepage.c
@@ -126,24 +126,10 @@ DriveDlgProc(
     {
         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)
diff --git a/reactos/base/setup/reactos/lang/bg-BG.rc b/reactos/base/setup/reactos/lang/bg-BG.rc
index 9d9d35bdaa0..7321a639552 100644
--- a/reactos/base/setup/reactos/lang/bg-BG.rc
+++ b/reactos/base/setup/reactos/lang/bg-BG.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Натиснете „Напред“ за настройка на устройствата.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Настройки на устройствата", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Компютър:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
     LTEXT "  Екран:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Клавиатура", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Натиснете „Напред“ за избор на устройство за слагане.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Натиснете „Напред“ за избор на устройство за слагане.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Настройка на РеактОС"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Дял за слагане на РеактОС", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Създаване", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "Из&триване", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Създаване", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "Из&триване", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "Драйвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "Раз&ширани възможности...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Натиснете „Напред“, за да започне слагането.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/cs-CZ.rc b/reactos/base/setup/reactos/lang/cs-CZ.rc
index 33e711fc027..26e40bf8cb3 100644
--- a/reactos/base/setup/reactos/lang/cs-CZ.rc
+++ b/reactos/base/setup/reactos/lang/cs-CZ.rc
@@ -25,7 +25,7 @@ BEGIN
     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
+    LTEXT "Po klepnutí na Další bude možné nastavit zařízení.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -33,14 +33,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Nastavení zařízení", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Počítač:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
     LTEXT "Obrazovka:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Klávesnice:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Po klepnutí na Další bude možné nastavit instalační zařízení.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Po klepnutí na Další bude možné nastavit instalační zařízení.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -48,12 +47,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalace systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Oddíl, do kterého bude systém ReactOS nainstalován", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Smazat", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Vytvořit", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Smazat", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Ovladač", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Pokročilé volby...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Po klepnutí na Další bude možné zkontrolovat všechna nastavení.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/de-DE.rc b/reactos/base/setup/reactos/lang/de-DE.rc
index 3e2d9a92e41..81e63bd5bc2 100644
--- a/reactos/base/setup/reactos/lang/de-DE.rc
+++ b/reactos/base/setup/reactos/lang/de-DE.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS-Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-//    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
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Tastatur:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Klicken Sie auf Weiter um den Installationsort zu konfigurieren.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 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
-    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
-    PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Löschen", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/el-GR.rc b/reactos/base/setup/reactos/lang/el-GR.rc
index 7df16075032..8c02c118325 100644
--- a/reactos/base/setup/reactos/lang/el-GR.rc
+++ b/reactos/base/setup/reactos/lang/el-GR.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Πατήστε Επόμενο για να ρυθμίσετε τις συσκευές.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Ρυθμίσεις συσκευών", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Υπολογιστής:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
     LTEXT "Εμφάνιση:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Πληκτρολόγιο:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Click Next setup of the installation device.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Εγκατάσταση του ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partition για την εγκατάσταση του ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Διαγραφή", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Δημιουργία", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Διαγραφή", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Επιλογές για προχωρημένους...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Πατήστε Επόμενο για να ξεκινήσετε τη διαδικασία εγκατάστασης.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/en-US.rc b/reactos/base/setup/reactos/lang/en-US.rc
index 3f66b86172a..24f5484ff6a 100644
--- a/reactos/base/setup/reactos/lang/en-US.rc
+++ b/reactos/base/setup/reactos/lang/en-US.rc
@@ -33,7 +33,7 @@ BEGIN
     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, 7, 128, 277, 8 */
+    LTEXT "Click Next to setup of the installation device.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -41,7 +41,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LISTBOX IDC_PARTITION, 7, 7, 303, 112, LBS_HASSTRINGS | WS_VSCROLL
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
     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
diff --git a/reactos/base/setup/reactos/lang/es-ES.rc b/reactos/base/setup/reactos/lang/es-ES.rc
index 369654450ca..3e05a360899 100644
--- a/reactos/base/setup/reactos/lang/es-ES.rc
+++ b/reactos/base/setup/reactos/lang/es-ES.rc
@@ -21,7 +21,7 @@ BEGIN
     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
+    LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -29,14 +29,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Ajustes de dispositivos", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Equipo:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
     LTEXT "Pantalla:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -44,12 +43,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalación de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partición para la instalación de ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Crear", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Borrar", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Crear", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Borrar", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Presione Siguiente para verificar el resumen.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/et-EE.rc b/reactos/base/setup/reactos/lang/et-EE.rc
index 69b6a36da56..ff1f9b57879 100644
--- a/reactos/base/setup/reactos/lang/et-EE.rc
+++ b/reactos/base/setup/reactos/lang/et-EE.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Vajuta Järgmine, et seadmeid paigaldada.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Seadmete seaded", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Arvuti:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Klaviatuur:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Vajuta Järgmine, et seadistada sihtketas.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOSi paigaldamine"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partitsioneerimine", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Loo uus", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Kustuta", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&raiver", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Täpsemad seaded...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Vajuta Järgmine, et seaded üle kontrollida.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/fi-FI.rc b/reactos/base/setup/reactos/lang/fi-FI.rc
index e52e115e534..b42b48fad6b 100644
--- a/reactos/base/setup/reactos/lang/fi-FI.rc
+++ b/reactos/base/setup/reactos/lang/fi-FI.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 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, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 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
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/fr-FR.rc b/reactos/base/setup/reactos/lang/fr-FR.rc
index 850686ca47d..4254f475442 100644
--- a/reactos/base/setup/reactos/lang/fr-FR.rc
+++ b/reactos/base/setup/reactos/lang/fr-FR.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 1280, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Installation de ReactOS"
 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, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Installation de ReactOS"
 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
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/he-IL.rc b/reactos/base/setup/reactos/lang/he-IL.rc
index 25d0ff4d205..343d5c1f71f 100644
--- a/reactos/base/setup/reactos/lang/he-IL.rc
+++ b/reactos/base/setup/reactos/lang/he-IL.rc
@@ -21,7 +21,7 @@ BEGIN
     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
+    LTEXT "לחץ על הבא כדי להגדיר את ההתקנים", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -29,14 +29,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "הגדרות התקנים", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "מחשב:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "תצוגה:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "תצוגה:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "לחץ על הבא כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "לחץ על הבא כדי להגדיר את התקן ההתקנה.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -44,12 +43,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "התקנת ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "מחיצה עבור התקנת ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "צור", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "מחק", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "צור", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "מחק", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "טעינת מנהל התקן", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "אפשרויות מתקדמות...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "לחץ על הבא כדי לראות סיכום.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/hu-HU.rc b/reactos/base/setup/reactos/lang/hu-HU.rc
index 4298e2878c8..2739e1e0d2c 100644
--- a/reactos/base/setup/reactos/lang/hu-HU.rc
+++ b/reactos/base/setup/reactos/lang/hu-HU.rc
@@ -21,7 +21,7 @@ BEGIN
     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
+    LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -29,14 +29,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 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, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -44,12 +43,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 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
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Create", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Delete", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/it-IT.rc b/reactos/base/setup/reactos/lang/it-IT.rc
index c7e4b85b784..d3b0a7b3d2c 100644
--- a/reactos/base/setup/reactos/lang/it-IT.rc
+++ b/reactos/base/setup/reactos/lang/it-IT.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Cliccare Avanti per impostare i dispositivi.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Impostazione dei dispositivi", 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, 150, 80
     LTEXT "Display:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Tastiera:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Cliccare Avanti per scegliere dove effettuare l'installazione.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Cliccare Avanti per scegliere dove effettuare l'installazione.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Installazione di ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partizione per l'installazione di ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Crea", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Crea", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Rimuovi", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Opzioni avanzate...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Cliccare Avanti per iniziare l'installazione.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/ms-MY.rc b/reactos/base/setup/reactos/lang/ms-MY.rc
index 56c5a99408d..de24c3134ae 100644
--- a/reactos/base/setup/reactos/lang/ms-MY.rc
+++ b/reactos/base/setup/reactos/lang/ms-MY.rc
@@ -21,7 +21,7 @@ BEGIN
     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
+    LTEXT "Klik Seterusnya untuk memasang peranti.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -29,14 +29,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Seting peranti", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Komputer:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Paparan:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Papan Kekunci:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Klik di sebelah persediaan peranti pemasangan tersebut.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Klik di sebelah persediaan peranti pemasangan tersebut.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -44,12 +43,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS Persediaan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partition untuk pemasangan ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "Men&cipta", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "Hapus(&D)", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "Pemacu(&R)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "Opsyen l&anjutan...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Klik Seterusnya untuk menyemak ringkasan.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/no-NO.rc b/reactos/base/setup/reactos/lang/no-NO.rc
index 8de485c02e6..42fec1376e4 100644
--- a/reactos/base/setup/reactos/lang/no-NO.rc
+++ b/reactos/base/setup/reactos/lang/no-NO.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Trykk på Neste for installere enhetene.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Enhetsinnstillinger", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Datamaskin:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
     LTEXT "Skjerm:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Tastatur:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Trykk på Neste for å installere enhetene.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Trykk på Neste for å installere enhetene.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS installering"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "ReactOS partisjon installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Opprett", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Slett", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Opprett", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Slett", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/pl-PL.rc b/reactos/base/setup/reactos/lang/pl-PL.rc
index bfc2cf5bddd..c91e94ac92c 100644
--- a/reactos/base/setup/reactos/lang/pl-PL.rc
+++ b/reactos/base/setup/reactos/lang/pl-PL.rc
@@ -29,7 +29,7 @@ BEGIN
     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
+    LTEXT "Naciśnij Dalej, aby zmienić ustawienia sprzętu.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -37,14 +37,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Ustawienia sprzętu", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Komputer:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
     LTEXT "Ekran:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Klawiatura:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Naciśnij Dalej, aby ustalić miejsce instalacji.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Naciśnij Dalej, aby ustalić miejsce instalacji.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -52,12 +51,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalator ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partycja dla instalacji ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Usuń", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "s&terownik", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Stwórz", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Usuń", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "s&terownik", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Opcje zaawansowane...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Naciśnij Dalej, aby rozpocząć proces instalacji.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/pt-BR.rc b/reactos/base/setup/reactos/lang/pt-BR.rc
index 85ec35033cb..0f76d3ce439 100644
--- a/reactos/base/setup/reactos/lang/pt-BR.rc
+++ b/reactos/base/setup/reactos/lang/pt-BR.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Clique em Próximo para configurar os dispositivos.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Configuração de dispositivo", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Computador:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Monitor:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Teclado:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Clique em Próximo para configurar o dispositivo de instalação.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Clique em Próximo para configurar o dispositivo de instalação.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalação do ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partição para instalação do ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Criar", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Apagar", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Criar", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Apagar", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&rivers", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Opções Avançadas...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Clique em Próximo para verificar o sumário.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/ro-RO.rc b/reactos/base/setup/reactos/lang/ro-RO.rc
index 7284b412422..af8ad183e4a 100644
--- a/reactos/base/setup/reactos/lang/ro-RO.rc
+++ b/reactos/base/setup/reactos/lang/ro-RO.rc
@@ -28,7 +28,7 @@ BEGIN
     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
+    LTEXT "Apăsați pe „Înainte” pentru configurarea de dispozitive.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -36,14 +36,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Configurare dispozitive", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Calculator:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Ecran:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Tastatură:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Apăsați pe „Înainte” pentru configurarea dispozitivului de instalare.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Apăsați pe „Înainte” pentru configurarea dispozitivului de instalare.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -51,12 +50,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partiția pentru instalarea ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Crează", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Șterge", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "Mo&dul pilot", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Opțiuni avansate…", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Crează", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Șterge", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "Mo&dul pilot", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Opțiuni avansate…", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Apăsați pe „Înainte” pentru a verifica sumarul.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/ru-RU.rc b/reactos/base/setup/reactos/lang/ru-RU.rc
index c543b49a3c9..59c3204c228 100644
--- a/reactos/base/setup/reactos/lang/ru-RU.rc
+++ b/reactos/base/setup/reactos/lang/ru-RU.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Основные устройства", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Компьютер:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 150, 80
     LTEXT "Экран:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 150, 80
     LTEXT "Клавиатура:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 150, 80
-    LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Для установки устройств нажмите ""Далее"".", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Установка ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Разделы для установки ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Создать", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Удалить", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 176, 155, 122, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Создать", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Удалить", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 162, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Дополнительные параметры...", IDC_PARTMOREOPTS, 176, 122, 122, 15
     LTEXT "Для начала установки нажмите ""Далее"".", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/sk-SK.rc b/reactos/base/setup/reactos/lang/sk-SK.rc
index db9a210b85a..257f1e1213d 100644
--- a/reactos/base/setup/reactos/lang/sk-SK.rc
+++ b/reactos/base/setup/reactos/lang/sk-SK.rc
@@ -24,7 +24,7 @@ BEGIN
     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
+    LTEXT "Click Next to setup the devices.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -32,14 +32,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Nastavenia zariadení", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Počítač:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Obrazovka:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Klávesnica:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Click Next setup of the installation device.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -47,12 +46,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Inštalácia systému ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Partícia na nainštalovanie systému ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Vytvoriť", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "O&dstrániť", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Vytvoriť", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "O&dstrániť", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "Rozšírené &možnosti...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/sq-AL.rc b/reactos/base/setup/reactos/lang/sq-AL.rc
index 9d8c2983ccd..13b591887f2 100644
--- a/reactos/base/setup/reactos/lang/sq-AL.rc
+++ b/reactos/base/setup/reactos/lang/sq-AL.rc
@@ -21,7 +21,7 @@ BEGIN
     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
+    LTEXT "Kliko vazhdo për të konfiguruar pajisjet.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -29,14 +29,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Cilesimet e pajisjeve", 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 "Klikoni vazhdo për instalim të pajisjeve.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Klikoni vazhdo për instalim të pajisjeve.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -44,12 +43,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Instalimi i ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Konfigurimi i particioneve për ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Krijo", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Fshi", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Krijo", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Fshi", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Opsionet e avancuara...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Kliko vazhdo për të kontrolluar përmbajtjen.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/tr-TR.rc b/reactos/base/setup/reactos/lang/tr-TR.rc
index b86dc8c5ecb..9a1c85491e2 100644
--- a/reactos/base/setup/reactos/lang/tr-TR.rc
+++ b/reactos/base/setup/reactos/lang/tr-TR.rc
@@ -21,7 +21,7 @@ BEGIN
     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
+    LTEXT "Aygıtları kurmak için İleri'ye tıklayınız.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -29,14 +29,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Aygıt Ayarları", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Bilgisayar:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Görüntü:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Düğme Takımı:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Kurulum aygıtını kurmak için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Kurulum aygıtını kurmak için İleri'ye tıklayınız.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -44,12 +43,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS Kur"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "ReactOS Kurulumu İçin Bölümlendirme", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Oluştur...", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Sil", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Oluştur...", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Sil", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "S&ürücü", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "G&elişmiş Seçenekler...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Kurulum özetini gözden geçirmek için İleri'ye tıklayınız.", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/uk-UA.rc b/reactos/base/setup/reactos/lang/uk-UA.rc
index 868c8d375d6..e615bd9ee25 100644
--- a/reactos/base/setup/reactos/lang/uk-UA.rc
+++ b/reactos/base/setup/reactos/lang/uk-UA.rc
@@ -27,7 +27,7 @@ BEGIN
     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
+    LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -35,14 +35,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Основні пристрої", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "Комп’ютер:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "Екран:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "Клавіатура:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "Для встановлення пристроїв натисніть Далі.", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -50,12 +49,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "Встановлення ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "Розділи для встановлення ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "&Створити", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "&Видалити", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "&Додаткові Опції...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "&Створити", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "&Видалити", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "Д&райвер", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "&Додаткові Опції...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "Для початку встановлення натисніть Далі", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/zh-CN.rc b/reactos/base/setup/reactos/lang/zh-CN.rc
index 81172d8a273..21b31bd1958 100644
--- a/reactos/base/setup/reactos/lang/zh-CN.rc
+++ b/reactos/base/setup/reactos/lang/zh-CN.rc
@@ -19,7 +19,7 @@ BEGIN
     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
+    LTEXT "点击下一步安装设备。", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -27,14 +27,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安装"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "设备设置", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "计算机:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "显示:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "键盘:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "点击下一步设置安装驱动器。", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "点击下一步设置安装驱动器。", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -42,12 +41,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安装"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "ReactOS 安装分区", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "删除(&D)", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "驱动器(&r)", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "高级选项(&A)...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "删除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "驱动器(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "高级选项(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "点击下一步检查安装概要。", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/lang/zh-TW.rc b/reactos/base/setup/reactos/lang/zh-TW.rc
index a1b2d0e548a..a37f8454f35 100644
--- a/reactos/base/setup/reactos/lang/zh-TW.rc
+++ b/reactos/base/setup/reactos/lang/zh-TW.rc
@@ -21,7 +21,7 @@ BEGIN
     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
+    LTEXT "點選下一步安裝裝置。", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143
@@ -29,14 +29,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安裝"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "裝置設定", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
     LTEXT "計算機:", IDC_STATIC, 20, 15, 80, 10
     CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 15, 180, 80
     LTEXT "顯示:", IDC_STATIC, 20, 35, 80, 10
     CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80
     LTEXT "鍵盤:", IDC_STATIC, 20, 55, 80, 10
     CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80
-    LTEXT "點選下一步設定安裝驅動器。", IDC_STATIC, 10, 180, 277, 20
+    LTEXT "點選下一步設定安裝驅動器。", IDC_STATIC, 7, 128, 297, 8
 END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143
@@ -44,12 +43,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS
 CAPTION "ReactOS 安裝"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "ReactOS 安裝分區", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
-    LISTBOX IDC_PARTITION, 20, 12, 278, 142, LBS_HASSTRINGS | WS_VSCROLL
-    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 20, 155, 50, 15
-    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 76, 155, 50, 15
-    PUSHBUTTON "驅動器(&r)", IDC_DEVICEDRIVER, 162, 155, 50, 15, WS_DISABLED
-    PUSHBUTTON "高階選項(&A)...", IDC_PARTMOREOPTS, 218, 155, 80, 15
+    CONTROL "", IDC_PARTITION, "SysListView32", WS_BORDER | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL, 7, 7, 303, 112
+    PUSHBUTTON "建立(&C)", IDC_PARTCREATE, 7, 122, 50, 15
+    PUSHBUTTON "刪除(&D)", IDC_PARTDELETE, 63, 122, 50, 15
+    PUSHBUTTON "驅動器(&r)", IDC_DEVICEDRIVER, 174, 122, 50, 15, WS_DISABLED
+    PUSHBUTTON "高階選項(&A)...", IDC_PARTMOREOPTS, 230, 122, 80, 15
     LTEXT "點選下一步檢查安裝概要。", IDC_STATIC, 10, 180, 277, 20
 END
 
diff --git a/reactos/base/setup/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c
index c6d71c15609..75196970ec6 100644
--- a/reactos/base/setup/reactos/reactos.c
+++ b/reactos/base/setup/reactos/reactos.c
@@ -97,38 +97,20 @@ StartDlgProc(HWND hwndDlg,
     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);
-
             /* Center the wizard window */
-            CenterWindow (hwndControl);
+            CenterWindow(GetParent(hwndDlg));
 
-            dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
-            SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
-        
-            /* Hide and disable the 'Cancel' button at the moment,
-             * we use this button to cancel the setup process
-             * like F3 in usetup
-             */
-            hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
-            ShowWindow (hwndControl, SW_HIDE);
-            EnableWindow (hwndControl, FALSE);
-            
             /* Set title font */
             SendDlgItemMessage(hwndDlg,
                                IDC_STARTTITLE,
                                WM_SETFONT,
                                (WPARAM)pSetupData->hTitleFont,
                                (LPARAM)TRUE);
-        }
-        break;
+            break;
 
         case WM_NOTIFY:
         {
@@ -168,25 +150,17 @@ TypeDlgProc(HWND hwndDlg,
     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);
-
+            /* Check the 'install' radio button */
             CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED);
 
+            /* Disable the 'update' radio button and text */
             EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE), FALSE);
             EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATETEXT), FALSE);
-        }
-        break;
+            break;
 
         case WM_NOTIFY:
         {
@@ -196,7 +170,7 @@ TypeDlgProc(HWND hwndDlg,
             {
                 case PSN_SETACTIVE:
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK);
-                break;
+                    break;
 
                 case PSN_QUERYCANCEL:
                     SetWindowLongPtr(hwndDlg,
@@ -244,26 +218,10 @@ DeviceDlgProc(HWND hwndDlg,
     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);*/
-
             hList = GetDlgItem(hwndDlg, IDC_COMPUTER);
 
             for (i=0; i < pSetupData->CompCount; i++)
@@ -290,8 +248,7 @@ DeviceDlgProc(HWND hwndDlg,
                 SendMessage(hList,CB_SETITEMDATA,tindex,i);
             }
             SendMessage(hList,CB_SETCURSEL,0,0); // set first as default
-        }
-        break;
+            break;
 
         case WM_NOTIFY:
         {
@@ -376,27 +333,10 @@ SummaryDlgProc(HWND hwndDlg,
     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);*/
-        }
-        break;
+            break;
 
         case WM_NOTIFY:
         {
@@ -443,27 +383,10 @@ ProcessDlgProc(HWND hwndDlg,
     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);*/
-        }
-        break;
+            break;
 
         case WM_NOTIFY:
         {
@@ -504,21 +427,17 @@ RestartDlgProc(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:
-        {
-            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_HIDE);
-            EnableWindow(hwndControl, FALSE);
+            /* Save pointer to the global setup data */
+            pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pSetupData);
 
             /* Set title font */
             /*SendDlgItemMessage(hwndDlg,
@@ -526,8 +445,7 @@ RestartDlgProc(HWND hwndDlg,
                                  WM_SETFONT,
                                  (WPARAM)hTitleFont,
                                  (LPARAM)TRUE);*/
-        }
-        break;
+            break;
 
         case WM_TIMER:
         {
@@ -558,13 +476,11 @@ RestartDlgProc(HWND hwndDlg,
             switch (lpnm->code)
             {
                 case PSN_SETACTIVE: // Only "Finish" for closing the App
-                {
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH);
                     SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 300));
                     SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0);
                     SetTimer(hwndDlg, 1, 50, NULL);
-                }
-                break;
+                    break;
 
                 default:
                     break;
@@ -753,12 +669,12 @@ LONG LoadGenentry(HINF hinf,PCTSTR name,PGENENTRY *gen,PINFCONTEXT context)
                 while (SetupFindNextLine(context, context) && Count < TotalCount);
             }
         }
-	else return 0;
+        else return 0;
     }
     return TotalCount;
 }
 
-BOOL isUnattendSetup()
+BOOL isUnattendSetup(VOID)
 {
     WCHAR szPath[MAX_PATH];
     WCHAR *ch;
@@ -797,6 +713,51 @@ BOOL isUnattendSetup()
     return result;
 }
 
+#if 0
+static
+VOID
+EnableShutdownPrivilege(VOID)
+{
+    HANDLE hToken = NULL;
+    TOKEN_PRIVILEGES Privileges;
+
+    /* Get shutdown privilege */
+    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken))
+    {
+//        FatalError("OpenProcessToken() failed!");
+        return;
+    }
+
+    if (!LookupPrivilegeValue(NULL,
+                              SE_SHUTDOWN_NAME,
+                              &Privileges.Privileges[0].Luid))
+    {
+//        FatalError("LookupPrivilegeValue() failed!");
+       goto done;
+    }
+
+    Privileges.PrivilegeCount = 1;
+    Privileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+
+    if (AdjustTokenPrivileges(hToken,
+                              FALSE,
+                              &Privileges,
+                              0,
+                              (PTOKEN_PRIVILEGES)NULL,
+                              NULL) == 0)
+    {
+//        FatalError("AdjustTokenPrivileges() failed!");
+       goto done;
+    }
+
+done:
+    if (hToken != NULL)
+        CloseHandle(hToken);
+
+    return;
+}
+#endif
+
 int WINAPI
 _tWinMain(HINSTANCE hInst,
           HINSTANCE hPrevInstance,
@@ -923,6 +884,11 @@ _tWinMain(HINSTANCE hInst,
     if (pSetupData != NULL)
         HeapFree(GetProcessHeap(), 0, pSetupData);
 
+#if 0
+    EnableShutdownPrivilege();
+    ExitWindowsEx(EWX_REBOOT, 0);
+#endif
+
     return 0;
 }