Fix broken menu sorting

It was broken in bb26cec commit. Fixes #1111
Update appveyor.yml
2026-04-13 02:17:26 +10:00 · 2022-09-09 17:07:29 +02:00 · 2022-09-08 13:31:28 +10:00 · 2022-09-01 19:27:25 -04:00 · 2022-08-21 22:51:18 +02:00 · 2022-08-21 22:51:18 +02:00
42 changed files with 7212 additions and 7763 deletions
--- a/Localization/StartMenuL10N.ini
+++ b/Localization/StartMenuL10N.ini
@@ -1,4 +1,4 @@
-; This file contains all localized text for Open-Shell Menu. There is one section per language.
+; This file contains all localized text for Open-Shell Menu. There is one section per language.
 ; Every section contains text lines in the form of <key> = <string>.
 ; Which section is used depends on the current OS setting. If a key is missing from the language section
 ; it will be searched in the [default] section. In some cases more than one language can be used.
@@ -129,7 +129,7 @@ Menu.RemoveHighlight = إزالة التمييز
 Menu.Uninstall = إز&الة التثبيت
 Menu.UninstallTitle = إزالة التثبيت
 Menu.UninstallPrompt = ‏‏هل تريد بالتأكيد إزالة تثبيت %s؟
-Search.CategorySettings = الإعدادات
+Search.CategorySettings = لوحة التح&كم
 Search.CategoryPCSettings = إعدادات الكمبيوتر
 Search.CategoryPrograms = البرامج
 Search.CategoryDocuments = المستندات
@@ -265,7 +265,7 @@ Menu.RemoveHighlight = Премахни осветяването
 Menu.Uninstall = &Деинсталирай
 Menu.UninstallTitle = Деинсталиране
 Menu.UninstallPrompt = Наистина ли искате да деинсталирате %s?
-Search.CategorySettings = Настройки
+Search.CategorySettings = Контролен панел
 Search.CategoryPCSettings = Настройки на компютъра
 Search.CategoryPrograms = Програми
 Search.CategoryDocuments = Документи
@@ -403,7 +403,7 @@ Menu.UninstallTitle = Desinstal·la
 Menu.UninstallPrompt = Esteu segur que voleu desinstal·lar el %s?
 Menu.ClassicSettings = Open-Shell &Menú
 Menu.SettingsTip = Ajustaments del Open-Shell Menú
-Search.CategorySettings = Configuració
+Search.CategorySettings = Panell de control
 Search.CategoryPCSettings = Configuració de l'ordinador
 Search.CategoryPrograms = Programes
 Search.CategoryDocuments = Documents
@@ -539,7 +539,7 @@ Menu.RemoveHighlight = Odebrat nejzajímavější místo
 Menu.Uninstall = &Odinstalovat
 Menu.UninstallTitle = Odinstalovat
 Menu.UninstallPrompt = Opravdu chcete odinstalovat položku %s?
-Search.CategorySettings = Nastavení
+Search.CategorySettings = Ovládací panely
 Search.CategoryPCSettings = Nastavení počítače
 Search.CategoryPrograms = Programy
 Search.CategoryDocuments = Dokumenty
@@ -675,7 +675,7 @@ Menu.RemoveHighlight = Fjern centralt punkt
 Menu.Uninstall = &Fjern
 Menu.UninstallTitle = Fjern
 Menu.UninstallPrompt = Er du sikker på, at du vil fjerne %s?
-Search.CategorySettings = Indstillinger
+Search.CategorySettings = Kontrolpanel
 Search.CategoryPCSettings = Pc-indstillinger
 Search.CategoryPrograms = Programmer
 Search.CategoryDocuments = Dokumenter
@@ -811,7 +811,7 @@ Menu.RemoveHighlight = Haupttreffer entfernen
 Menu.Uninstall = &Deinstallieren
 Menu.UninstallTitle = Deinstallieren
 Menu.UninstallPrompt = Möchten Sie %s wirklich deinstallieren?
-Search.CategorySettings = Einstellungen
+Search.CategorySettings = Systemsteuerung
 Search.CategoryPCSettings = PC-Einstellungen
 Search.CategoryPrograms = Programme
 Search.CategoryDocuments = Dokumente
@@ -947,7 +947,7 @@ Menu.RemoveHighlight = Κατάργηση επισήμανσης
 Menu.Uninstall = &Κατάργηση εγκατάστασης
 Menu.UninstallTitle = Κατάργηση εγκατάστασης
 Menu.UninstallPrompt = Είστε βέβαιοι ότι θέλετε να καταργήσετε την εγκατάσταση του %s;
-Search.CategorySettings = Ρυθμίσεις
+Search.CategorySettings = Πίνακας Ελέγχου
 Search.CategoryPCSettings = Ρυθμίσεις υπολογιστή
 Search.CategoryPrograms = Προγράμματα
 Search.CategoryDocuments = Έγγραφα
@@ -991,7 +991,7 @@ Menu.LogOffShort = &Log off
 Menu.Undock = Undock Comput&er
 Menu.Disconnect = D&isconnect
 Menu.ShutdownBox = Sh&ut Down...
-Menu.Shutdown = Sh&ut Down
+Menu.Shutdown = Sh&ut down
 Menu.Restart = &Restart
 Menu.ShutdownUpdate = Update and shut down
 Menu.RestartUpdate = Update and restart
@@ -1083,8 +1083,8 @@ Menu.RemoveHighlight = Remove highlight
 Menu.Uninstall = &Uninstall
 Menu.UninstallTitle = Uninstall
 Menu.UninstallPrompt = Are you sure you want to uninstall %s?
-Search.CategorySettings = Settings
-Search.CategoryPCSettings = Modern Settings
+Search.CategorySettings = Control Panel
+Search.CategoryPCSettings = Settings
 Search.CategoryPrograms = Programs
 Search.CategoryDocuments = Documents
 Search.CategoryMusic = Music
@@ -1219,7 +1219,7 @@ Menu.RemoveHighlight = Quitar como elemento destacado
 Menu.Uninstall = &Desinstalar
 Menu.UninstallTitle = Desinstalar
 Menu.UninstallPrompt = ¿Está seguro de que desea desinstalar %s?
-Search.CategorySettings = Configuración
+Search.CategorySettings = Panel de control
 Search.CategoryPCSettings = Configuración de tu PC
 Search.CategoryPrograms = Programas
 Search.CategoryDocuments = Documentos
@@ -1355,7 +1355,7 @@ Menu.RemoveHighlight = Eemalda esiletõst
 Menu.Uninstall = &Desinstalli
 Menu.UninstallTitle = Desinstalli
 Menu.UninstallPrompt = Kas soovite kindlasti desinstallida %s?
-Search.CategorySettings = Sätted
+Search.CategorySettings = Juhtpaneel
 Search.CategoryPCSettings = Arvutisätted
 Search.CategoryPrograms = Programmid
 Search.CategoryDocuments = Dokumendid
@@ -1493,7 +1493,7 @@ Menu.UninstallTitle = لغو نصب
 Menu.UninstallPrompt = ‏‏آیا مطمئنید می خواهید %s را لغو نصب کنید؟
 Menu.ClassicSettings = منوی ش&روع کلاسیک
 Menu.SettingsTip = تنظیمات منوی شروع کلاسیک
-Search.CategorySettings = تنظیمات
+Search.CategorySettings = صفحه کنترل
 Search.CategoryPCSettings = تنظیمات رایانه
 Search.CategoryPrograms = برنامه‌ها
 Search.CategoryDocuments = اسناد
@@ -1629,7 +1629,7 @@ Menu.RemoveHighlight = Poista tärkeä kohde
 Menu.Uninstall = &Poista asennus
 Menu.UninstallTitle = Poista asennus
 Menu.UninstallPrompt = Haluatko varmasti poistaa kohteen %s asennuksen?
-Search.CategorySettings = Asetukset
+Search.CategorySettings = Ohjauspaneeli
 Search.CategoryPCSettings = Tietokoneen asetukset
 Search.CategoryPrograms = Ohjelmat
 Search.CategoryDocuments = Tiedostot
@@ -1765,7 +1765,7 @@ Menu.RemoveHighlight = Supprimer la recommandation
 Menu.Uninstall = &Désinstaller
 Menu.UninstallTitle = Désinstaller
 Menu.UninstallPrompt = Faut-il vraiment désinstaller %s ?
-Search.CategorySettings = Paramètres
+Search.CategorySettings = Panneau de configuration
 Search.CategoryPCSettings = Paramètres du PC
 Search.CategoryPrograms = Programmes
 Search.CategoryDocuments = Documents
@@ -1901,7 +1901,7 @@ Menu.RemoveHighlight = Remove highlight
 Menu.Uninstall = &Dì-stàlaich
 Menu.UninstallTitle = Dì-stàlaich
 Menu.UninstallPrompt = A bheil thu cinnteach gu bheil thu airson %s a dhì-stàladh?
-Search.CategorySettings = Roghainnean
+Search.CategorySettings = A' phanail-smachd
 Search.CategoryPCSettings = Roghainnean a' PC
 Search.CategoryPrograms = Prògraman
 Search.CategoryDocuments = Sgrìobhainnean
@@ -2037,7 +2037,7 @@ Menu.RemoveHighlight = הסר הבלטה
 Menu.Uninstall = ה&סר התקנה
 Menu.UninstallTitle = הסר התקנה
 Menu.UninstallPrompt = ‏‏האם אתה בטוח שברצונך להסיר את התקנת %s?
-Search.CategorySettings = הגדרות
+Search.CategorySettings = לוח הבקרה
 Search.CategoryPCSettings = הגדרות מחשב
 Search.CategoryPrograms = תוכניות
 Search.CategoryDocuments = מסמכים
@@ -2173,7 +2173,7 @@ Menu.RemoveHighlight = Ukloni isticanje
 Menu.Uninstall = &Deinstaliraj
 Menu.UninstallTitle = Deinstaliraj
 Menu.UninstallPrompt = Jeste li sigurni da želite deinstalirati %s iz računala?
-Search.CategorySettings = Postavke
+Search.CategorySettings = Upravljačka ploča
 Search.CategoryPCSettings = Postavke PC-ja
 Search.CategoryPrograms = Programi
 Search.CategoryDocuments = Dokumenti
@@ -2309,7 +2309,7 @@ Menu.RemoveHighlight = Kiemelés eltávolítása
 Menu.Uninstall = Eltá&volítás
 Menu.UninstallTitle = Eltávolítás
 Menu.UninstallPrompt = Biztosan el kívánja távolítani a következőt: %s?
-Search.CategorySettings = Beállítások
+Search.CategorySettings = Vezérlőpult
 Search.CategoryPCSettings = Gépház
 Search.CategoryPrograms = Programs
 Search.CategoryDocuments = Dokumentumok
@@ -2447,8 +2447,8 @@ Menu.RemoveHighlight = Fjarlægja auðkenningu
 Menu.Uninstall = Fjarlægja
 Menu.UninstallTitle = Fjarlægja
 Menu.UninstallPrompt = Ertu viss um að það eigi að fjarlægja %s?
-Search.CategorySettings = Stillingar
-Search.CategoryPCSettings = Sérstillingar tölvunnar
+Search.CategorySettings = Stjórnborð
+Search.CategoryPCSettings = PC stillingar
 Search.CategoryPrograms = Forrit
 Search.CategoryDocuments = Skjöl
 Search.CategoryMusic = Tónlist
@@ -2479,7 +2479,7 @@ Menu.Search = Ce&rca
 Menu.SearchBox = Cerca
 Menu.SearchPrograms = Cerca programmi e file
 Menu.SearchInternet = Cerca in Internet
-Menu.Searching = Ricerca...
+Menu.Searching = Ricerca in corso...
 Menu.NoMatch = Nessun elemento corrisponde ai criteri di ricerca.
 Menu.MoreResults = Ulteriori risultati
 Menu.Help = &Guida e supporto tecnico
@@ -2502,10 +2502,10 @@ Menu.PCSettings = Impostazioni PC
 Menu.Security = Protezione di Windows
 Menu.Network = Connessioni di &rete
 Menu.Printers = &Stampanti
-Menu.Taskbar = &Barra applicazioni e menu Start
+Menu.Taskbar = &Barra delle applicazioni e menu Start
 Menu.SearchFiles = &File o cartelle...
 Menu.SearchPrinter = &Per stampante
-Menu.SearchComputers = Per &computer
+Menu.SearchComputers = Per &Computer
 Menu.UserFilesTip = Contiene cartelle per documenti, immagini, musica e altri file dell'utente.
 Menu.UserDocumentsTip = Contiene lettere, rapporti e altri documenti e file.
 Menu.UserPicturesTip = Contiene foto digitali, immagini e file di grafica.
@@ -2527,8 +2527,8 @@ Menu.HelpTip = Trovare argomenti della Guida, esercitazioni, risoluzione problem
 Menu.ProgramsTip = Apre l'elenco dei programmi.
 Menu.SearchFilesTip = Cercare documenti, musica, immagini, posta elettronica e altro.
 Menu.GamesTip = Consente di giocare e gestire i giochi installati nel computer.
-Menu.SecurityTip = Avvia programmi per modifica opzioni di sicurezza di Windows per cambiare la password, cambiare utente o avviare Gestione attività.
-Menu.SearchComputersTip = Cerca computer nella rete
+Menu.SecurityTip = Avvia le opzioni di Sicurezza di Windows per modificare la password, cambiare utente o avviare Gestione attività.
+Menu.SearchComputersTip = Cerca computer sulla rete
 Menu.SearchPrintersTip = Cerca stampante
 Menu.AdminToolsTip = Configura le impostazioni amministrative del computer.
 Menu.ShutdownTip = Chiude tutti i programmi aperti, arresta Windows e spegne il computer.
@@ -2536,7 +2536,7 @@ Menu.RestartTip = Chiude tutti i programmi aperti e riavvia Windows.
 Menu.SleepTip = Mantiene la sessione in memoria e imposta la modalità basso consumo che consente di riprendere rapidamente il lavoro.
 Menu.HibernateTip = Salva la sessione e spegne il computer. Quando si riaccende il computer, la sessione verrà ripristinata.
 Menu.LogOffTip = Chiude i programmi e disconnette l'utente.
-Menu.DisconnectTip = Disconnette dalla sessione. È possibile riconnettersi a questa sessione al prossimo accesso.
+Menu.DisconnectTip = Disconnette la sessione. È possibile riconnettersi a questa sessione al prossimo accesso.
 Menu.LockTip = Blocca il computer.
 Menu.UndockTip = Consente di rimuovere il computer portatile o il notebook dall'alloggiamento di espansione.
 Menu.SwitchUserTip = Consente di cambiare utente senza chiudere i programmi.
@@ -2553,7 +2553,7 @@ Menu.MenuSettings = Impostazioni
 Menu.MenuHelp = Guida
 Menu.MenuExit = Esci
 Menu.LogoffTitle = Disconnessione da Windows
-Menu.LogoffPrompt = Vuoi disconnetterti?
+Menu.LogoffPrompt = Disconnettersi?
 Menu.LogoffYes = &Disconnetti
 Menu.LogoffNo = &No
 Menu.RenameTitle = Rinomina
@@ -2570,7 +2570,7 @@ Menu.ActionOpen = Apri
 Menu.ActionClose = Chiudi
 Menu.ActionExecute = Esegui
 Menu.RemoveList = &Rimuovi da questo elenco
-Menu.RemoveAll = Azzera elenco ogge&tti recenti
+Menu.RemoveAll = Cancella elenco Ogge&tti recenti
 Menu.Explorer = Esplora risorse
 Menu.Start = Start
 Menu.StartScreen = Schermata Start
@@ -2582,8 +2582,8 @@ Menu.MonitorOff = Spegne lo schermo
 Menu.RemoveHighlight = Rimuovi elemento di rilievo
 Menu.Uninstall = &Disinstalla
 Menu.UninstallTitle = Disinstalla
-Menu.UninstallPrompt = Vuoi disinstallare %s?
-Search.CategorySettings = Impostazioni
+Menu.UninstallPrompt = Disinstallare %s?
+Search.CategorySettings = Pannello di controllo
 Search.CategoryPCSettings = Impostazioni PC
 Search.CategoryPrograms = Programmi
 Search.CategoryDocuments = Documenti
@@ -2991,7 +2991,7 @@ Menu.RemoveHighlight = Šalinti paryškinimą
 Menu.Uninstall = &Pašalinti
 Menu.UninstallTitle = Pašalinti
 Menu.UninstallPrompt = Ar tikrai norite pašalinti %s?
-Search.CategorySettings = Parametrai
+Search.CategorySettings = Valdymo skydas
 Search.CategoryPCSettings = PC parametrai
 Search.CategoryPrograms = Programos
 Search.CategoryDocuments = Dokumentai
@@ -3127,7 +3127,7 @@ Menu.RemoveHighlight = Noņemt marķējumu
 Menu.Uninstall = &Atinstalēt
 Menu.UninstallTitle = Atinstalēt
 Menu.UninstallPrompt = Vai esat pārliecināts, ka vēlaties atinstalēt %s?
-Search.CategorySettings = Iestatījumi
+Search.CategorySettings = Vadības panelis
 Search.CategoryPCSettings = Datora iestatījumi
 Search.CategoryPrograms = Programmas
 Search.CategoryDocuments = Dokumenti
@@ -3263,7 +3263,7 @@ Menu.RemoveHighlight = Remove highlight
 Menu.Uninstall = &Деинсталирај
 Menu.UninstallTitle = Деинсталирај
 Menu.UninstallPrompt = Дали сте сигурни дека сакате да го деинсталирате %s?
-Search.CategorySettings = Подесувања
+Search.CategorySettings = Контрол панел
 Search.CategoryPCSettings = Параметри на компјутерот
 Search.CategoryPrograms = Програми
 Search.CategoryDocuments = Документи
@@ -3399,7 +3399,7 @@ Menu.RemoveHighlight = Fjern høydepunkt
 Menu.Uninstall = &Avinstaller
 Menu.UninstallTitle = Avinstaller
 Menu.UninstallPrompt = Er du sikker på at du vil avinstallere %s?
-Search.CategorySettings = Innstillinger
+Search.CategorySettings = Kontrollpanel
 Search.CategoryPCSettings = PC-innstillinger
 Search.CategoryPrograms = Programmer
 Search.CategoryDocuments = Dokumenter
@@ -3535,7 +3535,7 @@ Menu.RemoveHighlight = Aandachtspunt verwijderen
 Menu.Uninstall = V&erwijderen
 Menu.UninstallTitle = Verwijderen
 Menu.UninstallPrompt = Weet u zeker dat u %s wilt verwijderen?
-Search.CategorySettings = Instellingen
+Search.CategorySettings = Configuratiescherm
 Search.CategoryPCSettings = Pc-instellingen
 Search.CategoryPrograms = Programma's
 Search.CategoryDocuments = Documenten
@@ -3671,7 +3671,7 @@ Menu.RemoveHighlight = Usuń wyróżnienie
 Menu.Uninstall = &Odinstaluj
 Menu.UninstallTitle = Odinstaluj
 Menu.UninstallPrompt = Czy na pewno chcesz odinstalować program %s?
-Search.CategorySettings = Ustawienia
+Search.CategorySettings = Panel sterowania
 Search.CategoryPCSettings = Ustawienia komputera
 Search.CategoryPrograms = Programy
 Search.CategoryDocuments = Dokumenty
@@ -3722,7 +3722,7 @@ Menu.RestartUpdate = Atualizar e reiniciar
 Menu.Sleep = &Dormir
 Menu.Hibernate = &Hibernar
 Menu.ControlPanel = &Painel de controle
-Menu.PCSettings = Configurações do computador 
+Menu.PCSettings = Configurações 
 Menu.Security = Segurança do Windows
 Menu.Network = Co&nexões de Rede
 Menu.Printers = &Impressoras
@@ -3807,7 +3807,7 @@ Menu.RemoveHighlight = Remover Destaque
 Menu.Uninstall = &Desinstalar
 Menu.UninstallTitle = Desinstalar
 Menu.UninstallPrompt = Tem certeza de que deseja desinstalar %s?
-Search.CategorySettings = Configurações
+Search.CategorySettings = Painel de controle
 Search.CategoryPCSettings = Configurações do computador 
 Search.CategoryPrograms = Programas
 Search.CategoryDocuments = Documentos
@@ -3943,7 +3943,7 @@ Menu.RemoveHighlight = Remover destaque
 Menu.Uninstall = D&esinstalar
 Menu.UninstallTitle = Desinstalar
 Menu.UninstallPrompt = Tem a certeza de que pretende desinstalar %s?
-Search.CategorySettings = Definições
+Search.CategorySettings = Painel de controlo
 Search.CategoryPCSettings = Definições do PC
 Search.CategoryPrograms = Programas
 Search.CategoryDocuments = Documentos
@@ -4079,7 +4079,7 @@ Menu.RemoveHighlight = Eliminare evidențiere
 Menu.Uninstall = &Dezinstalare
 Menu.UninstallTitle = Dezinstalare
 Menu.UninstallPrompt = Sigur dezinstalați %s?
-Search.CategorySettings = Setări
+Search.CategorySettings = Panou de control
 Search.CategoryPCSettings = Setări PC
 Search.CategoryPrograms = Programe
 Search.CategoryDocuments = Documente
@@ -4215,7 +4215,7 @@ Menu.RemoveHighlight = Выключить пометку
 Menu.Uninstall = &Удалить
 Menu.UninstallTitle = Удалить
 Menu.UninstallPrompt = Вы действительно хотите удалить "%s"?
-Search.CategorySettings = Параметры
+Search.CategorySettings = Панель управления
 Search.CategoryPCSettings = Параметры ПК
 Search.CategoryPrograms = Программы
 Search.CategoryDocuments = Документы
@@ -4351,7 +4351,7 @@ Menu.RemoveHighlight = Odstrániť zvýraznenie
 Menu.Uninstall = &Odinštalovať
 Menu.UninstallTitle = Odinštalovať
 Menu.UninstallPrompt = Naozaj chcete odinštalovať program %s?
-Search.CategorySettings = Nastavenia
+Search.CategorySettings = Ovládací panel
 Search.CategoryPCSettings = Nastavenie PC
 Search.CategoryPrograms = Programy
 Search.CategoryDocuments = Dokumenty
@@ -4487,7 +4487,7 @@ Menu.RemoveHighlight = Odstrani označitev
 Menu.Uninstall = &Odstrani
 Menu.UninstallTitle = Odstrani
 Menu.UninstallPrompt = Ali ste prepričani, da želite odstraniti %s?
-Search.CategorySettings = Nastavitve
+Search.CategorySettings = Nadzorna plošča
 Search.CategoryPCSettings = Nastavitve računalnika
 Search.CategoryPrograms = Programi
 Search.CategoryDocuments = Dokumenti
@@ -4623,7 +4623,7 @@ Menu.RemoveHighlight = Ukloni istaknuti sadržaj
 Menu.Uninstall = &Deinstaliraj
 Menu.UninstallTitle = Deinstaliraj
 Menu.UninstallPrompt = Želite li zaista da deinstalirate %s?
-Search.CategorySettings = Postavke
+Search.CategorySettings = Kontrolna tabla
 Search.CategoryPCSettings = Postavke računara
 Search.CategoryPrograms = Programs
 Search.CategoryDocuments = Dokumenti
@@ -4759,7 +4759,7 @@ Menu.RemoveHighlight = Ta bort fokus
 Menu.Uninstall = &Avinstallera
 Menu.UninstallTitle = Avinstallera
 Menu.UninstallPrompt = Vill du avinstallera %s?
