Index: dll/cpl/powercfg/CMakeLists.txt
===================================================================
--- dll/cpl/powercfg/CMakeLists.txt	(revision 72133)
+++ dll/cpl/powercfg/CMakeLists.txt	(working copy)
@@ -18,6 +18,6 @@
     ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
 
 set_module_type(powercfg cpl UNICODE)
-add_importlibs(powercfg user32 powrprof comctl32 shell32 advapi32 msvcrt kernel32 ntdll)
+add_importlibs(powercfg user32 powrprof comctl32 shell32 advapi32 msvcrt kernel32 ntdll shlwapi)
 add_pch(powercfg powercfg.h SOURCE)
 add_cd_file(TARGET powercfg DESTINATION reactos/system32 FOR all)
Index: dll/cpl/powercfg/hibernate.c
===================================================================
--- dll/cpl/powercfg/hibernate.c	(revision 72133)
+++ dll/cpl/powercfg/hibernate.c	(working copy)
@@ -20,8 +20,8 @@
 {
     SYSTEM_POWER_CAPABILITIES PowerCaps;
     MEMORYSTATUSEX msex;
-    TCHAR szSize[MAX_PATH];
     TCHAR szTemp[MAX_PATH];
+	LPTSTR lpRoot;
     ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes;
 
     if (GetPwrCapabilities(&PowerCaps))
@@ -37,50 +37,22 @@
         }
 
         if (GetWindowsDirectory(szTemp,MAX_PATH))
-        {
-            if (!GetDiskFreeSpaceEx(szTemp,&FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes))
-                TotalNumberOfFreeBytes.QuadPart = 0;
-        }
+            lpRoot = szTemp;
         else
-        {
-            if (!GetDiskFreeSpaceEx(NULL,&FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes))
-                TotalNumberOfFreeBytes.QuadPart = 0;
-        }
+            lpRoot = NULL;
 
-        if (TotalNumberOfFreeBytes.QuadPart > 0x100000)
-        {
-            if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH))
-            {
-                _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000);
-                SetDlgItemText(hwndDlg, IDC_FREESPACE, szSize);
-            }
-        }
-        else
-        {
-            if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH))
-            {
-                _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart);
-                SetDlgItemText(hwndDlg, IDC_FREESPACE, szSize);
-            }
-        }
+        // Get available space and size of selected volume.
+        if (!GetDiskFreeSpaceEx(lpRoot, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes))
+            TotalNumberOfFreeBytes.QuadPart = 0;
 
-        if (msex.ullTotalPhys>0x100000)
-        {
-            if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH))
-            {
-                _stprintf(szSize,szTemp,msex.ullTotalPhys/0x100000);
-                SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE,szSize);
-            }
-        }
-        else
-        {
-            if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH))
-            {
-                _stprintf(szSize,szTemp,msex.ullTotalPhys);
-                SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE, szSize);
-            }
-        }
+        // Print the free available space into selected volume.
+        StrFormatByteSize(TotalNumberOfFreeBytes.QuadPart, szTemp, _countof(szTemp));
+        SetDlgItemText(hwndDlg, IDC_FREESPACE, szTemp);
 
+        // Print the amount of space required for hibernation.
+        StrFormatByteSize(msex.ullTotalPhys, szTemp, _countof(szTemp));
+        SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE, szTemp);
+
         if (TotalNumberOfFreeBytes.QuadPart < msex.ullTotalPhys && !PowerCaps.HiberFilePresent)
         {
             EnableWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), FALSE);
Index: dll/cpl/powercfg/lang/bg-BG.rc
===================================================================
--- dll/cpl/powercfg/lang/bg-BG.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/bg-BG.rc	(working copy)
@@ -110,8 +110,6 @@
     IDS_TEXT "Текст"
     IDS_CONFIG1 "Настройки за захранваща наредба %1"
     IDS_CONFIG2 "Разширени настройки за %1"
-    IDS_SIZEBYTS "%i байта"
-    IDS_SIZEMB "%i МБ"
     IDS_NOACTION "Не прави нищо"
     IDS_PowerActionNone1 "Бездействие"
     IDS_PowerActionUnknown "Неизвестно"
Index: dll/cpl/powercfg/lang/cs-CZ.rc
===================================================================
--- dll/cpl/powercfg/lang/cs-CZ.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/cs-CZ.rc	(working copy)
@@ -110,8 +110,6 @@
     IDS_TEXT "Text"
     IDS_CONFIG1 "Nastavení pro schéma napájení %1"
     IDS_CONFIG2 "Pokročilá nastavení pro %1"
