From 069268edb79b096886b44a6507a2e96fdc9ee26d Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Wed, 13 Jan 2021 01:14:25 -0800
Subject: [PATCH 01/17] Update combobox

---
 dev/ComboBox/ComboBox_themeresources.xaml    | 284 ++++++++++++-------
 dev/CommonStyles/Common_themeresources.xaml  |   6 +-
 dev/CommonStyles/TextBox_themeresources.xaml |  44 ++-
 3 files changed, 229 insertions(+), 105 deletions(-)
 mode change 100644 => 100755 dev/ComboBox/ComboBox_themeresources.xaml
 mode change 100644 => 100755 dev/CommonStyles/TextBox_themeresources.xaml

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
old mode 100644
new mode 100755
index 10162af382..8463900711
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -21,47 +21,48 @@
             <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
             <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
             <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+            <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
             <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
             <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
+
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparent" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondary" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabled" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondary" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparent" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondary" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabled" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="ControlFillColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ComboBoxBackgroundUnfocused" />
-            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuter" />
             <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="TextFillColorPrimaryBrush" />
@@ -69,23 +70,24 @@
             <StaticResource x:Key="ComboBoxHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlAltFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlAAStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
             <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="AccentAAFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyout" />
 
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66FFFFFF" />
@@ -124,15 +126,21 @@
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
 
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+            <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
+            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
+            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
+            <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
+
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
@@ -252,8 +260,12 @@
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
+
+            <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="SystemControlHighlightListAccentLowBrush"/>
             <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
             <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
+            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
@@ -267,47 +279,48 @@
             <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
             <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
             <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+            <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
             <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
             <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
+
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparent" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondary" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabled" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondary" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparent" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondary" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabled" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="GhostFillColorTransparentBrush" />
-
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="ControlFillColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ComboBoxBackgroundUnfocused" />
-            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuter" />
             <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="TextFillColorPrimaryBrush" />
@@ -315,23 +328,24 @@
             <StaticResource x:Key="ComboBoxHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlAltFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlAAStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
             <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="AccentAAFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyout" />
 
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66000000" />
@@ -370,17 +384,21 @@
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
 
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+            <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
+            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
+            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 
@@ -388,6 +406,24 @@
     <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
     <Thickness x:Key="ComboBoxMinHeight">32</Thickness>
 
+    <CornerRadius x:Key="ComboBoxItemPillCornerRadius">1.5</CornerRadius>
+    <x:Double x:Key="ComboBoxItemPillHeight">16</x:Double>
+    <x:Double x:Key="ComboBoxItemPillWidth">3</x:Double>
+    <x:Double x:Key="ComboBoxItemPillMinScale">0.625</x:Double>
+    <x:String x:Key="ComboBoxItemScaleAnimationDuration">00:00:00.167</x:String>
+
+    <Style x:Key="ComboBoxItemPill" TargetType="Rectangle">
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Height" Value="{StaticResource ComboBoxItemPillHeight}"/>
+        <Setter Property="Width" Value="{StaticResource ComboBoxItemPillWidth}"/>
+        <Setter Property="Fill" Value="{ThemeResource ComboBoxItemPillFillBrush}"/>
+        <contract7Present:Setter Property="RadiusX" Value="{Binding Source={StaticResource ComboBoxItemPillCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"/>
+        <contract7Present:Setter Property="RadiusY" Value="{Binding Source={StaticResource ComboBoxItemPillCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"/>
+        <contract7NotPresent:Setter Property="RadiusX" Value="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"/>
+        <contract7NotPresent:Setter Property="RadiusY" Value="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"/>
+        <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
+    </Style>
+
     <Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBoxStyle}"/>
 
     <Style x:Key="DefaultComboBoxStyle" TargetType="ComboBox">
@@ -441,15 +477,12 @@
                         </Grid.Resources>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Normal"/>
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBorderBrushPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -470,6 +503,7 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <!-- Figure out what to do with placeholder -->
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock" Storyboard.TargetProperty="Foreground">
                                             <contract5NotPresent:DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxPlaceHolderForegroundPressed}" />
                                             <contract5Present:DiscreteObjectKeyFrame KeyTime="0" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForegroundPressed}}" />
@@ -484,6 +518,7 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="BorderBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBorderBrushDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <!-- Figure out what to do with the header -->
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxHeaderForegroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -507,12 +542,10 @@
                                             Storyboard.TargetProperty="Opacity"
                                             To="1"
                                             Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HighlightBackground" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HighlightBackground" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundBorderBrushFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="Pill"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundFocused}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -531,6 +564,10 @@
                                             Storyboard.TargetProperty="Opacity"
                                             To="1"
                                             Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="Pill"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundFocusedPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -579,14 +616,12 @@
                                 <VisualState x:Name="TextBoxFocused">
                                     <VisualState.Setters>
                                         <Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource ComboBoxEditableDropDownGlyphForeground}" />
-                                        <Setter Target="DropDownOverlay.Margin" Value="0,2,2,2" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="TextBoxFocusedOverlayPointerOver">
                                     <VisualState.Setters>
                                         <Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource ComboBoxEditableDropDownGlyphForeground}" />
-                                        <Setter Target="DropDownOverlay.Background" Value="{ThemeResource ComboBoxFocusedDropDownBackgroundPointerOver}" />
-                                        <Setter Target="DropDownOverlay.Margin" Value="0,2,2,2" />
+                                        <Setter Target="DropDownOverlay.Background" Value="{ThemeResource ComboBoxDropDownBackgroundPointerOver}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="TextBoxFocusedOverlayPressed">
@@ -606,7 +641,7 @@
                                         <Setter Target="DropDownOverlay.Background" Value="{ThemeResource ComboBoxDropDownBackgroundPointerPressed}" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="TextBoxUnfocused" />
+                                <VisualState x:Name="TextBoxUnfocused"/>
                             </contract7Present:VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <Grid.RowDefinitions>
@@ -627,15 +662,29 @@
                             FlowDirection="{TemplateBinding FlowDirection}"
                             Foreground="{ThemeResource ComboBoxHeaderForeground}"
                             FontWeight="{ThemeResource ComboBoxHeaderThemeFontWeight}"
-                            Margin="{ThemeResource ComboBoxTopHeaderMargin}"
+                            Margin="{StaticResource ComboBoxTopHeaderMargin}"
                             TextWrapping="Wrap"
                             VerticalAlignment="Top"
                             Visibility="Collapsed"
                             x:DeferLoadStrategy="Lazy" />
+
+                        <Border x:Name="HighlightBackground"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="-4,-4"
+                            Background="{ThemeResource ComboBoxBackgroundFocused}"
+                            BorderBrush="{ThemeResource ComboBoxBackgroundBorderBrushFocused}"
+                            BorderThickness="{ThemeResource ComboBoxBackgroundBorderThicknessFocused}"
+                            contract7Present:CornerRadius="{ThemeResource ComboBoxHiglightBorderCornerRadius}"
+                            contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
+                            Opacity="0" />
+
                         <Border x:Name="Background"
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
+                            contract7Present:Translation="0,0,1"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
@@ -643,16 +692,17 @@
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Control.IsTemplateFocusTarget="True"
                             MinWidth="{ThemeResource ComboBoxThemeMinWidth}" />
-                        <Border x:Name="HighlightBackground"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Background="{ThemeResource ComboBoxBackgroundUnfocused}"
-                            BorderBrush="{ThemeResource ComboBoxBackgroundBorderBrushUnfocused}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-                            contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
-                            Opacity="0" />
+
+                        <Rectangle x:Name="Pill"
+                            Style="{StaticResource ComboBoxItemPill}"
+                            Margin="1,0,0,0"
+                            Grid.Row="1" Grid.Column="0"
+                            Opacity="0">
+                            <Rectangle.RenderTransform>
+                                <CompositeTransform x:Name="PillTransform" ScaleY="1" />
+                            </Rectangle.RenderTransform>
+                        </Rectangle>
+
                         <ContentPresenter x:Name="ContentPresenter"
                             Grid.Row="1"
                             Grid.Column="0"
