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 :^)
 </details>
 
 ### 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 @@
 	<Search value="0"/>
 	<Help value="0"/>
 	<HideProgramsMetro value="1"/>
-	<PinnedPrograms value="FastItems"/>
+	<PinnedPrograms value="PinnedItems"/>
 	<RecentPrograms value="None"/>
 	<RecentMetroApps value="0"/>
 	<RecentProgsTop value="0"/>
 	<HybridShutdown value="0"/>
 	<StartScreenShortcut value="0"/>
+	<MainSortZA value="0"/>
+	<MainSortOnce value="0"/>
 	<ShowNextToTaskbar value="1"/>
+	<PreCacheIcons value="1"/>
+	<DelayIcons value="1"/>
 	<SearchBox value="Hide"/>
+	<SmallIconSize value="16"/>
 	<InvertMetroIcons value="0"/>
+	<AlignToWorkArea value="0"/>
 	<MainMenuAnimation value="Slide"/>
 	<SubMenuAnimation value="Slide"/>
 	<SubMenuAnimationAlways value="1"/>
@@ -53,8 +59,9 @@
 	<StartButtonText value=""/>
 	<CustomTaskbar value="1"/>
 	<TaskbarLook value="Opaque"/>
+	<TaskbarOpacity value="25"/>
 	<TaskbarColor value="0"/>
-	<TaskbarTextColor value="16777215"/>
+	<TaskbarTextColor value="14605291"/>
 	<TaskbarTexture value=""/>
 	<TaskbarTileH value="Tile"/>
 	<TaskbarTileV value="Tile"/>
@@ -64,24 +71,26 @@
 		<Line>CustomItem2.Items=ProgramsMenu,CustomItem,SEPARATOR,AppsMenu</Line>
 		<Line>CustomItem2.Label=$Menu.Programs</Line>
 		<Line>CustomItem2.Tip=$Menu.ProgramsTip</Line>
-		<Line>CustomItem2.Icon=D:\Pictures\2kexplorer\folders\folder_programs.ico</Line>
+		<Line>CustomItem2.Icon=%SystemRoot%\System32\shell32.dll, 37</Line>
 		<Line>ProgramsMenu.Command=programs</Line>
 		<Line>ProgramsMenu.Label=Start Menu</Line>
+		<Line>ProgramsMenu.Icon=%SystemRoot%\System32\imageres.dll, 80</Line>
 		<Line>CustomItem.Link=%appdata%\Microsoft\Windows\Start Menu\Programs\Scoop Apps</Line>
+		<Line>CustomItem.Icon=shell32.dll, 37</Line>
 		<Line>AppsMenu.Command=apps</Line>
 		<Line>AppsMenu.Label=$Menu.Apps</Line>
-		<Line>AppsMenu.Icon=,2</Line>
+		<Line>AppsMenu.Icon=%SystemRoot%\System32\shell32.dll, 37</Line>
 		<Line>SettingsMenu.Items=CustomItem3,ControlPanelItem,SEPARATOR,SecurityItem,NetworkItem,PrintersItem,TaskbarSettingsItem,ProgramsFeaturesItem,SEPARATOR,MenuSettingsItem</Line>
 		<Line>SettingsMenu.Command=settings</Line>
 		<Line>SettingsMenu.Label=$Menu.Settings</Line>
-		<Line>SettingsMenu.Icon=shell32.dll,330</Line>
+		<Line>SettingsMenu.Icon=shell32.dll, 22</Line>
 		<Line>CustomItem3.Link=%userprofile%\Settings Shortcuts</Line>
 		<Line>CustomItem3.Label=$Menu.PCSettings</Line>
-		<Line>CustomItem3.Icon=D:\Pictures\2kexplorer\enabled\settings.ico</Line>
+		<Line>CustomItem3.Icon=%SystemRoot%\System32\shell32.dll, 177</Line>
 		<Line>ControlPanelItem.Command=control_panel</Line>
 		<Line>ControlPanelItem.Label=$Menu.ControlPanel</Line>
 		<Line>ControlPanelItem.Tip=$Menu.ControlPanelTip</Line>
-		<Line>ControlPanelItem.Icon=shell32.dll,137</Line>
+		<Line>ControlPanelItem.Icon=shell32.dll, 274</Line>
 		<Line>ControlPanelItem.Settings=TRACK_RECENT</Line>
 		<Line>SecurityItem.Command=windows_security</Line>
 		<Line>SecurityItem.Label=$Menu.Security</Line>
@@ -98,15 +107,15 @@
 		<Line>TaskbarSettingsItem.Command=taskbar_settings</Line>
 		<Line>TaskbarSettingsItem.Label=$Menu.Taskbar</Line>
 		<Line>TaskbarSettingsItem.Tip=$Menu.TaskbarTip</Line>
-		<Line>TaskbarSettingsItem.Icon=shell32.dll,40</Line>
+		<Line>TaskbarSettingsItem.Icon=%SystemRoot%\System32\imageres.dll, 80</Line>
 		<Line>ProgramsFeaturesItem.Command=programs_features</Line>
 		<Line>ProgramsFeaturesItem.Label=$Menu.Features</Line>
 		<Line>ProgramsFeaturesItem.Tip=$Menu.FeaturesTip</Line>
