Fix for potential crash introduced in 1b013c3

Fixes #1245
Update README.md
2026-04-28 16:57:54 +10:00 · 2022-12-14 16:10:10 +01:00 · 2022-12-08 15:23:34 +01:00 · 2022-12-07 11:58:37 +01:00 · 2022-12-07 11:58:37 +01:00 · 2022-12-06 19:17:18 +01:00
83 changed files with 27167 additions and 1004 deletions
@@ -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.CategorySettings = Control Panel
-Search.CategoryPCSettings = Modern Settings
+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.CategorySettings = Stjórnborð
-Search.CategoryPCSettings = Sérstillingar tölvunnar
+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.SecurityTip = Avvia le opzioni di Sicurezza di Windows per modificare la password, cambiare utente o avviare Gestione attività.
-Menu.SearchComputersTip = Cerca computer nella rete
+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?
+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
@@ -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 = Документи
@@ -1,12 +1,11 @@
-## Open-Shell ![Open-Shell](/Src/Setup/OpenShell.ico)
+## Open-Shell <img src=/Src/Setup/OpenShell.ico width="64" />
 *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)
+[![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://img.shields.io/gitter/room/badges/shields.svg?color=lightseagreen)](https://gitter.im/open-shell/Lobby) [![Discord](https://img.shields.io/discord/757701054782636082?color=mediumslateblue&label=Discord&logo=discord&logoColor=white)](https://discord.gg/7H6arr5)
-[Home Page](https://open-shell.github.io/Open-Shell-Menu)  
+[Homepage](https://open-shell.github.io/Open-Shell-Menu)  
-[Discussion room](https://gitter.im/Open-Shell)  
+[Gitter Discussion rooms](https://gitter.im/Open-Shell)  
 [Latest nightly build](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master/artifacts)  
 ### Features
 - Classic style Start Menu for Windows 7, 8, 8.1, 10
@@ -16,18 +15,19 @@
 - Title bar and status bar for Internet Explorer
 ### Download
-If you just want to use it or looking for setup file, click here to download:
+You can find the latest stable version here:
-[![GitHub All Releases](https://img.shields.io/github/downloads/Open-Shell/Open-Shell-Menu/total?style=for-the-badge)](https://github.com/Open-Shell/Open-Shell-Menu/releases)
+[![GitHub All Releases](https://img.shields.io/github/downloads/Open-Shell/Open-Shell-Menu/total?style=for-the-badge)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)
 ### Temporary Translation/Language Solution
 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)  
+[Classic Shell: Custom Start Buttons](https://coddec.github.io/Classic-Shell/www.classicshell.net/tutorials/buttontutorial.html)  
-[Report a bug/issue or submit a feature request](https://github.com/Open-Shell/Open-Shell-Menu/issues)
+[Questions? Ask on the Discussions section](https://github.com/Open-Shell/Open-Shell-Menu/discussions) or on [Discord](https://discord.gg/7H6arr5)  
 [Submit a bug report/feature request](https://github.com/Open-Shell/Open-Shell-Menu/issues)
@@ -5,9 +5,9 @@ for other languages.
 The final files (installers, archives) are saved to the Setup\Final folder.
 You need the following tools:
-Visual Studio 2017 (Community Edition is enough)
+Visual Studio 2019 (Community Edition is enough)
  - Desktop development with C++ workload
-  - Windows 10 SDK (10.0.17134.0) for Desktop C++
+  - Windows 10 SDK (10.0.19041.0) for Desktop C++
  - Visual C++ ATL support
 HTML Help Workshop
 WiX 3.7
@@ -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));
@@ -135,17 +135,17 @@ BEGIN
    IDS_LANGUAGE_SETTINGS   "Language"
    IDS_CAPTION_FONT        "Caption font"
    IDS_CAPTION_FONT_TIP    "Select the font and text size to use for the caption"
-    IDS_TEXT_COLOR          "Text color"
+    IDS_TEXT_COLOR          "Text color (RRGGBB)"
    IDS_TEXT_COLOR_TIP      "Select the color for the caption text"
-    IDS_MAXTEXT_COLOR       "Text color (maximized)"
+    IDS_MAXTEXT_COLOR       "Text color (maximized) (RRGGBB)"
    IDS_MAXTEXT_COLOR_TIP   "Select the color for the caption text when the window is maximized"
-    IDS_INTEXT_COLOR        "Text color (inactive)"
+    IDS_INTEXT_COLOR        "Text color (inactive) (RRGGBB)"
    IDS_INTEXT_COLOR_TIP    "Select the color for the caption text when the window is inactive"
-    IDS_MAXINTEXT_COLOR     "Text color (maximized, inactive)"
+    IDS_MAXINTEXT_COLOR     "Text color (maximized, inactive) (RRGGBB)"
    IDS_MAXINTEXT_COLOR_TIP "Select the color for the caption text when the window is maximized and inactive"
    IDS_GLOW                "Text glow"
    IDS_GLOW_TIP            "When this is checked, the text will have a glow around it"
-    IDS_GLOW_COLOR          "Glow color"
+    IDS_GLOW_COLOR          "Glow color (RRGGBB)"
    IDS_GLOW_COLOR_TIP      "Select the color for the caption glow"
 END
@@ -153,7 +153,7 @@ STRINGTABLE
 BEGIN
    IDS_MAXGLOW             "Text glow (maximized)"
    IDS_MAXGLOW_TIP         "When this is checked, the text in the maximized window will have a glow around it"
-    IDS_MAXGLOW_COLOR       "Glow color (maximized)"
+    IDS_MAXGLOW_COLOR       "Glow color (maximized) (RRGGBB)"
    IDS_MAXGLOW_COLOR_TIP   "Select the color for the caption glow when the window is maximized"
    IDS_STATUS_SETTINGS     "Status Bar"
    IDS_SHOW_PROGRESS       "Show progress"
@@ -14,6 +14,7 @@
 #include "FNVHash.h"
 #include "StringUtils.h"
 #include "Translations.h"
 #include "json.hpp"
 #include <wininet.h>
 #include <softpub.h>
@@ -141,30 +142,9 @@ LRESULT CProgressDlg::OnCancel( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 static bool g_bCheckingVersion;
 static DWORD GetTimeStamp( const wchar_t *fname )
 {
 	HANDLE h=CreateFile(fname,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
 	if (h==INVALID_HANDLE_VALUE)
 		return 0;
 	DWORD res=0;
 	DWORD q;
 	IMAGE_DOS_HEADER header;
 	if (ReadFile(h,&header,sizeof(header),&q,NULL) && q==sizeof(header))
 	{
 		if (SetFilePointer(h,header.e_lfanew+8,NULL,FILE_BEGIN)!=INVALID_SET_FILE_POINTER)
 		{
 			if (!ReadFile(h,&res,4,&q,NULL) || q!=4)
 				res=0;
 		}
 	}
 	CloseHandle(h);
 	return res;
 }
 enum TDownloadResult
 {
 	DOWNLOAD_OK,
 	DOWNLOAD_SAMETIME,
 	DOWNLOAD_CANCEL,
 	// errors
@@ -176,8 +156,7 @@ enum TDownloadResult
 // Downloads a file
 // filename - returns the name of the downloaded file
-// timestamp - if not zero, it is compared to the timestamp of the file and returns DOWNLOAD_SAMETIME if the same (and buf will be empty)
+static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf, CString *pFilename, bool bAcceptCached, CProgressDlg *pProgress, TSettingsComponent component )
 static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf, CString *pFilename, DWORD timestamp, bool bAcceptCached, CProgressDlg *pProgress, TSettingsComponent component )
 {
 	const wchar_t *compName=L"Open-Shell";
 	switch (component)
@@ -211,15 +190,16 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 	int time=GetTickCount();
 	if (pProgress)
 		pProgress->SetText(LoadStringEx(IDS_PROGRESS_CONNECT));
-	HINTERNET hConnect=InternetConnect(hInternet,host,INTERNET_DEFAULT_HTTP_PORT,L"",L"",INTERNET_SERVICE_HTTP,0,0);
+	HINTERNET hConnect=InternetConnect(hInternet,host,components.nPort,L"",L"",INTERNET_SERVICE_HTTP,0,0);
 	if (hConnect)
 	{
 		if (pProgress && pProgress->IsCanceled())
 			res=DOWNLOAD_CANCEL;
-		const wchar_t *accept[]={L"*/*",NULL};
+		
 		if (res==DOWNLOAD_OK)
 		{
-			HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,bAcceptCached?0:INTERNET_FLAG_RELOAD,0);
+			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)
 			{
 				if (pProgress && pProgress->IsCanceled())
@@ -264,7 +244,7 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 						if (fileSize==0)
 							pProgress->SetProgress(-1);
 					}
-					int CHUNK_SIZE=timestamp?1024:32768; // start with small chunk to verify the timestamp
+					int CHUNK_SIZE=32768;
 					DWORD size=0;
 					buf.reserve(fileSize+CHUNK_SIZE);
 					while (1)
@@ -286,25 +266,6 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 						size+=dwSize;
 						if (pProgress && fileSize)
 							pProgress->SetProgress(size*100/fileSize);
 						if (timestamp && (size<sizeof(IMAGE_DOS_HEADER) || buf[0]!='M' || buf[1]!='Z'))
 						{
 							res=DOWNLOAD_FAIL;
 							break;
 						}
 						if (timestamp && size>=sizeof(IMAGE_DOS_HEADER))
 						{
 							DWORD pos=((IMAGE_DOS_HEADER*)&buf[0])->e_lfanew+8;
 							if (size>=pos+4)
 							{
 								if (timestamp==*(DWORD*)&buf[pos])
 								{
 									res=DOWNLOAD_SAMETIME;
 									break;
 								}
 								timestamp=0;
 								CHUNK_SIZE=32768;
 							}
 						}
 					}
 					buf.resize(size);
 				}
@@ -358,6 +319,7 @@ struct VersionCheckParams
 	TSettingsComponent component;
 	tNewVersionCallback callback;
 	CProgressDlg *progress;
 	bool nightly = false;
 };
 // 0 - fail, 1 - success, 2 - cancel
@@ -377,80 +339,17 @@ static DWORD WINAPI ThreadVersionCheck( void *param )
 		return 0;
 	}
 	DWORD curVersion=GetVersionEx(g_Instance);
 	regKey.SetDWORDValue(L"LastUpdateVersion",curVersion);
-	// download file
+	bool res = false;
 	wchar_t fname[_MAX_PATH]=L"%ALLUSERSPROFILE%\\OpenShell";
 	DoEnvironmentSubst(fname,_countof(fname));
 	SHCreateDirectory(NULL,fname);
 	PathAppend(fname,L"update.ver");
 	bool res=false;
 	CString urlBase=LoadStringEx(IDS_VERSION_URL);
 	VersionData data;
 	data.Clear();
 	if (data.Load(fname,false)==VersionData::LOAD_OK)
 	{
 		if (!data.altUrl.IsEmpty())
 			urlBase=data.altUrl;
 		WIN32_FILE_ATTRIBUTE_DATA attr;
 		if (GetFileAttributesEx(fname,GetFileExInfoStandard,&attr))
 		{
 			DWORD writeTime=(DWORD)(((((ULONGLONG)attr.ftLastWriteTime.dwHighDateTime)<<32)|attr.ftLastWriteTime.dwLowDateTime)/TIME_DIVISOR);
 			if (curTime>writeTime && (curTime-writeTime)<TIME_PRECISION)
 			{
 				res=true; // the file is valid and less than an hour old, don't download again
 			}
 		}
 	}
 	if (!res)
 	{
 		data.Clear();
 		CString url;
 		url.Format(L"%s%d.%d.%d.ver",urlBase,curVersion>>24,(curVersion>>16)&0xFF,curVersion&0xFFFF);
-	#ifdef UPDATE_LOG
+	{
-		LogToFile(UPDATE_LOG,L"URL: %s",url);
+		auto load = data.Load(!params.nightly);
 	#endif
-		std::vector<char> buf;
+#ifdef UPDATE_LOG
-		TDownloadResult download=DownloadFile(url,buf,NULL,GetTimeStamp(fname),false,params.progress,params.component);
+		LogToFile(UPDATE_LOG, L"Load result: %d", load);
-	#ifdef UPDATE_LOG
+#endif
-		LogToFile(UPDATE_LOG,L"Download result: %d",download);
+		res = (load == VersionData::LOAD_OK);
 	#endif
 		if (download==DOWNLOAD_CANCEL)
 		{
 			g_bCheckingVersion=false;
 			return 2;
 		}
 		if (download<DOWNLOAD_FIRST_ERROR)
 		{
 			if (download==DOWNLOAD_SAMETIME || SaveFile(fname,buf)==0)
 			{
 				if (download==DOWNLOAD_SAMETIME)
 				{
 					HANDLE h=CreateFile(fname,GENERIC_WRITE,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
 					if (h!=INVALID_HANDLE_VALUE)
 					{
 						SetFileTime(h,NULL,NULL,(FILETIME*)&curTimeL);
 						CloseHandle(h);
 					}
 				}
 				if (params.progress)
 				{
 					params.progress->SetText(LoadStringEx(IDS_PROGRESS_VERIFY));
 					params.progress->SetProgress(-1);
 				}
 				VersionData::TLoadResult load=data.Load(fname,false);
 	#ifdef UPDATE_LOG
 				LogToFile(UPDATE_LOG,L"Load result: %d",load);
 	#endif
 				if (load==VersionData::LOAD_BAD_FILE)
 					DeleteFile(fname);
 				res=(load==VersionData::LOAD_OK);
 			}
 		}
 	}
 	curTime+=(rand()*TIME_PRECISION)/(RAND_MAX+1)-(TIME_PRECISION/2); // add between -30 and 30 minutes to randomize access
@@ -553,6 +452,21 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec
 		params->callback=callback;
 		params->progress=NULL;
 		// check the Update setting (uses the current value in the registry, not the one from memory
 		{
 			CRegKey regSettings, regSettingsUser, regPolicy, regPolicyUser;
 			bool bUpgrade = OpenSettingsKeys(COMPONENT_SHARED, regSettings, regSettingsUser, regPolicy, regPolicyUser);
 			CSetting settings[] = {
 				{L"Nightly",CSetting::TYPE_BOOL,0,0,0},
 				{NULL}
 			};
 			settings[0].LoadValue(regSettings, regSettingsUser, regPolicy, regPolicyUser);
 			params->nightly = GetSettingBool(settings[0]);
 		}
 		if (!owner)
 			return ThreadVersionCheck(params);
@@ -583,57 +497,38 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec
 	}
 	else
 	{
 		DWORD buildTime=0;
 		{
 			// skip the update if the update component is not found
 			wchar_t path[_MAX_PATH];
 			GetModuleFileName(_AtlBaseModule.GetModuleInstance(),path,_countof(path));
 			PathRemoveFileSpec(path);
 			PathAppend(path,L"Update.exe");
 			WIN32_FILE_ATTRIBUTE_DATA attr;
 			if (!GetFileAttributesEx(path,GetFileExInfoStandard,&attr))
 				return 0;
 			buildTime=(DWORD)(((((ULONGLONG)attr.ftCreationTime.dwHighDateTime)<<32)|attr.ftCreationTime.dwLowDateTime)/TIME_DIVISOR); // in 0.01 hours
 		}
 		ULONGLONG curTimeL;
 		GetSystemTimeAsFileTime((FILETIME*)&curTimeL);
 		DWORD curTime=(DWORD)(curTimeL/TIME_DIVISOR); // in 0.01 hours
 		if (curTime-buildTime>24*365*TIME_PRECISION)
 			return 0; // the build is more than a year old, don't do automatic updates
 		CRegKey regKey;
 		if (regKey.Open(HKEY_CURRENT_USER,L"Software\\OpenShell\\OpenShell")!=ERROR_SUCCESS)
 			regKey.Create(HKEY_CURRENT_USER,L"Software\\OpenShell\\OpenShell");
 		DWORD lastVersion;
 		if (regKey.QueryDWORDValue(L"LastUpdateVersion",lastVersion)!=ERROR_SUCCESS)
 			lastVersion=0;
 		if (lastVersion==GetVersionEx(g_Instance))
 		{
 		DWORD lastTime;
 		if (regKey.QueryDWORDValue(L"LastUpdateTime",lastTime)!=ERROR_SUCCESS)
 			lastTime=0;
 		if ((int)(curTime-lastTime)<168*TIME_PRECISION)
 			return 0; // check weekly
 		}
 		// check the Update setting (uses the current value in the registry, not the one from memory
 		bool nightly = false;
 		{
 			CRegKey regSettings, regSettingsUser, regPolicy, regPolicyUser;
 			bool bUpgrade=OpenSettingsKeys(COMPONENT_SHARED,regSettings,regSettingsUser,regPolicy,regPolicyUser);
 			CSetting settings[]={
 				{L"Update",CSetting::TYPE_BOOL,0,0,1},
 				{L"Nightly",CSetting::TYPE_BOOL,0,0,0},
 				{NULL}
 			};
 			settings[0].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);
 			settings[1].LoadValue(regSettings,regSettingsUser,regPolicy,regPolicyUser);
 			if (!GetSettingBool(settings[0]))
 				return 0;
 			nightly = GetSettingBool(settings[1]);
 		}
 		VersionCheckParams *params=new VersionCheckParams;
@@ -641,6 +536,7 @@ DWORD CheckForNewVersion( HWND owner, TSettingsComponent component, TVersionChec
 		params->component=component;
 		params->callback=callback;
 		params->progress=NULL;
 		params->nightly=nightly;
 		g_bCheckingVersion=true;
 		if (check==CHECK_AUTO_WAIT)
@@ -848,6 +744,112 @@ void VersionData::Swap( VersionData &data )
 	std::swap(languages,data.languages);
 }
 std::vector<char> DownloadUrl(const wchar_t* url)
 {
 #ifdef UPDATE_LOG
 	LogToFile(UPDATE_LOG, L"URL: %s", url);
 #endif
 	std::vector<char> buffer;
 	TDownloadResult download = DownloadFile(url, buffer, nullptr, false, nullptr, COMPONENT_UPDATE);
 #ifdef UPDATE_LOG
 	LogToFile(UPDATE_LOG, L"Download result: %d", download);
 #endif
 	if (download != DOWNLOAD_OK)
 		buffer.clear();
 	return buffer;
 }
 using namespace nlohmann;
 VersionData::TLoadResult VersionData::Load(bool official)
 {
 	Clear();
 	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 jsonData = json::parse(buf.begin(), buf.end());
 		auto& data = jsonData;
 		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
 		auto tag = data["tag_name"].get<std::string>();
 		if (tag.empty())
 			return LOAD_BAD_FILE;
 		int v1, v2, v3;
 		if (sscanf_s(tag.c_str(), "v%d.%d.%d", &v1, &v2, &v3) != 3)
 			return LOAD_BAD_FILE;
 		newVersion = (v1 << 24) | (v2 << 16) | v3;
 		// installer url
 		std::string url;
 		for (const auto& asset : data["assets"])
 		{
 			if (asset["name"].get<std::string>().find("OpenShellSetup") == 0)
 			{
 				url = asset["browser_download_url"].get<std::string>();
 				break;
 			}
 		}
 		if (url.empty())
 			return LOAD_BAD_FILE;
 		downloadUrl.Append(CA2T(url.c_str()));
 		// changelog
 		auto body = data["body"].get<std::string>();
 		if (!body.empty())
 		{
 			auto name = data["name"].get<std::string>();
 			if (!name.empty())
 			{
 				news.Append(CA2T(name.c_str()));
 				news.Append(L"\r\n\r\n");
 			}
 			news.Append(CA2T(body.c_str()));
 			news.Replace(L"\\n", L"\n");
 			news.Replace(L"\\r", L"\r");
 		}
 		return LOAD_OK;
 	}
 	catch (...)
 	{
 		return LOAD_BAD_FILE;
 	}
 }
 VersionData::TLoadResult VersionData::Load( const wchar_t *fname, bool bLoadFlags )
 {
 	Clear();
@@ -937,7 +939,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param )
 	params.saveRes=0;
 	std::vector<char> buf;
-	params.downloadRes=DownloadFile(params.url,buf,params.fname.IsEmpty()?&params.fname:NULL,0,params.bAcceptCached,params.progress,params.component);
+	params.downloadRes=DownloadFile(params.url,buf,params.fname.IsEmpty()?&params.fname:NULL,params.bAcceptCached,params.progress,params.component);
 	if (params.downloadRes==DOWNLOAD_CANCEL || params.downloadRes>=DOWNLOAD_FIRST_ERROR)
 		return 0;
@@ -971,6 +973,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param )
 		return 0;
 	// validate signer
 /*
 	if (params.signer)
 	{
 		if (params.progress)
@@ -982,7 +985,7 @@ static DWORD WINAPI ThreadDownloadFile( void *param )
 			return 0;
 		}
 	}
-
+*/
 	return 0;
 }
@@ -1089,6 +1092,12 @@ DWORD DownloadNewVersion( HWND owner, TSettingsComponent component, const wchar_
 	params.bAcceptCached=true;
 	params.component=component;
 	{
 		const wchar_t* name = wcsrchr(url, '/');
 		if (name && name[1])
 			params.fname.Append(name+1);
 	}
 	HANDLE hThread=CreateThread(NULL,0,ThreadDownloadFile,&params,0,NULL);
 	while (1)
@@ -31,19 +31,19 @@ struct LanguageVersionData
 struct VersionData
 {
-	bool bValid;
+	bool bValid = false;
-	DWORD newVersion;
+	DWORD newVersion = 0;
-	DWORD encodedLangVersion;
+	DWORD encodedLangVersion = 0;
 	CString downloadUrl;
 	CString downloadSigner;
 	CString news;
 	CString updateLink;
 	CString languageLink;
 	CString altUrl;
-	bool bNewVersion;
+	bool bNewVersion = false;
-	bool bIgnoreVersion;
+	bool bIgnoreVersion = false;
-	bool bNewLanguage;
+	bool bNewLanguage = false;
-	bool bIgnoreLanguage;
+	bool bIgnoreLanguage = false;
 	CString newLanguage;
 	std::vector<LanguageVersionData> languages;
@@ -59,6 +59,7 @@ struct VersionData
 		LOAD_BAD_FILE, // the file is corrupted
 	};
 	TLoadResult Load(bool official);
 	TLoadResult Load( const wchar_t *fname, bool bLoadFlags );
 private:
 	void operator=( const VersionData& );
@@ -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;
 }
@@ -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 );
@@ -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;
@@ -83,6 +83,11 @@
    <OutDir>$(Configuration)64\</OutDir>
    <IntDir>$(Configuration)64\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <PreprocessorDefinitions>APPVEYOR_REPO_COMMIT="$(APPVEYOR_REPO_COMMIT)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
@@ -395,10 +395,13 @@ HBITMAP LoadImageFile( const wchar_t *path, const SIZE *pSize, bool bUseAlpha, b
 		return srcBmp;
 	CComPtr<IWICImagingFactory> pFactory;
 	if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory)))
 	{
 		if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory1)))
 		{
 			if (srcBmp) DeleteObject(srcBmp);
 			return NULL;
 		}
 	}
 	CComPtr<IWICBitmapSource> pBitmap;
 	if (srcBmp)
@@ -534,7 +537,10 @@ HBITMAP LoadImageResource( HMODULE hModule, const wchar_t *name, bool bTopDown,
 {
 	CComPtr<IWICImagingFactory> pFactory;
 	if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory)))
 	{
 		if (FAILED(pFactory.CoCreateInstance(CLSID_WICImagingFactory1)))
 			return NULL;
 	}
 	CComPtr<IWICBitmapSource> pBitmap;
 	if (hModule)
