diff --git a/Directory.Packages.props b/Directory.Packages.props
index bb62801..3ac0be2 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -8,15 +8,15 @@
     <PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
     <PackageVersion Include="DataGridExtensions" Version="2.6.0" />
     <PackageVersion Include="Fody" Version="6.8.2" />
-    <PackageVersion Include="Microsoft.Build" Version="[17.4.0]" Justification="VSIX limitation"/>
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="[17.4.0]" Justification="VSIX limitation"/>
+    <PackageVersion Include="Microsoft.Build" Version="[17.4.0]" Justification="VSIX limitation" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="[17.4.0]" Justification="VSIX limitation" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069" />
     <PackageVersion Include="NuGet.Protocol" Version="[6.5.1]" Justification="VSIX limitation (Newtonsoft.Json 13.0.1)" />
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="Throttle.Fody" Version="1.7.0" />
-    <PackageVersion Include="TomsToolbox.Essentials" Version="2.20.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.20.0" />
+    <PackageVersion Include="TomsToolbox.Essentials" Version="2.21.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.21.0" />
     <PackageVersion Include="VSIX-SdkProjectAdapter" Version="3.0.0" />
   </ItemGroup>
 
diff --git a/src/NuGetMonitor/Resources/VSColorScheme.xaml b/src/NuGetMonitor/Resources/VSColorScheme.xaml
index 31a5002..3794fb0 100644
--- a/src/NuGetMonitor/Resources/VSColorScheme.xaml
+++ b/src/NuGetMonitor/Resources/VSColorScheme.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
+                    xmlns:platformUi="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging"
                     xmlns:styles="urn:TomsToolbox.Wpf.Styles">
 
   <SolidColorBrush x:Key="{x:Static SystemColors.ControlLightLightBrushKey}"
@@ -60,7 +61,14 @@
   <SolidColorBrush x:Key="{x:Static styles:ResourceKeys.DisabledBrush}"
                    Color="{DynamicResource {x:Static vsfx:VsColors.ComboBoxDisabledBackgroundKey}}" />
 
-  <SolidColorBrush x:Key="CommandBarToolBarBorderBrush"
-                   Color="{DynamicResource {x:Static vsfx:VsColors.CommandBarToolBarBorderKey}}" />
-  
+  <Style TargetType="ToolBar" BasedOn="{StaticResource {x:Static styles:ResourceKeys.ToolBarStyle}}">
+    <Setter Property="Background" Value="{DynamicResource {x:Static vsfx:VsBrushes.CommandBarToolBarBorderKey}}" />
+    <Setter Property="platformUi:ImageThemingUtilities.ImageBackgroundColor" Value="{DynamicResource {x:Static vsfx:VsColors.WindowKey}}" />
+  </Style>
+
+  <Style TargetType="ContextMenu" BasedOn="{StaticResource {x:Static styles:ResourceKeys.ContextMenuStyle}}">
+    <Setter Property="Background" Value="{DynamicResource {x:Static vsfx:VsBrushes.CommandBarMenuIconBackgroundKey}}" />
+    <Setter Property="platformUi:ImageThemingUtilities.ImageBackgroundColor" Value="{DynamicResource {x:Static vsfx:VsColors.WindowKey}}" />
+  </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/NuGetMonitor/View/DependencyTree/DependencyTreeControl.xaml b/src/NuGetMonitor/View/DependencyTree/DependencyTreeControl.xaml
index 01e99d0..5bd3d1c 100644
--- a/src/NuGetMonitor/View/DependencyTree/DependencyTreeControl.xaml
+++ b/src/NuGetMonitor/View/DependencyTree/DependencyTreeControl.xaml
@@ -25,8 +25,7 @@
         <Setter Property="IsExpanded" Value="False" />
       </Style>
       <ContextMenu x:Key="PackageContextMenu"
-                   d:DataContext="{d:DesignInstance local:ChildNode}"
-                   Style="{DynamicResource {x:Static styles:ResourceKeys.ContextMenuStyle}}">
+                   d:DataContext="{d:DesignInstance local:ChildNode}">
         <MenuItem Header="Copy PackageReference"
                   Command="{Binding CopyPackageReferenceCommand}">
           <MenuItem.Icon>
@@ -110,8 +109,7 @@
   </UserControl.Resources>
   <Grid FocusManager.FocusedElement="{Binding ElementName=TreeView}">
     <DockPanel>
-      <ToolBar DockPanel.Dock="Top"
-               Style="{DynamicResource {x:Static styles:ResourceKeys.ToolBarStyle}}">
+      <ToolBar DockPanel.Dock="Top">
         <Button Command="{Binding RefreshCommand}" ToolTip="Refresh">
           <imaging:CrispImage Width="16" Height="16" Moniker="{x:Static imageCatalog:KnownMonikers.Refresh}" />
         </Button>
diff --git a/src/NuGetMonitor/View/Monitor/NuGetMonitorControl.xaml b/src/NuGetMonitor/View/Monitor/NuGetMonitorControl.xaml
index 118f465..bfd4b3b 100644
--- a/src/NuGetMonitor/View/Monitor/NuGetMonitorControl.xaml
+++ b/src/NuGetMonitor/View/Monitor/NuGetMonitorControl.xaml
@@ -18,8 +18,7 @@
   </UserControl.Resources>
   <Grid FocusManager.FocusedElement="{Binding ElementName=DataGrid}">
     <DockPanel>
-      <ToolBar DockPanel.Dock="Top" Style="{DynamicResource {x:Static styles:ResourceKeys.ToolBarStyle}}"
-               Background="{StaticResource CommandBarToolBarBorderBrush}">
+      <ToolBar DockPanel.Dock="Top">
         <Button Command="{Binding UpdateSelectedCommand}"
                 ToolTip="Update Selected Items">
           <Grid Width="16" Height="16"
@@ -235,7 +234,6 @@
                               dgx:DataGridFilterColumn.IsFilterVisible="False" />
         </DataGrid.Columns>
       </DataGrid>
-
     </DockPanel>
     <toms:LoadingIndicator IsActive="{Binding IsLoading}" Header="Loading..." d:IsHidden="True"/>
   </Grid>