diff --git a/RetroBar/App.xaml.cs b/RetroBar/App.xaml.cs
index 76290d29..f2332523 100644
--- a/RetroBar/App.xaml.cs
+++ b/RetroBar/App.xaml.cs
@@ -12,6 +12,8 @@
 using System.Reflection;
 using ManagedShell.Common.Logging;
 using System.Linq;
+using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace RetroBar
 {
@@ -57,11 +59,39 @@ private void App_OnStartup(object sender, StartupEventArgs e)
                 RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
             }
 
+            EventManager.RegisterClassHandler(typeof(ContextMenu), ContextMenu.OpenedEvent, new RoutedEventHandler(MenuOpened));
+            EventManager.RegisterClassHandler(typeof(ContextMenu), UIElement.KeyDownEvent, new KeyEventHandler(MenuOnKeyDown));
+            EventManager.RegisterClassHandler(typeof(MenuItem), MenuItem.ClickEvent, new RoutedEventHandler(MenuItemClicked));
+            EventManager.RegisterClassHandler(typeof(MenuItem), MenuItem.SubmenuOpenedEvent, new RoutedEventHandler(MenuOpened));
             _dictionaryManager.SetLanguageFromSettings();
             loadTheme();
             _windowManager = new WindowManager(_dictionaryManager, _explorerMonitor, _shellManager, _startMenuMonitor, _updater, _hotkeyManager);
         }
 
+        private void MenuOpened(object sender, RoutedEventArgs e)
+        {
+            SoundHelper.PlaySystemSound("MenuPopup");
+        }
+
+        private void MenuItemClicked(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuItem menuItem && menuItem.StaysOpenOnClick)
+            {
+                return;
+            }
+
+            SoundHelper.PlaySystemSound("MenuCommand");
+        }
+
+        private void MenuOnKeyDown(object sender, KeyEventArgs e)
+        {
+            // don't close if alt is pressed
+            if (e.SystemKey is Key.LeftAlt or Key.RightAlt)
+            {
+                e.Handled = true;
+            }
+        }
+
         private void App_OnExit(object sender, ExitEventArgs e)
         {
             ExitApp();
diff --git a/RetroBar/Controls/TaskButton.xaml b/RetroBar/Controls/TaskButton.xaml
index d5dce3a6..d076332e 100644
--- a/RetroBar/Controls/TaskButton.xaml
+++ b/RetroBar/Controls/TaskButton.xaml
@@ -20,7 +20,8 @@
             ContextMenuOpening="AppButton_OnContextMenuOpening"
             DragEnter="AppButton_OnDragEnter"
             DragLeave="AppButton_OnDragLeave"
-            ToolTipService.ShowDuration="60000">
+            ToolTipService.ShowDuration="60000"
+            ContextMenu="{StaticResource TaskButtonContextMenu}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -44,58 +45,6 @@
                 </TextBlock.Text>
             </TextBlock>
         </Grid>
-        <Button.ContextMenu>
-            <ContextMenu Opened="ContextMenu_OpenedOrClosed"
-                         Closed="ContextMenu_OpenedOrClosed">
-                <MenuItem Header="{DynamicResource restore}"
-                          Click="RestoreMenuItem_OnClick"
-                          Name="RestoreMenuItem">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Marlett"
-                                   Text="&#x32;"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource move}"
-                          Click="MoveMenuItem_OnClick"
-                          Name="MoveMenuItem" />
-                <MenuItem Header="{DynamicResource size}"
-                          Click="SizeMenuItem_OnClick"
-                          Name="SizeMenuItem" />
-                <MenuItem Header="{DynamicResource minimize}"
-                          Click="MinimizeMenuItem_OnClick"
-                          Name="MinimizeMenuItem">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Marlett"
-                                   Text="&#x30;"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="{DynamicResource maximize}"
-                          Click="MaximizeMenuItem_OnClick"
-                          Name="MaximizeMenuItem">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Marlett"
-                                   Text="&#x31;"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator />
-                <MenuItem Header="{DynamicResource close}"
-                          Click="CloseMenuItem_OnClick"
-                          Name="CloseMenuItem">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Marlett"
-                                   Text="&#x72;"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                    </MenuItem.Icon>
-                </MenuItem>
-            </ContextMenu>
-        </Button.ContextMenu>
         <Button.ToolTip>
             <ToolTip>
                 <ToolTip.Style>
diff --git a/RetroBar/Controls/TaskButton.xaml.cs b/RetroBar/Controls/TaskButton.xaml.cs
index bd4149c6..b913585c 100644
--- a/RetroBar/Controls/TaskButton.xaml.cs
+++ b/RetroBar/Controls/TaskButton.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -103,6 +104,10 @@ private void TaskButton_OnLoaded(object sender, RoutedEventArgs e)
                 Animate();
             }
 
+            AppButton.ContextMenu.Opened += ContextMenu_OpenedOrClosed;
+            AppButton.ContextMenu.Closed += ContextMenu_OpenedOrClosed;
+            AppButton.ContextMenu.KeyDown += ContextMenu_KeyDown;
+
             _isLoaded = true;
         }
 