@@ -727,6 +733,19 @@ bool IsWin10RS4( void )
 	return bIsRS4;
 }
 static bool IsWin11Helper()
 {
 	auto version = GetOSVersion();
 	return version.dwMajorVersion >= 10 && version.dwBuildNumber >= 22000;
 }
 // Returns true if the version is Windows11 or later
 bool IsWin11(void)
 {
 	static bool bIsWin11 = IsWin11Helper();
 	return bIsWin11;
 }
 // Wrapper for IShellFolder::ParseDisplayName
 HRESULT ShParseDisplayName( const wchar_t *pszName, PIDLIST_ABSOLUTE *ppidl, SFGAOF sfgaoIn, SFGAOF *psfgaoOut )
 {
@@ -903,3 +922,31 @@ HFONT CreateFontSetting( const wchar_t *fontStr, int dpi )
 	int size=-_wtol(token);
 	return CreateFont(size*dpi/72,0,0,0,weight,bItalic?1:0,0,0,DEFAULT_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,name);
 }
 static UINT WINAPI GetDpiForWindow(HWND hwnd)
 {
 	static auto p = static_cast<decltype(&GetDpiForWindow)>((void*)GetProcAddress(GetModuleHandle(L"user32.dll"), "GetDpiForWindow"));
 	if (p)
 		return p(hwnd);
 	return 0;
 }
 UINT GetDpi(HWND hwnd)
 {
 	UINT dpi = GetDpiForWindow(hwnd);
 	if (!dpi)
 	{
 		// fall-back for older systems
 		HDC hdc = GetDC(nullptr);
 		dpi = GetDeviceCaps(hdc, LOGPIXELSY);
 		ReleaseDC(nullptr, hdc);
 	}
 	return dpi;
 }
 int ScaleForDpi(HWND hwnd, int value)
 {
 	return MulDiv(value, GetDpi(hwnd), USER_DEFAULT_SCREEN_DPI);
 }
@@ -67,6 +67,9 @@ bool IsWin10RS1( void );
 // Returns true if the version is Windows10 RS4 (Spring Creator Update) or later
 bool IsWin10RS4( void );
 // Returns true if the version is Windows11 or later
 bool IsWin11();
 // Wrapper for IShellFolder::ParseDisplayName
 HRESULT ShParseDisplayName( const wchar_t *pszName, PIDLIST_ABSOLUTE *ppidl, SFGAOF sfgaoIn, SFGAOF *psfgaoOut );
@@ -82,6 +85,12 @@ void StringUpper( CString &str );
 // Create a font from the user settings
 HFONT CreateFontSetting( const wchar_t *fontStr, int dpi );
 // Return DPI of given window (or system DPI on older systems)
 UINT GetDpi(HWND hwnd = nullptr);
 // Scale given value according to DPI of window
 int ScaleForDpi(HWND hwnd, int value);
 extern HINSTANCE g_Instance;
 const int ANIM_BUTTON_TAG1='ANM';
@@ -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,7 +789,7 @@ 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]);
@@ -839,7 +839,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 +1701,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 +1711,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 +2209,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 +2710,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 +2770,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);
 		}
@@ -32,6 +32,7 @@ struct CSetting
 		TYPE_SOUND,
 		TYPE_FONT,
 		TYPE_MULTISTRING,
 		TYPE_DIRECTORY,
 	};
 	enum
@@ -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,15 +1227,21 @@ bool BrowseLinkHelper( HWND parent, wchar_t *text )
 	if (!pCustomize)
 		return false;
-	pDialog->SetTitle(LoadStringEx(IDS_PICK_LINK_TITLE));
+	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);
 	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,'|');
@@ -2271,6 +2277,7 @@ public:
 		EDIT_HOTKEY_ANY,
 		EDIT_COLOR,
 		EDIT_FONT,
 		EDIT_DIRECTORY,
 	};
 	BEGIN_MSG_MAP( CTreeSettingsDlg )
@@ -2644,15 +2651,14 @@ LRESULT CTreeSettingsDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO
 		CString str;
 		m_EditBox.GetWindowText(str);
 		str.TrimLeft(); str.TrimRight();
-		wchar_t *end;
+		COLORREF val=RgbToBgr(ParseColor(str));
 		COLORREF val=wcstol(str,&end,16)&0xFFFFFF;
 		static COLORREF customColors[16];
 		CHOOSECOLOR choose={sizeof(choose),m_hWnd,NULL,val,customColors};
 		choose.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT;
 		if (ChooseColor(&choose))
 		{
 			wchar_t text[100];
-			Sprintf(text,_countof(text),L"%06X",choose.rgbResult);
+			Sprintf(text,_countof(text),L"%06X",BgrToRgb(choose.rgbResult));
 			m_EditBox.SetWindowText(text);
 			ApplyEditBox();
 			UpdateGroup(m_pEditSetting);
@@ -2714,6 +2720,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;
 }
@@ -3018,8 +3047,7 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 			}
 			else if (pSetting->type==CSetting::TYPE_COLOR)
 			{
-				wchar_t *end;
+				int val=RgbToBgr(ParseColor(str));
 				int val=wcstol(str,&end,16)&0xFFFFFF;
 				if (pSetting->value.vt!=VT_I4 || pSetting->value.intVal!=val)
 				{
 					pSetting->value=CComVariant(val);
@@ -3034,6 +3062,20 @@ void CTreeSettingsDlg::ApplyEditBox( void )
 					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
 			{
 				if (pSetting->value.vt!=VT_BSTR || str!=pSetting->value.bstrVal)
@@ -3074,7 +3116,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 +3132,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)
 		{
@@ -3110,7 +3154,7 @@ void CTreeSettingsDlg::ItemSelected( HTREEITEM hItem, CSetting *pSetting, bool b
 			mode=EDIT_COLOR;
 			int val=0;
 			if (valVar.vt==VT_I4)
-				val=valVar.intVal;
+				val=BgrToRgb(valVar.intVal);
 			Sprintf(text,_countof(text),L"%06X",val);
 		}
 	}
@@ -3131,7 +3175,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 +3233,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 +3421,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)
 		{
@@ -3412,7 +3460,7 @@ void CTreeSettingsDlg::UpdateGroup( const CSetting *pModified )
 				CString str=LoadStringEx(pSetting->nameID);
 				int val=0;
 				if (valVar.vt==VT_I4)
-					val=valVar.intVal;
+					val=BgrToRgb(valVar.intVal);
 				Sprintf(text,_countof(text),L"%s: %06X",str,val);
 				item.mask|=TVIF_TEXT;
 			}
@@ -3458,7 +3506,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;
@@ -3566,3 +3614,19 @@ bool CDefaultSettingsPanel::Validate( HWND parent )
 	s_Dialog.Validate();
 	return true;
 }
 DWORD RgbToBgr(DWORD val)
 {
 	return ((val & 0xFF) << 16) | (val & 0xFF00) | ((val >> 16) & 0xFF);
 }
 DWORD BgrToRgb(DWORD val)
 {
 	return RgbToBgr(val);
 }
 DWORD ParseColor(const wchar_t* str)
 {
 	wchar_t* end;
 	return wcstoul(str, &end, 16) & 0xFFFFFF;
 }
@@ -385,5 +385,13 @@ 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 );
 // convert color in RRGGBB format to BBGGRR
 DWORD RgbToBgr(DWORD val);
 // convert color in BBGGRR format to RRGGBB
 DWORD BgrToRgb(DWORD val);
 // parse color from hexadecimal string
 DWORD ParseColor(const wchar_t* str);
@@ -40,6 +40,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassicIEDLL", "ClassicIE\ClassicIEDLL\ClassicIEDLL.vcxproj", "{BC0E6E7C-08C1-4F12-A754-4608E5A22FA8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Update", "Update\Update.vcxproj", "{171B46B0-6083-4D9E-BD33-946EA3BD76FA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1} = {D94BD2A6-1872-4F01-B911-F406603AA2E1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win7Aero7", "Skins\Win7Aero7\Win7Aero7.vcxproj", "{A2CCDE9F-17CE-461E-8BD9-00261B8855A6}"
 EndProject
@@ -63,6 +66,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metro", "Skins\Metro\Metro.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metallic7", "Skins\Metallic7\Metallic7.vcxproj", "{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DesktopToasts", "Update\DesktopToasts\DesktopToasts.vcxproj", "{D94BD2A6-1872-4F01-B911-F406603AA2E1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -374,6 +379,15 @@ Global
 		{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|Win32.ActiveCfg = Resource|Win32
 		{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|Win32.Build.0 = Resource|Win32
 		{CA5BFC96-428D-42F5-9F7D-CDDE048A357C}.Setup|x64.ActiveCfg = Resource|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|Win32.Build.0 = Debug|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Debug|x64.ActiveCfg = Debug|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|Win32.ActiveCfg = Release|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|Win32.Build.0 = Release|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Release|x64.ActiveCfg = Release|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.ActiveCfg = Release|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.Build.0 = Release|Win32
 		{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -37,6 +37,8 @@ copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.dll Output > nul
 copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul
 copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul
 copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul
 copy /B ..\Update\Release\Update.exe Output > nul
 copy /B ..\Update\DesktopToasts\Release\DesktopToasts.dll Output > nul
 copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul
 copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul
@@ -96,6 +98,10 @@ copy /B ..\StartMenu\Setup\StartMenuDLL.pdb Output\PDB32 > nul
 copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
 copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
 copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
 copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul
 copy /B Output\Update.exe Output\PDB32 > nul
 copy /B ..\Update\DesktopToasts\Release\DesktopToasts.pdb Output\PDB32 > nul
 copy /B Output\DesktopToasts.dll Output\PDB32 > nul
 REM Menu 64
 copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul
@@ -108,7 +114,7 @@ copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
 REM ********* Source Index PDBs
-set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\srcsrv\pdbstr.exe"
+set PDBSTR_PATH="C:\Program Files (x86)\Windows Kits\10\Debuggers\x86\srcsrv\pdbstr.exe"
 if exist %PDBSTR_PATH% (
 	echo --- Adding source index to PDBs
@@ -116,10 +122,18 @@ if exist %PDBSTR_PATH% (
 	for %%f in (Output\PDB32\*.pdb) do (
 		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
 		if not ERRORLEVEL 0 (
 			echo Error adding source index to PDB
 			exit /b 1
 		)
 	)
 	for %%f in (Output\PDB64\*.pdb) do (
 		%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
 		if not ERRORLEVEL 0 (
 			echo Error adding source index to PDB
 			exit /b 1
 		)
 	)
 )
@@ -103,6 +103,12 @@
 				<ComponentRef Id="IESettingsLink" />
 				<Condition Level="1">IE_BUILD&gt;=90000</Condition>
 			</Feature>
 			<Feature Id="Update" Level="1" Title="!(loc.UpdateTitle)" ConfigurableDirectory="APPLICATIONFOLDER" AllowAdvertise="no" Description="!(loc.UpdateDesc)">
 				<ComponentRef Id="Update.exe" />
 				<ComponentRef Id="DesktopToasts.dll" />
 				<ComponentRef Id="UpdateSettingsLink" />
 				<ComponentRef Id="ToastActivator" />
 			</Feature>
 		</Feature>
 		<UI>
 			<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
@@ -469,6 +475,12 @@
 			<Component Id="StartMenuHelperL10N.ini" Guid="144CE4DC-0C77-4793-B79A-A32E48A90E64" Win64="$(var.CS_WIN64)">
 				<File Id="StartMenuHelperL10N.ini" KeyPath="yes" Source="..\StartMenu\StartMenuHelper\StartMenuHelperL10N.ini" Vital="yes" />
 			</Component>
 			<Component Id="Update.exe" Guid="FB6C213F-B670-4888-8B2C-12E807E335A7" Win64="$(var.CS_WIN64)">
 				<File Id="Update" KeyPath="yes" Source="Output\Update.exe" Checksum="yes" Vital="yes" />
 			</Component>
 			<Component Id="DesktopToasts.dll" Guid="B42157AF-3984-4796-8BD6-501FC5450FF1" Win64="$(var.CS_WIN64)">
 				<File Id="DesktopToasts.dll" KeyPath="yes" Source="Output\DesktopToasts.dll" Checksum="yes" Vital="yes" />
 			</Component>
 			<Component Id="PolicyDefinitions.zip" Guid="580A15D0-4023-471d-9D82-9D63FBA42B5D" Win64="$(var.CS_WIN64)">
 				<File Id="PolicyDefinitions.zip" KeyPath="yes" Source="Output\PolicyDefinitions.zip" Vital="yes" />
 			</Component>
@@ -544,6 +556,11 @@
 			<Component Id="TreatAs" Guid="B1E7462A-E1E2-47eb-A42C-7BD272D738AA" Win64="$(var.CS_WIN64)">
 				<RegistryKey Root="HKCR" Key="CLSID\{ECD4FC4D-521C-11D0-B792-00A0C90312E1}\TreatAs" ForceDeleteOnUninstall="yes" />
 			</Component>
 			<Component Id="ToastActivator" Guid="3A0FDC31-D5D3-4C2E-9A0B-292CAB46DA87" Win64="$(var.CS_WIN64)">
 				<RegistryKey Root="HKCR" Key="CLSID\{E407B70A-1FBD-4D5E-8822-231C69102472}\LocalServer32" ForceDeleteOnUninstall="yes">
 					<RegistryValue Value="&quot;[APPLICATIONFOLDER]Update.exe&quot; -ToastActivated" Type="string" />
 				</RegistryKey>
 			</Component>
 		</DirectoryRef>
 		<DirectoryRef Id="StartMenuDir">
 			<Component Id="HelpLink" Guid="D631C351-7BD4-42CE-813C-5D46347068AF">
@@ -556,6 +573,15 @@
 				<CreateFolder />
 				<Condition>START_MENU_FOLDER=1</Condition>
 			</Component>
 			<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"/>
 					<!-- 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>
 			</Component>
 			<Component Id="ExplorerSettingsLink" Guid="6EC027F2-115D-4110-8189-DDAFC78169EC">
 				<Shortcut Id="ExplorerSettingsLink" Name="!(loc.ExplorerItem)" Advertise="no" Description="!(loc.ExplorerSettingsDesc)" Target="[APPLICATIONFOLDER]ClassicExplorerSettings.exe" WorkingDirectory="APPLICATIONFOLDER">
 					<ShortcutProperty Key="System.AppUserModel.ID" Value="OpenShell.ClassicExplorer.Settings" />
@@ -405,7 +405,7 @@ void ShowMetroColorViewer( void )
 			if (fout) fprintf(fout,"%02X%02X%02X%02X %S\n",(color>>24)&0xFF,color&0xFF,(color>>8)&0xFF,(color>>16)&0xFF,name);
 #endif
 			MetroColor mc;
-			mc.name=name;
+			mc.name=text;
 			mc.NAME=mc.name;
 			mc.NAME.MakeUpper();
 			mc.type=type;
@@ -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;
 }
@@ -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%
@@ -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%
@@ -561,6 +561,7 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 	else if (wcsstr(lpstrCmdLine,L"-toggle")!=NULL) open=MSG_TOGGLE;
 	else if (wcsstr(lpstrCmdLine,L"-open")!=NULL) open=MSG_OPEN;
 	else if (wcsstr(lpstrCmdLine,L"-settings")!=NULL) open=MSG_SETTINGS;
 	else if (wcsstr(lpstrCmdLine,L"-reloadsettings")!=NULL) open=MSG_RELOADSETTINGS;
 	else if (wcsstr(lpstrCmdLine,L"-exit")!=NULL) open=MSG_EXIT;
 	{
@@ -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 )
 {
@@ -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"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},
+	{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},
@@ -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;
@@ -15,9 +15,7 @@ public:
 		m_RefCount=0;
 	}
-	~CDropTargetProxy( void )
+	~CDropTargetProxy( void ) = default;
 	{
 	}
 	void Reset( void )
 	{
@@ -55,8 +55,8 @@ GUID IID_IApplicationResolver8={0xde25675a,0x72de,0x44b4,{0x93,0x73,0x05,0x17,0x
 interface IResourceContext;
-const GUID IID_IResourceMap={0x6e21e72b, 0xb9b0, 0x42ae, {0xa6, 0x86, 0x98, 0x3c, 0xf7, 0x84, 0xed, 0xcd}};
+MIDL_INTERFACE("6e21e72b-b9b0-42ae-a686-983cf784edcd")
-interface IResourceMap : public IUnknown
+IResourceMap : public IUnknown
 {
 	virtual HRESULT STDMETHODCALLTYPE GetUri(const wchar_t **pUri ) = 0;
 	virtual HRESULT STDMETHODCALLTYPE GetSubtree(const wchar_t *propName, IResourceMap **pSubTree ) = 0;
@@ -76,8 +76,8 @@ enum RESOURCE_SCALE
 	RES_SCALE_80 =3,
 };
-const GUID IID_ResourceContext={0xe3c22b30, 0x8502, 0x4b2f, {0x91, 0x33, 0x55, 0x96, 0x74, 0x58, 0x7e, 0x51}};
+MIDL_INTERFACE("e3c22b30-8502-4b2f-9133-559674587e51")
-interface IResourceContext : public IUnknown
+IResourceContext : public IUnknown
 {
 	virtual HRESULT STDMETHODCALLTYPE GetLanguage( void ) = 0;
 	virtual HRESULT STDMETHODCALLTYPE GetHomeRegion( wchar_t *pRegion ) = 0;
@@ -176,6 +176,27 @@ static void CreateMonochromeImage( unsigned int *bits, int stride, int width, in
 	}
 }
 HBITMAP ColorizeMonochromeImage(HBITMAP bitmap, DWORD color)
 {
 	{
 		BITMAP info{};
 		GetObject(bitmap, sizeof(info), &info);
 		if (!DetectGrayscaleImage((const unsigned int*)info.bmBits, info.bmWidth, info.bmWidth, info.bmHeight))
 			return nullptr;
 	}
 	HBITMAP bmp = (HBITMAP)CopyImage(bitmap, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
 	if (bmp)
 	{
 		BITMAP info{};
 		GetObject(bmp, sizeof(info), &info);
 		CreateMonochromeImage((unsigned int*)info.bmBits, info.bmWidth, info.bmWidth, info.bmHeight, color);
 	}
 	return bmp;
 }
 static HBITMAP BitmapFromMetroIcon( HICON hIcon, int bitmapSize, int iconSize, DWORD metroColor, bool bDestroyIcon=true )
 {
 	ICONINFO info;
@@ -259,7 +280,6 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met
 	HGDIOBJ bmp0=SelectObject(hdc,bmp);
 	HGDIOBJ bmp02=SelectObject(hsrc,hBitmap);
 	int offset=(bitmapSize-info.bmWidth)/2;
 	bool bInvert=g_bInvertMetroIcons;
 	if (g_bInvertMetroIcons && bGrayscale)
 	{
 		FillRect(hdc,&rc,(HBRUSH)GetStockObject(BLACK_BRUSH));
@@ -300,10 +320,9 @@ static HBITMAP BitmapFromMetroBitmap( HBITMAP hBitmap, int bitmapSize, DWORD met
 ///////////////////////////////////////////////////////////////////////////////
-static HBITMAP LoadMetroBitmap0( const wchar_t *path, int bitmapSize, DWORD metroColor )
+static HBITMAP LoadMetroBitmap0(const wchar_t *path, int bitmapSize, DWORD metroColor = 0xFFFFFFFF)
 {
-	int iconSize=g_bInvertMetroIcons?bitmapSize:(bitmapSize-2);
+	SIZE size={-bitmapSize,bitmapSize};
 	SIZE size={-iconSize,iconSize};
 	HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL);
 	if (hBitmap)
 	{
@@ -439,17 +458,9 @@ static HBITMAP LoadMetroBitmap2( const wchar_t *location, int bitmapSize, DWORD
 		}
 	}
 	if (iconSize)
 	{
 		if (g_bInvertMetroIcons)
 	{
 		if (iconSize>bitmapSize)
 			iconSize=bitmapSize;
 		}
 		else
 		{
 			if (iconSize>bitmapSize-2)
 				iconSize=bitmapSize-2;
 		}
 		SIZE size={iconSize,iconSize};
 		HBITMAP hBitmap=LoadImageFile(path,&size,true,true,NULL);
 		if (hBitmap)
@@ -478,7 +489,8 @@ void CItemManager::LoadIconData::Init( void )
 			HIMAGELIST_QueryInterface(m_TempLists[i],IID_IImageList2,(void**)&m_pTempLists[i]);
 		}
 	}
-	m_pFactory.CoCreateInstance(CLSID_WICImagingFactory);
+	if (FAILED(m_pFactory.CoCreateInstance(CLSID_WICImagingFactory)))
 		m_pFactory.CoCreateInstance(CLSID_WICImagingFactory1);
 }
 void CItemManager::LoadIconData::Close( void )
@@ -578,7 +590,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);
@@ -598,7 +610,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());
@@ -606,7 +618,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;
@@ -693,21 +705,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 )
@@ -885,7 +897,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;
@@ -967,7 +979,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)
@@ -1065,7 +1077,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;
@@ -1114,6 +1126,49 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *path,
 	return GetCustomIcon(text,index,iconSizeType,false);
 }
 const CItemManager::ItemInfo* CItemManager::GetLinkIcon(IShellLink* link, TIconSizeType iconSizeType)
 {
 	wchar_t location[_MAX_PATH];
 	int index;
 	if (link->GetIconLocation(location, _countof(location), &index) == S_OK && location[0])
 		return GetCustomIcon(location, index, iconSizeType, (index == 0)); // assuming that if index!=0 the icon comes from a permanent location like a dll or exe
 	CComQIPtr<IPropertyStore> store(link);
 	if (store)
 	{
 		//  Name:     System.AppUserModel.DestListLogoUri -- PKEY_AppUserModel_DestListLogoUri
 		//  Type:     String -- VT_LPWSTR
 		//  FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 29
 		static const PROPERTYKEY PKEY_AppUserModel_DestListLogoUri = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 29 };
 		auto logoUri = GetPropertyStoreString(store, PKEY_AppUserModel_DestListLogoUri);
 		if (!logoUri.IsEmpty())
 		{
 			auto appId = GetPropertyStoreString(store, PKEY_AppUserModel_ID);
 			if (!appId.IsEmpty())
 			{
 				CComPtr<IResourceManager> resManager;
 				if (SUCCEEDED(resManager.CoCreateInstance(CLSID_ResourceManager)))
 				{
 					if (SUCCEEDED(resManager->InitializeForPackage(GetPackageFullName(appId))))
 					{
 						CComPtr<IResourceMap> resMap;
 						if (SUCCEEDED(resManager->GetMainResourceMap(IID_PPV_ARGS(&resMap))))
 						{
 							CComString location;
 							if (SUCCEEDED(resMap->GetFilePath(logoUri, &location)))
 								return GetCustomIcon(location, -65536, iconSizeType, true);
 						}
 					}
 				}
 			}
 		}
 	}
 	return nullptr;
 }
 const CItemManager::ItemInfo *CItemManager::GetMetroAppInfo10( const wchar_t *appid )
 {
 	wchar_t APPID[256];
@@ -1824,7 +1879,11 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 					{
 						newInfo.bLink=true;
 						pStore=pLink;
-
+#ifdef _DEBUG
 						LOG_MENU(LOG_OPEN, L"Link: %s", newInfo.path);
 						LOG_MENU(LOG_OPEN, L"Link property store:");
 						LogPropertyStore(LOG_OPEN, pStore);
 #endif
 						if (SUCCEEDED(pLink->GetIDList(&newInfo.targetPidl)))
 						{
 							wchar_t path[_MAX_PATH];
@@ -1833,6 +1892,28 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 								CharUpper(path);
 								newInfo.targetPATH=path;
 							}
 							CComPtr<IShellItem> target;
 							if (SUCCEEDED(SHCreateItemFromIDList(newInfo.targetPidl, IID_PPV_ARGS(&target))))
 							{
 								CComPtr<IPropertyStore> store;
 								if (SUCCEEDED(target->BindToHandler(nullptr, BHID_PropertyStore, IID_PPV_ARGS(&store))))
 								{
 #ifdef _DEBUG
 									LOG_MENU(LOG_OPEN, L"Target property store:");
 									LogPropertyStore(LOG_OPEN, store);
 #endif
 									PROPVARIANT val;
 									PropVariantInit(&val);
 									if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal)
 									{
 										newInfo.bLink = false;
 										pItem = std::move(target);
 										pStore = store;
 									}
 									PropVariantClear(&val);
 								}
 							}
 						}
 					}
 				}
@@ -1924,7 +2005,6 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
 			{
 				newInfo.targetPidl.Clear();
 				newInfo.targetPATH.Empty();
 				newInfo.metroName.Empty();
 				newInfo.iconPath.Empty();
 				newInfo.bNoPin=newInfo.bNoNew=false;
 				if (!newInfo.bMetroApp)
@@ -2297,12 +2377,6 @@ void CItemManager::LoadShellIcon( IShellItem *pItem, int refreshFlags, const Ico
 	int smallIconSize=SMALL_ICON_SIZE;
 	int largeIconSize=LARGE_ICON_SIZE;
 	int extraLargeIconSize=EXTRA_LARGE_ICON_SIZE;
 	if (pMetroColor)
 	{
 		smallIconSize-=2;
 		largeIconSize-=2;
 		extraLargeIconSize-=2;
 	}
 	HICON hSmallIcon=NULL, hLargeIcon=NULL, hExtraLargeIcon=NULL;
 	if (bNotFileName)
 	{
@@ -2415,14 +2489,13 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
 	if (FAILED(pResManager->InitializeForPackage(packageName)))
 		return;
 	CComPtr<IResourceMap> pResMap;
-	if (FAILED(pResManager->GetMainResourceMap(IID_IResourceMap,(void**)&pResMap)))
+	if (FAILED(pResManager->GetMainResourceMap(IID_PPV_ARGS(&pResMap))))
 		return;
 	CComPtr<IResourceContext> pResContext;
-	if (FAILED(pResManager->GetDefaultContext(IID_ResourceContext,(void**)&pResContext)))
+	if (FAILED(pResManager->GetDefaultContext(IID_PPV_ARGS(&pResContext))))
 		return;
 	int iconFlags=0;
-	int delta=g_bInvertMetroIcons?0:2;
+	if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE))
 	if ((refreshFlags&INFO_SMALL_ICON) && SetResContextTargetSize(pResContext,SMALL_ICON_SIZE-delta))
 	{
 		CComString pLocation;
 		if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2432,7 +2505,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
 			StoreInCache(hash,L"",hSmallBitmap,NULL,NULL,INFO_SMALL_ICON,smallIcon,largeIcon,extraLargeIcon,false,true);
 		}
 	}
-	if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE-delta))
+	if ((refreshFlags&INFO_LARGE_ICON) && SetResContextTargetSize(pResContext,LARGE_ICON_SIZE))
 	{
 		CComString pLocation;
 		if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2442,7 +2515,7 @@ void CItemManager::LoadMetroIcon( IShellItem *pItem, int &refreshFlags, const Ic
 			StoreInCache(hash,L"",NULL,hLargeBitmap,NULL,INFO_LARGE_ICON,smallIcon,largeIcon,extraLargeIcon,false,true);
 		}
 	}
-	if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE-delta))
+	if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && SetResContextTargetSize(pResContext,EXTRA_LARGE_ICON_SIZE))
 	{
 		CComString pLocation;
 		if (SUCCEEDED(pResMap->GetFilePath(iconName,&pLocation)))
@@ -2525,7 +2598,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;
@@ -2535,7 +2608,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;
@@ -2545,7 +2618,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;
@@ -2587,49 +2660,45 @@ void CItemManager::IconInfo::SetPath( const wchar_t *path )
 	timestamp.dwHighDateTime=timestamp.dwLowDateTime=0;
 }