-Search.CategorySettings = Inställningar
+Search.CategorySettings = Kontrollpanelen
 Search.CategoryPCSettings = Datorinställningar
 Search.CategoryPrograms = Program
 Search.CategoryDocuments = Dokument
@@ -4896,7 +4896,7 @@ Menu.RemoveHighlight = เอาไฮไลท์ออก
 Menu.Uninstall = &ถอนการติดตั้ง
 Menu.UninstallTitle = ถอนการติดตั้ง
 Menu.UninstallPrompt = คุณแน่ใจหรือไม่ว่าคุณต้องการถอนการติดตั้ง %s
-Search.CategorySettings = การตั้งค่า
+Search.CategorySettings = แผงควบคุม
 Search.CategoryPCSettings = การตั้งค่าพีซี
 Search.CategoryPrograms = โปรแกรม
 Search.CategoryDocuments = เอกสาร
@@ -5032,7 +5032,7 @@ Menu.RemoveHighlight = Önemli Noktayı Kaldır
 Menu.Uninstall = &Kaldır
 Menu.UninstallTitle = Kaldır
 Menu.UninstallPrompt = %s programını kaldırmak istediğinizden emin misiniz?
-Search.CategorySettings = Ayarlar
+Search.CategorySettings = Denetim Masası
 Search.CategoryPCSettings = Bilgisayar ayarları
 Search.CategoryPrograms = Programlar
 Search.CategoryDocuments = Belgeler
@@ -5168,7 +5168,7 @@ Menu.RemoveHighlight = Видалити виділення
 Menu.Uninstall = &Видалити
 Menu.UninstallTitle = Видалити
 Menu.UninstallPrompt = Дійсно видалити %s?
-Search.CategorySettings = Настройки
+Search.CategorySettings = Панель керування
 Search.CategoryPCSettings = Параметри ПК
 Search.CategoryPrograms = Програми
 Search.CategoryDocuments = Документи
--- a/README.md
+++ b/README.md
@@ -2,11 +2,10 @@

 *Originally* **[Classic Shell](http://www.classicshell.net)** *by [Ivo Beltchev](https://sourceforge.net/u/ibeltchev/profile/)*

-[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=%4E5D94&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5)
+[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest) [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg)](https://github.com/Open-Shell/Open-Shell-Menu/releases) [![Build status](https://ci.appveyor.com/api/projects/status/2wj5x5qoypfjj0tr/branch/master?svg=true)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master) [![GitQ](https://gitq.com/badge.svg)](https://gitq.com/passionate-coder/Classic-Start) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=%4E5D94&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5)

 [Home Page](https://open-shell.github.io/Open-Shell-Menu)  
-[Discussion room](https://gitter.im/Open-Shell)  
-[Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts)  
+[Gitter Discussion room](https://gitter.im/Open-Shell)  

 ### Features
 - Classic style Start Menu for Windows 7, 8, 8.1, 10
@@ -24,10 +23,11 @@ If you just want to use it or looking for setup file, click here to download:
 1. Download [language DLL](https://coddec.github.io/Classic-Shell/www.classicshell.net/translations/index.html)  
 2. Place it either in the Open-Shell's __install folder__ or in the `%ALLUSERSPROFILE%\OpenShell\Languages` folder

---
+----

 *For archival reasons, we have a mirror of `www.classicshell.net` [here](https://coddec.github.io/Classic-Shell/www.classicshell.net/).*

 [How To Skin a Start Menu](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/skintutorial.html)  
 [Classic Shell - Custom Start Buttons](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/buttontutorial.html)  
+[Questions? Ask on the Discussions section](https://github.com/Open-Shell/Open-Shell-Menu/discussions) or on [Discord](https://discord.gg/7H6arr5)  
 [Report a bug/issue or submit a feature request](https://github.com/Open-Shell/Open-Shell-Menu/issues)
--- a/Src/ClassicExplorer/SettingsUI.cpp
+++ b/Src/ClassicExplorer/SettingsUI.cpp
@@ -380,7 +380,7 @@ LRESULT CEditToolbarDlg::OnBrowseLink( WORD wNotifyCode, WORD wID, HWND hWndCtl,
 {
 	wchar_t text[_MAX_PATH];
 	GetDlgItemText(IDC_COMBOLINK,text,_countof(text));
-	if (BrowseLinkHelper(m_hWnd,text))
+	if (BrowseLinkHelper(m_hWnd,text,false))
 	{
 		SetDlgItemText(IDC_COMBOLINK,text);
 		SendMessage(WM_COMMAND,MAKEWPARAM(IDC_COMBOLINK,CBN_KILLFOCUS));
--- a/Src/Lib/DownloadHelper.cpp
+++ b/Src/Lib/DownloadHelper.cpp
@@ -195,9 +195,10 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 	{
 		if (pProgress && pProgress->IsCanceled())
 			res=DOWNLOAD_CANCEL;
-		const wchar_t *accept[]={L"*/*",NULL};
+		
 		if (res==DOWNLOAD_OK)
 		{
+			const wchar_t* accept[] = { L"*/*",NULL };
 			HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,((components.nScheme==INTERNET_SCHEME_HTTPS)?INTERNET_FLAG_SECURE:0)|(bAcceptCached?0:INTERNET_FLAG_RELOAD),0);
 			if (hRequest)
 			{
@@ -343,7 +344,7 @@ static DWORD WINAPI ThreadVersionCheck( void *param )
 	VersionData data;

 	{
-		auto load = params.nightly ? data.LoadNightly() : data.Load();
+		auto load = data.Load(!params.nightly);

 #ifdef UPDATE_LOG
 		LogToFile(UPDATE_LOG, L"Load result: %d", load);
@@ -764,20 +765,38 @@ std::vector<char> DownloadUrl(const wchar_t* url)

 using namespace nlohmann;

-VersionData::TLoadResult VersionData::Load()
+VersionData::TLoadResult VersionData::Load(bool official)
 {
 	Clear();

-	auto buf = DownloadUrl(L"https://api.github.com/repos/Open-Shell/Open-Shell-Menu/releases/latest");
+	std::wstring baseUrl = L"https://api.github.com/repos/Open-Shell/Open-Shell-Menu/releases";
+	if (official)
+		baseUrl += L"/latest";
+
+	auto buf = DownloadUrl(baseUrl.c_str());
 	if (buf.empty())
 		return LOAD_ERROR;

 	try
 	{
-		auto data = json::parse(buf.begin(), buf.end());
+		auto jsonData = json::parse(buf.begin(), buf.end());
+		auto& data = jsonData;

-		// skip prerelease versions
-		if (data["prerelease"].get<bool>())
+		if (official)
+		{
+			// skip prerelease versions (just in case)
+			if (data["prerelease"].get<bool>())
+				return LOAD_BAD_VERSION;
+		}
+		else
+		{
+			// we've got list of versions (release and pre-release)
+			// lets pick first one (that should be the latest one)
+			data = jsonData[0];
+		}
+
+		// make sure we didn't get draft release (for whatever reason)
+		if (data["draft"].get<bool>())
 			return LOAD_BAD_VERSION;

 		// get version from tag name
@@ -831,116 +850,6 @@ VersionData::TLoadResult VersionData::Load()
 	}
 }

-VersionData::TLoadResult VersionData::LoadNightly()
-{
-	Clear();
-
-	auto buf = DownloadUrl(L"https://ci.appveyor.com/api/projects/passionate-coder/open-shell-menu/branch/master");
-	if (buf.empty())
-		return LOAD_ERROR;
-
-	try
-	{
-		auto data = json::parse(buf.begin(), buf.end());
-		auto build = data["build"];
-
-		// get version
-		auto version = build["version"].get<std::string>();
-		if (version.empty())
-			return LOAD_BAD_FILE;
-
-		{
-			int v1, v2, v3;
-			if (sscanf_s(version.c_str(), "%d.%d.%d", &v1, &v2, &v3) != 3)
-				return LOAD_BAD_FILE;
-
-			newVersion = (v1 << 24) | (v2 << 16) | v3;
-
-			if (newVersion <= GetVersionEx(g_Instance))
-				return LOAD_OK;
-		}
-
-		// artifact url
-		{
-			auto jobId = build["jobs"][0]["jobId"].get<std::string>();
-			if (jobId.empty())
-				return LOAD_BAD_FILE;
-
-			std::wstring jobUrl(L"https://ci.appveyor.com/api/buildjobs/");
-			jobUrl += std::wstring(jobId.begin(), jobId.end());
-			jobUrl += L"/artifacts";
-
-			buf = DownloadUrl(jobUrl.c_str());
-			if (buf.empty())
-				return LOAD_ERROR;
-
-			auto artifacts = json::parse(buf.begin(), buf.end());
-
-			std::string fileName;
-			for (const auto& artifact : artifacts)
-			{
-				auto name = artifact["fileName"].get<std::string>();
-				if (name.find("OpenShellSetup") == 0)
-				{
-					fileName = name;
-					break;
-				}
-			}
-
-			if (fileName.empty())
-				return LOAD_BAD_FILE;
-
-			auto artifactUrl(jobUrl);
-			artifactUrl += L'/';
-			artifactUrl += std::wstring(fileName.begin(), fileName.end());
-
-			downloadUrl = artifactUrl.c_str();
-		}
-
-		// changelog
-		news.Append(CA2T(version.c_str()));
-		news.Append(L"\r\n\r\n");
-		try
-		{
-			// use Github API to compare commit that actual version was built from (APPVEYOR_REPO_COMMIT)
-			// and commit that AppVeyor version was built from (commitId)
-			auto commitId = build["commitId"].get<std::string>();
-
-			std::wstring compareUrl(L"https://api.github.com/repos/Open-Shell/Open-Shell-Menu/compare/");
-			compareUrl += _T(APPVEYOR_REPO_COMMIT);
-			compareUrl += L"...";
-			compareUrl += std::wstring(commitId.begin(), commitId.end());
-
-			buf = DownloadUrl(compareUrl.c_str());
-			auto compare = json::parse(buf.begin(), buf.end());
-
-			// then use first lines (subjects) of commit messages as changelog
-			auto commits = compare["commits"];
-			for (const auto& commit : commits)
-			{
-				auto message = commit["commit"]["message"].get<std::string>();
-
-				auto pos = message.find('\n');
-				if (pos != message.npos)
-					message.resize(pos);
-
-				news.Append(L"- ");
-				news.Append(CA2T(message.c_str()));
-				news.Append(L"\r\n");
-			}
-		}
-		catch (...)
-		{
-		}
-	}
-	catch (...)
-	{
-		return LOAD_BAD_FILE;
-	}
-
-	return LOAD_OK;
-}
-
 VersionData::TLoadResult VersionData::Load( const wchar_t *fname, bool bLoadFlags )
 {
 	Clear();
--- a/Src/Lib/DownloadHelper.h
+++ b/Src/Lib/DownloadHelper.h
@@ -59,8 +59,7 @@ struct VersionData
 		LOAD_BAD_FILE, // the file is corrupted
 	};

-	TLoadResult Load();
-	TLoadResult LoadNightly();
+	TLoadResult Load(bool official);
 	TLoadResult Load( const wchar_t *fname, bool bLoadFlags );
 private:
 	void operator=( const VersionData& );
--- a/Src/Lib/FileHelper.cpp
+++ b/Src/Lib/FileHelper.cpp
@@ -60,3 +60,17 @@ bool IsFakeFolder( const wchar_t *fname )
 	}
 	return false;
 }
+
+bool GetFakeFolder( wchar_t *dst, int len, const wchar_t *src )
+{
+	Sprintf(dst,len,L"%s\\target.lnk",src);
+	if (GetFileAttributes(dst)!=INVALID_FILE_ATTRIBUTES)
+	{
+		wchar_t path[_MAX_PATH];
+		Sprintf(path,_countof(path),L"%s\\desktop.ini",src);
+		DWORD attrib=GetFileAttributes(path);
+		if (attrib!=INVALID_FILE_ATTRIBUTES && (attrib&FILE_ATTRIBUTE_SYSTEM))
+			return true;
+	}
+	return false;
+}
--- a/Src/Lib/FileHelper.h
+++ b/Src/Lib/FileHelper.h
@@ -7,3 +7,4 @@
 bool CreateFakeFolder( const wchar_t *source, const wchar_t *fname );
 void DeleteFakeFolder( const wchar_t *fname );
 bool IsFakeFolder( const wchar_t *fname );
+bool GetFakeFolder( wchar_t *dst, int len, const wchar_t *src );
--- a/Src/Lib/LanguageSettingsHelper.cpp
+++ b/Src/Lib/LanguageSettingsHelper.cpp
@@ -127,7 +127,6 @@ VersionData CLanguageSettingsDlg::s_VersionData;

 void CLanguageSettingsDlg::AddFlag( const wchar_t *langName, int langId, HBITMAP bmp )
 {
-	std::vector<LangInfo>::iterator it=m_LanguageIDs.begin()+1;
 	int idx=1;
 	for (;idx<(int)m_LanguageIDs.size();idx++)
 	{
@@ -205,8 +204,6 @@ void CLanguageSettingsDlg::UpdateFlags( void )
 			DoEnvironmentSubst(path,_countof(path));
 		}

-		CWindow list=GetDlgItem(IDC_LISTLANGUAGE);
-
 		wchar_t find[_MAX_PATH];
 		Sprintf(find,_countof(find),L"%s\\*.dll",path);
 		WIN32_FIND_DATA data;
@@ -408,7 +405,7 @@ LRESULT CLanguageSettingsDlg::OnSelChange( int idCtrl, LPNMHDR pnmh, BOOL& bHand
 	CComVariant val(name);
 	if (m_pSetting->value!=val)
 		SetSettingsDirty();
-	m_pSetting->value=val;
+	m_pSetting->value=std::move(val);

 	if (_wcsicmp(m_pSetting->value.bstrVal,m_pSetting->defValue.bstrVal)==0)
 		m_pSetting->flags|=CSetting::FLAG_DEFAULT;
--- a/Src/Lib/Settings.cpp
+++ b/Src/Lib/Settings.cpp
@@ -125,7 +125,7 @@ bool CSetting::IsEnabled( void ) const
 					if (operation=='>' && pSetting->GetValue().intVal<=val)
 						return false;
 				}
-				if ((pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG) && pSetting->GetValue().vt==VT_BSTR)
+				if ((pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_DIRECTORY) && pSetting->GetValue().vt==VT_BSTR)
 				{
 					if (operation=='~' && *pSetting->GetValue().bstrVal==0)
 						return false;
@@ -202,7 +202,7 @@ bool CSetting::ReadValue( CRegKey &regKey, const wchar_t *valName )
 	}

 	// string
-	if (type>=CSetting::TYPE_STRING && type<CSetting::TYPE_MULTISTRING)
+	if (type>=CSetting::TYPE_STRING && type!=CSetting::TYPE_MULTISTRING)
 	{
 		ULONG len;
 		if (regKey.QueryStringValue(valName,NULL,&len)==ERROR_SUCCESS)
@@ -789,11 +789,14 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 						}
 						CComPtr<IXMLDOMNode> next;
 						child2->get_nextSibling(&next);
-						child2=next;
+						child2=std::move(next);
 					}
 					string.push_back(0);
 					pSetting->value=CComVariant(&string[0]);
-					pSetting->flags&=~CSetting::FLAG_DEFAULT;
+					if (pSetting->value==pSetting->defValue)
+						pSetting->flags|=CSetting::FLAG_DEFAULT;
+					else
+						pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 				else
 				{
@@ -806,7 +809,10 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 							if (pSetting->type>=CSetting::TYPE_STRING)
 							{
 								pSetting->value=value;
-								pSetting->flags&=~CSetting::FLAG_DEFAULT;
+								if (pSetting->value==pSetting->defValue)
+									pSetting->flags|=CSetting::FLAG_DEFAULT;
+								else
+									pSetting->flags&=~CSetting::FLAG_DEFAULT;
 							}
 							else if (pSetting->type==CSetting::TYPE_BOOL || (pSetting->type==CSetting::TYPE_INT && pSetting[1].type!=CSetting::TYPE_RADIO) || pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY || pSetting->type==CSetting::TYPE_COLOR)
 							{
@@ -815,7 +821,10 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 									pSetting->value=CComVariant(val?1:0);
 								else
 									pSetting->value=CComVariant(val);
-								pSetting->flags&=~CSetting::FLAG_DEFAULT;
+								if (pSetting->value==pSetting->defValue)
+									pSetting->flags|=CSetting::FLAG_DEFAULT;
+								else
+									pSetting->flags&=~CSetting::FLAG_DEFAULT;
 							}
 							else if (pSetting->type==CSetting::TYPE_INT && pSetting[1].type==CSetting::TYPE_RADIO)
 							{
@@ -825,7 +834,10 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 									if (_wcsicmp(pRadio->name,value.bstrVal)==0)
 									{
 										pSetting->value=CComVariant(val);
-										pSetting->flags&=~CSetting::FLAG_DEFAULT;
+										if (pSetting->value==pSetting->defValue)
+											pSetting->flags|=CSetting::FLAG_DEFAULT;
+										else
+											pSetting->flags&=~CSetting::FLAG_DEFAULT;
 										break;
 									}
 								}
@@ -839,7 +851,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
 		CComPtr<IXMLDOMNode> next;
 		if (child->get_nextSibling(&next)!=S_OK)
 			break;
-		child=next;
+		child=std::move(next);
 	}
 	if (ver<0x03090000)
 		UpgradeSettings(false);
@@ -1701,6 +1713,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
 		if (GetOpenFileName(&ofn))
 		{
+			SetCurTab(m_Index,true); // reload tab once to force-close any active edit boxes
 			CString error=g_SettingsManager.LoadSettingsXml(path);
 			if (!error.IsEmpty())
 			{
@@ -1710,7 +1723,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 				::MessageBox(m_hWnd,text,LoadStringEx(IDS_ERROR_TITLE),MB_OK|MB_ICONERROR);
 			}
 			SetSettingsDirty();
-			SetCurTab(m_Index,true);
+			SetCurTab(m_Index,true); // reload tab again to show the new settings
 		}
 	}
 	if (res==3)
@@ -2208,7 +2221,7 @@ bool GetSettingBool( const CSetting &setting )

 CString GetSettingString( const CSetting &setting )
 {
-	Assert(setting.type==CSetting::TYPE_STRING);
+	Assert(setting.type==CSetting::TYPE_STRING || setting.type==CSetting::TYPE_DIRECTORY);
 	if (setting.value.vt!=VT_BSTR)
 		return CString();
 	return setting.value.bstrVal;
@@ -2709,7 +2722,7 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
 		{
 			fprintf_s(fAdmx,"\t\t\t\t<decimal id=\"Value\" valueName=\"%S\"/>\r\n",pSetting->name);
 		}
-		else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT)
+		else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT || pSetting->type==CSetting::TYPE_DIRECTORY)
 		{
 			fprintf_s(fAdmx,"\t\t\t\t<text id=\"Value\" valueName=\"%S\"/>\r\n",pSetting->name);
 		}
@@ -2769,7 +2782,7 @@ bool SaveAdmx( TSettingsComponent component, const char *admxFile, const char *a
 		{
 			fprintf_s(fAdml,"\t\t\t\t<decimalTextBox refId=\"Value\" spin=\"false\">%s</decimalTextBox>\r\n",(const char*)name);
 		}
-		else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT)
+		else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT || pSetting->type==CSetting::TYPE_DIRECTORY)
 		{
 			fprintf_s(fAdml,"\t\t\t\t<textBox refId=\"Value\"><label>%s</label></textBox>\r\n",(const char*)name);
 		}
--- a/Src/Lib/Settings.h
+++ b/Src/Lib/Settings.h
@@ -32,6 +32,7 @@ struct CSetting
 		TYPE_SOUND,
 		TYPE_FONT,
 		TYPE_MULTISTRING,
+		TYPE_DIRECTORY,
 	};

 	enum
--- a/Src/Lib/SettingsUIHelper.cpp
+++ b/Src/Lib/SettingsUIHelper.cpp
@@ -1156,7 +1156,7 @@ HRESULT STDMETHODCALLTYPE CBrowseLinkEvents::OnButtonClicked( IFileDialogCustomi
 	{
 		pfd->GetFolder(&pItem);
 	}
-	m_pResult=pItem;
+	m_pResult=std::move(pItem);
 	pfd->Close(S_FALSE);
 	return S_OK;
 }
@@ -1216,7 +1216,7 @@ bool BrowseCommandHelper( HWND parent, wchar_t *text )
 	return false;
 }

-bool BrowseLinkHelper( HWND parent, wchar_t *text )
+bool BrowseLinkHelper( HWND parent, wchar_t *text, bool bFoldersOnly )
 {
 	DoEnvironmentSubst(text,_MAX_PATH);

@@ -1227,16 +1227,22 @@ bool BrowseLinkHelper( HWND parent, wchar_t *text )
 	if (!pCustomize)
 		return false;

-	pDialog->SetTitle(LoadStringEx(IDS_PICK_LINK_TITLE));
-	pDialog->SetOkButtonLabel(LoadStringEx(IDS_PICK_LINK_FILE));
-	wchar_t button[256];
-	Sprintf(button,_countof(button),L"  %s  ",LoadStringEx(IDS_PICK_LINK_FOLDER));
-	pCustomize->AddPushButton(101,button);
+	pDialog->SetTitle(LoadStringEx(bFoldersOnly?IDS_PICK_LINK_FOLDER:IDS_PICK_LINK_TITLE));
+	if (!bFoldersOnly) // add separate buttons for selecting files/folders to the dialog
+	{
+		pDialog->SetOkButtonLabel(LoadStringEx(IDS_PICK_LINK_FILE));
+		wchar_t button[256];
+		Sprintf(button,_countof(button),L"  %s  ",LoadStringEx(IDS_PICK_LINK_FOLDER));
+		pCustomize->AddPushButton(101,button);
+	}

 	CBrowseLinkEvents events;
 	DWORD cookie;
 	pDialog->Advise(&events,&cookie);
-	pDialog->SetOptions(FOS_ALLNONSTORAGEITEMS|FOS_FILEMUSTEXIST|FOS_DONTADDTORECENT|FOS_DEFAULTNOMINIMODE|FOS_NODEREFERENCELINKS);
+	if (bFoldersOnly) // set FOS_PICKFOLDERS option to use dialog in folder-only mode
+		pDialog->SetOptions(FOS_PICKFOLDERS|FOS_ALLNONSTORAGEITEMS|FOS_DONTADDTORECENT|FOS_DEFAULTNOMINIMODE);
+	else
+		pDialog->SetOptions(FOS_ALLNONSTORAGEITEMS|FOS_FILEMUSTEXIST|FOS_DONTADDTORECENT|FOS_DEFAULTNOMINIMODE|FOS_NODEREFERENCELINKS);
 	{
 		const wchar_t *c=wcschr(text,'|');
 		if (c)
@@ -1822,7 +1828,10 @@ void CCustomTreeDlg::SerializeData( void )
 	if ((m_pSetting->flags&CSetting::FLAG_DEFAULT) || wcscmp(strNew,strOld)!=0)
 		SetSettingsDirty();
 	m_pSetting->value=CComVariant(strNew);
-	m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
+	if (m_pSetting->value==m_pSetting->defValue)
+		m_pSetting->flags|=CSetting::FLAG_DEFAULT;
+	else
+		m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
 	ItemsChanged();
 }

@@ -2271,6 +2280,7 @@ public:
 		EDIT_HOTKEY_ANY,
 		EDIT_COLOR,
 		EDIT_FONT,
+		EDIT_DIRECTORY,
 	};

 	BEGIN_MSG_MAP( CTreeSettingsDlg )
@@ -2714,6 +2724,29 @@ LRESULT CTreeSettingsDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO
 		m_EditBox.SetFocus();
 		m_bIgnoreFocus=false;
 	}
+	else if (m_EditMode==EDIT_DIRECTORY)
+	{
+		m_bIgnoreFocus=true;
+		CString str;
+		m_EditBox.GetWindowText(str);
+		str.TrimLeft(); str.TrimRight();
+		wchar_t text[1024];
+		DWORD dwAttrs=GetFileAttributes(str); // ensure directory exists before passing it to dialog
+		if (dwAttrs!=INVALID_FILE_ATTRIBUTES && dwAttrs&FILE_ATTRIBUTE_DIRECTORY)
+		{
+			Strcpy(text,_countof(text),str);
+			DoEnvironmentSubst(text,_countof(text));
+		}
+		else
+			text[0]=0;
+		Strcpy(text,_countof(text),str);
+		DoEnvironmentSubst(text,_countof(text));
+		if (BrowseLinkHelper(m_hWnd,text,true))
+			m_EditBox.SetWindowText(text);
+		SendMessage(WM_NEXTDLGCTL,(LPARAM)m_EditBox.m_hWnd,TRUE);
+		m_EditBox.SetFocus();
+		m_bIgnoreFocus=false;
+	}
 	return 0;
 }

@@ -2778,7 +2811,10 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault )
 		{
 			CSettingsLockWrite lock;
 			pSetting->value=CComVariant(state?0:1);
-			pSetting->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSetting->value==pSetting->defValue)
+				pSetting->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSetting->flags&=~CSetting::FLAG_DEFAULT;
 			SetSettingsDirty();
 		}
 		if (pSetting->flags&CSetting::FLAG_CALLBACK)
@@ -2802,7 +2838,10 @@ void CTreeSettingsDlg::ToggleItem( HTREEITEM hItem, bool bDefault )
 				{
 					CSettingsLockWrite lock;
 					pTarget->value=CComVariant(val);
-					pTarget->flags&=~CSetting::FLAG_DEFAULT;
+					if (pTarget->value==pTarget->defValue)
+						pTarget->flags|=CSetting::FLAG_DEFAULT;
+					else
+						pTarget->flags&=~CSetting::FLAG_DEFAULT;
 					SetSettingsDirty();
 				}
 				if (pParent->flags&CSetting::FLAG_CALLBACK)
@@ -3013,7 +3052,10 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val)
 				{
 					pSetting->value=CComVariant(val);
-					pSetting->flags&=~CSetting::FLAG_DEFAULT;
+					if (pSetting->value==pSetting->defValue)
+						pSetting->flags|=CSetting::FLAG_DEFAULT;
+					else
+						pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}
 			else if (pSetting->type==CSetting::TYPE_COLOR)
@@ -3023,7 +3065,10 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val)
 				{
 					pSetting->value=CComVariant(val);
-					pSetting->flags&=~CSetting::FLAG_DEFAULT;
+					if (pSetting->value==pSetting->defValue)
+						pSetting->flags|=CSetting::FLAG_DEFAULT;
+					else
+						pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}
 			else if (pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY)
@@ -3031,7 +3076,24 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=g_HotKey)
 				{
 					pSetting->value=CComVariant(g_HotKey);
-					pSetting->flags&=~CSetting::FLAG_DEFAULT;
+					if (pSetting->value==pSetting->defValue)
+						pSetting->flags|=CSetting::FLAG_DEFAULT;
+					else
+						pSetting->flags&=~CSetting::FLAG_DEFAULT;
+				}
+			}
+			else if (pSetting->type==CSetting::TYPE_DIRECTORY)
+			{
+				if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal)
+				{
+					if (str.IsEmpty()) // empty directory strings cause unexpected behavior, so we reset to avoid this
+						pSetting->value=pSetting->defValue;
+					else // otherwise we are very lenient about what users can input as a path
+						pSetting->value=CComVariant(str);
+					if (pSetting->value==pSetting->defValue)
+						pSetting->flags|=CSetting::FLAG_DEFAULT;
+					else
+						pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}
 			else