@@ -158,51 +163,106 @@ private void AppButton_OnContextMenuOpening(object sender, ContextMenuEventArgs
             NativeMethods.WindowShowStyle wss = Window.ShowStyle;
             int ws = Window.WindowStyles;
 
-            // disable window operations depending on current window state. originally tried implementing via bindings but found there is no notification we get regarding maximized state
-            MaximizeMenuItem.IsEnabled = wss != NativeMethods.WindowShowStyle.ShowMaximized && (ws & (int)NativeMethods.WindowStyles.WS_MAXIMIZEBOX) != 0;
-            MinimizeMenuItem.IsEnabled = wss != NativeMethods.WindowShowStyle.ShowMinimized && Window.CanMinimize;
-            if (RestoreMenuItem.IsEnabled = wss != NativeMethods.WindowShowStyle.ShowNormal)
+            var menuItems = AppButton.ContextMenu.Items.OfType<MenuItem>().ToDictionary(item => item.Name);
+
+            if (menuItems.TryGetValue("RestoreMenuItem", out var restoreMenuItem))
+            {
+                restoreMenuItem.Click += RestoreMenuItem_OnClick;
+                restoreMenuItem.StaysOpenOnClick = wss == NativeMethods.WindowShowStyle.ShowNormal;
+            }
+
+            if (menuItems.TryGetValue("MoveMenuItem", out var moveMenuItem))
+            {
+                moveMenuItem.Click += MoveMenuItem_OnClick;
+                moveMenuItem.StaysOpenOnClick = !(wss == NativeMethods.WindowShowStyle.ShowNormal);
+            }
+
+            if (menuItems.TryGetValue("SizeMenuItem", out var sizeMenuItem))
+            {
+                sizeMenuItem.Click += SizeMenuItem_OnClick;
+                sizeMenuItem.StaysOpenOnClick = !(wss == NativeMethods.WindowShowStyle.ShowNormal && (ws & (int)NativeMethods.WindowStyles.WS_MAXIMIZEBOX) != 0);
+            }
+
+            if (menuItems.TryGetValue("MinimizeMenuItem", out var minimizeMenuItem))
+            {
+                minimizeMenuItem.Click += MinimizeMenuItem_OnClick;
+                minimizeMenuItem.StaysOpenOnClick = !(wss != NativeMethods.WindowShowStyle.ShowMinimized && (ws & (int)NativeMethods.WindowStyles.WS_MINIMIZEBOX) != 0);
+            }
+
+            if (menuItems.TryGetValue("MaximizeMenuItem", out var maximizeMenuItem))
             {
-                CloseMenuItem.FontWeight = FontWeights.Normal;
-                RestoreMenuItem.FontWeight = FontWeights.Bold;
+                maximizeMenuItem.Click += MaximizeMenuItem_OnClick;
+                maximizeMenuItem.StaysOpenOnClick = !(wss != NativeMethods.WindowShowStyle.ShowMaximized && (ws & (int)NativeMethods.WindowStyles.WS_MAXIMIZEBOX) != 0);
             }
-            if (!RestoreMenuItem.IsEnabled || RestoreMenuItem.IsEnabled && !MaximizeMenuItem.IsEnabled)
+
+            if (menuItems.TryGetValue("CloseMenuItem", out var closeMenuItem))
+            {
+                closeMenuItem.Click += CloseMenuItem_OnClick;
+            }
+        }
+
+        private void ContextMenu_KeyDown(object sender, KeyEventArgs e)
+        {
+            // Check if Alt+F4 is pressed
+            if (Keyboard.Modifiers == ModifierKeys.Alt && Keyboard.IsKeyDown(Key.F4))
             {
-                CloseMenuItem.FontWeight = FontWeights.Bold;
-                RestoreMenuItem.FontWeight = FontWeights.Normal;
+                e.Handled = true;
+                Window?.Close();
+                if (AppButton.ContextMenu is { IsOpen: true })
+                {
+                    AppButton.ContextMenu.IsOpen = false;
+                }
             }
-            MoveMenuItem.IsEnabled = wss == NativeMethods.WindowShowStyle.ShowNormal;
-            SizeMenuItem.IsEnabled = wss == NativeMethods.WindowShowStyle.ShowNormal && (ws & (int)NativeMethods.WindowStyles.WS_MAXIMIZEBOX) != 0;
         }
 
+        private static bool MenuItemEnabled(object sender) => !((MenuItem)sender).StaysOpenOnClick;
+
         private void CloseMenuItem_OnClick(object sender, RoutedEventArgs e)
         {
-            Window?.Close();
+            if (MenuItemEnabled(sender))
+            {
+                Window?.Close();
+            }
         }
 
         private void RestoreMenuItem_OnClick(object sender, RoutedEventArgs e)
         {
-            Window?.Restore();
+            if (MenuItemEnabled(sender))
+            {
+                Window?.Restore();
+            }
         }
 
         private void MoveMenuItem_OnClick(object sender, RoutedEventArgs e)
         {
-            Window?.Move();
+            if (MenuItemEnabled(sender))
+            {
+                Window?.Move();
+            }
         }
 
         private void SizeMenuItem_OnClick(object sender, RoutedEventArgs e)
         {
-            Window?.Size();
+            if (MenuItemEnabled(sender))
+            {
+                Window?.Size();
+            }
         }
 
         private void MinimizeMenuItem_OnClick(object sender, RoutedEventArgs e)
         {
-            Window?.Minimize();
+            if (MenuItemEnabled(sender))
+            {
+                Window?.Minimize();
+            }
         }
 
         private void MaximizeMenuItem_OnClick(object sender, RoutedEventArgs e)
         {
-            Window?.Maximize();
+            if (MenuItemEnabled(sender))
+            {
+                Window?.Maximize();
+            }
         }
 
         private void AppButton_OnClick(object sender, RoutedEventArgs e)
