Index: reactos/dll/win32/shell32/dialogs/folder_options.cpp
===================================================================
--- reactos/dll/win32/shell32/dialogs/folder_options.cpp	(revision 73408)
+++ reactos/dll/win32/shell32/dialogs/folder_options.cpp	(working copy)
@@ -245,34 +245,154 @@
     return FALSE;
 }
 
-static
-VOID
-InitializeFolderOptionsListCtrl(HWND hwndDlg)
+static HTREEITEM
+ViewDlgTree_InsertItem(HWND hwndTreeView, TV_INSERTSTRUCT *pInsertion,
+                       UINT nStringID, INT iImage)
 {
-    RECT clientRect;
-    LVCOLUMNW col;
-    WCHAR szName[50];
-    HWND hDlgCtrl;
+    TCHAR szText[MAX_PATH];
+    LoadStringW(shell32_hInstance, nStringID, szText, MAX_PATH);
+    pInsertion->item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM;
+    pInsertion->item.pszText = szText;
+    pInsertion->item.iImage = iImage;
+    pInsertion->item.iSelectedImage = iImage;
+    pInsertion->item.lParam = nStringID;
+    return TreeView_InsertItem(hwndTreeView, pInsertion);
+}
 
-    hDlgCtrl = GetDlgItem(hwndDlg, 14003);
+static BOOL
+ViewDlg_OnInitDialog(HWND hwndDlg)
+{
+    HWND hwndTreeView = GetDlgItem(hwndDlg, 14003);
 
-    if (!LoadStringW(shell32_hInstance, IDS_COLUMN_EXTENSION, szName, sizeof(szName) / sizeof(WCHAR)))
-        szName[0] = 0;
-    szName[(sizeof(szName)/sizeof(WCHAR))-1] = 0;
+    HIMAGELIST hImageList = ImageList_Create(16, 16, ILC_COLOR24, 3, 1);
 
-    GetClientRect(hDlgCtrl, &clientRect);
-    ZeroMemory(&col, sizeof(LV_COLUMN));
-    col.mask      = LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT;
-    col.iSubItem  = 0;
-    col.pszText = szName;
-    col.fmt = LVCFMT_LEFT;
-    col.cx        = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL);
-    (void)SendMessageW(hDlgCtrl, LVM_INSERTCOLUMN, 0, (LPARAM)&col);
+    // add icon images
+    //
+    HICON hFolderIcon = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_FOLDER));
+    ImageList_AddIcon(hImageList, hFolderIcon);
+    DestroyIcon(hFolderIcon);
+#define I_FOLDER 0
 
+    HICON hicoChecked = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_CHECKED));
+    ImageList_AddIcon(hImageList, hicoChecked);
+    DestroyIcon(hicoChecked);
+#define I_CHECKED 1
 
+    HICON hicoUnchecked = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_UNCHECKED));
+    ImageList_AddIcon(hImageList, hicoUnchecked);
+    DestroyIcon(hicoUnchecked);
+#define I_UNCHECKED 2
 
+    // set image list to tree view
+    SetWindowLongPtr(hwndTreeView, GWLP_USERDATA, (LONG_PTR)hImageList);
+    TreeView_SetImageList(hwndTreeView, hImageList, TVSIL_NORMAL);
+
+    // insert items
+    //
+    TV_INSERTSTRUCT Insertion;
+    ZeroMemory(&Insertion, sizeof(Insertion));
+    Insertion.hParent = TVI_ROOT;
+    Insertion.hInsertAfter = TVI_LAST;
+
+    HTREEITEM hRoot = ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_FILES_AND_FOLDERS, I_FOLDER);
+
+    Insertion.hParent = hRoot;
+
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_AUTO_SEARCH_NETWORK, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_DISPLAY_SIZE_IN_TIP, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_SIMPLE_FOLDERS_LIST, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_FULLPATH_IN_ADDRESS, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_FULLPATH_IN_TITLE, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_DONT_CACHE_THUMBNAILS, I_UNCHECKED);
+    HTREEITEM hHidden = ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_HIDDEN, I_FOLDER);
+
+    Insertion.hParent = hHidden;
+
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_DONT_SHOW_HIDDEN, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_SHOW_HIDDEN, I_UNCHECKED);
+
+    Insertion.hParent = hRoot;
+
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_HIDE_PROTECTED, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_LAUNCH_IN_SEPARATE, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_REMEMBER_EACH, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_RESTORE_AT_LOGON, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_SHOW_CPL_IN_COMPUTER, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR, I_UNCHECKED);
+    ViewDlgTree_InsertItem(hwndTreeView, &Insertion, IDS_ADVANCED_SHOW_POPUP_DESCRIPTION, I_UNCHECKED);
+
+    // expand
+    TreeView_Expand(hwndTreeView, hRoot, TVE_EXPAND);
+    TreeView_Expand(hwndTreeView, hHidden, TVE_EXPAND);
+
+    return TRUE;
 }
 