-void CItemManager::LoadCustomIcon( const wchar_t *iconPath, int iconIndex, int refreshFlags, const IconInfo *&smallIcon, const IconInfo *&largeIcon, const IconInfo *&extraLargeIcon, bool bTemp )
+void CItemManager::LoadCustomIcon(const wchar_t *iconPath, int iconIndex, int refreshFlags, const IconInfo *&smallIcon, const IconInfo *&largeIcon, const IconInfo *&extraLargeIcon, bool bTemp)
 {
-	unsigned int hash=CalcFNVHash(iconPath,CalcFNVHash(&iconIndex,4));
+	unsigned int hash = CalcFNVHash(iconPath, CalcFNVHash(&iconIndex, 4));
-	FindInCache(hash,refreshFlags,smallIcon,largeIcon,extraLargeIcon);
+	FindInCache(hash, refreshFlags, smallIcon, largeIcon, extraLargeIcon);
-	if (!refreshFlags) return;
+	if (!refreshFlags)
 		return;
 	auto ExtractIconAsBitmap = [&](int iconSize) -> HBITMAP {
 		if (iconIndex == -65536)
 			return LoadMetroBitmap0(iconPath, iconSize);
 		HICON hIcon;
 		if (!*iconPath)
 			hIcon = (HICON)LoadImage(g_Instance, MAKEINTRESOURCE(-iconIndex), IMAGE_ICON, iconSize, iconSize, LR_DEFAULTCOLOR);
 		else
 			hIcon = ShExtractIcon(iconPath, iconIndex == -1 ? 0 : iconIndex, iconSize);
 		if (hIcon)
 			return BitmapFromIcon(hIcon, iconSize);
 		return nullptr;
 	};
 	// extract icon
-	HBITMAP hSmallBitmap=NULL, hLargeBitmap=NULL, hExtraLargeBitmap=NULL;
+	HBITMAP hSmallBitmap = nullptr, hLargeBitmap = nullptr, hExtraLargeBitmap = nullptr;
 	if (refreshFlags&INFO_SMALL_ICON)
 	{
 		HICON hIcon;
 		if (!*iconPath)
 			hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,SMALL_ICON_SIZE,SMALL_ICON_SIZE,LR_DEFAULTCOLOR);
 		else
 			hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,SMALL_ICON_SIZE);
 		if (hIcon)
 			hSmallBitmap=BitmapFromIcon(hIcon,SMALL_ICON_SIZE);
 	}
-	if (refreshFlags&INFO_LARGE_ICON)
+	if (refreshFlags & INFO_SMALL_ICON)
-	{
+		hSmallBitmap = ExtractIconAsBitmap(SMALL_ICON_SIZE);
 		HICON hIcon;
 		if (!*iconPath)
 			hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,LARGE_ICON_SIZE,LARGE_ICON_SIZE,LR_DEFAULTCOLOR);
 		else
 			hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,LARGE_ICON_SIZE);
 		if (hIcon)
 			hLargeBitmap=BitmapFromIcon(hIcon,LARGE_ICON_SIZE);
 	}
-	if (refreshFlags&INFO_EXTRA_LARGE_ICON)
+	if (refreshFlags & INFO_LARGE_ICON)
-	{
+		hLargeBitmap = ExtractIconAsBitmap(LARGE_ICON_SIZE);
 		HICON hIcon;
 		if (!*iconPath)
 			hIcon=(HICON)LoadImage(g_Instance,MAKEINTRESOURCE(-iconIndex),IMAGE_ICON,EXTRA_LARGE_ICON_SIZE,EXTRA_LARGE_ICON_SIZE,LR_DEFAULTCOLOR);
 		else
 			hIcon=ShExtractIcon(iconPath,iconIndex==-1?0:iconIndex,EXTRA_LARGE_ICON_SIZE);
 		if (hIcon)
 			hExtraLargeBitmap=BitmapFromIcon(hIcon,EXTRA_LARGE_ICON_SIZE);
 	}
-	StoreInCache(hash,bTemp?NULL:iconPath,hSmallBitmap,hLargeBitmap,hExtraLargeBitmap,refreshFlags,smallIcon,largeIcon,extraLargeIcon,bTemp,false);
+	if (refreshFlags & INFO_EXTRA_LARGE_ICON)
 		hExtraLargeBitmap = ExtractIconAsBitmap(EXTRA_LARGE_ICON_SIZE);
 	StoreInCache(hash, bTemp ? nullptr : iconPath, hSmallBitmap, hLargeBitmap, hExtraLargeBitmap, refreshFlags, smallIcon, largeIcon, extraLargeIcon, bTemp, false);
 }
 // Recursive function to preload the items for a folder
@@ -2799,7 +2868,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;
@@ -3205,7 +3275,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
 				{
@@ -3236,7 +3306,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;
@@ -3500,7 +3570,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;
@@ -173,6 +173,7 @@ public:
 	const ItemInfo *GetItemInfo( CString path, int refreshFlags, TLocation location=LOCATION_UNKNOWN );
 	const ItemInfo *GetCustomIcon( const wchar_t *location, int index, TIconSizeType iconSizeType, bool bTemp );
 	const ItemInfo *GetCustomIcon( const wchar_t *path, TIconSizeType iconSizeType );
 	const ItemInfo* GetLinkIcon(IShellLink* link, TIconSizeType iconSizeType);
 	const ItemInfo *GetMetroAppInfo10( const wchar_t *appid );
 	void UpdateItemInfo( const ItemInfo *pInfo, int refreshFlags, bool bHasWriteLock=false );
 	void WaitForShortcuts( const POINT &balloonPos );
@@ -466,9 +467,9 @@ bool MenuGetFileTimestamp( const wchar_t *path, FILETIME *pWriteTime, FILETIME *
 STDAPI ShGetKnownFolderPath( REFKNOWNFOLDERID rfid, PWSTR *pPath );
 STDAPI ShGetKnownFolderIDList(REFKNOWNFOLDERID rfid, PIDLIST_ABSOLUTE *pPidl );
 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"
@@ -198,8 +198,14 @@ 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())
 		return true;
@@ -322,6 +328,9 @@ static void AddJumpItem( CJumpGroup &group, IUnknown *pUnknown, std::vector<CCom
 			}
 		}
 		LOG_MENU(LOG_OPEN,L"Jumplist Link Name: %s",item.name);
 #ifdef _DEBUG
 		LogPropertyStore(LOG_OPEN, pStore);
 #endif
 		if (!item.name.IsEmpty())
 			group.items.push_back(item);
 		return;
@@ -519,91 +528,15 @@ bool GetJumplist( const wchar_t *appid, CJumpList &list, int maxCount, int maxHe
 bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &item, HWND hwnd )
 {
 	Assert(GetWinVersion()>=WIN_VER_WIN7);
-	if (!item.pItem) return false;
+	if (!item.pItem)
 		return false;
 	if (item.type==CJumpItem::TYPE_ITEM)
 	{
 /*		CString appid;
 		{
 			CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS);
 			appid=pAppInfo->GetAppid();
 		}
 		LOG_MENU(LOG_OPEN,L"Execute Item: name=%s, appid=%s",item.name,appid);*/
 		CComQIPtr<IShellItem> pItem(item.pItem);
 		if (!pItem)
 			return false;
 /*		CComString pName;
 		if (FAILED(pItem->GetDisplayName(SIGDN_DESKTOPABSOLUTEPARSING,&pName)))
 			return false;
 		wchar_t ext[_MAX_EXT];
 		Strcpy(ext,_countof(ext),PathFindExtension(pName));
 		// find the correct association handler by appid and invoke it on the item
 		CComPtr<IEnumAssocHandlers> pEnumHandlers;
 		if (ext[0] && SUCCEEDED(SHAssocEnumHandlers(ext,ASSOC_FILTER_RECOMMENDED,&pEnumHandlers)))
 		{
 			CComPtr<IAssocHandler> pHandler;
 			ULONG count;
 			while (SUCCEEDED(pEnumHandlers->Next(1,&pHandler,&count)) && count==1)
 			{
 				CComQIPtr<IObjectWithAppUserModelID> pObject=pHandler;
 				if (pObject)
 				{
 					CComString pID;
 					if (SUCCEEDED(pObject->GetAppID(&pID)))
 					{
 						// found explicit appid
 						if (_wcsicmp(appid,pID)==0)
 						{
 							LOG_MENU(LOG_OPEN,L"Found handler appid");
 							CComPtr<IDataObject> pDataObject;
 							if (SUCCEEDED(pItem->BindToHandler(NULL,BHID_DataObject,IID_IDataObject,(void**)&pDataObject)) && SUCCEEDED(pHandler->Invoke(pDataObject)))
 								return true;
 							break;
 						}
 					}
 				}
 				pHandler=NULL;
 			}
 			pEnumHandlers=NULL;
 			// find the correct association handler by exe name and invoke it on the item
 			wchar_t targetPath[_MAX_PATH];
 			targetPath[0]=0;
 			{
 				CComPtr<IShellItem> pItem;
 				SHCreateItemFromIDList(pAppInfo->GetPidl(),IID_IShellItem,(void**)&pItem);
 				CComPtr<IShellLink> pLink;
 				if (pItem)
 					pItem->BindToHandler(NULL,BHID_SFUIObject,IID_IShellLink,(void**)&pLink);
 				CAbsolutePidl target;
 				if (pLink && SUCCEEDED(pLink->Resolve(NULL,SLR_INVOKE_MSI|SLR_NO_UI|SLR_NOUPDATE)) && SUCCEEDED(pLink->GetIDList(&target)))
 				{
 					if (FAILED(SHGetPathFromIDList(target,targetPath)))
 						targetPath[0]=0;
 				}
 			}
 			if (targetPath[0] && SUCCEEDED(SHAssocEnumHandlers(ext,ASSOC_FILTER_RECOMMENDED,&pEnumHandlers)))
 			{
 				while (SUCCEEDED(pEnumHandlers->Next(1,&pHandler,&count)) && count==1)
 				{
 					CComString pExe;
 					if (SUCCEEDED(pHandler->GetName(&pExe)))
 					{
 						if (_wcsicmp(targetPath,pExe)==0)
 						{
 							LOG_MENU(LOG_OPEN,L"Found handler appexe %s",targetPath);
 							CComPtr<IDataObject> pDataObject;
 							if (SUCCEEDED(pItem->BindToHandler(NULL,BHID_DataObject,IID_IDataObject,(void**)&pDataObject)) && SUCCEEDED(pHandler->Invoke(pDataObject)))
 								return true;
 							break;
 						}
 					}
 					pHandler=NULL;
 				}
 			}
 		}
 */
 		// couldn't find a handler, execute the old way
 		SHELLEXECUTEINFO execute={sizeof(execute),SEE_MASK_IDLIST|SEE_MASK_FLAG_LOG_USAGE};
 		execute.nShow=SW_SHOWNORMAL;
 		CAbsolutePidl pidl;
@@ -617,9 +550,50 @@ bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &i
 	if (item.type==CJumpItem::TYPE_LINK)
 	{
-		// invoke the link through its context menu
+		//  Name:     System.AppUserModel.HostEnvironment -- PKEY_AppUserModel_HostEnvironment
 		//  Type:     UInt32 -- VT_UI4
 		//  FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 14
 		static const PROPERTYKEY PKEY_AppUserModel_HostEnvironment = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 14 };
 		//  Name:     System.AppUserModel.ActivationContext -- PKEY_AppUserModel_ActivationContext
 		//  Type:     String -- VT_LPWSTR
 		//  FormatID: {9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3}, 20
 		static const PROPERTYKEY PKEY_AppUserModel_ActivationContext = { {0x9F4C2855, 0x9F79, 0x4B39, {0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3}}, 20 };
 		CComQIPtr<IContextMenu> pMenu(item.pItem);
-		if (!pMenu) return false;
+		CStringA params;
 		CComQIPtr<IShellLink> pLink(item.pItem);
 		if (pLink)
 		{
 			CComQIPtr<IPropertyStore> store(pLink);
 			if (store)
 			{
 				auto appId = GetPropertyStoreString(store, PKEY_AppUserModel_ID);
 				if (!appId.IsEmpty())
 				{
 					CComPtr<IShellItem2> target;
 					if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder, 0, appId, IID_PPV_ARGS(&target))))
 					{
 						ULONG modern = 0;
 						if (SUCCEEDED(target->GetUInt32(PKEY_AppUserModel_HostEnvironment, &modern)) && modern)
 						{
 							CComQIPtr<IContextMenu> targetMenu;
 							if (SUCCEEDED(target->BindToHandler(nullptr, BHID_SFUIObject, IID_PPV_ARGS(&targetMenu))))
 							{
 								pMenu = targetMenu;
 								params = CT2CA(GetPropertyStoreString(store, PKEY_AppUserModel_ActivationContext));
 							}
 						}
 					}
 				}
 			}
 		}
 		// invoke the link through its context menu
 		if (!pMenu)
 			return false;
 		HRESULT hr;
 		HMENU menu=CreatePopupMenu();
 		hr=pMenu->QueryContextMenu(menu,0,1,1000,CMF_DEFAULTONLY);
@@ -633,6 +607,8 @@ bool ExecuteJumpItem( const CItemManager::ItemInfo *pAppInfo, const CJumpItem &i
 		{
 			CMINVOKECOMMANDINFO command={sizeof(command),CMIC_MASK_FLAG_LOG_USAGE};
 			command.lpVerb=MAKEINTRESOURCEA(id-1);
 			if (!params.IsEmpty())
 				command.lpParameters = params;
 			wchar_t path[_MAX_PATH];
 			GetModuleFileName(NULL,path,_countof(path));
 			if (_wcsicmp(PathFindFileName(path),L"explorer.exe")==0)
@@ -7,10 +7,13 @@
 #include "stdafx.h"
 #include "LogManager.h"
 #include "ResourceHelper.h"
 #include "ComHelper.h"
 #include <propvarutil.h>
 #include <chrono>
 int g_LogCategories;
 static FILE *g_LogFile;
-static int g_LogTime;
+static std::chrono::time_point<std::chrono::steady_clock> g_LogTime;
 void InitLog( int categories, const wchar_t *fname )
 {
@@ -21,7 +24,7 @@ void InitLog( int categories, const wchar_t *fname )
 		wchar_t bom=0xFEFF;
 		fwrite(&bom,2,1,g_LogFile);
 		g_LogCategories=categories;
-		g_LogTime=GetTickCount();
+		g_LogTime=std::chrono::steady_clock::now();
 		LogMessage(L"version=%x, PID=%d, TID=%d, Categories=%08x\r\n",GetWinVersion(),GetCurrentProcessId(),GetCurrentThreadId(),categories);
 	}
 }
@@ -38,7 +41,7 @@ void LogMessage( const wchar_t *text, ... )
 	if (!g_LogFile) return;
 	wchar_t buf[2048];
-	int len=Sprintf(buf,_countof(buf),L"%8d: ",GetTickCount()-g_LogTime);
+	int len=Sprintf(buf,_countof(buf),L"%8d: ",std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now()-g_LogTime).count());
 	fwrite(buf,2,len,g_LogFile);
 	va_list args;
@@ -51,3 +54,31 @@ void LogMessage( const wchar_t *text, ... )
 	fflush(g_LogFile);
 }
 void LogPropertyStore(TLogCategory category, IPropertyStore* store)
 {
 	if (!store)
 		return;
 	DWORD count = 0;
 	store->GetCount(&count);
 	for (DWORD i = 0; i < count; i++)
 	{
 		PROPERTYKEY key{};
 		store->GetAt(i, &key);
 		PROPVARIANT val;
 		PropVariantInit(&val);
 		store->GetValue(key, &val);
 		CComString valueStr;
 		PropVariantToStringAlloc(val, &valueStr);
 		PropVariantClear(&val);
 		wchar_t guidStr[100]{};
 		StringFromGUID2(key.fmtid, guidStr, _countof(guidStr));
 		LOG_MENU(category, L"Property: {%s, %u} = %s", guidStr, key.pid, valueStr ? valueStr : L"???");
 	}
 }
@@ -4,6 +4,8 @@
 #pragma once
 #include <propsys.h>
 // LogManager.h - logging functionality (for debugging)
 // Logs different events in the start menu
 // Turn it on by setting the LogLevel setting in the registry
@@ -33,3 +35,5 @@ void CloseLog( void );
 void LogMessage( const wchar_t *text, ... );
 #define STARTUP_LOG L"Software\\OpenShell\\StartMenu\\Settings|LogStartup|%LOCALAPPDATA%\\OpenShell\\StartupLog.txt"
 void LogPropertyStore(TLogCategory category, IPropertyStore* store);
