diff --git a/reactos/base/applications/dxdiag/display.c b/reactos/base/applications/dxdiag/display.c
index 66b00a5f785..73469df9beb 100644
--- a/reactos/base/applications/dxdiag/display.c
+++ b/reactos/base/applications/dxdiag/display.c
@@ -236,14 +236,14 @@ InitializeDialog(HWND hwndDlg, PDISPLAY_DEVICEW pDispDevice)
             }
             else
             {
-                LoadStringW(hInst, IDS_OPTION_NO, szText, sizeof(szText)/sizeof(WCHAR));
+                LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText)/sizeof(WCHAR));
             }
         }
         IDirect3D9_Release(ppObj);
     }
     else
     {
-        LoadStringW(hInst, IDS_DEVICE_STATUS_UNKNOWN, szText, sizeof(szText)/sizeof(WCHAR));
+        LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText)/sizeof(WCHAR));
     }
     szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0';
     SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_LOGO, WM_SETTEXT, 0, (LPARAM)szText);
diff --git a/reactos/base/applications/dxdiag/dxdiag.c b/reactos/base/applications/dxdiag/dxdiag.c
index ae2bd20020c..096b276da8c 100644
--- a/reactos/base/applications/dxdiag/dxdiag.c
+++ b/reactos/base/applications/dxdiag/dxdiag.c
@@ -288,11 +288,6 @@ DxDiagWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam)
             break;
         case WM_DESTROY:
             DestroyTabCtrlDialogs(pContext);
-            if (pContext->hDisplayWnd)
-                HeapFree(GetProcessHeap(), 0, pContext->hDisplayWnd);
-            if (pContext->hSoundWnd)
-                HeapFree(GetProcessHeap(), 0, pContext->hSoundWnd);
-            HeapFree(GetProcessHeap(), 0, pContext);
             return DefWindowProc(hwndDlg, message, wParam, lParam);
     }
     return 0;
diff --git a/reactos/base/applications/dxdiag/help.c b/reactos/base/applications/dxdiag/help.c
index 08d09f7a174..26624a28ca3 100644
--- a/reactos/base/applications/dxdiag/help.c
+++ b/reactos/base/applications/dxdiag/help.c
@@ -20,6 +20,16 @@ HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
             SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
             return TRUE;
         }
+        case WM_COMMAND:
+        {
+            switch (LOWORD(wParam)) {
+                case IDC_BUTTON_SYSINFO:
+                    break;
+                case IDC_BUTTON_DDRAW_REFRESH:
+                    break;
+            }
+            break;
+        }
     }
 
     return FALSE;
diff --git a/reactos/base/applications/dxdiag/input.c b/reactos/base/applications/dxdiag/input.c
index ecb5259b44e..c2472a0fb37 100644
--- a/reactos/base/applications/dxdiag/input.c
+++ b/reactos/base/applications/dxdiag/input.c
@@ -160,6 +160,10 @@ InitListViewColumns(PINPUT_DIALOG_CONTEXT pContext)
 
     pContext->hDevList = GetDlgItem(pContext->hwndDlg, IDC_LIST_DEVICE);
 
+    /* Highlights the entire row instead of just the selected item in the first column.
+       This increases readability on the selected item in the list. */
+    SendMessage(pContext->hDevList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
+
     ZeroMemory(&lvcolumn, sizeof(LVCOLUMNW));
     lvcolumn.pszText = szText;
     lvcolumn.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH;
diff --git a/reactos/base/applications/dxdiag/lang/bg-BG.rc b/reactos/base/applications/dxdiag/lang/bg-BG.rc
index 2faa036b953..b794a06decd 100644
--- a/reactos/base/applications/dxdiag/lang/bg-BG.rc
+++ b/reactos/base/applications/dxdiag/lang/bg-BG.rc
@@ -7,162 +7,186 @@ CAPTION "Приложение за преглеждане на РеактХ"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "Помо&щ", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Следваща страница", IDC_BUTTON_NEXT, 257, 261, 80, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Запис на всички сведения...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Из&ход", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Помо&щ", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&Следваща страница", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Запис на всички сведения...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "Из&ход", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Това средство дава подробни сведения за съставните на РеактХ и за водачите, сложени в уредбата ви.", -1, 10, 10, 443, 17
-    LTEXT "Ако знаете коя област причинява проблема, натиснете подходящия подпрозорец. В противен случай можете да ползвате „Следваща страница“, за да обходите всички страници.", -1, 10, 30, 443, 25
-    GROUPBOX "Сведения за уредбата", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Сегашни дата/време:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Име на компютъра:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Работна уредба:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Език:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Производител на уредбата:", -1, 40, 110, 110, 10, SS_RIGHT
-    LTEXT "Модел на системата:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "БИОС:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Процесор:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Памет:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Обменен файл:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Версия на РеактХ:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Това средство дава подробни сведения за съставните на РеактХ и за водачите, сложени в уредбата ви.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Ако знаете коя област причинява проблема, натиснете подходящия подпрозорец. В противен случай можете да ползвате „Следваща страница“, за да обходите всички страници.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Сведения за уредбата", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Сегашни дата/време:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Име на компютъра:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Работна уредба:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Език:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Производител на уредбата:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Модел на системата:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "БИОС:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Процесор:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Памет:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Обменен файл:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Версия на РеактХ:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Устройство", -1, 10, 10, 250, 100
-    RTEXT "Име:", -1, 20, 25, 80, 10
-    RTEXT "Производител:", -1, 20, 35, 80, 10
-    RTEXT "Вид на чипа:", -1, 20, 45, 80, 10
-    RTEXT "Вид ЦАП:", -1, 20, 55, 80, 10
-    RTEXT "Обща памет около:", -1, 14, 65, 80, 10
-    RTEXT "Режим на екрана:", -1, 14, 75, 80, 10
-    RTEXT "Екран:", -1, 20, 85, 80, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Водач (драйвер)", -1, 270, 10, 190, 100
-    RTEXT "Основен водач:", -1, 275, 25, 55, 10
-    RTEXT "Издание:", -1, 275, 35, 55, 10
-    RTEXT "Дата:", -1, 275, 45, 55, 10
-    RTEXT "Знак на WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Мини-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "Версия на DDI:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Възможности на РеактХ", -1, 10, 115, 450, 60
-    RTEXT "Ускорение на DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Ускорение на Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "AGP ускорение на тъканите:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Включване", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Включване", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Включване", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Проверка на DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 85, 14
-    PUSHBUTTON "Проверка на Direct3D", IDC_BUTTON_TEST3D, 250, 140, 85, 14
-    GROUPBOX "Бележки", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Устройство", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Име:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Производител:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Вид на чипа:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Вид ЦАП:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Обща памет около:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Режим на екрана:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Екран:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Водач (драйвер)", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Основен водач:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Издание:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Дата:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Знак на WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Мини-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Версия на DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Възможности на РеактХ", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Ускорение на DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Ускорение на Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP ускорение на тъканите:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Включване", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Включване", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Включване", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Проверка на DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Проверка на Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Бележки", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Устройство", -1, 10, 10, 250, 100
-    RTEXT "Име:", -1, 15, 25, 95, 10
-    RTEXT "ОЗ на устройството:", -1, 15, 35, 95, 10
-    RTEXT "ОЗ на производителя:", -1, 15, 45, 95, 10
-    RTEXT "ОУ на произведението:", -1, 15, 55, 95, 10
-    RTEXT "Вид:", -1, 15, 65, 95, 10
-    RTEXT "Подразбирано устройство:", -1, 15, 75, 95, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 115, 25, 140, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 115, 35, 140, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 115, 45, 140, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 115, 55, 140, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 115, 65, 140, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 115, 75, 140, 10
-    GROUPBOX "Водач (драйвер)", -1, 270, 10, 190, 100
-    RTEXT "Име:", -1, 275, 25, 55, 10
-    RTEXT "Издание:", -1, 275, 35, 55, 10
-    RTEXT "Дата:", -1, 275, 45, 55, 10
-    RTEXT "Знак на WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Други файлове:", -1, 275, 65, 55, 10
-    RTEXT "Доставчик:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Възможности на РеактХ", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Хардуерен звук\nУскорение:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Проверка на DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 100, 14
-    GROUPBOX "Бележки", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Устройство", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Име:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ОЗ на устройството:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ОЗ на производителя:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ОУ на произведението:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Вид:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Подразбирано устройство:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Име:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Издание:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Дата:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Знак на WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Други файлове:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Доставчик:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Възможности на РеактХ", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Хардуерен звук\nУскорение:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Проверка на DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Бележки", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Устройства за пряк вход (DirectInput)", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Входни устройства", -1, 10, 100, 452, 60
+    GROUPBOX "Устройства за пряк вход (DirectInput)", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Входни устройства", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Сведения", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Сведения", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Вписан доставчик на услугата DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Вписан доставчик на услугата DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Сведения", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "Не"
     IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?"
     IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/cs-CZ.rc b/reactos/base/applications/dxdiag/lang/cs-CZ.rc
index 9f35ba68e57..708af8cad4e 100644
--- a/reactos/base/applications/dxdiag/lang/cs-CZ.rc
+++ b/reactos/base/applications/dxdiag/lang/cs-CZ.rc
@@ -12,162 +12,186 @@ CAPTION "ReactX-diagnostický program"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Nápověda", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Další stránka", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Uložit všechny informace...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "U&končit", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Nápověda", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&Další stránka", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Uložit všechny informace...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "U&končit", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Tento nástroj poskytuje detailní informace o komponentách ReactX a ovladačích nainstalovaných na tomto systému.", -1, 10, 10, 443, 17
-    LTEXT "Pokud víte, ve které oblasti se nachází problém, klikněte na vhodnou záložku výše. V opačném případě lze použít tlačítko ""Další stránka"" níže a procházet stránky postupně.", -1, 10, 30, 443, 25
-    GROUPBOX "Systémové informace", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Současné datum a čas:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Název počítače:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Operační systém:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Jazyk:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Výrobce systému:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Model systému:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Paměť:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Stránkovací soubor:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Verze ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Tento nástroj poskytuje detailní informace o komponentách ReactX a ovladačích nainstalovaných na tomto systému.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Pokud víte, ve které oblasti se nachází problém, klikněte na vhodnou záložku výše. V opačném případě lze použít tlačítko ""Další stránka"" níže a procházet stránky postupně.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Systémové informace", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Současné datum a čas:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Název počítače:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Operační systém:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Jazyk:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Výrobce systému:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Model systému:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Procesor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Paměť:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Stránkovací soubor:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Verze ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Zařízení", -1, 10, 10, 250, 100
-    RTEXT "Název:", -1, 20, 25, 70, 10
-    RTEXT "Výrobce:", -1, 20, 35, 70, 10
-    RTEXT "Typ čipu:", -1, 20, 45, 70, 10
-    RTEXT "Typ DAC:", -1, 20, 55, 70, 10
-    RTEXT "Celková paměť:", -1, 14, 65, 75, 10
-    RTEXT "Zobrazovací mód:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Ovladač", -1, 270, 10, 190, 100
-    RTEXT "Hlavní ovladač:", -1, 275, 25, 55, 10
-    RTEXT "Verze:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "Verze DDI:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Vlastnosti ReactX", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw akcelerace:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D akcelerace:", -1, 15, 145, 110, 12
-    RTEXT "AGP akcelerace textur:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Zapnout", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Zapnout", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Zapnout", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Otestovat DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Otestovat Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Poznámky", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Zařízení", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Název:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Výrobce:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Typ čipu:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Typ DAC:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Celková paměť:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Zobrazovací mód:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Ovladač", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Hlavní ovladač:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Verze:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Verze DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Vlastnosti ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw akcelerace:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D akcelerace:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP akcelerace textur:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Zapnout", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Zapnout", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Zapnout", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Otestovat DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Otestovat Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Poznámky", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Zařízení", -1, 10, 10, 250, 100
-    RTEXT "Název:", -1, 20, 25, 70, 10
-    RTEXT "ID zařízení:", -1, 20, 35, 70, 10
-    RTEXT "ID výrobce:", -1, 20, 45, 70, 10
-    RTEXT "ID produktu:", -1, 20, 55, 70, 10
-    RTEXT "Typ:", -1, 20, 65, 70, 10
-    RTEXT "Implicitní zařízení:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Ovladač", -1, 270, 10, 190, 100
-    RTEXT "Název:", -1, 275, 25, 55, 10
-    RTEXT "Verze:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Další soubory:", -1, 275, 65, 55, 10
-    RTEXT "Poskytovatel:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Vlastnosti ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Hardwarový zvuk\nÚroveň akcelerace:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Otestovat DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Poznámky", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Zařízení", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Název:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ID zařízení:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ID výrobce:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ID produktu:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Typ:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Implicitní zařízení:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Ovladač", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Název:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Verze:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Další soubory:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Poskytovatel:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Vlastnosti ReactX", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Hardwarový zvuk\nÚroveň akcelerace:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Otestovat DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Poznámky", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Zařízení DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Vstupní zařízení", -1, 10, 100, 452, 60
+    GROUPBOX "Zařízení DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Vstupní zařízení", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informace", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informace", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registrovaný poskytovatel služby DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registrovaný poskytovatel služby DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -223,4 +247,13 @@ BEGIN
     IDS_OPTION_NO "Ne"
     IDS_D3DTEST_DESCRIPTION "Spustí se test rozhraní Direct3D. Pokračovat?"
     IDS_D3DTEST_D3Dx "Tento test použije hardwarově akcelerované rozhraní Direct3D %u."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/de-DE.rc b/reactos/base/applications/dxdiag/lang/de-DE.rc
index 350c273ddd9..131e7a88854 100644
--- a/reactos/base/applications/dxdiag/lang/de-DE.rc
+++ b/reactos/base/applications/dxdiag/lang/de-DE.rc
@@ -7,162 +7,186 @@ CAPTION "ReactX-Diagnoseprogramm"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Hilfe", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 254, 261, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO, 312, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 426, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Hilfe", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&Nächste Seite", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Alle &Informationen speichern...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&Beenden", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Dieses Hilfsprogramm gibt detailierte Informationen über die ReactX-Komponenten und -Treiber dieses Computers an.", -1, 10, 10, 443, 17
-    LTEXT "Wählen Sie die entsprechende Registerkarte oben, wenn Sie den Bereich des Problems bereits kennen. Klicken Sie andernfalls auf ""Nächste Seite"", um alle Seiten nacheinander zu durchsuchen.", -1, 10, 30, 443, 25
-    GROUPBOX "Systeminformationen", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Aktuelles Datum/Zeit:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Computername:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Betriebssystem:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Sprache:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Systemhersteller:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Systemmodell:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Prozessor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Speicher:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Auslagerungsdatei:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Dieses Hilfsprogramm gibt detailierte Informationen über die ReactX-Komponenten und -Treiber dieses Computers an.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Wählen Sie die entsprechende Registerkarte oben, wenn Sie den Bereich des Problems bereits kennen. Klicken Sie andernfalls auf ""Nächste Seite"", um alle Seiten nacheinander zu durchsuchen.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Systeminformationen", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Aktuelles Datum/Zeit:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Computername:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Betriebssystem:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Sprache:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Systemhersteller:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Systemmodell:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Prozessor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Speicher:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Auslagerungsdatei:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX-Version:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Gerät", -1, 10, 10, 250, 100
-    RTEXT "Name:", -1, 20, 25, 70, 10
-    RTEXT "Hersteller:", -1, 20, 35, 70, 10
-    RTEXT "Chiptyp:", -1, 20, 45, 70, 10
-    RTEXT "DAC-Typ:", -1, 20, 55, 70, 10
-    RTEXT "Gesamtspeicher ca.:", -1, 14, 65, 75, 10
-    RTEXT "Anzeigemodus:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Treiber", -1, 270, 10, 190, 100
-    RTEXT "Hauptreiber:", -1, 275, 25, 55, 10
-    RTEXT "Version:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "Mit WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT "VDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI-Version:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX-Funktionen", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw-Beschleunigung:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D-Beschleunigung:", -1, 15, 145, 110, 12
-    RTEXT "AGP-Oberflächenbeschleunigung:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Aktivieren", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Aktivieren", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Aktivieren", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "DirectDraw &testen", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Direct3D t&esten", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Hinweise", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Gerät", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Name:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Hersteller:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Chiptyp:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC-Typ:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Gesamtspeicher ca.:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Anzeigemodus:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Treiber", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Hauptreiber:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Mit WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI-Version:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Funktionen", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw-Beschleunigung:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D-Beschleunigung:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP-Oberflächenbeschleunigung:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Aktivieren", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktivieren", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktivieren", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "DirectDraw &testen", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Direct3D t&esten", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Hinweise", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Gerät", -1, 10, 10, 250, 100
-    RTEXT "Name:", -1, 20, 25, 70, 10
-    RTEXT "Gerätekennung:", -1, 20, 35, 70, 10
-    RTEXT "Herstellerkennung:", -1, 20, 45, 70, 10
-    RTEXT "Produktkennung:", -1, 20, 55, 70, 10
-    RTEXT "Typ:", -1, 20, 65, 70, 10
-    RTEXT "Standardgerät:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Treiber", -1, 270, 10, 190, 100
-    RTEXT "Name:", -1, 275, 25, 55, 10
-    RTEXT "Version:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "Mit WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Andere Dateien:", -1, 275, 65, 55, 10
-    RTEXT "Anbieter:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX-Funktionen", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Einstellung der Sound-\nhardwarebeschleunigung:", -1, 20, 135, 90, 20
-    PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Hinweise", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Gerät", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Name:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Gerätekennung:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Herstellerkennung:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Produktkennung:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Typ:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Standardgerät:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Treiber", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Name:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Mit WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Andere Dateien:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Anbieter:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Funktionen", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Einstellung der Sound-\nhardwarebeschleunigung:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Hinweise", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
-IDD_MUSIC_DIALOG DIALOGEX 0, 0, 362, 220
+IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput-Geräte", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Eingabegeräte", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput-Geräte", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Eingabegeräte", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Hinweis", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Hinweis", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registrierte DirectPlay-Dienstanbieter", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registrierte DirectPlay-Dienstanbieter", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "Nein"
     IDS_D3DTEST_DESCRIPTION "Dies wird den Direct3D-Interfacetest starten. Fortfahren?"
     IDS_D3DTEST_D3Dx "Dieser Test wird das hardwarebeschleunigte Direct3D %u Interface verwenden."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/en-US.rc b/reactos/base/applications/dxdiag/lang/en-US.rc
index 9583e1aab53..2c6a9dd66ef 100644
--- a/reactos/base/applications/dxdiag/lang/en-US.rc
+++ b/reactos/base/applications/dxdiag/lang/en-US.rc
@@ -3,166 +3,190 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDD_MAIN_DIALOG DIALOGEX 0, 0, 478, 280
 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
       WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactX-Diagnostic program"
+CAPTION "ReactX Diagnostic Tool"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Next Page", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Save All Information...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Exit", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&Next Page", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Save All Information...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&Exit", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 443, 17
-    LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 443, 25
-    GROUPBOX "System Information", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "System Model:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "If you are encountering a problem with ReactX and know what it is, then click the appropriate tab above. If not, you can click on the ""Next Page"" button below to visit each page in sequence.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "System Information", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Current Date/Time:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Computer Name:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Operating System:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Language:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "System Manufacturer:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "System Model:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Processor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Memory:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Page file:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX Version:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Device", -1, 10, 10, 250, 100
-    RTEXT "Name:", -1, 20, 25, 70, 10
-    RTEXT "Manufacturer:", -1, 20, 35, 70, 10
-    RTEXT "Chip Type:", -1, 20, 45, 70, 10
-    RTEXT "DAC Type:", -1, 20, 55, 70, 10
-    RTEXT "Approx. Total Memory:", -1, 14, 65, 75, 10
-    RTEXT "Current Display Mode:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Main Driver:", -1, 275, 25, 55, 10
-    RTEXT "Version:", -1, 275, 35, 55, 10
-    RTEXT "Date:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI Version:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D Acceleration:", -1, 15, 145, 110, 12
-    RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Device", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Name:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Manufacturer:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Chip Type:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC Type:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Approx. Total Memory:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Current Display Mode:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Main Driver:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Date:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL Logo'd:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI Version:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw Acceleration:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D Acceleration:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP Texture Acceleration:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Device", -1, 10, 10, 250, 100
-    RTEXT "Name:", -1, 20, 25, 70, 10
-    RTEXT "Device ID:", -1, 20, 35, 70, 10
-    RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10
-    RTEXT "Product ID:", -1, 20, 55, 70, 10
-    RTEXT "Type:", -1, 20, 65, 70, 10
-    RTEXT "Default Device:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Name:", -1, 275, 25, 55, 10
-    RTEXT "Version:", -1, 275, 35, 55, 10
-    RTEXT "Date:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Other Files:", -1, 275, 65, 55, 10
-    RTEXT "Provider:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Device", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Name:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Device ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Manufacturer ID:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Product ID:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Type:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Default Device:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Name:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Date:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Other Files:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Provider:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Hardware Sound\nAcceleration Level:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput Devices", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Input Devices", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput Devices", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Input Devices", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Information", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registered DirectPlay Service Providers", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -188,34 +212,43 @@ BEGIN
     IDS_DEVICE_CONTROLLER "Controller ID"
     IDS_DEVICE_MANUFACTURER "Manufacturer ID"
     IDS_DEVICE_PRODUCT "Product ID"
-    IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver"
+    IDS_DEVICE_FORCEFEEDBACK "Force Feedback Driver"
     IDS_NOT_APPLICABLE "n/a"
     IDS_OPTION_YES "Yes"
     IDS_DIRECTPLAY_COL_NAME1 "Name"
     IDS_DIRECTPLAY_COL_NAME2 "Registry"
     IDS_DIRECTPLAY_COL_NAME3 "File"
     IDS_DIRECTPLAY_COL_NAME4 "Version"
-    IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider"
+    IDS_DIRECTPLAY8_MODEMSP "DirectPlay8 Modem Service Provider"
     IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider"
     IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider"
-    IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider"
+    IDS_DIRECTPLAY8_TCPSP "DirectPlay8 TCP/IP Service Provider"
     IDS_DIRECTPLAY_TCPCONN "Internet TCP/IP Connection For DirectPlay"
     IDS_DIRECTPLAY_IPXCONN "IPX Connection For DirectPlay"
     IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay"
     IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay"
     IDS_REG_SUCCESS "OK"
     IDS_REG_FAIL "Error"
-    IDS_DDTEST_ERROR "Test failed!"
-    IDS_DDTEST_DESCRIPTION "This will start DirectDraw interface test. Continue?"
-    IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?"
+    IDS_DDTEST_ERROR "The DirectDraw rendering test failed.\nPlease see the notes for more information."
+    IDS_DDTEST_DESCRIPTION "This will start DirectDraw interface test. Do you wish to continue?"
+    IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on the primary surface.\nBlack and white rectangles should be drawn. Do you wish to continue?"
     IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
-    IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?"
-    IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
-    IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?"
-    IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?"
+    IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Do you wish to continue?"
+    IDS_DDOFFSCREEN_RESULT "Did you see white moving rectangle?"
+    IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in fullscreen mode. Moving white rectangle should be drawn. Do you wish to continue?"
+    IDS_DDFULLSCREEN_RESULT "Did you see white moving rectangle in fullscreen mode?"
     IDS_FORMAT_ADAPTER_MEM "%u MB"
-    IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)"
+    IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)"
     IDS_OPTION_NO "No"