diff --git a/RetroBar/Controls/TaskList.xaml.cs b/RetroBar/Controls/TaskList.xaml.cs
index 6407905c..9eb86e17 100644
--- a/RetroBar/Controls/TaskList.xaml.cs
+++ b/RetroBar/Controls/TaskList.xaml.cs
@@ -262,10 +262,16 @@ private void SetScrollable(bool canScroll)
 
         private void TasksScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
         {
-            if (!isScrollable)
+            if (e.Delta > 0)
             {
-                e.Handled = true;
+                TasksScrollViewer.PageUp();
             }
+            if (e.Delta < 0)
+            {
+                TasksScrollViewer.PageDown();
+            }
+
+            e.Handled = true;
         }
     }
 }
\ No newline at end of file
diff --git a/RetroBar/Taskbar.xaml.cs b/RetroBar/Taskbar.xaml.cs
index 9882230e..65b6cbdb 100644
--- a/RetroBar/Taskbar.xaml.cs
+++ b/RetroBar/Taskbar.xaml.cs
@@ -226,6 +226,11 @@ protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lP
             {
                 windowManager.NotifyWorkAreaChange();
             }
+            else if (msg == (int)NativeMethods.WM.SYSCOMMAND && wParam == (IntPtr)NativeMethods.SC_CLOSE)
+            {
+                IntPtr progmanHwnd = NativeMethods.FindWindow("Progman", "Program Manager");
+                NativeMethods.SendMessage(progmanHwnd, (int)NativeMethods.WM.CLOSE, IntPtr.Zero, IntPtr.Zero);
+            }
 
             return IntPtr.Zero;
         }
diff --git a/RetroBar/Themes/System XP.xaml b/RetroBar/Themes/System XP.xaml
index f4429529..415f5a5b 100644
--- a/RetroBar/Themes/System XP.xaml	
+++ b/RetroBar/Themes/System XP.xaml	
@@ -26,7 +26,20 @@
     </Style>
 
     <Style TargetType="MenuItem"
-           x:Key="TaskManMenuItem">
+           x:Key="{x:Type MenuItem}"
+           BasedOn="{StaticResource {x:Type MenuItem}}">
+        <Style.Triggers>
+            <Trigger Property="Role"
+                     Value="SubmenuItem">
+                <Setter Property="Padding"
+                        Value="4,1,1,3" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="MenuItem"
+           x:Key="TaskManMenuItem"
+           BasedOn="{StaticResource {x:Type MenuItem}}">
         <Setter Property="Header"
                 Value="{DynamicResource show_taskman}" />
     </Style>
diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index 2c436ea8..ff62bbb6 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -17,10 +17,11 @@
     <SolidColorBrush x:Key="ButtonFace" Color="{x:Static SystemColors.ControlColor}" />
     <SolidColorBrush x:Key="ButtonShadow" Color="{x:Static SystemColors.ControlDarkColor}" />
     <SolidColorBrush x:Key="ButtonDarkShadow" Color="{x:Static SystemColors.ControlDarkDarkColor}" />
-    <SolidColorBrush x:Key="ButtonFlashingFace" Color="{x:Static SystemColors.HighlightColor}" />
-
     <SolidColorBrush x:Key="ButtonForeground" Color="{x:Static SystemColors.ControlTextColor}" />
-    <SolidColorBrush x:Key="ButtonFlashingForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
+
+    <SolidColorBrush x:Key="HighlightBackground" Color="{x:Static SystemColors.HighlightColor}" />
+    <SolidColorBrush x:Key="HighlightForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
+
     <SolidColorBrush x:Key="ClockForeground" Color="{x:Static SystemColors.ControlTextColor}" />
     <SolidColorBrush x:Key="InputLanguageForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
     <SolidColorBrush x:Key="InputLanguageBackground" Color="{x:Static SystemColors.HighlightColor}" />
@@ -28,6 +29,11 @@
     <SolidColorBrush x:Key="ToolTipBackground" Color="{x:Static SystemColors.InfoColor}" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="{x:Static SystemColors.InfoTextColor}" />
 
+    <SolidColorBrush x:Key="MenuBackground" Color="{x:Static SystemColors.MenuColor}" />
+    <SolidColorBrush x:Key="MenuForeground" Color="{x:Static SystemColors.MenuTextColor}" />
+    <SolidColorBrush x:Key="MenuDisabledForeground" Color="{x:Static SystemColors.ControlDarkColor}" />
+    <SolidColorBrush x:Key="MenuDisabledForegroundShadow" Color="{x:Static SystemColors.ControlLightLightColor}" />
+
     <BitmapImage x:Key="StartIconImage"
                  UriSource="../Resources/start9x.png" />
 
@@ -41,12 +47,6 @@
                         Value="LeftToRight" />
     </Style>
 
-    <Style TargetType="MenuItem"
-           x:Key="TaskManMenuItem">
-        <Setter Property="Header"
-                Value="{DynamicResource show_taskman_2k}" />
-    </Style>
-
     <system:Double x:Key="GlobalFontSize">11</system:Double>
     <FontWeight x:Key="SetTimeMenuItemWeight">Bold</FontWeight>
 