@@ -3039,7 +3101,10 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 				if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal)
 				{
 					pSetting->value=CComVariant(str);
-					pSetting->flags&=~CSetting::FLAG_DEFAULT;
+					if (pSetting->value==pSetting->defValue)
+						pSetting->flags|=CSetting::FLAG_DEFAULT;
+					else
+						pSetting->flags&=~CSetting::FLAG_DEFAULT;
 				}
 			}
 			SetSettingsDirty();
@@ -3074,7 +3139,7 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b
 				val=valVar.intVal;
 			Sprintf(text,_countof(text),L"%d",val);
 		}
-		else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT)
+		else if (pSetting->type==CSetting::TYPE_STRING || pSetting->type==CSetting::TYPE_ICON || pSetting->type==CSetting::TYPE_BITMAP || pSetting->type==CSetting::TYPE_BITMAP_JPG || pSetting->type==CSetting::TYPE_SOUND || pSetting->type==CSetting::TYPE_FONT || pSetting->type==CSetting::TYPE_DIRECTORY)
 		{
 			if (valVar.vt==VT_BSTR)
 				Strcpy(text,_countof(text),valVar.bstrVal);
@@ -3090,8 +3155,10 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b
 				mode=EDIT_BITMAP_JPG;
 			else if (pSetting->type==CSetting::TYPE_SOUND)
 				mode=EDIT_SOUND;
-			else
+			else if (pSetting->type==CSetting::TYPE_FONT)
 				mode=EDIT_FONT;
+			else
+				mode=EDIT_DIRECTORY;
 		}
 		else if (pSetting->type==CSetting::TYPE_HOTKEY || pSetting->type==CSetting::TYPE_HOTKEY_ANY)
 		{
@@ -3131,7 +3198,7 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b
 		m_pEditSetting=pSetting;
 	}

-	if (mode==EDIT_ICON || mode==EDIT_BITMAP || mode==EDIT_BITMAP_JPG || mode==EDIT_SOUND || mode==EDIT_FONT || mode==EDIT_COLOR)
+	if (mode==EDIT_ICON || mode==EDIT_BITMAP || mode==EDIT_BITMAP_JPG || mode==EDIT_SOUND || mode==EDIT_FONT || mode==EDIT_COLOR || mode==EDIT_DIRECTORY)
 	{
 		RECT rc2=rc;
 		int width=(rc2.bottom-rc2.top)*3/2;
@@ -3189,14 +3256,15 @@ void CTreeSettingsDlg::UpdateEditPosition( void )
 	DeleteDC(hdc);
 	DWORD margins=(DWORD)m_EditBox.SendMessage(EM_GETMARGINS);
 	size.cx+=HIWORD(margins)+LOWORD(margins)+12;
-	if (m_EditMode==EDIT_ICON || m_EditMode==EDIT_BITMAP || m_EditMode==EDIT_BITMAP_JPG || m_EditMode==EDIT_FONT || m_EditMode==EDIT_COLOR)
+	// adjust size and position of edit boxes for settings that use browse/play buttons
+	if (m_EditMode==EDIT_ICON || m_EditMode==EDIT_BITMAP || m_EditMode==EDIT_BITMAP_JPG || m_EditMode==EDIT_FONT || m_EditMode==EDIT_COLOR || m_EditMode==EDIT_DIRECTORY)
 		size.cx+=width;
 	if (m_EditMode==EDIT_SOUND)
 		size.cx+=width*2;
 	if (size.cx<w)
 		rc.right=rc.left+size.cx;

-	if (m_EditMode==EDIT_ICON || m_EditMode==EDIT_BITMAP || m_EditMode==EDIT_BITMAP_JPG || m_EditMode==EDIT_SOUND || m_EditMode==EDIT_FONT || m_EditMode==EDIT_COLOR)
+	if (m_EditMode==EDIT_ICON || m_EditMode==EDIT_BITMAP || m_EditMode==EDIT_BITMAP_JPG || m_EditMode==EDIT_SOUND || m_EditMode==EDIT_FONT || m_EditMode==EDIT_COLOR || m_EditMode==EDIT_DIRECTORY)
 	{
 		RECT rc2=rc;
 		rc2.left=rc2.right-width;
@@ -3376,6 +3444,9 @@ void CTreeSettingsDlg::UpdateGroup( const CSetting *pModified )
 		bool bDefault=pSetting->IsDefault();
 		const CComVariant &valVar=pSetting->GetValue();

+		// check if modified items should be bold
+		bool bBoldSettings=GetSettingBool(L"BoldSettings");
+
 		// calculate text
 		if (pSetting!=m_pEditSetting)
 		{
@@ -3458,7 +3529,7 @@ void CTreeSettingsDlg::UpdateGroup( const CSetting *pModified )
 			DeleteDC(hdc);
 			DeleteDC(hdcMask);
 		}
-		int state=bDefault?0:TVIS_BOLD;
+		int state=bDefault||!bBoldSettings?0:TVIS_BOLD; // check if item should be highlighted in bold
 		if (!bEnabled)
 		{
 			if (pSetting->type!=CSetting::TYPE_COLOR) image|=SETTING_STATE_DISABLED;
--- a/Src/Lib/SettingsUIHelper.h
+++ b/Src/Lib/SettingsUIHelper.h
@@ -385,5 +385,5 @@ const wchar_t *GetSettingsRegPath( void );
 extern const GUID FOLDERID_DesktopRoot;

 bool BrowseCommandHelper( HWND parent, wchar_t *text );
-bool BrowseLinkHelper( HWND parent, wchar_t *text );
+bool BrowseLinkHelper( HWND parent, wchar_t *text, bool bFoldersOnly );
 bool BrowseIconHelper( HWND parent, wchar_t *text );
--- a/Src/Lib/json.hpp
+++ b/Src/Lib/json.hpp
--- a/Src/Setup/Setup.wxs
+++ b/Src/Setup/Setup.wxs
@@ -576,7 +576,8 @@
 			<Component Id="UpdateSettingsLink" Guid="10B5A082-6C92-4EA7-AFF8-21AE3D2D7FE0">
 				<Shortcut Id="UpdateSettingsLink" Name="!(loc.UpdateItem)" Advertise="no" Description="!(loc.UpdateSettingsDesc)" Target="[APPLICATIONFOLDER]Update.exe" WorkingDirectory="APPLICATIONFOLDER">
 					<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.Update"/>
-					<ShortcutProperty Key="System.AppUserModel.ToastActivatorCLSID" Value="{E407B70A-1FBD-4D5E-8822-231C69102472}"/>
+					<!-- Windows 7 doesn't recognize `System.AppUserModel.ToastActivatorCLSID` name so we have to use GUID directly -->
+					<ShortcutProperty Key="{9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 26" Value="{E407B70A-1FBD-4D5E-8822-231C69102472}"/>
 				</Shortcut>
 				<CreateFolder />
 				<Condition>START_MENU_FOLDER=1</Condition>
--- a/Src/Setup/Utility/Utility.cpp
+++ b/Src/Setup/Utility/Utility.cpp
@@ -943,7 +943,7 @@ static BOOL CALLBACK EnumResLangProc( HMODULE hModule, LPCTSTR lpszType, LPCTSTR
 	if (IS_INTRESOURCE(lpszName))
 	{
 		std::vector<std::pair<int,WORD>> &oldStrings=*(std::vector<std::pair<int,WORD>>*)lParam;
-		oldStrings.push_back(std::pair<int,WORD>(PtrToInt(lpszName),wIDLanguage));
+		oldStrings.emplace_back(PtrToInt(lpszName),wIDLanguage);
 	}
 	return TRUE;
 }
--- a/Src/Skins/Metro/SkinDescription.txt
+++ b/Src/Skins/Metro/SkinDescription.txt
@@ -105,7 +105,6 @@ Submenu_padding=2,2,2,2

 ; These have the same meaning as the Main_... properties
 Submenu_opacity=region
-Submenu_opacity=region
 Submenu_bitmap=$SystemAccentDark1|$StartBackground
 Submenu_bitmap_tint1=$StartHighlight
 Submenu_bitmap_mask=2
@@ -179,9 +178,11 @@ Main_icon_frame_tint1=$SystemAccentDark2|$StartSelectionBackground
 Main_icon_frame_mask=10
 Main_icon_frame_slices_X=4,4,4
 Main_icon_frame_slices_Y=4,4,4
-Main_icon_frame_offset=3,3
+Main_icon_frame_offset=3,3,100%
 Main_icon_padding=6,6,6,6,100%
 Main_text_padding=5,2,8,2,100%
+
+[ICON_FRAMES AND NOT SMALL_ICONS AND NOT NO_ICONS]
 Main2_icon_padding=6,6,6,6,100%
 Main2_text_padding=5,2,8,2,100%

--- a/Src/Skins/Metro7/SkinDescription.txt
+++ b/Src/Skins/Metro7/SkinDescription.txt
@@ -143,6 +143,7 @@ Scrollbar_arrows_mask=17


 ; LIST SECTION
+List_icon_padding=3,3,3,3,100%
 List_text_padding=0,0,4,0,100%
 List_separator_font="Segoe UI",bold,-9
 List_separator_text_padding=3,0,0,0,100%
@@ -249,7 +250,7 @@ Main_icon_frame_tint1=$SystemAccentDark2|$StartSelectionBackground
 Main_icon_frame_mask=10
 Main_icon_frame_slices_X=4,4,4
 Main_icon_frame_slices_Y=4,4,4
-Main_icon_frame_offset=3,3
+Main_icon_frame_offset=3,3,100%
 List_icon_frame=0
 Main_icon_padding=6,6,6,6,100%
 Main_text_padding=5,2,8,2,100%
--- a/Src/Skins/Metro7/programs.bmp
+++ b/Src/Skins/Metro7/programs.bmp
--- a/Src/Skins/Metro7/programs150.bmp
+++ b/Src/Skins/Metro7/programs150.bmp
--- a/Src/StartMenu/StartMenuDLL/Accessibility.cpp
+++ b/Src/StartMenu/StartMenuDLL/Accessibility.cpp
@@ -16,9 +16,7 @@ CMenuAccessible::CMenuAccessible( CMenuContainer *pOwner )
 	CreateStdAccessibleObject(pOwner->m_hWnd,OBJID_CLIENT,IID_IAccessible,(void**)&m_pStdAccessible);
 }

-CMenuAccessible::~CMenuAccessible( void )
-{
-}
+CMenuAccessible::~CMenuAccessible( void ) = default;

 void CMenuAccessible::Reset( void )
 {
--- a/Src/StartMenu/StartMenuDLL/CustomMenu.cpp
+++ b/Src/StartMenu/StartMenuDLL/CustomMenu.cpp
@@ -95,13 +95,13 @@ CStdCommand7 g_StdCommands7[]={
 	{L"user_videos",0,NULL,L"$Menu.UserVideosTip",NULL,&FOLDERID_Videos},
 	{L"control_panel",0,L"$Menu.ControlPanel",L"$Menu.ControlPanelTip",NULL,&FOLDERID_ControlPanelFolder,NULL,StdMenuItem::MENU_TRACK},
 	{L"pc_settings",IDS_PCSETTINGS,L"$Menu.PCSettings",L"",L"%windir%\\ImmersiveControlPanel\\SystemSettings.exe,10",NULL,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_SINGLE},
-	{L"network_connections",0,NULL,L"$Menu.NetworkTip",NULL,&FOLDERID_ConnectionsFolder},
+	{L"network_connections",0,NULL,L"$Menu.NetworkTip",NULL,&FOLDERID_ConnectionsFolder,NULL,0,CStdCommand7::ITEM_NODRIVES},
 	{L"network",0,NULL,NULL,NULL,&FOLDERID_NetworkFolder,NULL,0,CStdCommand7::ITEM_SINGLE},
-	{L"printers",0,NULL,L"$Menu.PrintersTip",NULL,&FOLDERID_PrintersFolder},
+	{L"printers",0,NULL,L"$Menu.PrintersTip",NULL,&FOLDERID_PrintersFolder,NULL,0,CStdCommand7::ITEM_NODRIVES},
 	{L"fonts",0,NULL,NULL,NULL,&FOLDERID_Fonts},
 	{L"desktop",0,NULL,NULL,NULL,&FOLDERID_Desktop},
-	{L"admin",0,NULL,L"$Menu.AdminToolsTip",L"imageres.dll,114",&FOLDERID_CommonAdminTools,NULL,StdMenuItem::MENU_TRACK},
-	{L"startup",0,NULL,NULL,NULL,&FOLDERID_Startup,NULL,StdMenuItem::MENU_TRACK},
+	{L"admin",0,NULL,L"$Menu.AdminToolsTip",L"imageres.dll,114",&FOLDERID_CommonAdminTools,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_NODRIVES},
+	{L"startup",0,NULL,NULL,NULL,&FOLDERID_Startup,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_NODRIVES},
 	{L"downloads",0,NULL,L"$Menu.DownloadTip",NULL,&FOLDERID_Downloads},
 	{L"games",0,NULL,L"$Menu.GamesTip",NULL,&FOLDERID_Games,NULL,StdMenuItem::MENU_TRACK},
 	{L"links",0,NULL,NULL,NULL,&FOLDERID_Links},
@@ -112,7 +112,7 @@ CStdCommand7 g_StdCommands7[]={
 	{L"lib_videos",IDS_LIB_VIDEOS_ITEM,NULL,L"$Menu.VideosLibTip",NULL,&FOLDERID_VideosLibrary},
 	{L"lib_tv",IDS_LIB_TV_ITEM,NULL,L"$Menu.RecordingsLibTip",NULL,&FOLDERID_RecordedTVLibrary},
 	{L"homegroup",0,NULL,L"$Menu.HomegroupTip",NULL,&FOLDERID_HomeGroup,NULL,0,CStdCommand7::ITEM_SINGLE},
-	{L"devices",0,NULL,NULL,NULL,NULL,L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\0\\::{A8A91A66-3A7D-4424-8D24-04E180695C7A}"},
+	{L"devices",0,NULL,NULL,NULL,NULL,L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\0\\::{A8A91A66-3A7D-4424-8D24-04E180695C7A}",0,CStdCommand7::ITEM_NODRIVES},
 	{L"defaults",0,NULL,NULL,NULL,NULL,L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\0\\::{17CD9488-1228-4B2F-88CE-4298E93E0966}",0,CStdCommand7::ITEM_SINGLE},
 	{L"apps",IDS_METRO_APPS,L"$Menu.Apps",NULL,L",2",NULL,NULL,StdMenuItem::MENU_TRACK,CStdCommand7::ITEM_FOLDER},

--- a/Src/StartMenu/StartMenuDLL/CustomMenu.h
+++ b/Src/StartMenu/StartMenuDLL/CustomMenu.h
@@ -15,6 +15,7 @@ struct CStdCommand7
 		ITEM_SINGLE=1, // this item never has sub-menu
 		ITEM_FOLDER=2, // this item always has sub-menu
 		ITEM_COMPUTER=4, // this item can be expanded only one level
+		ITEM_NODRIVES=8, // this item can never be expanded only one level
 	};
 	const wchar_t *command;
 	int nameID;
--- a/Src/StartMenu/StartMenuDLL/DragDrop.h
+++ b/Src/StartMenu/StartMenuDLL/DragDrop.h
@@ -15,9 +15,7 @@ public:
 		m_RefCount=0;
 	}

-	~CDropTargetProxy( void )
-	{
-	}
+	~CDropTargetProxy( void ) = default;

 	void Reset( void )
 	{
--- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp
+++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp
@@ -589,7 +589,7 @@ void CItemManager::Init( void )

 	m_RootGames=L"::{ED228FDF-9EA8-4870-83B1-96B02CFE0D52}\\";
 	wchar_t text[_MAX_PATH];
-	Strcpy(text,_countof(text),START_MENU_PINNED_ROOT L"\\");
+	Sprintf(text,_countof(text),L"%s\\",GetSettingString(L"PinnedItemsPath"));
 	DoEnvironmentSubst(text,_countof(text));
 	m_RootStartMenu3=text;
 	StringUpper(m_RootStartMenu3);
@@ -609,7 +609,7 @@ void CItemManager::Init( void )
 		{
 			int width, height;
 			pList->GetIconSize(&width,&height);
-			m_ListSizes.push_back(std::pair<int,int>(width,i));
+			m_ListSizes.emplace_back(width,i);
 		}
 	}
 	std::sort(m_ListSizes.begin(),m_ListSizes.end());
@@ -617,7 +617,7 @@ void CItemManager::Init( void )
 	CreateDefaultIcons();
 	LoadCacheFile();

-	ItemInfo &item=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(0,ItemInfo()))->second;
+	ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second;
 	item.bIconOnly=true;
 	item.smallIcon=m_DefaultSmallIcon;
 	item.largeIcon=m_DefaultLargeIcon;
@@ -704,21 +704,21 @@ void CItemManager::CreateDefaultIcons( void )
 		icon.bitmap=BitmapFromIcon(LoadShellIcon(index,SMALL_ICON_SIZE),SMALL_ICON_SIZE);
 	else
 		icon.bitmap=NULL;
-	m_DefaultSmallIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second;
+	m_DefaultSmallIcon=&m_IconInfos.emplace(0,icon)->second;

 	icon.sizeType=ICON_SIZE_TYPE_LARGE;
 	if (index>=0)
 		icon.bitmap=BitmapFromIcon(LoadShellIcon(index,LARGE_ICON_SIZE),LARGE_ICON_SIZE);
 	else
 		icon.bitmap=NULL;
-	m_DefaultLargeIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second;
+	m_DefaultLargeIcon=&m_IconInfos.emplace(0,icon)->second;

 	icon.sizeType=ICON_SIZE_TYPE_EXTRA_LARGE;
 	if (index>=0)
 		icon.bitmap=BitmapFromIcon(LoadShellIcon(index,EXTRA_LARGE_ICON_SIZE),EXTRA_LARGE_ICON_SIZE);
 	else
 		icon.bitmap=NULL;
-	m_DefaultExtraLargeIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second;
+	m_DefaultExtraLargeIcon=&m_IconInfos.emplace(0,icon)->second;
 }

 CItemManager::LoadIconData &CItemManager::GetLoadIconData( void )
@@ -896,7 +896,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( IShellItem *pItem, PIDL
 		}
 		if (!pInfo)
 		{
-			pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second;
+			pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
 			pInfo->pidl.Clone(pidl);
 			pInfo->path=path;
 			pInfo->PATH=PATH;
@@ -978,7 +978,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( CString path, int refre
 		}
 		if (!pInfo)
 		{
-			pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second;
+			pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
 			if (!PATH.IsEmpty())
 				MenuParseDisplayName(path,&pInfo->pidl,NULL,NULL);
 			if (pInfo->pidl)
@@ -1076,7 +1076,7 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *locati
 		}
 		if (!pInfo)
 		{
-			pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second;
+			pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
 			pInfo->bIconOnly=true;
 			pInfo->bTemp=bTemp;
 			pInfo->iconPath=location;
@@ -1907,7 +1907,7 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 									if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal)
 									{
 										newInfo.bLink = false;
-										pItem = target;
+										pItem = std::move(target);
 										pStore = store;
 									}
 									PropVariantClear(&val);
@@ -2597,7 +2597,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP

 	if ((refreshFlags&INFO_SMALL_ICON) && hSmallBitmap)
 	{
-		IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second;
+		IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
 		pInfo->sizeType=ICON_SIZE_TYPE_SMALL;
 		pInfo->bTemp=bTemp;
 		pInfo->bMetro=bMetro;
@@ -2607,7 +2607,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP
 	}
 	if ((refreshFlags&INFO_LARGE_ICON) && hLargeBitmap)
 	{
-		IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second;
+		IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
 		pInfo->sizeType=ICON_SIZE_TYPE_LARGE;
 		pInfo->bTemp=bTemp;
 		pInfo->bMetro=bMetro;
@@ -2617,7 +2617,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP
 	}
 	if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && hExtraLargeBitmap)
 	{
-		IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second;
+		IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
 		pInfo->sizeType=ICON_SIZE_TYPE_EXTRA_LARGE;
 		pInfo->bTemp=bTemp;
 		pInfo->bMetro=bMetro;
@@ -2867,7 +2867,8 @@ void CItemManager::PreloadItemsThread( void )
 			else if (g_CacheFolders[i].folder==FOLDERID_ClassicPinned)
 			{
 				if (GetSettingInt(L"PinnedPrograms")!=PINNED_PROGRAMS_PINNED) continue;
-				wchar_t path[_MAX_PATH]=START_MENU_PINNED_ROOT;
+				wchar_t path[_MAX_PATH];
+				Strcpy(path,_countof(path),GetSettingString(L"PinnedItemsPath"));
 				DoEnvironmentSubst(path,_countof(path));
 				if (FAILED(SHParseDisplayName(path,NULL,&pidl,0,NULL)) || !pidl) continue;
 				if (FAILED(SHCreateItemFromIDList(pidl,IID_IShellItem,(void**)&pFolder)) || !pFolder) continue;
@@ -3273,7 +3274,7 @@ void CItemManager::LoadCacheFile( void )
 						bError=true;
 						break;
 					}
-					remapIcons.push_back(&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(data.key,info))->second);
+					remapIcons.push_back(&m_IconInfos.emplace(data.key,info)->second);
 				}
 				else
 				{
@@ -3304,7 +3305,7 @@ void CItemManager::LoadCacheFile( void )
 					bError=true;
 					break;
 				}
-				ItemInfo &info=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(data.key,ItemInfo()))->second;
+				ItemInfo &info=m_ItemInfos.emplace(data.key,ItemInfo())->second;

 				info.writestamp=data.writestamp;
 				info.createstamp=data.createstamp;
@@ -3568,7 +3569,7 @@ void CItemManager::ClearCache( void )
 	m_IconInfos.clear();
 	m_MetroItemInfos10.clear();
 	CreateDefaultIcons();
-	ItemInfo &item=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(0,ItemInfo()))->second;
+	ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second;
 	item.bIconOnly=true;
 	item.smallIcon=m_DefaultSmallIcon;
 	item.largeIcon=m_DefaultLargeIcon;
--- a/Src/StartMenu/StartMenuDLL/ItemManager.h
+++ b/Src/StartMenu/StartMenuDLL/ItemManager.h
@@ -470,7 +470,6 @@ STDAPI ShGetKnownFolderItem(REFKNOWNFOLDERID rfid, IShellItem **ppItem );
 HBITMAP ColorizeMonochromeImage(HBITMAP bitmap, DWORD color);

 #define TASKBAR_PINNED_ROOT L"%APPDATA%\\Microsoft\\Internet Explorer\\Quick Launch\\User Pinned\\TaskBar"
-#define START_MENU_PINNED_ROOT L"%APPDATA%\\OpenShell\\Pinned"
 #define STARTSCREEN_COMMAND L"startscreen.lnk"
 #define USERASSIST_LINKS_KEY L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\UserAssist\\{F4E57C4B-2036-45F0-A9AB-443BCFE33D9F}\\Count"
 #define USERASSIST_APPIDS_KEY L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\UserAssist\\{CEBFF5CD-ACE2-4F4F-9178-9926F41749EA}\\Count"
--- a/Src/StartMenu/StartMenuDLL/JumpLists.cpp
+++ b/Src/StartMenu/StartMenuDLL/JumpLists.cpp
@@ -198,7 +198,13 @@ bool HasJumplist( const wchar_t *appid )
 	{
 		UINT count;
 		if (SUCCEEDED(pCustomList->GetCategoryCount(&count)) && count>0)
+		{
+			// skip Settings app (it reports one category with unsupported type, thus jump-list will be empty)
+			if (wcscmp(appid, L"windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel") == 0)
+				return false;
+
 			return true;
+		}
 	}

 	if (CAutomaticList(appid).HasList())
--- a/Src/StartMenu/StartMenuDLL/MenuCommands.cpp
+++ b/Src/StartMenu/StartMenuDLL/MenuCommands.cpp
@@ -11,6 +11,7 @@
 #include "Settings.h"
 #include "SettingsUI.h"
 #include "SettingsUIHelper.h"
+#include "FileHelper.h"
 #include "Translations.h"
 #include "LogManager.h"
 #include "FNVHash.h"
@@ -2782,12 +2783,19 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 			info.lpVerb=MAKEINTRESOURCEA(res-verbOffset);
 			info.lpVerbW=MAKEINTRESOURCEW(res-verbOffset);
 			info.nShow=SW_SHOWNORMAL;
+			bool bOpenTruePath=false;
+			wchar_t targetlnkPath[_MAX_PATH]; // path to target.lnk in a fake folder
 			wchar_t dir[_MAX_PATH];
 			if (SHGetPathFromIDList(pItemPidl1,dir))
 			{
-				PathRemoveFileSpec(dir);
-				if (GetFileAttributes(dir)!=INVALID_FILE_ATTRIBUTES)
-					info.lpDirectoryW=dir;
+				if (_stricmp(command,"open")==0 && GetSettingBool(L"OpenTruePath") && GetFakeFolder(targetlnkPath,_countof(targetlnkPath),dir))
+					bOpenTruePath=true;
+				else
+				{
+					PathRemoveFileSpec(dir);
+					if (GetFileAttributes(dir)!=INVALID_FILE_ATTRIBUTES)
+						info.lpDirectoryW=dir;
+				}
 			}
 			if (pPt)
 			{
@@ -2818,9 +2826,20 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 			::SetForegroundWindow(g_OwnerWindow);
 			::SetWindowPos(g_OwnerWindow,HWND_TOPMOST,rc.left,rc.top,rc.right-rc.left,rc.bottom-rc.top,0);
 			LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, command='%S'",this,command);
-			HRESULT hr=pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info);
-			LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hr);
-			if (type==ACTIVATE_EXECUTE && SUCCEEDED(hr))
+			bool executeSuccess;
+			if (bOpenTruePath) // we are trying to open a fake folder, directly open target.lnk instead
+			{
+				HINSTANCE hinst=ShellExecute(NULL,NULL,targetlnkPath,NULL,NULL,SW_SHOWNORMAL);
+				LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hinst);
+				executeSuccess=static_cast<int>(reinterpret_cast<uintptr_t>(hinst))>=32;
+			}
+			else
+			{
+				HRESULT hr=pInvokeMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&info);
+				LOG_MENU(LOG_EXECUTE,L"Invoke command, ptr=%p, res=%d",this,hr);
+				executeSuccess=SUCCEEDED(hr);
+			}
+			if (type==ACTIVATE_EXECUTE && executeSuccess)
 			{
 				if (bTrackRecent)
 				{
--- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp
+++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp
@@ -315,6 +315,7 @@ bool CMenuContainer::s_bShowTopEmpty=false;
 bool CMenuContainer::s_bNoDragDrop=false;
 bool CMenuContainer::s_bNoContextMenu=false;
 bool CMenuContainer::s_bExpandLinks=false;
+bool CMenuContainer::s_bSingleClickFolders=false;
 bool CMenuContainer::s_bLogicalSort=false;
 bool CMenuContainer::s_bExtensionSort=false;
 bool CMenuContainer::s_bAllPrograms=false;
@@ -334,6 +335,7 @@ bool CMenuContainer::s_bDragMovable;
 bool CMenuContainer::s_bRightDrag;
 bool CMenuContainer::s_bLockWorkArea;
 bool CMenuContainer::s_bPendingSearchEnter;
+bool CMenuContainer::s_bMoreResults;
 std::vector<CMenuContainer*> CMenuContainer::s_Menus;
 volatile HWND CMenuContainer::s_FirstMenu, CMenuContainer::s_SearchMenu;
 CSearchManager::SearchResults CMenuContainer::s_SearchResults;
@@ -443,7 +445,10 @@ LRESULT CALLBACK CMenuContainer::SubclassSearchBox( HWND hWnd, UINT uMsg, WPARAM
 			SetBkColor(hdc,GetSysColor(COLOR_WINDOW));
 			SetBkMode(hdc,TRANSPARENT);
 			SetTextColor(hdc,s_Skin.Search_text_colors[1]);
-			DrawText(hdc,pParent->m_Items[pParent->m_SearchIndex].name,-1,&rc,DT_SINGLELINE|DT_EDITCONTROL|(s_bRTL?DT_RIGHT:DT_LEFT));
+			if (GetSettingBool(L"SearchHint"))
+				DrawText(hdc,GetSettingString(L"SearchHintText"),-1,&rc,DT_SINGLELINE|DT_EDITCONTROL|(s_bRTL?DT_RIGHT:DT_LEFT));
+			else
+				DrawText(hdc,pParent->m_Items[pParent->m_SearchIndex].name,-1,&rc,DT_SINGLELINE|DT_EDITCONTROL|(s_bRTL?DT_RIGHT:DT_LEFT));
 			SelectObject(hdc,font0);
 		}
 		return res;
@@ -1084,7 +1089,8 @@ void CMenuContainer::AddStandardItems( void )
 			if (m_bSubMenu && pStdItem->id==s_ShutdownCommand)
 				continue;

-			if (pStdItem->id==MENU_COLUMN_BREAK && m_bTwoColumns)
+			const bool bTwoColumns = (!m_bSubMenu && s_Skin.TwoColumns);
+			if (pStdItem->id==MENU_COLUMN_BREAK && bTwoColumns)
 				mainIconSize=s_Skin.Main2_icon_size;

 			int stdOptions=GetStdOptions(pStdItem->id);
@@ -2237,7 +2243,7 @@ void CMenuContainer::AddJumpListItems( std::vector<MenuItem> &items )
 							{
 								ILFree(item.pItem1);
 								item.pItem1=pidl2.Detach();
-								pItem=pItem2;
+								pItem=std::move(pItem2);
 							}
 						}
 					}