-    IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?"
-    IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface."
+    IDS_D3DTEST_DESCRIPTION "This will start the Direct3D interface test. Do you wish to continue?"
+    IDS_D3DTEST_D3Dx "This test will use the hardware accelerated Direct3D %u interface."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/es-ES.rc b/reactos/base/applications/dxdiag/lang/es-ES.rc
index 0c9e39e7416..64b357a076d 100644
--- a/reactos/base/applications/dxdiag/lang/es-ES.rc
+++ b/reactos/base/applications/dxdiag/lang/es-ES.rc
@@ -9,9 +9,9 @@ CAPTION "Programa de diagnóstico de ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "Ay&uda", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Siguiente página", IDC_BUTTON_NEXT, 107, 261, 80, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Guardar toda la información...", IDC_BUTTON_SAVE_INFO, 201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Ay&uda", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Siguiente página", IDC_BUTTON_NEXT, 107, 260, 80, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Guardar toda la información...", IDC_BUTTON_SAVE_INFO, 201, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "Sa&lir", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
@@ -19,152 +19,176 @@ IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Esta herramienta informa detalladamente acerca de los componentes y controladores de ReactX instalados en su equipo.", -1, 10, 10, 443, 17
-    LTEXT "Si sabe la causa del problema, presione la pestaña superior apropiada. De lo contrario, puede usar el botón ""Siguiente página"" para visitar las páginas en secuencia.", -1, 10, 30, 443, 25
-    GROUPBOX "Información del sistema ", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Fecha y hora actual:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Nombre del equipo:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Sistema operativo:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Idioma:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Fabricante:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Modelo:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Procesador:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Memoria:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Archivo de paginación:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Versión de ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Esta herramienta informa detalladamente acerca de los componentes y controladores de ReactX instalados en su equipo.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Si sabe la causa del problema, presione la pestaña superior apropiada. De lo contrario, puede usar el botón ""Siguiente página"" para visitar las páginas en secuencia.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Información del sistema", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Fecha y hora actual:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Nombre del equipo:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Sistema operativo:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Idioma:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Fabricante:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Modelo:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Procesador:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Memoria:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Archivo de paginación:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Versión de ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispositivo", -1, 10, 10, 250, 100
-    RTEXT "Nombre:", -1, 20, 25, 70, 10
-    RTEXT "Fabricante:", -1, 20, 35, 70, 10
-    RTEXT "Tipo de chip:", -1, 20, 45, 70, 10
-    RTEXT "Tipo de DAC:", -1, 20, 55, 70, 10
-    RTEXT "Memoria total aprox.:", -1, 14, 65, 75, 10
-    RTEXT "Resolución actual:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Controladores ", -1, 270, 10, 190, 100
-    RTEXT "Controlador:", -1, 275, 25, 55, 10
-    RTEXT "Versión:", -1, 275, 35, 55, 10
-    RTEXT "Fecha:", -1, 275, 45, 55, 10
-    RTEXT "Logo WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT "vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "Versión DDI:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Características ReactX ", -1, 10, 115, 450, 60
-    RTEXT "Aceleración DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Aceleración Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "Aceleración texturas AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Habilitar", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Habilitar", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Habilitar", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Probar DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Probar Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Notas ", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Dispositivo", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nombre:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Fabricante:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Tipo de chip:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Tipo de DAC:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Memoria total aprox.:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Resolución actual:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Controladores ", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Controlador:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versión:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Fecha:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Logo WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Versión DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Características ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Aceleración DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Aceleración Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Aceleración texturas AGP:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Habilitar", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Habilitar", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Habilitar", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Probar DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Probar Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Notas", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispositivo ", -1, 10, 10, 250, 100
-    RTEXT "Nombre:", -1, 20, 25, 70, 10
-    RTEXT "ID del dispositivo:", -1, 20, 35, 70, 10
-    RTEXT "ID del fabricante:", -1, 20, 45, 70, 10
-    RTEXT "ID del producto:", -1, 20, 55, 70, 10
-    RTEXT "Tipo:", -1, 20, 65, 70, 10
-    RTEXT "Dispositivo por defecto:", -1, 20, 75, 70, 16
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Controlador ", -1, 270, 10, 190, 100
-    RTEXT "Nombre:", -1, 275, 25, 55, 10
-    RTEXT "Versión:", -1, 275, 35, 55, 10
-    RTEXT "Fecha:", -1, 275, 45, 55, 10
-    RTEXT "Logo WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Otros archivos:", -1, 275, 65, 55, 10
-    RTEXT "Proveedor:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Características ReactX ", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Sonido Hardware\nNivel de aceleración:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Probar DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Notas", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Dispositivo", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nombre:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ID del dispositivo:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ID del fabricante:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ID del producto:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Tipo:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Dispositivo por defecto:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Controlador", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Nombre:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versión:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Fecha:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Logo WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Otros archivos:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Proveedor:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Características ReactX ", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Sonido Hardware\nNivel de aceleración:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Probar DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Notas", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notas", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispositivos de entrada directa ", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Dispositivos de entrada ", -1, 10, 100, 452, 60
+    GROUPBOX "Dispositivos de entrada directa ", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Dispositivos de entrada ", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Información ", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Información ", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Proveedores de servicios DirectPlay registrados", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Proveedores de servicios DirectPlay registrados", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notas", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -220,4 +244,13 @@ BEGIN
     IDS_OPTION_NO "No"
     IDS_D3DTEST_DESCRIPTION "Va a comenzar la prueba del interfaz Direct3D. ¿Desea continuar?"
     IDS_D3DTEST_D3Dx "Esta prueba utilizará un interfaz Direct3D %u acelerado por hardware."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/fr-FR.rc b/reactos/base/applications/dxdiag/lang/fr-FR.rc
index cdfbddfa2da..a60fede0b7b 100644
--- a/reactos/base/applications/dxdiag/lang/fr-FR.rc
+++ b/reactos/base/applications/dxdiag/lang/fr-FR.rc
@@ -7,162 +7,186 @@ CAPTION "ReactX - Programme de diagnostic"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "Aide", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 223, 261, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Enregi&strer toutes les informations...", IDC_BUTTON_SAVE_INFO, 287, 261, 136, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 426, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Aide", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Enregi&strer toutes les informations...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Cet outil rapporte des informations détaillées à propos des composants ReactX et des drivers installés sur votre système.", -1, 10, 10, 443, 17
-    LTEXT "Si vous avez connaissance de la section d'où provient le problème, cliquez sur l'onglet approprié. Autrement, vous pouvez utiliser le bouton ""Page suivante"" ci-dessous pour visualiser chaque page.", -1, 10, 30, 443, 25
-    GROUPBOX "Informations système", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Date/heure actuelles :", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Nom de l'ordinateur :", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Système d'exploitation :", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Langue :", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Fabricant du système :", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Modèle du système :", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS :", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Processeur :", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Mémoire :", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Fichier cache :", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Version de ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Cet outil rapporte des informations détaillées à propos des composants ReactX et des drivers installés sur votre système.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Si vous avez connaissance de la section d'où provient le problème, cliquez sur l'onglet approprié. Autrement, vous pouvez utiliser le bouton ""Page suivante"" ci-dessous pour visualiser chaque page.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Informations système", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Date/heure actuelles :", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Nom de l'ordinateur :", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Système d'exploitation :", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Langue :", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Fabricant du système :", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Modèle du système :", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS :", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Processeur :", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Mémoire :", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Fichier cache :", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Version de ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Périphérique", -1, 10, 10, 220, 100
-    RTEXT "Nom :", -1, 20, 25, 70, 10
-    RTEXT "Fabricant :", -1, 20, 35, 70, 10
-    RTEXT "Type de puce :", -1, 20, 45, 70, 10
-    RTEXT "Type de DAC :", -1, 20, 55, 70, 10
-    RTEXT "Mémoire totale approx. :", -1, 14, 65, 75, 10
-    RTEXT "Mode d'affichage actuelle:", -1, 14, 75, 75, 10
-    RTEXT "Moniteur :", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Pilote", -1, 240, 10, 220, 100
-    RTEXT "Pilote principal:", -1, 245, 30, 55, 10
-    RTEXT "Version :", -1, 245, 40, 55, 10
-    RTEXT "Date :", -1, 245, 50, 55, 10
-    RTEXT "WHQL-Logo :", -1, 245, 60, 55, 10
-    RTEXT "Mini-VDD :", -1, 245, 70, 55, 10
-    RTEXT " vvdddVDD :", -1, 245, 80, 55, 10
-    RTEXT "Version DDI :", -1, 245, 90, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Fonctionnalités ReactX", -1, 10, 115, 450, 60
-    RTEXT "Accélération DirectDraw :", -1, 15, 130, 110, 12
-    RTEXT "Accélération Direct3D :", -1, 15, 145, 110, 12
-    RTEXT "Accélération des textures AGP :", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Activée", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Activée", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Activée", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Tester DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Tester Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Périphérique", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nom :", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Fabricant :", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Type de puce :", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Type de DAC :", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Mémoire totale approx. :", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Mode d'affichage actuelle:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Moniteur :", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Pilote", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Pilote principal:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version :", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Date :", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo :", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD :", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD :", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Version DDI :", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Fonctionnalités ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Accélération DirectDraw :", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Accélération Direct3D :", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Accélération des textures AGP :", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Activée", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Activée", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Activée", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Tester DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Tester Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Périphérique", -1, 10, 10, 250, 100
-    RTEXT "Nom :", -1, 20, 25, 70, 10
-    RTEXT "ID périphérique :", -1, 20, 35, 70, 10
-    RTEXT "ID fabricant :", -1, 20, 45, 70, 10
-    RTEXT "ID produit:", -1, 20, 55, 70, 10
-    RTEXT "Type :", -1, 20, 65, 70, 10
-    RTEXT "Périphérique par défaut :", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Pilote", -1, 270, 10, 190, 100
-    RTEXT "Nom :", -1, 275, 25, 55, 10
-    RTEXT "Version :", -1, 275, 35, 55, 10
-    RTEXT "Date :", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo :", -1, 275, 55, 55, 10
-    RTEXT "Autres fichiers :", -1, 275, 65, 55, 10
-    RTEXT "Fournisseur :", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Fonctionnalités ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Son matériel\nNiveau d'accélération :", -1, 20, 135, 90, 20
-    PUSHBUTTON "Tester DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Périphérique", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nom :", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ID périphérique :", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ID fabricant :", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ID produit:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Type :", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Périphérique par défaut :", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Pilote", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Nom :", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version :", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Date :", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo :", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Autres fichiers :", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Fournisseur :", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Fonctionnalités ReactX", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Son matériel\nNiveau d'accélération :", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Tester DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Périphériques DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Périphériques d'entrée", -1, 10, 100, 452, 60
+    GROUPBOX "Périphériques DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Périphériques d'entrée", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Information", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Information", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Fournisseur enregistré de service DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Fournisseur enregistré de service DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "Non"
     IDS_D3DTEST_DESCRIPTION "Ceci va démarrer le test de l'interface Direct3D. Continuer ?"
     IDS_D3DTEST_D3Dx "Ce test va utiliser l'interface Direct3D %u accélérée matériellement."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/he-IL.rc b/reactos/base/applications/dxdiag/lang/he-IL.rc