+static VOID
+ViewDlg_ToggleCheckItem(HWND hwndDlg, HTREEITEM hItem)
+{
+    HWND hwndTreeView = GetDlgItem(hwndDlg, 14003);
+
+    TV_ITEM Item;
+    ZeroMemory(&Item, sizeof(Item));
+    Item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_IMAGE;
+    Item.hItem = hItem;
+    if (!TreeView_GetItem(hwndTreeView, &Item))
+        return;
+
+    // toggle check mark
+    Item.mask = TVIF_HANDLE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
+    Item.hItem = hItem;
+    switch (Item.iImage)
+    {
+        case I_CHECKED:
+            Item.iImage = Item.iSelectedImage = I_UNCHECKED;
+            break;
+        case I_UNCHECKED:
+            Item.iImage = Item.iSelectedImage = I_CHECKED;
+            break;
+        default:
+            return;
+    }
+    TreeView_SetItem(hwndTreeView, &Item);
+
+    // redraw the item
+    RECT rcItem;
+    TreeView_GetItemRect(hwndTreeView, hItem, &rcItem, FALSE);
+    InvalidateRect(hwndTreeView, &rcItem, TRUE);
+}
+
+static VOID
+ViewDlg_OnTreeViewClick(HWND hwndDlg)
+{
+    HWND hwndTreeView = GetDlgItem(hwndDlg, 14003);
+
+    // do hit test to get the clicked item
+    TV_HITTESTINFO HitTest;
+    ZeroMemory(&HitTest, sizeof(HitTest));
+    DWORD dwPos = GetMessagePos();
+    HitTest.pt.x = LOWORD(dwPos);
+    HitTest.pt.y = HIWORD(dwPos);
+    ScreenToClient(hwndTreeView, &HitTest.pt);
+    HTREEITEM hItem = TreeView_HitTest(hwndTreeView, &HitTest);
+
+    ViewDlg_ToggleCheckItem(hwndDlg, hItem);
+}
+
+static void
+ViewDlg_OnTreeViewKeyDown(HWND hwndDlg, TV_KEYDOWN *KeyDown)
+{
+    HWND hwndTreeView = GetDlgItem(hwndDlg, 14003);
+
+    if (KeyDown->wVKey == VK_SPACE)
+    {
+        HTREEITEM hItem = TreeView_GetSelection(hwndTreeView);
+        ViewDlg_ToggleCheckItem(hwndDlg, hItem);
+    }
+}
+
 INT_PTR
 CALLBACK
 FolderOptionsViewDlg(
@@ -279,18 +399,28 @@
     HWND hwndDlg,
     UINT uMsg,
     WPARAM wParam,
-    LPARAM lParam
-)
+    LPARAM lParam)
 {
     switch(uMsg)
     {
         case WM_INITDIALOG:
-            InitializeFolderOptionsListCtrl(hwndDlg);
-            return TRUE;
+            return ViewDlg_OnInitDialog(hwndDlg);
+        case WM_NOTIFY:
+            switch (LPNMHDR(lParam)->code)
+            {
+                case NM_CLICK:
+                    ViewDlg_OnTreeViewClick(hwndDlg);
+                    break;
+                case TVN_KEYDOWN:
+                    ViewDlg_OnTreeViewKeyDown(hwndDlg, (TV_KEYDOWN *)lParam);
+                    break;
+                default:
+                    break;
+            }
+            break;
     }
 
     return FALSE;
-
 }
 
 static