@@ -664,6 +714,7 @@
                                 contract5NotPresent:Foreground="{ThemeResource ComboBoxPlaceHolderForeground}"
                                 contract5Present:Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForeground}}" />
                         </ContentPresenter>
+
                         <contract7Present:TextBox x:Name="EditableText"
                             Grid.Row="1"
                             Grid.Column="0"
@@ -671,7 +722,7 @@
                             Style="{StaticResource ComboBoxTextBoxStyle}"
                             Margin="0,0,0,0"
                             Padding="{ThemeResource ComboBoxEditableTextPadding}"
-                            BorderBrush="Transparent"
+                            BorderBrush="Transparent"                  
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             PlaceholderText="{TemplateBinding PlaceholderText}"
@@ -683,21 +734,23 @@
                             x:Load="False"
                             contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}" />
-                        <contract7Present:Border x:Name="DropDownOverlay"
+                        <Border x:Name="DropDownOverlay"
                             Grid.Row="1"
                             Grid.Column="1"
                             Background="Transparent"
-                            Margin="0,1,1,1"
+                            Margin="-4,4,4,4"
                             Visibility="Collapsed"
+                            contract7Present:CornerRadius="{ThemeResource ComboBoxDropDownButtonBackgroundCornerRadius}"
+                            contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Width="30"
                             HorizontalAlignment="Right"
-                            x:Load="False"/>
+                            x:Load="False" />
                         <FontIcon x:Name="DropDownGlyph"
                             MinHeight="{ThemeResource ComboBoxMinHeight}"
                             Grid.Row="1"
                             Grid.Column="1"
                             IsHitTestVisible="False"
-                            Margin="0,0,10,0"
+                            Margin="0,0,14,0"
                             Foreground="{ThemeResource ComboBoxDropDownGlyphForeground}"
                             FontFamily="{ThemeResource SymbolThemeFontFamily}"
                             FontSize="12"
@@ -718,7 +771,7 @@
                                 contract7Present:BackgroundSizing="OuterBorderEdge"
                                 BorderBrush="{ThemeResource ComboBoxDropDownBorderBrush}"
                                 BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}"
-                                Margin="0,-1,0,-1"
+                                Margin="0,-0.5,0,-1"
                                 Padding="{ThemeResource ComboBoxDropdownBorderPadding}"
                                 HorizontalAlignment="Stretch"
                                 CornerRadius="{ThemeResource OverlayCornerRadius}">
@@ -761,6 +814,8 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                                  Margin="5,2,5,2"
+                                  CornerRadius="3"
                         Control.IsTemplateFocusTarget="True">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -807,11 +862,13 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemForegroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <PointerDownThemeAnimation Storyboard.TargetName="LayoutRoot" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelected}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -826,6 +883,9 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedUnfocused">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedUnfocused}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -839,6 +899,9 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedDisabled">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -852,6 +915,9 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedPointerOver">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -866,6 +932,12 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedPressed">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PillTransform" Storyboard.TargetProperty="ScaleY">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" Value="{StaticResource ComboBoxItemPillMinScale}" KeySpline="0,0,0,1" />
+                                        </DoubleAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -896,6 +968,17 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
+
+                        <Rectangle
+                            x:Name="Pill"
+                            Style="{StaticResource ComboBoxItemPill}"
+                            Grid.Row="1" Grid.Column="0"
+                            Opacity="0">
+                            <Rectangle.RenderTransform>
+                                <CompositeTransform x:Name="PillTransform" ScaleY="1"/>
+                            </Rectangle.RenderTransform>
+                        </Rectangle>
+
                         <ContentPresenter x:Name="ContentPresenter"
                             Content="{TemplateBinding Content}"
                             ContentTransitions="{TemplateBinding ContentTransitions}"
@@ -946,7 +1029,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        
+
                         <Border x:Name="BorderElement"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
@@ -980,5 +1063,4 @@
             </Setter.Value>
         </Setter>
     </contract7Present:Style>
-
 </ResourceDictionary>
diff --git a/dev/CommonStyles/Common_themeresources.xaml b/dev/CommonStyles/Common_themeresources.xaml
index 36bcd69468..9971df0399 100755
--- a/dev/CommonStyles/Common_themeresources.xaml
+++ b/dev/CommonStyles/Common_themeresources.xaml
@@ -252,7 +252,7 @@
             <SolidColorBrush x:Key="SystemControlHighlightListAccentMediumLowBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.75" />
             <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
             <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
+            <Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
             <Thickness x:Key="TextControlThemePadding">10,6,6,5</Thickness>
         </ResourceDictionary>
 
@@ -502,7 +502,7 @@
             <SolidColorBrush x:Key="SystemControlHighlightListAccentMediumLowBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.75" />
             <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
             <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
+            <Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
             <Thickness x:Key="TextControlThemePadding">10,6,6,5</Thickness>
         </ResourceDictionary>
 
@@ -627,7 +627,7 @@
             <SolidColorBrush x:Key="SystemControlHighlightListAccentMediumLowBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
             <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
+            <Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
             <Thickness x:Key="TextControlThemePadding">10,6,6,5</Thickness>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
diff --git a/dev/CommonStyles/TextBox_themeresources.xaml b/dev/CommonStyles/TextBox_themeresources.xaml
old mode 100644
new mode 100755
index 95ffe11c3d..e4c6f8bae1
--- a/dev/CommonStyles/TextBox_themeresources.xaml
+++ b/dev/CommonStyles/TextBox_themeresources.xaml
@@ -31,6 +31,27 @@
             <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="ControlAltFillColorTertiaryBrush" />
+            <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="TextControlElevationBorderFocusedBrush" />
+
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+                <LinearGradientBrush.RelativeTransform>
+                    <ScaleTransform ScaleY="-1" CenterY="0.5"/>
+                </LinearGradientBrush.RelativeTransform>
+                <LinearGradientBrush.GradientStops>
+                    <GradientStop Offset="0" Color="{StaticResource ControlAAFillColorDefault}"/>
+                    <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
+                </LinearGradientBrush.GradientStops>
+            </LinearGradientBrush>
+
+            <LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,1.5" EndPoint="0,2.5">
+                <LinearGradientBrush.RelativeTransform>
+                    <ScaleTransform ScaleY="-1" CenterY="0.5"/>
+                </LinearGradientBrush.RelativeTransform>
+                <LinearGradientBrush.GradientStops>
+                    <GradientStop Offset="0" Color="{StaticResource AccentFillColorDefault}"/>
+                    <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
+                </LinearGradientBrush.GradientStops>
+            </LinearGradientBrush>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
@@ -81,7 +102,28 @@
             <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="ControlAltFillColorTertiaryBrush" />
-        </ResourceDictionary>
+            <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="TextControlElevationBorderFocusedBrush" />
+
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+                <LinearGradientBrush.RelativeTransform>
+                    <ScaleTransform ScaleY="-1" CenterY="0.5"/>
+                </LinearGradientBrush.RelativeTransform>
+                <LinearGradientBrush.GradientStops>
+                    <GradientStop Offset="0" Color="{StaticResource ControlAAFillColorDefault}"/>
+                    <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
+                </LinearGradientBrush.GradientStops>
+            </LinearGradientBrush>
+
+            <LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,1.5" EndPoint="0,2.5">
+                <LinearGradientBrush.RelativeTransform>
+                    <ScaleTransform ScaleY="-1" CenterY="0.5"/>
+                </LinearGradientBrush.RelativeTransform>
+                <LinearGradientBrush.GradientStops>
+                    <GradientStop Offset="0" Color="{StaticResource AccentFillColorDefault}"/>
+                    <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
+                </LinearGradientBrush.GradientStops>
+            </LinearGradientBrush>
+        </ResourceDictionary> 
     </ResourceDictionary.ThemeDictionaries>
 
     <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>