index 216b0894715..d3b12b1bc12 100644
--- a/reactos/base/applications/dxdiag/lang/he-IL.rc
+++ b/reactos/base/applications/dxdiag/lang/he-IL.rc
@@ -8,162 +8,186 @@ CAPTION "כלי אבחון - ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&עזרה", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&העמוד הבא", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&שמור את כל המידע...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&יציאה", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&עזרה", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&העמוד הבא", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&שמור את כל המידע...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&יציאה", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "כלי זה מדווח על מידע מפורט אודות הרכיבים ומנהלי ההתקנים של ReactX המותקנים במערכת שלך.", -1, 10, 10, 443, 17
-    LTEXT "אם ידוע לך התחום שגורם לבעיה, לחץ על הכרטיסייה המתאימה לעיל. אחרת, באפשרותך להשתמש בלחצן ""העמוד הבא"" להלן, כיד לבקר בכל עמוד לפי סדר", -1, 10, 30, 443, 25
-    GROUPBOX "מידע מערכת", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "תאריך/שעה נוכחיים:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "שם מחשב:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "מערכת הפעלה:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "שפה:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "יצרן המערכת:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "דגם המערכת:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "מעבד:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "זיכרון:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "קובץ החלפה:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "גרסת ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "כלי זה מדווח על מידע מפורט אודות הרכיבים ומנהלי ההתקנים של ReactX המותקנים במערכת שלך.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "אם ידוע לך התחום שגורם לבעיה, לחץ על הכרטיסייה המתאימה לעיל. אחרת, באפשרותך להשתמש בלחצן ""העמוד הבא"" להלן, כיד לבקר בכל עמוד לפי סדר", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "מידע מערכת", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "תאריך/שעה נוכחיים:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "שם מחשב:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "מערכת הפעלה:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "שפה:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "יצרן המערכת:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "דגם המערכת:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "מעבד:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "זיכרון:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "קובץ החלפה:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "גרסת ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "התקן", -1, 10, 10, 250, 100
-    RTEXT "שם:", -1, 20, 25, 70, 10
-    RTEXT "יצרן:", -1, 20, 35, 70, 10
-    RTEXT "סוג שבב:", -1, 20, 45, 70, 10
-    RTEXT "סוג DAC:", -1, 20, 55, 70, 10
-    RTEXT "זיכרון כולל בקירוב:", -1, 14, 65, 75, 10
-    RTEXT "מצב תצוגה נוכחי:", -1, 14, 75, 75, 10
-    RTEXT "צג:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "מנהלי התקנים", -1, 270, 10, 190, 100
-    RTEXT "מנהל התקן ראשי:", -1, 275, 25, 55, 10
-    RTEXT "גרסה:", -1, 275, 35, 55, 10
-    RTEXT "תאריך", -1, 275, 45, 55, 10
-    RTEXT "סימול WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "גירסת DD:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "תכונות ReactX", -1, 10, 115, 450, 60
-    RTEXT "תאוצת DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "תאוצת Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "תאוצת AGP Texture:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "אפשר", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "אפשר", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "אפשר", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "בדיקת DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "בדיקת Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "הערות", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "התקן", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "שם:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "יצרן:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "סוג שבב:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "סוג DAC:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "זיכרון כולל בקירוב:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "מצב תצוגה נוכחי:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "צג:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "מנהלי התקנים", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "מנהל התקן ראשי:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "גרסה:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "תאריך", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "סימול WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "גירסת DD:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "תכונות ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "תאוצת DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "תאוצת Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "תאוצת AGP Texture:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "אפשר", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "אפשר", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "אפשר", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "בדיקת DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "בדיקת Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "הערות", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "התקן", -1, 10, 10, 250, 100
-    RTEXT "שם:", -1, 20, 25, 70, 10
-    RTEXT "מזהה חומרה:", -1, 20, 35, 70, 10
-    RTEXT "מזהה יצרן:", -1, 20, 45, 70, 10
-    RTEXT "מזהה מוצר:", -1, 20, 55, 70, 10
-    RTEXT "סוג:", -1, 20, 65, 70, 10
-    RTEXT "התקן ברירת מחדל:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "מנהלי התקנים", -1, 270, 10, 190, 100
-    RTEXT "שם:", -1, 275, 25, 55, 10
-    RTEXT "גרסה:", -1, 275, 35, 55, 10
-    RTEXT "תאריך:", -1, 275, 45, 55, 10
-    RTEXT "סימול WHQL:", -1, 275, 55, 55, 10
-    RTEXT "קבצים אחרים:", -1, 275, 65, 55, 10
-    RTEXT "ספק:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "תכונות ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "רמת תאוצת קול של חומרה:", -1, 20, 135, 90, 20
-    PUSHBUTTON "בדוק DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "הערות", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "התקן", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "שם:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "מזהה חומרה:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "מזהה יצרן:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "מזהה מוצר:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "סוג:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "התקן ברירת מחדל:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "מנהלי התקנים", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "שם:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "גרסה:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "תאריך:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "סימול WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "קבצים אחרים:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "ספק:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "תכונות ReactX", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "רמת תאוצת קול של חומרה:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "בדוק DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "הערות", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "התקני DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "התקני קלט", -1, 10, 100, 452, 60
+    GROUPBOX "התקני DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "התקני קלט", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "הערות", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "הערות", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "ספקי שירות רשומים של DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "ספקי שירות רשומים של DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -219,4 +243,13 @@ BEGIN
     IDS_OPTION_NO "לא"
     IDS_D3DTEST_DESCRIPTION "פעולה זו תבדוק Direct3D בהתקן זה. האם להמשיך?"
     IDS_D3DTEST_D3Dx "בדיקה זו תשתמש בממשקי Direct3D %u המואצים באמצעות חומרה."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/it-IT.rc b/reactos/base/applications/dxdiag/lang/it-IT.rc
index 15b3fc7125f..bdfc99dcdd8 100644
--- a/reactos/base/applications/dxdiag/lang/it-IT.rc
+++ b/reactos/base/applications/dxdiag/lang/it-IT.rc
@@ -7,162 +7,186 @@ CAPTION "Programma di diagnostica ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Aiuto", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Prossima pagina", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Salva tutte le informazioni...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&uSCITA", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Aiuto", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&Prossima pagina", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Salva tutte le informazioni...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "&uSCITA", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Questo strumento riporta informazioni dettagliate sui componenti ReactX e dei driver installati sul sistema.", -1, 10, 10, 443, 17
-    LTEXT "Se si sa quale zona è la causa del problema, fare clic sopra la scheda appropriata. In caso contrario, è possibile utilizzare il tasto Pagina successiva qui sotto per visitare ogni pagina in sequenza.", -1, 10, 30, 443, 25
-    GROUPBOX "Informazioni di sistema", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Data/Ora:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Nome del computer:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Sistema operativo:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Lingua:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Produttore DI sistema:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Modello di Sistem :", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Processore:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Memoria:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Questo strumento riporta informazioni dettagliate sui componenti ReactX e dei driver installati sul sistema.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Se si sa quale zona è la causa del problema, fare clic sopra la scheda appropriata. In caso contrario, è possibile utilizzare il tasto Pagina successiva qui sotto per visitare ogni pagina in sequenza.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Informazioni di sistema", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Data/Ora:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Nome del computer:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Sistema operativo:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Lingua:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Produttore DI sistema:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Modello di Sistem :", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Processore:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Memoria:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Page file:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX-Version:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Device", -1, 10, 10, 250, 100
-    RTEXT "Nome:", -1, 20, 25, 70, 10
-    RTEXT "Fabbricante:", -1, 20, 35, 70, 10
-    RTEXT "Chip Type:", -1, 20, 45, 70, 10
-    RTEXT "DAC Type:", -1, 20, 55, 70, 10
-    RTEXT "Totale memnoria (Approssimativo):", -1, 14, 65, 75, 10
-    RTEXT "Modalità di visualizzazione corrente:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Driver Principale:", -1, 275, 25, 55, 10
-    RTEXT "Versione:", -1, 275, 35, 55, 10
-    RTEXT "Data:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI Version:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
-    RTEXT "Accelerazione DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Accelerazione Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Abilita", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Abilita", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Abilita", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Device", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nome:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Fabbricante:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Chip Type:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC Type:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Totale memnoria (Approssimativo):", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Modalità di visualizzazione corrente:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Driver Principale:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versione:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo'd:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI Version:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Accelerazione DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Accelerazione Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP Texture Acceleration:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Abilita", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Abilita", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Abilita", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Device", -1, 10, 10, 250, 100
-    RTEXT "Nome:", -1, 20, 25, 70, 10
-    RTEXT "Device ID:", -1, 20, 35, 70, 10
-    RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10
-    RTEXT "Product ID:", -1, 20, 55, 70, 10
-    RTEXT "Tipo:", -1, 20, 65, 70, 10
-    RTEXT "Default Device:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Nome:", -1, 275, 25, 55, 10
-    RTEXT "Versione:", -1, 275, 35, 55, 10
-    RTEXT "Data:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Altri Files:", -1, 275, 65, 55, 10
-    RTEXT "Provider:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Note", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Device", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nome:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Device ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Manufacturer ID:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Product ID:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Tipo:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Default Device:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Nome:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versione:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Altri Files:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Provider:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Features", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Hardware Sound\nAcceleration Level:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput Devices", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Input Devices", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput Devices", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Input Devices", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informazioni", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informazioni", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registered DirectPlay Service Provider", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "No"
     IDS_D3DTEST_DESCRIPTION "Avviare il test dell'interfaccia Direct3D. Continuare?"
     IDS_D3DTEST_D3Dx "Questo test utilizza accelerazione hardware dell'interfaccia Direct3D % u."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/ja-JP.rc b/reactos/base/applications/dxdiag/lang/ja-JP.rc