Index: reactos/dll/win32/shell32/icon_res.rc
===================================================================
--- reactos/dll/win32/shell32/icon_res.rc	(revision 73408)
+++ reactos/dll/win32/shell32/icon_res.rc	(working copy)
@@ -235,3 +235,6 @@
 IDI_SHELL_DELETE3 ICON "res/icons/16717.ico"
 IDI_SHELL_DELETE4 ICON "res/icons/16718.ico"
 IDI_SHELL_DELETE5 ICON "res/icons/16721.ico"
+
+IDI_CHECKED ICON "res/icons/checked.ico"
+IDI_UNCHECKED ICON "res/icons/unchecked.ico"
Index: reactos/dll/win32/shell32/lang/bg-BG.rc
===================================================================
--- reactos/dll/win32/shell32/lang/bg-BG.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/bg-BG.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Прилагане върху ви&чки папки", 14001, 20, 50, 115, 14, WS_TABSTOP
     PUSHBUTTON "&Зачистване на всички папки", 14002, 140, 50, 115, 14, WS_TABSTOP
     LTEXT "Разширени настройки", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "От под&разбираните", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/ca-ES.rc
===================================================================
--- reactos/dll/win32/shell32/lang/ca-ES.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/ca-ES.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/cs-CZ.rc
===================================================================
--- reactos/dll/win32/shell32/lang/cs-CZ.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/cs-CZ.rc	(working copy)
@@ -438,7 +438,7 @@
     PUSHBUTTON "&Použít pro všechny složky", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "Ob&novit všechny složky", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Pokročilá nastavení:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Obnovit výchozí", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -840,4 +840,24 @@
     IDS_MENU_EMPTY "(Prázdné)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/da-DK.rc
===================================================================
--- reactos/dll/win32/shell32/lang/da-DK.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/da-DK.rc	(working copy)
@@ -438,7 +438,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -840,4 +840,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/de-DE.rc
===================================================================
--- reactos/dll/win32/shell32/lang/de-DE.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/de-DE.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Auf a&lle Ordner anwenden", 14001, 60, 50, 90, 14, WS_TABSTOP
     PUSHBUTTON "&Alle Ordner zurücksetzen", 14002, 160, 50, 90, 14, WS_TABSTOP
     LTEXT "Erweiterte Einstellungen:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 140
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "&Wiederherstellen", 14004, 191, 235, 65, 14, WS_TABSTOP
 END
 
@@ -835,4 +835,24 @@
     IDS_MENU_EMPTY "(Leer)"
     IDS_OBJECTS "%d Objekte"
     IDS_OBJECTS_SELECTED "%d Objekte ausgewählt"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/el-GR.rc
===================================================================
--- reactos/dll/win32/shell32/lang/el-GR.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/el-GR.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/en-GB.rc
===================================================================
--- reactos/dll/win32/shell32/lang/en-GB.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/en-GB.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/en-US.rc
===================================================================
--- reactos/dll/win32/shell32/lang/en-US.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/en-US.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/es-ES.rc
===================================================================
--- reactos/dll/win32/shell32/lang/es-ES.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/es-ES.rc	(working copy)
@@ -434,7 +434,7 @@
     PUSHBUTTON "A&plicar a todas las carpetas", 14001, 60, 50, 100, 14, WS_TABSTOP
     PUSHBUTTON "R&estaurar todas las carpetas", 14002, 165, 50, 100, 14, WS_TABSTOP
     LTEXT "Configuración avanzada:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 279, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "&Restaurar valores predeterminados", 14004, 156, 220, 130, 14, WS_TABSTOP
 END
 
@@ -836,4 +836,24 @@
     IDS_MENU_EMPTY "(Vacío)"
     IDS_OBJECTS "%d elementos"
     IDS_OBJECTS_SELECTED "%d elementos seleccionados"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/fi-FI.rc
===================================================================
--- reactos/dll/win32/shell32/lang/fi-FI.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/fi-FI.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/fr-FR.rc
===================================================================
--- reactos/dll/win32/shell32/lang/fr-FR.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/fr-FR.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Appliquer à tous les dossiers", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Réinitialiser tous les dossiers", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Paramètres avancés :", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Paramètres par &défaut", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Vide)"
     IDS_OBJECTS "%d objet(s)"
     IDS_OBJECTS_SELECTED "%d objet(s) sélectionné(s)"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/he-IL.rc