From 7b9ffa8eb1d73673768fef60cd1262fda0eef684 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Wed, 13 Jan 2021 22:32:22 -0800
Subject: [PATCH 02/17] Update disabled brushes

---
 dev/ComboBox/ComboBox_themeresources.xaml | 51 ++++++++++++-----------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 8463900711..4b5161beaa 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -34,19 +34,19 @@
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparent" />
+            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondary" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabled" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondary" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparent" />
+            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondary" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabled" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
@@ -58,7 +58,7 @@
             <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="ControlFillColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ControlFillColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuter" />
+            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuterBrush" />
             <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
@@ -86,8 +86,8 @@
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyout" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
 
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66FFFFFF" />
@@ -137,6 +137,7 @@
             <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
             <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
             <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
+            <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
@@ -266,6 +267,7 @@
             <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
             <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
             <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
+            <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
@@ -292,19 +294,19 @@
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparent" />
+            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondary" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabled" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondary" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparent" />
+            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondary" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabled" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
@@ -316,7 +318,7 @@
             <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="ControlFillColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ControlFillColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuter" />
+            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuterBrush" />
             <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
@@ -344,8 +346,8 @@
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyout" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
 
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66000000" />
@@ -395,6 +397,7 @@
             <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
             <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
             <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
+            <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
@@ -503,7 +506,6 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <!-- Figure out what to do with placeholder -->
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock" Storyboard.TargetProperty="Foreground">
                                             <contract5NotPresent:DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxPlaceHolderForegroundPressed}" />
                                             <contract5Present:DiscreteObjectKeyFrame KeyTime="0" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForegroundPressed}}" />
@@ -518,7 +520,6 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="BorderBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBorderBrushDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <!-- Figure out what to do with the header -->
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxHeaderForegroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -807,6 +808,7 @@
         <Setter Property="Padding" Value="{ThemeResource ComboBoxItemThemePadding}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ComboBoxItemCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBoxItem">
@@ -814,8 +816,9 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                                  Margin="5,2,5,2"
-                                  CornerRadius="3"
+                        Margin="5,2,5,2"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                        contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                         Control.IsTemplateFocusTarget="True">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">

From 5c117fe6340db51f8f35409d2b1b441d875392ad Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Wed, 13 Jan 2021 23:43:54 -0800
Subject: [PATCH 03/17] Revert disabled brushes

---
 dev/ComboBox/ComboBox_themeresources.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 4b5161beaa..02bff10f0e 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -37,7 +37,7 @@
             <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
@@ -46,7 +46,7 @@
             <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
@@ -297,7 +297,7 @@
             <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
@@ -306,7 +306,7 @@
             <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />

From 4f827ab3cdafb47704edd8f6d4fc442eb783f81c Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 14 Jan 2021 22:14:13 -0800
Subject: [PATCH 04/17] reverse textbox changes

---
 dev/CommonStyles/Common_themeresources.xaml  |  9 +--
 dev/CommonStyles/TextBox_themeresources.xaml | 78 ++++++++++++++++----
 2 files changed, 69 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 dev/CommonStyles/Common_themeresources.xaml
 mode change 100755 => 100644 dev/CommonStyles/TextBox_themeresources.xaml

diff --git a/dev/CommonStyles/Common_themeresources.xaml b/dev/CommonStyles/Common_themeresources.xaml
old mode 100755
new mode 100644
index 9971df0399..47ae5298db
--- a/dev/CommonStyles/Common_themeresources.xaml
+++ b/dev/CommonStyles/Common_themeresources.xaml
@@ -214,7 +214,7 @@
             <SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
             
             <StaticResource x:Key="DefaultTextForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="DefaultApplicationBackgroundThemeBrush" ResourceKey="SolidBackgroundFillColorTertiaryBrush" />
+            <StaticResource x:Key="ApplicationPageBackgroundThemeBrush" ResourceKey="SolidBackgroundFillColorTertiaryBrush" />
 
             <!-- Elevation border brushes-->
 
@@ -463,8 +463,7 @@
             <SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
 
             <StaticResource x:Key="DefaultTextForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="DefaultApplicationBackgroundThemeBrush" ResourceKey="SolidBackgroundFillColorTertiaryBrush" />
-            
+            <StaticResource x:Key="ApplicationPageBackgroundThemeBrush" ResourceKey="SolidBackgroundFillColorTertiaryBrush" />
 
             <!-- Elevation border brushes-->
 
@@ -610,7 +609,7 @@
             <SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
 
             <StaticResource x:Key="DefaultTextForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="DefaultApplicationBackgroundThemeBrush" ResourceKey="SolidBackgroundFillColorTertiaryBrush" />
+            <StaticResource x:Key="ApplicationPageBackgroundThemeBrush" ResourceKey="SolidBackgroundFillColorTertiaryBrush" />
 
             <!-- Elevation border brushes-->
 
@@ -627,7 +626,7 @@
             <SolidColorBrush x:Key="SystemControlHighlightListAccentMediumLowBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
             <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
+            <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
             <Thickness x:Key="TextControlThemePadding">10,6,6,5</Thickness>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
diff --git a/dev/CommonStyles/TextBox_themeresources.xaml b/dev/CommonStyles/TextBox_themeresources.xaml
old mode 100755
new mode 100644
index e4c6f8bae1..19b501a55a
--- a/dev/CommonStyles/TextBox_themeresources.xaml
+++ b/dev/CommonStyles/TextBox_themeresources.xaml
@@ -25,13 +25,37 @@
             <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
             <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
             <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+
+            <!-- BUG 31342318: Text color doesn't update if the main color value is the same. To be removed when the bug is fixed. -->
+            <Color x:Key="TemporaryTextFillColorDisabled">#5DFEFEFE</Color>
+
+            <StaticResource x:Key="TextControlBackground" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="ControlFillColorInputActiveBrush" />
-            <StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlAltFillColorTertiaryBrush" />
-            <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlAAStrokeColorDefaultBrush" />
-            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="ControlAltFillColorTertiaryBrush" />
+            <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="TextControlBorderBrush" ResourceKey="TextControlElevationBorderBrush" />
+            <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="TextControlElevationBorderBrush" />
             <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="TextControlElevationBorderFocusedBrush" />
+            <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="TextControlForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="TemporaryTextFillColorDisabled" />
+            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="TextFillColorTertiaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="AccentFillColorDefaultBrush" />
+
+            <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="ControlFillColorTransparent" />
+            <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="ControlFillColorTransparent" />
+            <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="ControlFillColorTransparent" />
+            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
 
             <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
@@ -53,6 +77,7 @@
                 </LinearGradientBrush.GradientStops>
             </LinearGradientBrush>
         </ResourceDictionary>
+        
         <ResourceDictionary x:Key="HighContrast">
             <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
             <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
@@ -78,6 +103,7 @@
             <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
             <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
         </ResourceDictionary>
+        
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FF000000" />
             <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#AB000000" />
@@ -96,13 +122,37 @@
             <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#26000000" />
             <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
             <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+
+            <!-- BUG 31342318: Text color doesn't update if the main color value is the same. To be removed when the bug is fixed. -->
+            <Color x:Key="TemporaryTextFillColorDisabled">#5C010101</Color>
+
+            <StaticResource x:Key="TextControlBackground" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="TextControlBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="ControlFillColorInputActiveBrush" />
-            <StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlAltFillColorTertiaryBrush" />
-            <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlAAStrokeColorDefaultBrush" />
-            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="ControlAltFillColorTertiaryBrush" />
+            <StaticResource x:Key="TextControlBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="TextControlBorderBrush" ResourceKey="TextControlElevationBorderBrush" />
+            <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="TextControlElevationBorderBrush" />
             <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="TextControlElevationBorderFocusedBrush" />