@@ -62,9 +62,224 @@
                 Value="{DynamicResource GlobalFontSize}" />
     </Style>
 
-    <Style TargetType="ContextMenu"
-           x:Key="{x:Type ContextMenu}"
+    <DropShadowEffect x:Key="DisabledDropShadow"
+                      ShadowDepth="1.42"
+                      Direction="315"
+                      Color="#ffffff"
+                      BlurRadius="0"
+                      Opacity="1" />
+
+    <DataTemplate x:Key="DisabledMenuItemTemplate">
+        <Grid>
+            <AccessText Text="{Binding}"
+                        Foreground="{DynamicResource MenuDisabledForegroundShadow}" RenderTransformOrigin="0.5,0.5">
+                <AccessText.RenderTransform>
+                    <TranslateTransform X="1" Y="1"/>
+                </AccessText.RenderTransform>
+            </AccessText>
+            <AccessText Text="{Binding}"
+                        Foreground="{Binding RelativeSource={RelativeSource AncestorType=MenuItem}, Path=Foreground}"/>
+        </Grid>
+    </DataTemplate>
+
+    <Style x:Key="SystemMenuItemIcon" TargetType="ContentControl">
+        <Setter Property="FontFamily"
+                Value="Marlett" />
+        <Setter Property="HorizontalAlignment"
+                Value="Center" />
+        <Setter Property="VerticalAlignment"
+                Value="Center" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Tag, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type MenuItem}}}"
+                         Value="Disabled">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ContentControl">
+                            <Grid>
+                                <!-- Shadow layer -->
+                                <TextBlock Text="{TemplateBinding Content}"
+                                   Foreground="Black"
+                                   RenderTransformOrigin="0.5,0.5">
+                                    <TextBlock.RenderTransform>
+                                        <TranslateTransform X="3" Y="3"/>
+                                    </TextBlock.RenderTransform>
+                                </TextBlock>
+                                <!-- Foreground layer -->
+                                <TextBlock Text="{TemplateBinding Content}"
+                                   Foreground="{TemplateBinding Foreground}"/>
+                            </Grid>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Geometry x:Key="Checkmark">M0 2 0 5 2.5 7.6 7.1 3 7.1 0 2.5 4.6Z</Geometry>
+
+    <ControlTemplate TargetType="MenuItem"
+                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}">
+        <Border Name="Border"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="17" SharedSizeGroup="MenuItemIconColumnGroup" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup" />
+                    <ColumnDefinition Width="14" />
+                </Grid.ColumnDefinitions>
+                <ContentPresenter x:Name="Icon"
+                                  Grid.Column="0"
+                                  Margin="3,0,1,-1"
+                                  ContentSource="Icon"
+                                  TextBlock.FontSize="13"
+                                  TextBlock.FontStyle="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}"
+                                  TextBlock.FontWeight="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}" />
+                <Path x:Name="GlyphPanel"
+                      Grid.Column="0"
+                      Margin="4,0,6,0"
+                      VerticalAlignment="Center"
+                      Data="{DynamicResource Checkmark}"
+                      Fill="{TemplateBinding Foreground}"
+                      FlowDirection="LeftToRight"
+                      RenderOptions.EdgeMode="Aliased"
+                      Visibility="Hidden" />
+                <ContentPresenter x:Name="Header"
+                                  Grid.Column="1"
+                                  Margin="{TemplateBinding Padding}"
+                                  ContentSource="Header"
+                                  RecognizesAccessKey="True" />
+                <TextBlock x:Name="InputGestureText"
+                           Grid.Column="2"
+                           Margin="5,1,0,1"
+                           DockPanel.Dock="Right"
+                           Text="{TemplateBinding InputGestureText}" />
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Icon"
+                     Value="{x:Null}">
+                <Setter TargetName="Icon"
+                        Property="Visibility"
+                        Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     Value="True">
+                <Setter TargetName="GlyphPanel"
+                        Property="Visibility"
+                        Value="Visible" />
+                <Setter TargetName="Icon"
+                        Property="Visibility"
+                        Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="StaysOpenOnClick"
+                     Value="True">
+                <Setter Property="Foreground"
+                        Value="{DynamicResource MenuDisabledForeground}" />
+                <Setter Property="HeaderTemplate"
+                        Value="{StaticResource DisabledMenuItemTemplate}" />
+                <Setter Property="Tag"
+                        Value="Disabled" />
+            </Trigger>
+            <Trigger Property="IsHighlighted"
+                     Value="True">
+                <Setter TargetName="Border"
+                        Property="Background"
+                        Value="{DynamicResource HighlightBackground}" />
+                <Setter Property="Foreground"
+                        Value="{DynamicResource HighlightForeground}" />
+                <Setter TargetName="Icon"
+                        Property="Effect"
+                        Value="{x:Null}" />
+                <Setter TargetName="Header"
+                        Property="Effect"
+                        Value="{x:Null}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="MenuItem"
+           x:Key="{x:Type MenuItem}"
            BasedOn="{StaticResource GlobalFonts}">