===================================================================
--- reactos/dll/win32/shell32/lang/he-IL.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/he-IL.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/hu-HU.rc
===================================================================
--- reactos/dll/win32/shell32/lang/hu-HU.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/hu-HU.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/it-IT.rc
===================================================================
--- reactos/dll/win32/shell32/lang/it-IT.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/it-IT.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Applicare a &tutte le cartelle", 14001, 40, 50, 100, 14, WS_TABSTOP
     PUSHBUTTON "&Ripristina tutte le cartelle", 14002, 150, 50, 100, 14, WS_TABSTOP
     LTEXT "Impostazioni avanzate:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Ripristina come predefinite", 14004, 160, 210, 100, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Vuoto)"
     IDS_OBJECTS "%d Oggetti"
     IDS_OBJECTS_SELECTED "%d Oggetti selezionati"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/ja-JP.rc
===================================================================
--- reactos/dll/win32/shell32/lang/ja-JP.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/ja-JP.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "すべてのフォルダに適用(&L)", 14001, 50, 50, 95, 14, WS_TABSTOP
     PUSHBUTTON "すべてのフォルダをリセット(&R)", 14002, 147, 50, 106, 14, WS_TABSTOP
     LTEXT "詳細設定:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "デフォルトに戻す(&D)", 14004, 168, 210, 88, 14, WS_TABSTOP
 END
 
@@ -831,4 +831,24 @@
     IDS_MENU_EMPTY "(空)"
     IDS_OBJECTS "%d 個のオブジェクト"
     IDS_OBJECTS_SELECTED "%d 個のオブジェクトが選択済み"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/ko-KR.rc
===================================================================
--- reactos/dll/win32/shell32/lang/ko-KR.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/ko-KR.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/nl-NL.rc
===================================================================
--- reactos/dll/win32/shell32/lang/nl-NL.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/nl-NL.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/no-NO.rc
===================================================================
--- reactos/dll/win32/shell32/lang/no-NO.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/no-NO.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Bruk til a&lle mappene", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Gjenopprett alle mapper", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Avanserte innstillinger:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Gjenopprett &standard", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/pl-PL.rc
===================================================================
--- reactos/dll/win32/shell32/lang/pl-PL.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/pl-PL.rc	(working copy)
@@ -436,7 +436,7 @@
     PUSHBUTTON "Zastosuj do w&szystkich Katalogów", 14001, 50, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "Z&resetuj ustawienia", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Zaawansowane:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Przywróć &domyślne", 14004, 180, 210, 90, 14, WS_TABSTOP
 END
 
@@ -838,4 +838,24 @@
     IDS_MENU_EMPTY "(Puste)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/pt-BR.rc
===================================================================
--- reactos/dll/win32/shell32/lang/pt-BR.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/pt-BR.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Aplicar a &Todas as Pastas", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Resetar Todas as Pastas", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Configurações avançadas:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restaurar &Padrões", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/pt-PT.rc
===================================================================
--- reactos/dll/win32/shell32/lang/pt-PT.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/pt-PT.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Applicar a T&odas as Pastas", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reiniciar todas as Pastas", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Definições avançadas:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restaurar valores por &Defeito", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/ro-RO.rc
===================================================================
--- reactos/dll/win32/shell32/lang/ro-RO.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/ro-RO.rc	(working copy)
@@ -434,7 +434,7 @@
     PUSHBUTTON "Apli&că pentru toate", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "Restabilește t&oate", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Opțiuni avansate:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "&Restabilește opțiunile implicite",  14004, 130, 215, 126, 14, WS_TABSTOP
 END
 
@@ -836,4 +836,24 @@
     IDS_MENU_EMPTY "(Gol)"
     IDS_OBJECTS "%d Obiecte"
     IDS_OBJECTS_SELECTED "%d Obiecte selectate"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/ru-RU.rc
===================================================================
--- reactos/dll/win32/shell32/lang/ru-RU.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/ru-RU.rc	(working copy)
@@ -434,7 +434,7 @@
     PUSHBUTTON "&Применить к папкам", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Сброс вида папок", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Дополнительные параметры:", -1, 7, 80, 105, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "&Восстановить умолчания", 14004, 160, 210, 100, 14, WS_TABSTOP
 END
 