+            <StaticResource x:Key="TextControlBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="TextControlForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="TemporaryTextFillColorDisabled" />
+            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="TextFillColorTertiaryBrush" />
+            <StaticResource x:Key="TextControlPlaceholderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="TextControlSelectionHighlightColor" ResourceKey="AccentFillColorDefaultBrush" />
+
+            <StaticResource x:Key="TextControlButtonBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlButtonBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="TextControlButtonBorderBrush" ResourceKey="ControlFillColorTransparent" />
+            <StaticResource x:Key="TextControlButtonBorderBrushPointerOver" ResourceKey="ControlFillColorTransparent" />
+            <StaticResource x:Key="TextControlButtonBorderBrushPressed" ResourceKey="ControlFillColorTransparent" />
+            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
 
             <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
@@ -123,10 +173,11 @@
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
                 </LinearGradientBrush.GradientStops>
             </LinearGradientBrush>
-        </ResourceDictionary> 
+        </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
     <Thickness x:Key="TextBoxTopHeaderMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="TextBoxInnerButtonMargin">0,4,4,4</Thickness>
 
     <Style TargetType="TextBox" BasedOn="{StaticResource DefaultTextBoxStyle}" />
 
@@ -162,6 +213,7 @@
                                     <Setter.Value>
                                         <ControlTemplate TargetType="Button">
                                             <Grid x:Name="ButtonLayoutGrid"
+                                                Margin="{ThemeResource TextBoxInnerButtonMargin}"
                                                 BorderBrush="{ThemeResource TextControlButtonBorderBrush}"
                                                 BorderThickness="{TemplateBinding BorderThickness}"
                                                 Background="{ThemeResource TextControlButtonBackground}"
@@ -383,13 +435,13 @@
                             Grid.Column="1"
                             Style="{StaticResource DeleteButtonStyle}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            contract7Present:CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                             Padding="{ThemeResource HelperButtonThemePadding}"
                             IsTabStop="False"
                             Visibility="Collapsed"
                             AutomationProperties.AccessibilityView="Raw"
                             FontSize="{TemplateBinding FontSize}"
-                            MinWidth="34"
+                            Width="30"
                             VerticalAlignment="Stretch" />
                         <contract7Present:ContentPresenter x:Name="DescriptionPresenter"
                             Grid.Row="2"

From 9e66a8cbbd4b2bc9f39624b027d2a959c0ffe71e Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Fri, 15 Jan 2021 16:44:04 -0800
Subject: [PATCH 05/17] Update tests, remove unnecessary resource

---
 dev/ComboBox/ComboBox_themeresources.xaml        | 3 +--
 dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 02bff10f0e..b4dd018327 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -400,8 +400,7 @@
             <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
-
-    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
+    
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 
diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
old mode 100644
new mode 100755
index ba6db09bfd..2b401f1ff0
--- a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
+++ b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
@@ -249,7 +249,7 @@ private void HeaderContentPresenterMarginTest(DependencyObject control)
             var contentPresenter = (ContentPresenter)root.FindName("HeaderContentPresenter");
             simpleVerify.IsTrue(contentPresenter != null, "HeaderContentPresenter can't be found");
 
