diff --git a/reactos/dll/cpl/timedate/dateandtime.c b/reactos/dll/cpl/timedate/dateandtime.c
index 7980b106a41..a7a13eb9d20 100644
--- a/reactos/dll/cpl/timedate/dateandtime.c
+++ b/reactos/dll/cpl/timedate/dateandtime.c
@@ -98,7 +98,7 @@ SetLocalSystemTime(HWND hwnd)
                     (WPARAM)&Time,
                     0);
 
-        /* broadcast the time change message */
+        /* Broadcast the time change message */
         SendMessage(HWND_BROADCAST,
                     WM_TIMECHANGE,
                     0,
@@ -110,38 +110,38 @@ SetLocalSystemTime(HWND hwnd)
 static VOID
 SetTimeZoneName(HWND hwnd)
 {
-  TIME_ZONE_INFORMATION TimeZoneInfo;
-  WCHAR TimeZoneString[128];
-  WCHAR TimeZoneText[128];
-  WCHAR TimeZoneName[128];
-  DWORD TimeZoneId;
+    TIME_ZONE_INFORMATION TimeZoneInfo;
+    WCHAR TimeZoneString[128];
+    WCHAR TimeZoneText[128];
+    WCHAR TimeZoneName[128];
+    DWORD TimeZoneId;
 
-  TimeZoneId = GetTimeZoneInformation(&TimeZoneInfo);
+    TimeZoneId = GetTimeZoneInformation(&TimeZoneInfo);
 
-  LoadStringW(hApplet, IDS_TIMEZONETEXT, TimeZoneText, 128);
+    LoadStringW(hApplet, IDS_TIMEZONETEXT, TimeZoneText, 128);
 
-  switch (TimeZoneId)
-  {
-    case TIME_ZONE_ID_STANDARD:
-      wcscpy(TimeZoneName, TimeZoneInfo.StandardName);
-      break;
+    switch (TimeZoneId)
+    {
+        case TIME_ZONE_ID_STANDARD:
+            wcscpy(TimeZoneName, TimeZoneInfo.StandardName);
+            break;
 
-    case TIME_ZONE_ID_DAYLIGHT:
-      wcscpy(TimeZoneName, TimeZoneInfo.DaylightName);
-      break;
+        case TIME_ZONE_ID_DAYLIGHT:
+            wcscpy(TimeZoneName, TimeZoneInfo.DaylightName);
+            break;
 
-    case TIME_ZONE_ID_UNKNOWN:
-      LoadStringW(hApplet, IDS_TIMEZONEUNKNOWN, TimeZoneName, 128);
-      break;
+        case TIME_ZONE_ID_UNKNOWN:
+            LoadStringW(hApplet, IDS_TIMEZONEUNKNOWN, TimeZoneName, 128);
+            break;
 
-    case TIME_ZONE_ID_INVALID:
-    default:
-      LoadStringW(hApplet, IDS_TIMEZONEINVALID, TimeZoneName, 128);
-      break;
-  }
+        case TIME_ZONE_ID_INVALID:
+        default:
+            LoadStringW(hApplet, IDS_TIMEZONEINVALID, TimeZoneName, 128);
+            break;
+    }
 
-  wsprintfW(TimeZoneString, TimeZoneText, TimeZoneName);
-  SendDlgItemMessageW(hwnd, IDC_TIMEZONE, WM_SETTEXT, 0, (LPARAM)TimeZoneString);
+    wsprintfW(TimeZoneString, TimeZoneText, TimeZoneName);
+    SendDlgItemMessageW(hwnd, IDC_TIMEZONE, WM_SETTEXT, 0, (LPARAM)TimeZoneString);
 }
 
 
@@ -254,13 +254,10 @@ DTPProc(HWND hwnd,
     switch (uMsg)
     {
         case WM_KEYDOWN:
-        {
             /* stop the timer when the user is about to change the time */
             if ((wParam != VK_LEFT) & (wParam != VK_RIGHT))
                 KillTimer(GetParent(hwnd), ID_TIMER);
-        }
-        break;
-
+            break;
     }
 
     return CallWindowProc(pOldWndProc, hwnd, uMsg, wParam, lParam);
@@ -279,7 +276,6 @@ DateTimePageProc(HWND hwndDlg,
     switch (uMsg)
     {
         case WM_INITDIALOG:
-        {
             FillMonthsComboBox(GetDlgItem(hwndDlg,
                                           IDC_MONTHCB));
 
@@ -290,21 +286,16 @@ DateTimePageProc(HWND hwndDlg,
             SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0));
 
             pOldWndProc = (WNDPROC) SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc);
-        }
-        break;
+            break;
 
         case WM_TIMER:
-        {
             SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPICKER), DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM) &st);
-        }
-        break;
+            break;
 
         case WM_COMMAND:
-        {
             switch (LOWORD(wParam))
             {
                 case IDC_MONTHCB:
-                {
                     if (HIWORD(wParam) == CBN_SELCHANGE)
                     {
                         ChangeMonthCalDate(GetDlgItem(hwndDlg,
@@ -313,19 +304,14 @@ DateTimePageProc(HWND hwndDlg,
                                                       GetCBSelectedMonth((HWND)lParam),
                                                       (WORD) -1);
                     }
-                }
-                break;
+                    break;
             }
-        }
-        break;
+            break;
 
         case WM_CTLCOLORSTATIC:
-        {
-            if ((HWND) lParam == GetDlgItem(hwndDlg, IDC_YEARTEXT))
-                return (INT_PTR) GetSysColorBrush(COLOR_WINDOW);
-
-        }
-        break;
+            if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_YEARTEXT))
+                return (INT_PTR)GetSysColorBrush(COLOR_WINDOW);
+            break;
 
         case WM_NOTIFY:
         {
@@ -334,14 +320,13 @@ DateTimePageProc(HWND hwndDlg,
             switch (lpnm->idFrom)
             {
                 case IDC_YEAR:
-                {
                     switch (lpnm->code)
                     {
                         case UDN_DELTAPOS:
                         {
-                            short wYear;
-                            LPNMUPDOWN updown = (LPNMUPDOWN) lpnm;
-                            wYear = (short) SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0);
+                            SHORT wYear;
+                            LPNMUPDOWN updown = (LPNMUPDOWN)lpnm;
+                            wYear = (SHORT)SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0);
                             /* Enable the 'Apply' button */
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                             ChangeMonthCalDate(GetDlgItem(hwndDlg,
@@ -352,15 +337,12 @@ DateTimePageProc(HWND hwndDlg,
                         }
                         break;
                     }
-                }
-                break;
+                    break;
 
                 case IDC_TIMEPICKER:
-                {
                     switch (lpnm->code)
                     {
                         case DTN_DATETIMECHANGE:
-                        {
                             /* Stop the timer */
                             KillTimer(hwndDlg, ID_TIMER);
 
@@ -370,73 +352,54 @@ DateTimePageProc(HWND hwndDlg,
 
                             /* Enable the 'Apply' button */
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-                        }
-                        break;
+                            break;
                     }
-                }
-                break;
+                    break;
 
                 case IDC_MONTHCALENDAR:
-                {
                     switch (lpnm->code)
                     {
                         case MCCN_SELCHANGE:
-                        {
                             /* Enable the 'Apply' button */
                             PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-                        }
-                        break;
+                            break;
 
                         case MCCN_AUTOUPDATE:
-                        {
                             AutoUpdateMonthCal(hwndDlg,
                                                  (PNMMCCAUTOUPDATE)lpnm);
-                        }
-                        break;
+                            break;
                     }
-                }
-                break;
+                    break;
 
                 default:
-                {
                     switch (lpnm->code)
                     {
                         case PSN_SETACTIVE:
-                        {
                             SetTimeZoneName(hwndDlg);
-                        }
-                        break;
+                            break;
 
                         case PSN_APPLY:
-                        {
                             SetLocalSystemTime(hwndDlg);
                             SetTimer(hwndDlg, ID_TIMER, 1000, NULL);
                             return TRUE;
-                        }
                     }
-                }
+                    break;
             }
         }
         break;
 
         case WM_TIMECHANGE:
-        {
             /* FIXME - we don't get this message as we're not a top-level window... */
             SendMessage(GetDlgItem(hwndDlg,
                                    IDC_MONTHCALENDAR),
                         MCCM_RESET,
                         0,
                         0);
-
-        }
-        break;
+            break;
 
         case WM_DESTROY:
-        {
             KillTimer(hwndDlg, ID_TIMER);
-        }
-        break;
-
+            break;
     }
 
     return FALSE;
diff --git a/reactos/dll/cpl/timedate/internettime.c b/reactos/dll/cpl/timedate/internettime.c
index 003b0b79192..34fd6ad7759 100644
--- a/reactos/dll/cpl/timedate/internettime.c
+++ b/reactos/dll/cpl/timedate/internettime.c
@@ -13,74 +13,74 @@ static VOID
 CreateNTPServerList(HWND hwnd)
 {
     HWND hList;
-    WCHAR ValName[MAX_VALUE_NAME];
-    WCHAR Data[256];
-    DWORD Index = 0;
-    DWORD ValSize;
+    TCHAR szValName[MAX_VALUE_NAME];
+    TCHAR szData[256];
+    DWORD dwIndex = 0;
+    DWORD dwValSize;
     DWORD dwNameSize;
-    DWORD Default = 1;
-    LONG Ret;
+    DWORD dwDefault = 1;
+    LONG lRet;
     HKEY hKey;
 
     hList = GetDlgItem(hwnd,
                        IDC_SERVERLIST);
 
-    Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                        L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers",
+    lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                        _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers"),
                         0,
                         KEY_QUERY_VALUE,
                         &hKey);
-    if (Ret != ERROR_SUCCESS)
+    if (lRet != ERROR_SUCCESS)
         return;
 
     while (TRUE)
     {
-            ValSize = MAX_VALUE_NAME;
-            ValName[0] = '\0';
-            Ret = RegEnumValueW(hKey,
-                                Index,
-                                ValName,
-                                &ValSize,
-                                NULL,
-                                NULL,
-                                (LPBYTE)Data,
-                                &dwNameSize);
-
-            if (Ret == ERROR_SUCCESS)
+        dwValSize = MAX_VALUE_NAME * sizeof(TCHAR);
+        szValName[0] = '\0';
+        lRet = RegEnumValue(hKey,
+                            dwIndex,
+                            szValName,
+                            &dwValSize,
+                            NULL,
+                            NULL,
+                            (LPBYTE)szData,
+                            &dwNameSize);
+        if (lRet == ERROR_SUCCESS)
+        {
+            /* get date from default reg value */
+            if (_tcscmp(szValName, _T("")) == 0) // if (Index == 0)
             {
-                /* get date from default reg value */
-                if (wcscmp(ValName, L"") == 0) // if (Index == 0)
-                {
-                    Default = _wtoi(Data);
-                    Index++;
-                }
-                else
-                {
-                    SendMessageW(hList,
-                                 CB_ADDSTRING,
-                                 0,
-                                 (LPARAM)Data);
-                    Index++;
-                }
+                dwDefault = _ttoi(szData);
+                dwIndex++;
             }
-            else if (Ret != ERROR_MORE_DATA)
-                break;
+            else
+            {
+                SendMessage(hList,
+                            CB_ADDSTRING,
+                            0,
+                            (LPARAM)szData);
+                dwIndex++;
+            }
+        }
+        else if (lRet != ERROR_MORE_DATA)
+        {
+            break;
+        }
     }
 
-    if (Default < 1 || Default > Index)
-        Default = 1;
+    if (dwDefault < 1 || dwDefault > dwIndex)
+        dwDefault = 1;
 
     /* server reg entries count from 1,
      * combo boxes count from 0 */
-    Default--;
+    dwDefault--;
 
     SendMessage(hList,
                 CB_SETCURSEL,
-                Default,
+                dwDefault,
                 0);
 
     RegCloseKey(hKey);
-
 }
 
 
@@ -90,110 +90,100 @@ SetNTPServer(HWND hwnd)
 {
     HKEY hKey;
     HWND hList;
-    UINT Sel;
-    WCHAR szSel[4];
-    LONG Ret;
+    UINT uSel;
+    TCHAR szSel[4];
+    LONG lRet;
 
     hList = GetDlgItem(hwnd,
                        IDC_SERVERLIST);
 
-    Sel = (UINT)SendMessage(hList,
-                            CB_GETCURSEL,
-                            0,
-                            0);
+    uSel = (UINT)SendMessage(hList, CB_GETCURSEL, 0, 0);
 
     /* server reg entries count from 1,
      * combo boxes count from 0 */
-    Sel++;
+    uSel++;
 
     /* convert to wide char */
-    _itow(Sel, szSel, 10);
+    _itow(uSel, szSel, 10);
 
-    Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                        L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers",
+    lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                        _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers"),
                         0,
                         KEY_SET_VALUE,
                         &hKey);
-    if (Ret != ERROR_SUCCESS)
+    if (lRet != ERROR_SUCCESS)
     {
-        DisplayWin32Error(Ret);
+        DisplayWin32Error(lRet);
         return;
     }
 
-    Ret = RegSetValueExW(hKey,
-                         L"",
-                         0,
-                         REG_SZ,
-                         (LPBYTE)szSel,
-                         sizeof(szSel));
-    if (Ret != ERROR_SUCCESS)
-        DisplayWin32Error(Ret);
+    lRet = RegSetValueExW(hKey,
+                          _T(""),
+                          0,
+                          REG_SZ,
+                          (LPBYTE)szSel,
+                          sizeof(szSel));
+    if (lRet != ERROR_SUCCESS)
+        DisplayWin32Error(lRet);
 
     RegCloseKey(hKey);
-
 }
 
 
 /* get the domain name from the registry */
 static BOOL