+        <Setter Property="Background"
+                Value="Transparent" />
+        <Setter Property="Template"
+                Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}}" />
+        <Style.Triggers>
+            <Trigger Property="Role"
+                     Value="TopLevelHeader">
+                <Setter Property="Margin"
+                        Value="0,1,0,1" />
+                <Setter Property="Padding"
+                        Value="4,1,5,2" />
+                <Setter Property="Template"
+                        Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}}"/>
+            </Trigger>
+            <Trigger Property="Role"
+                     Value="TopLevelItem">
+                <Setter Property="Margin"
+                        Value="0,1,0,1" />
+                <Setter Property="Padding"
+                        Value="4,1,5,2" />
+                <Setter Property="Template"
+                        Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}}"/>
+            </Trigger>
+            <Trigger Property="Role"
+                     Value="SubmenuHeader">
+                <Setter Property="DockPanel.Dock"
+                        Value="Top"/>
+                <Setter Property="Padding"
+                        Value="0,2,0,2" />
+                <Setter Property="Template"
+                        Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}}"/>
+            </Trigger>
+            <Trigger Property="Role"
+                     Value="SubmenuItem">
+                <Setter Property="DockPanel.Dock"
+                        Value="Top"/>
+                <Setter Property="Padding"
+                        Value="0,1,0,0" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="MenuItem"
+           x:Key="TaskManMenuItem"
+           BasedOn="{StaticResource {x:Type MenuItem}}">
+        <Setter Property="Header"
+                Value="{DynamicResource show_taskman_2k}" />
+    </Style>
+
+    <Style TargetType="Separator"
+           x:Key="{x:Static MenuItem.SeparatorStyleKey}">
+        <Setter Property="OverridesDefaultStyle"
+                Value="True" />
+        <Setter Property="MinHeight"
+                Value="2" />
+        <Setter Property="MinWidth"
+                Value="2" />
+        <Setter Property="Margin"
+                Value="2" />
+        <Setter Property="Focusable"
+                Value="False" />
+        <Setter Property="Background"
+                Value="{DynamicResource ButtonShadow}" />
+        <Setter Property="BorderBrush"
+                Value="{DynamicResource ButtonHighlight}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Separator">
+                    <Grid Height="2"
+                          Margin="0,2,0,1"
+                          Background="{TemplateBinding BorderBrush}">
+                        <Rectangle Fill="{TemplateBinding Background}"
+                                   Height="1" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
     <Style TargetType="ToolTip"
@@ -191,6 +406,61 @@
         </Setter>
     </Style>
 
+    <Style TargetType="ContextMenu"
+           x:Key="{x:Type ContextMenu}"
+           BasedOn="{StaticResource GlobalFonts}">
+        <Setter Property="OverridesDefaultStyle"
+                Value="True" />
+        <Setter Property="Background"
+                Value="{DynamicResource MenuBackground}" />
+        <Setter Property="FontStyle"
+                Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}" />
+        <Setter Property="FontWeight"
+                Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}" />
+        <Setter Property="Foreground"
+                Value="{DynamicResource MenuForeground}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Grid Margin="{TemplateBinding Margin}">
+                        <Border Background="Transparent"
+                                Padding="2">
+                            <Border BorderThickness="0,0,1,1"
+                                    BorderBrush="{DynamicResource ButtonDarkShadow}"
+                                    x:Name="OuterBottomBorder">
+                                <Border BorderThickness="1,1,0,0"
+                                        BorderBrush="{DynamicResource ButtonLight}"
+                                        x:Name="OuterTopBorder">
+                                    <Border BorderThickness="0,0,1,1"
+                                            BorderBrush="{DynamicResource ButtonShadow}"
+                                            x:Name="InnerBottomBorder">
+                                        <Border BorderThickness="1,1,0,0"
+                                                BorderBrush="{DynamicResource ButtonHighlight}"
+                                                Background="{TemplateBinding Background}"
+                                                x:Name="InnerTopBorder">
+                                            <ScrollViewer SnapsToDevicePixels="True"
+                                                          VerticalScrollBarVisibility="Auto"
+                                                          HorizontalScrollBarVisibility="Hidden"
+                                                          ClipToBounds="True">
+                                                <StackPanel IsItemsHost="True"
+                                                            KeyboardNavigation.DirectionalNavigation="Cycle"
+                                                            Margin="0"
+                                                            HorizontalAlignment="Stretch"
+                                                            VerticalAlignment="Stretch"/>
+                                            </ScrollViewer>
+                                        </Border>
+                                    </Border>
+                                </Border>
+                            </Border>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+
     <Style TargetType="GroupBox"
            x:Key="Tray">
         <Setter Property="OverridesDefaultStyle"
@@ -215,10 +485,50 @@
         </Setter>
     </Style>
 