-            string expectedHeaderMargin = "0,0,0,4";
+            string expectedHeaderMargin = "0,0,0,8";
             if (contentPresenter != null)
             {
                 simpleVerify.IsEqual(contentPresenter.Margin.ToString(), expectedHeaderMargin, "HeaderContentPresenter.Margin");

From 62c3ac3527412856616517aea6c0753085a46f82 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Fri, 15 Jan 2021 17:07:13 -0800
Subject: [PATCH 06/17] Restore Header margin

---
 dev/ComboBox/ComboBox_themeresources.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index b4dd018327..02bff10f0e 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -400,7 +400,8 @@
             <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
-    
+
+    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 

From 70c51cbb99e244fe5facf072c43aba5fa8daeacb Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Wed, 27 Jan 2021 23:25:17 -0800
Subject: [PATCH 07/17] Update ghost to subtle

---
 dev/ComboBox/ComboBox_themeresources.xaml | 80 +++++++++++------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 02bff10f0e..86f2a0ee81 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -34,24 +34,24 @@
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="ControlFillColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush" />
@@ -126,8 +126,8 @@
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
 
-            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
@@ -294,24 +294,24 @@
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="GhostFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="GhostFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="GhostFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="GhostFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="GhostFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="ControlFillColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush" />
@@ -386,8 +386,8 @@
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
 
-            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="GhostFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="GhostFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />

From a6d5669feb9b4fda7663ad42a779ea22530d2e31 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Wed, 27 Jan 2021 23:32:55 -0800
Subject: [PATCH 08/17] Revert header margin test

---
 dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
index 549bc8da69..280bad18a1 100755
--- a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
+++ b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
@@ -249,7 +249,7 @@ private void HeaderContentPresenterMarginTest(DependencyObject control)
             var contentPresenter = (ContentPresenter)root.FindName("HeaderContentPresenter");
             simpleVerify.IsTrue(contentPresenter != null, "HeaderContentPresenter can't be found");
 
-            string expectedHeaderMargin = "0,0,0,8";
+            string expectedHeaderMargin = "0,0,0,4";
             if (contentPresenter != null)
             {
                 simpleVerify.IsEqual(contentPresenter.Margin.ToString(), expectedHeaderMargin, "HeaderContentPresenter.Margin");

From b11c4c0d4ec1a01f43c52f96e713ad6fa4475d67 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 28 Jan 2021 09:49:04 -0800
Subject: [PATCH 09/17] restore permissions

---
 dev/CommonStyles/TestUI/CommonStylesPage.xaml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 dev/CommonStyles/TestUI/CommonStylesPage.xaml

diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml b/dev/CommonStyles/TestUI/CommonStylesPage.xaml
old mode 100644
new mode 100755

From 7678eb54b7cadba0b46c737a897ba592fedf4e60 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 28 Jan 2021 09:50:16 -0800
Subject: [PATCH 10/17] revert permissions

---
 dev/CommonStyles/TestUI/CommonStylesPage.xaml    | 0
 dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 dev/CommonStyles/TestUI/CommonStylesPage.xaml
 mode change 100755 => 100644 dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs

diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml b/dev/CommonStyles/TestUI/CommonStylesPage.xaml
old mode 100755
new mode 100644
diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
old mode 100755
new mode 100644

From 40ee5ef96651f8a8b52ec4441f0e7624399e53b8 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 28 Jan 2021 11:46:21 -0800
Subject: [PATCH 11/17] Fix header test for combobox only

---
 dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs

diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
old mode 100644
new mode 100755
index 280bad18a1..c3e96c3fc1
--- a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
+++ b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
@@ -248,8 +248,8 @@ private void HeaderContentPresenterMarginTest(DependencyObject control)
             var root = (FrameworkElement)VisualTreeHelper.GetChild(control, 0);
             var contentPresenter = (ContentPresenter)root.FindName("HeaderContentPresenter");
             simpleVerify.IsTrue(contentPresenter != null, "HeaderContentPresenter can't be found");
-
-            string expectedHeaderMargin = "0,0,0,4";
+            
+            string expectedHeaderMargin = control == ComboBox ? "0,0,0,8" : "0,0,0,4";
             if (contentPresenter != null)
             {
                 simpleVerify.IsEqual(contentPresenter.Margin.ToString(), expectedHeaderMargin, "HeaderContentPresenter.Margin");

From 7f769c073c0b202dec5b465f116d1b5a9587f504 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 28 Jan 2021 13:10:54 -0800
Subject: [PATCH 12/17] verification files update

---
 .../verification/ComboBox-4.xml               |  34 ++--
 .../verification/ComboBox-5.xml               | 126 -------------
 .../verification/ComboBox-6.xml               | 126 -------------
 .../verification/ComboBox-7.xml               |  40 ++--
 .../verification/ComboBox-8.xml               | 171 ------------------
 5 files changed, 49 insertions(+), 448 deletions(-)
 mode change 100644 => 100755 test/MUXControlsTestApp/verification/ComboBox-4.xml
 delete mode 100644 test/MUXControlsTestApp/verification/ComboBox-5.xml
 delete mode 100644 test/MUXControlsTestApp/verification/ComboBox-6.xml
 mode change 100644 => 100755 test/MUXControlsTestApp/verification/ComboBox-7.xml
 delete mode 100644 test/MUXControlsTestApp/verification/ComboBox-8.xml

diff --git a/test/MUXControlsTestApp/verification/ComboBox-4.xml b/test/MUXControlsTestApp/verification/ComboBox-4.xml
old mode 100644
new mode 100755
index d92ce09145..cf19921da3
--- a/test/MUXControlsTestApp/verification/ComboBox-4.xml
+++ b/test/MUXControlsTestApp/verification/ComboBox-4.xml
@@ -2,7 +2,7 @@
     Padding=12,5,0,7
     Foreground=#E4000000
     BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
+    BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
     Background=#B3FFFFFF
     MinWidth=64
     Margin=0,0,0,0
@@ -29,25 +29,25 @@
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
         CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
+        BorderThickness=2,2,2,2
+        BorderBrush=#E4000000
         Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
+        Name=HighlightBackground
+        Margin=-4,-4,-4,-4
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
-        RenderSize=64,32
+        RenderSize=72,40
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
         CornerRadius=4,4,4,4
         BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
+        BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
+        Background=#B3FFFFFF
+        Name=Background
+        MinWidth=64
         Margin=0,0,0,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
@@ -55,6 +55,18 @@
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
         RenderSize=64,32
+    [Windows.UI.Xaml.Shapes.Rectangle]
+        StrokeThickness=1
+        Width=3
+        Name=Pill
+        Margin=1,0,0,0
+        Height=16
+        FocusVisualSecondaryThickness=1,1,1,1
+        FocusVisualSecondaryBrush=#99FFFFFF
+        FocusVisualPrimaryThickness=2,2,2,2
+        FocusVisualPrimaryBrush=#FF000000
+        Visibility=Visible
+        RenderSize=3,16
     [Windows.UI.Xaml.Controls.ContentPresenter]
         Foreground=#E4000000
         Padding=0,0,0,0
@@ -85,7 +97,7 @@
         Foreground=#93000000
         Name=DropDownGlyph
         MinHeight=32
-        Margin=0,0,10,0
+        Margin=0,0,14,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
diff --git a/test/MUXControlsTestApp/verification/ComboBox-5.xml b/test/MUXControlsTestApp/verification/ComboBox-5.xml
deleted file mode 100644
index d92ce09145..0000000000
--- a/test/MUXControlsTestApp/verification/ComboBox-5.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-[Windows.UI.Xaml.Controls.ComboBox]
-    Padding=12,5,0,7
-    Foreground=#E4000000
-    BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
-    Background=#B3FFFFFF
-    MinWidth=64
-    Margin=0,0,0,0
-    FocusVisualSecondaryThickness=1,1,1,1
-    FocusVisualSecondaryBrush=#99FFFFFF
-    FocusVisualPrimaryThickness=2,2,2,2
-    FocusVisualPrimaryBrush=#FF000000
-    Visibility=Visible
-    RenderSize=64,32
-  [Windows.UI.Xaml.Controls.Grid]
-      Padding=0,0,0,0
-      CornerRadius=0,0,0,0
-      BorderThickness=0,0,0,0
-      BorderBrush=[NULL]
-      Background=[NULL]
-      Name=LayoutRoot
-      Margin=0,0,0,0
-      FocusVisualSecondaryThickness=1,1,1,1
-      FocusVisualSecondaryBrush=#99FFFFFF
-      FocusVisualPrimaryThickness=2,2,2,2
-      FocusVisualPrimaryBrush=#FF000000
-      Visibility=Visible
-      RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#E4000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=ContentPresenter
-        Margin=12,5,0,7
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=20,20
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Padding=0,0,0,0
-          Foreground=#93000000
-          Name=PlaceholderTextBlock
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=20,20
-    [Windows.UI.Xaml.Controls.FontIcon]
-        Foreground=#93000000
-        Name=DropDownGlyph
-        MinHeight=32
-        Margin=0,0,10,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=12,32
-      [Windows.UI.Xaml.Controls.Grid]
-          Padding=0,0,0,0
-          CornerRadius=0,0,0,0
-          BorderThickness=0,0,0,0
-          BorderBrush=[NULL]
-          Background=#00000000
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=12,32
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Padding=0,0,0,0
-            Foreground=#93000000
-            Margin=0,0,0,0
-            FocusVisualSecondaryThickness=1,1,1,1
-            FocusVisualSecondaryBrush=#99FFFFFF
-            FocusVisualPrimaryThickness=2,2,2,2
-            FocusVisualPrimaryBrush=#FF000000
-            Visibility=Visible
-            RenderSize=12,12
-    [Windows.UI.Xaml.Controls.Primitives.Popup]
-        Name=Popup
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=32,0
diff --git a/test/MUXControlsTestApp/verification/ComboBox-6.xml b/test/MUXControlsTestApp/verification/ComboBox-6.xml
deleted file mode 100644
index d92ce09145..0000000000
--- a/test/MUXControlsTestApp/verification/ComboBox-6.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-[Windows.UI.Xaml.Controls.ComboBox]
-    Padding=12,5,0,7
-    Foreground=#E4000000
-    BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
-    Background=#B3FFFFFF
-    MinWidth=64
-    Margin=0,0,0,0
-    FocusVisualSecondaryThickness=1,1,1,1
-    FocusVisualSecondaryBrush=#99FFFFFF
-    FocusVisualPrimaryThickness=2,2,2,2
-    FocusVisualPrimaryBrush=#FF000000
-    Visibility=Visible
-    RenderSize=64,32
-  [Windows.UI.Xaml.Controls.Grid]
-      Padding=0,0,0,0
-      CornerRadius=0,0,0,0
-      BorderThickness=0,0,0,0
-      BorderBrush=[NULL]
-      Background=[NULL]
-      Name=LayoutRoot
-      Margin=0,0,0,0
-      FocusVisualSecondaryThickness=1,1,1,1
-      FocusVisualSecondaryBrush=#99FFFFFF
-      FocusVisualPrimaryThickness=2,2,2,2
-      FocusVisualPrimaryBrush=#FF000000
-      Visibility=Visible
-      RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#E4000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=ContentPresenter
-        Margin=12,5,0,7
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=20,20
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Padding=0,0,0,0
-          Foreground=#93000000
-          Name=PlaceholderTextBlock
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=20,20
-    [Windows.UI.Xaml.Controls.FontIcon]
-        Foreground=#93000000
-        Name=DropDownGlyph
-        MinHeight=32
-        Margin=0,0,10,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=12,32
-      [Windows.UI.Xaml.Controls.Grid]
-          Padding=0,0,0,0
-          CornerRadius=0,0,0,0
-          BorderThickness=0,0,0,0
-          BorderBrush=[NULL]
-          Background=#00000000
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=12,32
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Padding=0,0,0,0
-            Foreground=#93000000
-            Margin=0,0,0,0
-            FocusVisualSecondaryThickness=1,1,1,1
-            FocusVisualSecondaryBrush=#99FFFFFF
-            FocusVisualPrimaryThickness=2,2,2,2
-            FocusVisualPrimaryBrush=#FF000000
-            Visibility=Visible
-            RenderSize=12,12
-    [Windows.UI.Xaml.Controls.Primitives.Popup]
-        Name=Popup
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=32,0
diff --git a/test/MUXControlsTestApp/verification/ComboBox-7.xml b/test/MUXControlsTestApp/verification/ComboBox-7.xml
old mode 100644
new mode 100755
index 2673201930..5a368d8142
--- a/test/MUXControlsTestApp/verification/ComboBox-7.xml
+++ b/test/MUXControlsTestApp/verification/ComboBox-7.xml
@@ -2,7 +2,7 @@
     Padding=12,5,0,7
     Foreground=#E4000000
     BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
+    BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
     Background=#B3FFFFFF
     CornerRadius=4,4,4,4
     Margin=0,0,0,0
@@ -28,26 +28,26 @@
       RenderSize=64,32
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
+        CornerRadius=7,7,7,7
+        BorderThickness=2,2,2,2
+        BorderBrush=#E4000000
         Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
+        Name=HighlightBackground
+        Margin=-4,-4,-4,-4
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
-        RenderSize=64,32
+        RenderSize=72,40
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
         CornerRadius=4,4,4,4
         BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
+        BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
+        Background=#B3FFFFFF
+        Name=Background
+        MinWidth=64
         Margin=0,0,0,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
@@ -55,6 +55,18 @@
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
         RenderSize=64,32
+    [Windows.UI.Xaml.Shapes.Rectangle]
+        StrokeThickness=1
+        Width=3
+        Name=Pill
+        Margin=1,0,0,0
+        Height=16
+        FocusVisualSecondaryThickness=1,1,1,1
+        FocusVisualSecondaryBrush=#99FFFFFF
+        FocusVisualPrimaryThickness=2,2,2,2
+        FocusVisualPrimaryBrush=#FF000000
+        Visibility=Visible
+        RenderSize=3,16
     [Windows.UI.Xaml.Controls.ContentPresenter]
         Foreground=#E4000000
         Padding=0,0,0,0
@@ -98,13 +110,13 @@
         RenderSize=0,0
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
-        CornerRadius=0,0,0,0
+        CornerRadius=4,4,4,4
         BorderThickness=0,0,0,0
         BorderBrush=[NULL]
         Background=#00FFFFFF
         Width=30
         Name=DropDownOverlay
-        Margin=0,1,1,1
+        Margin=-4,4,4,4
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
@@ -115,7 +127,7 @@
         Foreground=#93000000
         Name=DropDownGlyph
         MinHeight=32
-        Margin=0,0,10,0
+        Margin=0,0,14,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
diff --git a/test/MUXControlsTestApp/verification/ComboBox-8.xml b/test/MUXControlsTestApp/verification/ComboBox-8.xml
deleted file mode 100644
index 2673201930..0000000000
--- a/test/MUXControlsTestApp/verification/ComboBox-8.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-[Windows.UI.Xaml.Controls.ComboBox]
-    Padding=12,5,0,7
-    Foreground=#E4000000
-    BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
-    Background=#B3FFFFFF
-    CornerRadius=4,4,4,4
-    Margin=0,0,0,0
-    FocusVisualSecondaryThickness=1,1,1,1
-    FocusVisualSecondaryBrush=#99FFFFFF
-    FocusVisualPrimaryThickness=2,2,2,2
-    FocusVisualPrimaryBrush=#FF000000
-    Visibility=Visible
-    RenderSize=64,32
-  [Windows.UI.Xaml.Controls.Grid]
-      Padding=0,0,0,0
-      CornerRadius=0,0,0,0
-      BorderThickness=0,0,0,0
-      BorderBrush=[NULL]
-      Background=[NULL]
-      Name=LayoutRoot
-      Margin=0,0,0,0
-      FocusVisualSecondaryThickness=1,1,1,1
-      FocusVisualSecondaryBrush=#99FFFFFF
-      FocusVisualPrimaryThickness=2,2,2,2
-      FocusVisualPrimaryBrush=#FF000000
-      Visibility=Visible
-      RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#E4000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=ContentPresenter
-        Margin=12,5,0,7
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=20,19
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Padding=0,0,0,0
-          Foreground=#93000000
-          Name=PlaceholderTextBlock
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=20,19
-    [Windows.UI.Xaml.Controls.TextBox]
-        Padding=11,5,32,6
-        Foreground=#93000000
-        BorderThickness=1,1,1,1
-        BorderBrush=#00FFFFFF
-        Background=#B3FFFFFF
-        CornerRadius=4,4,4,4
-        Name=EditableText
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Collapsed
-        RenderSize=0,0
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=#00FFFFFF
-        Width=30
-        Name=DropDownOverlay
-        Margin=0,1,1,1
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Collapsed
-        RenderSize=0,0
-    [Windows.UI.Xaml.Controls.FontIcon]
-        Foreground=#93000000
-        Name=DropDownGlyph
-        MinHeight=32
-        Margin=0,0,10,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=12,32
-      [Windows.UI.Xaml.Controls.Grid]
-          Padding=0,0,0,0
-          CornerRadius=0,0,0,0
-          BorderThickness=0,0,0,0
-          BorderBrush=[NULL]
-          Background=#00000000
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=12,32
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Padding=0,0,0,0
-            Foreground=#93000000
-            Margin=0,0,0,0
-            FocusVisualSecondaryThickness=1,1,1,1
-            FocusVisualSecondaryBrush=#99FFFFFF
-            FocusVisualPrimaryThickness=2,2,2,2
-            FocusVisualPrimaryBrush=#FF000000
-            Visibility=Visible
-            RenderSize=12,12
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#99000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=DescriptionPresenter
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,0
-    [Windows.UI.Xaml.Controls.Primitives.Popup]
-        Name=Popup
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=32,0

From 48125591bc938153c67d049edbfe1c0636757a65 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Thu, 28 Jan 2021 13:26:58 -0800
Subject: [PATCH 13/17] Update margin for focus visual

---
 dev/ComboBox/ComboBox_themeresources.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 86f2a0ee81..672b84b458 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -808,6 +808,7 @@
         <Setter Property="Padding" Value="{ThemeResource ComboBoxItemThemePadding}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="FocusVisualMargin" Value="-3"/>
         <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ComboBoxItemCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>

From f6b4e523f72cb79909965ccd950f8e5996a275f1 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Fri, 29 Jan 2021 11:47:59 -0800
Subject: [PATCH 14/17] Address PR comments

---
 dev/ComboBox/ComboBox_themeresources.xaml | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 672b84b458..033ac89aa9 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -134,10 +134,10 @@
 
             <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
             <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
-            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
-            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
-            <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
+            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
+            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
+            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
+            <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
@@ -264,10 +264,10 @@
 
             <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="SystemControlHighlightListAccentLowBrush"/>
             <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
-            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
-            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
-            <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
+            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
+            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
+            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
+            <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
@@ -394,10 +394,10 @@
 
             <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
             <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
-            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7,7,7,7</CornerRadius>
-            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4,4,4,4</CornerRadius>
-            <CornerRadius x:Key="ComboBoxItemCornerRadius">3,3,3,3</CornerRadius>
+            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
+            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
+            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
+            <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
@@ -673,7 +673,7 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Margin="-4,-4"
+                            Margin="-4"
                             Background="{ThemeResource ComboBoxBackgroundFocused}"
                             BorderBrush="{ThemeResource ComboBoxBackgroundBorderBrushFocused}"
                             BorderThickness="{ThemeResource ComboBoxBackgroundBorderThicknessFocused}"
@@ -720,7 +720,7 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Style="{StaticResource ComboBoxTextBoxStyle}"
+                            Style="{TemplateBinding TextBoxStyle}"
                             Margin="0,0,0,0"
                             Padding="{ThemeResource ComboBoxEditableTextPadding}"
                             BorderBrush="Transparent"                  

From 35db37da7cfc8281fb77ed83036414386cb7fc0b Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Fri, 29 Jan 2021 16:42:34 -0800
Subject: [PATCH 15/17] Remove repeated resources

---
 dev/ComboBox/ComboBox_themeresources.xaml | 146 ++++++++--------------
 1 file changed, 49 insertions(+), 97 deletions(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 033ac89aa9..851a87f996 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -10,21 +10,6 @@
   xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
-            <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
-            <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
-            <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
-            <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
-            <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
-            <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
-            <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
-
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
@@ -82,13 +67,11 @@
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
-
-            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
-
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66FFFFFF" />
             <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="#FF000000" />
@@ -125,23 +108,14 @@
             <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="#FF000000" />
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
-
             <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
-            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
-            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
-            <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
-            <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
-
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
@@ -169,7 +143,6 @@
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
-
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
@@ -200,26 +173,12 @@
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
-            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
-
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
-            <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
-            <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
-            <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
-            <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
-            <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
-            <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
-            <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
             <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
             <SolidColorBrush x:Key="ComboBoxArrowPressedForegroundThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
@@ -255,36 +214,14 @@
             <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
-
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-
             <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="SystemControlHighlightListAccentLowBrush"/>
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
-            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
-            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
-            <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
-            <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
-            <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
-            <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
-            <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
-            <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
-            <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
-            <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
-
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
@@ -341,14 +278,12 @@
             <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
-
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
-            <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
-
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66000000" />
             <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="#FF000000" />
@@ -385,35 +320,50 @@
             <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="#FF000000" />
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
-
             <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
-            <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
-            <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
-            <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
+    <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
+    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
+    <x:Double x:Key="ComboBoxItemPillHeight">16</x:Double>
+    <x:Double x:Key="ComboBoxItemPillWidth">3</x:Double>
+    <x:Double x:Key="ComboBoxItemPillMinScale">0.625</x:Double>
+
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 
+    <x:String x:Key="ComboBoxItemScaleAnimationDuration">00:00:00.167</x:String>
+
+    <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
+    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
     <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
     <Thickness x:Key="ComboBoxMinHeight">32</Thickness>
 
+    <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
+    <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
+    <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
     <CornerRadius x:Key="ComboBoxItemPillCornerRadius">1.5</CornerRadius>
-    <x:Double x:Key="ComboBoxItemPillHeight">16</x:Double>
-    <x:Double x:Key="ComboBoxItemPillWidth">3</x:Double>
-    <x:Double x:Key="ComboBoxItemPillMinScale">0.625</x:Double>
-    <x:String x:Key="ComboBoxItemScaleAnimationDuration">00:00:00.167</x:String>
+    
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
 
     <Style x:Key="ComboBoxItemPill" TargetType="Rectangle">
         <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -430,12 +380,12 @@
     <Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBoxStyle}"/>
 
     <Style x:Key="DefaultComboBoxStyle" TargetType="ComboBox">
-        <Setter Property="Padding" Value="{ThemeResource ComboBoxPadding}" />
+        <Setter Property="Padding" Value="{StaticResource ComboBoxPadding}" />
         <Setter Property="MaxDropDownHeight" Value="504" />
         <Setter Property="Foreground" Value="{ThemeResource ComboBoxForeground}" />
         <Setter Property="Background" Value="{ThemeResource ComboBoxBackground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource ComboBoxBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ComboBoxBorderThemeThickness}" />
+        <Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}" />
         <Setter Property="TabNavigation" Value="Once" />
         <contract7Present:Setter Property="TextBoxStyle" Value="{StaticResource ComboBoxTextBoxStyle}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
@@ -662,7 +612,7 @@
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             FlowDirection="{TemplateBinding FlowDirection}"
                             Foreground="{ThemeResource ComboBoxHeaderForeground}"
-                            FontWeight="{ThemeResource ComboBoxHeaderThemeFontWeight}"
+                            FontWeight="{StaticResource ComboBoxHeaderThemeFontWeight}"
                             Margin="{StaticResource ComboBoxTopHeaderMargin}"
                             TextWrapping="Wrap"
                             VerticalAlignment="Top"
@@ -676,8 +626,8 @@
                             Margin="-4"
                             Background="{ThemeResource ComboBoxBackgroundFocused}"
                             BorderBrush="{ThemeResource ComboBoxBackgroundBorderBrushFocused}"
-                            BorderThickness="{ThemeResource ComboBoxBackgroundBorderThicknessFocused}"
-                            contract7Present:CornerRadius="{ThemeResource ComboBoxHiglightBorderCornerRadius}"
+                            BorderThickness="{StaticResource ComboBoxBackgroundBorderThicknessFocused}"
+                            contract7Present:CornerRadius="{StaticResource ComboBoxHiglightBorderCornerRadius}"
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Opacity="0" />
 
@@ -692,7 +642,7 @@
                             contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Control.IsTemplateFocusTarget="True"
-                            MinWidth="{ThemeResource ComboBoxThemeMinWidth}" />
+                            MinWidth="{StaticResource ComboBoxThemeMinWidth}" />
 
                         <Rectangle x:Name="Pill"
                             Style="{StaticResource ComboBoxItemPill}"
@@ -722,7 +672,7 @@
                             Grid.ColumnSpan="2"
                             Style="{TemplateBinding TextBoxStyle}"
                             Margin="0,0,0,0"
-                            Padding="{ThemeResource ComboBoxEditableTextPadding}"
+                            Padding="{StaticResource ComboBoxEditableTextPadding}"
                             BorderBrush="Transparent"                  
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -741,13 +691,13 @@
                             Background="Transparent"
                             Margin="-4,4,4,4"
                             Visibility="Collapsed"
-                            contract7Present:CornerRadius="{ThemeResource ComboBoxDropDownButtonBackgroundCornerRadius}"
+                            contract7Present:CornerRadius="{StaticResource ComboBoxDropDownButtonBackgroundCornerRadius}"
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Width="30"
                             HorizontalAlignment="Right"
                             x:Load="False" />
                         <FontIcon x:Name="DropDownGlyph"
-                            MinHeight="{ThemeResource ComboBoxMinHeight}"
+                            MinHeight="{StaticResource ComboBoxMinHeight}"
                             Grid.Row="1"
                             Grid.Column="1"
                             IsHitTestVisible="False"
@@ -771,9 +721,9 @@
                                 Background="{ThemeResource ComboBoxDropDownBackground}"
                                 contract7Present:BackgroundSizing="OuterBorderEdge"
                                 BorderBrush="{ThemeResource ComboBoxDropDownBorderBrush}"
-                                BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}"
+                                BorderThickness="{StaticResource ComboBoxDropdownBorderThickness}"
                                 Margin="0,-0.5,0,-1"
-                                Padding="{ThemeResource ComboBoxDropdownBorderPadding}"
+                                Padding="{StaticResource ComboBoxDropdownBorderPadding}"
                                 HorizontalAlignment="Stretch"
                                 CornerRadius="{ThemeResource OverlayCornerRadius}">
                                 <ScrollViewer x:Name="ScrollViewer"
@@ -791,7 +741,7 @@
                                     BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
                                     ZoomMode="Disabled"
                                     AutomationProperties.AccessibilityView="Raw">
-                                    <ItemsPresenter Margin="{ThemeResource ComboBoxDropdownContentMargin}" />
+                                    <ItemsPresenter Margin="{StaticResource ComboBoxDropdownContentMargin}" />
                                 </ScrollViewer>
                             </Border>
                         </Popup>
@@ -801,15 +751,17 @@
         </Setter>
     </Style>
 
-    <Style TargetType="ComboBoxItem">
+    <Style TargetType="ComboBoxItem" BasedOn="{StaticResource DefaultComboBoxItemStyle}"/>
+        
+    <Style TargetType="ComboBoxItem" x:Key="DefaultComboBoxItemStyle">
         <Setter Property="Foreground" Value="{ThemeResource ComboBoxItemForeground}" />
         <Setter Property="Background" Value="{ThemeResource ComboBoxItemBackground}" />
         <Setter Property="TabNavigation" Value="Local" />
-        <Setter Property="Padding" Value="{ThemeResource ComboBoxItemThemePadding}" />
+        <Setter Property="Padding" Value="{StaticResource ComboBoxItemThemePadding}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
         <Setter Property="FocusVisualMargin" Value="-3"/>
-        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ComboBoxItemCornerRadius}"/>
+        <contract7Present:Setter Property="CornerRadius" Value="{StaticResource ComboBoxItemCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBoxItem">
@@ -959,14 +911,14 @@
                                 <VisualState x:Name="TouchInputMode">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemThemeTouchPadding}" />
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ComboBoxItemThemeTouchPadding}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="GameControllerInputMode">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemThemeGameControllerPadding}" />
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ComboBoxItemThemeGameControllerPadding}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>