@@ -2499,9 +2505,9 @@ void CMenuContainer::InitItems( void )
 		m_Items.resize(MAX_MENU_ITEMS);
 	}

-	if (m_Options&CONTAINER_CONTROLPANEL)
+	if (m_Options&CONTAINER_CONTROLPANEL && !(m_Options&CONTAINER_NOSUBFOLDERS))
 	{
-		// expand Administrative Tools. must be done after the sorting because we don't want the folder to jump to the top
+		// expand Administrative Tools when displaying as a menu. must be done after the sorting because we don't want the folder to jump to the top
 		unsigned int AdminToolsHash=CalcFNVHash(L"::{D20EA4E1-3957-11D2-A40B-0C5020524153}");
 		for (std::vector<MenuItem>::iterator it=m_Items.begin();it!=m_Items.end();++it)
 			if (it->nameHash==AdminToolsHash)
@@ -2740,9 +2746,9 @@ bool CMenuContainer::InitSearchItems( void )
 	{
 		sepHeight=s_Skin.ItemSettings[s_Skin.More_bitmap_Size.cx?MenuSkin::LIST_SEPARATOR_SPLIT:MenuSkin::LIST_SEPARATOR].itemHeight;
 		itemHeight=s_Skin.ItemSettings[MenuSkin::LIST_ITEM].itemHeight;
-		// total height minus the search box and the "more results"/"search internet"
+		// total height minus the search box and the "more results"/"search internet", if present
 		maxHeight=m_Items[m_SearchIndex].itemRect.top-s_Skin.Main_search_padding.top-s_Skin.Search_padding.top;
-		maxHeight-=itemHeight*(m_SearchItemCount-1);
+		maxHeight-=itemHeight*(m_SearchItemCount-(s_bMoreResults?1:2));
 		if (!s_SearchResults.bSearching && !HasMoreResults())
 			maxHeight+=itemHeight;
 	}
@@ -2768,18 +2774,18 @@ bool CMenuContainer::InitSearchItems( void )
 			if (m_SearchCategoryHash==CSearchManager::CATEGORY_PROGRAM)
 				selectedCount=(int)s_SearchResults.programs.size();
 		}
-		if (!s_SearchResults.settings.empty())
-		{
-			counts.push_back((int)s_SearchResults.settings.size());
-			if (m_SearchCategoryHash==CSearchManager::CATEGORY_SETTING)
-				selectedCount=(int)s_SearchResults.settings.size();
-		}
 		if (!s_SearchResults.metrosettings.empty())
 		{
 			counts.push_back((int)s_SearchResults.metrosettings.size());
 			if (m_SearchCategoryHash==CSearchManager::CATEGORY_METROSETTING)
 				selectedCount=(int)s_SearchResults.metrosettings.size();
 		}
+		if (!s_SearchResults.settings.empty())
+		{
+			counts.push_back((int)s_SearchResults.settings.size());
+			if (m_SearchCategoryHash==CSearchManager::CATEGORY_SETTING)
+				selectedCount=(int)s_SearchResults.settings.size();
+		}
 		for (std::list<CSearchManager::SearchCategory>::const_iterator it=s_SearchResults.indexed.begin();it!=s_SearchResults.indexed.end();++it)
 		{
 			if (!it->items.empty())
@@ -2829,9 +2835,9 @@ bool CMenuContainer::InitSearchItems( void )
 		if (idx==0)
 			categoryHash=CSearchManager::CATEGORY_PROGRAM;
 		else if (idx==1)
-			categoryHash=CSearchManager::CATEGORY_SETTING;
-		else if (idx==2)
 			categoryHash=CSearchManager::CATEGORY_METROSETTING;
+		else if (idx==2)
+			categoryHash=CSearchManager::CATEGORY_SETTING;
 		else
 			categoryHash=it->categoryHash;

@@ -2866,16 +2872,6 @@ bool CMenuContainer::InitSearchItems( void )
 			name=FindTranslation(L"Search.CategoryPrograms",L"Programs");
 		}
 		else if (idx==1)