+    <ContextMenu x:Key="TaskButtonContextMenu"
+                 x:Shared="False">
+        <MenuItem x:Name="RestoreMenuItem"
+                  Header="{DynamicResource restore}" >
+            <MenuItem.Icon>
+                <ContentControl Style="{StaticResource SystemMenuItemIcon}"
+                                Content="&#x32;" />
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem x:Name="MoveMenuItem"
+                  Header="{DynamicResource move}" />
+        <MenuItem x:Name="SizeMenuItem"
+                  Header="{DynamicResource size}" />
+        <MenuItem x:Name="MinimizeMenuItem"
+                  Header="{DynamicResource minimize}">
+            <MenuItem.Icon>
+                <ContentControl Style="{StaticResource SystemMenuItemIcon}"
+                                Content="&#x30;" />
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem x:Name="MaximizeMenuItem"
+                  Header="{DynamicResource maximize}">
+            <MenuItem.Icon>
+                <ContentControl Style="{StaticResource SystemMenuItemIcon}"
+                                Content="&#x31;" />
+            </MenuItem.Icon>
+        </MenuItem>
+        <Separator />
+        <MenuItem x:Name="CloseMenuItem"
+                  Header="{DynamicResource close}"
+                  InputGestureText="Alt+F4">
+            <MenuItem.Icon>
+                <ContentControl Style="{StaticResource SystemMenuItemIcon}"
+                                Content="&#x72;" />
+            </MenuItem.Icon>
+        </MenuItem>
+    </ContextMenu>
+
     <Style TargetType="Button"
            x:Key="TaskButton">
         <Setter Property="OverridesDefaultStyle"
                 Value="True" />
+        <Setter Property="FocusVisualStyle"
+                Value="{x:Null}" />
         <Setter Property="Background"
                 Value="{DynamicResource ButtonFace}" />
         <Setter Property="Foreground"
@@ -252,6 +562,16 @@
                         </Border>
                     </Border>
                     <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsKeyboardFocused"
+                                           Value="True" />
+                                <Condition Property="IsMouseOver"
+                                           Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="FocusVisualStyle"
+                                    Value="{DynamicResource ClassicFocusVisualAlt}" />
+                        </MultiTrigger>
                         <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                      Value="Vertical">
                             <DataTrigger.Setters>
@@ -350,7 +670,7 @@
 
     <DrawingBrush x:Key="CheckeredBackground" TileMode="Tile" Viewport="0,0,2,2" ViewportUnits="Absolute">
         <DrawingBrush.Drawing>
-            <GeometryDrawing Geometry="M2,0 H1 V1 H0 V2 H1 V1 H2Z" Brush="{DynamicResource ButtonHighlight}" />
+            <GeometryDrawing Geometry="M0,0 H1 V1 H2 V2 H1 V1 H0Z" Brush="{DynamicResource ButtonHighlight}" />
         </DrawingBrush.Drawing>
     </DrawingBrush>
 
@@ -364,9 +684,9 @@
            x:Key="TaskButtonFlashing"
            BasedOn="{StaticResource TaskButton}">
         <Setter Property="Background"
-                Value="{DynamicResource ButtonFlashingFace}" />
+                Value="{DynamicResource HighlightBackground}" />
         <Setter Property="Foreground"
-                Value="{DynamicResource ButtonFlashingForeground}" />
+                Value="{DynamicResource HighlightForeground}" />
     </Style>
 
     <Style TargetType="ContentControl"
@@ -568,6 +888,18 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ClassicFocusVisualAlt">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle RenderOptions.EdgeMode="Aliased" Margin="2,4,2,4" StrokeThickness="1"
+                               Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                               StrokeDashOffset="1.5" StrokeDashArray="1" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <ToolTip x:Key="StartButtonTip" Content="{DynamicResource start_button_tip}" />
     <ToolTip x:Key="ShowDesktopButtonTip" Content="{DynamicResource show_desktop_tip}" />
     <Style TargetType="MenuItem"
diff --git a/RetroBar/Themes/Windows 2000.xaml b/RetroBar/Themes/Windows 2000.xaml
index 587fe73e..882a18eb 100644
--- a/RetroBar/Themes/Windows 2000.xaml	
+++ b/RetroBar/Themes/Windows 2000.xaml	
@@ -2,17 +2,18 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:Boolean x:Key="InvertSystemNotifyIcons">True</system:Boolean>
-    
-    <SolidColorBrush x:Key="ButtonHighlight" Color="#ffffff" />
-    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="#ffffff" />
+
+    <SolidColorBrush x:Key="ButtonHighlight" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="#FFFFFF" />
     <SolidColorBrush x:Key="ButtonLight" Color="#D4D0C8" />
     <SolidColorBrush x:Key="ButtonFace" Color="#D4D0C8" />
     <SolidColorBrush x:Key="ButtonShadow" Color="#808080" />
     <SolidColorBrush x:Key="ButtonDarkShadow" Color="#404040" />
-    <SolidColorBrush x:Key="ButtonFlashingFace" Color="#0A246A" />
-
     <SolidColorBrush x:Key="ButtonForeground" Color="#000000" />
-    <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#FFFFFF" />
+
+    <SolidColorBrush x:Key="HighlightBackground" Color="#0A246A" />
+    <SolidColorBrush x:Key="HighlightForeground" Color="#FFFFFF" />
+
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
 
     <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
@@ -21,6 +22,10 @@
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
 
+    <SolidColorBrush x:Key="MenuBackground" Color="#D4D0C8" />
+    <SolidColorBrush x:Key="MenuForeground" Color="#000000" />
+    <SolidColorBrush x:Key="MenuDisabledForeground" Color="#808080" />
+
     <Style TargetType="TextBlock"
            x:Key="StartLabel"
            BasedOn="{StaticResource StartLabel}">