From bde655e2630ccaf4955eab259e025505e72bfe51 Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Fri, 29 Jan 2021 16:50:16 -0800
Subject: [PATCH 16/17] Fix wrong type for resource

---
 dev/ComboBox/ComboBox_themeresources.xaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 851a87f996..52fddbdb75 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -278,8 +278,8 @@
             <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+            <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
@@ -333,10 +333,11 @@
     <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
     <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
     <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
+    <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
     <x:Double x:Key="ComboBoxItemPillHeight">16</x:Double>
     <x:Double x:Key="ComboBoxItemPillWidth">3</x:Double>
     <x:Double x:Key="ComboBoxItemPillMinScale">0.625</x:Double>
-
+    
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 
@@ -355,7 +356,7 @@
     <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
     <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
-    <Thickness x:Key="ComboBoxMinHeight">32</Thickness>
+  
 
     <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
     <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>

From 96ce1d55da740d8cfa6406d3decabaa0b78435da Mon Sep 17 00:00:00 2001
From: beervoley <sevkorobot@gmail.com>
Date: Sat, 30 Jan 2021 18:52:41 -0800
Subject: [PATCH 17/17] Fix tests

---
 dev/ComboBox/ComboBox_themeresources.xaml | 31 +++++++++++------------
 dev/dll/DensityStyles/Compact.xaml        |  2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