-		{
-			originalCount=(int)s_SearchResults.settings.size();
-			if (count>originalCount)
-				count=originalCount;
-			items.reserve(count);
-			for (std::vector<const CItemManager::ItemInfo*>::const_iterator it=s_SearchResults.settings.begin();it!=s_SearchResults.settings.end() && (int)items.size()<count;++it)
-				items.push_back(SearchItem(*it));
-			name=FindTranslation(L"Search.CategorySettings",L"Settings");
-		}
-		else if (idx==2)
 		{
 			originalCount=(int)s_SearchResults.metrosettings.size();
 			if (count>originalCount)
@@ -2883,7 +2879,17 @@ bool CMenuContainer::InitSearchItems( void )
 			items.reserve(count);
 			for (std::vector<const CItemManager::ItemInfo*>::const_iterator it=s_SearchResults.metrosettings.begin();it!=s_SearchResults.metrosettings.end() && (int)items.size()<count;++it)
 				items.push_back(SearchItem(*it));
-			name=FindTranslation(L"Search.CategoryPCSettings", L"Modern Settings");
+			name=FindTranslation(L"Search.CategoryPCSettings", L"Settings");
+		}
+		else if (idx==2)
+		{
+			originalCount=(int)s_SearchResults.settings.size();
+			if (count>originalCount)
+				count=originalCount;
+			items.reserve(count);
+			for (std::vector<const CItemManager::ItemInfo*>::const_iterator it=s_SearchResults.settings.begin();it!=s_SearchResults.settings.end() && (int)items.size()<count;++it)
+				items.push_back(SearchItem(*it));
+			name=FindTranslation(L"Search.CategorySettings",L"Control Panel");
 		}
 		else
 		{
@@ -2936,25 +2942,28 @@ bool CMenuContainer::InitSearchItems( void )
 	if (s_bWin7Style)
 	{
 		UpdateAccelerators(m_OriginalCount,(int)m_Items.size());
-		MenuItem &item=m_Items[m_SearchIndex-m_SearchItemCount+1];
-		if (s_SearchResults.bSearching)
+		if (s_bMoreResults)
 		{
-			item.id=MENU_SEARCH_EMPTY;
-			item.name=FindTranslation(L"Menu.Searching",L"Searching...");
-			item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,8",CItemManager::ICON_SIZE_TYPE_SMALL);
-		}
-		else
-		{
-			item.id=MENU_MORE_RESULTS;
-			item.name=FindTranslation(L"Menu.MoreResults",L"See more results");
-			item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,177",CItemManager::ICON_SIZE_TYPE_SMALL);
+			MenuItem &item=m_Items[m_SearchIndex-m_SearchItemCount+1];
+			if (s_SearchResults.bSearching)
+			{
+				item.id=MENU_SEARCH_EMPTY;
+				item.name=FindTranslation(L"Menu.Searching",L"Searching...");
+				item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,8",CItemManager::ICON_SIZE_TYPE_SMALL);
+			}
+			else
+			{
+				item.id=MENU_MORE_RESULTS;
+				item.name=FindTranslation(L"Menu.MoreResults",L"See more results");
+				item.pItemInfo=g_ItemManager.GetCustomIcon(L"imageres.dll,177",CItemManager::ICON_SIZE_TYPE_SMALL);
+			}
 		}
 	}
 	else
 	{
 		m_ScrollCount=(int)m_Items.size();
-		bool bInternet=GetSettingBool(L"SearchInternet");
-		if (s_SearchResults.bSearching)
+			bool bInternet=GetSettingBool(L"SearchInternet");
+		if (s_bMoreResults && s_SearchResults.bSearching)
 		{
 			MenuItem item(MENU_SEARCH_EMPTY);
 			item.name=FindTranslation(L"Menu.Searching",L"Searching...");
@@ -2969,7 +2978,7 @@ bool CMenuContainer::InitSearchItems( void )
 				item.name=FindTranslation(L"Menu.NoMatch",L"No items match your search.");
 				m_Items.push_back(item);
 			}
-			if (HasMoreResults())
+			if (s_bMoreResults && HasMoreResults())
 			{
 				{
 					MenuItem item(MENU_SEPARATOR);
@@ -5057,7 +5066,7 @@ void CMenuContainer::UpdateSearchResults( bool bForceShowAll )
 		g_SearchManager.BeginSearch(s_SearchResults.currentString);
 		s_SearchResults.bSearching=true;
 		s_bPendingSearchEnter=false;
-		if (s_bWin7Style)
+		if (s_bWin7Style && s_bMoreResults)
 		{
 			MenuItem &item=m_Items[m_SearchIndex-m_SearchItemCount+1];
 			item.id=MENU_SEARCH_EMPTY;
@@ -6798,7 +6807,7 @@ LRESULT CMenuContainer::OnLButtonDblClick( UINT uMsg, WPARAM wParam, LPARAM lPar
 	ClientToScreen(&pt);
 	if (s_bWin7Style && item.id==MENU_PROGRAMS) // only single clicks for All Programs
 		OnLButtonDown(WM_LBUTTONDOWN,wParam,lParam,bHandled);
-	else if (!bArrow) // ignore double-click on the split arrow
+	else if (!bArrow && item.id!=MENU_APPS) // ignore double-click on the split arrow and Apps folder
 		ActivateItem(index,ACTIVATE_EXECUTE,&pt);
 	return 0;
 }
@@ -6822,7 +6831,7 @@ LRESULT CMenuContainer::OnLButtonUp( UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 	const MenuItem &item=m_Items[index];
 	POINT pt2=pt;
 	ClientToScreen(&pt2);
-	if (!item.bFolder)
+	if (!item.bFolder || (s_bSingleClickFolders && item.id!=MENU_PROGRAMS && item.id!=MENU_APPS && !bArrow)) // never open All Programs, Apps folder, or jumplists with single click
 	{
 		if (item.jumpIndex>=0 && m_bHotArrow)
 		{
@@ -7401,35 +7410,46 @@ bool CMenuContainer::HasMoreResults( void )

 RECT CMenuContainer::CalculateWorkArea( const RECT &taskbarRect )
 {
-	RECT rc=s_MenuLimits;
-	if ((s_TaskBarEdge==ABE_LEFT || s_TaskBarEdge==ABE_RIGHT) && GetSettingBool(L"ShowNextToTaskbar"))
+	RECT rc;
+	if (!GetSettingBool(L"AlignToWorkArea"))
 	{
-		// when the taskbar is on the side and the menu is not on top of it
-		// the start button is assumed at the top
-		if (s_TaskBarEdge==ABE_LEFT)
-			rc.left=taskbarRect.right;
+		rc = s_MenuLimits;
+		if ((s_TaskBarEdge == ABE_LEFT || s_TaskBarEdge == ABE_RIGHT) && GetSettingBool(L"ShowNextToTaskbar"))
+		{
+			// when the taskbar is on the side and the menu is not on top of it
+			// the start button is assumed at the top
+			if (s_TaskBarEdge == ABE_LEFT)
+				rc.left = taskbarRect.right;
+			else
+				rc.right = taskbarRect.left;
+		}
 		else
-			rc.right=taskbarRect.left;
+		{
+			if (s_TaskBarEdge == ABE_BOTTOM)
+			{
+				// taskbar is at the bottom
+				rc.bottom = taskbarRect.top;
+			}
+			else if (s_TaskBarEdge == ABE_TOP)
+			{
+				// taskbar is at the top
+				rc.top = taskbarRect.bottom;
+			}
+			else
+			{
+				// taskbar is on the side, start button must be at the top
+				rc.top = s_StartRect.bottom;
+			}
+		}
 	}
 	else
 	{
-		if (s_TaskBarEdge==ABE_BOTTOM)
-		{
-			// taskbar is at the bottom
-			rc.bottom=taskbarRect.top;
-		}
-		else if (s_TaskBarEdge==ABE_TOP)
-		{
-			// taskbar is at the top
-			rc.top=taskbarRect.bottom;
-		}
-		else
-		{
-			// taskbar is on the side, start button must be at the top
-			rc.top=s_StartRect.bottom;
-		}
+		// Get working area of the monitor the specified taskbar is on
+		MONITORINFO info{ sizeof(MONITORINFO) };
+		HMONITOR mon = MonitorFromRect(&taskbarRect, 0);
+		GetMonitorInfo(mon, &info);
+		rc = info.rcWork;
 	}
-
 	if (!s_bLockWorkArea)
 	{
 		// exclude floating keyboard
@@ -7455,6 +7475,32 @@ RECT CMenuContainer::CalculateWorkArea( const RECT &taskbarRect )
 			}
 		}
 	}
+
+	//calculate offsets
+	int xOff = GetSettingInt(L"HorizontalMenuOffset");
+	int yOff = GetSettingInt(L"VerticalMenuOffset");
+	if (s_TaskBarEdge == ABE_BOTTOM)
+	{
+		if (xOff != 0)
+			rc.left += xOff;
+		if (yOff != 0)
+			rc.bottom += yOff;
+	}
+	else if (s_TaskBarEdge == ABE_TOP || s_TaskBarEdge == ABE_LEFT)
+	{
+		if (xOff != 0)
+			rc.left += xOff;
+		if (yOff != 0)
+			rc.top += yOff;
+	}
+	else
+	{
+		if (xOff != 0)
+			rc.right += xOff;
+		if (yOff != 0)
+			rc.top += yOff;
+	}
+
 	return rc;
 }

@@ -7634,6 +7680,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
 	g_ItemManager.ResetTempIcons();
 	s_ScrollMenus=GetSettingInt(L"ScrollType");
 	s_bExpandLinks=GetSettingBool(L"ExpandFolderLinks");
+	s_bSingleClickFolders=GetSettingBool(L"SingleClickFolders");
 	s_bLogicalSort=GetSettingBool(L"NumericSort");
 	s_MaxRecentDocuments=GetSettingInt(L"MaxRecentDocuments");
 	s_ShellFormat=RegisterClipboardFormat(CFSTR_SHELLIDLIST);
@@ -7651,6 +7698,7 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
 	s_bDisableHover=false;
 	s_bDragClosed=false;
 	s_bPendingSearchEnter=false;
+	s_bMoreResults=GetSettingBool(L"MoreResults");
 	InitTouchHelper();

 	bool bRemote=GetSystemMetrics(SM_REMOTESESSION)!=0;
@@ -8019,7 +8067,8 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
 	}
 	else
 	{
-		wchar_t path[_MAX_PATH]=START_MENU_PINNED_ROOT;
+		wchar_t path[_MAX_PATH];
+		Strcpy(path,_countof(path),GetSettingString(L"PinnedItemsPath"));
 		DoEnvironmentSubst(path,_countof(path));
 		SHCreateDirectory(NULL,path);
 		s_PinFolder=path;
@@ -8031,7 +8080,8 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
 	{
 		bool bPinned=GetSettingInt(L"PinnedPrograms")==PINNED_PROGRAMS_PINNED;
 		bool bShortcut=GetSettingBool(L"StartScreenShortcut");
-		wchar_t path[_MAX_PATH]=START_MENU_PINNED_ROOT L"\\" STARTSCREEN_COMMAND;
+		wchar_t path[_MAX_PATH];
+		Sprintf(path,_countof(path),L"%s\\%s",GetSettingString(L"PinnedItemsPath"),STARTSCREEN_COMMAND);
 		DoEnvironmentSubst(path,_countof(path));
 		if (bPinned)
 		{
--- a/Src/StartMenu/StartMenuDLL/MenuContainer.h
+++ b/Src/StartMenu/StartMenuDLL/MenuContainer.h
@@ -876,6 +876,7 @@ private:
 	static bool s_bNoDragDrop; // disables drag/drop
 	static bool s_bNoContextMenu; // disables the context menu
 	static bool s_bExpandLinks; // expand links to folders
+	static bool s_bSingleClickFolders; // open links to folders with one click instead of two
 	static bool s_bLogicalSort; // use StrCmpLogical instead of CompareString
 	static bool s_bExtensionSort; // sort file names by extension
 	static bool s_bAllPrograms; // this is the All Programs menu of the Windows start menu
@@ -895,6 +896,7 @@ private:
 	static bool s_bRightDrag; // dragging with the right mouse button
 	static bool s_bLockWorkArea; // changes to the work area are ignored
 	static bool s_bPendingSearchEnter; // Enter was pressed before the search results were ready
+	static bool s_bMoreResults; // shows the "Show More Results" item at the bottom of searches
 	static RECT s_MenuLimits; // area of the main monitor accessible to all menus
 	static RECT s_MainMenuLimits; // area of the main monitor accessible by the main menu
 	static DWORD s_TaskbarState; // the state of the taskbar (ABS_AUTOHIDE and ABS_ALWAYSONTOP)
--- a/Src/StartMenu/StartMenuDLL/SearchManager.cpp
+++ b/Src/StartMenu/StartMenuDLL/SearchManager.cpp
@@ -526,7 +526,7 @@ bool CSearchManager::SearchScope::ParseSearchConnector( const wchar_t *fname )
 			CComPtr<IXMLDOMNode> pNext;
 			if (pScopeItem->get_nextSibling(&pNext)!=S_OK)
 				break;
-			pScopeItem=pNext;
+			pScopeItem=std::move(pNext);
 		}
 		return true;
 	}
@@ -639,7 +639,8 @@ void CSearchManager::SearchThread( void )
 				// pinned folder
 				if (searchRequest.bPinnedFolder)
 				{
-					wchar_t path[_MAX_PATH]=START_MENU_PINNED_ROOT;
+					wchar_t path[_MAX_PATH];
+					Strcpy(path,_countof(path),GetSettingString(L"PinnedItemsPath"));
 					DoEnvironmentSubst(path,_MAX_PATH);
 					CComPtr<IShellItem> pFolder;
 					if (SUCCEEDED(SHCreateItemFromParsingName(path,NULL,IID_IShellItem,(void**)&pFolder)))
@@ -798,14 +799,14 @@ void CSearchManager::SearchThread( void )
 		CSession session;
 		if (SUCCEEDED(dataSource.OpenFromInitializationString(L"provider=Search.CollatorDSO.1;EXTENDED PROPERTIES=\"Application=Windows\"")) && SUCCEEDED(session.Open(dataSource)))
 		{
-			std::list<SearchScope> scopeList;
+			std::vector<SearchScope> scopeList;

 			if (searchRequest.bSearchMetroSettings && !m_bMetroSettingsFound)
 			{
 				scopeList.push_back(SearchScope());
 				SearchScope &scope=*scopeList.rbegin();
 				scope.bFiles=true;
-				scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Modern Settings");
+				scope.name=FindTranslation(L"Search.CategoryPCSettings",L"Settings");
 				scope.categoryHash=CATEGORY_METROSETTING;
 				scope.roots.push_back(L"FILE:");
 			}
@@ -1104,7 +1105,7 @@ void CSearchManager::SearchThread( void )
 				command0.Close();
 				continue;
 			}
-			for (std::list<SearchScope>::iterator it=scopeList.begin();it!=scopeList.end();++it)
+			for (auto it=scopeList.begin();it!=scopeList.end();++it)
 			{
 				if (it->roots.empty())
 					continue;
@@ -1122,7 +1123,7 @@ void CSearchManager::SearchThread( void )
 					else
 					{
 						len+=Strcpy(query+len,_countof(query)-len,L" AND System.Search.Store='FILE' AND System.ItemType!='.settingcontent-ms'");
-						for (std::list<SearchScope>::iterator it2=scopeList.begin();it2!=it;++it2)
+						for (auto it2=scopeList.begin();it2!=it;++it2)
 						{
 							if (it2->categoryHash==CATEGORY_METROSETTING)
 								continue;
--- a/Src/StartMenu/StartMenuDLL/SearchManager.h
+++ b/Src/StartMenu/StartMenuDLL/SearchManager.h
@@ -36,7 +36,7 @@ public:

 	struct SearchCategory
 	{
-		SearchCategory( void ) {}
+		SearchCategory( void ) = default;
 		SearchCategory( const SearchCategory &cat )
 		{
 			search.Clone(cat.search);
--- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp
+++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp
@@ -1001,7 +1001,7 @@ static const CStdCommand g_StdCommands[]={
 	{L"settings",IDS_SETTINGS_ITEM,IDS_SETTINGS_MENU_TIP,L"SettingsMenu",L"$Menu.Settings",L"",L"shell32.dll,330"},
 	{L"search",IDS_SEARCH_MENU_ITEM,IDS_SEARCH_TIP,L"SearchMenu",L"$Menu.Search",L"",L"shell32.dll,323"},
 	{L"search_box",IDS_SEARCH_BOX_ITEM,IDS_SEARCH_BOX_TIP,L"SearchBoxItem",L"$Menu.SearchBox",NULL,L"none",NULL,StdMenuItem::MENU_TRACK|StdMenuItem::MENU_OPENUP},
-	{L"help",IDS_HELP_ITEM,IDS_HELP_TIP,L"HelpItem",L"$Menu.Help",L"$Menu.HelpTip",L"shell32.dll,324"},
+	{L"help",IDS_HELP_ITEM,IDS_HELP_TIP,L"HelpItem",L"$Menu.Help",L"$Menu.HelpTip",L"imageres.dll,99"},
 	{L"run",IDS_RUN_ITEM,IDS_RUN_TIP,L"RunItem",L"$Menu.Run",L"$Menu.RunTip",L"shell32.dll,328"},
 	{L"logoff",IDS_SHUTDOWN_LOGOFF,IDS_LOGOFF_TIP,L"LogOffItem",L"$Menu.Logoff",L"$Menu.LogOffTip",L"shell32.dll,325",NULL,StdMenuItem::MENU_STYLE_CLASSIC1},
 	{L"logoff",IDS_SHUTDOWN_LOGOFF,IDS_LOGOFF_TIP,L"LogOffItem",L"$Menu.Logoff",L"$Menu.LogOffTip",L"none",NULL,StdMenuItem::MENU_STYLE_CLASSIC2},
@@ -1057,7 +1057,7 @@ L"RecentDocumentsItem.Label=$Menu.Documents\n"
 L"RecentDocumentsItem.Icon=shell32.dll,327\n"
 L"RecentDocumentsItem.Settings=ITEMS_FIRST\n"
 L"SettingsMenu.Command=settings\n"
-L"SettingsMenu.Items=ControlPanelItem, PCSettingsItem, SEPARATOR, SecurityItem, NetworkItem, PrintersItem, TaskbarSettingsItem, ProgramsFeaturesItem, SEPARATOR, MenuSettingsItem\n"
+L"SettingsMenu.Items=PCSettingsItem, ControlPanelItem, SEPARATOR, SecurityItem, NetworkItem, PrintersItem, TaskbarSettingsItem, ProgramsFeaturesItem, SEPARATOR, MenuSettingsItem\n"
 L"SettingsMenu.Label=$Menu.Settings\n"
 L"SettingsMenu.Icon=shell32.dll,330\n"
 L"SearchMenu.Command=search\n"
@@ -1068,7 +1068,7 @@ L"ComputerItem.Command=computer\n"
 L"HelpItem.Command=help\n"
 L"HelpItem.Label=$Menu.Help\n"
 L"HelpItem.Tip=$Menu.HelpTip\n"
-L"HelpItem.Icon=shell32.dll,324\n"
+L"HelpItem.Icon=imageres.dll,99\n"
 L"RunItem.Command=run\n"
 L"RunItem.Label=$Menu.Run\n"
 L"RunItem.Tip=$Menu.RunTip\n"
@@ -1183,7 +1183,7 @@ L"ShutdownItem.Icon=none\n"
 ;

 const wchar_t *g_DefaultStartMenu2=
-L"Items=COLUMN_PADDING, ProgramsMenu, AppsMenu, SearchBoxItem, COLUMN_BREAK, FavoritesItem, UserFilesItem, UserDocumentsItem, UserPicturesItem, ComputerItem, RecentDocumentsItem, SEPARATOR, ControlPanelItem, PCSettingsItem, SecurityItem, NetworkItem, PrintersItem, SEPARATOR, SearchMenu, HelpItem, RunItem, COLUMN_PADDING, SEPARATOR, ShutdownBoxItem\n"
+L"Items=COLUMN_PADDING, ProgramsMenu, AppsMenu, SearchBoxItem, COLUMN_BREAK, FavoritesItem, UserFilesItem, UserDocumentsItem, UserPicturesItem, ComputerItem, RecentDocumentsItem, SEPARATOR, PCSettingsItem, ControlPanelItem, SecurityItem, NetworkItem, PrintersItem, SEPARATOR, SearchMenu, HelpItem, RunItem, COLUMN_PADDING, SEPARATOR, ShutdownBoxItem\n"
 L"ProgramsMenu.Command=programs\n"
 L"ProgramsMenu.Label=$Menu.Programs\n"
 L"ProgramsMenu.Icon=shell32.dll,326\n"
@@ -1203,7 +1203,7 @@ L"SearchMenu.Icon=shell32.dll,323\n"
 L"HelpItem.Command=help\n"
 L"HelpItem.Label=$Menu.Help\n"
 L"HelpItem.Tip=$Menu.HelpTip\n"
-L"HelpItem.Icon=shell32.dll,324\n"
+L"HelpItem.Icon=imageres.dll,99\n"
 L"RunItem.Command=run\n"
 L"RunItem.Label=$Menu.Run\n"
 L"RunItem.Tip=$Menu.RunTip\n"
@@ -1379,9 +1379,9 @@ L"Item13.Settings=ITEM_DISABLED\n"
 L"Item14.Command=network_connections\n"
 L"Item14.Settings=ITEM_DISABLED\n"
 L"Item15.Command=separator\n"
-L"Item16.Command=control_panel\n"
+L"Item16.Command=pc_settings\n"
 L"Item16.Settings=TRACK_RECENT\n"
-L"Item17.Command=pc_settings\n"
+L"Item17.Command=control_panel\n"
 L"Item17.Settings=TRACK_RECENT\n"
 L"Item18.Command=admin\n"
 L"Item18.Settings=TRACK_RECENT|ITEM_DISABLED\n"
@@ -1742,7 +1742,7 @@ LRESULT CEditMenuDlg::OnBrowseLink( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO
 {
 	wchar_t text[_MAX_PATH];
 	GetDlgItemText(IDC_COMBOLINK,text,_countof(text));
-	if (BrowseLinkHelper(m_hWnd,text))
+	if (BrowseLinkHelper(m_hWnd,text,false))
 	{
 		SetDlgItemText(IDC_COMBOLINK,text);
 		SendMessage(WM_COMMAND,MAKEWPARAM(IDC_COMBOLINK,CBN_KILLFOCUS));
@@ -2437,7 +2437,7 @@ LRESULT CEditMenuDlg7::OnBrowseLink( WORD wNotifyCode, WORD wID, HWND hWndCtl, B
 {
 	wchar_t text[_MAX_PATH];
 	GetDlgItemText(IDC_EDITLINK2,text,_countof(text));
-	if (BrowseLinkHelper(m_hWnd,text))
+	if (BrowseLinkHelper(m_hWnd,text,false))
 	{
 		SetDlgItemText(IDC_EDITLINK2,text);
 		SendMessage(WM_COMMAND,MAKEWPARAM(IDC_EDITLINK2,EN_KILLFOCUS));
@@ -2725,8 +2725,11 @@ void CCustomMenuDlg7::CItemList::UpdateItem( int index )
 		str=LoadStringEx(IDS_ITEM_SHOW2);
 	else if ((menuItem.settings&StdMenuItem::MENU_NOEXPAND) && !(g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_FOLDER))
 		str=LoadStringEx(IDS_ITEM_SHOW);
-	else if ((menuItem.settings&StdMenuItem::MENU_SINGLE_EXPAND) && (g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_COMPUTER))
-		str=LoadStringEx(IDS_ITEM_DRIVES);
+	else if ((menuItem.settings&StdMenuItem::MENU_SINGLE_EXPAND) && !(g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_NODRIVES))
+		if (g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_COMPUTER)
+			str=LoadStringEx(IDS_ITEM_DRIVES);
+		else
+			str=LoadStringEx(IDS_ITEM_LINKS);
 	else
 		str=LoadStringEx(IDS_ITEM_MENU);
 	ListView_SetItemText(m_hWnd,index,2,(wchar_t*)(const wchar_t*)str);
@@ -3155,13 +3158,12 @@ LRESULT CCustomMenuDlg7::CItemList::OnSelEndOk( WORD wNotifyCode, WORD wID, HWND
 	if (m_Column==2)
 	{
 		// state
-		CString str;
 		menuItem.settings&=~CEditMenuDlg7::SETTINGS_MASK;
 		if (sel==0)
 			menuItem.settings|=StdMenuItem::MENU_ITEM_DISABLED;
 		else if (sel==1 && !(g_StdCommands7[menuItem.stdItemIndex].flags&(CStdCommand7::ITEM_SINGLE|CStdCommand7::ITEM_FOLDER)))
 			menuItem.settings|=StdMenuItem::MENU_NOEXPAND;
-		else if (sel==3 && (g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_COMPUTER))
+		else if (sel==3 && !(g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_NODRIVES))
 			menuItem.settings|=StdMenuItem::MENU_SINGLE_EXPAND;
 	}
 	UpdateItem(m_Line);
@@ -3308,12 +3310,17 @@ void CCustomMenuDlg7::CItemList::CreateCombo( int line, int column )
 				str=LoadStringEx(IDS_ITEM_DRIVES);
 				m_Combo.SendMessage(CB_ADDSTRING,0,(LPARAM)(const wchar_t*)str);
 			}
+			else if (!(g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_NODRIVES))
+			{
+				str=LoadStringEx(IDS_ITEM_LINKS);
+				m_Combo.SendMessage(CB_ADDSTRING,0,(LPARAM)(const wchar_t*)str);
+			}
 		}
 		if (menuItem.settings&StdMenuItem::MENU_ITEM_DISABLED)
 			m_Combo.SendMessage(CB_SETCURSEL,0);
 		else if ((g_StdCommands7[menuItem.stdItemIndex].flags&(CStdCommand7::ITEM_SINGLE|CStdCommand7::ITEM_FOLDER)) || (menuItem.settings&StdMenuItem::MENU_NOEXPAND))
 			m_Combo.SendMessage(CB_SETCURSEL,1);
-		else if ((g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_COMPUTER) && (menuItem.settings&StdMenuItem::MENU_SINGLE_EXPAND))
+		else if (!(g_StdCommands7[menuItem.stdItemIndex].flags&CStdCommand7::ITEM_NODRIVES) && (menuItem.settings&StdMenuItem::MENU_SINGLE_EXPAND))
 			m_Combo.SendMessage(CB_SETCURSEL,3);
 		else
 			m_Combo.SendMessage(CB_SETCURSEL,2);
@@ -3617,7 +3624,10 @@ void CCustomMenuDlg7::SerializeData( void )
 	stringBuilder.push_back(0);
 	CSettingsLockWrite lock;
 	m_pSetting->value=CComVariant(&stringBuilder[0]);
-	m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
+	if (m_pSetting->value==m_pSetting->defValue)
+		m_pSetting->flags|=CSetting::FLAG_DEFAULT;
+	else
+		m_pSetting->flags&=~CSetting::FLAG_DEFAULT;
 	SetSettingsDirty();
 }

@@ -3844,7 +3854,10 @@ LRESULT CMenuStyleDlg::OnClick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		CheckDlgButton(IDC_RADIO_CLASSIC,pSetting->value.intVal==MENU_CLASSIC1?BST_CHECKED:BST_UNCHECKED);
 		CheckDlgButton(IDC_RADIO_TWO_COLUMNS,pSetting->value.intVal==MENU_CLASSIC2?BST_CHECKED:BST_UNCHECKED);
 		CheckDlgButton(IDC_RADIO_WIN7,pSetting->value.intVal==MENU_WIN7?BST_CHECKED:BST_UNCHECKED);
-		pSetting->flags&=~CSetting::FLAG_DEFAULT;
+		if (pSetting->value==pSetting->defValue)
+			pSetting->flags|=CSetting::FLAG_DEFAULT;
+		else
+			pSetting->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsDirty();

 		SetSettingsStyle(styleFlag,CSetting::FLAG_MENU_MASK);
@@ -3862,7 +3875,10 @@ LRESULT CMenuStyleDlg::OnEnabled( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
 		CSettingsLockWrite lock;
 		CSetting *pSetting=FindSetting(L"EnableStartButton");
 		pSetting->value=CComVariant(bEnabled);
-		pSetting->flags&=~CSetting::FLAG_DEFAULT;
+		if (pSetting->value==pSetting->defValue)
+			pSetting->flags|=CSetting::FLAG_DEFAULT;
+		else
+			pSetting->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsDirty();
 	}
 	Update(false);
@@ -3901,7 +3917,10 @@ LRESULT CMenuStyleDlg::OnButtonStyle( WORD wNotifyCode, WORD wID, HWND hWndCtl,
 		CSettingsLockWrite lock;
 		CSetting *pSetting=FindSetting(L"StartButtonType");
 		pSetting->value=CComVariant(style);
-		pSetting->flags&=~CSetting::FLAG_DEFAULT;
+		if (pSetting->value==pSetting->defValue)
+			pSetting->flags|=CSetting::FLAG_DEFAULT;
+		else
+			pSetting->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsDirty();
 	}
 	Update(false);
@@ -3925,7 +3944,10 @@ LRESULT CMenuStyleDlg::OnPick( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& b
 			CSettingsLockWrite lock;
 			CSetting *pSetting=FindSetting(L"StartButtonPath");
 			pSetting->value=CComVariant(path);
-			pSetting->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSetting->value==pSetting->defValue)
+				pSetting->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSetting->flags&=~CSetting::FLAG_DEFAULT;
 			SetSettingsDirty();
 		}
 		Update(true);
@@ -4140,38 +4162,50 @@ CSetting g_Settings[]={
 		{L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP},
 		{L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP},
 		{L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP},
+		{L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP},
 		{L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP,0,CSetting::FLAG_HIDDEN},
+	{L"MouseClickCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"%userprofile%",0,L"MouseClick=3",L"Command"},
 	{L"ShiftClick",CSetting::TYPE_INT,IDS_SHIFT_LCLICK,IDS_SHIFT_LCLICK_TIP,2,CSetting::FLAG_BASIC},
 		{L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP},
 		{L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP},
 		{L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP},
+		{L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP},
 		{L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP,0,CSetting::FLAG_HIDDEN},
 /*		{L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP,0,CSetting::FLAG_HIDDEN},
 		{L"Cortana",CSetting::TYPE_RADIO,IDS_OPEN_CORTANA,IDS_OPEN_CORTANA_TIP},*/
+	{L"ShiftClickCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"%systemdrive%",0,L"ShiftClick=3",L"Command"},
 	{L"WinKey",CSetting::TYPE_INT,IDS_WIN_KEY,IDS_WIN_KEY_TIP,1,CSetting::FLAG_BASIC},
 		{L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP},
 		{L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP},
 		{L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP},
+		{L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP},
 		{L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP},
 		{L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP},
+	{L"WinKeyCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"cmd",0,L"WinKey=3",L"Command"},
 	{L"ShiftWin",CSetting::TYPE_INT,IDS_SHIFT_WIN,IDS_SHIFT_WIN_TIP,2,CSetting::FLAG_BASIC},
 		{L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP},
 		{L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP},
 		{L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP},
+		{L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP},
 		{L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP},
 /*		{L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP,0,CSetting::FLAG_HIDDEN},
 		{L"Cortana",CSetting::TYPE_RADIO,IDS_OPEN_CORTANA,IDS_OPEN_CORTANA_TIP},*/
+	{L"ShiftWinCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"powershell",0,L"ShiftWin=3",L"Command"},
 	{L"MiddleClick",CSetting::TYPE_INT,IDS_MCLICK,IDS_MCLICK_TIP,0},
 		{L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP},
 		{L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP},
 		{L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP},
+		{L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP},
 /*		{L"Both",CSetting::TYPE_RADIO,IDS_OPEN_BOTH,IDS_OPEN_BOTH_TIP,0,CSetting::FLAG_HIDDEN},
 		{L"Desktop",CSetting::TYPE_RADIO,IDS_OPEN_DESKTOP,IDS_OPEN_DESKTOP_TIP,0,CSetting::FLAG_HIDDEN},
 		{L"Cortana",CSetting::TYPE_RADIO,IDS_OPEN_CORTANA,IDS_OPEN_CORTANA_TIP},*/
+	{L"MiddleClickCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"taskmgr",0,L"MiddleClick=3",L"Command"},
 	{L"Hover",CSetting::TYPE_INT,IDS_HOVER,IDS_HOVER_TIP,0},
 		{L"Nothing",CSetting::TYPE_RADIO,IDS_OPEN_NOTHING,IDS_OPEN_NOTHING_TIP},
 		{L"ClassicMenu",CSetting::TYPE_RADIO,IDS_OPEN_CSM,IDS_OPEN_CSM_TIP},
 		{L"WindowsMenu",CSetting::TYPE_RADIO,IDS_OPEN_WSM,IDS_OPEN_WSM_TIP},
+		{L"Command",CSetting::TYPE_RADIO,IDS_OPEN_CMD,IDS_OPEN_CMD_TIP},
+	{L"HoverCommand",CSetting::TYPE_STRING,IDS_OPEN_CMD_TEXT,IDS_OPEN_CMD_TEXT_TIP,"",0,L"Hover=3",L"Command"},
 	{L"StartHoverDelay",CSetting::TYPE_INT,IDS_HOVER_DELAY,IDS_HOVER_DELAY_TIP,1000,0,L"Hover",L"Hover"},
 	{L"ShiftRight",CSetting::TYPE_BOOL,IDS_RIGHT_SHIFT,IDS_RIGHT_SHIFT_TIP,0},
 	{L"CSMHotkey",CSetting::TYPE_HOTKEY,IDS_CSM_HOTKEY,IDS_CSM_HOTKEY_TIP,0},
@@ -4246,6 +4280,7 @@ CSetting g_Settings[]={
 	{L"PinnedPrograms",CSetting::TYPE_INT,IDS_PINNED_PROGRAMS,IDS_PINNED_PROGRAMS_TIP,PINNED_PROGRAMS_PINNED},
 		{L"FastItems",CSetting::TYPE_RADIO,IDS_FAST_ITEMS,IDS_FAST_ITEMS_TIP},
 		{L"PinnedItems",CSetting::TYPE_RADIO,IDS_PINNED_ITEMS,IDS_PINNED_ITEMS_TIP},
+	{L"PinnedItemsPath",CSetting::TYPE_DIRECTORY,IDS_PINNED_PATH,IDS_PINNED_PATH_TIP,L"%APPDATA%\\OpenShell\\Pinned",0,L"PinnedPrograms=1",L"PinnedItems"},
 	{L"RecentPrograms",CSetting::TYPE_INT,IDS_RECENT_PROGRAMS,IDS_RECENT_PROGRAMS_TIP,RECENT_PROGRAMS_RECENT,CSetting::FLAG_BASIC},
 		{L"None",CSetting::TYPE_RADIO,IDS_NO_RECENT,IDS_NO_RECENT_TIP},
 		{L"Recent",CSetting::TYPE_RADIO,IDS_SHOW_RECENT,IDS_SHOW_RECENT_TIP},
@@ -4314,11 +4349,14 @@ CSetting g_Settings[]={
 	{L"UserNameCommand",CSetting::TYPE_STRING,IDS_NAME_COMMAND,IDS_NAME_COMMAND_TIP,L"control nusrmgr.cpl"},
 	{L"SearchFilesCommand",CSetting::TYPE_STRING,IDS_SEARCH_COMMAND,IDS_SEARCH_COMMAND_TIP,L"search-ms:",CSetting::FLAG_MENU_CLASSIC_BOTH},
 	{L"ExpandFolderLinks",CSetting::TYPE_BOOL,IDS_EXPAND_LINKS,IDS_EXPAND_LINKS_TIP,1},
+	{L"SingleClickFolders",CSetting::TYPE_BOOL,IDS_NO_DBLCLICK,IDS_NO_DBLCLICK_TIP,0},
+	{L"OpenTruePath",CSetting::TYPE_BOOL,IDS_OPEN_TRUE_PATH,IDS_OPEN_TRUE_PATH_TIP,1},
 	{L"EnableTouch",CSetting::TYPE_BOOL,IDS_ENABLE_TOUCH,IDS_ENABLE_TOUCH_TIP,1},
 	{L"EnableAccessibility",CSetting::TYPE_BOOL,IDS_ACCESSIBILITY,IDS_ACCESSIBILITY_TIP,1},
 	{L"ShowNextToTaskbar",CSetting::TYPE_BOOL,IDS_NEXTTASKBAR,IDS_NEXTTASKBAR_TIP,0},
 	{L"PreCacheIcons",CSetting::TYPE_BOOL,IDS_CACHE_ICONS,IDS_CACHE_ICONS_TIP,1,CSetting::FLAG_COLD},
 	{L"DelayIcons",CSetting::TYPE_BOOL,IDS_DELAY_ICONS,IDS_DELAY_ICONS_TIP,1,CSetting::FLAG_COLD},
+	{L"BoldSettings",CSetting::TYPE_BOOL,IDS_BOLD_SETTINGS,IDS_BOLD_SETTINGS_TIP,1},
 	{L"ReportSkinErrors",CSetting::TYPE_BOOL,IDS_SKIN_ERRORS,IDS_SKIN_ERRORS_TIP,0},

 {L"SearchBoxSettings",CSetting::TYPE_GROUP,IDS_SEARCH_BOX},
@@ -4327,6 +4365,8 @@ CSetting g_Settings[]={
 		{L"Normal",CSetting::TYPE_RADIO,IDS_SEARCH_BOX_SHOW,IDS_SEARCH_BOX_SHOW_TIP},
 		{L"Tab",CSetting::TYPE_RADIO,IDS_SEARCH_BOX_TAB,IDS_SEARCH_BOX_TAB_TIP},
 	{L"SearchSelect",CSetting::TYPE_BOOL,IDS_SEARCH_BOX_SEL,IDS_SEARCH_BOX_SEL_TIP,1,0,L"SearchBox=1",L"Normal"},
+	{L"SearchHint",CSetting::TYPE_BOOL,IDS_SEARCH_HINT,IDS_SEARCH_HINT_TIP,0,0,L"SearchBox"},
+		{L"SearchHintText",CSetting::TYPE_STRING,IDS_NEW_SEARCH_HINT,IDS_NEW_SEARCH_HINT_TIP,L"",0,L"#SearchHint",L"SearchHint"},
 	{L"SearchTrack",CSetting::TYPE_BOOL,IDS_SEARCH_TRACK,IDS_SEARCH_TRACK_TIP,1,0,L"SearchBox"},
 	{L"SearchResults",CSetting::TYPE_INT,IDS_SEARCH_MAX2,IDS_SEARCH_MAX_TIP2,5,CSetting::FLAG_MENU_CLASSIC_BOTH,L"SearchBox"},
 	{L"SearchResultsMax",CSetting::TYPE_INT,IDS_SEARCH_MAX3,IDS_SEARCH_MAX_TIP3,20,CSetting::FLAG_MENU_CLASSIC_BOTH,L"SearchBox"},
@@ -4341,6 +4381,7 @@ CSetting g_Settings[]={
 		{L"SearchContents",CSetting::TYPE_BOOL,IDS_SEARCH_CONTENTS,IDS_SEARCH_CONTENTS_TIP,1,0,L"#SearchFiles",L"SearchFiles"},
 		{L"SearchCategories",CSetting::TYPE_BOOL,IDS_SEARCH_CATEGORIES,IDS_SEARCH_CATEGORIES_TIP,1,0,L"#SearchFiles",L"SearchFiles"},
 	{L"SearchInternet",CSetting::TYPE_BOOL,IDS_SEARCH_INTERNET,IDS_SEARCH_INTERNET_TIP,1,0,L"SearchBox"},
+	{L"MoreResults",CSetting::TYPE_BOOL,IDS_MORE_RESULTS,IDS_MORE_RESULTS_TIP,1,0,L"SearchBox"},

 {L"Look",CSetting::TYPE_GROUP,IDS_LOOK_SETTINGS},
 	{L"SmallIconSize",CSetting::TYPE_INT,IDS_SMALL_SIZE_SM,IDS_SMALL_SIZE_SM_TIP,-1,CSetting::FLAG_COLD}, // 16 for DPI<=96, 20 for DPI<=120, 24 otherwise
@@ -4348,6 +4389,9 @@ CSetting g_Settings[]={
 	{L"InvertMetroIcons",CSetting::TYPE_BOOL,IDS_INVERT_ICONS,IDS_INVERT_ICONS_TIP,0},
 	{L"MaxMainMenuWidth",CSetting::TYPE_INT,IDS_MENU_WIDTH,IDS_MENU_WIDTH_TIP,60,CSetting::FLAG_MENU_CLASSIC_BOTH},
 	{L"MaxMenuWidth",CSetting::TYPE_INT,IDS_SUBMENU_WIDTH,IDS_SUBMENU_WIDTH_TIP,60},
+	{L"AlignToWorkArea",CSetting::TYPE_BOOL,IDS_ALIGN_WORK_AREA,IDS_ALIGN_WORK_AREA_TIP,0},
+	{L"HorizontalMenuOffset",CSetting::TYPE_INT,IDS_HOR_OFFSET,IDS_HOR_OFFSET_TIP,0},
+	{L"VerticalMenuOffset",CSetting::TYPE_INT,IDS_VERT_OFFSET,IDS_VERT_OFFSET_TIP,0 },
 	{L"OverrideDPI",CSetting::TYPE_INT,IDS_DPI_OVERRIDE,IDS_DPI_OVERRIDE_TIP,0,CSetting::FLAG_COLD},
 	{L"MainMenuAnimate",CSetting::TYPE_BOOL,IDS_ANIMATION7,IDS_ANIMATION7_TIP,1,CSetting::FLAG_MENU_WIN7},
 	{L"MainMenuAnimation",CSetting::TYPE_INT,IDS_ANIMATION,IDS_ANIMATION_TIP,-1}, // system animation type
@@ -4413,7 +4457,7 @@ CSetting g_Settings[]={
 	{L"StartButtonIconSize",CSetting::TYPE_INT,IDS_BUTTON_ICON_SIZE,IDS_BUTTON_ICON_SIZE_TIP,0,0,L"#StartButtonType=1",L"ClasicButton"},
 	{L"StartButtonText",CSetting::TYPE_STRING,IDS_BUTTON_TEXT,IDS_BUTTON_TEXT_TIP,L"$Menu.Start",0,L"#StartButtonType=1",L"ClasicButton"},

-{L"Taskbar",CSetting::TYPE_GROUP,IDS_TASKBAR_SETTINGS},
+{L"Taskbar",CSetting::TYPE_GROUP,IDS_TASKBAR_SETTINGS,0,0,CSetting::FLAG_BASIC},
 	{L"CustomTaskbar",CSetting::TYPE_BOOL,IDS_TASK_CUSTOM,IDS_TASK_CUSTOM_TIP,0,CSetting::FLAG_CALLBACK},
 	{L"TaskbarLook",CSetting::TYPE_INT,IDS_TASK_LOOK,IDS_TASK_LOOK_TIP,1,CSetting::FLAG_CALLBACK,L"CustomTaskbar",L"CustomTaskbar"},
 		{L"Opaque",CSetting::TYPE_RADIO,IDS_TASK_OPAQUE,IDS_TASK_OPAQUE_TIP},
@@ -4422,8 +4466,8 @@ CSetting g_Settings[]={
 		{L"AeroGlass",CSetting::TYPE_RADIO,IDS_TASK_AEROGLASS,IDS_TASK_AEROGLASS_TIP,0,CSetting::FLAG_HIDDEN},
 	{L"TaskbarOpacity",CSetting::TYPE_INT,IDS_TASK_OPACITY,IDS_TASK_OPACITY_TIP,DEFAULT_TASK_OPACITY10,CSetting::FLAG_CALLBACK,L"TaskbarLook",L"CustomTaskbar"},
 	{L"TaskbarColor",CSetting::TYPE_COLOR,IDS_TASK_COLOR,IDS_TASK_COLOR_TIP,0,CSetting::FLAG_CALLBACK,L"CustomTaskbar",L"CustomTaskbar"},
-	{L"TaskbarTextColor",CSetting::TYPE_COLOR,IDS_TASK_TEXTCOLOR,IDS_TASK_TEXTCOLOR_TIP,0xFFFFFF,CSetting::FLAG_CALLBACK|(1<<24),L"CustomTaskbar",L"CustomTaskbar"},
-	{L"TaskbarTexture",CSetting::TYPE_BITMAP_JPG,IDS_TASK_TEXTURE,IDS_TASK_TEXTURE_TIP,L"",CSetting::FLAG_CALLBACK,L"CustomTaskbar",L"CustomTaskbar"},
+	{L"TaskbarTextColor",CSetting::TYPE_COLOR,IDS_TASK_TEXTCOLOR,IDS_TASK_TEXTCOLOR_TIP,0xFFFFFF,CSetting::FLAG_COLD|(1<<24),L"CustomTaskbar",L"CustomTaskbar"},
+	{L"TaskbarTexture",CSetting::TYPE_BITMAP_JPG,IDS_TASK_TEXTURE,IDS_TASK_TEXTURE_TIP,L"",CSetting::FLAG_COLD,L"CustomTaskbar",L"CustomTaskbar"},
 	{L"TaskbarTileH",CSetting::TYPE_INT,IDS_TASK_STRETCHH,IDS_TASK_STRETCHH_TIP,1,CSetting::FLAG_CALLBACK,L"#TaskbarTexture",L"TaskbarTexture"},
 		{L"Tile",CSetting::TYPE_RADIO,IDS_TASK_TILE,IDS_TASK_TILE_TIP},
 		{L"Stretch",CSetting::TYPE_RADIO,IDS_TASK_STRETCH,IDS_TASK_STRETCH_TIP},
@@ -4542,7 +4586,10 @@ void UpgradeSettings( bool bShared )
 		items.Replace(L"Command=recent_items\n",L"Command=recent_programs\n");
 		items.Replace(L"Command=control_panel_categories\n",L"Command=control_panel\n");
 		pSettingItems->value=items;
-		pSettingItems->flags&=~CSetting::FLAG_DEFAULT;
+		if (pSettingItems->value==pSettingItems->defValue)
+			pSettingItems->flags|=CSetting::FLAG_DEFAULT;
+		else
+			pSettingItems->flags&=~CSetting::FLAG_DEFAULT;
 	}

 	// set initial menu style
@@ -4550,7 +4597,10 @@ void UpgradeSettings( bool bShared )
 	if (!pSettingStyle->IsLocked())
 	{
 		pSettingStyle->value=(bTwoColumns?1:0);
-		pSettingStyle->flags&=~CSetting::FLAG_DEFAULT;
+		if (pSettingStyle->value==pSettingStyle->defValue)
+			pSettingStyle->flags|=CSetting::FLAG_DEFAULT;
+		else
+			pSettingStyle->flags&=~CSetting::FLAG_DEFAULT;
 		SetSettingsStyle(bTwoColumns?CSetting::FLAG_MENU_CLASSIC2:CSetting::FLAG_MENU_CLASSIC1,CSetting::FLAG_MENU_MASK);
 	}

@@ -4562,7 +4612,10 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingSkin->value=pSetting->value;
-			pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSettingSkin->value==pSettingSkin->defValue)
+				pSettingSkin->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
 	CSetting *pSettingOpt=FindSetting(bTwoColumns?L"SkinOptionsC2":L"SkinOptionsC1");
@@ -4572,7 +4625,10 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingOpt->value=pSetting->value;
-			pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSettingOpt->value==pSettingOpt->defValue)
+				pSettingOpt->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
 	CSetting *pSettingVar=FindSetting(bTwoColumns?L"SkinVariationC2":L"SkinVariationC1");
@@ -4582,7 +4638,10 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingVar->value=pSetting->value;
-			pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSettingVar->value==pSettingVar->defValue)
+				pSettingVar->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}

@@ -4594,7 +4653,10 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingSkin->value=pSetting->value;
-			pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSettingSkin->value==pSettingSkin->defValue)
+				pSettingSkin->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSettingSkin->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
 	pSettingOpt=FindSetting(L"SkinOptionsA");
@@ -4604,7 +4666,10 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingOpt->value=pSetting->value;
-			pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSettingOpt->value==pSettingOpt->defValue)
+				pSettingOpt->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSettingOpt->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
 	pSettingVar=FindSetting(L"SkinVariationA");
@@ -4614,7 +4679,10 @@ void UpgradeSettings( bool bShared )
 		if (!pSetting->IsDefault())
 		{
 			pSettingVar->value=pSetting->value;
-			pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
+			if (pSettingVar->value==pSettingVar->defValue)
+				pSettingVar->flags|=CSetting::FLAG_DEFAULT;
+			else
+				pSettingVar->flags&=~CSetting::FLAG_DEFAULT;
 		}
 	}
 }
@@ -4656,11 +4724,19 @@ void UpdateSettings( void )
 	else if (dpi<96) dpi=96;
 	else if (dpi>480) dpi=480;

-	int iconSize=24;
-	if (dpi<=96)
-		iconSize=16;
-	else if (dpi<=120)
-		iconSize=20;
+	int iconSize=16;
+	if (dpi>=240)
+		iconSize=40;	// for 250% scaling
+	else if (dpi>=216)
+		iconSize=36;	// for 225% scaling
+	else if (dpi>=192)
+		iconSize=32;	// for 200% scaling
+	else if (dpi>=168)
+		iconSize=28;	// for 175% scaling
+	else if (dpi>=144)
+		iconSize=24;	// for 150% scaling
+	else if (dpi>=120)
+		iconSize=20;	// for 125% scaling
 	UpdateSetting(L"SmallIconSize",CComVariant(iconSize),false);
 	UpdateSetting(L"LargeIconSize",CComVariant(iconSize*2),false);

--- a/Src/StartMenu/StartMenuDLL/SkinManager.cpp
+++ b/Src/StartMenu/StartMenuDLL/SkinManager.cpp
@@ -1778,7 +1778,7 @@ bool MenuSkin::LoadSkin( HMODULE hMod, const wchar_t *variation, const wchar_t *
 				var.label=token;
 				if (var.labelEn.IsEmpty())
 					var.labelEn=var.label;
-				Variations.push_back(std::pair<int,Variation>(res,var));
+				Variations.emplace_back(res,var);
 				LOG_MENU(LOG_OPEN,L"Variation found: name=%s, id=%d",token,res);
 			}
 			else
--- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
+++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
@@ -79,6 +79,7 @@ enum
 	OPEN_NOTHING,
 	OPEN_CLASSIC,
 	OPEN_WINDOWS,
+	OPEN_CUSTOM,
 	OPEN_BOTH,
 	OPEN_DESKTOP,
 	OPEN_CORTANA,
@@ -2790,6 +2791,9 @@ static void OpenCortana( void )

 static void InitStartMenuDLL( void )
 {
+	LogToFile(STARTUP_LOG, L"StartMenu DLL: InitStartMenuDLL");
+	WaitDllInitThread();
+
 	InitializeIatHooks();
 	if (IsWin81Update1())
 	{
@@ -2817,39 +2821,40 @@ static void InitStartMenuDLL( void )
 		}
 	}

-	if (GetWinVersion()>=WIN_VER_WIN10)
+	if (GetSettingBool(L"CustomTaskbar"))
 	{
-		HMODULE shlwapi=GetModuleHandle(L"shlwapi.dll");
-		if (shlwapi)
+		if (GetWinVersion()>=WIN_VER_WIN10)
 		{
-			g_SHFillRectClr=(tSHFillRectClr)GetProcAddress(shlwapi,MAKEINTRESOURCEA(197));
-			if (g_SHFillRectClr)
+			HMODULE shlwapi=GetModuleHandle(L"shlwapi.dll");
+			if (shlwapi)
 			{
-				g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"shlwapi.dll",MAKEINTRESOURCEA(197),SHFillRectClr2);
-				if (!g_SHFillRectClrHook)
-					g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"api-ms-win-shlwapi-winrt-storage-l1-1-1.dll",MAKEINTRESOURCEA(197),SHFillRectClr2);
+				g_SHFillRectClr=(tSHFillRectClr)GetProcAddress(shlwapi,MAKEINTRESOURCEA(197));
+				if (g_SHFillRectClr)
+				{
+					g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"shlwapi.dll",MAKEINTRESOURCEA(197),SHFillRectClr2);
+					if (!g_SHFillRectClrHook)
+						g_SHFillRectClrHook=SetIatHook(GetModuleHandle(NULL),"api-ms-win-shlwapi-winrt-storage-l1-1-1.dll",MAKEINTRESOURCEA(197),SHFillRectClr2);
+				}
 			}
+			g_StretchDIBitsHook=SetIatHook(GetModuleHandle(NULL),"gdi32.dll","StretchDIBits",StretchDIBits2);
 		}
-		g_StretchDIBitsHook=SetIatHook(GetModuleHandle(NULL),"gdi32.dll","StretchDIBits",StretchDIBits2);
-	}

-	{
-		HWND dlg=CreateWindow(L"#32770",L"",WS_POPUP,0,0,0,0,NULL,0,0,0);
-		HWND toolbar=CreateWindow(TOOLBARCLASSNAME,L"",WS_CHILD|TBS_TOOLTIPS,0,0,0,0,dlg,0,0,0);
-		DestroyWindow(dlg);
-	}
+		{
+			HWND dlg=CreateWindow(L"#32770",L"",WS_POPUP,0,0,0,0,NULL,0,0,0);
+			HWND toolbar=CreateWindow(TOOLBARCLASSNAME,L"",WS_CHILD|TBS_TOOLTIPS,0,0,0,0,dlg,0,0,0);
+			DestroyWindow(dlg);
+		}

-	if (GetWinVersion()<=WIN_VER_WIN81)
-		g_DrawThemeBackgroundHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeBackground",DrawThemeBackground2);
-	g_DrawThemeTextHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeText",DrawThemeText2);
-	g_DrawThemeTextExHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeTextEx",DrawThemeTextEx2);
-	g_DrawThemeTextCtlHook=SetIatHook(GetModuleHandle(L"comctl32.dll"),"uxtheme.dll","DrawThemeText",DrawThemeText2);
-	if (GetWinVersion()>=WIN_VER_WIN10)
-		g_SetWindowCompositionAttributeHook=SetIatHook(GetModuleHandle(NULL),"user32.dll","SetWindowCompositionAttribute",SetWindowCompositionAttribute2);
+		if (GetWinVersion()<=WIN_VER_WIN81)
+			g_DrawThemeBackgroundHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeBackground",DrawThemeBackground2);
+		g_DrawThemeTextHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeText",DrawThemeText2);
+		g_DrawThemeTextExHook=SetIatHook(GetModuleHandle(NULL),"uxtheme.dll","DrawThemeTextEx",DrawThemeTextEx2);
+		g_DrawThemeTextCtlHook=SetIatHook(GetModuleHandle(L"comctl32.dll"),"uxtheme.dll","DrawThemeText",DrawThemeText2);
+		if (GetWinVersion()>=WIN_VER_WIN10)
+			g_SetWindowCompositionAttributeHook=SetIatHook(GetModuleHandle(NULL),"user32.dll","SetWindowCompositionAttribute",SetWindowCompositionAttribute2);
+	}

 	g_TaskbarThreadId=GetCurrentThreadId();
-	LogToFile(STARTUP_LOG,L"StartMenu DLL: InitStartMenuDLL");
-	WaitDllInitThread();
 	g_bTrimHooks=GetWinVersion()==WIN_VER_WIN7 && (GetSettingInt(L"CompatibilityFixes")&COMPATIBILITY_TRIM_HOOKS);
 	InitManagers(false);
 	int level=GetSettingInt(L"CrashDump");
@@ -3344,6 +3349,16 @@ static LRESULT CALLBACK HookProgManThread( int code, WPARAM wParam, LPARAM lPara
 					msg->message=WM_NULL;
 					if (control==OPEN_CLASSIC)
 						PostMessage(g_TaskBar,g_StartMenuMsg,MSG_TOGGLE,0);
+					else if (control==OPEN_CUSTOM)
+					{
+						CString commandText=GetSettingString(L"WinKeyCommand");
+						if (!commandText.IsEmpty())
+						{
+							wchar_t expandedCommand[_MAX_PATH]{};
+							::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand));
+							ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL);
+						}
+					}
 				}
 			}
 		}
@@ -3427,6 +3442,16 @@ if (!g_bTrimHooks)
 						PostMessage(g_ProgWin,WM_SYSCOMMAND,SC_TASKLIST,'WSMK');
 					else if (control==OPEN_CORTANA)
 						OpenCortana();
+					else if (control==OPEN_CUSTOM)
+					{
+						CString commandText=GetSettingString(L"ShiftWinCommand");
+						if (!commandText.IsEmpty())
+						{
+							wchar_t expandedCommand[_MAX_PATH]{};
+							::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand));
+							ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL);
+						}
+					}
 				}
 				else if (msg->wParam==MSG_DRAG || msg->wParam==MSG_SHIFTDRAG)
 				{
@@ -3586,12 +3611,22 @@ if (!g_bTrimHooks)
 				// left or middle click on start button
 				FindWindowsMenu();
 				const wchar_t *name;
+				const wchar_t *command;
 				if (bMiddle)
+				{
 					name=L"MiddleClick";
+					command=L"MiddleClickCommand";
+				}
 				else if (GetKeyState(VK_SHIFT)<0)
+				{
 					name=L"ShiftClick";
+					command=L"ShiftClickCommand";
+				}
 				else
+				{
 					name=L"MouseClick";
+					command=L"MouseClickCommand";
+				}

 				int control=GetSettingInt(name);
 				if (control==OPEN_BOTH && GetWinVersion()>=WIN_VER_WIN10)
@@ -3607,6 +3642,16 @@ if (!g_bTrimHooks)
 					PostMessage(g_ProgWin,WM_SYSCOMMAND,SC_TASKLIST,'WSMM');
 				else if (control==OPEN_CORTANA)
 					OpenCortana();
+				else if (control==OPEN_CUSTOM)
+				{
+					CString commandText=GetSettingString(command);
+					if (!commandText.IsEmpty())
+					{
+						wchar_t expandedCommand[_MAX_PATH]{};
+						::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand));
+						ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL);
+					}
+				}
 				msg->message=WM_NULL;
 			}
 		}
@@ -3747,6 +3792,16 @@ if (!g_bTrimHooks)
 							FindWindowsMenu();
 							PostMessage(g_ProgWin,WM_SYSCOMMAND,SC_TASKLIST,'WSMM');
 						}
+						else if (control==OPEN_CUSTOM)
+						{
+							CString commandText=GetSettingString(L"HoverCommand");
+							if (!commandText.IsEmpty())
+							{
+								wchar_t expandedCommand[_MAX_PATH]{};
+								::ExpandEnvironmentStrings(commandText, expandedCommand, _countof(expandedCommand));
+								ShellExecute(NULL,NULL,expandedCommand,NULL,NULL,SW_SHOWNORMAL);
+							}
+						}
 					}
 				}
 				taskBar->bTimer=false;