diff --git a/RetroBar/Themes/Windows 95-98.xaml b/RetroBar/Themes/Windows 95-98.xaml
index fb40d525..b8e27f91 100644
--- a/RetroBar/Themes/Windows 95-98.xaml	
+++ b/RetroBar/Themes/Windows 95-98.xaml	
@@ -2,17 +2,18 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:Boolean x:Key="InvertSystemNotifyIcons">True</system:Boolean>
-    
-    <SolidColorBrush x:Key="ButtonHighlight" Color="#ffffff" />
-    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="#ffffff" />
-    <SolidColorBrush x:Key="ButtonLight" Color="#dfdfdf" />
-    <SolidColorBrush x:Key="ButtonFace" Color="#c0c0c0" />
+
+    <SolidColorBrush x:Key="ButtonHighlight" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="ButtonLight" Color="#DFDFDF" />
+    <SolidColorBrush x:Key="ButtonFace" Color="#C0C0C0" />
     <SolidColorBrush x:Key="ButtonShadow" Color="#808080" />
     <SolidColorBrush x:Key="ButtonDarkShadow" Color="#000000" />
-    <SolidColorBrush x:Key="ButtonFlashingFace" Color="#000080" />
-
     <SolidColorBrush x:Key="ButtonForeground" Color="#000000" />
-    <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#FFFFFF" />
+
+    <SolidColorBrush x:Key="HighlightBackground" Color="#000080" />
+    <SolidColorBrush x:Key="HighlightForeground" Color="#FFFFFF" />
+
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
     
     <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
@@ -21,6 +22,10 @@
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
 
+    <SolidColorBrush x:Key="MenuBackground" Color="#C0C0C0" />
+    <SolidColorBrush x:Key="MenuForeground" Color="#000000" />
+    <SolidColorBrush x:Key="MenuDisabledForeground" Color="#808080" />
+
     <ToolTip x:Key="StartButtonTip" Content="{DynamicResource start_button_tip_98}" />
     <ToolTip x:Key="ShowDesktopButtonTip" Content="{DynamicResource show_desktop_tip_95}" />
     <Style TargetType="MenuItem"
diff --git a/RetroBar/Themes/Windows Longhorn Aero.xaml b/RetroBar/Themes/Windows Longhorn Aero.xaml
index eb092880..a03fd919 100644
--- a/RetroBar/Themes/Windows Longhorn Aero.xaml	
+++ b/RetroBar/Themes/Windows Longhorn Aero.xaml	
@@ -333,11 +333,12 @@
                       BlurRadius="8"
                       ShadowDepth="0" />
 
+    <SolidColorBrush x:Key="HighlightForeground" Color="#ffffff" />
+
     <SolidColorBrush x:Key="ItemButtonForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonActiveForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="InputLanguageBackground" Color="Transparent" />
diff --git a/RetroBar/Themes/Windows Vista Aero.xaml b/RetroBar/Themes/Windows Vista Aero.xaml
index 2d46bba0..662550eb 100644
--- a/RetroBar/Themes/Windows Vista Aero.xaml	
+++ b/RetroBar/Themes/Windows Vista Aero.xaml	
@@ -275,11 +275,12 @@
                       Offset="0.4" />
     </LinearGradientBrush>
 
+    <SolidColorBrush x:Key="HighlightForeground" Color="#ffffff" />
+
     <SolidColorBrush x:Key="ItemButtonForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonActiveForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="InputLanguageBackground" Color="Transparent" />
diff --git a/RetroBar/Themes/Windows XP Blue.xaml b/RetroBar/Themes/Windows XP Blue.xaml
index df5b30da..4feaccd6 100644
--- a/RetroBar/Themes/Windows XP Blue.xaml	
+++ b/RetroBar/Themes/Windows XP Blue.xaml	
@@ -8,6 +8,13 @@
     <Thickness x:Key="TaskButtonMargin" />
     <FontWeight x:Key="SetTimeMenuItemWeight">Normal</FontWeight>
 
+    <SolidColorBrush x:Key="HighlightBackground" Color="#316AC5" />
+    <SolidColorBrush x:Key="HighlightForeground" Color="#FFFFFF" />
+
+    <SolidColorBrush x:Key="MenuBackground" Color="#FFFFFF" />
+    <SolidColorBrush x:Key="MenuForeground" Color="#000000" />
+    <SolidColorBrush x:Key="MenuDisabledForeground" Color="#ACA899" />
+
     <LinearGradientBrush x:Key="TaskbarBackground"
                          StartPoint="0,0"
                          EndPoint="0,1">
@@ -362,7 +369,6 @@
     <SolidColorBrush x:Key="ButtonForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonActiveForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="InputLanguageBackground" Color="#316ac5" />
@@ -424,7 +430,8 @@
                  UriSource="../Resources/desktopxp-lg.png" />
 
     <Style TargetType="MenuItem"
-           x:Key="TaskManMenuItem">
+           x:Key="TaskManMenuItem"
+           BasedOn="{StaticResource {x:Type MenuItem}}">
         <Setter Property="Header"
                 Value="{DynamicResource show_taskman}" />
     </Style>
@@ -716,6 +723,122 @@
         </Setter>
     </Style>
 
