diff --git a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
index 776c4f4177..a4c4dde369 100644
--- a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
+++ b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
@@ -247,9 +247,6 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundFocused}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="RequestedTheme">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Light" />
-                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="QueryButton" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlButtonForeground}" />
                                         </ObjectAnimationUsingKeyFrames>
diff --git a/dev/CommonStyles/RichEditBox_themeresources.xaml b/dev/CommonStyles/RichEditBox_themeresources.xaml
index 803bbaafb8..ab21acc769 100644
--- a/dev/CommonStyles/RichEditBox_themeresources.xaml
+++ b/dev/CommonStyles/RichEditBox_themeresources.xaml
@@ -95,9 +95,6 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundFocused}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="RequestedTheme">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Light" />
-                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
 
diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml b/dev/CommonStyles/TestUI/CommonStylesPage.xaml
index 9e810ebc0c..13190939ca 100644
--- a/dev/CommonStyles/TestUI/CommonStylesPage.xaml
+++ b/dev/CommonStyles/TestUI/CommonStylesPage.xaml
@@ -14,7 +14,7 @@
         VerticalScrollMode="Disabled" HorizontalAlignment="Stretch">
         <StackPanel>
             <TextBlock Text="Control samples" Style="{ThemeResource StandardGroupHeader}" HorizontalAlignment="Center"/>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" BorderBrush="Transparent">
+            <StackPanel x:Name="RootSampleControlsPanel" Orientation="Horizontal" HorizontalAlignment="Center" BorderBrush="Transparent">
                 <StackPanel.Resources>
                     <x:Double x:Key="CompareGridHeight">600</x:Double>
                     <Style TargetType="StackPanel" x:Key="CompactPanelStyle">
@@ -259,6 +259,10 @@
                     <Button x:Name="AppBarToggleButtonDensityTest" AutomationProperties.Name="AppBarToggleButtonDensityTest" Content="AppBarToggleButtonDensity" Click="AppBarToggleButtonDensityTest_Click" />
                     <Button x:Name="RichEditBoxDensityTest" AutomationProperties.Name="RichEditBoxDensityTest" Content="RichEditBoxDensity" Click="RichEditBoxDensityTest_Click" />
                 </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                    <Button Content="Set blue background" Click="BlueBackground_Click"/>
+                    <Button Content="Set standard background" Click="StandardBackground_Click" Margin="8,0,0,0"/>
+                </StackPanel>
             </StackPanel>
         </StackPanel>
     </ScrollViewer>
diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
index c2bf90ac65..afa221e11e 100644
--- a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
+++ b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using Common;
 using MUXControlsTestApp.Utilities;
+using Windows.UI;
 
 namespace MUXControlsTestApp
 {
@@ -300,5 +301,16 @@ private void AppBarToggleButtonDensityTest_Click(object sender, RoutedEventArgs
 
             DensityTestResult.Text = simpleVerify.ToString();
         }
+
+        private void BlueBackground_Click(object sender, RoutedEventArgs e)
+        {
+            RootSampleControlsPanel.Background = new SolidColorBrush(Color.FromArgb(255,0, 173, 239));
+        }
+
+        private void StandardBackground_Click(object sender, RoutedEventArgs e)
+        {
+            RootSampleControlsPanel.Background = new SolidColorBrush(Colors.Transparent);
+        }
+
     }
 }
diff --git a/dev/CommonStyles/TextBox_themeresources.xaml b/dev/CommonStyles/TextBox_themeresources.xaml
index e9582dead0..4622b944f1 100644
--- a/dev/CommonStyles/TextBox_themeresources.xaml
+++ b/dev/CommonStyles/TextBox_themeresources.xaml
@@ -14,7 +14,7 @@
             <SolidColorBrush x:Key="TextBoxBorderThemeBrush" Color="#FFFFFFFF" />
             <SolidColorBrush x:Key="TextBoxButtonBackgroundThemeBrush" Color="Transparent" />
             <SolidColorBrush x:Key="TextBoxButtonBorderThemeBrush" Color="Transparent" />
-            <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99000000" />
+            <SolidColorBrush x:Key="TextBoxButtonForegroundThemeBrush" Color="#99FFFFFF" />
             <SolidColorBrush x:Key="TextBoxButtonPointerOverBackgroundThemeBrush" Color="#FFDEDEDE" />
             <SolidColorBrush x:Key="TextBoxButtonPointerOverBorderThemeBrush" Color="Transparent" />
             <SolidColorBrush x:Key="TextBoxButtonPointerOverForegroundThemeBrush" Color="#FF000000" />
@@ -25,8 +25,11 @@
             <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#66FFFFFF" />
             <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
             <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+            <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemAltHighColor" />
             <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
             <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemBaseHighColor" />
+            <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemBaseHighColor" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
@@ -46,8 +49,11 @@
             <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
             <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
             <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+            <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemAltHighColor" />
             <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
             <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemBaseHighColor" />
+            <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemBaseHighColor" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="TextBoxForegroundHeaderThemeBrush" Color="#FF000000" />
@@ -67,8 +73,11 @@
             <SolidColorBrush x:Key="TextBoxDisabledBorderThemeBrush" Color="#26000000" />
             <SolidColorBrush x:Key="TextBoxDisabledForegroundThemeBrush" Color="#FF666666" />
             <SolidColorBrush x:Key="TextBoxForegroundThemeBrush" Color="#FF000000" />
+            <StaticResource x:Key="TextControlBackgroundFocused" ResourceKey="SystemAltHighColor" />
             <StaticResource x:Key="TextControlBorderBrush" ResourceKey="SystemControlForegroundBaseMediumBrush" />
             <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumHighBrush" />
+            <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemBaseHighColor" />
+            <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemBaseHighColor" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
@@ -232,9 +241,6 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundFocused}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="RequestedTheme">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Light" />
-                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>