@@ -3756,7 +3811,6 @@ if (!g_bTrimHooks)
 		// context menu
 		if (msg->message==WM_NCRBUTTONUP || msg->message==WM_RBUTTONUP)
 		{
-			CPoint pt0(GetMessagePos());
 			TaskbarInfo *taskBar=FindTaskBarInfoButton(msg->hwnd);
 			DWORD winVer=GetWinVersion();
 			if (!taskBar && winVer>=WIN_VER_WIN8)
@@ -3767,6 +3821,7 @@ if (!g_bTrimHooks)
 			}
 			if (taskBar)
 			{
+				CPoint pt0(GetMessagePos());
 				if (msg->message==WM_RBUTTONUP && msg->hwnd==taskBar->startButton && msg->lParam==MAKELPARAM(-1,-1))
 				{
 					RECT rc;
@@ -3801,6 +3856,7 @@ if (!g_bTrimHooks)
 						CMD_OPEN,
 						CMD_OPEN_ALL,
 						CMD_EXPLORER,
+						CMD_OPEN_PINNED,
 					};

 					// right-click on the start button - open the context menu (Settings, Help, Exit)
@@ -3821,6 +3877,8 @@ if (!g_bTrimHooks)
 						AppendMenu(menu,MF_STRING,CMD_OPEN,FindTranslation(L"Menu.Open",L"&Open"));
 						if (!SHRestricted(REST_NOCOMMONGROUPS))
 							AppendMenu(menu,MF_STRING,CMD_OPEN_ALL,FindTranslation(L"Menu.OpenAll",L"O&pen All Users"));
+						if (GetSettingInt(L"PinnedPrograms")==PINNED_PROGRAMS_PINNED)
+							AppendMenu(menu,MF_STRING,CMD_OPEN_PINNED,FindTranslation(L"Menu.OpenPinned",L"O&pen Pinned"));
 						AppendMenu(menu,MF_SEPARATOR,0,0);
 					}
 					if (GetSettingBool(L"EnableSettings"))
