diff --git a/README.md b/README.md
index 59ebb93..64495a9 100644
--- a/README.md
+++ b/README.md
@@ -78,20 +78,24 @@ a bunch of others that I've written or are publicly incriminating :^)
### Classic Theme
-Start Menu: [OpenShell](https://github.com/Open-Shell/Open-Shell-Menu) with [valinet's classic theme patch](https://github.com/valinet/ExplorerPatcher/discussions/167#discussioncomment-1517997)
-
-Theme Enabler: [Windhawk mod](https://gitdab.com/Cynosphere/WindhawkMods/src/branch/main/classic-theme-windows.wh.cpp)
-
-Classic Theme mitigations:
-* Folder Options X for ListView control
-* [SCT.FEH](https://github.com/AEAEAEAE4343/SimpleClassicTheme.FileExplorerHook) [(Windhawk port)](https://gitdab.com/Cynosphere/WindhawkMods/src/branch/main/classic-theme-explorer.wh.cpp)
-* [ExplorerPatcher](https://github.com/valinet/ExplorerPatcher)
+* [OpenShell](https://github.com/Open-Shell/Open-Shell-Menu) with [valinet's classic theme patch](https://github.com/valinet/ExplorerPatcher/discussions/167#discussioncomment-1517997)
+* Folder Options X
* [Command Bar shellstyle mod](https://www.askvg.com/how-to-make-folder-band-auto-hidden-in-windows-vista/)
-* [BasicThemer2](https://github.com/Ingan121/BasicThemer2) for titlebars
-
-Toolbars:
-* OpenShell's Classic Explorer Bar
-* [Classic Address Bar](https://winclassic.net/thread/1004/classic-toolbars-address-explorer-restored)
+* Windhawk mods:
+ * [Classic Theme Explorer](https://gitdab.com/Cynosphere/WindhawkMods/src/branch/main/classic-theme-explorer.wh.cpp)
+ * Replaces [SCT.FEH](https://github.com/AEAEAEAE4343/SimpleClassicTheme.FileExplorerHook) and [ExplorerPatcher](https://github.com/valinet/ExplorerPatcher)
+ * [Classic Theme Windows](https://gitdab.com/Cynosphere/WindhawkMods/src/branch/main/classic-theme-windows.wh.cpp)
+ * Replaces SimpleClassicTray, [BasicThemer2](https://github.com/Ingan121/BasicThemer2) and [Classic File Picker](https://gitdab.com/Cynosphere/WindhawkMods/src/branch/main/classic-file-picker.wh.cpp)
+ * Windows 7 Command Bar
+ * Disable Immersive Context Menus
+ * Non Immersive Taskbar Context Menu
+ * Disable icons if Explorer windows refuse to load.
+* Toolbars:
+ * OpenShell's Classic Explorer Bar
+ * [Classic Address Bar](https://winclassic.net/thread/1004/classic-toolbars-address-explorer-restored)
+ * QtTabBar (currently not in use)
+ * Uninstalling QtTabBar **will remove all your other toolbar entries**.
+* [Windows Classic 7tsp Icon Pack](https://winclassic.net/thread/1152/windows-classic-icon-pack-7tsp)
### Windhawk Mods (non-classic)
* Taskbar Clock Customization
diff --git a/windows/OpenShell/Menu Settings.xml b/windows/OpenShell/Menu Settings.xml
index c18b4ea..f109579 100644
--- a/windows/OpenShell/Menu Settings.xml
+++ b/windows/OpenShell/Menu Settings.xml
@@ -20,15 +20,21 @@
-
+
+
+
+
+
+
+
@@ -53,8 +59,9 @@
+
-
+
@@ -64,24 +71,26 @@
CustomItem2.Items=ProgramsMenu,CustomItem,SEPARATOR,AppsMenu
CustomItem2.Label=$Menu.Programs
CustomItem2.Tip=$Menu.ProgramsTip
- CustomItem2.Icon=D:\Pictures\2kexplorer\folders\folder_programs.ico
+ CustomItem2.Icon=%SystemRoot%\System32\shell32.dll, 37
ProgramsMenu.Command=programs
ProgramsMenu.Label=Start Menu
+ ProgramsMenu.Icon=%SystemRoot%\System32\imageres.dll, 80
CustomItem.Link=%appdata%\Microsoft\Windows\Start Menu\Programs\Scoop Apps
+ CustomItem.Icon=shell32.dll, 37
AppsMenu.Command=apps
AppsMenu.Label=$Menu.Apps
- AppsMenu.Icon=,2
+ AppsMenu.Icon=%SystemRoot%\System32\shell32.dll, 37
SettingsMenu.Items=CustomItem3,ControlPanelItem,SEPARATOR,SecurityItem,NetworkItem,PrintersItem,TaskbarSettingsItem,ProgramsFeaturesItem,SEPARATOR,MenuSettingsItem
SettingsMenu.Command=settings
SettingsMenu.Label=$Menu.Settings
- SettingsMenu.Icon=shell32.dll,330
+ SettingsMenu.Icon=shell32.dll, 22
CustomItem3.Link=%userprofile%\Settings Shortcuts
CustomItem3.Label=$Menu.PCSettings
- CustomItem3.Icon=D:\Pictures\2kexplorer\enabled\settings.ico
+ CustomItem3.Icon=%SystemRoot%\System32\shell32.dll, 177
ControlPanelItem.Command=control_panel
ControlPanelItem.Label=$Menu.ControlPanel
ControlPanelItem.Tip=$Menu.ControlPanelTip
- ControlPanelItem.Icon=shell32.dll,137
+ ControlPanelItem.Icon=shell32.dll, 274
ControlPanelItem.Settings=TRACK_RECENT
SecurityItem.Command=windows_security
SecurityItem.Label=$Menu.Security
@@ -98,15 +107,15 @@
TaskbarSettingsItem.Command=taskbar_settings
TaskbarSettingsItem.Label=$Menu.Taskbar
TaskbarSettingsItem.Tip=$Menu.TaskbarTip
- TaskbarSettingsItem.Icon=shell32.dll,40
+ TaskbarSettingsItem.Icon=%SystemRoot%\System32\imageres.dll, 80
ProgramsFeaturesItem.Command=programs_features
ProgramsFeaturesItem.Label=$Menu.Features
ProgramsFeaturesItem.Tip=$Menu.FeaturesTip
- ProgramsFeaturesItem.Icon=shell32.dll,271
+ ProgramsFeaturesItem.Icon=%SystemRoot%\System32\imageres.dll, 161
MenuSettingsItem.Command=menu_settings
MenuSettingsItem.Label=$Menu.ClassicSettings
MenuSettingsItem.Tip=$Menu.SettingsTip
- MenuSettingsItem.Icon=,1
+ MenuSettingsItem.Icon=%SystemRoot%\System32\shell32.dll, 250
FavoritesItem.Command=favorites
FavoritesItem.Label=$Menu.Favorites
FavoritesItem.Icon=imageres.dll,1024
@@ -148,36 +157,36 @@
RunItem.Command=run
RunItem.Label=$Menu.Run
RunItem.Tip=$Menu.RunTip
- RunItem.Icon=shell32.dll,328
+ RunItem.Icon=shell32.dll, 25
LogOffItem.Command=logoff
LogOffItem.Label=$Menu.Logoff
LogOffItem.Tip=$Menu.LogOffTip
- LogOffItem.Icon=shell32.dll,325
+ LogOffItem.Icon=shell32.dll, 45
UndockItem.Command=undock
UndockItem.Label=$Menu.Undock
UndockItem.Tip=$Menu.UndockTip
- UndockItem.Icon=shell32.dll,331
+ UndockItem.Icon=shell32.dll, 27
DisconnectItem.Command=disconnect
DisconnectItem.Label=$Menu.Disconnect
DisconnectItem.Tip=$Menu.DisconnectTip
- DisconnectItem.Icon=shell32.dll,329
+ DisconnectItem.Icon=%SystemRoot%\System32\shell32.dll, 28
ShutdownBoxItem.Items=SwitchUserItem,LockItem,SleepItem,HibernateItem,RestartNUItem,RestartItem,ShutdownNUItem,ShutdownItem
ShutdownBoxItem.Command=shutdown_box
ShutdownBoxItem.Label=$Menu.ShutdownBox
- ShutdownBoxItem.Icon=shell32.dll,329
+ ShutdownBoxItem.Icon=shell32.dll, 28
ShutdownBoxItem.Settings=SPLIT
SwitchUserItem.Command=switch_user
SwitchUserItem.Label=$Menu.SwitchUser
SwitchUserItem.Tip=$Menu.SwitchUserTip
- SwitchUserItem.Icon=none
+ SwitchUserItem.Icon=%SystemRoot%\System32\shell32.dll, 220
LockItem.Command=lock
LockItem.Label=$Menu.Lock
LockItem.Tip=$Menu.LockTip
- LockItem.Icon=none
+ LockItem.Icon=%SystemRoot%\System32\shell32.dll, 48
SleepItem.Command=sleep
SleepItem.Label=$Menu.Sleep
SleepItem.Tip=$Menu.SleepTip
- SleepItem.Icon=none
+ SleepItem.Icon=%SystemRoot%\System32\shell32.dll, 26
HibernateItem.Command=hibernate
HibernateItem.Label=$Menu.Hibernate
HibernateItem.Tip=$Menu.HibernateTip
@@ -189,7 +198,7 @@
RestartItem.Command=restart
RestartItem.Label=$Menu.Restart
RestartItem.Tip=$Menu.RestartTip
- RestartItem.Icon=none
+ RestartItem.Icon=%SystemRoot%\System32\shell32.dll, 28
ShutdownNUItem.Command=shutdown_noupdate
ShutdownNUItem.Label=$Menu.Shutdown
ShutdownNUItem.Tip=$Menu.ShutdownTip
@@ -197,7 +206,7 @@
ShutdownItem.Command=shutdown
ShutdownItem.Label=$Menu.Shutdown
ShutdownItem.Tip=$Menu.ShutdownTip
- ShutdownItem.Icon=none
+ ShutdownItem.Icon=%SystemRoot%\System32\shell32.dll, 28
SearchBoxItem.Command=search_box
SearchBoxItem.Label=$Menu.SearchBox
SearchBoxItem.Icon=none