@@ -836,4 +836,24 @@
     IDS_MENU_EMPTY "(пусто)"
     IDS_OBJECTS "Объектов: %d"
     IDS_OBJECTS_SELECTED "Выделено объектов: %d"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/sk-SK.rc
===================================================================
--- reactos/dll/win32/shell32/lang/sk-SK.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/sk-SK.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/sl-SI.rc
===================================================================
--- reactos/dll/win32/shell32/lang/sl-SI.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/sl-SI.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/sq-AL.rc
===================================================================
--- reactos/dll/win32/shell32/lang/sq-AL.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/sq-AL.rc	(working copy)
@@ -436,7 +436,7 @@
     PUSHBUTTON "Apliko për të gjitha Dosjet", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Rivë të gjitha Dosjet", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Cilësime të Avancuar:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Kthej &Parazgjedhje", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -838,4 +838,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/sv-SE.rc
===================================================================
--- reactos/dll/win32/shell32/lang/sv-SE.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/sv-SE.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "Använd för a&lla mappar", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Återställ alla mappar", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Avancerade inställningar:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Återställ &standardvärde", 14004, 160, 220, 90, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(tom)"
     IDS_OBJECTS "%d objekt"
     IDS_OBJECTS_SELECTED "%d markerade objekt"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/tr-TR.rc
===================================================================
--- reactos/dll/win32/shell32/lang/tr-TR.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/tr-TR.rc	(working copy)
@@ -434,7 +434,7 @@
     PUSHBUTTON "&Tüm Dizinlere Uygula", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "T&üm Dizinleri Sıfırla", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Gelişmiş Ayarlar:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "&Ön Tanımlıları Geri Getir", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -836,4 +836,24 @@
     IDS_MENU_EMPTY "(Boş)"
     IDS_OBJECTS "%d Nesne"
     IDS_OBJECTS_SELECTED "%d Nesne Seçili"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/uk-UA.rc
===================================================================
--- reactos/dll/win32/shell32/lang/uk-UA.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/uk-UA.rc	(working copy)
@@ -432,7 +432,7 @@
     PUSHBUTTON "&Застосувати до всіх тек", 14001, 58, 50, 84, 14, WS_TABSTOP
     PUSHBUTTON "&Скид для всіх тек", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Додаткові параметри:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "&Стандартно", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -834,4 +834,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/zh-CN.rc
===================================================================
--- reactos/dll/win32/shell32/lang/zh-CN.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/zh-CN.rc	(working copy)
@@ -441,7 +441,7 @@
     PUSHBUTTON "应用到所有文件夹(&L)", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "重置所有文件夹(&R)", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "高级的设置：", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "还原默认值(&D)", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -841,4 +841,24 @@
     IDS_MENU_EMPTY "(空)"
     IDS_OBJECTS "%d 个对象"
     IDS_OBJECTS_SELECTED "%d 个选定的对象"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/lang/zh-TW.rc
===================================================================
--- reactos/dll/win32/shell32/lang/zh-TW.rc	(revision 73408)
+++ reactos/dll/win32/shell32/lang/zh-TW.rc	(working copy)
@@ -440,7 +440,7 @@
     PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP
     PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP
     LTEXT "Advanced settings:", -1, 7, 80, 100, 10
-    CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120
+    CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120
     PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP
 END
 
@@ -842,4 +842,24 @@
     IDS_MENU_EMPTY "(Empty)"
     IDS_OBJECTS "%d Objects"
     IDS_OBJECTS_SELECTED "%d Objects Selected"
