diff --git a/dll/cpl/console/console.c b/dll/cpl/console/console.c
index c1bccba1ea2..c3657520fbd 100644
--- a/dll/cpl/console/console.c
+++ b/dll/cpl/console/console.c
@@ -97,8 +97,10 @@ InitConsoleDefaults(PCONSOLE_PROPS pConInfo)
     pConInfo->ci.QuickEdit = FALSE;
     pConInfo->ci.InsertMode = TRUE;
     // pConInfo->ci.InputBufferSize;
-    pConInfo->ci.ScreenBufferSize = (COORD){80, 300};
-    pConInfo->ci.ConsoleSize      = (COORD){80, 25 };
+    pConInfo->ci.ScreenBufferSize.X = 80;
+    pConInfo->ci.ScreenBufferSize.Y = 300;
+    pConInfo->ci.ConsoleSize.X = 80;
+    pConInfo->ci.ConsoleSize.Y = 25;
     pConInfo->ci.CursorBlinkOn = TRUE;
     pConInfo->ci.ForceCursorOff = FALSE;
     pConInfo->ci.CursorSize = CSR_DEFAULT_CURSOR_SIZE;
@@ -118,7 +120,8 @@ InitConsoleDefaults(PCONSOLE_PROPS pConInfo)
     GuiInfo->UseRasterFonts = TRUE;
 
     GuiInfo->AutoPosition = TRUE;
-    GuiInfo->WindowOrigin = (POINT){0, 0};
+    GuiInfo->WindowOrigin.x = 0;
+    GuiInfo->WindowOrigin.y = 0;
 
     memcpy(pConInfo->ci.Colors, s_Colors, sizeof(s_Colors));
 }
diff --git a/dll/cpl/console/layout.c b/dll/cpl/console/layout.c
index 4f5df70185d..e6fd38ec8e3 100644
--- a/dll/cpl/console/layout.c
+++ b/dll/cpl/console/layout.c
@@ -292,9 +292,12 @@ LayoutProc(HWND hwndDlg,
                     }
                 }
 
-                pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight};
-                pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight};
-                GuiInfo->WindowOrigin = (POINT){left, top};
+                pConInfo->ci.ScreenBufferSize.X = swidth;
+                pConInfo->ci.ScreenBufferSize.Y = sheight;
+                pConInfo->ci.ConsoleSize.X = wwidth;
+                pConInfo->ci.ConsoleSize.Y = wheight;
+                GuiInfo->WindowOrigin.x = left;
+                GuiInfo->WindowOrigin.y = top;
                 PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
             }
             break;
@@ -339,9 +342,12 @@ LayoutProc(HWND hwndDlg,
                             wheight = sheight;
                         }
 
-                        pConInfo->ci.ScreenBufferSize = (COORD){swidth, sheight};
-                        pConInfo->ci.ConsoleSize = (COORD){wwidth, wheight};
-                        GuiInfo->WindowOrigin = (POINT){left, top};
+                        pConInfo->ci.ScreenBufferSize.X = swidth;
+                        pConInfo->ci.ScreenBufferSize.Y = sheight;
+                        pConInfo->ci.ConsoleSize.X = wwidth;
+                        pConInfo->ci.ConsoleSize.Y = wheight;
+                        GuiInfo->WindowOrigin.x = left;
+                        GuiInfo->WindowOrigin.y = top;
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
                     break;
@@ -356,7 +362,8 @@ LayoutProc(HWND hwndDlg,
 
                         left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE);
                         top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE);
-                        GuiInfo->WindowOrigin = (POINT){left, top};
+                        GuiInfo->WindowOrigin.x = left;
+                        GuiInfo->WindowOrigin.y = top;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
                         EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE);
                         EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE);
@@ -365,7 +372,8 @@ LayoutProc(HWND hwndDlg,
                     }
                     else if (res == BST_UNCHECKED)
                     {
-                        GuiInfo->WindowOrigin = (POINT){UINT_MAX, UINT_MAX};
+                        GuiInfo->WindowOrigin.x = UINT_MAX;
+                        GuiInfo->WindowOrigin.y = UINT_MAX;
                         SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
                         EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE);
                         EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE);