-		<Line>ProgramsFeaturesItem.Icon=shell32.dll,271</Line>
+		<Line>ProgramsFeaturesItem.Icon=%SystemRoot%\System32\imageres.dll, 161</Line>
 		<Line>MenuSettingsItem.Command=menu_settings</Line>
 		<Line>MenuSettingsItem.Label=$Menu.ClassicSettings</Line>
 		<Line>MenuSettingsItem.Tip=$Menu.SettingsTip</Line>
-		<Line>MenuSettingsItem.Icon=,1</Line>
+		<Line>MenuSettingsItem.Icon=%SystemRoot%\System32\shell32.dll, 250</Line>
 		<Line>FavoritesItem.Command=favorites</Line>
 		<Line>FavoritesItem.Label=$Menu.Favorites</Line>
 		<Line>FavoritesItem.Icon=imageres.dll,1024</Line>
@@ -148,36 +157,36 @@
 		<Line>RunItem.Command=run</Line>
 		<Line>RunItem.Label=$Menu.Run</Line>
 		<Line>RunItem.Tip=$Menu.RunTip</Line>
-		<Line>RunItem.Icon=shell32.dll,328</Line>
+		<Line>RunItem.Icon=shell32.dll, 25</Line>
 		<Line>LogOffItem.Command=logoff</Line>
 		<Line>LogOffItem.Label=$Menu.Logoff</Line>
 		<Line>LogOffItem.Tip=$Menu.LogOffTip</Line>
-		<Line>LogOffItem.Icon=shell32.dll,325</Line>
+		<Line>LogOffItem.Icon=shell32.dll, 45</Line>
 		<Line>UndockItem.Command=undock</Line>
 		<Line>UndockItem.Label=$Menu.Undock</Line>
 		<Line>UndockItem.Tip=$Menu.UndockTip</Line>
-		<Line>UndockItem.Icon=shell32.dll,331</Line>
+		<Line>UndockItem.Icon=shell32.dll, 27</Line>
 		<Line>DisconnectItem.Command=disconnect</Line>
 		<Line>DisconnectItem.Label=$Menu.Disconnect</Line>
 		<Line>DisconnectItem.Tip=$Menu.DisconnectTip</Line>
-		<Line>DisconnectItem.Icon=shell32.dll,329</Line>
+		<Line>DisconnectItem.Icon=%SystemRoot%\System32\shell32.dll, 28</Line>
 		<Line>ShutdownBoxItem.Items=SwitchUserItem,LockItem,SleepItem,HibernateItem,RestartNUItem,RestartItem,ShutdownNUItem,ShutdownItem</Line>
 		<Line>ShutdownBoxItem.Command=shutdown_box</Line>
 		<Line>ShutdownBoxItem.Label=$Menu.ShutdownBox</Line>
-		<Line>ShutdownBoxItem.Icon=shell32.dll,329</Line>
+		<Line>ShutdownBoxItem.Icon=shell32.dll, 28</Line>
 		<Line>ShutdownBoxItem.Settings=SPLIT</Line>
 		<Line>SwitchUserItem.Command=switch_user</Line>
 		<Line>SwitchUserItem.Label=$Menu.SwitchUser</Line>
 		<Line>SwitchUserItem.Tip=$Menu.SwitchUserTip</Line>
-		<Line>SwitchUserItem.Icon=none</Line>
+		<Line>SwitchUserItem.Icon=%SystemRoot%\System32\shell32.dll, 220</Line>
 		<Line>LockItem.Command=lock</Line>
 		<Line>LockItem.Label=$Menu.Lock</Line>
 		<Line>LockItem.Tip=$Menu.LockTip</Line>
-		<Line>LockItem.Icon=none</Line>
+		<Line>LockItem.Icon=%SystemRoot%\System32\shell32.dll, 48</Line>
 		<Line>SleepItem.Command=sleep</Line>
 		<Line>SleepItem.Label=$Menu.Sleep</Line>
 		<Line>SleepItem.Tip=$Menu.SleepTip</Line>
-		<Line>SleepItem.Icon=none</Line>
+		<Line>SleepItem.Icon=%SystemRoot%\System32\shell32.dll, 26</Line>
 		<Line>HibernateItem.Command=hibernate</Line>
 		<Line>HibernateItem.Label=$Menu.Hibernate</Line>
 		<Line>HibernateItem.Tip=$Menu.HibernateTip</Line>
@@ -189,7 +198,7 @@
 		<Line>RestartItem.Command=restart</Line>
 		<Line>RestartItem.Label=$Menu.Restart</Line>
 		<Line>RestartItem.Tip=$Menu.RestartTip</Line>
-		<Line>RestartItem.Icon=none</Line>
+		<Line>RestartItem.Icon=%SystemRoot%\System32\shell32.dll, 28</Line>
 		<Line>ShutdownNUItem.Command=shutdown_noupdate</Line>
 		<Line>ShutdownNUItem.Label=$Menu.Shutdown</Line>
 		<Line>ShutdownNUItem.Tip=$Menu.ShutdownTip</Line>
@@ -197,7 +206,7 @@
 		<Line>ShutdownItem.Command=shutdown</Line>
 		<Line>ShutdownItem.Label=$Menu.Shutdown</Line>
 		<Line>ShutdownItem.Tip=$Menu.ShutdownTip</Line>
-		<Line>ShutdownItem.Icon=none</Line>
+		<Line>ShutdownItem.Icon=%SystemRoot%\System32\shell32.dll, 28</Line>
 		<Line>SearchBoxItem.Command=search_box</Line>
 		<Line>SearchBoxItem.Label=$Menu.SearchBox</Line>
 		<Line>SearchBoxItem.Icon=none</Line>