@@ -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,13 +2783,20 @@ 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))
 			{
 				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)
 			{
 				info.fMask|=CMIC_MASK_PTINVOKE;
@@ -2803,6 +2811,10 @@ void CMenuContainer::ActivateItem( int index, TActivateType type, const POINT *p
 			if (bRefresh || bRefreshMain)
 				info.fMask|=CMIC_MASK_NOASYNC; // wait for delete/link commands to finish so we can refresh the menu
 			// we don't want our virtual folder to appear in Explorer's frequent list
 			if (item.pItemInfo && wcsncmp(item.pItemInfo->PATH, L"::{82E749ED-B971-4550-BAF7-06AA2BF7E836}", 40) == 0)
 				info.fMask &= ~CMIC_MASK_FLAG_LOG_USAGE;
 			s_bPreventClosing=true;
 			for (auto& it : s_Menus)
 			{
@@ -2818,9 +2830,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);
 			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);
-			if (type==ACTIVATE_EXECUTE && SUCCEEDED(hr))
+				executeSuccess=SUCCEEDED(hr);
 			}
 			if (type==ACTIVATE_EXECUTE && executeSuccess)
 			{
 				if (bTrackRecent)
 				{
@@ -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;
@@ -343,7 +345,8 @@ bool CMenuContainer::s_bMRULoaded=false;
 const CItemManager::ItemInfo *CMenuContainer::s_JumpAppInfo;
 CJumpList CMenuContainer::s_JumpList;
 int CMenuContainer::s_TaskBarId;
-HWND CMenuContainer::s_TaskBar, CMenuContainer::s_StartButton;
+HWND CMenuContainer::s_TaskBar;
 HWND CMenuContainer::s_StartButton;	// custom start button (if any)
 UINT CMenuContainer::s_TaskBarEdge;
 RECT CMenuContainer::s_StartRect;
 HWND CMenuContainer::s_LastFGWindow;
@@ -443,6 +446,9 @@ 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]);
 			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);
 		}
@@ -1066,7 +1072,7 @@ void CMenuContainer::AddStandardItems( void )
 		const StdMenuItem *pInlineParent=NULL;
 		int searchProviderIndex=-1;
 		m_SearchProvidersCount=0;
-		MenuSkin::TIconSize mainIconSize=s_Skin.Main_icon_size;
+		bool bSecondColumn=false;
 		for (const StdMenuItem *pStdItem=m_pStdItem;;pStdItem++)
 		{
 			if (pStdItem->id==MENU_LAST)
@@ -1084,8 +1090,8 @@ void CMenuContainer::AddStandardItems( void )
 			if (m_bSubMenu && pStdItem->id==s_ShutdownCommand)
 				continue;
-			if (pStdItem->id==MENU_COLUMN_BREAK && m_bTwoColumns)
+			if (pStdItem->id==MENU_COLUMN_BREAK && !m_bSubMenu && s_Skin.TwoColumns)
-				mainIconSize=s_Skin.Main2_icon_size;
+				bSecondColumn=true;
 			int stdOptions=GetStdOptions(pStdItem->id);
 			if (!(stdOptions&MENU_ENABLED)) continue;
@@ -1266,6 +1272,10 @@ void CMenuContainer::AddStandardItems( void )
 			item.bSplit=item.bFolder && (item.pStdItem->settings&StdMenuItem::MENU_SPLIT_BUTTON)!=0;
 			// get icon
 			MenuSkin::TIconSize mainIconSize=!bSecondColumn ? s_Skin.Main_icon_size : s_Skin.Main2_icon_size;
 			if (item.bInline && mainIconSize==MenuSkin::ICON_SIZE_NONE)
 				mainIconSize=s_Skin.Main_icon_size;
 			CItemManager::TIconSizeType iconSizeType;
 			int refreshFlags;
 			if (bSearchProvider7 || m_bSubMenu)
@@ -1579,6 +1589,23 @@ static const wchar_t *g_MfuIgnoreExes[]={
 	L"WUAPP.EXE",
 };
 static bool IgnoreUserAssistItem(const UserAssistItem& uaItem)
 {
 	static constexpr const wchar_t* ignoredNames[] =
 	{
 		DESKTOP_APP_ID,
 		L"Microsoft.Windows.ShellExperienceHost_cw5n1h2txyewy!App",
 	};
 	for (const auto& name : ignoredNames)
 	{
 		if (_wcsicmp(uaItem.name, name) == 0)
 			return true;
 	}
 	return false;
 }
 void CMenuContainer::GetRecentPrograms( std::vector<MenuItem> &items, int maxCount )
 {
 	bool bShowMetro=GetSettingBool(L"RecentMetroApps");
@@ -1931,18 +1958,9 @@ void CMenuContainer::GetRecentPrograms( std::vector<MenuItem> &items, int maxCou
 					continue;
 				}
-				if (_wcsicmp(uaItem.name,DESKTOP_APP_ID)==0)
+				if (IgnoreUserAssistItem(uaItem))
 				{
-					LOG_MENU(LOG_MFU,L"UserAssist: Dropping: Ignore desktop");
+					LOG_MENU(LOG_MFU,L"UserAssist: Dropping: Ignore '%s'",uaItem.name);
 					continue;
 				}
 				{
 					CComPtr<IShellItem> pAppItem;
 					if (FAILED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder2,0,uaItem.name,IID_IShellItem,(void**)&pAppItem)))
 						continue;
 					CComString pName;
 					if (FAILED(pAppItem->GetDisplayName(SIGDN_NORMALDISPLAY,&pName)) || wcsncmp(pName,L"@{",2)==0)
 					continue;
 				}
@@ -1956,6 +1974,11 @@ void CMenuContainer::GetRecentPrograms( std::vector<MenuItem> &items, int maxCou
 				LOG_MENU(LOG_MFU,L"UserAssist: '%s', %d, %.3f",uaItem.name,data.count,uaItem.rank);
 				{
 					CItemManager::RWLock lock(&g_ItemManager,false,CItemManager::RWLOCK_ITEMS);
 					if (uaItem.pLinkInfo->GetMetroName().IsEmpty() || wcsncmp(uaItem.pLinkInfo->GetMetroName(), L"@{",2)==0)
 					{
 						LOG_MENU(LOG_MFU, L"UserAssist: Dropping: No metro name");
 						continue;
 					}
 					if (uaItem.pLinkInfo->IsNoPin())
 					{
 						LOG_MENU(LOG_MFU,L"UserAssist: Dropping: No pin");
@@ -2207,10 +2230,7 @@ void CMenuContainer::AddJumpListItems( std::vector<MenuItem> &items )
 				if (pLink)
 				{
 					pLink->GetIDList(&item.pItem1);
-					wchar_t location[_MAX_PATH];
+					item.pItemInfo = g_ItemManager.GetLinkIcon(pLink, CItemManager::ICON_SIZE_TYPE_SMALL);
 					int index;
 					if (pLink->GetIconLocation(location,_countof(location),&index)==S_OK && location[0])
 						item.pItemInfo=g_ItemManager.GetCustomIcon(location,index,CItemManager::ICON_SIZE_TYPE_SMALL,(index==0)); // assuming that if index!=0 the icon comes from a permanent location like a dll or exe
 				}
 			}
 			else if (jumpItem.type==CJumpItem::TYPE_ITEM)
@@ -2244,7 +2264,7 @@ void CMenuContainer::AddJumpListItems( std::vector<MenuItem> &items )
 							{
 								ILFree(item.pItem1);
 								item.pItem1=pidl2.Detach();
-								pItem=pItem2;
+								pItem=std::move(pItem2);
 							}
 						}
 					}
@@ -2506,9 +2526,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)
@@ -2747,9 +2767,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;
 	}
@@ -2775,18 +2795,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())
@@ -2836,9 +2856,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;
@@ -2873,16 +2893,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)
@@ -2890,7 +2900,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
 		{
@@ -2943,6 +2963,8 @@ bool CMenuContainer::InitSearchItems( void )
 	if (s_bWin7Style)
 	{
 		UpdateAccelerators(m_OriginalCount,(int)m_Items.size());
 		if (s_bMoreResults)
 		{
 			MenuItem &item=m_Items[m_SearchIndex-m_SearchItemCount+1];
 			if (s_SearchResults.bSearching)
 			{
@@ -2957,11 +2979,12 @@ bool CMenuContainer::InitSearchItems( void )
 				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)
+		if (s_bMoreResults && s_SearchResults.bSearching)
 		{
 			MenuItem item(MENU_SEARCH_EMPTY);
 			item.name=FindTranslation(L"Menu.Searching",L"Searching...");
@@ -2976,7 +2999,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);
@@ -5064,7 +5087,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;
@@ -6672,8 +6695,7 @@ bool CMenuContainer::GetDescription( int index, wchar_t *text, int size )
 			{
 				if (SUCCEEDED(pLink->GetDescription(text,size)) && text[0])
 					return true;
-				wchar_t args[256];
+				if (jumpItem.bHasArguments)
 				if (SUCCEEDED(pLink->GetArguments(args,_countof(args))) && args[0])
 				{
 					// don't use default tip for items with arguments
 					Strcpy(text,size,item.name);
@@ -6806,7 +6828,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;
 }
@@ -6830,7 +6852,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)
 		{
@@ -7331,8 +7353,9 @@ static void NewVersionCallback( VersionData &data )
 	wchar_t cmdLine[1024];
 	Sprintf(cmdLine,_countof(cmdLine),L"\"%s\" -popup",path);
 	STARTUPINFO startupInfo={sizeof(startupInfo)};
-	PROCESS_INFORMATION processInfo;
+	// don't display busy cursor as we are doing this on background
-	memset(&processInfo,0,sizeof(processInfo));
+	startupInfo.dwFlags=STARTF_FORCEOFFFEEDBACK;
 	PROCESS_INFORMATION processInfo{};
 	if (CreateProcess(path,cmdLine,NULL,NULL,TRUE,0,NULL,NULL,&startupInfo,&processInfo))
 	{
 		CloseHandle(processInfo.hThread);
@@ -7408,35 +7431,46 @@ bool CMenuContainer::HasMoreResults( void )
 RECT CMenuContainer::CalculateWorkArea( const RECT &taskbarRect )
 {
-	RECT rc=s_MenuLimits;
+	RECT rc;
-	if ((s_TaskBarEdge==ABE_LEFT || s_TaskBarEdge==ABE_RIGHT) && GetSettingBool(L"ShowNextToTaskbar"))
+	if (!GetSettingBool(L"AlignToWorkArea"))
 	{
 		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)
+			if (s_TaskBarEdge == ABE_LEFT)
-			rc.left=taskbarRect.right;
+				rc.left = taskbarRect.right;
 			else
-			rc.right=taskbarRect.left;
+				rc.right = taskbarRect.left;
 		}
 		else
 		{
-		if (s_TaskBarEdge==ABE_BOTTOM)
+			if (s_TaskBarEdge == ABE_BOTTOM)
 			{
 				// taskbar is at the bottom
-			rc.bottom=taskbarRect.top;
+				rc.bottom = taskbarRect.top;
 			}
-		else if (s_TaskBarEdge==ABE_TOP)
+			else if (s_TaskBarEdge == ABE_TOP)
 			{
 				// taskbar is at the top
-			rc.top=taskbarRect.bottom;
+				rc.top = taskbarRect.bottom;
 			}
 			else
 			{
 				// taskbar is on the side, start button must be at the top
-			rc.top=s_StartRect.bottom;
+				rc.top = s_StartRect.bottom;
 			}
 		}
-
+	}
 	else
 	{
 		// 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
@@ -7462,9 +7496,36 @@ 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;
 }
 // Calculates start menu position
 POINT CMenuContainer::CalculateCorner( void )
 {
 	RECT margin={0,0,0,0};
@@ -7472,10 +7533,24 @@ POINT CMenuContainer::CalculateCorner( void )
 		AdjustWindowRect(&margin,GetWindowLong(GWL_STYLE),FALSE);
 	POINT corner;
 	if (IsWin11())
 	{
 		// start button can be in the center on Win11
 		// we want to show menu at the position of start button
 		if (m_Options&CONTAINER_LEFT)
 			corner.x=s_StartRect.left+margin.left;
 		else
 			corner.x=s_StartRect.right+margin.right;
 	}
 	else
 	{
 		// start button can be only in corner on older systems
 		// we can use screen limits to determine menu position
 		if (m_Options&CONTAINER_LEFT)
 			corner.x=s_MainMenuLimits.left+margin.left;
 		else
 			corner.x=s_MainMenuLimits.right+margin.right;
 	}
 	if (m_Options&CONTAINER_TOP)
 	{
@@ -7594,6 +7669,9 @@ HWND CMenuContainer::ToggleStartMenu( int taskbarId, bool bKeyboard, bool bAllPr
 	// initialize all settings
 	bool bErr=false;
 	HMONITOR initialMonitor=MonitorFromWindow(s_TaskBar,MONITOR_DEFAULTTONEAREST);
 	// note: GetTaskbarPosition properly identifies monitor in case of multi-monitor setup and automatic taskbar hiding
 	GetTaskbarPosition(s_TaskBar,NULL,&initialMonitor,NULL);
 	int dpi=CItemManager::GetDPI(true);
 	if (!CItemManager::GetDPIOverride() && GetWinVersion()>=WIN_VER_WIN81)
 	{
@@ -7641,6 +7719,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);
@@ -7658,6 +7737,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;
@@ -8026,7 +8106,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;
@@ -8038,7 +8119,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)
 		{
@@ -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)
@@ -2200,6 +2200,21 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect )
 		else
 			iconSize.cx=iconSize.cy=0;
 		COLORREF color, shadowColor;
 		{
 			bool bHotColor = (bHot && !bSplit) || stateLeft > 0;
 			if (item.id == MENU_EMPTY || item.id == MENU_EMPTY_TOP)
 			{
 				color = settings.textColors[bHotColor ? 3 : 2];
 				shadowColor = settings.textShadowColors[bHotColor ? 3 : 2];
 			}
 			else
 			{
 				color = settings.textColors[bHotColor ? 1 : 0];
 				shadowColor = settings.textShadowColors[bHotColor ? 1 : 0];
 			}
 		}
 		// draw icon
 		if (drawType==MenuSkin::PROGRAMS_BUTTON || drawType==MenuSkin::PROGRAMS_BUTTON_NEW)
 		{
@@ -2256,15 +2271,21 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect )
 			const CItemManager::IconInfo *pIcon=(settings.iconSize==MenuSkin::ICON_SIZE_LARGE)?item.pItemInfo->largeIcon:item.pItemInfo->smallIcon;
 			if (pIcon && pIcon->bitmap)
 			{
 				HBITMAP temp = ColorizeMonochromeImage(pIcon->bitmap, color);
 				HBITMAP bitmap = temp ? temp : pIcon->bitmap;
 				BITMAP info;
-				GetObject(pIcon->bitmap,sizeof(info),&info);
+				GetObject(bitmap,sizeof(info),&info);
-				HGDIOBJ bmp0=SelectObject(hdc2,pIcon->bitmap);
+				HGDIOBJ bmp0=SelectObject(hdc2,bitmap);
 				if (bmp0)
 				{
 					BLENDFUNCTION func={AC_SRC_OVER,0,255,AC_SRC_ALPHA};
 					AlphaBlend(hdc,iconX,iconY,iconSize.cx,iconSize.cy,hdc2,0,0,info.bmWidth,info.bmHeight,func);
 					SelectObject(hdc2,bmp0);
 				}
 				if (temp)
 					DeleteObject(temp);
 			}
 		}
 		else if (item.id==MENU_SHUTDOWN_BUTTON && s_bHasUpdates && s_Skin.Shutdown_bitmap.GetBitmap())
@@ -2287,18 +2308,6 @@ void CMenuContainer::DrawBackground( HDC hdc, const RECT &drawRect )
 		// draw text
 		SelectObject(hdc,settings.font);
 		COLORREF color, shadowColor;
 		bool bHotColor=(bHot && !bSplit) || stateLeft>0;
 		if (item.id==MENU_EMPTY || item.id==MENU_EMPTY_TOP)
 		{
 			color=settings.textColors[bHotColor?3:2];
 			shadowColor=settings.textShadowColors[bHotColor?3:2];
 		}
 		else
 		{
 			color=settings.textColors[bHotColor?1:0];
 			shadowColor=settings.textShadowColors[bHotColor?1:0];
 		}
 		RECT rc={itemRect.left+settings.iconPadding.left+settings.iconPadding.right+settings.textPadding.left,itemRect.top+settings.textPadding.top,
 		         itemRect.right-settings.arrPadding.cx-settings.arrPadding.cy-settings.textPadding.right,itemRect.bottom-settings.textPadding.bottom};
 		if (item.id==MENU_SHUTDOWN_BUTTON)
@@ -301,21 +301,12 @@ bool CanUninstallMetroApp( const wchar_t *appid )
 // Uninstalls the app with the given id
 void UninstallMetroApp( const wchar_t *appid )
 {
-	CComPtr<IShellItem> pAppItem;
+	auto packageName = GetPackageFullName(appid);
 	if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder2,0,appid,IID_IShellItem,(void**)&pAppItem)))
 	{
 		CComPtr<IPropertyStore> pStore;
 		pAppItem->BindToHandler(NULL,BHID_PropertyStore,IID_IPropertyStore,(void**)&pStore);
 		if (pStore)
 		{
 			CString packageName=GetPropertyStoreString(pStore,PKEY_MetroPackageName);
 	if (!packageName.IsEmpty())
 	{
 		wchar_t command[1024];
-				Sprintf(command,_countof(command),L"Remove-AppxPackage %s",packageName);
+		Sprintf(command, _countof(command), L"Remove-AppxPackage %s", packageName);
-				ShellExecute(NULL,L"open",L"powershell.exe",command,NULL,SW_HIDE);
+		ShellExecute(NULL, L"open", L"powershell.exe", command, NULL, SW_HIDE);
 			}
 		}
 	}
 }
@@ -381,3 +372,16 @@ bool IsEdgeDefaultBrowser( void )
 	}
 	return false;
 }
 CString GetPackageFullName(const wchar_t* appId)
 {
 	CComPtr<IShellItem> item;
 	if (SUCCEEDED(SHCreateItemInKnownFolder(FOLDERID_AppsFolder, 0, appId, IID_PPV_ARGS(&item))))
 	{
 		CComPtr<IPropertyStore> store;
 		if (SUCCEEDED(item->BindToHandler(nullptr, BHID_PropertyStore, IID_PPV_ARGS(&store))))
 			return GetPropertyStoreString(store, PKEY_MetroPackageName);
 	}
 	return {};
 }
@@ -53,3 +53,6 @@ CComPtr<IContextMenu> GetMetroPinMenu( const wchar_t *appid );
 // Determines if Edge is the default browser
 bool IsEdgeDefaultBrowser( void );
 // Returns full package name for given App ID
 CString GetPackageFullName(const wchar_t* appId);