+    <ControlTemplate TargetType="MenuItem"
+                     x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}">
+        <Border Name="Border"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition MinWidth="17"
+                                      Width="Auto"
+                                      SharedSizeGroup="MenuItemIconColumnGroup" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto"
+                                      SharedSizeGroup="MenuItemIGTColumnGroup" />
+                    <ColumnDefinition Width="14"/>
+                </Grid.ColumnDefinitions>
+                <!-- Icon or Checkmark in the same cell -->
+                <Grid Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <ContentPresenter x:Name="Icon"
+                                  ContentSource="Icon"
+                                  VerticalAlignment="Center"
+                                  HorizontalAlignment="Center"
+                                  Width="16" Height="16"/>
+                    <Path x:Name="GlyphPanel"
+                      Visibility="Collapsed"
+                      Fill="{TemplateBinding Foreground}"
+                      Data="{DynamicResource Checkmark}"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      Width="16" Height="16"/>
+                </Grid>
+                <ContentPresenter Grid.Column="1"
+                                  ContentSource="Header"
+                                  Margin="{TemplateBinding Padding}"
+                                  RecognizesAccessKey="True"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <TextBlock x:Name="InputGestureText"
+                           Grid.Column="2"
+                           Text="{TemplateBinding InputGestureText}"
+                           Margin="5,2,0,2"
+                           DockPanel.Dock="Right" />
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Icon"
+                     Value="{x:Null}">
+                <Setter TargetName="Icon"
+                        Property="Visibility"
+                        Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsChecked"
+                     Value="True">
+                <Setter TargetName="GlyphPanel"
+                        Property="Visibility"
+                        Value="Visible" />
+                <Setter TargetName="Icon"
+                        Property="Visibility"
+                        Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsHighlighted"
+                     Value="True">
+                <Setter TargetName="Border"
+                        Property="Background"
+                        Value="{DynamicResource HighlightBackground}" />
+                <Setter Property="Foreground"
+                        Value="{DynamicResource HighlightForeground}" />
+            </Trigger>
+            <Trigger Property="StaysOpenOnClick"
+                     Value="True">
+                <Setter Property="Foreground"
+                        Value="{DynamicResource MenuDisabledForeground}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="ContextMenu"
+           x:Key="{x:Type ContextMenu}"
+           BasedOn="{StaticResource {x:Type ContextMenu}}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ContextMenu}">
+                    <Border Name="ContextMenuBorder" Background="{TemplateBinding Background}"
+                            BorderBrush="{DynamicResource MenuDisabledForeground}"
+                            BorderThickness="1">
+                            <ScrollViewer Name="ContextMenuScrollViewer"
+                                          Style="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type FrameworkElement}, ResourceId=MenuScrollViewer}}">
+                                <Grid RenderOptions.ClearTypeHint="Enabled">
+                                    <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                        <Rectangle Name="OpaqueRect"
+                                                   Height="{Binding ElementName=ContextMenuBorder,Path=ActualHeight}"
+                                                   Width="{Binding ElementName=ContextMenuBorder,Path=ActualWidth}"
+                                                   Fill="{Binding ElementName=ContextMenuBorder,Path=Background}" />
+                                    </Canvas>
+                                    <ItemsPresenter Name="ItemsPresenter" Margin="2"
+                                                    KeyboardNavigation.DirectionalNavigation="Cycle"
+                                                    SnapsToDevicePixels="True" />
+                                </Grid>
+                            </ScrollViewer>
+                        </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="ContextMenuScrollViewer"
+                                 Property="ScrollViewer.CanContentScroll"
+                                 Value="False">
+                            <Setter TargetName="OpaqueRect"
+                                    Property="Canvas.Top"
+                                    Value="{Binding ElementName=ContextMenuScrollViewer, Path=VerticalOffset}" />
+                            <Setter TargetName="OpaqueRect"
+                                    Property="Canvas.Left"
+                                    Value="{Binding ElementName=ContextMenuScrollViewer, Path=HorizontalOffset}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style TargetType="GroupBox"
            x:Key="Tray">
         <Setter Property="OverridesDefaultStyle"
diff --git a/RetroBar/Themes/Windows XP Olive Green.xaml b/RetroBar/Themes/Windows XP Olive Green.xaml
index 71f20f3d..1da9b559 100644
--- a/RetroBar/Themes/Windows XP Olive Green.xaml	
+++ b/RetroBar/Themes/Windows XP Olive Green.xaml	
@@ -8,6 +8,8 @@
 
     <system:Boolean x:Key="InvertSystemNotifyIcons">True</system:Boolean>
 
+    <SolidColorBrush x:Key="HighlightBackground" Color="#93A070" />
+
     <LinearGradientBrush x:Key="TaskbarBackground"
                          StartPoint="0,0"
                          EndPoint="0,1">
diff --git a/RetroBar/Themes/Windows XP Silver.xaml b/RetroBar/Themes/Windows XP Silver.xaml
index f3088287..e0d461eb 100644
--- a/RetroBar/Themes/Windows XP Silver.xaml	
+++ b/RetroBar/Themes/Windows XP Silver.xaml	
@@ -8,7 +8,10 @@
 
     <Thickness x:Key="TaskButtonMargin" Right="1" />
     <system:Boolean x:Key="InvertSystemNotifyIcons">True</system:Boolean>
-    
+
+    <SolidColorBrush x:Key="HighlightBackground" Color="#BBB7C7" />
+    <SolidColorBrush x:Key="HighlightForeground" Color="#000000" />
+
     <LinearGradientBrush x:Key="TaskbarBackground"
                          StartPoint="0,0"
                          EndPoint="0,1">