+
+    IDS_ADVANCED_FILES_AND_FOLDERS "Files and Folders"
+    IDS_ADVANCED_AUTO_SEARCH_NETWORK "Automatically search for network folders and printers"
+    IDS_ADVANCED_DISPLAY_SIZE_IN_TIP "Display file size information in folder tips"
+    IDS_ADVANCED_SIMPLE_FOLDERS_LIST "Display simple folder view in Explorer's Folders list"
+    IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS "Display the contents of system folders"
+    IDS_ADVANCED_FULLPATH_IN_ADDRESS "Display the full path in address bar"
+    IDS_ADVANCED_FULLPATH_IN_TITLE "Display the full path in the title bar"
+    IDS_ADVANCED_DONT_CACHE_THUMBNAILS "Do not cache thumbnails"
+    IDS_ADVANCED_HIDDEN "Hidden files and folders"
+    IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders"
+    IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders"
+    IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS "Hide extensions for known file types"
+    IDS_ADVANCED_HIDE_PROTECTED "Hide protected operating system files (Recommended)"
+    IDS_ADVANCED_LAUNCH_IN_SEPARATE "Launch folder windows in a separate process"
+    IDS_ADVANCED_REMEMBER_EACH "Remember each folder's view settings"
+    IDS_ADVANCED_RESTORE_AT_LOGON "Restore previous folder windows at logon"
+    IDS_ADVANCED_SHOW_CPL_IN_COMPUTER "Show Control Panel in My Computer"
+    IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR "Show encrypted or compressed NTFS files in color"
+    IDS_ADVANCED_SHOW_POPUP_DESCRIPTION "Show pop-up description for folder and desktop items"
 END
Index: reactos/dll/win32/shell32/res/icons/checked.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: reactos/dll/win32/shell32/res/icons/checked.ico
===================================================================
--- reactos/dll/win32/shell32/res/icons/checked.ico	(nonexistent)
+++ reactos/dll/win32/shell32/res/icons/checked.ico	(working copy)

Property changes on: reactos/dll/win32/shell32/res/icons/checked.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: reactos/dll/win32/shell32/res/icons/unchecked.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: reactos/dll/win32/shell32/res/icons/unchecked.ico
===================================================================
--- reactos/dll/win32/shell32/res/icons/unchecked.ico	(nonexistent)
+++ reactos/dll/win32/shell32/res/icons/unchecked.ico	(working copy)

Property changes on: reactos/dll/win32/shell32/res/icons/unchecked.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: reactos/dll/win32/shell32/shresdef.h
===================================================================
--- reactos/dll/win32/shell32/shresdef.h	(revision 73408)
+++ reactos/dll/win32/shell32/shresdef.h	(working copy)
@@ -236,6 +236,27 @@
 #define IDS_OBJECTS                6466
 #define IDS_OBJECTS_SELECTED       6477
 
+/* Advanced settings */
+#define IDS_ADVANCED_FILES_AND_FOLDERS              30498
+#define IDS_ADVANCED_AUTO_SEARCH_NETWORK            30509
+#define IDS_ADVANCED_DISPLAY_SIZE_IN_TIP            30514
+#define IDS_ADVANCED_SIMPLE_FOLDERS_LIST            30511
+#define IDS_ADVANCED_SHOW_SYSTEM_FOLDER_CONTENTS    30510
+#define IDS_ADVANCED_FULLPATH_IN_ADDRESS            30505
+#define IDS_ADVANCED_FULLPATH_IN_TITLE              30504
+#define IDS_ADVANCED_DONT_CACHE_THUMBNAILS          30517
+#define IDS_ADVANCED_HIDDEN                         30499
+#define IDS_ADVANCED_DONT_SHOW_HIDDEN               30501
+#define IDS_ADVANCED_SHOW_HIDDEN                    30500
+#define IDS_ADVANCED_HIDE_EXT_FOR_KNOWNS            30503
+#define IDS_ADVANCED_HIDE_PROTECTED                 30508
+#define IDS_ADVANCED_LAUNCH_IN_SEPARATE             30507
+#define IDS_ADVANCED_REMEMBER_EACH                  30506
+#define IDS_ADVANCED_RESTORE_AT_LOGON               30513
+#define IDS_ADVANCED_SHOW_CPL_IN_COMPUTER           30497
+#define IDS_ADVANCED_SHOW_E_OR_C_IN_COLOR           30512
+#define IDS_ADVANCED_SHOW_POPUP_DESCRIPTION         30502
+
 /* Dialogs */
 
 /* Run dialog */
@@ -572,6 +593,9 @@
 #define IDI_SHELL_DELETE4 16718
 #define IDI_SHELL_DELETE5 16721
 
+#define IDI_CHECKED                 3000
+#define IDI_UNCHECKED               3001
+
 /*
  * AVI resources
  *