-    IDS_SIZEBYTS "%i bytů"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Nedělat nic"
     IDS_PowerActionNone1 "Žádná akce"
     IDS_PowerActionUnknown "Neznámý"
Index: dll/cpl/powercfg/lang/de-DE.rc
===================================================================
--- dll/cpl/powercfg/lang/de-DE.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/de-DE.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Text"
     IDS_CONFIG1 "Einstellungen für Energieschema %s."
     IDS_CONFIG2 "Erweiterte Einstellungen für %s."
-    IDS_SIZEBYTS "%i Bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Nichts unternehmen"
     IDS_PowerActionNone1 "Keine Aktion"
     IDS_PowerActionUnknown "Unbekannt"
Index: dll/cpl/powercfg/lang/el-GR.rc
===================================================================
--- dll/cpl/powercfg/lang/el-GR.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/el-GR.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Κείμενο"
     IDS_CONFIG1 "Ρυθμίσεις του συνδιασμού τροφοδοσίας %1"
     IDS_CONFIG2 "Ειδικές ρυθμίσεις του συνδιασμού %1"
-    IDS_SIZEBYTS "%i bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Καμία ενέργεια"
     IDS_PowerActionNone1 "Να μη γίνεται καμία ενέργεια"
     IDS_PowerActionUnknown "Unknown"
Index: dll/cpl/powercfg/lang/en-US.rc
===================================================================
--- dll/cpl/powercfg/lang/en-US.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/en-US.rc	(working copy)
@@ -110,8 +110,6 @@
     IDS_TEXT "Text"
     IDS_CONFIG1 "Settings for %1 power scheme"
     IDS_CONFIG2 "Advanced settings for %1"
-    IDS_SIZEBYTS "%i bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Do nothing"
     IDS_PowerActionNone1 "No action"
     IDS_PowerActionUnknown "Unknown"
Index: dll/cpl/powercfg/lang/es-ES.rc
===================================================================
--- dll/cpl/powercfg/lang/es-ES.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/es-ES.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Texto"
     IDS_CONFIG1 "Configuración para la combinación de energía %1"
     IDS_CONFIG2 "Opciones avanzadas para %1"
-    IDS_SIZEBYTS "%i bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "No hacer nada"
     IDS_PowerActionNone1 "No hacer nada"
     IDS_PowerActionUnknown "desconocido"
Index: dll/cpl/powercfg/lang/fr-FR.rc
===================================================================
--- dll/cpl/powercfg/lang/fr-FR.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/fr-FR.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Texte"
     IDS_CONFIG1 "Réglages pour le profil d'alimentation %1"
     IDS_CONFIG2 "Réglages avancés pour %1"
-    IDS_SIZEBYTS "%i octets"
-    IDS_SIZEMB "%i Mo"
     IDS_NOACTION "Ne rien faire"
     IDS_PowerActionNone1 "Pas d'action"
     IDS_PowerActionUnknown "Inconnue"
Index: dll/cpl/powercfg/lang/he-IL.rc
===================================================================
--- dll/cpl/powercfg/lang/he-IL.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/he-IL.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "טקסט"
     IDS_CONFIG1 "Settings for %1 power scheme"
     IDS_CONFIG2 "אפשרויות מתקדמות ל %1"
-    IDS_SIZEBYTS "%i בית"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "אל תעשה דבר"
     IDS_PowerActionNone1 "שום פעולה"
     IDS_PowerActionUnknown "לא ידוע"
Index: dll/cpl/powercfg/lang/id-ID.rc
===================================================================
--- dll/cpl/powercfg/lang/id-ID.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/id-ID.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Teks"
     IDS_CONFIG1 "Menyetel untuk %1 skema tenaga"
     IDS_CONFIG2 "Setelan Lanjutan untuk %1"
-    IDS_SIZEBYTS "%i byte"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Tidak melakukan apapun"
     IDS_PowerActionNone1 "Tidak ada aksi"
     IDS_PowerActionUnknown "Tidak dikenal"
Index: dll/cpl/powercfg/lang/it-IT.rc
===================================================================
--- dll/cpl/powercfg/lang/it-IT.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/it-IT.rc	(working copy)
@@ -110,8 +110,6 @@
     IDS_TEXT "Testo"
     IDS_CONFIG1 "Impostazioni per lo schema %1 "
     IDS_CONFIG2 "Impostazioni avanzate per %1"
-    IDS_SIZEBYTS "%i bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Nessuna azione"
     IDS_PowerActionNone1 "Nessuna azione"
     IDS_PowerActionUnknown "Sconosciuto"
