Added explicit check for IsKeyboardFocused = false

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/themes/Aero.NormalColor.xaml

@@ -124,6 +124,7 @@ To automatically copy the files, set the environment variable
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/Themes/Aero2.NormalColor.xaml

@@ -7240,6 +7240,7 @@ TODO:
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/Themes/AeroLite.NormalColor.xaml

@@ -5930,6 +5930,7 @@ To automatically copy the files, set the environment variable
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/Themes/Classic.xaml

@@ -746,6 +746,7 @@ To automatically copy the files, set the environment variable
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/Themes/Luna.HomeStead.xaml

@@ -117,6 +117,7 @@ To automatically copy the files, set the environment variable
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/Themes/Luna.Metallic.xaml

@@ -119,6 +119,7 @@ To automatically copy the files, set the environment variable
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/Themes/Luna.NormalColor.xaml

@@ -118,6 +118,7 @@ To automatically copy the files, set the environment variable
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/Themes/Royale.NormalColor.xaml

@@ -122,6 +122,7 @@ To automatically copy the files, set the environment variable
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                     <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                    <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
                 </MultiDataTrigger.Conditions>
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
             </MultiDataTrigger>

src/Microsoft.DotNet.Wpf/src/Themes/XAML/Button.xaml

@@ -680,6 +680,7 @@
             <MultiDataTrigger.Conditions>
                 <Condition Binding="{Binding Path=(SystemParameters.HighContrast)}" Value="true"/>
                 <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Value="true"/>
+                <Condition Binding="{Binding Path=IsKeyboardFocused, RelativeSource={RelativeSource Self}}" Value="false"/>
             </MultiDataTrigger.Conditions>
             <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
         </MultiDataTrigger>