diff --git a/dll/win32/kernel32/client/console/console.c b/dll/win32/kernel32/client/console/console.c
index a064f947806..c0e2286bda2 100644
--- a/dll/win32/kernel32/client/console/console.c
+++ b/dll/win32/kernel32/client/console/console.c
@@ -535,7 +535,8 @@ SetConsoleDisplayMode(HANDLE hConsoleOutput,
 
     SetDisplayModeRequest->OutputHandle = hConsoleOutput;
     SetDisplayModeRequest->DisplayMode  = dwFlags;
-    SetDisplayModeRequest->NewSBDim     = (COORD){0, 0};
+    SetDisplayModeRequest->NewSBDim.X   = 0;
+    SetDisplayModeRequest->NewSBDim.Y   = 0;
 
     Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
@@ -1113,7 +1114,8 @@ GetLargestConsoleWindowSize(HANDLE hConsoleOutput)
     PCONSOLE_GETLARGESTWINDOWSIZE GetLargestWindowSizeRequest = &ApiMessage.Data.GetLargestWindowSizeRequest;
 
     GetLargestWindowSizeRequest->OutputHandle = hConsoleOutput;
-    GetLargestWindowSizeRequest->Size = (COORD){0, 0};
+    GetLargestWindowSizeRequest->Size.X = 0;
+    GetLargestWindowSizeRequest->Size.Y = 0;
 
     Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
                                  NULL,
@@ -2238,7 +2240,7 @@ DWORD
 WINAPI
 GetConsoleInputExeNameW(DWORD nBufferLength, LPWSTR lpBuffer)
 {
-    int lenName = lstrlenW(InputExeName);
+    ULONG lenName = lstrlenW(InputExeName);
 
     if (nBufferLength == 0)
     {
diff --git a/include/reactos/subsys/win/conmsg.h b/include/reactos/subsys/win/conmsg.h
index 24383cca91c..366fe2e297a 100644
--- a/include/reactos/subsys/win/conmsg.h
+++ b/include/reactos/subsys/win/conmsg.h
@@ -143,7 +143,7 @@ typedef struct _CONSOLE_CONNECTION_INFO
 
 typedef struct
 {
-    USHORT nMaxIds;
+    ULONG  nMaxIds;
     ULONG  nProcessIdsTotal;
     PDWORD pProcessIds;
 } CONSOLE_GETPROCESSLIST, *PCONSOLE_GETPROCESSLIST;
diff --git a/win32ss/user/consrv/conoutput.c b/win32ss/user/consrv/conoutput.c
index 9b6fc62bdab..1a6065ac39f 100644
--- a/win32ss/user/consrv/conoutput.c
+++ b/win32ss/user/consrv/conoutput.c
@@ -115,7 +115,8 @@ ConSrvCreateScreenBuffer(IN OUT PCONSOLE Console,
     {
         ClearLineBuffer(*Buffer);
     }
-    (*Buffer)->CursorPosition = (COORD){0, 0};
+    (*Buffer)->CursorPosition.X = 0;
+    (*Buffer)->CursorPosition.Y = 0;
 
     (*Buffer)->Mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT;
     (*Buffer)->DisplayMode = DisplayMode;
@@ -1394,7 +1395,7 @@ CSR_API(SrvCreateConsoleScreenBuffer)
     PCONSOLE Console;
     PCONSOLE_SCREEN_BUFFER Buff;
 
-    COORD   ScreenBufferSize = (COORD){80, 25};
+    COORD   ScreenBufferSize = {80, 25};
     USHORT  ScreenAttrib     = DEFAULT_SCREEN_ATTRIB;
     USHORT  PopupAttrib      = DEFAULT_POPUP_ATTRIB;
     ULONG   DisplayMode      = CONSOLE_WINDOWED_MODE;
diff --git a/win32ss/user/consrv/console.c b/win32ss/user/consrv/console.c
index 90c604adc12..a3af227fe27 100644
--- a/win32ss/user/consrv/console.c
+++ b/win32ss/user/consrv/console.c
@@ -348,9 +348,10 @@ LoadShellLinkConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
 {
 #define PATH_SEPARATOR L'\\'
 
-    BOOL   RetVal = FALSE;
-    LPWSTR LinkName = NULL;
-    SIZE_T Length = 0;
+    BOOL    RetVal   = FALSE;
+    HRESULT hRes     = S_OK;
+    LPWSTR  LinkName = NULL;
+    SIZE_T  Length   = 0;
 
     if ((ConsoleStartInfo->dwStartupFlags & STARTF_TITLEISLINKNAME) == 0)
         return FALSE;
@@ -379,7 +380,7 @@ LoadShellLinkConsoleInfo(IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
         return FALSE;
 
     /* 3- It may be a link. Try to retrieve some properties */
-    HRESULT hRes = CoInitialize(NULL);
+    hRes = CoInitialize(NULL);
     if (SUCCEEDED(hRes))
     {
         /* Get a pointer to the IShellLink interface */
diff --git a/win32ss/user/consrv/frontends/gui/guisettings.c b/win32ss/user/consrv/frontends/gui/guisettings.c
index 0a4cf44c728..8a143d2e334 100644
--- a/win32ss/user/consrv/frontends/gui/guisettings.c
+++ b/win32ss/user/consrv/frontends/gui/guisettings.c
@@ -198,7 +198,8 @@ GuiConsoleGetDefaultSettings(IN OUT PGUI_CONSOLE_INFO TermInfo,
 
     TermInfo->ShowWindow   = SW_SHOWNORMAL;
     TermInfo->AutoPosition = TRUE;
-    TermInfo->WindowOrigin = (POINT){0, 0};
+    TermInfo->WindowOrigin.x = 0;
+    TermInfo->WindowOrigin.y = 0;
 
     /*
      * 2. Overwrite them with the ones stored in HKCU\Console.
diff --git a/win32ss/user/consrv/frontends/gui/guiterm.c b/win32ss/user/consrv/frontends/gui/guiterm.c
index 6e25b3b102d..3f8ec1f544d 100644
--- a/win32ss/user/consrv/frontends/gui/guiterm.c
+++ b/win32ss/user/consrv/frontends/gui/guiterm.c
@@ -226,7 +226,8 @@ GuiConsoleHandleSysMenuCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM
             LPWSTR WindowTitle = NULL;
             SIZE_T Length = 0;
 
-            Console->dwSelectionCursor = (COORD){0, 0};
+            Console->dwSelectionCursor.X = 0;
+            Console->dwSelectionCursor.Y = 0;
             Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor;
             Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS;
             GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor);
@@ -251,7 +252,8 @@ GuiConsoleHandleSysMenuCommand(PGUI_CONSOLE_DATA GuiData, WPARAM wParam, LPARAM
 
         case ID_SYSTEM_EDIT_SELECTALL:
         {
-            Console->Selection.dwSelectionAnchor = (COORD){0, 0};
+            Console->Selection.dwSelectionAnchor.X = 0;
+            Console->Selection.dwSelectionAnchor.Y = 0;
             Console->dwSelectionCursor.X = Console->ConsoleSize.X - 1;
             Console->dwSelectionCursor.Y = Console->ConsoleSize.Y - 1;
             GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor);
@@ -768,7 +770,8 @@ GuiConsoleHandleKey(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM l
                 case VK_HOME:
                 {
                     Interpreted = TRUE;
-                    Console->dwSelectionCursor = (COORD){0, 0};
+                    Console->dwSelectionCursor.X = 0;
+                    Console->dwSelectionCursor.Y = 0;
                     break;
                 }
 
@@ -1911,11 +1914,17 @@ GuiInit(VOID)
         }
 
         /* Initialize the console window class */
-        ghDefaultIcon = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON,
-                                   GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON),
-                                   LR_SHARED);
-        ghDefaultIconSm = LoadImageW(ConSrvDllInstance, MAKEINTRESOURCEW(IDI_CONSOLE), IMAGE_ICON,
-                                     GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
+        ghDefaultIcon   = LoadImageW(ConSrvDllInstance,
+                                     MAKEINTRESOURCEW(IDI_TERMINAL),
+                                     IMAGE_ICON,
+                                     GetSystemMetrics(SM_CXICON),
+                                     GetSystemMetrics(SM_CYICON),
+                                     LR_SHARED);
+        ghDefaultIconSm = LoadImageW(ConSrvDllInstance,
+                                     MAKEINTRESOURCEW(IDI_TERMINAL),
+                                     IMAGE_ICON,
+                                     GetSystemMetrics(SM_CXSMICON),
+                                     GetSystemMetrics(SM_CYSMICON),
                                      LR_SHARED);
         ghDefaultCursor = LoadCursorW(NULL, IDC_ARROW);
         wc.cbSize = sizeof(WNDCLASSEXW);
@@ -2042,7 +2051,7 @@ GuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG Cur
 
         ScrollWindowEx(GuiData->hWindow,
                        0,
-                       -(ScrolledLines * GuiData->CharHeight),
+                       -(int)(ScrolledLines * GuiData->CharHeight),
                        &ScrollRect,
                        NULL,
                        NULL,
diff --git a/win32ss/user/consrv/frontends/gui/guiterm.rc b/win32ss/user/consrv/frontends/gui/guiterm.rc
index d6f07b05b7e..7a88fce0e39 100644
--- a/win32ss/user/consrv/frontends/gui/guiterm.rc
+++ b/win32ss/user/consrv/frontends/gui/guiterm.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 // #define REACTOS_STR_ORIGINAL_FILENAME   "consrv.dll"
 // #include <reactos/version.rc>
 
-// IDI_CONSOLE ICON    DISCARDABLE "res/terminal.ico"
-IDI_CONSOLE ICON    DISCARDABLE "frontends/gui/res/terminal.ico"
+// IDI_TERMINAL ICON    DISCARDABLE "res/terminal.ico"
+IDI_TERMINAL ICON    DISCARDABLE "frontends/gui/res/terminal.ico"
 
 #include "rsrc.rc"
diff --git a/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc b/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc
index 1404cb583c9..7e8440e4355 100644
--- a/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/bg-BG.rc
@@ -17,6 +17,8 @@ BEGIN
     IDS_FIND            "Търсене..."
     IDS_DEFAULTS        "Подразбирани"
     IDS_PROPERTIES      "Свойства"
+
+/*
     IDS_SCROLLHERE      "Прелистване тук"
     IDS_SCROLLTOP       "Прелистване до горе"
     IDS_SCROLLBOTTOM    "Прелистване до долу"
@@ -24,6 +26,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Долна страница"
     IDS_SCROLLUP        "Прелистване нагоре"
     IDS_SCROLLDOWN      "Прелистване надолу"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc b/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc
index 8834206d1f0..bd38c87488a 100644
--- a/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/cs-CZ.rc
@@ -17,6 +17,8 @@ BEGIN
     IDS_FIND            "Najít..."
     IDS_DEFAULTS        "Výchozí"
     IDS_PROPERTIES      "Vlastnosti"
+
+/*
     IDS_SCROLLHERE      "Posunout sem"
     IDS_SCROLLTOP       "Posunout na začátek"
     IDS_SCROLLBOTTOM    "Posunout na konec"
@@ -24,6 +26,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "O stránku níže"
     IDS_SCROLLUP        "Posunout nahoru"
     IDS_SCROLLDOWN      "Posunout dolů"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/de-DE.rc b/win32ss/user/consrv/frontends/gui/lang/de-DE.rc
index d8c6844ebab..6d66f62e401 100644
--- a/win32ss/user/consrv/frontends/gui/lang/de-DE.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/de-DE.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "Suchen..."
     IDS_DEFAULTS        "Standardwerte"
     IDS_PROPERTIES      "Eigenschaften"
+
+/*
     IDS_SCROLLHERE      "Hier scrollen"
     IDS_SCROLLTOP       "Ganz nach oben scrollen"
     IDS_SCROLLBOTTOM    "Ganz nach unten scrollen"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Seite nach unten"
     IDS_SCROLLUP        "Nach oben scrollen"
     IDS_SCROLLDOWN      "Nach unten scrollen"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/el-GR.rc b/win32ss/user/consrv/frontends/gui/lang/el-GR.rc
index 09b61274a13..6041800756c 100644
--- a/win32ss/user/consrv/frontends/gui/lang/el-GR.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/el-GR.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "Εύρεση..."
     IDS_DEFAULTS        "Προεπιλογή"
     IDS_PROPERTIES      "Ιδιότητες"
+
+/*
     IDS_SCROLLHERE      "Κύλιση εδώ"
     IDS_SCROLLTOP       "Αρχή"
     IDS_SCROLLBOTTOM    "Τέλος"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Επόμενη σελίδα"
     IDS_SCROLLUP        "Κύλιση πάνω"
     IDS_SCROLLDOWN      "Κύλιση κάτω"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/en-US.rc b/win32ss/user/consrv/frontends/gui/lang/en-US.rc
index 3ab021d185b..04de038bffa 100644
--- a/win32ss/user/consrv/frontends/gui/lang/en-US.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/en-US.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "Find..."
     IDS_DEFAULTS        "Defaults"
     IDS_PROPERTIES      "Properties"
+
+/*
     IDS_SCROLLHERE      "Scroll here"
     IDS_SCROLLTOP       "Scroll top"
     IDS_SCROLLBOTTOM    "Scroll bottom"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Page down"
     IDS_SCROLLUP        "Scroll up"
     IDS_SCROLLDOWN      "Scroll down"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/es-ES.rc b/win32ss/user/consrv/frontends/gui/lang/es-ES.rc
index 44aa1442734..78ffc2221e1 100644
--- a/win32ss/user/consrv/frontends/gui/lang/es-ES.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/es-ES.rc
@@ -16,6 +16,8 @@ BEGIN
     IDS_FIND            "Buscar..."
     IDS_DEFAULTS        "Por defecto"
     IDS_PROPERTIES      "Propiedades"
+
+/*
     IDS_SCROLLHERE      "Desplazar aquí"
     IDS_SCROLLTOP       "Desplazar hasta arriba"
     IDS_SCROLLBOTTOM    "Desplazar hasta abajo"
@@ -23,6 +25,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Bajar página"
     IDS_SCROLLUP        "Desplazar arriba"
     IDS_SCROLLDOWN      "Desplazar abajo"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc b/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc
index 8a20107d0c5..f1834c18545 100644
--- a/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/fr-FR.rc
@@ -13,6 +13,8 @@ BEGIN
     IDS_FIND            "Trouver..."
     IDS_DEFAULTS        "Défauts"
     IDS_PROPERTIES      "Propriétés"
+
+/*
     IDS_SCROLLHERE      "Défiler ici"
     IDS_SCROLLTOP       "Défiler tout en haut"
     IDS_SCROLLBOTTOM    "Défiler tout en bas"
@@ -20,6 +22,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Page suivante"
     IDS_SCROLLUP        "Défiler en haut"
     IDS_SCROLLDOWN      "Défiler en bas"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/he-IL.rc b/win32ss/user/consrv/frontends/gui/lang/he-IL.rc
index b9261ffc424..de4f25870bb 100644
--- a/win32ss/user/consrv/frontends/gui/lang/he-IL.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/he-IL.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND "מצא..."
     IDS_DEFAULTS "ברירת מחדל"
     IDS_PROPERTIES "מאפיינים"
+
+/*
     IDS_SCROLLHERE "גלול לכאן"
     IDS_SCROLLTOP "גלול למעלה"
     IDS_SCROLLBOTTOM "גלול למטה"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "עמוד מטה"
     IDS_SCROLLUP "גלול מעלה"
     IDS_SCROLLDOWN "גלול מטה"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/id-ID.rc b/win32ss/user/consrv/frontends/gui/lang/id-ID.rc
index 34a6d016069..6e889163363 100644
--- a/win32ss/user/consrv/frontends/gui/lang/id-ID.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/id-ID.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "Cari..."
     IDS_DEFAULTS        "Standar"
     IDS_PROPERTIES      "Properti"
+
+/*
     IDS_SCROLLHERE      "Gulung ke Sini"
     IDS_SCROLLTOP       "Gulung ke Atas"
     IDS_SCROLLBOTTOM    "Gulung ke Bawah"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Halaman Turun"
     IDS_SCROLLUP        "Gulung Naik"
     IDS_SCROLLDOWN      "Gulung Turun"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/it-IT.rc b/win32ss/user/consrv/frontends/gui/lang/it-IT.rc
index bb7227abdf7..ce09f5cca02 100644
--- a/win32ss/user/consrv/frontends/gui/lang/it-IT.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/it-IT.rc
@@ -20,6 +20,8 @@ BEGIN
     IDS_FIND            "Trova..."
     IDS_DEFAULTS        "Impostazioni predefinite"
     IDS_PROPERTIES      "Proprietà"
+
+/*
     IDS_SCROLLHERE      "Scorri qui"
     IDS_SCROLLTOP       "Scorri in cima"
     IDS_SCROLLBOTTOM    "Scorri in fondo"
@@ -27,6 +29,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Pagina giù"
     IDS_SCROLLUP        "Scorri sù"
     IDS_SCROLLDOWN      "Scorri giù"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc b/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc
index 98497409feb..8c4f66dcb48 100644
--- a/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/ja-JP.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "検索..."
     IDS_DEFAULTS        "規定値"
     IDS_PROPERTIES      "プロパティ"
+
+/*
     IDS_SCROLLHERE      "ここにスクロール"
     IDS_SCROLLTOP       "一番上にスクロール"
     IDS_SCROLLBOTTOM    "一番下にスクロール"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Page down"
     IDS_SCROLLUP        "上にスクロール"
     IDS_SCROLLDOWN      "下にスクロール"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/no-NO.rc b/win32ss/user/consrv/frontends/gui/lang/no-NO.rc
index b1cad6560a0..9ffd8d70518 100644
--- a/win32ss/user/consrv/frontends/gui/lang/no-NO.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/no-NO.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "Finn..."
     IDS_DEFAULTS        "Standard"
     IDS_PROPERTIES      "Egenskaper"
+
+/*
     IDS_SCROLLHERE      "Rull her"
     IDS_SCROLLTOP       "Rull til toppen"
     IDS_SCROLLBOTTOM    "Rull knapp"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Side ned"
     IDS_SCROLLUP        "Rull opp"
     IDS_SCROLLDOWN      "Rull ned"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc b/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc
index 375c8f92ce3..c6e237f81da 100644
--- a/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/pl-PL.rc
@@ -19,6 +19,8 @@ BEGIN
     IDS_FIND            "Znajdź..."
     IDS_DEFAULTS        "Ustawienia domyślne"
     IDS_PROPERTIES      "Właściwości"
+
+/*
     IDS_SCROLLHERE      "Przewiń tutaj"
     IDS_SCROLLTOP       "Przewiń na początek"
     IDS_SCROLLBOTTOM    "Przewiń na koniec"
@@ -26,6 +28,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Następna strona"
     IDS_SCROLLUP        "Przewiń do góry"
     IDS_SCROLLDOWN      "Przewiń na dół"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc b/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc
index aa6eb17c9ca..37e66f8afb4 100644
--- a/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/pt-BR.rc
@@ -13,6 +13,8 @@ BEGIN
     IDS_FIND            "Procurar..."
     IDS_DEFAULTS        "Padrões"
     IDS_PROPERTIES      "Propriedades"
+
+/*
     IDS_SCROLLHERE      "Rolar aqui"
     IDS_SCROLLTOP       "Rolar até o topo"
     IDS_SCROLLBOTTOM    "Rolar até o fim"
@@ -20,6 +22,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Page down"
     IDS_SCROLLUP        "Scroll up"
     IDS_SCROLLDOWN      "Scroll down"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc b/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc
index 8b1fb8aa80c..9eec57c8b66 100644
--- a/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/ro-RO.rc
@@ -18,6 +18,8 @@ BEGIN
     IDS_FIND            "Găsire…"
     IDS_DEFAULTS        "Implicite"
     IDS_PROPERTIES      "Proprietăți"
+
+/*
     IDS_SCROLLHERE      "Derulează aici"
     IDS_SCROLLTOP       "Derulează la început"
     IDS_SCROLLBOTTOM    "Derulează la sfârșit"
@@ -25,6 +27,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Pagina următoare"
     IDS_SCROLLUP        "Derulează în sus"
     IDS_SCROLLDOWN      "Derulează în jos"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc b/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc
index 49f4597c6c4..b1587a2baf7 100644
--- a/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/ru-RU.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "Искать..."
     IDS_DEFAULTS        "Умолчания"
     IDS_PROPERTIES      "Свойства"
+
+/*
     IDS_SCROLLHERE      "Scroll Here"
     IDS_SCROLLTOP       "Scroll Top"
     IDS_SCROLLBOTTOM    "Прокрутить вниз"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Вниз страницы"
     IDS_SCROLLUP        "Прокрутить вверх"
     IDS_SCROLLDOWN      "Scroll Down"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc b/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc
index aa60dd5c4dc..f518891626f 100644
--- a/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/sk-SK.rc
@@ -16,6 +16,8 @@ BEGIN
     IDS_FIND            "Nájsť..."   // Find
     IDS_DEFAULTS        "Predvolené" // Defaults
     IDS_PROPERTIES      "Vlastnosti"
+
+/*
     IDS_SCROLLHERE      "Rolovať sem"
     IDS_SCROLLTOP       "K hornému okraju"
     IDS_SCROLLBOTTOM    "K dolnému okraju"
@@ -23,6 +25,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "O stránku nižšie"
     IDS_SCROLLUP        "Rolovať nahor"
     IDS_SCROLLDOWN      "Rolovať nadol"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc b/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc
index 3c94849fd6c..f72c472023d 100644
--- a/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/sv-SE.rc
@@ -18,6 +18,8 @@ BEGIN
     IDS_FIND            "Sök..."
     IDS_DEFAULTS        "Ursprunglig"
     IDS_PROPERTIES      "Egenskaper"
+
+/*
     IDS_SCROLLHERE      "Skrolla hit"
     IDS_SCROLLTOP       "Skrolla till topp"
     IDS_SCROLLBOTTOM    "Skrolla till botten"
@@ -25,6 +27,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Sida ner"
     IDS_SCROLLUP        "Skrolla upp"
     IDS_SCROLLDOWN      "Skrolla ner"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc b/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc
index 96879dddc88..1b2a9b6034f 100644
--- a/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/tr-TR.rc
@@ -31,6 +31,8 @@ BEGIN
     IDS_FIND            "Bul..."
     IDS_DEFAULTS        "Varsayılanlar"
     IDS_PROPERTIES      "Özellikler"
+
+/*
     IDS_SCROLLHERE      "Buraya yuvarla"
     IDS_SCROLLTOP       "Üste yuvarla"
     IDS_SCROLLBOTTOM    "Alta yuvarla"
@@ -38,6 +40,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Sayfa aşağı"
     IDS_SCROLLUP        "Yukarı yuvarla"
     IDS_SCROLLDOWN      "Aşağı yuvarla"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc b/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc
index 2fabbc5b2ea..d610288cbc1 100644
--- a/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/uk-UA.rc
@@ -19,6 +19,8 @@ BEGIN
     IDS_FIND            "Знайти..."
     IDS_DEFAULTS        "Замовчування"
     IDS_PROPERTIES      "Властивості"
+
+/*
     IDS_SCROLLHERE      "Прокрутити сюди"
     IDS_SCROLLTOP       "Прокрутити на початок"
     IDS_SCROLLBOTTOM    "Прокрутити на кінець"
@@ -26,6 +28,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "Наступна сторінка"
     IDS_SCROLLUP        "Прокрутити догори"
     IDS_SCROLLDOWN      "Прокрутити донизу"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc b/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc
index 82b68fa376d..3d7c645f66a 100644
--- a/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/zh-CN.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "查找..."
     IDS_DEFAULTS        "默认"
     IDS_PROPERTIES      "属性"
+
+/*
     IDS_SCROLLHERE      "滚动到此"
     IDS_SCROLLTOP       "滚动至顶端"
     IDS_SCROLLBOTTOM    "滚动至末端"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "下一页"
     IDS_SCROLLUP        "向上滚动"
     IDS_SCROLLDOWN      "向下滚动"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc b/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc
index cb7f32ae906..6ff4e5865ed 100644
--- a/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc
+++ b/win32ss/user/consrv/frontends/gui/lang/zh-TW.rc
@@ -11,6 +11,8 @@ BEGIN
     IDS_FIND            "尋找..."
     IDS_DEFAULTS        "預設"
     IDS_PROPERTIES      "屬性"
+
+/*
     IDS_SCROLLHERE      "滾動到此 "
     IDS_SCROLLTOP       "滾動到頂置"
     IDS_SCROLLBOTTOM    "滾動到末端"
@@ -18,6 +20,7 @@ BEGIN
     IDS_SCROLLPAGE_DOWN "下一頁"
     IDS_SCROLLUP        "向上滾動"
     IDS_SCROLLDOWN      "向下滾動"
+*/
 
-    IDS_CONSOLE_TITLE   "ReactOS Console"
+    IDS_TERMINAL_TITLE   "ReactOS Console"
 END
diff --git a/win32ss/user/consrv/frontends/gui/resource.h b/win32ss/user/consrv/frontends/gui/resource.h
index d8a7ae5e466..51dd0a2006a 100644
--- a/win32ss/user/consrv/frontends/gui/resource.h
+++ b/win32ss/user/consrv/frontends/gui/resource.h
@@ -7,37 +7,39 @@
 
 #pragma once
 
-#define ID_SYSTEM_EDIT_MARK 1001
-#define ID_SYSTEM_EDIT_COPY 1002
-#define ID_SYSTEM_EDIT_PASTE    1003
+#define ID_SYSTEM_EDIT_MARK         1001
+#define ID_SYSTEM_EDIT_COPY         1002
+#define ID_SYSTEM_EDIT_PASTE        1003
 #define ID_SYSTEM_EDIT_SELECTALL    1004
-#define ID_SYSTEM_EDIT_SCROLL   1005
-#define ID_SYSTEM_EDIT_FIND 1006
-#define ID_SYSTEM_DEFAULTS  1007
-#define ID_SYSTEM_PROPERTIES    1008
+#define ID_SYSTEM_EDIT_SCROLL       1005
+#define ID_SYSTEM_EDIT_FIND         1006
+#define ID_SYSTEM_DEFAULTS          1007
+#define ID_SYSTEM_PROPERTIES        1008
 
-#define NCPOPUP_MENU  103
+#define NCPOPUP_MENU    103
 
-#define IDS_EDIT      204
-#define IDS_MARK      205
-#define IDS_COPY      206
-#define IDS_PASTE     207
-#define IDS_SELECTALL 208
-#define IDS_SCROLL    209
-#define IDS_FIND      210
-#define IDS_DEFAULTS  211
-#define IDS_PROPERTIES 212
+#define IDS_EDIT        204
+#define IDS_MARK        205
+#define IDS_COPY        206
+#define IDS_PASTE       207
+#define IDS_SELECTALL   208
+#define IDS_SCROLL      209
+#define IDS_FIND        210
+#define IDS_DEFAULTS    211
+#define IDS_PROPERTIES  212
 
-// Scrollbar resource ids
-#define IDS_SCROLLHERE   304
-#define IDS_SCROLLTOP    305
-#define IDS_SCROLLBOTTOM 306
-#define IDS_SCROLLPAGE_UP 307
+// Scrollbar resource ids. Unused.
+/*
+#define IDS_SCROLLHERE      304
+#define IDS_SCROLLTOP       305
+#define IDS_SCROLLBOTTOM    306
+#define IDS_SCROLLPAGE_UP   307
 #define IDS_SCROLLPAGE_DOWN 308
-#define IDS_SCROLLUP 309
-#define IDS_SCROLLDOWN 310
+#define IDS_SCROLLUP        309
+#define IDS_SCROLLDOWN      310
+*/
 
-#define IDI_CONSOLE       1
-#define IDS_CONSOLE_TITLE 500
+#define IDI_TERMINAL        1
+#define IDS_TERMINAL_TITLE  400
 
 /* EOF */
diff --git a/win32ss/user/consrv/settings.c b/win32ss/user/consrv/settings.c
index 4dea69bf1a7..37728dbcc0d 100644
--- a/win32ss/user/consrv/settings.c
+++ b/win32ss/user/consrv/settings.c
@@ -415,8 +415,10 @@ ConSrvGetDefaultSettings(IN OUT PCONSOLE_INFO ConsoleInfo,
     ConsoleInfo->QuickEdit  = FALSE;
     ConsoleInfo->InsertMode = TRUE;
     // ConsoleInfo->InputBufferSize;
-    ConsoleInfo->ScreenBufferSize = (COORD){80, 300};
-    ConsoleInfo->ConsoleSize      = (COORD){80, 25 };
+    ConsoleInfo->ScreenBufferSize.X = 80;
+    ConsoleInfo->ScreenBufferSize.Y = 300;
+    ConsoleInfo->ConsoleSize.X = 80;
+    ConsoleInfo->ConsoleSize.Y = 25;
 
     ConsoleInfo->CursorBlinkOn;
     ConsoleInfo->ForceCursorOff;