@@ -3867,6 +3925,16 @@ if (!g_bTrimHooks)
 							if (SUCCEEDED(ShGetKnownFolderPath((res==CMD_OPEN)?FOLDERID_StartMenu:FOLDERID_CommonStartMenu,&pPath)))
 								ShellExecute(NULL,L"open",pPath,NULL,NULL,SW_SHOWNORMAL);
 						}
+						if (res==CMD_OPEN_PINNED) // open pinned folder
+						{
+							SHELLEXECUTEINFO execute={sizeof(execute)};
+							CString path=GetSettingString(L"PinnedItemsPath");
+							execute.lpVerb=L"open";
+							execute.lpFile=path;
+							execute.nShow=SW_SHOWNORMAL;
+							execute.fMask=SEE_MASK_DOENVSUBST;
+							ShellExecuteEx(&execute);
+						}
 						if (res==CMD_EXPLORER)
 						{
 							CString path=GetSettingString(L"ExplorerPath");
--- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc
+++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.rc
@@ -644,6 +644,12 @@ BEGIN
    IDS_PIC_COMMAND_TIP     "Enter the command you want to run when you click on the user picture"
    IDS_NAME_COMMAND        "User name command"
    IDS_NAME_COMMAND_TIP    "Enter the command you want to run when you click on the user name"
+    IDS_ALIGN_WORK_AREA     "Align start menu to working area"
+    IDS_ALIGN_WORK_AREA_TIP "Align the start menu to the working area instead of to the taskbar. Use with custom taskbars"
+    IDS_HOR_OFFSET          "Horizontal position offset"
+    IDS_HOR_OFFSET_TIP      "Offset the start menu horizontally by the amount of pixels specified"
+    IDS_VERT_OFFSET         "Vertical position offset"
+    IDS_VERT_OFFSET_TIP     "Offset the start menu vertically by the amount of pixels specified"
    IDS_SMALL_SIZE_SM       "Small icon size"
    IDS_SMALL_SIZE_SM_TIP   "Set the small icon size. The default is 16 for DPI<=96, 20 for 96<DPI<=120 and 24 for DPI>120"
    IDS_LARGE_SIZE_SM       "Large icon size"
@@ -1038,7 +1044,7 @@ BEGIN
    IDS_FOLDERS_FIRST       "Show folders first"
    IDS_FOLDERS_FIRST_TIP   "When this is checked, the All Programs tree will show the folders first and the programs last"
    IDS_PINNED_PROGRAMS     "Pinned Programs folder"
-    IDS_PINNED_PROGRAMS_TIP "Select the location to store the pinned programs"
+    IDS_PINNED_PROGRAMS_TIP "Select the location to store pinned programs. After updating this setting, close this window in order to pin items through the context menu again"
    IDS_FAST_ITEMS          "Use Start Menu folder"
 END

@@ -1154,21 +1160,21 @@ END

 STRINGTABLE 
 BEGIN
-    IDS_STRING7100          "This is the default skin when no other skin is selected or if the selected skin fails to load.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7101          "Windows Aero skin\n\nDefault skin to use for the Windows Aero theme.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7102          "Windows Basic skin\n\nDefault skin to use for the Windows Basic theme.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7103          "Classic skin\n\nClassic look with large or small icons.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7100          "This is the default skin when no other skin is selected or if the selected skin fails to load.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7101          "Windows Aero skin\n\nDefault skin to use for the Windows Aero theme.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7102          "Windows Basic skin\n\nDefault skin to use for the Windows Basic theme.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7103          "Classic skin\n\nClassic look with large or small icons.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
 END

 STRINGTABLE 
 BEGIN
-    IDS_STRING7104          "Full Glass skin\n\nTransparent menu with large or small icons.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7105          "Smoked Glass skin\n\nSimple transparent menu with dark background.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7106          "Windows XP Luna skin\n\nA start menu similar to the one in Windows XP.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7107          "Windows 8 skin\n\nDefault skin to use for Windows 8.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7108          "Midnight skin\n\nSkin with dark background.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7109          "Metro skin\n\nSkin that uses the start screen colors.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
-    IDS_STRING7110          "Metallic skin\n\nA start menu skin with metallic look.\n\nPart of <A HREF=""http://www.classicshell.net/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7104          "Full Glass skin\n\nTransparent menu with large or small icons.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7105          "Smoked Glass skin\n\nSimple transparent menu with dark background.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7106          "Windows XP Luna skin\n\nA start menu similar to the one in Windows XP.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7107          "Windows 8 skin\n\nDefault skin to use for Windows 8.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7108          "Midnight skin\n\nSkin with dark background.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7109          "Metro skin\n\nSkin that uses the start screen colors.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+    IDS_STRING7110          "Metallic skin\n\nA start menu skin with metallic look.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
 END

 STRINGTABLE 
@@ -1289,6 +1295,34 @@ BEGIN
    IDS_CLEAR_CACHE         "Clear cached information"
 END

+STRINGTABLE 
+BEGIN
+    IDS_NO_DBLCLICK         "Single-click to open folder shortcuts"
+    IDS_NO_DBLCLICK_TIP     "When this is checked, single-clicking shortcuts (links) to folders will open them in explorer. Hovering over the shortcut will still expand sub-menus"
+    IDS_BOLD_SETTINGS       "Highlight modified settings"
+    IDS_BOLD_SETTINGS_TIP   "When this is checked, settings that have been modified from their defaults will be highlighted in bold"
+    IDS_SEARCH_HINT         "Custom search hint"
+    IDS_SEARCH_HINT_TIP     "When this is checked, the hint text in the search box will be replaced"
+    IDS_NEW_SEARCH_HINT     "Custom search hint text"
+    IDS_NEW_SEARCH_HINT_TIP "The text to replace the search hint with. Empty text is a valid option"
+    IDS_MORE_RESULTS        "Enable ""See more results"" option"
+    IDS_MORE_RESULTS_TIP    "When this is checked, the search results will include an option to do a more advanced search"
+    IDS_OPEN_CMD            "Custom command"
+    IDS_OPEN_CMD_TIP        "The action will run a user-defined command"
+    IDS_OPEN_CMD_TEXT       "Command to run"
+    IDS_OPEN_CMD_TEXT_TIP   "Enter the command to run when you use this control"
+    IDS_ITEM_LINKS          "Display as a list of links"
+    IDS_ITEM_LINKS_TIP      "This item will appear as a sub-menu showing only its top-level contents"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_OPEN_TRUE_PATH      "Open pinned folders to their true path"
+    IDS_OPEN_TRUE_PATH_TIP  "When this is checked, pinned folders will open to their true path instead of the path to their shortcut in the Pinned Programs folder"
+    IDS_PINNED_PATH         "Pinned folder path"
+    IDS_PINNED_PATH_TIP     "The path to use as the Pinned folder. If the path does not exist, it will be created (if possible) after opening the start menu. Close this window after updating this setting to update your context menu.\n\nNote: If you do not have permissions for the selected path, you will not be able to pin items until you take ownership of the new folder"
+END
+
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////

--- a/Src/StartMenu/StartMenuDLL/resource.h
+++ b/Src/StartMenu/StartMenuDLL/resource.h
@@ -754,6 +754,32 @@
 #define IDS_SELECT_LAST                 3657
 #define IDS_SELECT_LAST_TIP             3658
 #define IDS_CLEAR_CACHE                 3659
+#define IDS_ALIGN_WORK_AREA             3660
+#define IDS_ALIGN_WORK_AREA_TIP         3661
+#define IDS_HOR_OFFSET                  3662
+#define IDS_HOR_OFFSET_TIP              3663
+#define IDS_VERT_OFFSET                 3664
+#define IDS_VERT_OFFSET_TIP             3665
+#define IDS_NO_DBLCLICK                 3666
+#define IDS_NO_DBLCLICK_TIP             3667
+#define IDS_BOLD_SETTINGS               3668
+#define IDS_BOLD_SETTINGS_TIP           3669
+#define IDS_SEARCH_HINT                 3670
+#define IDS_SEARCH_HINT_TIP             3671
+#define IDS_NEW_SEARCH_HINT             3672
+#define IDS_NEW_SEARCH_HINT_TIP         3673
+#define IDS_MORE_RESULTS                3674
+#define IDS_MORE_RESULTS_TIP            3675
+#define IDS_OPEN_CMD                    3676
+#define IDS_OPEN_CMD_TIP                3677
+#define IDS_OPEN_CMD_TEXT               3678
+#define IDS_OPEN_CMD_TEXT_TIP           3679
+#define IDS_ITEM_LINKS                  3680
+#define IDS_ITEM_LINKS_TIP              3681
+#define IDS_OPEN_TRUE_PATH              3682
+#define IDS_OPEN_TRUE_PATH_TIP          3683
+#define IDS_PINNED_PATH                 3684
+#define IDS_PINNED_PATH_TIP             3685
 #define IDS_STRING7001                  7001
 #define IDS_STRING7002                  7002
 #define IDS_STRING7003                  7003
--- a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp
+++ b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp
@@ -280,7 +280,7 @@ static std::vector<uint8_t> ParseModernSettings()
 					CComPtr<IXMLDOMNode> next;
 					if (FAILED(node->get_nextSibling(&next)))
 						break;
-					node = next;
+					node = std::move(next);
 				}
 			}
 		}