index 608dc399787..6548b4c7edd 100644
--- a/reactos/base/applications/dxdiag/lang/ja-JP.rc
+++ b/reactos/base/applications/dxdiag/lang/ja-JP.rc
@@ -7,162 +7,186 @@ CAPTION "ReactX 診断 プログラム"
 FONT 9, "MS UI Gothic"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "ヘルプ(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "次ページ(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "すべての情報を保存(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "終了(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "ヘルプ(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "次ページ(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "すべての情報を保存(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "終了(&E)", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "このツールを使うと、インストールされている ReactX コンポーネントやドライバの詳細情報を入手することができます。", -1, 10, 10, 443, 17
-    LTEXT "どの分野が問題を起こしているか分かっている場合は、適当なタブをクリックしてください。 それ以外の場合は、[次ページ] をクリックしてください。", -1, 10, 30, 443, 25
-    GROUPBOX "システム情報", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "現在の日時:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "コンピュータ名:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "オペレーティング システム:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "言語:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "システム製造元:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "システム モデル:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "プロセッサ:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "メモリ:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "ページ ファイル:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX バージョン:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "このツールを使うと、インストールされている ReactX コンポーネントやドライバの詳細情報を入手することができます。", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "どの分野が問題を起こしているか分かっている場合は、適当なタブをクリックしてください。 それ以外の場合は、[次ページ] をクリックしてください。", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "システム情報", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "現在の日時:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "コンピュータ名:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "オペレーティング システム:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "言語:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "システム製造元:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "システム モデル:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "プロセッサ:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "メモリ:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "ページ ファイル:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX バージョン:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "デバイス", -1, 10, 10, 250, 100
-    RTEXT "名前:", -1, 20, 25, 70, 10
-    RTEXT "製造元:", -1, 20, 35, 70, 10
-    RTEXT "チップの種類:", -1, 20, 45, 70, 10
-    RTEXT "DAC の種類:", -1, 20, 55, 70, 10
-    RTEXT "概算メモリ合計:", -1, 14, 65, 75, 10
-    RTEXT "現在のディスプレイ モード:", -1, 14, 75, 75, 10
-    RTEXT "モニタ:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "ドライバ", -1, 270, 10, 190, 100
-    RTEXT "メイン ドライバ:", -1, 275, 25, 55, 10
-    RTEXT "バージョン:", -1, 275, 35, 55, 10
-    RTEXT "日付:", -1, 275, 45, 55, 10
-    RTEXT "WHQL ロゴ付き:", -1, 275, 55, 55, 10
-    RTEXT "Mini VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDIのバージョン:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX の機能", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw アクセラレーション:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D アクセラレーション:", -1, 15, 145, 110, 12
-    RTEXT "AGP テクスチャ アクセラレーション:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "有効", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "有効", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "有効", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "DirectDraw のテスト", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Direct3D のテスト", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "注意", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "デバイス", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "名前:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "製造元:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "チップの種類:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC の種類:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "概算メモリ合計:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "現在のディスプレイ モード:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "モニタ:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ドライバ", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "メイン ドライバ:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "バージョン:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "日付:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL ロゴ付き:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDIのバージョン:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX の機能", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw アクセラレーション:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D アクセラレーション:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP テクスチャ アクセラレーション:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "有効", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "有効", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "有効", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "DirectDraw のテスト", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Direct3D のテスト", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "注意", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "デバイス", -1, 10, 10, 250, 100
-    RTEXT "名前:", -1, 20, 25, 70, 10
-    RTEXT "デバイス ID:", -1, 20, 35, 70, 10
-    RTEXT "製造元 ID:", -1, 20, 45, 70, 10
-    RTEXT "製品 ID:", -1, 20, 55, 70, 10
-    RTEXT "種類:", -1, 20, 65, 70, 10
-    RTEXT "既定のデバイス:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "ドライバ", -1, 270, 10, 190, 100
-    RTEXT "名前:", -1, 275, 25, 55, 10
-    RTEXT "バージョン:", -1, 275, 35, 55, 10
-    RTEXT "日付:", -1, 275, 45, 55, 10
-    RTEXT "WHQL ロゴ付き:", -1, 275, 55, 55, 10
-    RTEXT "他のファイル:", -1, 275, 65, 55, 10
-    RTEXT "供給元:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX の機能", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "ハードウェア サウンド\nアクセラレーション レベル:", -1, 20, 135, 90, 20
-    PUSHBUTTON "DirectSound のテスト", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "注意", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "デバイス", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "名前:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "デバイス ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "製造元 ID:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "製品 ID:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "種類:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "既定のデバイス:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ドライバ", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "名前:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "バージョン:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "日付:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL ロゴ付き:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "他のファイル:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "供給元:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX の機能", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Hardware Sound\nAcceleration Level:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "DirectSound のテスト", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "注意", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "DirectInput デバイス", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "入力デバイス", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput デバイス", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "入力デバイス", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "情報", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "情報", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "登録済み DirectPlay サービス プロバイダ", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "登録済み DirectPlay サービス プロバイダ", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "いいえ"
     IDS_D3DTEST_DESCRIPTION "Direct3D インタフェーステストを開始しようとしています。続行しますか?"
     IDS_D3DTEST_D3Dx "このテストはハードウェア アクセラーレータ Direct3D %u インターフェイスを使います。"
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/ko-KR.rc b/reactos/base/applications/dxdiag/lang/ko-KR.rc
index 04a5232bcac..d1f94619024 100644
--- a/reactos/base/applications/dxdiag/lang/ko-KR.rc
+++ b/reactos/base/applications/dxdiag/lang/ko-KR.rc
@@ -9,9 +9,9 @@ CAPTION "ReactX 분석 도구"
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "도움말(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "다음 장(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "모든 정보 저장(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "도움말(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "다음 장(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "모든 정보 저장(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "종료(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
@@ -19,152 +19,176 @@ IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT "이 프로그램은 ReactX와 컴포넌트, 드라이버에 대한 자세한 정보를 제공합니다.", -1, 10, 10, 443, 17
-    LTEXT "당신이 어떤 부분에서 오류가 발생하는지 아신다면 위의 탭을 클릭해 주세요.그렇지 않다면 ""다음 장"" 버튼을 이용해 각 장을 하나하나 살펴보세요.", -1, 10, 30, 443, 25
-    GROUPBOX "시스템 정보", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "현재 날짜/시간:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "컴퓨터 이름:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "운영 체제:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "언어:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "시스템 제조자:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "시스템 모델:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "프로세서:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "메모리:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "페이지 파일:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX 버젼:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "이 프로그램은 ReactX와 컴포넌트, 드라이버에 대한 자세한 정보를 제공합니다.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "당신이 어떤 부분에서 오류가 발생하는지 아신다면 위의 탭을 클릭해 주세요.그렇지 않다면 ""다음 장"" 버튼을 이용해 각 장을 하나하나 살펴보세요.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "시스템 정보", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "현재 날짜/시간:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "컴퓨터 이름:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "운영 체제:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "언어:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "시스템 제조자:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "시스템 모델:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "프로세서:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "메모리:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "페이지 파일:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX 버젼:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "장치", -1, 10, 10, 250, 100
-    RTEXT "이름:", -1, 20, 25, 70, 10
-    RTEXT "제조자:", -1, 20, 35, 70, 10
-    RTEXT "칩 타입:", -1, 20, 45, 70, 10
-    RTEXT "DAC 타입:", -1, 20, 55, 70, 10
-    RTEXT "총 메모리:", -1, 14, 65, 75, 10
-    RTEXT "현재 디스플레이 모드:", -1, 14, 75, 75, 10
-    RTEXT "모니터:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "드라이버", -1, 270, 10, 190, 100
-    RTEXT "메인 드라이버:", -1, 275, 25, 55, 10
-    RTEXT "버젼:", -1, 275, 35, 55, 10
-    RTEXT "날짜:", -1, 275, 45, 55, 10
-    RTEXT "WHQL 로고:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI 버젼:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX-기능", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw 가속:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D 가속:", -1, 15, 145, 110, 12
-    RTEXT "AGP 텍스쳐 가속:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "활성화", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "활성화", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "활성화", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "DirectDraw 시험", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Direct3D 시험", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "참고", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "장치", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "이름:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "제조자:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "칩 타입:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC 타입:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "총 메모리:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "현재 디스플레이 모드:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "모니터:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "드라이버", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "메인 드라이버:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "버젼:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "날짜:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL 로고:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI 버젼:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-기능", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw 가속:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D 가속:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP 텍스쳐 가속:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "활성화", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "활성화", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "활성화", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "DirectDraw 시험", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Direct3D 시험", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "참고", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "장치", -1, 10, 10, 250, 100
-    RTEXT "이름:", -1, 20, 25, 70, 10
-    RTEXT "장치 ID:", -1, 20, 35, 70, 10
-    RTEXT "제조사 ID:", -1, 20, 45, 70, 10
-    RTEXT "제품 ID:", -1, 20, 55, 70, 10
-    RTEXT "타입:", -1, 20, 65, 70, 10
-    RTEXT "기본 장치:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "드라이버", -1, 270, 10, 190, 100
-    RTEXT "이름:", -1, 275, 25, 55, 10
-    RTEXT "버젼:", -1, 275, 35, 55, 10
-    RTEXT "날짜:", -1, 275, 45, 55, 10
-    RTEXT "WHQL 로고:", -1, 275, 55, 55, 10
-    RTEXT "기타 파일:", -1, 275, 65, 55, 10
-    RTEXT "공급자:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX 기능", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "하드웨어 소리\n가속 수준:", -1, 20, 135, 90, 20
-    PUSHBUTTON "DirectSound 테스트", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "참고", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "장치", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "이름:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "장치 ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "제조사 ID:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "제품 ID:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "타입:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "기본 장치:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "드라이버", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "이름:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "버젼:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "날짜:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL 로고:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "기타 파일:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "공급자:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX 기능", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "하드웨어 소리\n가속 수준:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "DirectSound 테스트", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "참고", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput 장치", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "입력 장치", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput 장치", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "입력 장치", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "정보", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "정보", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "등록된 DirectPlay 서비스 공급자", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "등록된 DirectPlay 서비스 공급자", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -220,4 +244,13 @@ BEGIN
     IDS_OPTION_NO "아니오"
     IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?"
     IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/nl-NL.rc b/reactos/base/applications/dxdiag/lang/nl-NL.rc
index b7d4955be2d..787cc518c9c 100644
--- a/reactos/base/applications/dxdiag/lang/nl-NL.rc
+++ b/reactos/base/applications/dxdiag/lang/nl-NL.rc
@@ -7,9 +7,9 @@ CAPTION "Diagnostisch hulpprogramma voor ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Volgende Pagina", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Alle gegevens opslaan...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Volgende Pagina", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Alle gegevens opslaan...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "&Afsluiten", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
@@ -17,152 +17,176 @@ IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Dit hulpprogramma geeft gedetailleerde information over de op dit systeem geïnstalleerde ReactX-onderdelen en stuurprogrammas.", -1, 10, 10, 443, 17
-    LTEXT "Als u weet welk gebied het probleem veroorzaakt, kunt u hierboven op het desbetreffende tabblad klikken. Weet u dit niet, dan klikt u op de knop ""Volgende pagina"" om elke pagina te bekijken.", -1, 10, 30, 443, 25
-    GROUPBOX "Systeeminfo", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Huidige Datum/Tijd:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Computernaam:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Besturingssysteem:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Taal:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Systeemfabrikant:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Systeemmodel:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Geheugen:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Wisselbestand:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX-Versie:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Dit hulpprogramma geeft gedetailleerde information over de op dit systeem geïnstalleerde ReactX-onderdelen en stuurprogrammas.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Als u weet welk gebied het probleem veroorzaakt, kunt u hierboven op het desbetreffende tabblad klikken. Weet u dit niet, dan klikt u op de knop ""Volgende pagina"" om elke pagina te bekijken.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Systeeminfo", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Huidige Datum/Tijd:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Computernaam:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Besturingssysteem:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Taal:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Systeemfabrikant:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Systeemmodel:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Processor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Geheugen:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Wisselbestand:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX-Versie:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Apparaat", -1, 10, 10, 250, 100
-    RTEXT "Naam:", -1, 20, 25, 70, 10
-    RTEXT "Fabrikans:", -1, 20, 35, 70, 10
-    RTEXT "Chip-type:", -1, 20, 45, 70, 10
-    RTEXT "DAC-type:", -1, 20, 55, 70, 10
-    RTEXT "Totaal geheugen:", -1, 14, 65, 75, 10
-    RTEXT "Huidige resolutie:", -1, 14, 75, 75, 10
-    RTEXT "Beeldscherm:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Stuurprogramma's", -1, 270, 10, 190, 100
-    RTEXT "Stuurprogramma:", -1, 275, 25, 55, 10
-    RTEXT "Versie:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI-versie:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX-functies", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw-versnelling:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D-versnelling:", -1, 15, 145, 110, 12
-    RTEXT "AGP-oppervlakteversnelling:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Inschakelen", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Inschakelen", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Inschakelen", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "DirectDraw testen", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Direct3D testen", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Opmerkingen", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Apparaat", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Naam:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Fabrikans:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Chip-type:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC-type:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Totaal geheugen:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Huidige resolutie:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Beeldscherm:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Stuurprogramma's", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Stuurprogramma:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versie:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI-versie:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-functies", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw-versnelling:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D-versnelling:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP-oppervlakteversnelling:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Inschakelen", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Inschakelen", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Inschakelen", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "DirectDraw testen", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Direct3D testen", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Opmerkingen", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Apparaat", -1, 10, 10, 250, 100
-    RTEXT "Naam:", -1, 20, 25, 70, 10
-    RTEXT "Apparaat-ID:", -1, 20, 35, 70, 10
-    RTEXT "Fabrikant-ID:", -1, 20, 45, 70, 10
-    RTEXT "Product-ID:", -1, 20, 55, 70, 10
-    RTEXT "Type:", -1, 20, 65, 70, 10
-    RTEXT "Standaardapparaat:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Stuurprogramma's", -1, 270, 10, 190, 100
-    RTEXT "Naam:", -1, 275, 25, 55, 10
-    RTEXT "Versie:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Andere bestanden:", -1, 275, 65, 55, 10
-    RTEXT "Leverancier:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX-functies", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Versnellingsniveau van hardwaregeluid:", -1, 20, 135, 90, 20
-    PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Opmerkingen", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Apparaat", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Naam:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Apparaat-ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Fabrikant-ID:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Product-ID:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Type:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Standaardapparaat:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Stuurprogramma's", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Naam:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versie:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Andere bestanden:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Leverancier:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-functies", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Versnellingsniveau van hardwaregeluid:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "DirectSound testen", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Opmerkingen", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput-apparaten", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Aan invoer gerelateerde apparaten", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput-apparaten", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Aan invoer gerelateerde apparaten", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "opmerkingen", -1, 10, 170, 352, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "opmerkingen", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registreerde DirectPlay serviceproviders", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registreerde DirectPlay serviceproviders", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "Nee"
     IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?"
     IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/no-NO.rc b/reactos/base/applications/dxdiag/lang/no-NO.rc
index b656f5a455e..4ba16e78652 100644
--- a/reactos/base/applications/dxdiag/lang/no-NO.rc
+++ b/reactos/base/applications/dxdiag/lang/no-NO.rc
@@ -7,162 +7,186 @@ CAPTION "ReactX-diagnose program"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Hjelp", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Neste side", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Lagre alt informasjon...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Avslutt", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Hjelp", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Neste side", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Lagre alt informasjon...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Avslutt", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Dette verktøyet rapporterer detaljert informasjon om ReactX komponenter og enheter som er installert på ditt system.", -1, 10, 10, 443, 17
-    LTEXT "Hvis du vet hvilket område som skaper problemer, velger du den aktuelle kategorien ovenfor. Hvis ikke, kan du bruke knappen ""Neste side"" nedenfor for å besøke alle sidene sekvensielt.", -1, 10, 30, 443, 25
-    GROUPBOX "System Informasjon", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Nåværende Dato/Tid:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Datamaskin Navn:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Operativsystem:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Språk:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "System fabrikant:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "System modell:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Prosessor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Minne:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Sideveksel fil:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX-Versjon:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Dette verktøyet rapporterer detaljert informasjon om ReactX komponenter og enheter som er installert på ditt system.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Hvis du vet hvilket område som skaper problemer, velger du den aktuelle kategorien ovenfor. Hvis ikke, kan du bruke knappen ""Neste side"" nedenfor for å besøke alle sidene sekvensielt.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "System Informasjon", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Nåværende Dato/Tid:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Datamaskin Navn:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Operativsystem:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Språk:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "System fabrikant:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "System modell:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Prosessor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Minne:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Sideveksel fil:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX-Versjon:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Enhet", -1, 10, 10, 250, 100
-    RTEXT "Navn:", -1, 20, 25, 70, 10
-    RTEXT "Fabrikant:", -1, 20, 35, 70, 10
-    RTEXT "Brikketype:", -1, 20, 45, 70, 10
-    RTEXT "DAC type:", -1, 20, 55, 70, 10
-    RTEXT "Cirka total minne:", -1, 14, 65, 75, 10
-    RTEXT "Gjeldende skjermmodus:", -1, 14, 75, 75, 10
-    RTEXT "Skjerm:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Hoved driver:", -1, 275, 25, 55, 10
-    RTEXT "Versjon:", -1, 275, 35, 55, 10
-    RTEXT "Dato:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI Versjon:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX-Funksjoner", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw akselerasjon:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D akselerasjon:", -1, 15, 145, 110, 12
-    RTEXT "AGP tekstur akselerasjon:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Aktivert", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Aktivert", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Aktivert", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Merknader", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Enhet", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Navn:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Fabrikant:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Brikketype:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC type:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Cirka total minne:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Gjeldende skjermmodus:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Skjerm:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Hoved driver:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versjon:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Dato:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI Versjon:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Funksjoner", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw akselerasjon:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D akselerasjon:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP tekstur akselerasjon:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Aktivert", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktivert", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktivert", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Merknader", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Enheter", -1, 10, 10, 250, 100
-    RTEXT "Navn:", -1, 20, 25, 70, 10
-    RTEXT "Enhet ID:", -1, 20, 35, 70, 10
-    RTEXT "Fabrikant ID:", -1, 20, 45, 70, 10
-    RTEXT "Produkt ID:", -1, 20, 55, 70, 10
-    RTEXT "Type:", -1, 20, 65, 70, 10
-    RTEXT "Standard enhet:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Navn:", -1, 275, 25, 55, 10
-    RTEXT "Versjon:", -1, 275, 35, 55, 10
-    RTEXT "Dato:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Andre filer:", -1, 275, 65, 55, 10
-    RTEXT "Fabrikant:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX-Funksjoner", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Maskinvare lyd\nAcceleration Level:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Merknader", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Enheter", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Navn:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Enhet ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Fabrikant ID:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Produkt ID:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Type:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Standard enhet:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Navn:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versjon:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Dato:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Andre filer:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Fabrikant:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Funksjoner", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Maskinvare lyd\nAcceleration Level:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Merknader", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Direkteinndata enheter", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Inndata enheter", -1, 10, 100, 452, 60
+    GROUPBOX "Direkteinndata enheter", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Inndata enheter", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informasjon", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informasjon", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registert DirectPlay tjeneste leverandør", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registert DirectPlay tjeneste leverandør", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "Nei"
     IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?"
     IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/pl-PL.rc b/reactos/base/applications/dxdiag/lang/pl-PL.rc
index 92e5c84b17d..6b75f3a3bd1 100644
--- a/reactos/base/applications/dxdiag/lang/pl-PL.rc
+++ b/reactos/base/applications/dxdiag/lang/pl-PL.rc
@@ -16,162 +16,186 @@ CAPTION "Narzędzie diagnostyki ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Następna", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Wyjście", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Następna", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Wyjście", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ten program dostarcza szczegółowe dane o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", -1, 10, 10, 443, 17
-    LTEXT "Jeśli wiesz już, gdzie tkwi błąd, kliknij na odpowiednią zakładkę. W innym wypadku możesz przejść przez wszystkie zakładki przyciskiem Następna", -1, 10, 30, 443, 25
-    GROUPBOX "Informacje o systemie", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Data i czas:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Nazwa komputera:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "System operacyjny:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Język:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Producent:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Model:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Pamięć:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Plik wymiany:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Wersja ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Ten program dostarcza szczegółowe dane o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Jeśli wiesz już, gdzie tkwi błąd, kliknij na odpowiednią zakładkę. W innym wypadku możesz przejść przez wszystkie zakładki przyciskiem Następna", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Informacje o systemie", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Data i czas:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Nazwa komputera:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "System operacyjny:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Język:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Producent:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Model:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Procesor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Pamięć:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Plik wymiany:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Wersja ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Urządzenie", -1, 10, 10, 220, 100
-    RTEXT "Nazwa:", -1, 20, 25, 70, 10
-    RTEXT "Producent:", -1, 20, 35, 70, 10
-    RTEXT "GPU:", -1, 20, 45, 70, 10
-    RTEXT "Typ DAC:", -1, 20, 55, 70, 10
-    RTEXT "Pamięć:", -1, 14, 65, 75, 10
-    RTEXT "Bieżąca rozdzielczość:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Sterownik", -1, 240, 10, 190, 100
-    RTEXT "Główny sterownik:", -1, 245, 30, 55, 10
-    RTEXT "Wersja:", -1, 245, 40, 55, 10
-    RTEXT "Data:", -1, 245, 50, 55, 10
-    RTEXT "WHQL:", -1, 245, 60, 55, 10
-    RTEXT "Mini-VDD:", -1, 245, 70, 55, 10
-    RTEXT " vvdddVDD:", -1, 245, 80, 55, 10
-    RTEXT "Wersja DDI:", -1, 245, 90, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "Teksturowanie AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Włącz", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Włącz", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Włącz", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Testuj DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Testuj Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Uwagi", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Urządzenie", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nazwa:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Producent:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "GPU:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Typ DAC:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Pamięć:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Bieżąca rozdzielczość:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Sterownik", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Główny sterownik:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Wersja:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Wersja DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Teksturowanie AGP:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Włącz", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Włącz", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Włącz", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Testuj DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Testuj Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Uwagi", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Urządzenie", -1, 10, 10, 250, 100
-    RTEXT "Nazwa:", -1, 20, 25, 70, 10
-    RTEXT "ID Urządzenia:", -1, 20, 35, 70, 10
-    RTEXT "ID Producenta:", -1, 20, 45, 70, 10
-    RTEXT "ID Produktu:", -1, 20, 55, 70, 10
-    RTEXT "Typ:", -1, 20, 65, 70, 10
-    RTEXT "Urządzenie domyślne:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Sterownik", -1, 270, 10, 190, 100
-    RTEXT "Nazwa:", -1, 275, 25, 55, 10
-    RTEXT "Wersja:", -1, 275, 35, 55, 10
-    RTEXT "Data:", -1, 275, 45, 55, 10
-    RTEXT "Logo WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Inne pliki:", -1, 275, 65, 55, 10
-    RTEXT "Dostawca:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX-", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Przyspieszenie sprzętowe\nPoziom:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Uwagi", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Urządzenie", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nazwa:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ID Urządzenia:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ID Producenta:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ID Produktu:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Typ:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Urządzenie domyślne:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Sterownik", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Nazwa:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Wersja:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Logo WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Inne pliki:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Dostawca:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Przyspieszenie sprzętowe\nPoziom:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Uwagi", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Urządzenia DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Urządzenia wejścia", -1, 10, 100, 452, 60
+    GROUPBOX "Urządzenia DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Urządzenia wejścia", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informacje", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informacje", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Zarejestrowani dostawcy usług DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Zarejestrowani dostawcy usług DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -227,4 +251,13 @@ BEGIN
     IDS_OPTION_NO "Nie"
     IDS_D3DTEST_DESCRIPTION "Uruchomiony zostanie test interfejsu Direct3D. Kontynuować?"
     IDS_D3DTEST_D3Dx "Test obejmie przyspieszany sprzętowo interfejs Direct3D dla %u."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/pt-BR.rc b/reactos/base/applications/dxdiag/lang/pt-BR.rc
index f3b9b079a42..13e314ff0e5 100644
--- a/reactos/base/applications/dxdiag/lang/pt-BR.rc
+++ b/reactos/base/applications/dxdiag/lang/pt-BR.rc
@@ -9,162 +9,186 @@ CAPTION "Programa de Diagnóstico ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Ajuda", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Próxima página", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Sal&var Informações...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Sai&r", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Ajuda", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Próxima página", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Sal&var Informações...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Sai&r", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Esta ferramenta fornece informações detalhadas sobre os componentes e drivers do ReactX instalados no sistema.", -1, 10, 10, 443, 17
-    LTEXT "Se você souber que área está causando o problema, clique na guia adequada acima. Caso contrário, você pode usar o botão ""Próxima página"" abaixo para visitar cada página em sequência.", -1, 10, 30, 443, 25
-    GROUPBOX "Informações do sistema", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Data/hora atual:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Nome do computador:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Sistema pperacional:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Idioma:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Fabricante do sistema:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Modelo do sistema:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Processador:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Memória:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Arquivo de paginação:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Versão do ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Esta ferramenta fornece informações detalhadas sobre os componentes e drivers do ReactX instalados no sistema.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Se você souber que área está causando o problema, clique na guia adequada acima. Caso contrário, você pode usar o botão ""Próxima página"" abaixo para visitar cada página em sequência.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Informações do sistema", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Data/hora atual:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Nome do computador:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Sistema pperacional:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Idioma:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Fabricante do sistema:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Modelo do sistema:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Processador:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Memória:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Arquivo de paginação:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Versão do ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispositivo", -1, 10, 10, 250, 100
-    RTEXT "Nome:", -1, 20, 25, 70, 10
-    RTEXT "Fabricante:", -1, 20, 35, 70, 10
-    RTEXT "Tipo de processador:", -1, 20, 45, 70, 10
-    RTEXT "Conv. analógico-digital:", -1, 20, 55, 70, 10
-    RTEXT "Total aprox. memória:", -1, 14, 65, 75, 10
-    RTEXT "Modo de exib. atual:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Drivers", -1, 270, 10, 190, 100
-    RTEXT "Driver principal:", -1, 275, 25, 55, 10
-    RTEXT "Versão:", -1, 275, 35, 55, 10
-    RTEXT "Data:", -1, 275, 45, 55, 10
-    RTEXT "Assinado por WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "Versão do DDI:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Recursos dos ReactX", -1, 10, 115, 450, 60
-    RTEXT "Aceleração do DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Aceleração do Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "Aceleração de textura AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Ativado", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Ativado", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Ativado", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Testar DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Testar Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Observações", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Dispositivo", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nome:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Fabricante:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Tipo de processador:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Conv. analógico-digital:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Total aprox. memória:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Modo de exib. atual:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Drivers", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Driver principal:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versão:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Assinado por WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Versão do DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Aceleração do DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Aceleração do Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Aceleração de textura AGP:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Ativado", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Ativado", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Ativado", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Testar DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Testar Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Observações", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispositivo", -1, 10, 10, 250, 100
-    RTEXT "Nome:", -1, 20, 25, 70, 10
-    RTEXT "ID do Hardware:", -1, 20, 35, 70, 10
-    RTEXT "Ident. do fabricante:", -1, 20, 45, 70, 10
-    RTEXT "Ident. do produto (Product ID):", -1, 20, 55, 70, 10
-    RTEXT "Tipo:", -1, 20, 65, 70, 10
-    RTEXT "Dispositivo padrão:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Drivers", -1, 270, 10, 190, 100
-    RTEXT "Nome:", -1, 275, 25, 55, 10
-    RTEXT "Versão:", -1, 275, 35, 55, 10
-    RTEXT "Data:", -1, 275, 45, 55, 10
-    RTEXT "Assinado por WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Outros arquivos:", -1, 275, 65, 55, 10
-    RTEXT "Provedor:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Recursos do ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Hardware de Som\nNível de Aceleração:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Testar DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Observações", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Dispositivo", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nome:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ID do Hardware:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Ident. do fabricante:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Ident. do produto (Product ID):", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Tipo:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Dispositivo padrão:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Drivers", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Nome:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versão:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Assinado por WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Outros arquivos:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Provedor:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Hardware de Som\nNível de Aceleração:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Testar DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Observações", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispositivos do DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Dispositivos relacionados a entrada", -1, 10, 100, 452, 60
+    GROUPBOX "Dispositivos do DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Dispositivos relacionados a entrada", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informações", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informações", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Provedor de Serviço DirectPlay Registrado", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Provedor de Serviço DirectPlay Registrado", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -220,4 +244,13 @@ BEGIN
     IDS_OPTION_NO "Não"
     IDS_D3DTEST_DESCRIPTION "Será iniciada a interface de teste do Direct3D. Prosseguir?"
     IDS_D3DTEST_D3Dx "Este teste utilizará a interface Direct3D %u com aceleração por hardware."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/ro-RO.rc b/reactos/base/applications/dxdiag/lang/ro-RO.rc
index 7698cade3fb..6a82e51c428 100644
--- a/reactos/base/applications/dxdiag/lang/ro-RO.rc
+++ b/reactos/base/applications/dxdiag/lang/ro-RO.rc
@@ -14,162 +14,186 @@ CAPTION "Diagnostic ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Manual…", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Următorul compartiment", IDC_BUTTON_NEXT, 187, 261, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Păstrare informații…", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Î&nchide", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Manual…", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Următorul compartiment", IDC_BUTTON_NEXT, 187, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Păstrare informații…", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "Î&nchide", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Acest instrument oferă informații detaliate despre componentele ReactX și modulele-pilot instalate în sistem.", -1, 10, 10, 443, 17
-    LTEXT "Dacă aveți la cunoștință careva probleme la o anumită categorie, mergeți la compartimentul corespunzător de mai sus. Altfel, puteți utiliza butonul „Următorul compartiment” de mai jos pentru a trece secvențial prin fiecare categorie.", -1, 10, 30, 443, 25
-    GROUPBOX "Informații despre sistem", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Data/Ora curentă:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Numele calculatorului:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Sistemul de operare:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Limba:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Producătorul sistemului:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Modelul sistemului:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Memorie:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Fișierul de paginare:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Versiunea ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Acest instrument oferă informații detaliate despre componentele ReactX și modulele-pilot instalate în sistem.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Dacă aveți la cunoștință careva probleme la o anumită categorie, mergeți la compartimentul corespunzător de mai sus. Altfel, puteți utiliza butonul „Următorul compartiment” de mai jos pentru a trece secvențial prin fiecare categorie.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Informații despre sistem", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Data/Ora curentă:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Numele calculatorului:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Sistemul de operare:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Limba:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Producătorul sistemului:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Modelul sistemului:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Procesor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Memorie:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Fișierul de paginare:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Versiunea ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispozitiv", -1, 10, 10, 250, 100
-    RTEXT "Nume:", -1, 20, 25, 70, 10
-    RTEXT "Producător:", -1, 20, 35, 70, 10
-    RTEXT "Tipul cipului:", -1, 20, 45, 70, 10
-    RTEXT "Tipul CDA:", -1, 20, 55, 70, 10
-    RTEXT "Memorie aprox.:", -1, 14, 65, 75, 10
-    RTEXT "Afișare curentă:", -1, 14, 75, 75, 10
-    RTEXT "Ecran:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Modúl-pilot", -1, 270, 10, 190, 100
-    RTEXT "Modulul-pilot primar:", -1, 275, 25, 55, 10
-    RTEXT "Versiune:", -1, 275, 35, 55, 10
-    RTEXT "Dată:", -1, 275, 45, 55, 10
-    RTEXT "Semnăt. WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT "VDD:", -1, 275, 75, 55, 10
-    RTEXT "Versiune DDI:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Funcționalități ReactX", -1, 10, 115, 450, 60
-    RTEXT "Accelerare DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Accelerare Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "Accelerare Textură AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Activează", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Activează", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Activează", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Testează DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Testează Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Note", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Dispozitiv", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nume:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Producător:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Tipul cipului:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Tipul CDA:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Memorie aprox.:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Afișare curentă:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Ecran:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Modúl-pilot", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Modulul-pilot primar:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versiune:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Dată:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Semnăt. WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Versiune DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Accelerare DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Accelerare Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Accelerare Textură AGP:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Activează", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Activează", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Activează", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Testează DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Testează Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispozitiv", -1, 10, 10, 250, 100
-    RTEXT "Nume:", -1, 20, 25, 70, 10
-    RTEXT "ID dispozitiv:", -1, 20, 35, 70, 10
-    RTEXT "ID producător:", -1, 20, 45, 70, 10
-    RTEXT "ID produs:", -1, 20, 55, 70, 10
-    RTEXT "Tip:", -1, 20, 65, 70, 10
-    RTEXT "Dispozitiv implicit:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Modúl-pilot", -1, 270, 10, 190, 100
-    RTEXT "Nume:", -1, 275, 25, 55, 10
-    RTEXT "Versiune:", -1, 275, 35, 55, 10
-    RTEXT "Dată:", -1, 275, 45, 55, 10
-    RTEXT "Semnătură WHQL:", -1, 275, 55, 55, 10
-    RTEXT "Alte fișiere:", -1, 275, 65, 55, 10
-    RTEXT "Furnizor:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Funcționalități ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Echipament de sunet\nNivel de accelerare:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Testează DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Note", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Dispozitiv", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Nume:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ID dispozitiv:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ID producător:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ID produs:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Tip:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Dispozitiv implicit:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Modúl-pilot", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Nume:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versiune:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Dată:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Semnătură WHQL:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Alte fișiere:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Furnizor:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Funcționalități ReactX", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Echipament de sunet\nNivel de accelerare::", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Testează DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Note", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Dispozitive DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Dispozitive de intrare", -1, 10, 100, 452, 60
+    GROUPBOX "Dispozitive DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Dispozitive de intrare", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informații", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informații", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Furnizori înregistrați de servicii DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Furnizori înregistrați de servicii DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -225,4 +249,13 @@ BEGIN
     IDS_OPTION_NO "Nu"
     IDS_D3DTEST_DESCRIPTION "Urmează testul de interfață Direct3D. Continuați?"
     IDS_D3DTEST_D3Dx "Testul următor va utiliza interfața Direct3D %u cu accelerare de echipament fizic."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/ru-RU.rc b/reactos/base/applications/dxdiag/lang/ru-RU.rc
index df780b60b05..e8ec937cd5d 100644
--- a/reactos/base/applications/dxdiag/lang/ru-RU.rc
+++ b/reactos/base/applications/dxdiag/lang/ru-RU.rc
@@ -7,162 +7,186 @@ CAPTION "Средство диагностики ReactX"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Справка", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Следующая страница", IDC_BUTTON_NEXT, 203, 260, 94, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "С&охранить всю информацию...", IDC_BUTTON_SAVE_INFO, 301, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Справка", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
+    DEFPUSHBUTTON "&Следующая страница", IDC_BUTTON_NEXT, 237, 260, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "С&охранить всю информацию...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "&Выход", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
-IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 190
+IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Данная программа позволяет получить подробные сведения об установленных компонентах и драйверах ReactX.", -1, 10, 10, 443, 17
-    LTEXT "Если известна возможная причина неполадки, можно сразу выбрать соответствующую вкладку. В противном случае используйте кнопку ""Следующая страница"" для последовательного просмотра страниц.", -1, 10, 30, 443, 25
-    GROUPBOX "Сведения о системе", -1, 10, 58, 443, 130, SS_RIGHT
-    LTEXT "Текущие время и дата:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Имя компьютера:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Операционная система:", -1, 50, 90, 100, 10, SS_RIGHT
-    LTEXT "Язык:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Изготовитель компьютера:", -1, 50, 110, 100, 10, SS_RIGHT
-    LTEXT "Модель компьютера:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Процессор:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Память:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Файл подкачки:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Версия ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Данная программа позволяет получить подробные сведения об установленных компонентах и драйверах ReactX.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Если известна возможная причина неполадки, можно сразу выбрать соответствующую вкладку. В противном случае используйте кнопку ""Следующая страница"" для последовательного просмотра страниц.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Сведения о системе", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Текущие время и дата:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Имя компьютера:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Операционная система:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Язык:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Изготовитель компьютера:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Модель компьютера:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Процессор:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Память:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Файл подкачки:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Версия ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 220, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 215, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Устройство", -1, 10, 10, 220, 100
-    RTEXT "Имя:", -1, 20, 25, 70, 10
-    RTEXT "Изготовитель:", -1, 20, 35, 70, 10
-    RTEXT "Тип микросхем:", -1, 20, 45, 70, 10
-    RTEXT "Тип конвертера DAC:", -1, 15, 55, 75, 10
-    RTEXT "Всего памяти:", -1, 14, 65, 75, 10
-    RTEXT "Режим экрана:", -1, 14, 75, 75, 10
-    RTEXT "Монитор:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Драйверы", -1, 240, 10, 220, 100
-    RTEXT "Главный:", -1, 245, 30, 55, 10
-    RTEXT "Версия:", -1, 245, 40, 55, 10
-    RTEXT "Дата:", -1, 245, 50, 55, 10
-    RTEXT "Подпись:", -1, 245, 60, 55, 10
-    RTEXT "Мини-VDD:", -1, 245, 70, 55, 10
-    RTEXT "VDD:", -1, 245, 80, 55, 10
-    RTEXT "Версия DDI:", -1, 245, 90, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Возможности ReactX", -1, 10, 115, 450, 65
-    RTEXT "Ускорение DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Ускорение Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "Ускорение текстур AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Включить", IDC_BUTTON_DDRAW, 170, 126, 60, 14, WS_DISABLED
-    PUSHBUTTON "Включить", IDC_BUTTON_D3D, 170, 142, 60, 14, WS_DISABLED
-    PUSHBUTTON "Включить", IDC_BUTTON_AGP, 170, 158, 60, 14, WS_DISABLED
-    PUSHBUTTON "Проверка DirectDraw", IDC_BUTTON_TESTDD, 250, 126, 80, 14
-    PUSHBUTTON "Проверка Direct3D", IDC_BUTTON_TEST3D, 250, 142, 80, 14
-    GROUPBOX "Примечания", -1, 10, 185, 450, 34
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Устройство", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Имя:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Изготовитель:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Тип микросхем:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Тип конвертера DAC:", IDC_STATIC, 7, 40, 80, 10
+    RTEXT "Всего памяти:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Режим экрана:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Монитор:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Драйверы", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Главный:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Версия:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Дата:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Подпись:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Мини-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Версия DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Возможности ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Ускорение DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Ускорение Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Ускорение текстур AGP:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Включить", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Включить", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Включить", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Проверка DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Проверка Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Примечания", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Устройство", -1, 10, 10, 250, 100
-    RTEXT "Имя:", -1, 20, 25, 70, 10
-    RTEXT "Код устройства:", -1, 20, 35, 70, 10
-    RTEXT "Код изготовителя:", -1, 20, 45, 70, 10
-    RTEXT "Код продукта:", -1, 20, 55, 70, 10
-    RTEXT "Тип:", -1, 20, 65, 70, 10
-    RTEXT "По умолчанию:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Драйверы", -1, 270, 10, 190, 100
-    RTEXT "Имя:", -1, 275, 25, 55, 10
-    RTEXT "Версия:", -1, 275, 35, 55, 10
-    RTEXT "Дата:", -1, 275, 45, 55, 10
-    RTEXT "Подпись:", -1, 275, 55, 55, 10
-    RTEXT "Другие файлы:", -1, 275, 65, 55, 10
-    RTEXT "Поставщик:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Возможности ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Уровень аппаратного\nускорения:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Проверка DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 14
-    GROUPBOX "Примечания", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Устройство", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Имя:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Код устройства:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Код изготовителя:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Код продукта:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Тип:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "По умолчанию:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Драйверы", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Имя:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Версия:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Дата:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Подпись:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Другие файлы:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Поставщик:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Возможности ReactX", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Уровень аппаратного\nускорения", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Проверка DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Примечания", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Устройства DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Устройства ввода", -1, 10, 100, 452, 60
+    GROUPBOX "Устройства DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Устройства ввода", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Информация", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Информация", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Зарегистрированные поставщики DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Зарегистрированные поставщики DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -218,4 +242,13 @@ BEGIN
     IDS_OPTION_NO "Нет"
     IDS_D3DTEST_DESCRIPTION "Будет произведена проверка Direct3D на этом устройстве. Продолжить?"
     IDS_D3DTEST_D3Dx "Этот тест будет использовать интерфейс Direct3D %u с аппаратным ускорением."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/sk-SK.rc b/reactos/base/applications/dxdiag/lang/sk-SK.rc
index d9282c71849..804f2e01505 100644
--- a/reactos/base/applications/dxdiag/lang/sk-SK.rc
+++ b/reactos/base/applications/dxdiag/lang/sk-SK.rc
@@ -12,162 +12,186 @@ CAPTION "ReactX - diagnostický program"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Pomocník", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "Ďalšia stra&na", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Uložiť všetky informácie...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Skončiť", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Pomocník", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "Ďalšia stra&na", IDC_BUTTON_NEXT, 250, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Uložiť všetky informácie...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Skončiť", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Tento nástroj hlási detailné informácie o komponentoch a oládačoch ReactX nainštalovaných do systému.", -1, 10, 10, 443, 17
-    LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 443, 25
-    GROUPBOX "Systémové informácie", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Aktuálny dátum/čas:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Názov počítača:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Operačný systém:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Jazyk:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Výrobca systému:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Model systému:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Pamäť:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Stránkovací súbor:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX - verzia:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Tento nástroj hlási detailné informácie o komponentoch a oládačoch ReactX nainštalovaných do systému.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Systémové informácie", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Aktuálny dátum/čas:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Názov počítača:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Operačný systém:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Jazyk:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Výrobca systému:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Model systému:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Procesor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Pamäť:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Stránkovací súbor:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX - verzia:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Zariadenie", -1, 10, 10, 250, 100
-    RTEXT "Názov:", -1, 20, 25, 70, 10
-    RTEXT "Výrobca:", -1, 20, 35, 70, 10
-    RTEXT "Typ čipu:", -1, 20, 45, 70, 10
-    RTEXT "Typ D-A konvertora:", -1, 20, 55, 70, 10
-    RTEXT "Pribl. celková pamäť:", -1, 14, 65, 75, 10
-    RTEXT "Súčasný mód obrazovky:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Ovládač", -1, 270, 10, 190, 100
-    RTEXT "Hlavný ovládač:", -1, 275, 25, 55, 10
-    RTEXT "Verzia:", -1, 275, 35, 55, 10
-    RTEXT "Dátum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "Verzia DDI:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX - funkcie", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw urýchľovanie:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D urýchľovanie:", -1, 15, 145, 110, 12
-    RTEXT "AGP urýchľovanie textúr:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Zariadenie", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Názov:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Výrobca:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Typ čipu:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Typ D-A konvertora:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Pribl. celková pamäť:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Súčasný mód obrazovky:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Ovládač", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Hlavný ovládač:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Verzia:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Dátum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Verzia DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX - funkcie", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw urýchľovanie:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D urýchľovanie:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP urýchľovanie textúr:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Zariadenie", -1, 10, 10, 250, 100
-    RTEXT "Názov:", -1, 20, 25, 70, 10
-    RTEXT "ID zariadenia:", -1, 20, 35, 70, 10
-    RTEXT "ID výrobcu:", -1, 20, 45, 70, 10
-    RTEXT "ID produktu:", -1, 20, 55, 70, 10
-    RTEXT "Typ:", -1, 20, 65, 70, 10
-    RTEXT "Predvolené zariadenie:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Ovládač", -1, 270, 10, 190, 100
-    RTEXT "Názov:", -1, 275, 25, 55, 10
-    RTEXT "Verzia:", -1, 275, 35, 55, 10
-    RTEXT "Dátum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Other Files:", -1, 275, 65, 55, 10
-    RTEXT "Provider:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX - funkcie", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Zariadenie", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Názov:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "ID zariadenia:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ID výrobcu:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ID produktu:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Typ:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Predvolené zariadenie:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Ovládač", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Názov:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Verzia:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Dátum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Other Files:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Provider:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX - funkcie", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Hardware Sound\nAcceleration Level:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Zariadenia DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Vstupné zariadenia", -1, 10, 100, 452, 60
+    GROUPBOX "Zariadenia DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Vstupné zariadenia", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informácie", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informácie", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registered DirectPlay Service Provider", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -223,4 +247,13 @@ BEGIN
     IDS_OPTION_NO "Nie"
     IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?"
     IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/sq-AL.rc b/reactos/base/applications/dxdiag/lang/sq-AL.rc
index 39c17f634e3..28fffd831d4 100644
--- a/reactos/base/applications/dxdiag/lang/sq-AL.rc
+++ b/reactos/base/applications/dxdiag/lang/sq-AL.rc
@@ -11,162 +11,186 @@ CAPTION "ReactX-Programi i diaknostikimit"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Ndihmë", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Faqja tjetër", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Ruaj të gjithë informacionet...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Dil", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Ndihmë", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Faqja tjetër", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Ruaj të gjithë informacionet...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Dil", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ky mjet raporton informacione të detajuara rreth komponentëve të ReactX dhe driverave të instaluar në sistemin tuaj.", -1, 10, 10, 443, 17
-    LTEXT "Nëse ju e dini se çfarë zonë është duke u shkaktuar problemin, klikoni butonin e duhur më lart. Përndryshe ju mund të përdorni ""Faqen Tjetëre"" button poshtë për të vizituar çdo faqe në rend.", -1, 10, 30, 443, 25
-    GROUPBOX "Informacioni i Sistemit", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Data/Ora aktuale:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Emri i Kompjuterit:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Sistemi Operativ:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Gjuha:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Prodhuesi i Sistemit:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Modeli i Sistemit:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Procesori:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Memoria:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Faqja e Dokumentave:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Versioni-ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Ky mjet raporton informacione të detajuara rreth komponentëve të ReactX dhe driverave të instaluar në sistemin tuaj.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Nëse ju e dini se çfarë zonë është duke u shkaktuar problemin, klikoni butonin e duhur më lart. Përndryshe ju mund të përdorni ""Faqen Tjetëre"" button poshtë për të vizituar çdo faqe në rend.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Informacioni i Sistemit", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Data/Ora aktuale:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Emri i Kompjuterit:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Sistemi Operativ:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Gjuha:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Prodhuesi i Sistemit:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Modeli i Sistemit:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Procesori:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Memoria:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Faqja e Dokumentave:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Versioni-ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Device", -1, 10, 10, 250, 100
-    RTEXT "Emri:", -1, 20, 25, 70, 10
-    RTEXT "Prodhuesi:", -1, 20, 35, 70, 10
-    RTEXT "Tipi i procesorit:", -1, 20, 45, 70, 10
-    RTEXT "Tipi DAC:", -1, 20, 55, 70, 10
-    RTEXT "Memoria Totale:", -1, 14, 65, 75, 10
-    RTEXT "Modaliteti vizual aktual:", -1, 14, 75, 75, 10
-    RTEXT "Monitor:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Driver Kryesor:", -1, 275, 25, 55, 10
-    RTEXT "Versioni:", -1, 275, 35, 55, 10
-    RTEXT "Data:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI Versioni:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Karakteristikat e ReactX", -1, 10, 115, 450, 60
-    RTEXT "Përshpejtimi i DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Përshpejtimi i Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "Përshpejtimi i tekstit për AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Mundëso", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Mundëso", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Mundëso", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Testo DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Testo Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Notes", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Device", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Emri:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Prodhuesi:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Tipi i procesorit:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Tipi DAC:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Memoria Totale:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Modaliteti vizual aktual:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Monitor:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Driver Kryesor:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versioni:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI Versioni:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Përshpejtimi i DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Përshpejtimi i Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Përshpejtimi i tekstit për AGP:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Mundëso", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Mundëso", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Mundëso", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Testo DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Testo Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Device", -1, 10, 10, 250, 100
-    RTEXT "Emri:", -1, 20, 25, 70, 10
-    RTEXT "Device ID:", -1, 20, 35, 70, 10
-    RTEXT "ID e prodhimit:", -1, 20, 45, 70, 10
-    RTEXT "ID e produktit:", -1, 20, 55, 70, 10
-    RTEXT "Tipi:", -1, 20, 65, 70, 10
-    RTEXT "Default Device:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Driver", -1, 270, 10, 190, 100
-    RTEXT "Emri:", -1, 275, 25, 55, 10
-    RTEXT "Versioni:", -1, 275, 35, 55, 10
-    RTEXT "Data:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Dokumta të tjerë:", -1, 275, 65, 55, 10
-    RTEXT "Ofruesi:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Karakteristikat e ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Karakteristikat e ReactX:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Testo ZërinDirekt", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Shënime", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Device", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Emri:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Device ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "ID e prodhimit:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "ID e produktit:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Tipi:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Default Device:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Driver", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Emri:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Versioni:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Data:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Dokumta të tjerë:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Ofruesi:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Karakteristikat e ReactX", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Karakteristikat e ReactX:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Testo ZërinDirekt", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Shënime", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "PjesëHyrese Elektronike", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "PjesëHyrese Elektronike", -1, 10, 100, 452, 60
+    GROUPBOX "PjesëHyrese Elektronike", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "PjesëHyrese Elektronike", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Informacione", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Informacione", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Regjistro shërbimet ofruese të DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Regjistro shërbimet ofruese të DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -222,4 +246,13 @@ BEGIN
     IDS_OPTION_NO "No"
     IDS_D3DTEST_DESCRIPTION "Kjo do të fillojë ndërfaqes etestit Direct3D. Vazhdo?"
     IDS_D3DTEST_D3Dx "Ky test do të përdore pjesë elektronike të përshpejtuara për Direct3D %u ndërfaqe."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/sv-SE.rc b/reactos/base/applications/dxdiag/lang/sv-SE.rc
index 380e0213bc1..229759551e1 100644
--- a/reactos/base/applications/dxdiag/lang/sv-SE.rc
+++ b/reactos/base/applications/dxdiag/lang/sv-SE.rc
@@ -14,162 +14,186 @@ CAPTION "ReactX-diagnos program"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Hjälp", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Nästa sida", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Spara all information...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Avsluta", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Hjälp", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Nästa sida", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Spara all information...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Avsluta", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Detta verktyget rapporterar detaljerad information om ReactX komponenter och enheter som är installerade på ditt system.", -1, 10, 10, 443, 17
-    LTEXT "Om du vet vilket område som skapar problem, kan du klicka på motsvarande flik ovanför. Om inte, kan du använda knappen ""Nästa sida"" nedanför för att besöka alla sidorna sekventiellt.", -1, 10, 30, 443, 25
-    GROUPBOX "System Information", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Aktuellt Datum/Tid:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Datornamn:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Operativsystem:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Språk:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Systemtillverkare:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Systemmodell:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Minne:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Växlingsfil:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX-version:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Detta verktyget rapporterar detaljerad information om ReactX komponenter och enheter som är installerade på ditt system.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Om du vet vilket område som skapar problem, kan du klicka på motsvarande flik ovanför. Om inte, kan du använda knappen ""Nästa sida"" nedanför för att besöka alla sidorna sekventiellt.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "System Information", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Aktuellt Datum/Tid:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Datornamn:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Operativsystem:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Språk:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Systemtillverkare:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Systemmodell:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Processor:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Minne:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Växlingsfil:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX-version:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Enhet", -1, 10, 10, 250, 100
-    RTEXT "Namn:", -1, 20, 25, 70, 10
-    RTEXT "Fabrikat:", -1, 20, 35, 70, 10
-    RTEXT "Chip typ:", -1, 20, 45, 70, 10
-    RTEXT "DAC type:", -1, 20, 55, 70, 10
-    RTEXT "Uppskattat total minne:", -1, 14, 65, 75, 10
-    RTEXT "Aktuellt Bildskärmsläge:", -1, 14, 75, 75, 10
-    RTEXT "Bildskärm:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Drivrutiner", -1, 270, 10, 190, 100
-    RTEXT "Huvuddrivrutin:", -1, 275, 25, 55, 10
-    RTEXT "Version:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI Version:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX-Funktioner", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw-accelerasjon:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D-accelerasjon:", -1, 15, 145, 110, 12
-    RTEXT "AGP-strukturaccelleration:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Aktiverad", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Aktiverad", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Aktiverad", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "Testa DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "Testa Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Anmärkningar", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Enhet", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Namn:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Fabrikat:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Chip typ:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC type:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Uppskattat total minne:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Aktuellt Bildskärmsläge:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Bildskärm:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Drivrutiner", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Huvuddrivrutin:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI Version:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Funktioner", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw-accelerasjon:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D-accelerasjon:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP-strukturaccelleration:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Aktiverad", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktiverad", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktiverad", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Testa DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Testa Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Anmärkningar", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Enhet", -1, 10, 10, 250, 100
-    RTEXT "Namn:", -1, 20, 25, 70, 10
-    RTEXT "Maskinvaru-ID:", -1, 20, 35, 70, 10
-    RTEXT "Tillverkarens ID:", -1, 20, 45, 70, 10
-    RTEXT "Produkt-ID:", -1, 20, 55, 70, 10
-    RTEXT "Typ:", -1, 20, 65, 70, 10
-    RTEXT "Standard enhet:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Drivrutiner", -1, 270, 10, 190, 100
-    RTEXT "Namn:", -1, 275, 25, 55, 10
-    RTEXT "Version:", -1, 275, 35, 55, 10
-    RTEXT "Datum:", -1, 275, 45, 55, 10
-    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
-    RTEXT "Andra filer:", -1, 275, 65, 55, 10
-    RTEXT "Leverantör:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX-Funktioner", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Maskinvara ljud\nAccelerationsnivå:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Testa DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Anmärkningar", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Enhet", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Namn:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Maskinvaru-ID:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Tillverkarens ID:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Produkt-ID:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Typ:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Standard enhet:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Drivrutiner", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Namn:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Version:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Datum:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL-Logo:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Andra filer:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Leverantör:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX-Funktioner", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Maskinvara ljud\nAccelerationsnivå:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Testa DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Anmärkningar", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirektInput-enheter", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Indata enheter", -1, 10, 100, 452, 60
+    GROUPBOX "DirektInput-enheter", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Indata enheter", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Information", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Information", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Registad DirectPlay tjänesteleverantör", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Registad DirectPlay tjänesteleverantör", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -225,4 +249,13 @@ BEGIN
     IDS_OPTION_NO "Nej"
     IDS_D3DTEST_DESCRIPTION "Detta kommer att starta Direct3D enhetstest. Fortsätt?"
     IDS_D3DTEST_D3Dx "Detta testet kommer att använda hårdvaruaccellererad Direct3D %u enheten."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/tr-TR.rc b/reactos/base/applications/dxdiag/lang/tr-TR.rc
index 300fd8a916b..1970e6af205 100644
--- a/reactos/base/applications/dxdiag/lang/tr-TR.rc
+++ b/reactos/base/applications/dxdiag/lang/tr-TR.rc
@@ -9,162 +9,186 @@ CAPTION "ReactX Tanı Aracı"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "&Yardım", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&Sonraki Bölüm", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Tüm Bilgileri Sakla...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Çıkış", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Yardım", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Sonraki Bölüm", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Tüm Bilgileri Sakla...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Çıkış", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Bu araç, dizgenizdeki yüklü ReactX bileşenleri ve sürücüleri üzerine ayrıntılı bilgi raporlar.", -1, 10, 10, 443, 17
-    LTEXT "Soruna neden olan bölümü biliyorsanız yukarıdaki uygun sekmeyi tıklayınız. Yoksa diziyle tüm bölümlere gitmek için aşağıdaki ""Sonraki Bölüm"" düğmesini kullanabilirsiniz.", -1, 10, 30, 443, 25
-    GROUPBOX "Dizge Bilgisi", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Geçerli Zaman:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Bilgisayar Adı:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "İşletim Dizgesi:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "Dil:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Dizge Üreticisi:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "Dizge Modeli:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "İşlemci:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Bellek:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Disk Belleği:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX Sürümü:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Bu araç, dizgenizdeki yüklü ReactX bileşenleri ve sürücüleri üzerine ayrıntılı bilgi raporlar.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Soruna neden olan bölümü biliyorsanız yukarıdaki uygun sekmeyi tıklayınız. Yoksa diziyle tüm bölümlere gitmek için aşağıdaki ""Sonraki Bölüm"" düğmesini kullanabilirsiniz.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Dizge Bilgisi", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Geçerli Zaman:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Bilgisayar Adı:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "İşletim Dizgesi:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Dil:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Dizge Üreticisi:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Dizge Modeli:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "İşlemci:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Bellek:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Disk Belleği:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX Sürümü:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Aygıt", -1, 10, 10, 250, 100
-    RTEXT "Ad:", -1, 20, 25, 70, 10
-    RTEXT "Üretici:", -1, 20, 35, 70, 10
-    RTEXT "Yonga Türü:", -1, 20, 45, 70, 10
-    RTEXT "DAC Türü:", -1, 20, 55, 70, 10
-    RTEXT "Yaklaşık Toplam Bellek:", -1, 14, 65, 75, 10
-    RTEXT "Şimdiki Görüntü Kipi:", -1, 14, 75, 75, 10
-    RTEXT "Göstergeç:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "Sürücü", -1, 270, 10, 190, 100
-    RTEXT "Ana Sürücü:", -1, 275, 25, 55, 10
-    RTEXT "Sürüm:", -1, 275, 35, 55, 10
-    RTEXT "Zaman:", -1, 275, 45, 55, 10
-    RTEXT "WHQL İmleği:", -1, 275, 55, 55, 10
-    RTEXT "Mini VDD:", -1, 275, 65, 55, 10
-    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI Sürümü:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX Husûsiyetleri", -1, 10, 115, 450, 60
-    RTEXT "ReactDraw Hızlandırması:", -1, 15, 130, 110, 12
-    RTEXT "React3D Hızlandırması:", -1, 15, 145, 110, 12
-    RTEXT "AGP Doku Hızlandırması:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Etkinleştir", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "Etkinleştir", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "Etkinleştir", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "&ReactDraw'ı Sına", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "R&eact3D'yi Sına", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "Notlar", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Aygıt", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Ad:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Üretici:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Yonga Türü:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC Türü:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Yaklaşık Toplam Bellek:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Şimdiki Görüntü Kipi:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Göstergeç:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Sürücü", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Ana Sürücü:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Sürüm:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Zaman:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL İmleği:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Mini VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT " vvdddVDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI Sürümü:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX Husûsiyetleri", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "ReactDraw Hızlandırması:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "React3D Hızlandırması:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP Doku Hızlandırması:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Etkinleştir", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Etkinleştir", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Etkinleştir", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "&ReactDraw'ı Sına", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "R&eact3D'yi Sına", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Notlar", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Aygıt", -1, 10, 10, 250, 100
-    RTEXT "Ad:", -1, 20, 25, 70, 10
-    RTEXT "Aygıt Kimliği:", -1, 20, 35, 70, 10
-    RTEXT "Üretici Kimliği:", -1, 20, 45, 70, 10
-    RTEXT "Ürün Kimliği:", -1, 20, 55, 70, 10
-    RTEXT "Tür:", -1, 20, 65, 70, 10
-    RTEXT "Varsayılan Aygıt:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Sürücü", -1, 270, 10, 190, 100
-    RTEXT "Ad:", -1, 275, 25, 55, 10
-    RTEXT "Sürüm:", -1, 275, 35, 55, 10
-    RTEXT "Zaman:", -1, 275, 45, 55, 10
-    RTEXT "WHQL İmleği:", -1, 275, 55, 55, 10
-    RTEXT "Başka Kütükler:", -1, 275, 65, 55, 10
-    RTEXT "Sağlayıcı:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX Husûsiyetleri", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Donanım Ses\nİvme Düzeyi:", -1, 20, 135, 90, 20
-    PUSHBUTTON "&ReactSound'u Sına", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "Notlar", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Aygıt", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Ad:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Aygıt Kimliği:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Üretici Kimliği:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Ürün Kimliği:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Tür:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "Varsayılan Aygıt:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Sürücü", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Ad:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Sürüm:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Zaman:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL İmleği:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Başka Kütükler:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Sağlayıcı:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX Husûsiyetleri", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Donanım Ses\nİvme Düzeyi:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "&ReactSound'u Sına", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Notlar", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "ReactInput Aygıtları", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Giriş Aygıtları", -1, 10, 100, 452, 60
+    GROUPBOX "ReactInput Aygıtları", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Giriş Aygıtları", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Notlar", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Notlar", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Kayıtlı ReactPlay Hizmet Sağlayıcıları", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Kayıtlı ReactPlay Hizmet Sağlayıcıları", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -220,4 +244,13 @@ BEGIN
     IDS_OPTION_NO "Hayır"
     IDS_D3DTEST_DESCRIPTION "Bu, React3D arayüz sınamasını başlatılacak. Sürdürülsün mü?"
     IDS_D3DTEST_D3Dx "Bu sınama, donanım hızlandırmalı React3D %u arayüzünü kullanacak."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/uk-UA.rc b/reactos/base/applications/dxdiag/lang/uk-UA.rc
index 8797709a336..1e9e468b48a 100644
--- a/reactos/base/applications/dxdiag/lang/uk-UA.rc
+++ b/reactos/base/applications/dxdiag/lang/uk-UA.rc
@@ -25,152 +25,176 @@ IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Ця програма дозволяє отримати докладні відомості про встановлені компоненти і драйвери ReactX.", -1, 10, 10, 443, 17
-    LTEXT "Якщо ви знаєте можливу причину неполадки, можна відразу вибрати відповідну вкладку. В іншому випадку використовуйте кнопку ""Наступна сторінка"" для послідовного перегляду сторінок.", -1, 10, 30, 443, 25
-    GROUPBOX "Відомості про систему", -1, 10, 58, 443, 130, SS_RIGHT
-    LTEXT "Поточні час і дата:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "Ім'я комп'ютера:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "Операційна система:", -1, 50, 90, 100, 10, SS_RIGHT
-    LTEXT "Мова:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "Виробник комп'ютера:", -1, 50, 110, 100, 10, SS_RIGHT
-    LTEXT "Модель комп'ютера:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "Процесор:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "Пам'ять:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "Файл підкачки:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "Версія ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "Ця програма дозволяє отримати докладні відомості про встановлені компоненти і драйвери ReactX.", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "Якщо ви знаєте можливу причину неполадки, можна відразу вибрати відповідну вкладку. В іншому випадку використовуйте кнопку ""Наступна сторінка"" для послідовного перегляду сторінок.", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "Відомості про систему", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "Поточні час і дата:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "Ім'я комп'ютера:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "Операційна система:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Мова:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Виробник комп'ютера:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Модель комп'ютера:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "Процесор:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "Пам'ять:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Файл підкачки:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Версія ReactX:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Пристрій", -1, 10, 10, 220, 100
-    RTEXT "Назва:", -1, 20, 25, 70, 10
-    RTEXT "Виробник:", -1, 20, 35, 70, 10
-    RTEXT "Тип мікросхем:", -1, 20, 45, 70, 10
-    RTEXT "Тип конвертера DAC:", -1, 15, 55, 75, 10
-    RTEXT "Всього пам'яті:", -1, 20, 65, 70, 10
-    RTEXT "Режим екрану:", -1, 20, 75, 70, 10
-    RTEXT "Монітор:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10
-    GROUPBOX "Драйвери", -1, 240, 10, 220, 100
-    RTEXT "Головний:", -1, 245, 30, 55, 10
-    RTEXT "Версія:", -1, 245, 40, 55, 10
-    RTEXT "Дата:", -1, 245, 50, 55, 10
-    RTEXT "Підпис:", -1, 245, 60, 55, 10
-    RTEXT "Міні-VDD:", -1, 245, 70, 55, 10
-    RTEXT "VDD:", -1, 245, 80, 55, 10
-    RTEXT "Версія DDI:", -1, 245, 90, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "Можливості ReactX", -1, 10, 115, 450, 65
-    RTEXT "Прискорення DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "Прискорення Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "Прискорення текстур AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "Увімкнути", IDC_BUTTON_DDRAW, 170, 126, 60, 14, WS_DISABLED
-    PUSHBUTTON "Увімкнути", IDC_BUTTON_D3D, 170, 142, 60, 14, WS_DISABLED
-    PUSHBUTTON "Увімкнути", IDC_BUTTON_AGP, 170, 158, 60, 14, WS_DISABLED
-    PUSHBUTTON "Перевірка DirectDraw", IDC_BUTTON_TESTDD, 250, 126, 80, 14
-    PUSHBUTTON "Перевірка Direct3D", IDC_BUTTON_TEST3D, 250, 142, 80, 14
-    GROUPBOX "Примітки", -1, 10, 185, 450, 34
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Пристрій", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Назва:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Виробник:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Тип мікросхем:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Тип конвертера DAC:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Всього пам'яті:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "Режим екрану:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "Монітор:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Драйвери", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Головний:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Версія:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Дата:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Підпис:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Міні-VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "Версія DDI:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Можливості ReactX", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Прискорення DirectDraw:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Прискорення Direct3D:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "Прискорення текстур AGP:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "Увімкнути", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "Увімкнути", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "Увімкнути", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "Перевірка DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "Перевірка Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "Примітки", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Пристрій", -1, 10, 10, 250, 100
-    RTEXT "Назва:", -1, 20, 25, 70, 10
-    RTEXT "Код пристрою:", -1, 20, 35, 70, 10
-    RTEXT "Код виробника:", -1, 20, 45, 70, 10
-    RTEXT "Код продукту:", -1, 20, 55, 70, 10
-    RTEXT "Тип:", -1, 20, 65, 70, 10
-    RTEXT "За замовчуванням:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "Драйвери", -1, 270, 10, 190, 100
-    RTEXT "Назва:", -1, 275, 25, 55, 10
-    RTEXT "Версія:", -1, 275, 35, 55, 10
-    RTEXT "Дата:", -1, 275, 45, 55, 10
-    RTEXT "Підпис:", -1, 275, 55, 55, 10
-    RTEXT "Інші файли:", -1, 275, 65, 55, 10
-    RTEXT "Постачальник:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "Можливості ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Рівень апаратного\nприскорення:", -1, 20, 135, 90, 20
-    PUSHBUTTON "Перевірка DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 14
-    GROUPBOX "Примітки", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "Пристрій", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "Назва:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "Код пристрою:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "Код виробника:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "Код продукту:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "Тип:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "За замовчуванням:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Драйвери", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "Назва:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "Версія:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "Дата:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "Підпис:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "Інші файли:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "Постачальник:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Можливості ReactX", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "Рівень апаратного\nприскорення:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "Перевірка DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "Примітки", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Пристрої DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Пристрої введення", -1, 10, 100, 452, 60
+    GROUPBOX "Пристрої DirectInput", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "Пристрої введення", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "Інформація", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "Інформація", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Зареєстровані постачальники DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Зареєстровані постачальники DirectPlay", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -226,4 +250,13 @@ BEGIN
     IDS_OPTION_NO "Ні"
     IDS_D3DTEST_DESCRIPTION "Буде виконана перевірка інтерфейсу Direct3D. Продовжити?"
     IDS_D3DTEST_D3Dx "Цей тест використає апаратно-прискорений Direct3D інтерфейс %u."
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/zh-CN.rc b/reactos/base/applications/dxdiag/lang/zh-CN.rc
index 7b493c799d3..635f1454edb 100644
--- a/reactos/base/applications/dxdiag/lang/zh-CN.rc
+++ b/reactos/base/applications/dxdiag/lang/zh-CN.rc
@@ -15,162 +15,186 @@ CAPTION "ReactX 诊断程式"
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "说明(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "下一页(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "储存所有资讯(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "结束(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "说明(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "下一页(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "储存所有资讯(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "结束(&E)", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT "此工具会报告安装在您系统的ReactX 元件和驱动程式的详细资料。", -1, 10, 10, 443, 17
-    LTEXT "如果你知道那个区域造成问题，单击上面相应的标签。否则，你可以使用「下一页」按钮来顺序访问每一页。 ", -1, 10, 30, 443, 25
-    GROUPBOX "系统资讯", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "目前日期/时间:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "电脑名称:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "操作系统:", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "语言:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "系统制造商:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "系统型号:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "处理器:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "内存:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "分页档案:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX 版本:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "此工具会报告安装在您系统的ReactX 元件和驱动程式的详细资料。", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "如果你知道那个区域造成问题，单击上面相应的标签。否则，你可以使用「下一页」按钮来顺序访问每一页。 ", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "系统资讯", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "目前日期/时间:", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "电脑名称:", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "操作系统:", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "语言:", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "系统制造商:", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "系统型号:", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "处理器:", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "内存:", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "分页档案:", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX 版本:", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "装置", -1, 10, 10, 250, 100
-    RTEXT "名称:", -1, 20, 25, 70, 10
-    RTEXT "制造商:", -1, 20, 35, 70, 10
-    RTEXT "晶片类型:", -1, 20, 45, 70, 10
-    RTEXT "DAC 类型:", -1, 20, 55, 70, 10
-    RTEXT "内存总计约:", -1, 20, 65, 70, 10
-    RTEXT "目前显示模式:", -1, 20, 75, 70, 10
-    RTEXT "显示器:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "驱动程序", -1, 270, 10, 190, 100
-    RTEXT "主要驱动程序:", -1, 275, 25, 55, 10
-    RTEXT "版本:", -1, 275, 35, 55, 10
-    RTEXT "日期:", -1, 275, 45, 55, 10
-    RTEXT "WHQL 标志:", -1, 275, 55, 55, 10
-    RTEXT "迷你 VDD:", -1, 275, 65, 55, 10
-    RTEXT "VDD:", -1, 275, 75, 55, 10
-    RTEXT "DDI 版本:", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX 功能", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw 加速:", -1, 15, 130, 110, 12
-    RTEXT "Direct3D 加速:", -1, 15, 145, 110, 12
-    RTEXT "AGP 材质加速:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "启用", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "启用", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "启用", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "测试 DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "测试 Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "备注", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "装置", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "名称:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "制造商:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "晶片类型:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC 类型:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "内存总计约:", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "目前显示模式:", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "显示器:", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "驱动程序", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "主要驱动程序:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "版本:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "日期:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL 标志:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "迷你 VDD:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "VDD:", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI 版本:", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw 加速:", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D 加速:", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP 材质加速:", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "启用", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "启用", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "启用", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "测试 DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "测试 Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "备注", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "装置", -1, 10, 10, 250, 100
-    RTEXT "名称:", -1, 20, 25, 70, 10
-    RTEXT "装置识别码:", -1, 20, 35, 70, 10
-    RTEXT "制造商识别码:", -1, 20, 45, 70, 10
-    RTEXT "产品识别码:", -1, 20, 55, 70, 10
-    RTEXT "类型:", -1, 20, 65, 70, 10
-    RTEXT "预设装置:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "驱动程式", -1, 270, 10, 190, 100
-    RTEXT "名称:", -1, 275, 25, 55, 10
-    RTEXT "版本:", -1, 275, 35, 55, 10
-    RTEXT "日期:", -1, 275, 45, 55, 10
-    RTEXT "WHQL 标志:", -1, 275, 55, 55, 10
-    RTEXT "其他档案:", -1, 275, 65, 55, 10
-    RTEXT "提供者:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX 功能", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "硬体音效\n加速等级:", -1, 20, 135, 90, 20
-    PUSHBUTTON "测试 DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "备注", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "装置", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "名称:", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "装置识别码:", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "制造商识别码:", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "产品识别码:", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "类型:", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "预设装置:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "驱动程式", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "名称:", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "版本:", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "日期:", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL 标志:", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "其他档案:", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "提供者:", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "硬体音效\n加速等级:", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "测试 DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "备注", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput 装置", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "输入装置", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput 装置", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "输入装置", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "资讯", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "资讯", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "已注册的 DirectPlay 服务提供者:", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "已注册的 DirectPlay 服务提供者:", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -226,4 +250,13 @@ BEGIN
     IDS_OPTION_NO "否"
     IDS_D3DTEST_DESCRIPTION "这将启动 Direct3D 界面测试。要继续？"
     IDS_D3DTEST_D3Dx "此测试将使用硬体加速的 Direct3D %u 界面。"
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/lang/zh-TW.rc b/reactos/base/applications/dxdiag/lang/zh-TW.rc
index 39081c9f99c..110d58f5627 100644
--- a/reactos/base/applications/dxdiag/lang/zh-TW.rc
+++ b/reactos/base/applications/dxdiag/lang/zh-TW.rc
@@ -15,162 +15,186 @@ CAPTION "ReactX 診斷程式"
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250
-    PUSHBUTTON "說明(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "下一頁(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "儲存所有資訊(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "結束(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "說明(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "下一頁(&N)", IDC_BUTTON_NEXT, 257, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "儲存所有資訊(&S)...", IDC_BUTTON_SAVE_INFO, 311, 260, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "結束(&E)", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    LTEXT "此工具會報告安裝在您系統的 ReactX 元件和驅動程式的詳細資料。", -1, 10, 10, 443, 17
-    LTEXT "如果你知道那個區域造成問題，單擊上面相應的標籤。否則，你可以使用「下一頁」按鈕來順序訪問每一頁。", -1, 10, 30, 443, 25
-    GROUPBOX "系統資訊", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "目前日期/時間：", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "電腦名稱：", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "操作系統：", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "語言：", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "系統製造商：", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "系統型號：", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS：", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "處理器：", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "記憶體：", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "分頁檔案：", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX 版本：", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+    LTEXT "此工具會報告安裝在您系統的 ReactX 元件和驅動程式的詳細資料。", IDC_STATIC, 5, 0, 443, 17
+    LTEXT "如果你知道那個區域造成問題，單擊上面相應的標籤。否則，你可以使用「下一頁」按鈕來順序訪問每一頁。", IDC_STATIC, 5, 15, 443, 25
+    GROUPBOX "系統資訊", IDC_STATIC, 5, 35, 452, 150, SS_RIGHT
+    LTEXT "目前日期/時間：", IDC_STATIC, 70, 50, 80, 10, SS_RIGHT
+    LTEXT "電腦名稱：", IDC_STATIC, 70, 60, 80, 10, SS_RIGHT
+    LTEXT "操作系統：", IDC_STATIC, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "語言：", IDC_STATIC, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "系統製造商：", IDC_STATIC, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "系統型號：", IDC_STATIC, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "BIOS：", IDC_STATIC, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "處理器：", IDC_STATIC, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "記憶體：", IDC_STATIC, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "分頁檔案：", IDC_STATIC, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "ReactX 版本：", IDC_STATIC, 70, 150, 80, 10, SS_RIGHT
+    EDITTEXT IDC_STATIC_TIME, 155, 50, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_COMPUTER, 155, 60, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_OS, 155, 70, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_LANG, 155, 80, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MANU, 155, 90, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MODEL, 155, 100, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_BIOS, 155, 110, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_PROC, 155, 120, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_MEM, 155, 130, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_SWAP, 155, 140, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_VERSION, 155, 150, 210, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    CHECKBOX "Check for WHQL digital signatures", IDC_WHQL_SIGN_CHECK, 15, 170, 120, 10, WS_DISABLED
 END
 
 IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "裝置", -1, 10, 10, 250, 100
-    RTEXT "名稱：", -1, 20, 25, 70, 10
-    RTEXT "製造商：", -1, 20, 35, 70, 10
-    RTEXT "晶片類型：", -1, 20, 45, 70, 10
-    RTEXT "DAC 類型：", -1, 20, 55, 70, 10
-    RTEXT "記憶體總計約：", -1, 14, 65, 75, 10
-    RTEXT "目前顯示模式：", -1, 14, 75, 75, 10
-    RTEXT "顯示器：", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-    GROUPBOX "驅動程式", -1, 270, 10, 190, 100
-    RTEXT "主要驅動程式：", -1, 275, 25, 55, 10
-    RTEXT "版本：", -1, 275, 35, 55, 10
-    RTEXT "日期：", -1, 275, 45, 55, 10
-    RTEXT "WHQL 標誌：", -1, 275, 55, 55, 10
-    RTEXT "迷你 VDD：", -1, 275, 65, 55, 10
-    RTEXT "VDD：", -1, 275, 75, 55, 10
-    RTEXT "DDI 版本：", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-    GROUPBOX "ReactX 功能", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw 加速：", -1, 15, 130, 110, 12
-    RTEXT "Direct3D 加速：", -1, 15, 145, 110, 12
-    RTEXT "AGP 材質加速：", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "啟用", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "啟用", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "啟用", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "測試 DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "測試 Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-    GROUPBOX "備註", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "裝置", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "名稱：", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "製造商：", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "晶片類型：", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "DAC 類型：", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "記憶體總計約：", IDC_STATIC, 14, 50, 75, 10
+    RTEXT "目前顯示模式：", IDC_STATIC, 14, 60, 75, 10
+    RTEXT "顯示器：", IDC_STATIC, 20, 70, 70, 10
+    EDITTEXT IDC_STATIC_ADAPTER_ID, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VENDOR, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_CHIP, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DAC, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MEM, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MODE, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MONITOR, 95, 70, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "驅動程式", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "主要驅動程式：", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "版本：", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "日期：", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL 標誌：", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "迷你 VDD：", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "VDD：", IDC_STATIC, 275, 60, 55, 10
+    RTEXT "DDI 版本：", IDC_STATIC, 275, 70, 55, 10
+    EDITTEXT IDC_STATIC_ADAPTER_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_MINIVDD, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_VDD, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_DDI, 335, 70, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "DirectDraw 加速：", IDC_STATIC, 15, 115, 110, 12
+    RTEXT "Direct3D 加速：", IDC_STATIC, 15, 130, 110, 12
+    RTEXT "AGP 材質加速：", IDC_STATIC, 15, 145, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 115, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 145, 40, 10
+    PUSHBUTTON "啟用", IDC_BUTTON_DDRAW, 170, 112, 60, 14, WS_DISABLED
+    PUSHBUTTON "啟用", IDC_BUTTON_D3D, 170, 128, 60, 14, WS_DISABLED
+    PUSHBUTTON "啟用", IDC_BUTTON_AGP, 170, 144, 60, 14, WS_DISABLED
+    PUSHBUTTON "測試 DirectDraw", IDC_BUTTON_TESTDD, 250, 112, 80, 14
+    PUSHBUTTON "測試 Direct3D", IDC_BUTTON_TEST3D, 250, 128, 80, 14
+    GROUPBOX "備註", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "裝置", -1, 10, 10, 250, 100
-    RTEXT "名稱：", -1, 20, 25, 70, 10
-    RTEXT "裝置識別碼：", -1, 20, 35, 70, 10
-    RTEXT "製造商識別碼：", -1, 20, 45, 70, 10
-    RTEXT "產品識別碼：", -1, 20, 55, 70, 10
-    RTEXT "類型：", -1, 20, 65, 70, 10
-    RTEXT "預設裝置:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "驅動程式", -1, 270, 10, 190, 100
-    RTEXT "名稱：", -1, 275, 25, 55, 10
-    RTEXT "版本：", -1, 275, 35, 55, 10
-    RTEXT "日期：", -1, 275, 45, 55, 10
-    RTEXT "WHQL 標誌：", -1, 275, 55, 55, 10
-    RTEXT "其他檔案：", -1, 275, 65, 55, 10
-    RTEXT "提供者：", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX 功能", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "硬體音效\n加速等級：", -1, 20, 135, 90, 20
-    PUSHBUTTON "測試 DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "備註", -1, 10, 180, 450, 40
-    EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+    GROUPBOX "裝置", IDC_STATIC, 5, 0, 250, 95
+    RTEXT "名稱：", IDC_STATIC, 20, 10, 70, 10
+    RTEXT "裝置識別碼：", IDC_STATIC, 20, 20, 70, 10
+    RTEXT "製造商識別碼：", IDC_STATIC, 20, 30, 70, 10
+    RTEXT "產品識別碼：", IDC_STATIC, 20, 40, 70, 10
+    RTEXT "類型：", IDC_STATIC, 20, 50, 70, 10
+    RTEXT "預設裝置:", IDC_STATIC, 20, 60, 70, 10
+    EDITTEXT IDC_STATIC_DSOUND_NAME, 95, 10, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DEVICEID, 95, 20, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VENDORID, 95, 30, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_PRODUCTID, 95, 40, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_TYPE, 95, 50, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_STANDARD, 95, 60, 150, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "驅動程式", IDC_STATIC, 260, 0, 197, 95
+    RTEXT "名稱：", IDC_STATIC, 275, 10, 55, 10
+    RTEXT "版本：", IDC_STATIC, 275, 20, 55, 10
+    RTEXT "日期：", IDC_STATIC, 275, 30, 55, 10
+    RTEXT "WHQL 標誌：", IDC_STATIC, 275, 40, 55, 10
+    RTEXT "其他檔案：", IDC_STATIC, 275, 50, 55, 10
+    RTEXT "提供者：", IDC_STATIC, 275, 60, 55, 10
+    EDITTEXT IDC_STATIC_DSOUND_DRIVER, 335, 10, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_VERSION, 335, 20, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_DATE, 335, 30, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_LOGO, 335, 40, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_DSOUND_FILES, 335, 50, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    EDITTEXT IDC_STATIC_ADAPTER_PROVIDER, 335, 60, 100, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "ReactX 功能", IDC_STATIC, 5, 97, 452, 70
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 110, 125, 80, 17
+    RTEXT "硬體音效\n加速等級：", IDC_STATIC, 10, 125, 90, 20, WS_DISABLED
+    PUSHBUTTON "測試 DirectSound", IDC_BUTTON_TESTDSOUND, 270, 125, 80, 14, WS_DISABLED
+    GROUPBOX "備註", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_TEXT_DSOUNDINFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
+    RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10
+    EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+    GROUPBOX "Music Ports", IDC_STATIC, 5, 10, 452, 85
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 97, 452, 70
+    RTEXT "Default Port Acceleration:", IDC_STATIC, 15, 120, 95, 10
+    LTEXT "", IDC_STATIC_DEFAULT_PORT_ACCELERATION, 115, 120, 50, 10
+    PUSHBUTTON "Disable", IDC_BUTTON_DISABLEDMUSIC, 75, 135, 80, 14, WS_DISABLED
+    LTEXT "Test using this port:", IDC_STATIC, 180, 105, 70, 10
+    LISTBOX IDC_DMUSIC_TEST_LIST, 180, 115, 180, 45, LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Test DirectMusic", IDC_BUTTON_TESTDMUSIC, 370, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_MUSIC_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput 裝置", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "輸入裝置", -1, 10, 100, 452, 60
+    GROUPBOX "DirectInput 裝置", IDC_STATIC, 5, 0, 452, 85
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65
+    GROUPBOX "輸入裝置", IDC_STATIC, 5, 87, 452, 81
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS |
-            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "資訊", -1, 10, 170, 452, 50
-    EDITTEXT IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+            WS_VISIBLE | WS_BORDER | WS_TABSTOP, 15, 99, 432, 60, 0x00000200
+    GROUPBOX "資訊", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_RICH_INFO, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "已註冊的 DirectPlay 服務提供者：", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "已註冊的 DirectPlay 服務提供者：", IDC_STATIC, 5, 0, 452, 75
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55
+    GROUPBOX "Registered Lobbyable DirectPlay Applications", IDC_STATIC, 5, 77, 452, 55
+    GROUPBOX "ReactX Features", IDC_STATIC, 5, 133, 452, 35
+    PUSHBUTTON "DirectPlay Voice Options", IDC_BUTTON_VOICE_OPTIONS, 10, 145, 90, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectPlay", IDC_BUTTON_TESTDPLAY, 130, 145, 80, 14, WS_DISABLED
+    GROUPBOX "Notes", IDC_STATIC, 5, 170, 452, 50
+    EDITTEXT IDC_NETWORK_NOTES, 15, 182, 432, 30, ES_LEFT | WS_BORDER | ES_READONLY | WS_TABSTOP
 END
 
 IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS Shell Dlg"
 BEGIN
+    LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10
+    PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED
+    LTEXT "Displays additional system information", IDC_STATIC, 90, 20, 300, 14
+    PUSHBUTTON "Refresh Rate Override", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED
+    LTEXT "Overrides the Refresh Rate for DirectDraw", IDC_STATIC, 90, 40, 300, 14
 END
 
 STRINGTABLE
@@ -226,4 +250,13 @@ BEGIN
     IDS_OPTION_NO "否"
     IDS_D3DTEST_DESCRIPTION "這將啟動 Direct3D 界面測試。要繼續？"
     IDS_D3DTEST_D3Dx "此測試將使用硬體加速的 Direct3D %u 界面。"
+    IDS_OS_VERSION "%s %s (%d.%d, Build %d)"
+    IDS_DMUSIC_DESC "Description"
+    IDS_DMUSIC_TYPE "Type"
+    IDS_DMUSIC_KERNEL "Kernel Mode"
+    IDS_DMUSIC_IO "In/Out"
+    IDS_DMUSIC_DLS "Supports DLS"
+    IDS_DMUSIC_EXT "External"
+    IDS_DMUSIC_PORT "Default Port"
+    IDS_DDDISABLE_MSG "This will disable all hardware acceleration for DirectDraw on all display devices\n.Do you wish to continue?\n"
 END
diff --git a/reactos/base/applications/dxdiag/network.c b/reactos/base/applications/dxdiag/network.c
index 772c72f2a61..29c51594ce3 100644
--- a/reactos/base/applications/dxdiag/network.c
+++ b/reactos/base/applications/dxdiag/network.c
@@ -315,6 +315,10 @@ InitializeDirectPlayDialog(HWND hwndDlg)
         return;
 
     hDlgCtrl = GetDlgItem(hwndDlg, IDC_LIST_PROVIDER);
+
+    /* Highlights the entire row instead of just the selected item in the first column */
+    SendMessage(hDlgCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
+
     /* initialize list ctrl */
     InitListViewColumns(hDlgCtrl);
 
diff --git a/reactos/base/applications/dxdiag/precomp.h b/reactos/base/applications/dxdiag/precomp.h
index 7c63f424218..5ad492584f2 100644
--- a/reactos/base/applications/dxdiag/precomp.h
+++ b/reactos/base/applications/dxdiag/precomp.h
@@ -21,6 +21,7 @@
 #include <ddraw.h>
 #include <initguid.h>
 #include <devguid.h>
+#include <strsafe.h>
 
 #include "resource.h"
 
diff --git a/reactos/base/applications/dxdiag/resource.h b/reactos/base/applications/dxdiag/resource.h
index e012b44baf7..3bdcb7ad78d 100644
--- a/reactos/base/applications/dxdiag/resource.h
+++ b/reactos/base/applications/dxdiag/resource.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define IDC_STATIC -1
+
 /* dialog constants */
 #define IDD_MAIN_DIALOG    100
 #define IDD_SYSTEM_DIALOG  101
@@ -29,6 +31,7 @@
 #define IDC_STATIC_MEM      2008
 #define IDC_STATIC_SWAP     2009
 #define IDC_STATIC_VERSION  2010
+#define IDC_WHQL_SIGN_CHECK 2011
 
 /* DDraw dialog constants */
 #define IDC_STATIC_ADAPTER_ID      3000
@@ -54,6 +57,9 @@
 #define IDC_STATIC_D3DSTATE        3020
 #define IDC_STATIC_AGPSTATE        3021
 #define IDC_TEXT_INFO              3022
+#define IDC_BUTTON_TESTDMUSIC      3023
+#define IDC_BUTTON_TESTDPLAY       3024
+#define IDC_BUTTON_VOICE_OPTIONS   3025
 
 /* DirectSound dialog constants */
 #define IDC_STATIC_DSOUND_NAME      4000
@@ -72,6 +78,14 @@
 #define IDC_BUTTON_TESTDSOUND       4013
 #define IDC_TEXT_DSOUNDINFO         4014
 
+/* DirectMusic dialog constants */
+//#define IDC_LIST_MUSIC_PORTS     5000
+#define IDC_MUSIC_NOTES                      5001
+#define IDC_STATIC_DEFAULT_PORT_ACCELERATION 5002
+#define IDC_BUTTON_DISABLEDMUSIC             5003
+#define IDC_DMUSIC_TEST_LIST                 5004
+#define IDC_MIDI_DLS_COLLECTION              5005
+
 /* DirectInput dialog constants */
 #define IDC_LIST_DEVICE 6000
 #define IDC_TREE_PORT   6001
@@ -79,6 +93,11 @@
 
 /* DirectPlay dialog constants */
 #define IDC_LIST_PROVIDER 7000
+#define IDC_NETWORK_NOTES 7001
+
+/* Help constants */
+#define IDC_BUTTON_SYSINFO       8000
+#define IDC_BUTTON_DDRAW_REFRESH 8001
 
 /* string resource constants */
 #define IDS_MAIN_DIALOG              10000
@@ -133,6 +152,15 @@
 #define IDS_OPTION_NO                10127
 #define IDS_D3DTEST_DESCRIPTION      10128
 #define IDS_D3DTEST_D3Dx             10129
+#define IDS_OS_VERSION               10130
+#define IDS_DMUSIC_DESC              10131
+#define IDS_DMUSIC_TYPE              10132
+#define IDS_DMUSIC_KERNEL            10133
+#define IDS_DMUSIC_IO                10134
+#define IDS_DMUSIC_DLS               10135
+#define IDS_DMUSIC_EXT               10136
+#define IDS_DMUSIC_PORT              10137
+#define IDS_DDDISABLE_MSG            10138
 
 /* icon resource constants */
 #define IDI_APPICON 20000
diff --git a/reactos/base/applications/dxdiag/sound.c b/reactos/base/applications/dxdiag/sound.c
index 827bd6022b7..8bbe9b674ba 100644
--- a/reactos/base/applications/dxdiag/sound.c
+++ b/reactos/base/applications/dxdiag/sound.c
@@ -224,7 +224,7 @@ BOOL CALLBACK DSEnumCallback(LPGUID lpGuid, LPCWSTR lpcstrDescription, LPCWSTR l
             if (dwCertified == DS_CERTIFIED)
                 LoadStringW(hInst, IDS_OPTION_YES, szText, sizeof(szText)/sizeof(WCHAR));
             else if (dwCertified == DS_UNCERTIFIED)
-                LoadStringW(hInst, IDS_OPTION_NO, szText, sizeof(szText)/sizeof(WCHAR));
+                LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText)/sizeof(WCHAR));
         }
         else
         {
diff --git a/reactos/base/applications/dxdiag/system.c b/reactos/base/applications/dxdiag/system.c
index 311fc03cdf7..b6686a515d6 100644
--- a/reactos/base/applications/dxdiag/system.c
+++ b/reactos/base/applications/dxdiag/system.c
@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+typedef BOOL (WINAPI *ISWOW64PROC) (HANDLE, PBOOL);
+
 BOOL
 GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size)
 {
@@ -27,7 +29,7 @@ GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR R
     if (res != ERROR_SUCCESS)
         return FALSE;
 
-	if (dwType != Type)
+    if (dwType != Type)
         return FALSE;
 
     if (Size == sizeof(DWORD))
@@ -95,105 +97,60 @@ GetDirectXVersion(WCHAR * szBuffer)
     return TRUE;
 }
 
-#if 0
-static
-BOOL
-GetVistaVersion(WCHAR * szBuffer)
+VOID GetSystemCPU(WCHAR *szBuffer)
 {
-     DWORD Length;
+    SYSTEM_INFO archInfo;
+    ISWOW64PROC fnIsWow64Process;
+    BOOL isWow64 = FALSE;
 
-     if (GetProductInfo(6, 0, 0, 0, &Length))
-     {
-         switch(Length)
-         {
-             case PRODUCT_ULTIMATE:
-                 wsprintfW(szBuffer, L"Windows Vista Ultimate (6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-             case PRODUCT_HOME_BASIC:
-                 wsprintfW(szBuffer, L"Windows Vista Home Basic (6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-             case PRODUCT_HOME_PREMIUM:
-                 wsprintfW(szBuffer, L"Windows Vista Home Premimum (6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-             case PRODUCT_ENTERPRISE:
-                 wsprintfW(szBuffer, L"Windows Vista Enterprise (6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-             case PRODUCT_HOME_BASIC_N:
-                 wsprintfW(szBuffer, L"Windows Vista Home Basic N(6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-             case PRODUCT_BUSINESS:
-                 wsprintfW(szBuffer, L"Windows Vista Business(6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-            case PRODUCT_STARTER:
-                 wsprintfW(szBuffer, L"Windows Vista Starter(6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-            case PRODUCT_BUSINESS_N:
-                 wsprintfW(szBuffer, L"Windows Vista Business N(6.0, Build %04u)", info.dwBuildNumber);
-                 return TRUE;
-            default:
-                 return FALSE;
-                }
-            }
-}
+    /* Find out if the program is running through WOW64 or not. Apparently,
+    IsWow64Process() is not available on all versions of Windows, so the function
+    has to be imported at runtime. If the function cannot be found, then assume
+    the program is not running in WOW64. */
+    fnIsWow64Process = (ISWOW64PROC)GetProcAddress(
+        GetModuleHandleW(L"kernel32"), "IsWow64Process");
+    
+    if (fnIsWow64Process != NULL)
+        fnIsWow64Process(GetCurrentProcess(), &isWow64);
 
-#endif
+    /* If the program is compiled as 32-bit, but is running in WOW64, it will
+    automatically report as 32-bit regardless of the actual system architecture.
+    It detects whether or not the program is using WOW64 or not, and then
+    uses GetNativeSystemInfo(). If it is, it will properly report the actual
+    system architecture to the user. */
+    if (isWow64)
+        GetNativeSystemInfo(&archInfo);
+    else
+        GetSystemInfo(&archInfo);
 
-
-static
-BOOL
-GetOSVersion(WCHAR * szBuffer)
-{
-    OSVERSIONINFOEXW info;
-
-    ZeroMemory(&info, sizeof(info));
-    info.dwOSVersionInfoSize = sizeof(info);
-    if (GetVersionExW((LPOSVERSIONINFO)&info))
+    /* Now check to see what the system architecture is */
+    if(archInfo.wProcessorArchitecture != PROCESSOR_ARCHITECTURE_UNKNOWN)
     {
-        /* FIXME retrieve ReactOS version*/
-        if (info.dwMajorVersion == 4)
+        switch(archInfo.wProcessorArchitecture)
         {
-            wcscpy(szBuffer, L"Windows NT 4.0");
-            if (info.szCSDVersion[0])
-            {
-                wcscat(szBuffer, L" ");
-                wcscat(szBuffer, info.szCSDVersion);
-            }
-            return TRUE;
+        case PROCESSOR_ARCHITECTURE_INTEL:
+        {
+            wsprintfW(szBuffer, L"32-bit");
+            break;
         }
-
-        if (info.dwMajorVersion == 5 && info.dwMinorVersion == 0)
+        case PROCESSOR_ARCHITECTURE_AMD64:
         {
-            wcscpy(szBuffer, L"Windows 2000");
-            if (info.szCSDVersion[0])
-            {
-                wcscat(szBuffer, L" ");
-                wcscat(szBuffer, info.szCSDVersion);
-            }
-            return TRUE;
+            wsprintfW(szBuffer, L"64-bit");
+            break;
         }
-
-        if (info.dwMajorVersion == 5 && info.dwMinorVersion == 1)
+        case PROCESSOR_ARCHITECTURE_IA64:
         {
-            wcscpy(szBuffer, L"Windows XP");
-            if (info.szCSDVersion[0])
-            {
-                wcscat(szBuffer, L" ");
-                wcscat(szBuffer, info.szCSDVersion);
-            }
-            return TRUE;
+            wsprintfW(szBuffer, L"Itanium");
+            break;
         }
-
-        if (info.dwMajorVersion == 6 && info.dwMinorVersion == 0)
+        case PROCESSOR_ARCHITECTURE_ARM:
         {
-//            if (GetVistaVersion(szBuffer))
-//                return TRUE;
-
-            wsprintfW(szBuffer, L"Windows Vista (6.0, Build %04u)", info.dwBuildNumber);
-            return TRUE;
+            wsprintfW(szBuffer, L"ARM");
+            break;
+        }
+        default:break;
         }
     }
-
-    return FALSE;
 }
 
 static
@@ -201,12 +158,14 @@ VOID
 InitializeSystemPage(HWND hwndDlg)
 {
     WCHAR szTime[200];
+    WCHAR szOSName[50];
     DWORD Length;
     DWORDLONG AvailableBytes, UsedBytes;
     MEMORYSTATUSEX mem;
     WCHAR szFormat[40];
     WCHAR szDesc[50];
     SYSTEM_INFO SysInfo;
+    OSVERSIONINFO VersionInfo;
 
     /* set date/time */
     szTime[0] = L'\0';
@@ -227,9 +186,31 @@ InitializeSystemPage(HWND hwndDlg)
         SendDlgItemMessageW(hwndDlg, IDC_STATIC_COMPUTER, WM_SETTEXT, 0, (LPARAM)szTime);
 
     /* set product name */
-    if (GetOSVersion(szTime))
+    if (GetRegValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", L"ProductName", REG_SZ, szOSName, sizeof(szOSName)))
     {
-        SendDlgItemMessage(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime);
+        if (LoadStringW(hInst, IDS_OS_VERSION, szFormat, sizeof(szFormat) / sizeof(WCHAR)))
+        {
+            WCHAR szCpuName[50];
+
+            ZeroMemory(&VersionInfo, sizeof(OSVERSIONINFO));
+            VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+
+            GetSystemCPU(szCpuName);
+
+            if (GetVersionEx(&VersionInfo))
+            {
+                szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0';
+                wsprintfW(szTime, szFormat, szOSName, szCpuName, VersionInfo.dwMajorVersion, VersionInfo.dwMinorVersion, VersionInfo.dwBuildNumber);
+                SendDlgItemMessageW(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime);
+            }
+            else
+            {
+                /* If the version of the OS cannot be retrieved for some reason, then just give the OS Name and Architecture */
+                szTime[(sizeof(szTime) / sizeof(WCHAR))-1] = L'\0';
+                wsprintfW(szTime, L"%s %s", szOSName, szCpuName);
+                SendDlgItemMessageW(hwndDlg, IDC_STATIC_OS, WM_SETTEXT, 0, (LPARAM)szTime);
+            }
+        }
     }
     else
     {