@@ -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;
@@ -36,7 +36,7 @@ public:
 	struct SearchCategory
 	{
-		SearchCategory( void ) {}
+		SearchCategory( void ) = default;
 		SearchCategory( const SearchCategory &cat )
 		{
 			search.Clone(cat.search);
@@ -30,6 +30,19 @@ const int DEFAULT_TASK_OPACITY10=85; // 85%
 ///////////////////////////////////////////////////////////////////////////////
 CString RgbToBgr(const wchar_t* str)
 {
 	CString retval;
 	retval.Format(L"%06X", RgbToBgr(ParseColor(str)));
 	return retval;
 }
 CString BgrToRgb(const wchar_t* str)
 {
 	return RgbToBgr(str);
 }
 class CSkinSettingsDlg: public CResizeableDlg<CSkinSettingsDlg>
 {
 public:
@@ -422,7 +435,7 @@ void CSkinSettingsDlg::UpdateSkinSettings( void )
 			if (!option.bEnabled || bLocked)
 				image|=SETTING_STATE_DISABLED;
 			if (option.bValue && option.type>SKIN_OPTION_BOOL)
-				Sprintf(text,_countof(text),L"%s: %s",option.label,option.sValue);
+				Sprintf(text,_countof(text),L"%s: %s",option.label,(option.type==SKIN_OPTION_COLOR)?BgrToRgb(option.sValue):option.sValue);
 			else
 				Sprintf(text,_countof(text),L"%s",option.label);
@@ -482,9 +495,7 @@ LRESULT CSkinSettingsDlg::OnCustomDraw( int idCtrl, LPNMHDR pnmh, BOOL& bHandled
 			if (TreeView_GetItemRect(m_Tree,(HTREEITEM)pDraw->nmcd.dwItemSpec,&rc,TRUE))
 			{
 				const wchar_t *str=m_CurrentSkin.Options[pDraw->nmcd.lItemlParam].sValue;
-				wchar_t *end;
+				SetDCBrushColor(pDraw->nmcd.hdc,ParseColor(str));
 				COLORREF color=wcstoul(str,&end,16);
 				SetDCBrushColor(pDraw->nmcd.hdc,color&0xFFFFFF);
 				SelectObject(pDraw->nmcd.hdc,GetStockObject(DC_BRUSH));
 				SelectObject(pDraw->nmcd.hdc,GetStockObject(BLACK_PEN));
 				Rectangle(pDraw->nmcd.hdc,rc.right,rc.top,rc.right+rc.bottom-rc.top,rc.bottom-1);
@@ -690,15 +701,14 @@ LRESULT CSkinSettingsDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, BO
 		CString str;
 		m_EditBox.GetWindowText(str);
 		str.TrimLeft(); str.TrimRight();
-		wchar_t *end;
+		COLORREF val=RgbToBgr(ParseColor(str));
 		COLORREF val=wcstol(str,&end,16)&0xFFFFFF;
 		static COLORREF customColors[16];
 		CHOOSECOLOR choose={sizeof(choose),m_hWnd,NULL,val,customColors};
 		choose.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT;
 		if (ChooseColor(&choose))
 		{
 			wchar_t text[100];
-			Sprintf(text,_countof(text),L"%06X",choose.rgbResult);
+			Sprintf(text,_countof(text),L"%06X",BgrToRgb(choose.rgbResult));
 			m_EditBox.SetWindowText(text);
 			ApplyEditBox();
 			m_Tree.Invalidate();
@@ -717,7 +727,11 @@ void CSkinSettingsDlg::ApplyEditBox( void )
 		CString str;
 		m_EditBox.GetWindowText(str);
 		str.TrimLeft(); str.TrimRight();
-		m_CurrentSkin.Options[m_EditItemIndex].sValue=str;
+		auto& option=m_CurrentSkin.Options[m_EditItemIndex];
 		if (option.type==SKIN_OPTION_COLOR)
 			option.sValue=RgbToBgr(str);
 		else
 			option.sValue=str;
 		StoreSkinOptions();
 	}
 }
@@ -730,7 +744,7 @@ void CSkinSettingsDlg::ItemSelected( HTREEITEM hItem, int index, bool bEnabled )
 		const MenuSkin::Option &option=m_CurrentSkin.Options[m_EditItemIndex];
 		wchar_t text[256];
 		if (option.bValue && option.type>SKIN_OPTION_BOOL)
-			Sprintf(text,_countof(text),L"%s: %s",option.label,option.sValue);
+			Sprintf(text,_countof(text),L"%s: %s",option.label,(option.type==SKIN_OPTION_COLOR)?BgrToRgb(option.sValue):option.sValue);
 		else
 			Sprintf(text,_countof(text),L"%s",option.label);
 		TVITEM item={TVIF_TEXT,m_EditItem,0,0,text};
@@ -745,6 +759,9 @@ void CSkinSettingsDlg::ItemSelected( HTREEITEM hItem, int index, bool bEnabled )
 		const MenuSkin::Option &option=m_CurrentSkin.Options[index];
 		if (option.type>SKIN_OPTION_BOOL)
 			mode=option.type;
 		if (option.type==SKIN_OPTION_COLOR)
 			text=BgrToRgb(option.sValue);
 		else
 			text=option.sValue;
 	}
@@ -1001,7 +1018,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 +1074,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 +1085,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 +1200,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 +1220,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 +1396,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 +1759,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 +2454,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 +2742,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))
+	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 +3175,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 +3327,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);
@@ -4140,38 +4164,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 +4282,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 +4351,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 +4367,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 +4383,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 +4391,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 +4459,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 +4468,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"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_CALLBACK,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},
@@ -4619,6 +4665,48 @@ void UpgradeSettings( bool bShared )
 	}
 }
 static CString GetWindowsBrandingString()
 {
 	CString retval;
 	if (GetWinVersion() >= WIN_VER_WIN10)
 	{
 		auto winbrand = LoadLibraryEx(L"winbrand.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
 		if (winbrand)
 		{
 			PWSTR (WINAPI * BrandingFormatString)(PCWSTR pstrFormat);
 			BrandingFormatString = (decltype(BrandingFormatString))GetProcAddress(winbrand, "BrandingFormatString");
 			if (BrandingFormatString)
 			{
 				auto osName = BrandingFormatString(L"%WINDOWS_LONG%");
 				if (osName)
 				{
 					retval = osName;
 					GlobalFree(osName);
 				}
 			}
 			FreeLibrary(winbrand);
 		}
 	}
 	if (retval.IsEmpty())
 	{
 		// fallback for older Windows
 		wchar_t title[256] = L"Windows";
 		if (CRegKey reg; reg.Open(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", KEY_READ) == ERROR_SUCCESS)
 		{
 			ULONG size = _countof(title);
 			reg.QueryStringValue(L"ProductName", title, &size);
 		}
 		retval = title;
 	}
 	return retval;
 }
 void UpdateSettings( void )
 {
 	{
@@ -4656,11 +4744,19 @@ void UpdateSettings( void )
 	else if (dpi<96) dpi=96;
 	else if (dpi>480) dpi=480;
-	int iconSize=24;
+	int iconSize=16;
-	if (dpi<=96)
+	if (dpi>=240)
-		iconSize=16;
+		iconSize=40;	// for 250% scaling
-	else if (dpi<=120)
+	else if (dpi>=216)
-		iconSize=20;
+		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);
@@ -4733,16 +4829,10 @@ void UpdateSettings( void )
 	UpdateSetting(L"NumericSort",CComVariant(SHRestricted(REST_NOSTRCMPLOGICAL)?0:1),false);
-	wchar_t title[256]=L"Windows";
+	UpdateSetting(L"MenuCaption",CComVariant(GetWindowsBrandingString()),false);
 	ULONG size=_countof(title);
 	{
 		CRegKey regTitle;
 		if (regTitle.Open(HKEY_LOCAL_MACHINE,L"Software\\Microsoft\\Windows NT\\CurrentVersion",KEY_READ)==ERROR_SUCCESS)
 			regTitle.QueryStringValue(L"ProductName",title,&size);
 	}
 	UpdateSetting(L"MenuCaption",CComVariant(title),false);
-	size=_countof(title);
+	wchar_t title[256]{};
 	ULONG size=_countof(title);
 	if (!GetUserNameEx(NameDisplay,title,&size))
 	{
 		// GetUserNameEx may fail (for example on Home editions). use the login name
@@ -4873,7 +4963,7 @@ void UpdateSettings( void )
 		if (GetWinVersion()>WIN_VER_WIN7)
 		{
 			int color=GetSystemGlassColor8();
-			UpdateSetting(L"TaskbarColor",CComVariant(((color&0xFF)<<16)|(color&0xFF00)|((color>>16)&0xFF)),false);
+			UpdateSetting(L"TaskbarColor",CComVariant(RgbToBgr(color)),false);
 		}
 		if (GetWinVersion()<=WIN_VER_WIN7)
@@ -4973,15 +5063,15 @@ void UpdateSettings( void )
 			HIGHCONTRAST contrast={sizeof(contrast)};
 			if (SystemParametersInfo(SPI_GETHIGHCONTRAST,sizeof(contrast),&contrast,0) && (contrast.dwFlags&HCF_HIGHCONTRASTON))
 			{
-				options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=1";
+				options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=1\n";
-				options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=1";
+				options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=1\n";
-				options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=1";
+				options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=1\n";
 			}
 			else
 			{
-				options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=0";
+				options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=0\n";
-				options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=0";
+				options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=0\n";
-				options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=0";
+				options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nTHICK_BORDER=0\nSOLID_SELECTION=0\n";
 			}
 		}
 		else if (GetWinVersion()<WIN_VER_WIN8)
@@ -4989,25 +5079,25 @@ void UpdateSettings( void )
 			BOOL comp=FALSE;
 			skin12=(SUCCEEDED(DwmIsCompositionEnabled(&comp)) && comp)?L"Windows Aero":L"Windows Basic";
 			skin3=L"Windows Aero";
-			options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nWHITE_SUBMENUS=1";
+			options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nWHITE_SUBMENUS=1\n";
-			options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nWHITE_SUBMENUS=1";
+			options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nWHITE_SUBMENUS=1\n";
-			options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nWHITE_SUBMENUS=1";
+			options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nWHITE_SUBMENUS=1\n";
 		}
 		else if (GetWinVersion()<WIN_VER_WIN10)
 		{
 			skin12=L"Windows 8";
 			skin3=L"Windows 8";
-			options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nOPAQUE=0\nWHITE_SUBMENUS=1";
+			options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nOPAQUE=0\nWHITE_SUBMENUS=1\n";
-			options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nOPAQUE=0\nGLASS_SHADOW=0\nBLACK_TEXT=0\nBLACK_FRAMES=0\nWHITE_SUBMENUS=1";
+			options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nOPAQUE=0\nGLASS_SHADOW=0\nBLACK_TEXT=0\nBLACK_FRAMES=0\nWHITE_SUBMENUS=1\n";
-			options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nOPAQUE=0\nGLASS_SHADOW=0\nBLACK_TEXT=0\nBLACK_FRAMES=0\nWHITE_SUBMENUS=1";
+			options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nLARGE_FONT=0\nDISABLE_MASK=0\nOPAQUE=0\nGLASS_SHADOW=0\nBLACK_TEXT=0\nBLACK_FRAMES=0\nWHITE_SUBMENUS=1\n";
 		}
 		else
 		{
 			skin12=L"Metro";
 			skin3=L"Metro";
-			options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nICON_FRAMES=1\nOPAQUE=0";
+			options1=L"CAPTION=1\nUSER_IMAGE=0\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nICON_FRAMES=1\nOPAQUE=0\n";
-			options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nICON_FRAMES=1\nOPAQUE=0";
+			options2=L"NO_ICONS=1\nUSER_IMAGE=1\nUSER_NAME=0\nCENTER_NAME=0\nSMALL_ICONS=0\nLARGE_FONT=0\nICON_FRAMES=1\nOPAQUE=0\n";
-			options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nLARGE_FONT=0\nICON_FRAMES=1\nOPAQUE=0";
+			options3=L"USER_IMAGE=1\nSMALL_ICONS=0\nLARGE_FONT=0\nICON_FRAMES=1\nOPAQUE=0\n";
 		}
 		UpdateSetting(L"SkinC1",CComVariant(skin12),false);
 		UpdateSetting(L"SkinOptionsC1",CComVariant(options1),false);
@@ -375,6 +375,9 @@ COLORREF MenuSkin::GetMetroColor( const wchar_t *names ) const
 			if (GetImmersiveUserColorSetPreference!=NULL)
 			{
 				wchar_t text[256];
 				if (wcsncmp(name,L"Immersive",9)==0)
 					wcscpy_s(text,name);
 				else
 					Sprintf(text,_countof(text),L"Immersive%s",name);
 				int type=GetImmersiveColorTypeFromName(text);
 				data.colorType=type<0?-1:type;
@@ -1495,8 +1498,21 @@ bool MenuSkin::ComputeOptionStates( const std::map<CString,CString> &options, st
 		values.push_back(L"ALL_PROGRAMS");
 	if (SkinType==SKIN_TYPE_CLASSIC2)
 		values.push_back(L"TWO_COLUMNS");
 	// for compatibility with existing skins
 	if (Dpi>=144)
 		values.push_back(L"HIGH_DPI");
 	if (Dpi>=240)
 		values.push_back(L"240_DPI");	// 250% scaling
 	else if (Dpi>=216)
 		values.push_back(L"216_DPI");	// 225% scaling
 	else if (Dpi>=192)
 		values.push_back(L"192_DPI");	// 200% scaling
 	else if (Dpi>=168)
 		values.push_back(L"168_DPI");	// 175% scaling
 	else if (Dpi>=144)
 		values.push_back(L"144_DPI");	// 150% scaling
 	else if (Dpi>=120)
 		values.push_back(L"120_DPI");	// 125% scaling
 	if (ForceTouch || (GetWinVersion()>=WIN_VER_WIN8 && GetSettingBool(L"EnableTouch") && (GetSystemMetrics(SM_DIGITIZER)&NID_INTEGRATED_TOUCH)!=0))
 		values.push_back(L"TOUCH_ENABLED");
 	if (GetSettingInt(L"SearchBox")!=SEARCHBOX_HIDDEN)
@@ -1762,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
@@ -3219,10 +3235,14 @@ void GetSkinsPath( wchar_t *path )
 {
 	GetModuleFileName(g_Instance,path,_MAX_PATH);
 	*PathFindFileName(path)=0;
 #ifdef BUILD_SETUP
 	Strcat(path,_MAX_PATH,L"Skins\\");
-#else
+
 #ifndef BUILD_SETUP
 	if (!PathIsDirectory(path))
 	{
 		*PathFindFileName(path) = 0;
 		Strcat(path,_MAX_PATH,L"..\\Skins\\");
 	}
 #endif
 }
@@ -154,6 +154,7 @@ LRESULT CStartButton::OnCreate( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
 	OnThemeChanged(WM_THEMECHANGED,0,0,bHandled);
 	m_bPressed=true;
 	SetPressed(false);
 	ResizeClient(m_Size.cx,m_Size.cy);
 	bHandled=FALSE;
 	return 0;
 }
@@ -534,12 +535,12 @@ void CStartButton::LoadBitmap( void )
 		if (!m_Bitmap)
 		{
 			int id;
-			int dpi=CItemManager::GetDPI(false);
+			int dpi=GetDpi(GetParent());
 			if (dpi<120)
 				id=IDB_BUTTON96;
 			else if (dpi<144)
 				id=IDB_BUTTON120;
-			else if (dpi<180)
+			else if (dpi<168)
 				id=IDB_BUTTON144;
 			else
 				id=IDB_BUTTON180;
@@ -604,55 +605,12 @@ void CStartButton::LoadBitmap( void )
 static std::map<int,CStartButton> g_StartButtons;
-HWND CreateStartButton( int taskbarId, HWND taskBar, HWND rebar, const RECT &rcTask )
+HWND CreateStartButton( int taskbarId, HWND taskBar, HWND rebar )
 {
 	bool bRTL=(GetWindowLongPtr(rebar,GWL_EXSTYLE)&WS_EX_LAYOUTRTL)!=0;
 	DWORD styleTopmost=GetWindowLongPtr(taskBar,GWL_EXSTYLE)&WS_EX_TOPMOST;
 	CStartButton &button=g_StartButtons[taskbarId];
 	button.Create(taskBar,NULL,NULL,WS_POPUP,styleTopmost|WS_EX_TOOLWINDOW|WS_EX_LAYERED,0U,(void*)(intptr_t)(taskbarId*2+(bRTL?1:0)));
 	SIZE size=button.GetSize();
 	RECT rcButton;
 	MONITORINFO info;
 	UINT uEdge=GetTaskbarPosition(taskBar,&info,NULL,NULL);
 	if (uEdge==ABE_LEFT || uEdge==ABE_RIGHT)
 	{
 		if (GetSettingInt(L"StartButtonType")!=START_BUTTON_CUSTOM || !GetSettingBool(L"StartButtonAlign"))
 			rcButton.left=(rcTask.left+rcTask.right-size.cx)/2;
 		else if (uEdge==ABE_LEFT)
 			rcButton.left=rcTask.left;
 		else
 			rcButton.left=rcTask.right-size.cx;
 		rcButton.top=rcTask.top;
 	}
 	else
 	{
 		if (bRTL)
 			rcButton.left=rcTask.right-size.cx;
 		else
 			rcButton.left=rcTask.left;
 		if (GetSettingInt(L"StartButtonType")!=START_BUTTON_CUSTOM || !GetSettingBool(L"StartButtonAlign"))
 			rcButton.top=(rcTask.top+rcTask.bottom-size.cy)/2;
 		else if (uEdge==ABE_TOP)
 			rcButton.top=rcTask.top;
 		else
 			rcButton.top=rcTask.bottom-size.cy;
 	}
 	rcButton.right=rcButton.left+size.cx;
 	rcButton.bottom=rcButton.top+size.cy;
 	g_bAllowMoveButton=true;
 	button.SetWindowPos(HWND_TOP,&rcButton,SWP_SHOWWINDOW|SWP_NOOWNERZORDER|SWP_NOACTIVATE);
 	g_bAllowMoveButton=false;
 	RECT rc;
 	IntersectRect(&rc,&rcButton,&info.rcMonitor);
 	HRGN rgn=CreateRectRgn(rc.left-rcButton.left,rc.top-rcButton.top,rc.right-rcButton.left,rc.bottom-rcButton.top);
 	if (!SetWindowRgn(button,rgn,FALSE))
 	{
 		AddTrackedObject(rgn);
 		DeleteObject(rgn);
 	}
 	button.UpdateButton();
 	return button.m_hWnd;
 }
@@ -12,7 +12,7 @@ enum TStartButtonType
 //	START_BUTTON_METRO,
 };
-HWND CreateStartButton( int taskbarId, HWND taskBar, HWND rebar, const RECT &rcTask );
+HWND CreateStartButton( int taskbarId, HWND taskBar, HWND rebar );
 void DestroyStartButton( int taskbarId );
 void UpdateStartButton( int taskbarId );
 void PressStartButton( int taskbarId, bool bPressed );
@@ -47,7 +47,7 @@ static HWND g_Tooltip;
 static TOOLINFO g_StartButtonTool;
 static bool g_bHotkeyShift;
 static int g_HotkeyCSM, g_HotkeyWSM, g_HotkeyShiftID, g_HotkeyCSMID, g_HotkeyWSMID;
-static HHOOK g_ProgHook, g_StartHook, g_AppManagerHook, g_NewWindowHook, g_StartMenuHook;
+static HHOOK g_ProgHook, g_StartHook, g_StartMouseHook, g_AppManagerHook, g_NewWindowHook, g_StartMenuHook;
 static bool g_bAllProgramsTimer;
 static bool g_bInMenu;
 static DWORD g_LastClickTime;
@@ -79,6 +79,7 @@ enum
 	OPEN_NOTHING,
 	OPEN_CLASSIC,
 	OPEN_WINDOWS,
 	OPEN_CUSTOM,
 	OPEN_BOTH,
 	OPEN_DESKTOP,
 	OPEN_CORTANA,
@@ -401,6 +402,7 @@ static TaskbarInfo *FindTaskBarInfoBar( HWND bar )
 static LRESULT CALLBACK HookProgManThread( int code, WPARAM wParam, LPARAM lParam );
 static LRESULT CALLBACK HookDesktopThread( int code, WPARAM wParam, LPARAM lParam );
 static LRESULT CALLBACK HookDesktopThreadMouse(int code, WPARAM wParam, LPARAM lParam);
 static BOOL CALLBACK FindTooltipEnum( HWND hwnd, LPARAM lParam )
 {
@@ -615,12 +617,12 @@ UINT GetTaskbarPosition( HWND taskBar, MONITORINFO *pInfo, HMONITOR *pMonitor, R
 				if (pRc->right>rc.right) pRc->right=rc.right;
 			}
 		}
 		HMONITOR monitor=MonitorFromRect(&appbar.rc,MONITOR_DEFAULTTONEAREST);
 		if (pMonitor) *pMonitor=monitor;
 		if (pInfo)
 		{
 			pInfo->cbSize=sizeof(MONITORINFO);
 			HMONITOR monitor=MonitorFromRect(&appbar.rc,MONITOR_DEFAULTTONEAREST);
 			GetMonitorInfo(monitor,pInfo);
 			if (pMonitor) *pMonitor=monitor;
 		}
 		return appbar.uEdge;
 	}
@@ -670,21 +672,45 @@ UINT GetTaskbarPosition( HWND taskBar, MONITORINFO *pInfo, HMONITOR *pMonitor, R
 bool PointAroundStartButton( size_t taskbarId, const CPoint &pt )
 {
 	const TaskbarInfo *taskBar=GetTaskbarInfo(taskbarId);
-	if (!taskBar || !taskBar->startButton) return false;
+	if (!taskBar || !(taskBar->startButton || taskBar->oldButton)) return false;
-	RECT rc;
+	CRect rc;
 	GetWindowRect(taskBar->taskBar,&rc);
 	if (!PtInRect(&rc,pt))
 		return false;
-	UINT uEdge=GetTaskbarPosition(taskBar->taskBar,NULL,NULL,NULL);
+	bool rtl=GetWindowLongPtr(taskBar->taskBar,GWL_EXSTYLE)&WS_EX_LAYOUTRTL;
-	// check if the point is inside the start button rect
+
-	GetWindowRect(taskBar->startButton,&rc);
+	CRect rcStart;
-	if (uEdge==ABE_LEFT || uEdge==ABE_RIGHT)
+	if (taskBar->startButton)
-		return pt.y<rc.bottom;
+		GetWindowRect(taskBar->startButton,&rcStart);
-	else if (GetWindowLongPtr(taskBar->taskBar,GWL_EXSTYLE)&WS_EX_LAYOUTRTL)
+
-		return pt.x>rc.left;
+	CRect rcOld;
 	if (taskBar->oldButton)
 	{
 		GetWindowRect(taskBar->oldButton,&rcOld);
 		if (IsWin11())
 		{
 			// on Win11 the Start button rectangle is a bit smaller that actual XAML active area
 			// lets make it a bit wider to avoid accidental original Start menu triggers
 			const int adjust=ScaleForDpi(taskBar->taskBar,1);
 			if (rtl)
 				rcOld.left-=adjust;
 			else
-		return pt.x<rc.right;
+				rcOld.right+=adjust;
 		}
 	}
 	rc.UnionRect(&rcStart,&rcOld);
 	// check if the point is inside the start button rect
 	UINT uEdge=GetTaskbarPosition(taskBar->taskBar,NULL,NULL,NULL);
 	if (uEdge==ABE_LEFT || uEdge==ABE_RIGHT)
 		return pt.y>=rc.top && pt.y<rc.bottom;
 	else if (rtl)
 		return pt.x>rc.left && pt.x<=rc.right;
 	else
 		return pt.x>=rc.left && pt.x<rc.right;
 }
 // declare few interfaces so we don't need the Win8 SDK
@@ -1185,24 +1211,156 @@ void EnableHotkeys( THotkeys enable )
 	}
 }
 static void UpdateStartButtonPosition(const TaskbarInfo* taskBar, const WINDOWPOS* pPos)
 {
 	if (IsStartButtonSmallIcons(taskBar->taskbarId) != IsTaskbarSmallIcons())
 		RecreateStartButton(taskBar->taskbarId);
 	RECT rcTask;
 	GetWindowRect(taskBar->taskBar, &rcTask);
 	MONITORINFO info;
 	UINT uEdge = GetTaskbarPosition(taskBar->taskBar, &info, NULL, NULL);
 	DWORD buttonFlags = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE;
 	if (IsWindowVisible(taskBar->taskBar))
 		buttonFlags |= SWP_SHOWWINDOW;
 	else
 		buttonFlags |= SWP_HIDEWINDOW;
 	APPBARDATA appbar = { sizeof(appbar) };
 	if (SHAppBarMessage(ABM_GETSTATE, &appbar) & ABS_AUTOHIDE)
 	{
 		bool bHide = false;
 		if (uEdge == ABE_LEFT)
 			bHide = (rcTask.right < info.rcMonitor.left + 5);
 		else if (uEdge == ABE_RIGHT)
 			bHide = (rcTask.left > info.rcMonitor.right - 5);
 		else if (uEdge == ABE_TOP)
 			bHide = (rcTask.bottom < info.rcMonitor.top + 5);
 		else
 			bHide = (rcTask.top > info.rcMonitor.bottom - 5);
 		if (bHide)
 			buttonFlags = (buttonFlags & ~SWP_SHOWWINDOW) | SWP_HIDEWINDOW;
 	}
 	if (uEdge == ABE_TOP || uEdge == ABE_BOTTOM)
 	{
 		if (rcTask.left < info.rcMonitor.left) rcTask.left = info.rcMonitor.left;
 		if (rcTask.right > info.rcMonitor.right) rcTask.right = info.rcMonitor.right;
 	}
 	else
 	{
 		if (rcTask.top < info.rcMonitor.top) rcTask.top = info.rcMonitor.top;
 	}
 	HWND zPos = NULL;
 	if (pPos->flags & SWP_NOZORDER)
 		buttonFlags |= SWP_NOZORDER;
 	else
 	{
 		zPos = pPos->hwndInsertAfter;
 		if (zPos == HWND_TOP && !(GetWindowLongPtr(taskBar->startButton, GWL_EXSTYLE) & WS_EX_TOPMOST))
 			zPos = HWND_TOPMOST;
 		if (zPos == HWND_TOPMOST && !(GetWindowLongPtr(taskBar->taskBar, GWL_EXSTYLE) & WS_EX_TOPMOST))
 			zPos = HWND_TOP;
 		if (zPos == HWND_BOTTOM)
 			buttonFlags |= SWP_NOZORDER;
 		if (zPos == taskBar->startButton)
 			buttonFlags |= SWP_NOZORDER;
 	}
 	if (!IsStartButtonSmallIcons(taskBar->taskbarId))
 	{
 		bool bClassic;
 		if (GetWinVersion() < WIN_VER_WIN8)
 			bClassic = !IsAppThemed();
 		else
 		{
 			HIGHCONTRAST contrast = { sizeof(contrast) };
 			bClassic = (SystemParametersInfo(SPI_GETHIGHCONTRAST, sizeof(contrast), &contrast, 0) && (contrast.dwFlags & HCF_HIGHCONTRASTON));
 		}
 		if (!bClassic)
 		{
 			if (uEdge == ABE_TOP)
 				OffsetRect(&rcTask, 0, -1);
 			else if (uEdge == ABE_BOTTOM)
 				OffsetRect(&rcTask, 0, 1);
 		}
 	}
 	RECT rcOldButton;
 	if (taskBar->oldButton)
 		GetWindowRect(taskBar->oldButton, &rcOldButton);
 	int x, y;
 	if (uEdge == ABE_LEFT || uEdge == ABE_RIGHT)
 	{
 		if (GetSettingInt(L"StartButtonType") != START_BUTTON_CUSTOM || !GetSettingBool(L"StartButtonAlign"))
 			x = (rcTask.left + rcTask.right - taskBar->startButtonSize.cx) / 2;
 		else if (uEdge == ABE_LEFT)
 			x = rcTask.left;
 		else
 			x = rcTask.right - taskBar->startButtonSize.cx;
 		y = taskBar->oldButton ? rcOldButton.top : rcTask.top;
 	}
 	else
 	{
 		if (GetWindowLongPtr(taskBar->rebar, GWL_EXSTYLE) & WS_EX_LAYOUTRTL)
 			x = (taskBar->oldButton ? rcOldButton.right : rcTask.right) - taskBar->startButtonSize.cx;
 		else
 			x = taskBar->oldButton ? rcOldButton.left : rcTask.left;
 		if (GetSettingInt(L"StartButtonType") != START_BUTTON_CUSTOM || !GetSettingBool(L"StartButtonAlign"))
 			y = (rcTask.top + rcTask.bottom - taskBar->startButtonSize.cy) / 2;
 		else if (uEdge == ABE_TOP)
 			y = rcTask.top;
 		else
 			y = rcTask.bottom - taskBar->startButtonSize.cy;
 	}
 	// Start button on Win11 is a bit shifted to the right
 	// We will shift our Aero button to cover original button
 	if (IsWin11() && (x == 0) && (GetStartButtonType() == START_BUTTON_AERO))
 		x += ScaleForDpi(taskBar->taskBar, 6);
 	RECT rcButton = { x, y, x + taskBar->startButtonSize.cx, y + taskBar->startButtonSize.cy };
 	RECT rc;
 	IntersectRect(&rc, &rcButton, &info.rcMonitor);
 	HRGN rgn = CreateRectRgn(rc.left - x, rc.top - y, rc.right - x, rc.bottom - y);
 	if (!SetWindowRgn(taskBar->startButton, rgn, FALSE))
 	{
 		AddTrackedObject(rgn);
 		DeleteObject(rgn);
 	}
 	SetWindowPos(taskBar->startButton, zPos, x, y, 0, 0, buttonFlags);
 	if (buttonFlags & SWP_SHOWWINDOW)
 		UpdateStartButton(taskBar->taskbarId);
 }
 static LRESULT CALLBACK SubclassWin81StartButton( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData )
 {
 	TaskbarInfo* taskBar = GetTaskbarInfo((int)dwRefData);
 	if (uMsg==WM_WINDOWPOSCHANGING)
 	{
 		// keep the original start button hidden at all times
 		const TaskbarInfo *taskBar=GetTaskbarInfo((int)dwRefData);
 		if (taskBar && taskBar->bHideButton)
 		{
 			((WINDOWPOS*)lParam)->flags&=~SWP_SHOWWINDOW;
 		}
 	}
 	if (uMsg==WM_WINDOWPOSCHANGED)
 	{
 		if (taskBar && taskBar->bReplaceButton)
 		{
 			UpdateStartButtonPosition(taskBar,(WINDOWPOS*)lParam);
 		}
 	}
 	if (uMsg==WM_SIZE)
 	{
 		RECT rc;
 		GetWindowRect(hWnd,&rc);
 		rc.right-=rc.left;
 		rc.bottom-=rc.top;
 		TaskbarInfo *taskBar=GetTaskbarInfo((int)dwRefData);
 		if (taskBar && (taskBar->oldButtonSize.cx!=rc.right || taskBar->oldButtonSize.cy!=rc.bottom))
 		{
 			taskBar->oldButtonSize.cx=rc.right;
@@ -1466,6 +1624,15 @@ static void ComputeTaskbarColors( int *data )
 static void ShowWinX( void )
 {
 	if (IsWin11())
 	{
 		HWND hwnd=FindWindowEx(NULL,NULL,L"Shell_TrayWnd",NULL);
 		if (hwnd)
 			PostMessage(hwnd,WM_HOTKEY,590,MAKELPARAM(MOD_WIN,'X'));
 		return;
 	}
 	if (GetWinVersion()>=WIN_VER_WIN10)
 	{
 		CComPtr<IUnknown> pImmersiveShell;
@@ -1650,116 +1817,7 @@ static LRESULT CALLBACK SubclassTaskBarProc( HWND hWnd, UINT uMsg, WPARAM wParam
 	{
 		if (taskBar->bReplaceButton)
 		{
-			if (IsStartButtonSmallIcons(taskBar->taskbarId)!=IsTaskbarSmallIcons())
+			UpdateStartButtonPosition(taskBar,(WINDOWPOS*)lParam);
 				RecreateStartButton((int)dwRefData);
 			WINDOWPOS *pPos=(WINDOWPOS*)lParam;
 			RECT rcTask;
 			GetWindowRect(hWnd,&rcTask);
 			MONITORINFO info;
 			UINT uEdge=GetTaskbarPosition(hWnd,&info,NULL,NULL);
 			DWORD buttonFlags=SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE;
 			if (IsWindowVisible(taskBar->taskBar))
 				buttonFlags|=SWP_SHOWWINDOW;
 			else
 				buttonFlags|=SWP_HIDEWINDOW;
 			APPBARDATA appbar={sizeof(appbar)};
 			if (SHAppBarMessage(ABM_GETSTATE,&appbar)&ABS_AUTOHIDE)
 			{
 				bool bHide=false;
 				if (uEdge==ABE_LEFT)
 					bHide=(rcTask.right<info.rcMonitor.left+5);
 				else if (uEdge==ABE_RIGHT)
 					bHide=(rcTask.left>info.rcMonitor.right-5);
 				else if (uEdge==ABE_TOP)
 					bHide=(rcTask.bottom<info.rcMonitor.top+5);
 				else
 					bHide=(rcTask.top>info.rcMonitor.bottom-5);
 				if (bHide)
 					buttonFlags=(buttonFlags&~SWP_SHOWWINDOW)|SWP_HIDEWINDOW;
 			}
 			if (uEdge==ABE_TOP || uEdge==ABE_BOTTOM)
 			{
 				if (rcTask.left<info.rcMonitor.left) rcTask.left=info.rcMonitor.left;
 				if (rcTask.right>info.rcMonitor.right) rcTask.right=info.rcMonitor.right;
 			}
 			else
 			{
 				if (rcTask.top<info.rcMonitor.top) rcTask.top=info.rcMonitor.top;
 			}
 			if (!IsStartButtonSmallIcons(taskBar->taskbarId))
 			{
 				bool bClassic;
 				if (GetWinVersion()<WIN_VER_WIN8)
 					bClassic=!IsAppThemed();
 				else
 				{
 					HIGHCONTRAST contrast={sizeof(contrast)};
 					bClassic=(SystemParametersInfo(SPI_GETHIGHCONTRAST,sizeof(contrast),&contrast,0) && (contrast.dwFlags&HCF_HIGHCONTRASTON));
 				}
 				if (!bClassic)
 				{
 					if (uEdge==ABE_TOP)
 						OffsetRect(&rcTask,0,-1);
 					else if (uEdge==ABE_BOTTOM)
 						OffsetRect(&rcTask,0,1);
 				}
 			}
 			HWND zPos=NULL;
 			if (pPos->flags&SWP_NOZORDER)
 				buttonFlags|=SWP_NOZORDER;
 			else
 			{
 				zPos=pPos->hwndInsertAfter;
 				if (zPos==HWND_TOP && !(GetWindowLongPtr(taskBar->startButton,GWL_EXSTYLE)&WS_EX_TOPMOST))
 					zPos=HWND_TOPMOST;
 				if (zPos==HWND_TOPMOST && !(GetWindowLongPtr(hWnd,GWL_EXSTYLE)&WS_EX_TOPMOST))
 					zPos=HWND_TOP;
 				if (zPos==HWND_BOTTOM)
 					buttonFlags|=SWP_NOZORDER;
 				if (zPos==taskBar->startButton)
 					buttonFlags|=SWP_NOZORDER;
 			}
 			int x, y;
 			if (uEdge==ABE_LEFT || uEdge==ABE_RIGHT)
 			{
 				if (GetSettingInt(L"StartButtonType")!=START_BUTTON_CUSTOM || !GetSettingBool(L"StartButtonAlign"))
 					x=(rcTask.left+rcTask.right-taskBar->startButtonSize.cx)/2;
 				else if (uEdge==ABE_LEFT)
 					x=rcTask.left;
 				else
 					x=rcTask.right-taskBar->startButtonSize.cx;
 				y=rcTask.top;
 			}
 			else
 			{
 				if (GetWindowLongPtr(taskBar->rebar,GWL_EXSTYLE)&WS_EX_LAYOUTRTL)
 					x=rcTask.right-taskBar->startButtonSize.cx;
 				else
 					x=rcTask.left;
 				if (GetSettingInt(L"StartButtonType")!=START_BUTTON_CUSTOM || !GetSettingBool(L"StartButtonAlign"))
 					y=(rcTask.top+rcTask.bottom-taskBar->startButtonSize.cy)/2;
 				else if (uEdge==ABE_TOP)
 					y=rcTask.top;
 				else
 					y=rcTask.bottom-taskBar->startButtonSize.cy;
 			}
 			RECT rcButton={x,y,x+taskBar->startButtonSize.cx,y+taskBar->startButtonSize.cy};
 			RECT rc;
 			IntersectRect(&rc,&rcButton,&info.rcMonitor);
 			HRGN rgn=CreateRectRgn(rc.left-x,rc.top-y,rc.right-x,rc.bottom-y);
 			if (!SetWindowRgn(taskBar->startButton,rgn,FALSE))
 			{
 				AddTrackedObject(rgn);
 				DeleteObject(rgn);
 			}
 			g_bAllowMoveButton=true;
 			SetWindowPos(taskBar->startButton,zPos,x,y,0,0,buttonFlags);
 			g_bAllowMoveButton=false;
 			if (buttonFlags&SWP_SHOWWINDOW)
 				UpdateStartButton(taskBar->taskbarId);
 		}
 		if (taskBar->oldButton && GetWinVersion()<WIN_VER_WIN10)
 		{
@@ -2790,6 +2848,9 @@ static void OpenCortana( void )
 static void InitStartMenuDLL( void )
 {
 	LogToFile(STARTUP_LOG, L"StartMenu DLL: InitStartMenuDLL");
 	WaitDllInitThread();
 	InitializeIatHooks();
 	if (IsWin81Update1())
 	{
@@ -2817,6 +2878,8 @@ static void InitStartMenuDLL( void )
 		}
 	}
 	if (GetSettingBool(L"CustomTaskbar"))
 	{
 		if (GetWinVersion()>=WIN_VER_WIN10)
 		{
 			HMODULE shlwapi=GetModuleHandle(L"shlwapi.dll");
@@ -2846,10 +2909,9 @@ static void InitStartMenuDLL( void )
 		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");
@@ -2867,6 +2929,9 @@ static void InitStartMenuDLL( void )
 	DWORD progThread=GetWindowThreadProcessId(g_ProgWin,NULL);
 	g_ProgHook=SetWindowsHookEx(WH_GETMESSAGE,HookProgManThread,NULL,progThread);
 	g_StartHook=SetWindowsHookEx(WH_GETMESSAGE,HookDesktopThread,NULL,GetCurrentThreadId());
 	if (IsWin11())
 		g_StartMouseHook=SetWindowsHookEx(WH_MOUSE,HookDesktopThreadMouse,NULL,GetCurrentThreadId());
 	HWND hwnd=FindWindow(L"OpenShellMenu.CStartHookWindow",L"StartHookWindow");
 	LoadLibrary(L"StartMenuDLL.dll"); // keep the DLL from unloading
 	if (hwnd) PostMessage(hwnd,WM_CLEAR,0,0); // tell the exe to unhook this hook
@@ -2988,39 +3053,6 @@ static void RecreateStartButton( size_t taskbarId )
 			continue;
 		if (taskBar.bRecreatingButton)
 			continue;
 		RECT rcTask;
 		GetWindowRect(taskBar.taskBar,&rcTask);
 		RECT rcTask2=rcTask;
 		MONITORINFO info;
 		UINT uEdge=GetTaskbarPosition(taskBar.taskBar,&info,NULL,NULL);
 		if (uEdge==ABE_TOP || uEdge==ABE_BOTTOM)
 		{
 			if (rcTask2.left<info.rcMonitor.left) rcTask2.left=info.rcMonitor.left;
 			if (rcTask2.right>info.rcMonitor.right) rcTask2.right=info.rcMonitor.right;
 		}
 		else
 		{
 			if (rcTask2.top<info.rcMonitor.top) rcTask2.top=info.rcMonitor.top;
 		}
 		if (!IsTaskbarSmallIcons())
 		{
 			bool bClassic;
 			if (GetWinVersion()<WIN_VER_WIN8)
 				bClassic=!IsAppThemed();
 			else
 			{
 				HIGHCONTRAST contrast={sizeof(contrast)};
 				bClassic=(SystemParametersInfo(SPI_GETHIGHCONTRAST,sizeof(contrast),&contrast,0) && (contrast.dwFlags&HCF_HIGHCONTRASTON));
 			}
 			if (!bClassic)
 			{
 				if (uEdge==ABE_TOP)
 					OffsetRect(&rcTask2,0,-1);
 				else if (uEdge==ABE_BOTTOM)
 					OffsetRect(&rcTask2,0,1);
 			}
 		}
 		taskBar.bRecreatingButton=true;
 		{
@@ -3029,7 +3061,7 @@ static void RecreateStartButton( size_t taskbarId )
 				RevokeDragDrop(taskBar.startButton);
 				DestroyStartButton(taskBar.taskbarId);
 			}
-			taskBar.startButton=CreateStartButton(taskBar.taskbarId,taskBar.taskBar,taskBar.rebar,rcTask2);
+			taskBar.startButton=CreateStartButton(taskBar.taskbarId,taskBar.taskBar,taskBar.rebar);
 			CStartMenuTarget *pNewTarget=new CStartMenuTarget(taskBar.taskbarId);
 			RegisterDragDrop(taskBar.startButton,pNewTarget);
 			pNewTarget->Release();
@@ -3045,6 +3077,8 @@ static void RecreateStartButton( size_t taskbarId )
 			taskBar.oldButtonSize.cy=rc.bottom-rc.top;
 		}
 		RECT rcTask;
 		GetWindowRect(taskBar.taskBar,&rcTask);
 		PostMessage(taskBar.taskBar,WM_SIZE,SIZE_RESTORED,MAKELONG(rcTask.right-rcTask.left,rcTask.bottom-rcTask.top));
 	}
 }
@@ -3094,6 +3128,8 @@ static void CleanStartMenuDLL( void )
 	HWND hwnd=FindWindow(L"OpenShellMenu.CStartHookWindow",L"StartHookWindow");
 	UnhookWindowsHookEx(g_ProgHook);
 	UnhookWindowsHookEx(g_StartHook);
 	if (g_StartMouseHook) UnhookWindowsHookEx(g_StartMouseHook);
 	g_StartMouseHook=NULL;
 	if (g_AppManagerHook) UnhookWindowsHookEx(g_AppManagerHook);
 	g_AppManagerHook=NULL;
 	if (g_NewWindowHook) UnhookWindowsHookEx(g_NewWindowHook);
@@ -3115,6 +3151,7 @@ static void CleanStartMenuDLL( void )
 		if (it->second.oldButton)
 		{
 			RemoveWindowSubclass(it->second.oldButton,SubclassWin81StartButton,'CLSH');
 			if (GetWinVersion()<WIN_VER_WIN10 && GetTaskbarPosition(it->second.taskBar,NULL,NULL,NULL)==ABE_BOTTOM)
 				SetWindowPos(it->second.oldButton,NULL,0,0,0,0,SWP_NOSIZE|SWP_NOZORDER);
 			RevokeDragDrop(it->second.oldButton);
 			if (it->second.pOriginalTarget)
@@ -3344,6 +3381,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);
 						}
 					}
 				}
 			}
 		}
@@ -3368,6 +3415,35 @@ static LRESULT CALLBACK HookProgManThread( int code, WPARAM wParam, LPARAM lPara
 	return CallNextHookEx(NULL,code,wParam,lParam);
 }
 // WH_MOUSE hook for taskbar thread (Win11+)
 static LRESULT CALLBACK HookDesktopThreadMouse(int code, WPARAM wParam, LPARAM lParam)
 {
 	if (code == HC_ACTION)
 	{
 		// we need to steal mouse messages that are issues in start button area
 		// so that they won't get to XAML framework that is handling original start button
 		auto info = (const MOUSEHOOKSTRUCT*)lParam;
 		{
 			auto taskBar = FindTaskBarInfoButton(info->hwnd); // click on start button
 			if (!taskBar)
 			{
 				taskBar = FindTaskBarInfoBar(GetAncestor(info->hwnd, GA_ROOT)); // click on taskbar
 				if (taskBar && !PointAroundStartButton(taskBar->taskbarId))
 					taskBar = NULL;
 			}
 			if (taskBar && (info->hwnd != taskBar->startButton) && taskBar->oldButton)
 			{
 				// steal messages from other than our custom button window
 				PostMessage(taskBar->oldButton, (UINT)wParam, 0, MAKELPARAM(info->pt.x, info->pt.y));
 				return 1;
 			}
 		}
 	}
 	return CallNextHookEx(NULL, code, wParam, lParam);
 }
 // WH_GETMESSAGE hook for the taskbar thread
 static LRESULT CALLBACK HookDesktopThread( int code, WPARAM wParam, LPARAM lParam )
 {
@@ -3427,6 +3503,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 +3672,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 +3703,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 +3853,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 +3872,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 +3882,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,13 +3917,18 @@ 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)
 					HMENU menu=CreatePopupMenu();
-					CString title=LoadStringEx(IDS_MENU_TITLE);
+					CString titleFmt=LoadStringEx(IDS_MENU_TITLE);
-					if (!title.IsEmpty())
+					if (!titleFmt.IsEmpty())
 					{
 						CString title;
 						DWORD ver=GetVersionEx(g_Instance);
 						title.Format(titleFmt,ver>>24,(ver>>16)&0xFF,ver&0xFFFF);
 						AppendMenu(menu,MF_STRING,0,title);
 						EnableMenuItem(menu,0,MF_BYPOSITION|MF_DISABLED);
 						SetMenuDefaultItem(menu,0,TRUE);
@@ -3821,6 +3942,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 +3990,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");
@@ -51,7 +51,7 @@ struct TaskbarInfo
 	int taskbarId;
 	HWND taskBar;
 	HWND startButton; // either own start button or the win7 start button (depending on bReplaceButton)
-	HWND oldButton; // win81 start button (child of taskBar)
+	HWND oldButton; // win8.1+ start button (child of taskBar)
 	HWND rebar;
 	HWND taskList;
 	HWND chevron;
@@ -61,8 +61,8 @@ struct TaskbarInfo
 	int pointerId;
 	bool bTimer;
 	bool bCustomLook;
-	bool bReplaceButton;
+	bool bReplaceButton; // replace start button with own one
-	bool bHideButton;
+	bool bHideButton; // hide old start button (if we have own button)
 	bool bRecreatingButton;
 	bool bThemeChanging;
 	std::vector<HWND> trayButtons; // ordered by Z order (for win10)
@@ -427,7 +427,7 @@ BEGIN
    IDS_SKIN_ERR_LOAD_FILE  "Failed to load the variation skin file %s.\r\n"
    IDS_SKIN_ERR_LOAD       "Error loading %s\n%s"
    IDS_SKIN_ERR_VERSION    "The selected skin is not compatible with this version of the start menu.\r\n"
-    IDS_MENU_TITLE          "== Open-Shell Menu =="
+    IDS_MENU_TITLE          "Open-Shell Menu %d.%d.%d"
    IDS_DEFAULT_SKIN        "<No Skin>"
    IDS_CONTROLS_SETTINGS   "Controls"
    IDS_OPEN_NOTHING        "Nothing"
@@ -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
@@ -1076,7 +1082,7 @@ BEGIN
    IDS_MIN_HEIGHT_TIP      "The main menu will be at least as tall as this many search results"
    IDS_GLASS_OVERRIDE      "Override glass color"
    IDS_GLASS_OVERRIDE_TIP  "Check this to override the system glass color to use in the menu"
-    IDS_GLASS_COLOR         "Menu glass color"
+    IDS_GLASS_COLOR         "Menu glass color (RRGGBB)"
    IDS_GLASS_COLOR_TIP     "Select the glass color to use in the menu. How much this color affects the menu will depend on the selected skin"
    IDS_GLASS_INTENSITY     "Menu glass intensity"
    IDS_GLASS_INTENSITY_TIP "Select the intensity (brightness) for the glass color in the menu (0 - dark, 100 - bright)"
@@ -1138,37 +1144,37 @@ BEGIN
    IDS_STRING7024          "Shadows on glass#The text and the arrows in the second column of the main menu will have a drop shadow"
    IDS_STRING7025          "Opaque"
    IDS_STRING7026          "Main menu color"
-    IDS_STRING7027          "Custom color#Select custom color for the main menu"
+    IDS_STRING7027          "Custom color (RRGGBB)#Select custom color for the main menu"
    IDS_STRING7028          "Sub-menu color"
-    IDS_STRING7029          "Custom color#Select custom color for the sub-menus"
+    IDS_STRING7029          "Custom color (RRGGBB)#Select custom color for the sub-menus"
    IDS_STRING7030          "Silver"
    IDS_STRING7031          "Gold"
    IDS_STRING7032          "Steel"
    IDS_STRING7033          "Titanium"
    IDS_STRING7034          "Image for first column#Select custom image for the first column of the main menu"
    IDS_STRING7035          "Image for second column#Select custom image for the second column of the main menu"
-    IDS_STRING7036          "Text color for first column#Select custom color for the first column of the main menu text"
+    IDS_STRING7036          "Text color for first column (RRGGBB)#Select custom color for the first column of the main menu text"
-    IDS_STRING7037          "Text color for second column#Select custom color for the second column of the main menu text"
+    IDS_STRING7037          "Text color for second column (RRGGBB)#Select custom color for the second column of the main menu text"
    IDS_STRING7038          "Text size#Select custom size for the main menu text"
 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_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=""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=""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=""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=""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=""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=""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_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=""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=""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=""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=""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=""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=""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=""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=""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=""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=""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=""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=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
 END
 STRINGTABLE 
@@ -1243,7 +1249,7 @@ BEGIN
    IDS_TASK_AEROGLASS_TIP  "The taskbar will have glass transparency that is compatible with the Aero Glass mod"
    IDS_TASK_OPACITY        "Taskbar opacity"
    IDS_TASK_OPACITY_TIP    "Set the opacity for the taskbar (0 - transparent, 100 - opaque)"
-    IDS_TASK_COLOR          "Taskbar color"
+    IDS_TASK_COLOR          "Taskbar color (RRGGBB)"
    IDS_TASK_COLOR_TIP      "Set the color for the taskbar"
    IDS_PCSETTINGS          "Settings"
    IDS_PCSETTINGS_TIP      "Shows the modern Settings window"
@@ -1282,13 +1288,41 @@ BEGIN
    IDS_TASK_BORDERS        "Border sizes"
    IDS_TASK_BORDERS_TIP    "Select how many pixel on each side of the texture to exclude from stretching"
    IDS_TASKBAR_SETTINGS    "Taskbar"
-    IDS_TASK_TEXTCOLOR      "Taskbar text color"
+    IDS_TASK_TEXTCOLOR      "Taskbar text color (RRGGBB)"
    IDS_TASK_TEXTCOLOR_TIP  "Select the color for the text on the taskbar"
    IDS_SELECT_LAST         "Select the last item in shutdown menu"
    IDS_SELECT_LAST_TIP     "When this is checked, the last item will be selected by default when the shutdown menu is opened with the keyboard"
    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 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
 /////////////////////////////////////////////////////////////////////////////
@@ -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
@@ -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);
 				}
 			}
 		}
@@ -19,7 +19,6 @@ struct ICIVERBTOIDMAP
 static const ICIVERBTOIDMAP g_ContextMenuIDMap[] =
 {
 	{ L"open",       "open",      MENUVERB_OPEN },
 	{ NULL,          NULL,        (UINT)-1      }
 };
 HRESULT _MapICIVerbToCmdID(LPCMINVOKECOMMANDINFO pici, UINT* pid)
@@ -9,6 +9,7 @@
 #include "stdafx.h"
 #include "ModernSettings.h"
 #include "ModernSettingsShellFolder.h"
 #include "ResourceHelper.h"
 #include <propkey.h>
 #include <strsafe.h>
 #include <Uxtheme.h>
@@ -181,7 +182,7 @@ HICON IconFromGlyph(UINT glyph, UINT size)
 	HDC dc = CreateCompatibleDC(nullptr);
 	SelectObject(dc, info.hbmColor);
-	HFONT font = CreateFontW(size, 0, 0, 0, 400, 0, 0, 0, 1, 0, 0, 0, 0, L"Segoe MDL2 Assets");
+	HFONT font = CreateFontW(size, 0, 0, 0, 400, 0, 0, 0, 1, 0, 0, 0, 0, IsWin11() ? L"Segoe Fluent Icons" : L"Segoe MDL2 Assets");
 	SelectObject(dc, font);
 	RECT rc{};
@@ -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;
 	}
@@ -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},
@@ -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.CategorySettings = Control Panel
-Search.CategoryPCSettings = Modern Settings
+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.CategorySettings = Stjórnborð
-Search.CategoryPCSettings = Sérstillingar tölvunnar
+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 = Документи
@@ -0,0 +1,291 @@
 // ******************************************************************
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
 // THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
 // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
 // ******************************************************************
 #include "DesktopNotificationManagerCompat.h"
 #include <appmodel.h>
 #include <wrl\wrappers\corewrappers.h>
 #define RETURN_IF_FAILED(hr) do { HRESULT _hrTemp = hr; if (FAILED(_hrTemp)) { return _hrTemp; } } while (false)
 using namespace ABI::Windows::Data::Xml::Dom;
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;
 namespace DesktopNotificationManagerCompat
 {
    HRESULT RegisterComServer(GUID clsid, const wchar_t exePath[]);
    HRESULT EnsureRegistered();
    bool IsRunningAsUwp();
    bool s_registeredAumidAndComServer = false;
    std::wstring s_aumid;
    bool s_registeredActivator = false;
    bool s_hasCheckedIsRunningAsUwp = false;
    bool s_isRunningAsUwp = false;
    HRESULT RegisterAumidAndComServer(const wchar_t *aumid, GUID clsid)
    {
 /*
        // If running as Desktop Bridge
        if (IsRunningAsUwp())
        {
            // Clear the AUMID since Desktop Bridge doesn't use it, and then we're done.
            // Desktop Bridge apps are registered with platform through their manifest.
            // Their LocalServer32 key is also registered through their manifest.
            s_aumid = L"";
            s_registeredAumidAndComServer = true;
            return S_OK;
        }
 */
        // Copy the aumid
        s_aumid = std::wstring(aumid);
 /*
        // Get the EXE path
        wchar_t exePath[MAX_PATH];
        DWORD charWritten = ::GetModuleFileName(nullptr, exePath, ARRAYSIZE(exePath));
        RETURN_IF_FAILED(charWritten > 0 ? S_OK : HRESULT_FROM_WIN32(::GetLastError()));
        // Register the COM server
        RETURN_IF_FAILED(RegisterComServer(clsid, exePath));
 */
        s_registeredAumidAndComServer = true;
        return S_OK;
    }
    HRESULT RegisterActivator()
    {
        // Module<OutOfProc> needs a callback registered before it can be used.
        // Since we don't care about when it shuts down, we'll pass an empty lambda here.
        Module<OutOfProc>::Create([] {});
        // If a local server process only hosts the COM object then COM expects
        // the COM server host to shutdown when the references drop to zero.
        // Since the user might still be using the program after activating the notification,
        // we don't want to shutdown immediately.  Incrementing the object count tells COM that
        // we aren't done yet.
        Module<OutOfProc>::GetModule().IncrementObjectCount();
        RETURN_IF_FAILED(Module<OutOfProc>::GetModule().RegisterObjects());
        s_registeredActivator = true;
        return S_OK;
    }
    HRESULT RegisterComServer(GUID clsid, const wchar_t exePath[])
    {
        // Turn the GUID into a string
        OLECHAR* clsidOlechar;
        StringFromCLSID(clsid, &clsidOlechar);
        std::wstring clsidStr(clsidOlechar);
        ::CoTaskMemFree(clsidOlechar);
        // Create the subkey
        // Something like SOFTWARE\Classes\CLSID\{23A5B06E-20BB-4E7E-A0AC-6982ED6A6041}\LocalServer32
        std::wstring subKey = LR"(SOFTWARE\Classes\CLSID\)" + clsidStr + LR"(\LocalServer32)";
        // Include -ToastActivated launch args on the exe
        std::wstring exePathStr(exePath);
        exePathStr = L"\"" + exePathStr + L"\" " + TOAST_ACTIVATED_LAUNCH_ARG;
        // We don't need to worry about overflow here as ::GetModuleFileName won't
        // return anything bigger than the max file system path (much fewer than max of DWORD).
        DWORD dataSize = static_cast<DWORD>((exePathStr.length() + 1) * sizeof(WCHAR));
        // Register the EXE for the COM server
        return HRESULT_FROM_WIN32(::RegSetKeyValue(
            HKEY_CURRENT_USER,
            subKey.c_str(),
            nullptr,
            REG_SZ,
            reinterpret_cast<const BYTE*>(exePathStr.c_str()),
            dataSize));
    }
    HRESULT CreateToastNotifier(IToastNotifier **notifier)
    {
        RETURN_IF_FAILED(EnsureRegistered());
        ComPtr<IToastNotificationManagerStatics> toastStatics;
        RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory(
            HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(),
            &toastStatics));
        if (s_aumid.empty())
        {
            return toastStatics->CreateToastNotifier(notifier);
        }
        else
        {
            return toastStatics->CreateToastNotifierWithId(HStringReference(s_aumid.c_str()).Get(), notifier);
        }
    }
    HRESULT CreateXmlDocumentFromString(const wchar_t *xmlString, IXmlDocument **doc)
    {
        ComPtr<IXmlDocument> answer;
        RETURN_IF_FAILED(Windows::Foundation::ActivateInstance(HStringReference(RuntimeClass_Windows_Data_Xml_Dom_XmlDocument).Get(), &answer));
        ComPtr<IXmlDocumentIO> docIO;
        RETURN_IF_FAILED(answer.As(&docIO));
        // Load the XML string
        RETURN_IF_FAILED(docIO->LoadXml(HStringReference(xmlString).Get()));
        return answer.CopyTo(doc);
    }
    HRESULT CreateToastNotification(IXmlDocument *content, IToastNotification **notification)
    {
        ComPtr<IToastNotificationFactory> factory;
        RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory(
            HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotification).Get(),
            &factory));
        return factory->CreateToastNotification(content, notification);
    }
    HRESULT get_History(std::unique_ptr<DesktopNotificationHistoryCompat>* history)
    {
        RETURN_IF_FAILED(EnsureRegistered());
        ComPtr<IToastNotificationManagerStatics> toastStatics;
        RETURN_IF_FAILED(Windows::Foundation::GetActivationFactory(
            HStringReference(RuntimeClass_Windows_UI_Notifications_ToastNotificationManager).Get(),
            &toastStatics));
        ComPtr<IToastNotificationManagerStatics2> toastStatics2;
        RETURN_IF_FAILED(toastStatics.As(&toastStatics2));
        ComPtr<IToastNotificationHistory> nativeHistory;
        RETURN_IF_FAILED(toastStatics2->get_History(&nativeHistory));
        *history = std::make_unique<DesktopNotificationHistoryCompat>(s_aumid.c_str(), nativeHistory);
        return S_OK;
    }
    bool CanUseHttpImages()
    {
        return IsRunningAsUwp();
    }
    HRESULT EnsureRegistered()
    {
        // If not registered AUMID yet
        if (!s_registeredAumidAndComServer)
        {
            // Check if Desktop Bridge
            if (IsRunningAsUwp())
            {
                // Implicitly registered, all good!
                s_registeredAumidAndComServer = true;
            }
            else
            {
                // Otherwise, incorrect usage, must call RegisterAumidAndComServer first
                return E_ILLEGAL_METHOD_CALL;
            }
        }
        // If not registered activator yet
        if (!s_registeredActivator)
        {
            // Incorrect usage, must call RegisterActivator first
            return E_ILLEGAL_METHOD_CALL;
        }
        return S_OK;
    }
    bool IsRunningAsUwp()
    {
        if (!s_hasCheckedIsRunningAsUwp)
        {
            // https://stackoverflow.com/questions/39609643/determine-if-c-application-is-running-as-a-uwp-app-in-desktop-bridge-project
            UINT32 length;
            wchar_t packageFamilyName[PACKAGE_FAMILY_NAME_MAX_LENGTH + 1];
            LONG result = GetPackageFamilyName(GetCurrentProcess(), &length, packageFamilyName);
            s_isRunningAsUwp = result == ERROR_SUCCESS;
            s_hasCheckedIsRunningAsUwp = true;
        }
        return s_isRunningAsUwp;
    }
 }
 DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr<IToastNotificationHistory> history)
 {
    m_aumid = std::wstring(aumid);
    m_history = std::move(history);
 }
 HRESULT DesktopNotificationHistoryCompat::Clear()
 {
    if (m_aumid.empty())
    {
        return m_history->Clear();
    }
    else
    {
        return m_history->ClearWithId(HStringReference(m_aumid.c_str()).Get());
    }
 }
 HRESULT DesktopNotificationHistoryCompat::GetHistory(ABI::Windows::Foundation::Collections::IVectorView<ToastNotification*> **toasts)
 {
    ComPtr<IToastNotificationHistory2> history2;
    RETURN_IF_FAILED(m_history.As(&history2));
    if (m_aumid.empty())
    {
        return history2->GetHistory(toasts);
    }
    else
    {
        return history2->GetHistoryWithId(HStringReference(m_aumid.c_str()).Get(), toasts);
    }
 }
 HRESULT DesktopNotificationHistoryCompat::Remove(const wchar_t *tag)
 {
    if (m_aumid.empty())
    {
        return m_history->Remove(HStringReference(tag).Get());
    }
    else
    {
        return m_history->RemoveGroupedTagWithId(HStringReference(tag).Get(), HStringReference(L"").Get(), HStringReference(m_aumid.c_str()).Get());
    }
 }
 HRESULT DesktopNotificationHistoryCompat::RemoveGroupedTag(const wchar_t *tag, const wchar_t *group)
 {
    if (m_aumid.empty())
    {
        return m_history->RemoveGroupedTag(HStringReference(tag).Get(), HStringReference(group).Get());
    }
    else
    {
        return m_history->RemoveGroupedTagWithId(HStringReference(tag).Get(), HStringReference(group).Get(), HStringReference(m_aumid.c_str()).Get());
    }
 }
 HRESULT DesktopNotificationHistoryCompat::RemoveGroup(const wchar_t *group)
 {
    if (m_aumid.empty())
    {
        return m_history->RemoveGroup(HStringReference(group).Get());
    }
    else
    {
        return m_history->RemoveGroupWithId(HStringReference(group).Get(), HStringReference(m_aumid.c_str()).Get());
    }
 }