Index: dll/cpl/powercfg/lang/ja-JP.rc
===================================================================
--- dll/cpl/powercfg/lang/ja-JP.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/ja-JP.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "テキスト"
     IDS_CONFIG1 "[%1] の電源設定"
     IDS_CONFIG2 "%1の詳細設定"
-    IDS_SIZEBYTS "%i バイト"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "何もしない"
     IDS_PowerActionNone1 "何もしない"
     IDS_PowerActionUnknown "不明"
Index: dll/cpl/powercfg/lang/nl-NL.rc
===================================================================
--- dll/cpl/powercfg/lang/nl-NL.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/nl-NL.rc	(working copy)
@@ -110,8 +110,6 @@
     IDS_TEXT "Text"
     IDS_CONFIG1 "Settings for %1 power scheme"
     IDS_CONFIG2 "Advanced settings for %1"
-    IDS_SIZEBYTS "%i bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Doe niets"
     IDS_PowerActionNone1 "Geen actie"
     IDS_PowerActionUnknown "Onbekend"
Index: dll/cpl/powercfg/lang/no-NO.rc
===================================================================
--- dll/cpl/powercfg/lang/no-NO.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/no-NO.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Tekst"
     IDS_CONFIG1 "Innstillinger for %1 strømplan"
     IDS_CONFIG2 "Avanserte innstillinger for %1"
-    IDS_SIZEBYTS "%i byte"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Ikke gjør noe"
     IDS_PowerActionNone1 "Ingen handling"
     IDS_PowerActionUnknown "Ukjent"
Index: dll/cpl/powercfg/lang/pl-PL.rc
===================================================================
--- dll/cpl/powercfg/lang/pl-PL.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/pl-PL.rc	(working copy)
@@ -118,8 +118,6 @@
     IDS_TEXT "Tekst"
     IDS_CONFIG1 "Ustawienia dla schematu %1"
     IDS_CONFIG2 "Zaawansowane ustawienia dla %1"
-    IDS_SIZEBYTS "%i bajtów"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Nie rób nic"
     IDS_PowerActionNone1 "Brak akcji"
     IDS_PowerActionUnknown "Nieznana"
Index: dll/cpl/powercfg/lang/ro-RO.rc
===================================================================
--- dll/cpl/powercfg/lang/ro-RO.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/ro-RO.rc	(working copy)
@@ -115,8 +115,6 @@
     IDS_TEXT "text"
     IDS_CONFIG1 "Configurare regim %1"
     IDS_CONFIG2 "Opțiuni avansate pentru %1"
-    IDS_SIZEBYTS "%i octeți"
-    IDS_SIZEMB "%i Mo"
     IDS_NOACTION "nespecificată"
     IDS_PowerActionNone1 "acțiune nespecificată"
     IDS_PowerActionUnknown "acțiune necunoscută"
Index: dll/cpl/powercfg/lang/ru-RU.rc
===================================================================
--- dll/cpl/powercfg/lang/ru-RU.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/ru-RU.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Текст"
     IDS_CONFIG1 "Параметры схемы %1"
     IDS_CONFIG2 "Дополнительные параметры схемы %1"
-    IDS_SIZEBYTS "%i байт"
-    IDS_SIZEMB "%i МБ"
     IDS_NOACTION "Не делать ничего"
     IDS_PowerActionNone1 "Действие не требуется"
     IDS_PowerActionUnknown "Нет данных"
Index: dll/cpl/powercfg/lang/sk-SK.rc
===================================================================
--- dll/cpl/powercfg/lang/sk-SK.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/sk-SK.rc	(working copy)
@@ -118,8 +118,6 @@
     IDS_TEXT "Text"
     IDS_CONFIG1 "Nastavenie pre schému napájania %1"
     IDS_CONFIG2 "Rozšírené nastavenie pre %1"
-    IDS_SIZEBYTS "%i bajtov"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Do nothing"
     IDS_PowerActionNone1 "No action"
     IDS_PowerActionUnknown "Neznáme"
Index: dll/cpl/powercfg/lang/sq-AL.rc
===================================================================
--- dll/cpl/powercfg/lang/sq-AL.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/sq-AL.rc	(working copy)
@@ -115,8 +115,6 @@
     IDS_TEXT "Teksti"
     IDS_CONFIG1 "Konfigurimet për %1 skema energjise"
     IDS_CONFIG2 "Konfigurimet Avancuara për %1"