-GetNTPServerAddress(LPWSTR* lpAddress)
+GetNTPServerAddress(LPTSTR *lpAddress)
 {
     HKEY hKey;
-    WCHAR szSel[4];
+    TCHAR szSel[4];
     DWORD dwSize;
-    LONG Ret;
+    LONG lRet;
 
-    Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                        L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers",
+    lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                        _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers"),
                         0,
                         KEY_QUERY_VALUE,
                         &hKey);
-    if (Ret != ERROR_SUCCESS)
-    {
+    if (lRet != ERROR_SUCCESS)
         goto fail;
-    }
 
     /* Get data from default value */
-    dwSize = sizeof(szSel);
-    Ret = RegQueryValueExW(hKey,
-                           L"",
+    dwSize = 4 * sizeof(TCHAR);
+    lRet = RegQueryValueEx(hKey,
+                           _T(""),
                            NULL,
                            NULL,
                            (LPBYTE)szSel,
                            &dwSize);
-    if (Ret != ERROR_SUCCESS)
+    if (lRet != ERROR_SUCCESS)
         goto fail;
 
-
     dwSize = 0;
-    Ret = RegQueryValueExW(hKey,
+    lRet = RegQueryValueEx(hKey,
                            szSel,
                            NULL,
                            NULL,
                            NULL,
                            &dwSize);
-    if (Ret == ERROR_SUCCESS)
+    if (lRet != ERROR_SUCCESS)
+        goto fail;
+
+    (*lpAddress) = (LPTSTR)HeapAlloc(GetProcessHeap(),
+                                     0,
+                                     dwSize);
+    if ((*lpAddress) == NULL)
     {
-        (*lpAddress) = (LPWSTR) HeapAlloc(GetProcessHeap(),
-                                          0,
-                                          dwSize);
-        if ((*lpAddress) == NULL)
-        {
-            Ret = ERROR_NOT_ENOUGH_MEMORY;
-            goto fail;
-        }
-
-        Ret = RegQueryValueExW(hKey,
-                               szSel,
-                               NULL,
-                               NULL,
-                               (LPBYTE)*lpAddress,
-                               &dwSize);
-        if (Ret != ERROR_SUCCESS)
-            goto fail;
-
+        lRet = ERROR_NOT_ENOUGH_MEMORY;
+        goto fail;
     }
-    else
+
+    lRet = RegQueryValueEx(hKey,
+                           szSel,
+                           NULL,
+                           NULL,
+                           (LPBYTE)*lpAddress,
+                           &dwSize);
+    if (lRet != ERROR_SUCCESS)
         goto fail;
 
     RegCloseKey(hKey);
@@ -201,11 +191,11 @@ GetNTPServerAddress(LPWSTR* lpAddress)
     return TRUE;
 
 fail:
-    DisplayWin32Error(Ret);
-    if (hKey) RegCloseKey(hKey);
+    DisplayWin32Error(lRet);
+    if (hKey)
+        RegCloseKey(hKey);
     HeapFree(GetProcessHeap(), 0, *lpAddress);
     return FALSE;
-
 }
 
 
@@ -213,7 +203,7 @@ fail:
 static ULONG
 GetTimeFromServer(VOID)
 {
-    LPWSTR lpAddress = NULL;
+    LPTSTR lpAddress = NULL;
     ULONG ulTime = 0;
 
     if (GetNTPServerAddress(&lpAddress))
@@ -250,7 +240,7 @@ UpdateSystemTime(ULONG ulTime)
     stNew.wMilliseconds = 0;
 
     /* convert to a file time */
-    if (! SystemTimeToFileTime(&stNew, &ftNew))
+    if (!SystemTimeToFileTime(&stNew, &ftNew))
     {
         DisplayWin32Error(GetLastError());
         return;
@@ -262,7 +252,7 @@ UpdateSystemTime(ULONG ulTime)
     ftNew = * (FILETIME *)&li;
 
     /* convert back to a system time */
-    if (! FileTimeToSystemTime(&ftNew, &stNew))
+    if (!FileTimeToSystemTime(&ftNew, &stNew))
     {
         DisplayWin32Error(GetLastError());
         return;
@@ -270,7 +260,6 @@ UpdateSystemTime(ULONG ulTime)
 
     if (!SystemSetLocalTime(&stNew))
          DisplayWin32Error(GetLastError());
-
 }
 
 
@@ -278,10 +267,10 @@ static VOID
 EnableDialogText(HWND hwnd)
 {
     BOOL bChecked;
-    HWND hCheck = GetDlgItem(hwnd, IDC_AUTOSYNC);
-    UINT Check = (UINT)SendMessageW(hCheck, BM_GETCHECK, 0, 0);
+    UINT uCheck;
 
-    bChecked = (Check == BST_CHECKED) ? TRUE : FALSE;
+    uCheck = (UINT)SendDlgItemMessage(hwnd, IDC_AUTOSYNC, BM_GETCHECK, 0, 0);
+    bChecked = (uCheck == BST_CHECKED) ? TRUE : FALSE;
 
     EnableWindow(GetDlgItem(hwnd, IDC_SERVERTEXT), bChecked);
     EnableWindow(GetDlgItem(hwnd, IDC_SERVERLIST), bChecked);
@@ -295,30 +284,27 @@ static VOID
 GetSyncSetting(HWND hwnd)
 {
     HKEY hKey;
-    HWND hCheck;
-    WCHAR Data[8];
-    DWORD Size;
+    TCHAR szData[8];
+    DWORD dwSize;
 
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                        L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Parameters",
-                        0,
-                        KEY_QUERY_VALUE,
-                        &hKey) == ERROR_SUCCESS)
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                     _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Parameters"),
+                     0,
+                     KEY_QUERY_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        dwSize = 8 * sizeof(TCHAR);
+        if (RegQueryValueEx(hKey,
+                            _T("Type"),
+                            NULL,
+                            NULL,
+                            (LPBYTE)szData,
+                            &dwSize) == ERROR_SUCCESS)
         {
-        Size = sizeof(Data);
-        if (RegQueryValueExW(hKey,
-                           L"Type",
-                           NULL,
-                           NULL,
-                           (LPBYTE)Data,
-                           &Size) == ERROR_SUCCESS)
-        {
-            if (lstrcmp(Data, L"NTP") == 0)
-            {
-                hCheck = GetDlgItem(hwnd, IDC_AUTOSYNC);
-                SendMessageW(hCheck, BM_SETCHECK, 0, 0);
-            }
+            if (_tcscmp(szData, _T("NTP")) == 0)
+                SendDlgItemMessage(hwnd, IDC_AUTOSYNC, BM_SETCHECK, 0, 0);
         }
+
         RegCloseKey(hKey);
     }
 }
@@ -328,9 +314,7 @@ static VOID
 OnInitDialog(HWND hwnd)
 {
     GetSyncSetting(hwnd);
-
     EnableDialogText(hwnd);
-
     CreateNTPServerList(hwnd);
 }
 
@@ -345,10 +329,8 @@ InetTimePageProc(HWND hwndDlg,
     switch (uMsg)
     {
         case WM_INITDIALOG:
-        {
             OnInitDialog(hwndDlg);
-        }
-        break;
+            break;
 
         case WM_COMMAND:
             switch(LOWORD(wParam))
@@ -362,20 +344,18 @@ InetTimePageProc(HWND hwndDlg,
                     ulTime = GetTimeFromServer();
                     if (ulTime != 0)
                         UpdateSystemTime(ulTime);
-
                 }
                 break;
 
                 case IDC_SERVERLIST:
-                {
                     if (HIWORD(wParam) == CBN_SELCHANGE)
+                    {
                         /* Enable the 'Apply' button */
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-                }
-                break;
+                    }
+                    break;
 
                 case IDC_AUTOSYNC:
-                {
                     if (HIWORD(wParam) == BN_CLICKED)
                     {
                         EnableDialogText(hwndDlg);
@@ -383,13 +363,12 @@ InetTimePageProc(HWND hwndDlg,
                         /* Enable the 'Apply' button */
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
-                }
-                break;
+                    break;
             }
             break;
 
         case WM_DESTROY:
-        break;
+            break;
 
         case WM_NOTIFY:
         {
@@ -398,13 +377,11 @@ InetTimePageProc(HWND hwndDlg,
             switch (lpnm->code)
             {
                 case PSN_APPLY:
-
                     SetNTPServer(hwndDlg);
-
                     return TRUE;
 
                 default:
-                break;
+                    break;
             }
         }
         break;
diff --git a/reactos/dll/cpl/timedate/lang/cs-CZ.rc b/reactos/dll/cpl/timedate/lang/cs-CZ.rc
index 495daf5f9ba..8cba1891021 100644
--- a/reactos/dll/cpl/timedate/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/timedate/lang/cs-CZ.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Datum", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
diff --git a/reactos/dll/cpl/timedate/lang/da-DK.rc b/reactos/dll/cpl/timedate/lang/da-DK.rc
index f31feb63be5..c7d00847114 100644
--- a/reactos/dll/cpl/timedate/lang/da-DK.rc
+++ b/reactos/dll/cpl/timedate/lang/da-DK.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Dato", -1, 4, 2, 126, 133
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
diff --git a/reactos/dll/cpl/timedate/lang/de-DE.rc b/reactos/dll/cpl/timedate/lang/de-DE.rc
index 0553d59b244..4b217a4e8f8 100644
--- a/reactos/dll/cpl/timedate/lang/de-DE.rc
+++ b/reactos/dll/cpl/timedate/lang/de-DE.rc
@@ -9,7 +9,7 @@ BEGIN
     GROUPBOX "&Datum", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
@@ -21,7 +21,7 @@ BEGIN
             144, 105, 90, 12
     LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11
     CONTROL "", IDC_CLOCKWND, "ClockWndClass",
-            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 
+            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89
 END
 
 
diff --git a/reactos/dll/cpl/timedate/lang/el-GR.rc b/reactos/dll/cpl/timedate/lang/el-GR.rc
index d572e45673a..1b0d80accec 100644
--- a/reactos/dll/cpl/timedate/lang/el-GR.rc
+++ b/reactos/dll/cpl/timedate/lang/el-GR.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Çìåñïìçíßá", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/en-US.rc b/reactos/dll/cpl/timedate/lang/en-US.rc
index 73d4e58414f..a7c78512278 100644
--- a/reactos/dll/cpl/timedate/lang/en-US.rc
+++ b/reactos/dll/cpl/timedate/lang/en-US.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Date", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/es-ES.rc b/reactos/dll/cpl/timedate/lang/es-ES.rc
index 435adae5503..9d7898dc497 100644
--- a/reactos/dll/cpl/timedate/lang/es-ES.rc
+++ b/reactos/dll/cpl/timedate/lang/es-ES.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Dia", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
diff --git a/reactos/dll/cpl/timedate/lang/fr-FR.rc b/reactos/dll/cpl/timedate/lang/fr-FR.rc
index 0eda275c1ee..4a088847445 100644
--- a/reactos/dll/cpl/timedate/lang/fr-FR.rc
+++ b/reactos/dll/cpl/timedate/lang/fr-FR.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Date", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/hu-HU.rc b/reactos/dll/cpl/timedate/lang/hu-HU.rc
index 7bf28021dbe..182173f67ae 100644
--- a/reactos/dll/cpl/timedate/lang/hu-HU.rc
+++ b/reactos/dll/cpl/timedate/lang/hu-HU.rc
@@ -9,7 +9,7 @@ BEGIN
     GROUPBOX "&Dátum", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/id-ID.rc b/reactos/dll/cpl/timedate/lang/id-ID.rc
index ab387d6d74c..3031c268b2c 100644
--- a/reactos/dll/cpl/timedate/lang/id-ID.rc
+++ b/reactos/dll/cpl/timedate/lang/id-ID.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Tanggal", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/it-IT.rc b/reactos/dll/cpl/timedate/lang/it-IT.rc
index e2e95a64ba0..c32e55a40cb 100644
--- a/reactos/dll/cpl/timedate/lang/it-IT.rc
+++ b/reactos/dll/cpl/timedate/lang/it-IT.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Data", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/ja-JP.rc b/reactos/dll/cpl/timedate/lang/ja-JP.rc
index 8dcd9202c60..f4c1469dc95 100644
--- a/reactos/dll/cpl/timedate/lang/ja-JP.rc
+++ b/reactos/dll/cpl/timedate/lang/ja-JP.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "“ú•t(&D)", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/nl-NL.rc b/reactos/dll/cpl/timedate/lang/nl-NL.rc
index ec770a1f75b..d3a79622978 100644
--- a/reactos/dll/cpl/timedate/lang/nl-NL.rc
+++ b/reactos/dll/cpl/timedate/lang/nl-NL.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "Da&tum", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
diff --git a/reactos/dll/cpl/timedate/lang/pl-PL.rc b/reactos/dll/cpl/timedate/lang/pl-PL.rc
index a72091bd760..b1046ee165d 100644
--- a/reactos/dll/cpl/timedate/lang/pl-PL.rc
+++ b/reactos/dll/cpl/timedate/lang/pl-PL.rc
@@ -14,7 +14,7 @@ BEGIN
     GROUPBOX "&Data", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
@@ -26,7 +26,7 @@ BEGIN
             144, 105, 90, 12
     LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11
     CONTROL "", IDC_CLOCKWND, "ClockWndClass",
-            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89    
+            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89
 END
 
 
@@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136,
              CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    CONTROL  "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE
+    CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE
     AUTOCHECKBOX "&Automatycznie uwzglêdnij zmiany czasu",
                  IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP
 END
diff --git a/reactos/dll/cpl/timedate/lang/ru-RU.rc b/reactos/dll/cpl/timedate/lang/ru-RU.rc
index 81b71567daa..611da9f6b37 100644
--- a/reactos/dll/cpl/timedate/lang/ru-RU.rc
+++ b/reactos/dll/cpl/timedate/lang/ru-RU.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Äàòà", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
@@ -20,7 +20,7 @@ BEGIN
             144, 105, 90, 12
     LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11
     CONTROL "", IDC_CLOCKWND, "ClockWndClass",
-            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 
+            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89
 END
 
 
diff --git a/reactos/dll/cpl/timedate/lang/sv-SE.rc b/reactos/dll/cpl/timedate/lang/sv-SE.rc
index 3008648550f..872db1d3b54 100644
--- a/reactos/dll/cpl/timedate/lang/sv-SE.rc
+++ b/reactos/dll/cpl/timedate/lang/sv-SE.rc
@@ -13,7 +13,7 @@ BEGIN
     GROUPBOX "&Datum", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | 
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
     CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd",
@@ -25,7 +25,7 @@ BEGIN
             144, 105, 90, 12
     LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11
     CONTROL "", IDC_CLOCKWND, "ClockWndClass",
-            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 
+            WS_CHILD | WS_VISIBLE, 138, 12, 102, 89
 END
 
 
diff --git a/reactos/dll/cpl/timedate/lang/th-TH.rc b/reactos/dll/cpl/timedate/lang/th-TH.rc
index 68ae175de12..9aa8c84e2c8 100644
--- a/reactos/dll/cpl/timedate/lang/th-TH.rc
+++ b/reactos/dll/cpl/timedate/lang/th-TH.rc
@@ -8,7 +8,7 @@ BEGIN
     GROUPBOX "&Çѹ·Õè", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/lang/uk-UA.rc b/reactos/dll/cpl/timedate/lang/uk-UA.rc
index d0cd995ff91..e0993112afd 100644
--- a/reactos/dll/cpl/timedate/lang/uk-UA.rc
+++ b/reactos/dll/cpl/timedate/lang/uk-UA.rc
@@ -17,7 +17,7 @@ BEGIN
     GROUPBOX "&Äàòà", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY
-	CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
+    CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS |
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS |
                     WS_BORDER | WS_GROUP, 120, 17, 50, 12
 
diff --git a/reactos/dll/cpl/timedate/monthcal.c b/reactos/dll/cpl/timedate/monthcal.c
index 557abdfa500..8320b175c74 100644
--- a/reactos/dll/cpl/timedate/monthcal.c
+++ b/reactos/dll/cpl/timedate/monthcal.c
@@ -249,9 +249,7 @@ MonthCalReload(IN PMONTHCALWND infoPtr)
     infoPtr->hbHeader = GetSysColorBrush(infoPtr->Enabled ? MONTHCAL_HEADERBG : MONTHCAL_DISABLED_HEADERBG);
     infoPtr->hbSelection = GetSysColorBrush(infoPtr->Enabled ? MONTHCAL_SELBG : MONTHCAL_DISABLED_SELBG);
 
-    for (i = 0;
-         i < 7;
-         i++)
+    for (i = 0; i < 7; i++)
     {
         if (GetLocaleInfo(LOCALE_USER_DEFAULT,
                           LOCALE_SABBREVDAYNAME1 +
diff --git a/reactos/dll/cpl/timedate/ntpclient.c b/reactos/dll/cpl/timedate/ntpclient.c
index 3d7ff635741..3ff34dc737b 100644
--- a/reactos/dll/cpl/timedate/ntpclient.c
+++ b/reactos/dll/cpl/timedate/ntpclient.c
@@ -58,7 +58,7 @@ InitConnection(PINFO pInfo,
 
 
 static VOID
-DestroyConnection()
+DestroyConnection(VOID)
 {
     WSACleanup();
 }
@@ -67,7 +67,6 @@ DestroyConnection()
 static BOOL
 GetTransmitTime(PTIMEPACKET ptp)
 {
-
     return TRUE;
 }
 
@@ -143,7 +142,7 @@ GetServerTime(LPWSTR lpAddress)
     DWORD dwSize = wcslen(lpAddress) + 1;
     ULONG ulTime = 0;
 
-    pInfo = (PINFO)HeapAlloc(GetProcessHeap(), 
+    pInfo = (PINFO)HeapAlloc(GetProcessHeap(),
                              0, 
                              sizeof(INFO));
     lpAddr = (LPSTR)HeapAlloc(GetProcessHeap(),
@@ -179,5 +178,4 @@ GetServerTime(LPWSTR lpAddress)
         HeapFree(GetProcessHeap(), 0, lpAddr);
 
     return ulTime;
-
 }
diff --git a/reactos/dll/cpl/timedate/timedate.c b/reactos/dll/cpl/timedate/timedate.c
index 8a6513684ce..90b787ec7ed 100644
--- a/reactos/dll/cpl/timedate/timedate.c
+++ b/reactos/dll/cpl/timedate/timedate.c
@@ -118,7 +118,7 @@ CPlApplet(HWND hwndCpl,
           LPARAM lParam1,
           LPARAM lParam2)
 {
-    int i = (int)lParam1;
+    INT i = (INT)lParam1;
 
     switch (uMsg)
     {
diff --git a/reactos/dll/cpl/timedate/timezone.c b/reactos/dll/cpl/timedate/timezone.c
index d95af935b5e..cb35a803d87 100644
--- a/reactos/dll/cpl/timedate/timezone.c
+++ b/reactos/dll/cpl/timedate/timezone.c
@@ -59,7 +59,7 @@ GetLargerTimeZoneEntry(DWORD Index)
 static VOID
 CreateTimeZoneList(VOID)
 {
-    WCHAR szKeyName[256];
+    TCHAR szKeyName[256];
     DWORD dwIndex;
     DWORD dwNameSize;
     DWORD dwValueSize;
@@ -70,34 +70,34 @@ CreateTimeZoneList(VOID)
     PTIMEZONE_ENTRY Entry;
     PTIMEZONE_ENTRY Current;
 
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                      L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones",
-                      0,
-                      KEY_ENUMERATE_SUB_KEYS,
-                      &hZonesKey))
-    return;
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                     _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"),
+                     0,
+                     KEY_ENUMERATE_SUB_KEYS,
+                     &hZonesKey))
+        return;
 
     dwIndex = 0;
     while (TRUE)
     {
-        dwNameSize = 256;
-        lError = RegEnumKeyExW(hZonesKey,
-                               dwIndex,
-                               szKeyName,
-                               &dwNameSize,
-                               NULL,
-                               NULL,
-                               NULL,
-                               NULL);
+        dwNameSize = 256 * sizeof(TCHAR);
+        lError = RegEnumKeyEx(hZonesKey,
+                              dwIndex,
+                              szKeyName,
+                              &dwNameSize,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL);
         if (lError != ERROR_SUCCESS && lError != ERROR_MORE_DATA)
             break;
 
-        if (RegOpenKeyExW(hZonesKey,
-                          szKeyName,
-                          0,
-                          KEY_QUERY_VALUE,
-                          &hZoneKey))
-        break;
+        if (RegOpenKeyEx(hZonesKey,
+                         szKeyName,
+                         0,
+                         KEY_QUERY_VALUE,
+                         &hZoneKey))
+            break;
 
         Entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEZONE_ENTRY));
         if (Entry == NULL)
@@ -106,61 +106,61 @@ CreateTimeZoneList(VOID)
             break;
         }
 
-        dwValueSize = 64 * sizeof(WCHAR);
-        if (RegQueryValueExW(hZoneKey,
-                             L"Display",
-                             NULL,
-                             NULL,
-                             (LPBYTE)&Entry->Description,
-                             &dwValueSize))
+        dwValueSize = 64 * sizeof(TCHAR);
+        if (RegQueryValueEx(hZoneKey,
+                            _T("Display"),
+                            NULL,
+                            NULL,
+                            (LPBYTE)&Entry->Description,
+                            &dwValueSize))
         {
             RegCloseKey(hZoneKey);
             break;
         }
 
-        dwValueSize = 33 * sizeof(WCHAR);
-        if (RegQueryValueExW(hZoneKey,
-                             L"Std",
-                             NULL,
-                             NULL,
-                             (LPBYTE)&Entry->StandardName,
-                             &dwValueSize))
+        dwValueSize = 33 * sizeof(TCHAR);
+        if (RegQueryValueEx(hZoneKey,
+                            _T("Std"),
+                            NULL,
+                            NULL,
+                            (LPBYTE)&Entry->StandardName,
+                            &dwValueSize))
         {
             RegCloseKey(hZoneKey);
             break;
         }
 
-        dwValueSize = 33 * sizeof(WCHAR);
-        if (RegQueryValueExW(hZoneKey,
-                             L"Dlt",
-                             NULL,
-                             NULL,
-                             (LPBYTE)&Entry->DaylightName,
-                             &dwValueSize))
+        dwValueSize = 33 * sizeof(TCHAR);
+        if (RegQueryValueEx(hZoneKey,
+                            _T("Dlt"),
+                            NULL,
+                            NULL,
+                            (LPBYTE)&Entry->DaylightName,
+                            &dwValueSize))
         {
             RegCloseKey(hZoneKey);
             break;
         }
 
         dwValueSize = sizeof(DWORD);
-        if (RegQueryValueExW(hZoneKey,
-                             L"Index",
-                             NULL,
-                             NULL,
-                             (LPBYTE)&Entry->Index,
-                             &dwValueSize))
+        if (RegQueryValueEx(hZoneKey,
+                            _T("Index"),
+                            NULL,
+                            NULL,
+                            (LPBYTE)&Entry->Index,
+                            &dwValueSize))
         {
             RegCloseKey(hZoneKey);
             break;
         }
 
         dwValueSize = sizeof(TZ_INFO);
-        if (RegQueryValueExW(hZoneKey,
-                             L"TZI",
-                             NULL,
-                             NULL,
-                             (LPBYTE)&Entry->TimezoneInfo,
-                             &dwValueSize))
+        if (RegQueryValueEx(hZoneKey,
+                            _T("TZI"),
+                            NULL,
+                            NULL,
+                            (LPBYTE)&Entry->TimezoneInfo,
+                            &dwValueSize))
         {
             RegCloseKey(hZoneKey);
             break;
@@ -252,22 +252,22 @@ ShowTimeZoneList(HWND hwnd)
     Entry = TimeZoneListHead;
     while (Entry != NULL)
     {
-        SendMessageW(hwnd,
-                     CB_ADDSTRING,
-                     0,
-                     (LPARAM)Entry->Description);
+        SendMessage(hwnd,
+                    CB_ADDSTRING,
+                    0,
+                    (LPARAM)Entry->Description);
 
-        if (!wcscmp(Entry->StandardName, TimeZoneInfo.StandardName))
+        if (!_tcscmp(Entry->StandardName, TimeZoneInfo.StandardName))
             dwIndex = i;
 
         i++;
         Entry = Entry->Next;
     }
 
-    SendMessageW(hwnd,
-                 CB_SETCURSEL,
-                 (WPARAM)dwIndex,
-                 0);
+    SendMessage(hwnd,
+                CB_SETCURSEL,
+                (WPARAM)dwIndex,
+                0);
 }
 
 
@@ -279,10 +279,10 @@ SetLocalTimeZone(HWND hwnd)
     DWORD dwIndex;
     DWORD i;
 
-    dwIndex = (DWORD) SendMessage(hwnd,
-                          CB_GETCURSEL,
-                          0,
-                          0);
+    dwIndex = (DWORD)SendMessage(hwnd,
+                                 CB_GETCURSEL,
+                                 0,
+                                 0);
 
     i = 0;
     Entry = TimeZoneListHead;
@@ -295,10 +295,10 @@ SetLocalTimeZone(HWND hwnd)
         Entry = Entry->Next;
     }
 
-    wcscpy(TimeZoneInformation.StandardName,
-           Entry->StandardName);
-    wcscpy(TimeZoneInformation.DaylightName,
-           Entry->DaylightName);
+    _tcscpy(TimeZoneInformation.StandardName,
+            Entry->StandardName);
+    _tcscpy(TimeZoneInformation.DaylightName,
+            Entry->DaylightName);
 
     TimeZoneInformation.Bias = Entry->TimezoneInfo.Bias;
     TimeZoneInformation.StandardBias = Entry->TimezoneInfo.StandardBias;
@@ -321,22 +321,22 @@ GetAutoDaylightInfo(HWND hwnd)
 {
     HKEY hKey;
 
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                      L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation",
-                      0,
-                      KEY_QUERY_VALUE,
-                      &hKey))
-    return;
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                     _T("SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation"),
+                     0,
+                     KEY_QUERY_VALUE,
+                     &hKey))
+        return;
 
     /* if the call fails (non zero), the reg value isn't available,
-     * which means it shouldn't be disabled, so we should check the button.  
+     * which means it shouldn't be disabled, so we should check the button.
      */
-    if (RegQueryValueExW(hKey,
-                         L"DisableAutoDaylightTimeSet",
-                         NULL,
-                         NULL,
-                         NULL,
-                         NULL))
+    if (RegQueryValueEx(hKey,
+                        _T("DisableAutoDaylightTimeSet"),
+                        NULL,
+                        NULL,
+                        NULL,
+                        NULL))
     {
         SendMessage(hwnd, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
     }
@@ -355,26 +355,26 @@ SetAutoDaylightInfo(HWND hwnd)
     HKEY hKey;
     DWORD dwValue = 1;
 
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                      L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation",
-                      0,
-                      KEY_SET_VALUE,
-                      &hKey))
-    return;
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                     _T("SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation"),
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey))
+        return;
 
     if (SendMessage(hwnd, BM_GETCHECK, 0, 0) == BST_UNCHECKED)
     {
-        RegSetValueExW(hKey,
-                       L"DisableAutoDaylightTimeSet",
-                       0,
-                       REG_DWORD,
-                       (LPBYTE)&dwValue,
-                       sizeof(DWORD));
+        RegSetValueEx(hKey,
+                      _T("DisableAutoDaylightTimeSet"),
+                      0,
+                      REG_DWORD,
+                      (LPBYTE)&dwValue,
+                      sizeof(DWORD));
     }
     else
     {
-        RegDeleteValueW(hKey,
-                        L"DisableAutoDaylightTimeSet");
+        RegDeleteValue(hKey,
+                       _T("DisableAutoDaylightTimeSet"));
     }
 
     RegCloseKey(hKey);
@@ -384,16 +384,15 @@ SetAutoDaylightInfo(HWND hwnd)
 /* Property page dialog callback */
 INT_PTR CALLBACK
 TimeZonePageProc(HWND hwndDlg,
-         UINT uMsg,
-         WPARAM wParam,
-         LPARAM lParam)
+                 UINT uMsg,
+                 WPARAM wParam,
+                 LPARAM lParam)
 {
     BITMAP bitmap;
 
     switch (uMsg)
     {
         case WM_INITDIALOG:
-        {
             CreateTimeZoneList();
             ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST));
             GetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT));
@@ -405,8 +404,7 @@ TimeZonePageProc(HWND hwndDlg,
                 cxSource = bitmap.bmWidth;
                 cySource = bitmap.bmHeight;
             }
-        }
-        break;
+            break;
 
         case WM_DRAWITEM:
         {
@@ -430,22 +428,18 @@ TimeZonePageProc(HWND hwndDlg,
         break;
 
         case WM_COMMAND:
-        {
             if ((LOWORD(wParam) == IDC_TIMEZONELIST && HIWORD(wParam) == CBN_SELCHANGE) ||
                 (LOWORD(wParam) == IDC_AUTODAYLIGHT && HIWORD(wParam) == BN_CLICKED))
             {
                 /* Enable the 'Apply' button */
                 PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
             }
-        }
-        break;
+            break;
 
         case WM_DESTROY:
-        {
             DestroyTimeZoneList();
             DeleteObject(hBitmap);
-        }
-        break;
+            break;
 
         case WM_NOTIFY:
         {