@@ -0,0 +1,108 @@
 // ******************************************************************
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
 // THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
 // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
 // ******************************************************************
 #pragma once
 #include <string>
 #include <memory>
 #include <Windows.h>
 #include <windows.ui.notifications.h>
 #include <wrl.h>
 #define TOAST_ACTIVATED_LAUNCH_ARG L"-ToastActivated"
 using namespace ABI::Windows::UI::Notifications;
 class DesktopNotificationHistoryCompat;
 namespace DesktopNotificationManagerCompat
 {
    /// <summary>
    /// If not running under the Desktop Bridge, you must call this method to register your AUMID with the Compat library and to
    /// register your COM CLSID and EXE in LocalServer32 registry. Feel free to call this regardless, and we will no-op if running
    /// under Desktop Bridge. Call this upon application startup, before calling any other APIs.
    /// </summary>
    /// <param name="aumid">An AUMID that uniquely identifies your application.</param>
    /// <param name="clsid">The CLSID of your NotificationActivator class.</param>
    HRESULT RegisterAumidAndComServer(const wchar_t *aumid, GUID clsid);
    /// <summary>
    /// Registers your module to handle COM activations. Call this upon application startup.
    /// </summary>
    HRESULT RegisterActivator();
    /// <summary>
    /// Creates a toast notifier. You must have called RegisterActivator first (and also RegisterAumidAndComServer if you're a classic Win32 app), or this will throw an exception.
    /// </summary>
    HRESULT CreateToastNotifier(IToastNotifier** notifier);
    /// <summary>
    /// Creates an XmlDocument initialized with the specified string. This is simply a convenience helper method.
    /// </summary>
    HRESULT CreateXmlDocumentFromString(const wchar_t *xmlString, ABI::Windows::Data::Xml::Dom::IXmlDocument** doc);
    /// <summary>
    /// Creates a toast notification. This is simply a convenience helper method.
    /// </summary>
    HRESULT CreateToastNotification(ABI::Windows::Data::Xml::Dom::IXmlDocument* content, IToastNotification** notification);
    /// <summary>
    /// Gets the DesktopNotificationHistoryCompat object. You must have called RegisterActivator first (and also RegisterAumidAndComServer if you're a classic Win32 app), or this will throw an exception.
    /// </summary>
    HRESULT get_History(std::unique_ptr<DesktopNotificationHistoryCompat>* history);
    /// <summary>
    /// Gets a boolean representing whether http images can be used within toasts. This is true if running under Desktop Bridge.
    /// </summary>
    bool CanUseHttpImages();
 }
 class DesktopNotificationHistoryCompat
 {
 public:
    /// <summary>
    /// Removes all notifications sent by this app from action center.
    /// </summary>
    HRESULT Clear();
    /// <summary>
    /// Gets all notifications sent by this app that are currently still in Action Center.
    /// </summary>
    HRESULT GetHistory(ABI::Windows::Foundation::Collections::IVectorView<ToastNotification*>** history);
    /// <summary>
    /// Removes an individual toast, with the specified tag label, from action center.
    /// </summary>
    /// <param name="tag">The tag label of the toast notification to be removed.</param>
    HRESULT Remove(const wchar_t *tag);
    /// <summary>
    /// Removes a toast notification from the action using the notification's tag and group labels.
    /// </summary>
    /// <param name="tag">The tag label of the toast notification to be removed.</param>
    /// <param name="group">The group label of the toast notification to be removed.</param>
    HRESULT RemoveGroupedTag(const wchar_t *tag, const wchar_t *group);
    /// <summary>
    /// Removes a group of toast notifications, identified by the specified group label, from action center.
    /// </summary>
    /// <param name="group">The group label of the toast notifications to be removed.</param>
    HRESULT RemoveGroup(const wchar_t *group);
    /// <summary>
    /// Do not call this. Instead, call DesktopNotificationManagerCompat.get_History() to obtain an instance.
    /// </summary>
    DesktopNotificationHistoryCompat(const wchar_t *aumid, Microsoft::WRL::ComPtr<IToastNotificationHistory> history);
 private:
    std::wstring m_aumid;
    Microsoft::WRL::ComPtr<IToastNotificationHistory> m_history = nullptr;
 };