--- a/Src/StartMenu/StartMenuHelper/StartMenuExt.cpp
+++ b/Src/StartMenu/StartMenuHelper/StartMenuExt.cpp
@@ -91,7 +91,7 @@ STDMETHODIMP CStartMenuExt::Initialize( PCIDLIST_ABSOLUTE pidlFolder, IDataObjec
 		bUsePinned=(setting==1);
 	if (bUsePinned)
 	{
-		Strcpy(m_PinFolder1,_countof(m_PinFolder1),L"%APPDATA%\\OpenShell\\Pinned\\");
+		Sprintf(m_PinFolder1,_countof(m_PinFolder1),L"%s\\",GetSettingString(L"PinnedItemsPath"));
 		DoEnvironmentSubst(m_PinFolder1,_countof(m_PinFolder1));
 		m_PinFolder2[0]=0;
 	}
--- a/Src/StartMenu/StartMenuHelper/dllmain.cpp
+++ b/Src/StartMenu/StartMenuHelper/dllmain.cpp
@@ -57,6 +57,7 @@ CSetting g_Settings[]={
 	{L"DisablePinExt",CSetting::TYPE_BOOL,0,0,0},
 	{L"FolderStartMenu",CSetting::TYPE_STRING,0,0,L""},
 	{L"FolderCommonStartMenu",CSetting::TYPE_STRING,0,0,L""},
+	{L"PinnedItemsPath",CSetting::TYPE_DIRECTORY,0,0,L"%APPDATA%\\OpenShell\\Pinned"},

 {L"Language",CSetting::TYPE_GROUP},
 	{L"Language",CSetting::TYPE_STRING,0,0,L"",CSetting::FLAG_COLD|CSetting::FLAG_SHARED},
--- a/Src/StartMenu/StartMenuL10N.ini
+++ b/Src/StartMenu/StartMenuL10N.ini
@@ -129,7 +129,7 @@ Menu.RemoveHighlight = إزالة التمييز
 Menu.Uninstall = إز&الة التثبيت
 Menu.UninstallTitle = إزالة التثبيت
 Menu.UninstallPrompt = ‏‏هل تريد بالتأكيد إزالة تثبيت %s؟
-Search.CategorySettings = الإعدادات
+Search.CategorySettings = لوحة التح&كم
 Search.CategoryPCSettings = إعدادات الكمبيوتر
 Search.CategoryPrograms = البرامج
 Search.CategoryDocuments = المستندات
@@ -265,7 +265,7 @@ Menu.RemoveHighlight = Премахни осветяването
 Menu.Uninstall = &Деинсталирай
 Menu.UninstallTitle = Деинсталиране
 Menu.UninstallPrompt = Наистина ли искате да деинсталирате %s?
-Search.CategorySettings = Настройки
+Search.CategorySettings = Контролен панел
 Search.CategoryPCSettings = Настройки на компютъра
 Search.CategoryPrograms = Програми
 Search.CategoryDocuments = Документи
@@ -403,7 +403,7 @@ Menu.UninstallTitle = Desinstal·la
 Menu.UninstallPrompt = Esteu segur que voleu desinstal·lar el %s?
 Menu.ClassicSettings = Open-Shell &Menú
 Menu.SettingsTip = Ajustaments del Open-Shell Menú
-Search.CategorySettings = Configuració
+Search.CategorySettings = Panell de control
 Search.CategoryPCSettings = Configuració de l'ordinador
 Search.CategoryPrograms = Programes
 Search.CategoryDocuments = Documents
@@ -539,7 +539,7 @@ Menu.RemoveHighlight = Odebrat nejzajímavější místo
 Menu.Uninstall = &Odinstalovat
 Menu.UninstallTitle = Odinstalovat
 Menu.UninstallPrompt = Opravdu chcete odinstalovat položku %s?
-Search.CategorySettings = Nastavení
+Search.CategorySettings = Ovládací panely
 Search.CategoryPCSettings = Nastavení počítače
 Search.CategoryPrograms = Programy
 Search.CategoryDocuments = Dokumenty
@@ -675,7 +675,7 @@ Menu.RemoveHighlight = Fjern centralt punkt
 Menu.Uninstall = &Fjern
 Menu.UninstallTitle = Fjern
 Menu.UninstallPrompt = Er du sikker på, at du vil fjerne %s?
-Search.CategorySettings = Indstillinger
+Search.CategorySettings = Kontrolpanel
 Search.CategoryPCSettings = Pc-indstillinger
 Search.CategoryPrograms = Programmer
 Search.CategoryDocuments = Dokumenter
@@ -811,7 +811,7 @@ Menu.RemoveHighlight = Haupttreffer entfernen
 Menu.Uninstall = &Deinstallieren
 Menu.UninstallTitle = Deinstallieren
 Menu.UninstallPrompt = Möchten Sie %s wirklich deinstallieren?
-Search.CategorySettings = Einstellungen
+Search.CategorySettings = Systemsteuerung
 Search.CategoryPCSettings = PC-Einstellungen
 Search.CategoryPrograms = Programme
 Search.CategoryDocuments = Dokumente
@@ -947,7 +947,7 @@ Menu.RemoveHighlight = Κατάργηση επισήμανσης
 Menu.Uninstall = &Κατάργηση εγκατάστασης
 Menu.UninstallTitle = Κατάργηση εγκατάστασης
 Menu.UninstallPrompt = Είστε βέβαιοι ότι θέλετε να καταργήσετε την εγκατάσταση του %s;
-Search.CategorySettings = Ρυθμίσεις
+Search.CategorySettings = Πίνακας Ελέγχου
 Search.CategoryPCSettings = Ρυθμίσεις υπολογιστή
 Search.CategoryPrograms = Προγράμματα
 Search.CategoryDocuments = Έγγραφα
@@ -991,7 +991,7 @@ Menu.LogOffShort = &Log off
 Menu.Undock = Undock Comput&er
 Menu.Disconnect = D&isconnect
 Menu.ShutdownBox = Sh&ut Down...
-Menu.Shutdown = Sh&ut Down
+Menu.Shutdown = Sh&ut down
 Menu.Restart = &Restart
 Menu.ShutdownUpdate = Update and shut down
 Menu.RestartUpdate = Update and restart
@@ -1083,8 +1083,8 @@ Menu.RemoveHighlight = Remove highlight
 Menu.Uninstall = &Uninstall
 Menu.UninstallTitle = Uninstall
 Menu.UninstallPrompt = Are you sure you want to uninstall %s?
-Search.CategorySettings = Settings
-Search.CategoryPCSettings = Modern Settings
+Search.CategorySettings = Control Panel
+Search.CategoryPCSettings = Settings
 Search.CategoryPrograms = Programs
 Search.CategoryDocuments = Documents
 Search.CategoryMusic = Music
@@ -1219,7 +1219,7 @@ Menu.RemoveHighlight = Quitar como elemento destacado
 Menu.Uninstall = &Desinstalar
 Menu.UninstallTitle = Desinstalar
 Menu.UninstallPrompt = ¿Está seguro de que desea desinstalar %s?
-Search.CategorySettings = Configuración
+Search.CategorySettings = Panel de control
 Search.CategoryPCSettings = Configuración de tu PC
 Search.CategoryPrograms = Programas
 Search.CategoryDocuments = Documentos
@@ -1355,7 +1355,7 @@ Menu.RemoveHighlight = Eemalda esiletõst
 Menu.Uninstall = &Desinstalli
 Menu.UninstallTitle = Desinstalli
 Menu.UninstallPrompt = Kas soovite kindlasti desinstallida %s?
-Search.CategorySettings = Sätted
+Search.CategorySettings = Juhtpaneel
 Search.CategoryPCSettings = Arvutisätted
 Search.CategoryPrograms = Programmid
 Search.CategoryDocuments = Dokumendid
@@ -1493,7 +1493,7 @@ Menu.UninstallTitle = لغو نصب
 Menu.UninstallPrompt = ‏‏آیا مطمئنید می خواهید %s را لغو نصب کنید؟
 Menu.ClassicSettings = منوی ش&روع کلاسیک
 Menu.SettingsTip = تنظیمات منوی شروع کلاسیک
-Search.CategorySettings = تنظیمات
+Search.CategorySettings = صفحه کنترل
 Search.CategoryPCSettings = تنظیمات رایانه
 Search.CategoryPrograms = برنامه‌ها
 Search.CategoryDocuments = اسناد
@@ -1629,7 +1629,7 @@ Menu.RemoveHighlight = Poista tärkeä kohde
 Menu.Uninstall = &Poista asennus
 Menu.UninstallTitle = Poista asennus
 Menu.UninstallPrompt = Haluatko varmasti poistaa kohteen %s asennuksen?
-Search.CategorySettings = Asetukset
+Search.CategorySettings = Ohjauspaneeli
 Search.CategoryPCSettings = Tietokoneen asetukset
 Search.CategoryPrograms = Ohjelmat
 Search.CategoryDocuments = Tiedostot
@@ -1765,7 +1765,7 @@ Menu.RemoveHighlight = Supprimer la recommandation
 Menu.Uninstall = &Désinstaller
 Menu.UninstallTitle = Désinstaller
 Menu.UninstallPrompt = Faut-il vraiment désinstaller %s ?
-Search.CategorySettings = Paramètres
+Search.CategorySettings = Panneau de configuration
 Search.CategoryPCSettings = Paramètres du PC
 Search.CategoryPrograms = Programmes
 Search.CategoryDocuments = Documents
@@ -1901,7 +1901,7 @@ Menu.RemoveHighlight = Remove highlight
 Menu.Uninstall = &Dì-stàlaich
 Menu.UninstallTitle = Dì-stàlaich
 Menu.UninstallPrompt = A bheil thu cinnteach gu bheil thu airson %s a dhì-stàladh?
-Search.CategorySettings = Roghainnean
+Search.CategorySettings = A' phanail-smachd
 Search.CategoryPCSettings = Roghainnean a' PC
 Search.CategoryPrograms = Prògraman
 Search.CategoryDocuments = Sgrìobhainnean
@@ -2037,7 +2037,7 @@ Menu.RemoveHighlight = הסר הבלטה
 Menu.Uninstall = ה&סר התקנה
 Menu.UninstallTitle = הסר התקנה
 Menu.UninstallPrompt = ‏‏האם אתה בטוח שברצונך להסיר את התקנת %s?
-Search.CategorySettings = הגדרות
+Search.CategorySettings = לוח הבקרה
 Search.CategoryPCSettings = הגדרות מחשב
 Search.CategoryPrograms = תוכניות
 Search.CategoryDocuments = מסמכים
@@ -2173,7 +2173,7 @@ Menu.RemoveHighlight = Ukloni isticanje
 Menu.Uninstall = &Deinstaliraj
 Menu.UninstallTitle = Deinstaliraj
 Menu.UninstallPrompt = Jeste li sigurni da želite deinstalirati %s iz računala?
-Search.CategorySettings = Postavke
+Search.CategorySettings = Upravljačka ploča
 Search.CategoryPCSettings = Postavke PC-ja
 Search.CategoryPrograms = Programi
 Search.CategoryDocuments = Dokumenti
@@ -2309,7 +2309,7 @@ Menu.RemoveHighlight = Kiemelés eltávolítása
 Menu.Uninstall = Eltá&volítás
 Menu.UninstallTitle = Eltávolítás
 Menu.UninstallPrompt = Biztosan el kívánja távolítani a következőt: %s?
-Search.CategorySettings = Beállítások
+Search.CategorySettings = Vezérlőpult
 Search.CategoryPCSettings = Gépház
 Search.CategoryPrograms = Programs
 Search.CategoryDocuments = Dokumentumok
@@ -2447,8 +2447,8 @@ Menu.RemoveHighlight = Fjarlægja auðkenningu
 Menu.Uninstall = Fjarlægja
 Menu.UninstallTitle = Fjarlægja
 Menu.UninstallPrompt = Ertu viss um að það eigi að fjarlægja %s?
-Search.CategorySettings = Stillingar
-Search.CategoryPCSettings = Sérstillingar tölvunnar
+Search.CategorySettings = Stjórnborð
+Search.CategoryPCSettings = PC stillingar
 Search.CategoryPrograms = Forrit
 Search.CategoryDocuments = Skjöl
 Search.CategoryMusic = Tónlist
@@ -2583,7 +2583,7 @@ Menu.RemoveHighlight = Rimuovi elemento di rilievo
 Menu.Uninstall = &Disinstalla
 Menu.UninstallTitle = Disinstalla
 Menu.UninstallPrompt = Disinstallare %s?
-Search.CategorySettings = Impostazioni
+Search.CategorySettings = Pannello di controllo
 Search.CategoryPCSettings = Impostazioni PC
 Search.CategoryPrograms = Programmi
 Search.CategoryDocuments = Documenti
@@ -2991,7 +2991,7 @@ Menu.RemoveHighlight = Šalinti paryškinimą
 Menu.Uninstall = &Pašalinti
 Menu.UninstallTitle = Pašalinti
 Menu.UninstallPrompt = Ar tikrai norite pašalinti %s?
-Search.CategorySettings = Parametrai
+Search.CategorySettings = Valdymo skydas
 Search.CategoryPCSettings = PC parametrai
 Search.CategoryPrograms = Programos
 Search.CategoryDocuments = Dokumentai
@@ -3127,7 +3127,7 @@ Menu.RemoveHighlight = Noņemt marķējumu
 Menu.Uninstall = &Atinstalēt
 Menu.UninstallTitle = Atinstalēt
 Menu.UninstallPrompt = Vai esat pārliecināts, ka vēlaties atinstalēt %s?
-Search.CategorySettings = Iestatījumi
+Search.CategorySettings = Vadības panelis
 Search.CategoryPCSettings = Datora iestatījumi
 Search.CategoryPrograms = Programmas
 Search.CategoryDocuments = Dokumenti
@@ -3263,7 +3263,7 @@ Menu.RemoveHighlight = Remove highlight
 Menu.Uninstall = &Деинсталирај
 Menu.UninstallTitle = Деинсталирај
 Menu.UninstallPrompt = Дали сте сигурни дека сакате да го деинсталирате %s?
-Search.CategorySettings = Подесувања
+Search.CategorySettings = Контрол панел
 Search.CategoryPCSettings = Параметри на компјутерот
 Search.CategoryPrograms = Програми
 Search.CategoryDocuments = Документи
@@ -3399,7 +3399,7 @@ Menu.RemoveHighlight = Fjern høydepunkt
 Menu.Uninstall = &Avinstaller
 Menu.UninstallTitle = Avinstaller
 Menu.UninstallPrompt = Er du sikker på at du vil avinstallere %s?
-Search.CategorySettings = Innstillinger
+Search.CategorySettings = Kontrollpanel
 Search.CategoryPCSettings = PC-innstillinger
 Search.CategoryPrograms = Programmer
 Search.CategoryDocuments = Dokumenter
@@ -3535,7 +3535,7 @@ Menu.RemoveHighlight = Aandachtspunt verwijderen
 Menu.Uninstall = V&erwijderen
 Menu.UninstallTitle = Verwijderen
 Menu.UninstallPrompt = Weet u zeker dat u %s wilt verwijderen?
-Search.CategorySettings = Instellingen
+Search.CategorySettings = Configuratiescherm
 Search.CategoryPCSettings = Pc-instellingen
 Search.CategoryPrograms = Programma's
 Search.CategoryDocuments = Documenten
@@ -3671,7 +3671,7 @@ Menu.RemoveHighlight = Usuń wyróżnienie
 Menu.Uninstall = &Odinstaluj
 Menu.UninstallTitle = Odinstaluj
 Menu.UninstallPrompt = Czy na pewno chcesz odinstalować program %s?
-Search.CategorySettings = Ustawienia
+Search.CategorySettings = Panel sterowania
 Search.CategoryPCSettings = Ustawienia komputera
 Search.CategoryPrograms = Programy
 Search.CategoryDocuments = Dokumenty
@@ -3807,7 +3807,7 @@ Menu.RemoveHighlight = Remover Destaque
 Menu.Uninstall = &Desinstalar
 Menu.UninstallTitle = Desinstalar
 Menu.UninstallPrompt = Tem certeza de que deseja desinstalar %s?
-Search.CategorySettings = Configurações
+Search.CategorySettings = Painel de controle
 Search.CategoryPCSettings = Configurações do computador 
 Search.CategoryPrograms = Programas
 Search.CategoryDocuments = Documentos
@@ -3943,7 +3943,7 @@ Menu.RemoveHighlight = Remover destaque
 Menu.Uninstall = D&esinstalar
 Menu.UninstallTitle = Desinstalar
 Menu.UninstallPrompt = Tem a certeza de que pretende desinstalar %s?
-Search.CategorySettings = Definições
+Search.CategorySettings = Painel de controlo
 Search.CategoryPCSettings = Definições do PC
 Search.CategoryPrograms = Programas
 Search.CategoryDocuments = Documentos
@@ -4079,7 +4079,7 @@ Menu.RemoveHighlight = Eliminare evidențiere
 Menu.Uninstall = &Dezinstalare
 Menu.UninstallTitle = Dezinstalare
 Menu.UninstallPrompt = Sigur dezinstalați %s?
-Search.CategorySettings = Setări
+Search.CategorySettings = Panou de control
 Search.CategoryPCSettings = Setări PC
 Search.CategoryPrograms = Programe
 Search.CategoryDocuments = Documente
@@ -4215,7 +4215,7 @@ Menu.RemoveHighlight = Выключить пометку
 Menu.Uninstall = &Удалить
 Menu.UninstallTitle = Удалить
 Menu.UninstallPrompt = Вы действительно хотите удалить "%s"?
-Search.CategorySettings = Параметры
+Search.CategorySettings = Панель управления
 Search.CategoryPCSettings = Параметры ПК
 Search.CategoryPrograms = Программы
 Search.CategoryDocuments = Документы
@@ -4351,7 +4351,7 @@ Menu.RemoveHighlight = Odstrániť zvýraznenie
 Menu.Uninstall = &Odinštalovať
 Menu.UninstallTitle = Odinštalovať
 Menu.UninstallPrompt = Naozaj chcete odinštalovať program %s?
-Search.CategorySettings = Nastavenia
+Search.CategorySettings = Ovládací panel
 Search.CategoryPCSettings = Nastavenie PC
 Search.CategoryPrograms = Programy
 Search.CategoryDocuments = Dokumenty
@@ -4487,7 +4487,7 @@ Menu.RemoveHighlight = Odstrani označitev
 Menu.Uninstall = &Odstrani
 Menu.UninstallTitle = Odstrani
 Menu.UninstallPrompt = Ali ste prepričani, da želite odstraniti %s?
-Search.CategorySettings = Nastavitve
+Search.CategorySettings = Nadzorna plošča
 Search.CategoryPCSettings = Nastavitve računalnika
 Search.CategoryPrograms = Programi
 Search.CategoryDocuments = Dokumenti
@@ -4623,7 +4623,7 @@ Menu.RemoveHighlight = Ukloni istaknuti sadržaj
 Menu.Uninstall = &Deinstaliraj
 Menu.UninstallTitle = Deinstaliraj
 Menu.UninstallPrompt = Želite li zaista da deinstalirate %s?
-Search.CategorySettings = Postavke
+Search.CategorySettings = Kontrolna tabla
 Search.CategoryPCSettings = Postavke računara
 Search.CategoryPrograms = Programs
 Search.CategoryDocuments = Dokumenti
@@ -4759,7 +4759,7 @@ Menu.RemoveHighlight = Ta bort fokus
 Menu.Uninstall = &Avinstallera
 Menu.UninstallTitle = Avinstallera
 Menu.UninstallPrompt = Vill du avinstallera %s?
-Search.CategorySettings = Inställningar
+Search.CategorySettings = Kontrollpanelen
 Search.CategoryPCSettings = Datorinställningar
 Search.CategoryPrograms = Program
 Search.CategoryDocuments = Dokument
@@ -4896,7 +4896,7 @@ Menu.RemoveHighlight = เอาไฮไลท์ออก
 Menu.Uninstall = &ถอนการติดตั้ง
 Menu.UninstallTitle = ถอนการติดตั้ง
 Menu.UninstallPrompt = คุณแน่ใจหรือไม่ว่าคุณต้องการถอนการติดตั้ง %s
-Search.CategorySettings = การตั้งค่า
+Search.CategorySettings = แผงควบคุม
 Search.CategoryPCSettings = การตั้งค่าพีซี
 Search.CategoryPrograms = โปรแกรม
 Search.CategoryDocuments = เอกสาร
@@ -5032,7 +5032,7 @@ Menu.RemoveHighlight = Önemli Noktayı Kaldır
 Menu.Uninstall = &Kaldır
 Menu.UninstallTitle = Kaldır
 Menu.UninstallPrompt = %s programını kaldırmak istediğinizden emin misiniz?
-Search.CategorySettings = Ayarlar
+Search.CategorySettings = Denetim Masası
 Search.CategoryPCSettings = Bilgisayar ayarları
 Search.CategoryPrograms = Programlar
 Search.CategoryDocuments = Belgeler
@@ -5168,7 +5168,7 @@ Menu.RemoveHighlight = Видалити виділення
 Menu.Uninstall = &Видалити
 Menu.UninstallTitle = Видалити
 Menu.UninstallPrompt = Дійсно видалити %s?
-Search.CategorySettings = Настройки
+Search.CategorySettings = Панель керування
 Search.CategoryPCSettings = Параметри ПК
 Search.CategoryPrograms = Програми
 Search.CategoryDocuments = Документи
--- a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp
+++ b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp
@@ -168,7 +168,7 @@ namespace DesktopNotificationManagerCompat
        ComPtr<IToastNotificationHistory> nativeHistory;
        RETURN_IF_FAILED(toastStatics2->get_History(&nativeHistory));

-        *history = std::unique_ptr<DesktopNotificationHistoryCompat>(new DesktopNotificationHistoryCompat(s_aumid.c_str(), nativeHistory));
+        *history = std::make_unique<DesktopNotificationHistoryCompat>(s_aumid.c_str(), nativeHistory);
        return S_OK;
    }

@@ -224,7 +224,7 @@ namespace DesktopNotificationManagerCompat
 DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr<IToastNotificationHistory> history)
 {
    m_aumid = std::wstring(aumid);
-    m_history = history;
+    m_history = std::move(history);
 }

 HRESULT DesktopNotificationHistoryCompat::Clear()
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,7 @@
 version: 4.4.{build}
+branches:
+  only:
+    - master
 pull_requests:
  do_not_increment_build_number: true
 skip_tags: true
@@ -11,3 +14,12 @@ only_commits:
  files:
    - Src/
    - Localization/
+deploy:
+- provider: GitHub
+  tag: v$(APPVEYOR_BUILD_VERSION)
+  release: $(APPVEYOR_BUILD_VERSION)
+  on:
+    APPVEYOR_ACCOUNT_NAME: passionate-coder
+  auth_token:
+    secure: D0QZnRZfea3qJlWOwrxE6M2jrbiSrOfz/6U7RzdeeG8N0qNDFKI7LFjYyw2I/PcR
+  prerelease: true
Author	SHA1	Message	Date
ge0rdi	1cc5d2eb53	Fix broken menu sorting It was broken in `bb26cec` commit. Fixes #1111	2022-09-09 17:07:29 +02:00
coddec	687e50914f	Update appveyor.yml Change secure,hashed auth token as suggested by @ge0rdi	2022-09-08 13:31:28 +10:00
floppyD	a165ba38a6	Update StartMenuL10N.ini (#1125 ) That's how it's called on Windows. "Configurações do computador" also makes the start menu way larger than it should be.	2022-09-01 19:27:25 -04:00
ge0rdi	6b7cfc5ab2	Update: Remove unused code for checking nightly build on AppVeyor We have nightly builds on Github already.	2022-08-21 22:51:18 +02:00
ge0rdi	1f2c3d43a6	Update: Get nightly (prerelease) builds from Github We are now deploying official builds from master to Github releases page (as Prerelease). So we should get these build from there. This is also related to AppVeyor's rather tight download limits that make it quite challenge to obtain nightly builds.	2022-08-21 22:51:18 +02:00
ge0rdi	5bee5ae143	Update JSON library to latest version (3.11.2)	2022-08-21 22:51:18 +02:00
ge0rdi	f01c126b36	AppVeyor: Deploy only if build was done under official account	2022-08-21 22:47:52 +02:00
ge0rdi	3d1fa11973	Update README.md - Updated "release" badge to point to latest release version directly - Removed "Latest nightly build" link as nightly builds are now part of standard Releases page	2022-08-21 22:20:32 +02:00
ge0rdi	93245dc4d6	AppVeyor: deploy build to GitHub releases page	2022-08-21 14:01:21 +02:00
ge0rdi	86447299b1	AppVeyor: build only from master We want to do official builds from master only. PR builds should be not affected by this.	2022-08-21 14:00:12 +02:00
thisismy-github	64259f73e8	Various single-click option fixes Fixed single-click option ignoring split arrows Fixed Apps folder being clickable	2022-08-13 16:00:26 -04:00
thisismy-github	8031739110	Added option to customize Pinned folder location Items can be pinned to directories that require administative privileges (such as Open-Shell's default installation directory), so long as users take ownership of the pinned folder. Also adds a command to Open-Shell's context menu that opens the current pinned folder. Adds general support for directory-based settings by creating a new setting type called TYPE_DIRECTORY which uses a new bool added to BrowseLinkHelper, called bFoldersOnly. START_MENU_PINNED_ROOT has been removed, and all instances of both it and BrowseLinkHelper have been adjusted accordingly. To create your own directory-based settings, use CSetting::TYPE_DIRECTORY. Empty directory paths are reset to their default value as they can cause unexpected behavior.	2022-08-13 16:00:26 -04:00
thisismy-github	27e5c2bc74	Added option to open folders to their true path Adds a new function called GetFakeFolder which attempts to find and get the target.lnk file from a fake folder (what Open-Shell uses to pin folders). If detected, InvokeCommand is swapped for a ShellExecute call to the target shortcut. Fixes #555, #653, and by extension, #691.	2022-08-13 16:00:26 -04:00
thisismy-github	bb26cec0ec	Added option to single-expand any Win7 style item Expands the "display as a list of drives" option from This PC to work on almost any item in the Windows 7 style. Incompatible items have a new setting called ITEM_NODRIVES which blocks the option from appearing. This PC still uses the original "list of drives" text, while other items use "list of links" instead. Sorting has been updated to account for this option by adding a property called bFolderLink which marks any folder, even if it is not explicitly expandable.	2022-08-13 16:00:26 -04:00
thisismy-github	ef663d2051	Added option to set custom commands for controls Includes a unique option for each control and supports environment variables.	2022-08-13 16:00:26 -04:00
thisismy-github	be8568ce00	Added option to hide "see more results" in search Hides the item in both start menu styles and adjusts search height to ensure the empty space is used. Partially fixes #660, but currently does not honor group policy settings.	2022-08-13 16:00:26 -04:00
thisismy-github	5399e3ad8c	Added option to use a custom search hint If set, intercepts the search hint's DrawText function and swaps out the default text for user-defined text. Leaving the text blank results in an empty search box.	2022-08-13 16:00:26 -04:00
thisismy-github	68379f4098	Fixed bug between XML files and active edit boxes When loading XML files, settings with active edit boxes open will not be adjusted. This adds an additional tab-reload before the load begins to forcibly close any active edit boxes.	2022-08-13 16:00:26 -04:00
thisismy-github	daa1d96f12	Added option to never highlight modified settings Prevents settings from appearing in bold. Does not change the helper text at the bottom of the window.	2022-08-13 16:00:26 -04:00
thisismy-github	998d83c15c	Auto-detect when setting is back to default value Intercepts most instances of FLAG_DEFAULT getting set, including when XML files are loaded and when Open-Shell starts, adding if-statements to those spots to check if a new value is actually different from the setting's default value. Ensures more consistency behind the scenes and gets rid of inaccurate bold highlights.	2022-08-13 16:00:26 -04:00
thisismy-github	0cb43dd17c	Added option to always single-click folders Opens pinned items on both sides of the start menu in just one click, while preserving hover functionality. Ignores the All Programs button for now as the All Programs folder is rarely accessed and this option can obstruct its use, especially for the inline menu style. Fixes #692.	2022-08-13 16:00:26 -04:00
among-us-official	b89aaed785	Fix corrupted icons in second column (#1088 ) When using skin with a different second column icon size, all of the icons in it would become blank. Because m_bTwoColumns is set after AddStandardItems, it is still false in the column break check. As a workaround, use the value it's assigned later in InitWindowInternal instead. Fix Open-Shell/Open-Shell-Menu#980	2022-08-11 16:46:12 -04:00
Let's All Love Lain	47cc2b2304	Replacing 'scopeList' contiguous placement of elements in memory more efficient and std::make_unique c++17 Signed-off-by: germanaizek <GermanAizek@yandex.ru>	2022-05-12 20:54:42 +02:00
germanaizek	a20215d9da	Replace 'push' -> 'emplace' if possible and use std::move()	2022-05-12 20:54:42 +02:00
germanaizek	4f362760b6	Remove unused vars, usage '= default;' and fixed lower scope	2022-05-12 20:54:42 +02:00
Ibuprophen	2e43d4c7a1	Update README.md	2022-05-10 11:05:42 -04:00
bonzibudd	4b2688245f	Don't change Taskbar text color/texture until relaunch This will accurately represent when these changes are able to take effect. Currently, the settings don't make any immediate changes or are broken when applied, and this should fix that. Fixes #602.	2021-06-08 19:51:04 +02:00
bonzibudd	082f85a4e2	Scale menu icons up to 250% (240 DPI) This should allow for icons in the menu to scale better for higher DPI displays. Configurations above 250% will retain the sizes for 240DPI.	2021-05-10 08:11:18 +02:00
bonzibudd	0ce76c9c36	Skin: Tweak programs icon arrows	2021-05-06 08:23:04 +02:00
bonzibudd	6e71d7c414	Skin: Add "Back" arrow to programs button This can help distinguish when the programs list has been activated.	2021-05-06 08:23:04 +02:00
bonzibudd	84909cf397	Skin: Retain list padding when using icon frames This will make the padding of list items stay the same regardless of if icon frames are enabled or not. List padding shouldn't change with the icon frame option because lists don't contain icon frames.	2021-05-06 08:23:04 +02:00
bonzibudd	fc290d5a6a	Skin: Remove extra "Submenu_opacity"	2021-05-06 08:23:04 +02:00
bonzibudd	ebd530f652	Skin: Better scaling of icon frames This will make the space around icon frames scale appropriately.	2021-05-06 08:23:04 +02:00
bonzibudd	e50c5f73d7	"About this skin" text should link to Open-Shell	2021-05-06 08:23:04 +02:00
bonzibudd	1db0006c96	Fix right-hand padding with Icon frames enabled This should improve the right-hand spacing when icon frames are enabled, and right-hand icons are disabled. There shouldn't be any extra icon/text padding for Main2 when icons aren't enabled.	2021-05-04 11:26:29 +02:00
GenesisToxical	7d0a9df1c3	Quick Access to Taskbar Tab - SettingsUI.cpp Easy access to modify Taskbar options without having to activate all other tabs.	2021-04-03 10:13:01 +02:00
Anis Errais	8e1b4e35a3	Added options for moving the start menu and showing the start menu at the edge of working area instead of against the taskbar	2021-02-09 20:57:48 +01:00
Xenhat	859afc63d3	Label topmost discussion link correctly as Gitter	2020-12-27 10:50:55 -05:00
Xenhat	ee6db35b34	Update README.md Add link to Discussions section and Discord for questions	2020-12-27 10:49:38 -05:00
ge0rdi	283c0fce03	Fix Shutdown item text To be consistent with text in Windows. Fixes #501.	2020-10-23 18:07:39 +02:00
ge0rdi	ac5e69f1a0	Use modern Help icon in Classic/Two column menu style Fixes #506.	2020-10-23 18:07:38 +02:00
ge0rdi	b2df22104e	Setup: Fix installer warning on Windows 7 `Warning 1946. Property 'System.AppUserModel.ToastActivatorCLSID' for shortcut 'Open-Shell Update.lnk' could not be set.` Windows 7 doesn't recognize `System.AppUserModel.ToastActivatorCLSID` name so we have to use GUID directly. https://docs.microsoft.com/en-us/troubleshoot/windows/win32/warning-1946-when-you-install-installer-package Fixes #507.	2020-10-23 18:07:37 +02:00
ge0rdi	c88f028f3e	Show Settings above Control Panel by default (Modern) Settings are more and more important in Windows 10, so it makes sense to show them above Control Panel. This changes only defaults, users will be still able to order start menu items as they like. Fixes #23.	2020-10-23 10:13:57 +02:00
ge0rdi	312bfd99d5	Update settings search category names To make it consistent with the rest of product: `Settings` category is renamed to `Control Panel` `Modern Settings` category is renamed to `Settings`	2020-10-23 10:13:57 +02:00
ge0rdi	ca576a0224	Display Modern settings search results above Control Panel ones (Modern) Settings are just more and more important in Windows 10. So it makes sense to show their search results first. Fixes #481.	2020-10-23 10:13:57 +02:00
ge0rdi	a5f35b133f	Improve compatibility with WindowBlinds `Open-Shell` hooks `SHFillRectClr` (ordinal 197) API from `shlwapi.dll` in order to be able to customize taskbar. The API is hooked even if taskbar customization is disabled in `Open-Shell` (default). `WindowBlinds` hooks the same API so this is causing clashes between both programs. In fact `Open-Shell` hooks later which makes `WindowBlinds` hook to be completely ignored. The solution would be to hook only if taskbar customization is enabled. This way `Open-Shell` should be more compatible with other customization tools in default state. Fixes #433.	2020-10-23 10:13:57 +02:00
ge0rdi	f197c9f43d	Don't show jump list for Settings application It reports just one category with unsupported type, thus jump-list will be empty. Fixes #487.	2020-10-23 10:13:57 +02:00