-    IDS_SIZEBYTS "%i bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Mos bëj gjë"
     IDS_PowerActionNone1 "Asnjë veprim"
     IDS_PowerActionUnknown "i panjohur"
Index: dll/cpl/powercfg/lang/th-TH.rc
===================================================================
--- dll/cpl/powercfg/lang/th-TH.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/th-TH.rc	(working copy)
@@ -110,8 +110,6 @@
     IDS_TEXT "ข้อความ"
     IDS_CONFIG1 "ตั้งค่าให้กับ %1 ค่าพลังงาน"
     IDS_CONFIG2 "การตั้งค่าแบบขั้นสูงเป็น %1"
-    IDS_SIZEBYTS "%i bytes"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "ไม่เปลี่ยนค่า"
     IDS_PowerActionNone1 "ไม่เปลี่ยนค่า"
     IDS_PowerActionUnknown "ไม่ทราบ"
Index: dll/cpl/powercfg/lang/tr-TR.rc
===================================================================
--- dll/cpl/powercfg/lang/tr-TR.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/tr-TR.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "Metin"
     IDS_CONFIG1 "%1 Güç Düzeni İçin Ayarlar"
     IDS_CONFIG2 "%1 İçin Gelişmiş Ayarlar"
-    IDS_SIZEBYTS "%i Çoklu"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "Bir Şey Yapma"
     IDS_PowerActionNone1 "Eylem Yok"
     IDS_PowerActionUnknown "Bilinmiyor"
Index: dll/cpl/powercfg/lang/uk-UA.rc
===================================================================
--- dll/cpl/powercfg/lang/uk-UA.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/uk-UA.rc	(working copy)
@@ -118,8 +118,6 @@
     IDS_TEXT "Текст"
     IDS_CONFIG1 "Налаштування схеми живлення %1"
     IDS_CONFIG2 "Додаткові налаштування для %1"
-    IDS_SIZEBYTS "%i байт"
-    IDS_SIZEMB "%i МБ"
     IDS_NOACTION "Не робити нічого"
     IDS_PowerActionNone1 "Дія не потрібна"
     IDS_PowerActionUnknown "Немає даних"
Index: dll/cpl/powercfg/lang/zh-CN.rc
===================================================================
--- dll/cpl/powercfg/lang/zh-CN.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/zh-CN.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "文本"
     IDS_CONFIG1 "为 %i 设置电源使用方案"
     IDS_CONFIG2 "%i 的高级设置"
-    IDS_SIZEBYTS "%i 字节"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "无操作"
     IDS_PowerActionNone1 "无动作"
     IDS_PowerActionUnknown "未知"
Index: dll/cpl/powercfg/lang/zh-TW.rc
===================================================================
--- dll/cpl/powercfg/lang/zh-TW.rc	(revision 72133)
+++ dll/cpl/powercfg/lang/zh-TW.rc	(working copy)
@@ -112,8 +112,6 @@
     IDS_TEXT "文本"
     IDS_CONFIG1 "爲 %i 設置電源使用方案"
     IDS_CONFIG2 "%i 的高級設置"
-    IDS_SIZEBYTS "%i 字節"
-    IDS_SIZEMB "%i MB"
     IDS_NOACTION "無操作"
     IDS_PowerActionNone1 "無動作"
     IDS_PowerActionUnknown "未知"
Index: dll/cpl/powercfg/powercfg.h
===================================================================
--- dll/cpl/powercfg/powercfg.h	(revision 72133)
+++ dll/cpl/powercfg/powercfg.h	(working copy)
@@ -10,9 +10,11 @@
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
+#include <winreg.h>
 #include <cpl.h>
 #include <tchar.h>
 #include <shlobj.h>
+#include <shlwapi.h>
 #include <powrprof.h>
 
 #include "resource.h"
Index: dll/cpl/powercfg/resource.h
===================================================================
--- dll/cpl/powercfg/resource.h	(revision 72133)
+++ dll/cpl/powercfg/resource.h	(working copy)
@@ -9,15 +9,15 @@
 #define ICONSIZE         16
 
 /* IDs */
-#define IDC_CPLICON_1 1
 
+/* Set default to IDI_AC */
+#define IDC_CPLICON_1 IDI_AC
+
 #define IDS_PROCENT  49
 #define IDS_SOUND    50
 #define IDS_TEXT     51
 #define IDS_CONFIG1  53
 #define IDS_CONFIG2  54
-#define IDS_SIZEBYTS 55
-#define IDS_SIZEMB   56
 
 #define IDD_PROPPAGEPOWERSHEMES 70
 #define IDD_PROPPAGEALARMS      71