@@ -0,0 +1,5 @@
 LIBRARY "DesktopToasts.dll"
 EXPORTS
 	Initialize
 	DisplaySimpleToast
@@ -0,0 +1,59 @@
 #include <VersionHelpers.h>
 using DesktopToastActivateHandler = void(__cdecl*)(void* context, LPCWSTR invokedArgs);
 HRESULT Initialize(LPCWSTR appUserModelId, DesktopToastActivateHandler handler, void* handlerContext);
 HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text);
 class DesktopToasts
 {
 public:
 	explicit DesktopToasts(LPCWSTR appUserModelId)
 	{
 		if (::IsWindows10OrGreater())
 		{
 			auto m_lib = ::LoadLibrary(L"DesktopToasts.dll");
 			if (m_lib)
 			{
 				m_pInitialize = (decltype(m_pInitialize))::GetProcAddress(m_lib, "Initialize");
 				m_pDisplayToast = (decltype(m_pDisplayToast))::GetProcAddress(m_lib, "DisplaySimpleToast");
 				if (m_pInitialize && m_pDisplayToast)
 				{
 					if (m_pInitialize(appUserModelId, ToastActivate, this) == S_OK)
 						m_initialized = true;
 				}
 			}
 		}
 	}
 	~DesktopToasts()
 	{
 		if (m_lib)
 			::FreeLibrary(m_lib);
 	}
 	explicit operator bool() const
 	{
 		return m_initialized;
 	}
 	HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text)
 	{
 		return m_pDisplayToast(title, text);
 	}
 private:
 	virtual void OnToastActivate(LPCWSTR invokedArgs) {}
 	static void __cdecl ToastActivate(void* context, LPCWSTR invokedArgs)
 	{
 		static_cast<DesktopToasts*>(context)->OnToastActivate(invokedArgs);
 	}
 	bool m_initialized = false;
 	HMODULE m_lib = nullptr;
 	decltype(&::Initialize) m_pInitialize = nullptr;
 	decltype(&::DisplaySimpleToast) m_pDisplayToast = nullptr;
 };
@@ -0,0 +1,61 @@
 // Microsoft Visual C++ generated resource script.
 //
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winres.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 #endif //_WIN32
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION _PRODUCT_VERSION
 PRODUCTVERSION _PRODUCT_VERSION
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
 #else
 FILEFLAGS 0x0L
 #endif
 FILEOS 0x4L
 FILETYPE 0x2L
 FILESUBTYPE 0x0L
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904e4"
        BEGIN
            VALUE "CompanyName", "Open-Shell"
            VALUE "FileDescription", "Desktop toast notifications support"
            VALUE "FileVersion", _PRODUCT_VERSION_STR
            VALUE "InternalName", "DesktopToasts.dll"
            VALUE "LegalCopyright", "Copyright (C) 2020, The Open-Shell Team"
            VALUE "OriginalFilename", "DesktopToasts.dll"
            VALUE "ProductName", "Open-Shell"
            VALUE "ProductVersion", _PRODUCT_VERSION_STR
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1252
    END
 END
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
@@ -0,0 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <VCProjectVersion>16.0</VCProjectVersion>
    <Keyword>Win32Proj</Keyword>
    <ProjectGuid>{d94bd2a6-1872-4f01-b911-f406603aa2e1}</ProjectGuid>
    <RootNamespace>DesktopToasts</RootNamespace>
    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="Shared">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\..\Version.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    <Import Project="..\..\Version.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
    <OutDir>..\$(Configuration)\</OutDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <OutDir>$(Configuration)\</OutDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>WIN32;_DEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableUAC>false</EnableUAC>
      <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>DesktopToasts.def</ModuleDefinitionFile>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>WIN32;NDEBUG;DESKTOPTOASTS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <LanguageStandard>stdcpp17</LanguageStandard>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableUAC>false</EnableUAC>
      <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <ModuleDefinitionFile>DesktopToasts.def</ModuleDefinitionFile>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="DesktopNotificationManagerCompat.h" />
    <ClInclude Include="DesktopToasts.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="DesktopNotificationManagerCompat.cpp" />
    <ClCompile Include="dllmain.cpp" />
  </ItemGroup>
  <ItemGroup>
    <None Include="DesktopToasts.def" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="DesktopToasts.rc" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
@@ -0,0 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
    </Filter>
    <Filter Include="Header Files">
      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
    </Filter>
    <Filter Include="Resource Files">
      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="DesktopNotificationManagerCompat.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="DesktopToasts.h">
      <Filter>Header Files</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="DesktopNotificationManagerCompat.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="DesktopToasts.def">
      <Filter>Source Files</Filter>
    </None>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="DesktopToasts.rc">
      <Filter>Resource Files</Filter>
    </ResourceCompile>
  </ItemGroup>
 </Project>