index 52fddbdb75..28fac900af 100755
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -333,11 +333,11 @@
     <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
     <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
     <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
-    <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
     <x:Double x:Key="ComboBoxItemPillHeight">16</x:Double>
     <x:Double x:Key="ComboBoxItemPillWidth">3</x:Double>
     <x:Double x:Key="ComboBoxItemPillMinScale">0.625</x:Double>
-    
+    <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
+
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 
@@ -356,7 +356,6 @@
     <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
     <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
-  
 
     <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
     <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
@@ -381,12 +380,12 @@
     <Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBoxStyle}"/>
 
     <Style x:Key="DefaultComboBoxStyle" TargetType="ComboBox">
-        <Setter Property="Padding" Value="{StaticResource ComboBoxPadding}" />
+        <Setter Property="Padding" Value="{ThemeResource ComboBoxPadding}" />
         <Setter Property="MaxDropDownHeight" Value="504" />
         <Setter Property="Foreground" Value="{ThemeResource ComboBoxForeground}" />
         <Setter Property="Background" Value="{ThemeResource ComboBoxBackground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource ComboBoxBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ComboBoxBorderThemeThickness}" />
         <Setter Property="TabNavigation" Value="Once" />
         <contract7Present:Setter Property="TextBoxStyle" Value="{StaticResource ComboBoxTextBoxStyle}" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