@@ -0,0 +1,131 @@
 // dllmain.cpp : Defines the entry point for the DLL application.
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
 #include <windows.h>
 #include <NotificationActivationCallback.h>
 #include <windows.ui.notifications.h>
 #include <wrl/wrappers/corewrappers.h>
 #include "DesktopToasts.h"
 #include "DesktopNotificationManagerCompat.h"
 #define RETURN_IF_FAILED(hr) do { HRESULT _hrTemp = hr; if (FAILED(_hrTemp)) { return _hrTemp; } } while (false)
 using namespace ABI::Windows::Data::Xml::Dom;
 using namespace ABI::Windows::UI::Notifications;
 using namespace Microsoft::WRL;
 using namespace Microsoft::WRL::Wrappers;
 DesktopToastActivateHandler g_handler = nullptr;
 void* g_handlerContext = nullptr;
 class DECLSPEC_UUID("E407B70A-1FBD-4D5E-8822-231C69102472") NotificationActivator WrlSealed WrlFinal
 	: public RuntimeClass<RuntimeClassFlags<ClassicCom>, INotificationActivationCallback>
 {
 public:
   virtual HRESULT STDMETHODCALLTYPE Activate(
 	   _In_ LPCWSTR appUserModelId,
 	   _In_ LPCWSTR invokedArgs,
 	   _In_reads_(dataCount) const NOTIFICATION_USER_INPUT_DATA * data,
 	   ULONG dataCount) override
   {
 	   if (g_handler)
 		   g_handler(g_handlerContext, invokedArgs);
 	   return S_OK;
   }
 };
 // Flag class as COM creatable
 CoCreatableClass(NotificationActivator);
 HRESULT Initialize(LPCWSTR appUserModelId, DesktopToastActivateHandler handler, void* handlerContext)
 {
 	RETURN_IF_FAILED(DesktopNotificationManagerCompat::RegisterAumidAndComServer(appUserModelId, __uuidof(NotificationActivator)));
 	RETURN_IF_FAILED(DesktopNotificationManagerCompat::RegisterActivator());
 	g_handler = handler;
 	g_handlerContext = handlerContext;
 	return S_OK;
 }
 HRESULT SetNodeValueString(HSTRING inputString, IXmlNode* node, IXmlDocument* xml)
 {
 	ComPtr<IXmlText> inputText;
 	RETURN_IF_FAILED(xml->CreateTextNode(inputString, &inputText));
 	ComPtr<IXmlNode> inputTextNode;
 	RETURN_IF_FAILED(inputText.As(&inputTextNode));
 	ComPtr<IXmlNode> appendedChild;
 	return node->AppendChild(inputTextNode.Get(), &appendedChild);
 }
 _Use_decl_annotations_
 HRESULT SetTextValues(const PCWSTR* textValues, UINT32 textValuesCount, IXmlDocument* toastXml)
 {
 	ComPtr<IXmlNodeList> nodeList;
 	RETURN_IF_FAILED(toastXml->GetElementsByTagName(HStringReference(L"text").Get(), &nodeList));
 	UINT32 nodeListLength;
 	RETURN_IF_FAILED(nodeList->get_Length(&nodeListLength));
 	// If a template was chosen with fewer text elements, also change the amount of strings
 	// passed to this method.
 	RETURN_IF_FAILED(textValuesCount <= nodeListLength ? S_OK : E_INVALIDARG);
 	for (UINT32 i = 0; i < textValuesCount; i++)
 	{
 		ComPtr<IXmlNode> textNode;
 		RETURN_IF_FAILED(nodeList->Item(i, &textNode));
 		RETURN_IF_FAILED(SetNodeValueString(HStringReference(textValues[i]).Get(), textNode.Get(), toastXml));
 	}
 	return S_OK;
 }
 HRESULT DisplaySimpleToast(LPCWSTR title, LPCWSTR text)
 {
 	// Construct XML
 	ComPtr<IXmlDocument> doc;
 	HRESULT hr = DesktopNotificationManagerCompat::CreateXmlDocumentFromString(L"<toast><visual><binding template='ToastGeneric'><text></text><text></text></binding></visual></toast>", &doc);
 	if (SUCCEEDED(hr))
 	{
 		PCWSTR textValues[] = { title, text };
 		SetTextValues(textValues, ARRAYSIZE(textValues), doc.Get());
 		// Create the notifier
 		// Classic Win32 apps MUST use the compat method to create the notifier
 		ComPtr<IToastNotifier> notifier;
 		hr = DesktopNotificationManagerCompat::CreateToastNotifier(&notifier);
 		if (SUCCEEDED(hr))
 		{
 			// Create the notification itself (using helper method from compat library)
 			ComPtr<IToastNotification> toast;
 			hr = DesktopNotificationManagerCompat::CreateToastNotification(doc.Get(), &toast);
 			if (SUCCEEDED(hr))
 			{
 				// And show it!
 				hr = notifier->Show(toast.Get());
 			}
 		}
 	}
 	return hr;
 }
 BOOL APIENTRY DllMain( HMODULE hModule,
                       DWORD  ul_reason_for_call,
                       LPVOID lpReserved
                     )
 {
    switch (ul_reason_for_call)
    {
    case DLL_PROCESS_ATTACH:
    case DLL_THREAD_ATTACH:
    case DLL_THREAD_DETACH:
    case DLL_PROCESS_DETACH:
        break;
    }
    return TRUE;
 }
@@ -16,6 +16,7 @@
 #include "ResourceHelper.h"
 #include "Translations.h"
 #include <shlobj.h>
 #include "DesktopToasts/DesktopToasts.h"
 void ClosingSettings( HWND hWnd, int flags, int command )
@@ -59,11 +60,13 @@ static CSetting g_Settings[]={
 {L"Update",CSetting::TYPE_GROUP},
 	{L"Language",CSetting::TYPE_STRING,0,0,L"",CSetting::FLAG_SHARED},
 	{L"Update",CSetting::TYPE_BOOL,0,0,1,CSetting::FLAG_SHARED},
 	{L"Nightly",CSetting::TYPE_BOOL,0,0,0,CSetting::FLAG_SHARED},
 	{NULL}
 };
 const int SETTING_UPDATE=2;
 const int SETTING_NIGHTLY=3;
 ///////////////////////////////////////////////////////////////////////////////
@@ -78,6 +81,7 @@ public:
 		MESSAGE_HANDLER( WM_GETMINMAXINFO, OnGetMinMaxInfo )
 		MESSAGE_HANDLER( WM_CTLCOLORSTATIC, OnColorStatic )
 		COMMAND_HANDLER( IDC_CHECKAUTOCHECK, BN_CLICKED, OnCheckAuto )
 		COMMAND_HANDLER( IDC_CHECKNIGHTLY, BN_CLICKED, OnCheckNightly )
 		COMMAND_HANDLER( IDC_BUTTONCHECKNOW, BN_CLICKED, OnCheckNow )
 		COMMAND_HANDLER( IDC_BUTTONDOWNLOAD, BN_CLICKED, OnDownload )
 		COMMAND_HANDLER( IDC_CHECKDONT, BN_CLICKED, OnDontRemind )
@@ -113,6 +117,7 @@ protected:
 	LRESULT OnCancel( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnColorStatic( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled );
 	LRESULT OnCheckAuto( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnCheckNightly( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnCheckNow( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnDownload( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
 	LRESULT OnDontRemind( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled );
@@ -160,6 +165,13 @@ LRESULT CUpdateDlg::OnInitDialog( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
 	CheckDlgButton(IDC_CHECKAUTOCHECK,check?BST_CHECKED:BST_UNCHECKED);
 	GetDlgItem(IDC_CHECKAUTOCHECK).EnableWindow(!(g_Settings[SETTING_UPDATE].flags&CSetting::FLAG_LOCKED_MASK));
 	GetDlgItem(IDC_BUTTONCHECKNOW).EnableWindow(!(g_Settings[SETTING_UPDATE].flags&CSetting::FLAG_LOCKED_MASK) || check);
 	bool nightly = false;
 	if (g_Settings[SETTING_NIGHTLY].value.vt == VT_I4)
 		nightly = g_Settings[SETTING_NIGHTLY].value.intVal != 0;
 	CheckDlgButton(IDC_CHECKNIGHTLY, nightly ? BST_CHECKED : BST_UNCHECKED);
 	GetDlgItem(IDC_CHECKNIGHTLY).EnableWindow(!(g_Settings[SETTING_NIGHTLY].flags & CSetting::FLAG_LOCKED_MASK) && check);
 	UpdateUI();
 	return TRUE;
@@ -209,6 +221,17 @@ LRESULT CUpdateDlg::OnCheckAuto( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 	bool check=IsDlgButtonChecked(IDC_CHECKAUTOCHECK)==BST_CHECKED;
 	g_Settings[SETTING_UPDATE].value=CComVariant(check?1:0);
 	g_Settings[SETTING_UPDATE].flags&=~CSetting::FLAG_DEFAULT;
 	GetDlgItem(IDC_CHECKNIGHTLY).EnableWindow(check);
 	UpdateUI();
 	return 0;
 }
 LRESULT CUpdateDlg::OnCheckNightly(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
 {
 	CSettingsLockWrite lock;
 	bool check = IsDlgButtonChecked(IDC_CHECKNIGHTLY) == BST_CHECKED;
 	g_Settings[SETTING_NIGHTLY].value = CComVariant(check ? 1 : 0);
 	g_Settings[SETTING_NIGHTLY].flags &= ~CSetting::FLAG_DEFAULT;
 	UpdateUI();
 	return 0;
 }
@@ -319,7 +342,7 @@ LRESULT CUpdateDlg::OnDontRemind( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
 LRESULT CUpdateDlg::OnWeb( int idCtrl, LPNMHDR pnmh, BOOL& bHandled )
 {
-	ShellExecute(m_hWnd,NULL,L"https://github.com/Open-Shell/Open-Shell-Menu",NULL,NULL,SW_SHOWNORMAL);
+	ShellExecute(m_hWnd,NULL,L"https://open-shell.github.io/Open-Shell-Menu/",NULL,NULL,SW_SHOWNORMAL);
 	return 0;
 }
@@ -399,6 +422,9 @@ void CUpdateDlg::UpdateUI( void )
 void CUpdateDlg::Run( void )
 {
 	if (m_hWnd)
 		return;
 	DLGTEMPLATE *pTemplate=LoadDialogEx(IDD_UPDATE);
 	Create(NULL,pTemplate);
 	MSG msg;
@@ -457,15 +483,25 @@ protected:
 ///////////////////////////////////////////////////////////////////////////////
 class UpdateToasts : public DesktopToasts
 {
 public:
 	UpdateToasts() : DesktopToasts(L"OpenShell.Update") {}
 private:
 	void OnToastActivate(LPCWSTR invokedArgs) override
 	{
 		g_UpdateDlg.Run();
 	}
 };
 ///////////////////////////////////////////////////////////////////////////////
 int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow )
 {
 	INITCOMMONCONTROLSEX init={sizeof(init),ICC_STANDARD_CLASSES};
 	InitCommonControlsEx(&init);
-/*
+
 	VersionData data;
 	data.Load(L"D:\\Work\\OpenShell\\Setup\\Final\\update_4.0.4.ver",false);
 	return 0;
 */
 	// prevent multiple instances from running on the same desktop
 	// the assumption is that multiple desktops for the same user will have different name (but may repeat across users)
 	wchar_t userName[256];
@@ -491,8 +527,6 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 	CString language=GetSettingString(L"Language");
 	ParseTranslations(NULL,language);
 	g_Instance=hInstance;
 	HINSTANCE resInstance=LoadTranslationDll(language);
 	LoadTranslationResources(resInstance,g_LoadDialogs);
@@ -504,6 +538,9 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 	COwnerWindow ownerWindow;
 	ownerWindow.Create(NULL,0,0,WS_POPUP);
 	UpdateToasts toasts;
 	if (wcsstr(lpstrCmdLine,L"-popup")!=NULL)
 	{
 		g_UpdateDlg.UpdateData();
@@ -511,46 +548,55 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 		int sleep=5000-(timeGetTime()-time0);
 		if (sleep>0)
 			Sleep(sleep);
-		HWND balloon=CreateWindowEx(WS_EX_TOPMOST|WS_EX_TOOLWINDOW|(IsLanguageRTL()?WS_EX_LAYOUTRTL:0),TOOLTIPS_CLASS,NULL,WS_POPUP|TTS_CLOSE|TTS_NOPREFIX,0,0,0,0,NULL,NULL,g_Instance,NULL);
+
-		SendMessage(balloon,TTM_SETMAXTIPWIDTH,0,500);
+		auto title = LoadStringEx(IDS_UPDATE_TITLE);
-		TOOLINFO tool={sizeof(tool),TTF_ABSOLUTE|TTF_TRANSPARENT|TTF_TRACK|(IsLanguageRTL()?TTF_RTLREADING:0U)};
+		auto message = LoadStringEx(g_UpdateDlg.HasNewLanguage() ? IDS_LANG_NEWVERSION : IDS_NEWVERSION);
-		tool.uId=1;
+
-		CString message=LoadStringEx(g_UpdateDlg.HasNewLanguage()?IDS_LANG_NEWVERSION:IDS_NEWVERSION);
+		if (toasts)
-		tool.lpszText=(wchar_t*)(const wchar_t*)message;
+		{
-		SendMessage(balloon,TTM_ADDTOOL,0,(LPARAM)&tool);
+			toasts.DisplaySimpleToast(title, message);
-		SendMessage(balloon,TTM_SETTITLE,(WPARAM)LoadIcon(g_Instance,MAKEINTRESOURCE(IDI_APPICON)),(LPARAM)(const wchar_t*)LoadStringEx(IDS_UPDATE_TITLE));
+		}
 		APPBARDATA appbar={sizeof(appbar)};
 		SHAppBarMessage(ABM_GETTASKBARPOS,&appbar);
 		MONITORINFO info={sizeof(info)};
 		GetMonitorInfo(MonitorFromWindow(appbar.hWnd,MONITOR_DEFAULTTOPRIMARY),&info);
 		SendMessage(balloon,TTM_TRACKPOSITION,0,0);
 		SendMessage(balloon,TTM_TRACKACTIVATE,TRUE,(LPARAM)&tool);
 		RECT rc;
 		GetWindowRect(balloon,&rc);
 		LONG pos;
 		if (appbar.uEdge==ABE_LEFT)
 			pos=MAKELONG(info.rcWork.left,info.rcWork.bottom-rc.bottom+rc.top);
 		else if (appbar.uEdge==ABE_RIGHT)
 			pos=MAKELONG(info.rcWork.right-rc.right+rc.left,info.rcWork.bottom-rc.bottom+rc.top);
 		else if (appbar.uEdge==ABE_TOP)
 			pos=MAKELONG(IsLanguageRTL()?info.rcWork.left:info.rcWork.right-rc.right+rc.left,info.rcWork.top);
 		else
-			pos=MAKELONG(IsLanguageRTL()?info.rcWork.left:info.rcWork.right-rc.right+rc.left,info.rcWork.bottom-rc.bottom+rc.top);
+		{
-		SendMessage(balloon,TTM_TRACKPOSITION,0,pos);
+			HWND balloon = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW | (IsLanguageRTL() ? WS_EX_LAYOUTRTL : 0), TOOLTIPS_CLASS, NULL, WS_POPUP | TTS_CLOSE | TTS_NOPREFIX, 0, 0, 0, 0, NULL, NULL, g_Instance, NULL);
-		SetWindowSubclass(balloon,SubclassBalloonProc,0,'CLSH');
+			SendMessage(balloon, TTM_SETMAXTIPWIDTH, 0, 500);
-		PlaySound(L"SystemNotification",NULL,SND_APPLICATION|SND_ALIAS|SND_ASYNC|SND_NODEFAULT|SND_SYSTEM);
+			TOOLINFO tool = { sizeof(tool),TTF_ABSOLUTE | TTF_TRANSPARENT | TTF_TRACK | (IsLanguageRTL() ? TTF_RTLREADING : 0U) };
-		int time0=timeGetTime();
+			tool.uId = 1;
 			tool.lpszText = (wchar_t*)(const wchar_t*)message;
 			SendMessage(balloon, TTM_ADDTOOL, 0, (LPARAM)&tool);
 			SendMessage(balloon, TTM_SETTITLE, (WPARAM)LoadIcon(g_Instance, MAKEINTRESOURCE(IDI_APPICON)), (LPARAM)(const wchar_t*)title);
 			APPBARDATA appbar = { sizeof(appbar) };
 			SHAppBarMessage(ABM_GETTASKBARPOS, &appbar);
 			MONITORINFO info = { sizeof(info) };
 			GetMonitorInfo(MonitorFromWindow(appbar.hWnd, MONITOR_DEFAULTTOPRIMARY), &info);
 			SendMessage(balloon, TTM_TRACKPOSITION, 0, 0);
 			SendMessage(balloon, TTM_TRACKACTIVATE, TRUE, (LPARAM)&tool);
 			RECT rc;
 			GetWindowRect(balloon, &rc);
 			LONG pos;
 			if (appbar.uEdge == ABE_LEFT)
 				pos = MAKELONG(info.rcWork.left, info.rcWork.bottom - rc.bottom + rc.top);
 			else if (appbar.uEdge == ABE_RIGHT)
 				pos = MAKELONG(info.rcWork.right - rc.right + rc.left, info.rcWork.bottom - rc.bottom + rc.top);
 			else if (appbar.uEdge == ABE_TOP)
 				pos = MAKELONG(IsLanguageRTL() ? info.rcWork.left : info.rcWork.right - rc.right + rc.left, info.rcWork.top);
 			else
 				pos = MAKELONG(IsLanguageRTL() ? info.rcWork.left : info.rcWork.right - rc.right + rc.left, info.rcWork.bottom - rc.bottom + rc.top);
 			SendMessage(balloon, TTM_TRACKPOSITION, 0, pos);
 			SetWindowSubclass(balloon, SubclassBalloonProc, 0, 'CLSH');
 			PlaySound(L"SystemNotification", NULL, SND_APPLICATION | SND_ALIAS | SND_ASYNC | SND_NODEFAULT | SND_SYSTEM);
 			int time0 = timeGetTime();
 			while (IsWindowVisible(balloon))
 			{
-			if (time0 && (timeGetTime()-time0)>=15000)
+				if (time0 && (timeGetTime() - time0) >= 15000)
 				{
-				time0=0;
+					time0 = 0;
-				TOOLINFO tool={sizeof(tool)};
+					TOOLINFO tool = { sizeof(tool) };
-				tool.uId=1;
+					tool.uId = 1;
-				SendMessage(balloon,TTM_TRACKACTIVATE,FALSE,(LPARAM)&tool);
+					SendMessage(balloon, TTM_TRACKACTIVATE, FALSE, (LPARAM)&tool);
 				}
 				MSG msg;
-			while (PeekMessage(&msg,0,0,0,PM_REMOVE))
+				while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
 				{
 					TranslateMessage(&msg);
 					DispatchMessage(&msg);
@@ -558,10 +604,29 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrC
 				Sleep(10);
 			}
 		}
 	}
 	else if (wcsstr(lpstrCmdLine, L"-ToastActivated"))
 	{
 		g_UpdateDlg.UpdateData();
 		// dialog will be shown once toast is activated (UpdateToasts::OnToastActivate)
 	}
 	else
 	{
 		g_UpdateDlg.Run();
 	}
 	// process messages for a while
 	for (int i = 0; i < 100; i++)
 	{
 		MSG msg;
 		while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
 		{
 			TranslateMessage(&msg);
 			DispatchMessage(&msg);
 		}
 		Sleep(10);
 	}
 	ownerWindow.DestroyWindow();
 	CoUninitialize();
 	return 0;
@@ -123,22 +123,24 @@ END
 // Dialog
 //
-IDD_UPDATE DIALOGEX 0, 0, 316, 181
+IDD_UPDATE DIALOGEX 0, 0, 316, 200
 STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Open-Shell Update"
 FONT 9, "Segoe UI", 400, 0, 0x0
 BEGIN
    CONTROL         "Automatically check for new versions",IDC_CHECKAUTOCHECK,
                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,129,10
-    PUSHBUTTON      "Check now",IDC_BUTTONCHECKNOW,7,17,50,14
+    CONTROL         "Check for nightly builds",IDC_CHECKNIGHTLY,
-    LTEXT           "message",IDC_STATICLATEST,7,33,302,10,SS_CENTERIMAGE
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,151,10
-    EDITTEXT        IDC_EDITTEXT,7,45,302,97,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL
+    PUSHBUTTON      "Check now",IDC_BUTTONCHECKNOW,7,34,50,14
-    PUSHBUTTON      "Download",IDC_BUTTONDOWNLOAD,7,144,50,14,NOT WS_VISIBLE
+    LTEXT           "message",IDC_STATICLATEST,7,48,302,10,SS_CENTERIMAGE
    EDITTEXT        IDC_EDITTEXT,7,60,302,97,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL
    PUSHBUTTON      "Download",IDC_BUTTONDOWNLOAD,7,161,50,14,NOT WS_VISIBLE
    CONTROL         "Don't remind me again about this version",IDC_CHECKDONT,
-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,144,141,14
+                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,61,161,141,14
-    CONTROL         "<a>https://github.com/Open-Shell/Open-Shell-Menu</a>",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,164,66,10,WS_EX_TRANSPARENT
+    CONTROL         "<a>Open-Shell-Menu</a>",IDC_LINKWEB,"SysLink",WS_TABSTOP,7,181,66,10,WS_EX_TRANSPARENT
-    DEFPUSHBUTTON   "OK",IDOK,202,160,50,14
+    DEFPUSHBUTTON   "OK",IDOK,202,177,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,259,160,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,259,177,50,14
 END
@@ -155,7 +157,7 @@ BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 309
        TOPMARGIN, 7
-        BOTTOMMARGIN, 174
+        BOTTOMMARGIN, 191
    END
 END
 #endif    // APSTUDIO_INVOKED
@@ -9,6 +9,7 @@
 #define IDC_CHECKDONT                   1004
 #define IDC_BUTTONCHECKNOW              1005
 #define IDC_CHECKAUTOCHECK              1006
 #define IDC_CHECKNIGHTLY                1007
 #define IDD_UPDATE                      6001
 #define IDS_UPDATED                     6001
 #define IDS_OUTOFDATE                   6002
@@ -21,7 +22,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        227
+#define _APS_NEXT_RESOURCE_VALUE        228
 #define _APS_NEXT_COMMAND_VALUE         32769
 #define _APS_NEXT_CONTROL_VALUE         262
 #define _APS_NEXT_SYMED_VALUE           106
@@ -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