@@ -613,8 +612,8 @@
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             FlowDirection="{TemplateBinding FlowDirection}"
                             Foreground="{ThemeResource ComboBoxHeaderForeground}"
-                            FontWeight="{StaticResource ComboBoxHeaderThemeFontWeight}"
-                            Margin="{StaticResource ComboBoxTopHeaderMargin}"
+                            FontWeight="{ThemeResource ComboBoxHeaderThemeFontWeight}"
+                            Margin="{ThemeResource ComboBoxTopHeaderMargin}"
                             TextWrapping="Wrap"
                             VerticalAlignment="Top"
                             Visibility="Collapsed"
@@ -643,7 +642,7 @@
                             contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Control.IsTemplateFocusTarget="True"
-                            MinWidth="{StaticResource ComboBoxThemeMinWidth}" />
+                            MinWidth="{ThemeResource ComboBoxThemeMinWidth}" />
 
                         <Rectangle x:Name="Pill"
                             Style="{StaticResource ComboBoxItemPill}"
@@ -673,7 +672,7 @@
                             Grid.ColumnSpan="2"
                             Style="{TemplateBinding TextBoxStyle}"
                             Margin="0,0,0,0"
-                            Padding="{StaticResource ComboBoxEditableTextPadding}"
+                            Padding="{ThemeResource ComboBoxEditableTextPadding}"
                             BorderBrush="Transparent"                  
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -698,7 +697,7 @@
                             HorizontalAlignment="Right"
                             x:Load="False" />
                         <FontIcon x:Name="DropDownGlyph"
-                            MinHeight="{StaticResource ComboBoxMinHeight}"
+                            MinHeight="{ThemeResource ComboBoxMinHeight}"
                             Grid.Row="1"
                             Grid.Column="1"
                             IsHitTestVisible="False"
@@ -722,9 +721,9 @@
                                 Background="{ThemeResource ComboBoxDropDownBackground}"
                                 contract7Present:BackgroundSizing="OuterBorderEdge"
                                 BorderBrush="{ThemeResource ComboBoxDropDownBorderBrush}"
-                                BorderThickness="{StaticResource ComboBoxDropdownBorderThickness}"
+                                BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}"
                                 Margin="0,-0.5,0,-1"
-                                Padding="{StaticResource ComboBoxDropdownBorderPadding}"
+                                Padding="{ThemeResource ComboBoxDropdownBorderPadding}"
                                 HorizontalAlignment="Stretch"
                                 CornerRadius="{ThemeResource OverlayCornerRadius}">
                                 <ScrollViewer x:Name="ScrollViewer"
@@ -742,7 +741,7 @@
                                     BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
                                     ZoomMode="Disabled"
                                     AutomationProperties.AccessibilityView="Raw">
-                                    <ItemsPresenter Margin="{StaticResource ComboBoxDropdownContentMargin}" />
+                                    <ItemsPresenter Margin="{ThemeResource ComboBoxDropdownContentMargin}" />
                                 </ScrollViewer>
                             </Border>
                         </Popup>
@@ -758,7 +757,7 @@
         <Setter Property="Foreground" Value="{ThemeResource ComboBoxItemForeground}" />
         <Setter Property="Background" Value="{ThemeResource ComboBoxItemBackground}" />
         <Setter Property="TabNavigation" Value="Local" />
-        <Setter Property="Padding" Value="{StaticResource ComboBoxItemThemePadding}" />
+        <Setter Property="Padding" Value="{ThemeResource ComboBoxItemThemePadding}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
         <Setter Property="FocusVisualMargin" Value="-3"/>
@@ -912,14 +911,14 @@
                                 <VisualState x:Name="TouchInputMode">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ComboBoxItemThemeTouchPadding}" />
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemThemeTouchPadding}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="GameControllerInputMode">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ComboBoxItemThemeGameControllerPadding}" />
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemThemeGameControllerPadding}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
diff --git a/dev/dll/DensityStyles/Compact.xaml b/dev/dll/DensityStyles/Compact.xaml
index 8c43a10d2c..d0e85cbbed 100644
--- a/dev/dll/DensityStyles/Compact.xaml
+++ b/dev/dll/DensityStyles/Compact.xaml
@@ -15,7 +15,7 @@
     <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
     <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
-    <Thickness x:Key="ComboBoxMinHeight">24</Thickness>
+    <x:Double x:Key="ComboBoxMinHeight">24</x:Double>
     <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness>
     <x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
 </ResourceDictionary>
\ No newline at end of file