diff --git a/dev/CommonStyles/Common_themeresources.xaml b/dev/CommonStyles/Common_themeresources.xaml
index 469860587e..575abb16bf 100644
--- a/dev/CommonStyles/Common_themeresources.xaml
+++ b/dev/CommonStyles/Common_themeresources.xaml
@@ -605,10 +605,19 @@
             <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
             <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
 
-            <!-- Other -->
+            <!-- System high contrast colors -->
             
             <SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
             <SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{ThemeResource SystemColorWindowColor}" />
+            <SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
+            <SolidColorBrush x:Key="SystemColorButtonTextColorBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="SystemColorHighlightColorBrush" Color="{ThemeResource SystemColorHighlightColor}" />
+            <SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="{ThemeResource SystemColorHighlightTextColor}" />
+            <SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="{ThemeResource SystemColorHotlightColor}" />
+            <SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
+
+            <!-- Other -->
+
             <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
             <SolidColorBrush x:Key="SystemControlHighlightListAccentVeryHighBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="SystemControlHighlightListAccentMediumLowBrush" Color="{ThemeResource SystemColorHighlightColor}" />
diff --git a/dev/Expander/Expander.xaml b/dev/Expander/Expander.xaml
index 00ce882290..d2f8fb5e6b 100644
--- a/dev/Expander/Expander.xaml
+++ b/dev/Expander/Expander.xaml
@@ -4,8 +4,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Microsoft.UI.Xaml.Controls"
     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)">
+
     <Style TargetType="local:Expander" BasedOn="{StaticResource DefaultExpanderStyle}"/>
-    
+
     <Style x:Key="DefaultExpanderStyle" TargetType="local:Expander">
         <!-- We won't make this control tab stoppable, since the tab focus should go
             to the toggle button. For this logic, several things were made:
@@ -19,10 +20,21 @@
                Without this override, the narrator user that focuses the expander on a touch screen will see that pressing "Tab"
                doesn't work how they would expect.-->
         <Setter Property="IsTabStop" Value="False"/>
+        <Setter Property="Background" Value="{ThemeResource ExpanderBackground}" />
+        <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}"/>
+        <Setter Property="MaxWidth" Value="{ThemeResource FlyoutThemeMaxWidth}"/>
+        <Setter Property="MinHeight" Value="{StaticResource ExpanderMinHeight}"/>
+        <Setter Property="BorderThickness" Value="{ThemeResource ExpanderBorderThickness}"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource ExpanderBorderBrush}"/>
+        <Setter Property="Padding" Value="{StaticResource ExpanderPadding}"/>
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:Expander">
-                    <Grid>
+                    <Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="ExpandStates">
                                 <VisualState x:Name="Expanded">
@@ -62,243 +74,50 @@
                             <RowDefinition x:Name="Row0" Height="Auto" />
                             <RowDefinition x:Name="Row1" Height="*" />
                         </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition x:Name="Column0" Width="*" />
-                            <ColumnDefinition x:Name="Column1" Width="Auto" />
-                        </Grid.ColumnDefinitions>
 
                         <ToggleButton
                             x:Name="ExpanderHeader"
                             AutomationProperties.AutomationId="ExpanderToggleButton"
-                            MinWidth="0"
-                            MinHeight="0"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                            contract7Present:BackgroundSizing="OuterBorderEdge"
                             IsEnabled="{TemplateBinding IsEnabled}"
                             Style="{StaticResource ExpanderHeaderDownStyle}"
                             Content="{TemplateBinding Header}"
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            Padding="{TemplateBinding Padding}"
-                          />
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>
 
-                        <ContentPresenter
+                        <Border
                             x:Name="ExpanderContent"
                             Grid.Row="1"
                             Visibility="Collapsed"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ExpanderHeaderDownStyle" TargetType="ToggleButton">
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver" />
-                                <VisualState x:Name="Pressed" />
-                                <VisualState x:Name="Disabled" />
-                                <VisualState x:Name="Checked">
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="180.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CheckedPointerOver" >
-                                    <Storyboard >
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="180.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CheckedPressed">
-                                    <Storyboard >
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="180.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-
-                                <VisualState x:Name="CheckedDisabled">
-                                    <Storyboard >
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="180.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Indeterminate" />
-                                <VisualState x:Name="IndeterminatePointerOver" />
-                                <VisualState x:Name="IndeterminatePressed" />
-                                <VisualState x:Name="IndeterminateDisabled" />
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-
-                        <ContentPresenter 
-                            x:Name="ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="{ThemeResource ExpanderDropDownBackground}"
+                            BorderBrush="{ThemeResource ExpanderDropDownBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            AutomationProperties.AccessibilityView="Raw">
-                        </ContentPresenter>
-
-                        <Grid
-                            x:Name="ExpandCollapseChevron"
-                            Grid.Column="1"
-                            Width="{ThemeResource ExpanderChevronWidth}"
-                            Margin="{ThemeResource ExpanderChevronMargin}"
-                            Background="{ThemeResource ExpanderChevronBackground}">
-                            <TextBlock
-                                RenderTransformOrigin="0.5, 0.5"
-                                Foreground="{ThemeResource ExpanderChevronForeground}"
-                                Text="{StaticResource ExpanderChevronGlyph}"
-                                FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                AutomationProperties.AccessibilityView="Raw"
-                                IsTextScaleFactorEnabled="False">
-                                <TextBlock.RenderTransform>
-                                    <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0"/>
-                                </TextBlock.RenderTransform>
-                            </TextBlock>
-                        </Grid>
+                            MinHeight="{TemplateBinding MinHeight}"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                            contract7Present:BackgroundSizing="OuterBorderEdge"
+                            Padding="{TemplateBinding Padding}">
+                            <ContentPresenter
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Border>
                     </Grid>
-
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="ExpanderHeaderUpStyle" TargetType="ToggleButton">
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver" />
-                                <VisualState x:Name="Pressed" />
-                                <VisualState x:Name="Disabled" />
-                                <VisualState x:Name="Checked">
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="0.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CheckedPointerOver" >
-                                    <Storyboard >
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="0.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CheckedPressed">
-                                    <Storyboard >
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="0.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-
-                                <VisualState x:Name="CheckedDisabled">
-                                    <Storyboard >
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
-                                            Storyboard.TargetProperty="Angle"
-                                            To="0.0" Duration="0:0:0.1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Indeterminate" />
-                                <VisualState x:Name="IndeterminatePointerOver" />
-                                <VisualState x:Name="IndeterminatePressed" />
-                                <VisualState x:Name="IndeterminateDisabled" />
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-
-                        <ContentPresenter 
-                            x:Name="ContentPresenter"
-                            Background="{TemplateBinding Background}"
-                            contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            AutomationProperties.AccessibilityView="Raw">
-                        </ContentPresenter>
 
-                        <Grid
-                            x:Name="ExpandCollapseChevron"
-                            Grid.Column="1"
-                            Width="{ThemeResource ExpanderChevronWidth}"
-                            Margin="{ThemeResource ExpanderChevronMargin}"
-                            Background="{ThemeResource ExpanderChevronBackground}">
-                            <TextBlock
-                                RenderTransformOrigin="0.5, 0.5"
-                                Foreground="{ThemeResource ExpanderChevronForeground}"
-                                Text="{StaticResource ExpanderChevronGlyph}"
-                                FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                AutomationProperties.AccessibilityView="Raw"
-                                IsTextScaleFactorEnabled="False">
-                                <TextBlock.RenderTransform>
-                                    <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="180"/>
-                                </TextBlock.RenderTransform>
-                            </TextBlock>
-                        </Grid>
-                    </Grid>
-
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 </ResourceDictionary>
diff --git a/dev/Expander/Expander_themeresources.xaml b/dev/Expander/Expander_themeresources.xaml
index 1135226d4c..6a43be4c6d 100644
--- a/dev/Expander/Expander_themeresources.xaml
+++ b/dev/Expander/Expander_themeresources.xaml
@@ -2,31 +2,351 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.UI.Xaml.Controls">
+    xmlns:local="using:Microsoft.UI.Xaml.Controls"
+    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Dark">
-            <StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderBackground" ResourceKey="CardBackgroundFillColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderDropDownBackground" ResourceKey="ExpanderBackground" />
+            <StaticResource x:Key="ExpanderBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderBorderPointerOverBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderBorderPressedBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderDropDownBrush" ResourceKey="ExpanderBorderBrush" />
             <StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ExpanderChevronPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderChevronPressedForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderPointerOverBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderPressedBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="ExpanderDisabledBorderBrush" ResourceKey="ExpanderBorderBrush" />
+            <Thickness x:Key="ExpanderBorderThickness">1</Thickness>
+            <Thickness x:Key="ExpanderChevronBorderThickness">0</Thickness>
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderBackground" ResourceKey="CardBackgroundFillColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderDropDownBackground" ResourceKey="ExpanderBackground" />
+            <StaticResource x:Key="ExpanderBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderBorderPointerOverBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderBorderPressedBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ExpanderDropDownBrush" ResourceKey="ExpanderBorderBrush" />
             <StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ExpanderChevronPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderChevronPressedForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderPointerOverBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderPressedBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ExpanderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="ExpanderDisabledBorderBrush" ResourceKey="ExpanderBorderBrush" />
+            <Thickness x:Key="ExpanderBorderThickness">1</Thickness>
+            <Thickness x:Key="ExpanderChevronBorderThickness">0</Thickness>
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemControlTransparentBrush" />
-            <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+            <StaticResource x:Key="ExpanderBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
+            <StaticResource x:Key="ExpanderForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="ExpanderForegroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderDropDownBackground" ResourceKey="SystemColorWindowColorBrush" />
+            <StaticResource x:Key="ExpanderBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="ExpanderBorderPointerOverBrush" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderBorderPressedBrush" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderDropDownBrush" ResourceKey="SystemColorWindowTextColorBrush" />
+            <StaticResource x:Key="ExpanderChevronBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
+            <StaticResource x:Key="ExpanderChevronPointerOverBackground" ResourceKey="SystemControlTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronPressedBackground" ResourceKey="SystemControlTransparentBrush" />
+            <StaticResource x:Key="ExpanderChevronForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="ExpanderChevronPointerOverForeground" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderChevronPressedForeground" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderPointerOverBrush" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderChevronBorderPressedBrush" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="ExpanderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="ExpanderDisabledBorderBrush" ResourceKey="TextFillColorDisabledBrush" />
+            <Thickness x:Key="ExpanderBorderThickness">2</Thickness>
+            <Thickness x:Key="ExpanderChevronBorderThickness">2</Thickness>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
-    
-    <Thickness x:Key="ExpanderChevronMargin">8</Thickness>
-    <x:String x:Key="ExpanderChevronGlyph">&#xE70D;</x:String>
-    <x:Double x:Key="ExpanderChevronWidth">40</x:Double>
+
+    <Thickness x:Key="ExpanderChevronMargin">8,0,8,0</Thickness>
+    <x:String x:Key="ExpanderChevronUpGlyph">&#xE70E;</x:String>
+    <x:String x:Key="ExpanderChevronDownGlyph">&#xE70D;</x:String>
+    <x:Double x:Key="ExpanderChevronSize">30</x:Double>
+    <CornerRadius x:Key="ExpanderCornerRadius">2</CornerRadius>
     <x:Double x:Key="ExpanderPopinVerticalOffset">50</x:Double>
+    <x:Double x:Key="ExpanderMinHeight">64</x:Double>
+    <Thickness x:Key="ExpanderPadding">16,0,16,0</Thickness>
+    <Thickness x:Key="ExpanderHeaderPadding">16,0,0,0</Thickness>
+
+    <Style x:Key="ExpanderHeaderDownStyle" TargetType="ToggleButton">
+        <Setter Property="Padding" Value="{StaticResource ExpanderHeaderPadding}"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Tag" Value="{StaticResource ExpanderChevronDownGlyph}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid
+                        x:Name="ToggleButtonGrid"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                        contract7Present:BackgroundSizing="OuterBorderEdge"
+                        Background="{TemplateBinding Background}"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        MinWidth="{TemplateBinding MinWidth}"
+                        MaxWidth="{TemplateBinding MaxWidth}"
+                        Width="{TemplateBinding Width}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        BorderBrush="{ThemeResource ExpanderBorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Padding="{TemplateBinding Padding}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderBorderPointerOverBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBorderPointerOverBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPointerOverBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderBorderPressedBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPressedForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBorderPressedBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPressedBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
+                                            Storyboard.TargetProperty="Angle"
+                                            To="180.0" Duration="0:0:0.1"/>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="CheckedPointerOver" >
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
+                                            Storyboard.TargetProperty="Angle"
+                                            To="180.0" Duration="0:0:0.1"/>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderBorderPointerOverBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBorderPointerOverBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPointerOverBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="CheckedPressed">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
+                                            Storyboard.TargetProperty="Angle"
+                                            To="180.0" Duration="0:0:0.1"/>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderBorderPressedBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPressedForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBorderPressedBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronPressedBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
+                                            Storyboard.TargetProperty="Angle"
+                                            To="180.0" Duration="0:0:0.1"/>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledForeground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderDisabledBorderBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronBorder" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBackground}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
+                                            Storyboard.TargetProperty="Angle"
+                                            To="0.0" Duration="0:0:0.1"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate" />
+                                <VisualState x:Name="IndeterminatePointerOver" />
+                                <VisualState x:Name="IndeterminatePressed" />
+                                <VisualState x:Name="IndeterminateDisabled" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+
+                        <ContentPresenter 
+                            x:Name="ContentPresenter"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Foreground="{TemplateBinding Foreground}"
+                            AutomationProperties.AccessibilityView="Raw">
+                        </ContentPresenter>
+
+                        <Border
+                            x:Name="ExpandCollapseChevronBorder"
+                            Grid.Column="1"
+                            Width="{ThemeResource ExpanderChevronSize}"
+                            Height="{ThemeResource ExpanderChevronSize}"
+                            Margin="{ThemeResource ExpanderChevronMargin}"
+                            contract7Present:CornerRadius="{StaticResource ExpanderCornerRadius}"
+                            BorderBrush="{ThemeResource ExpanderChevronBorderBrush}"
+                            BorderThickness="{ThemeResource ExpanderChevronBorderThickness}"
+                            Background="{ThemeResource ExpanderChevronBackground}">
+                            <TextBlock
+                                x:Name="ExpandCollapseChevron"
+                                RenderTransformOrigin="0.5, 0.5"
+                                Foreground="{ThemeResource ExpanderChevronForeground}"
+                                Text="{TemplateBinding Tag}"
+                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                AutomationProperties.AccessibilityView="Raw"
+                                IsTextScaleFactorEnabled="False">
+                                <TextBlock.RenderTransform>
+                                    <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0"/>
+                                </TextBlock.RenderTransform>
+                            </TextBlock>
+                        </Border>
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
+    <Style x:Key="ExpanderHeaderUpStyle" TargetType="ToggleButton" BasedOn="{StaticResource ExpanderHeaderDownStyle}">
+        <Setter Property="Tag" Value="{StaticResource ExpanderChevronUpGlyph}" />
+    </Style>
 </ResourceDictionary>
diff --git a/dev/Expander/TestUI/ExpanderPage.xaml b/dev/Expander/TestUI/ExpanderPage.xaml
index 2d74ffa605..44dcf1960b 100644
--- a/dev/Expander/TestUI/ExpanderPage.xaml
+++ b/dev/Expander/TestUI/ExpanderPage.xaml
@@ -10,84 +10,67 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="12">
-        
-        <ScrollViewer Grid.Column="0" Height="Auto">
-            <StackPanel Orientation="Vertical">
-                <StackPanel.ChildrenTransitions>
-                    <TransitionCollection>
-                        <RepositionThemeTransition IsStaggeringEnabled="False" />
-                    </TransitionCollection>
-                </StackPanel.ChildrenTransitions>
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-                <controls:Expander x:Name ="ExpandedExpander" AutomationProperties.Name="ExpandedExpander"  HorizontalContentAlignment="Left" IsExpanded="True">
-                    <controls:Expander.Header>
-                        <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="This expander is expanded by default." />
-                    </controls:Expander.Header>
-                    <TextBlock AutomationProperties.AutomationId="ExpandedExpanderContent">Content</TextBlock>
-                </controls:Expander>
-                
-                <controls:Expander AutomationProperties.AutomationId="CollapsedExpander" AutomationProperties.Name="Expander2" HorizontalContentAlignment="Left" IsExpanded="False">
-                    <controls:Expander.Header>
-                        <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="This expander is collapsed by default." />
-                    </controls:Expander.Header>
-                    <TextBlock AutomationProperties.AutomationId="CollapsedExpanderContent">Content</TextBlock>
-                </controls:Expander>
-                
-                <controls:Expander AutomationProperties.Name="ParentExpander" HorizontalContentAlignment="Left" IsExpanded="False">
-                    <controls:Expander.Header>
-                        <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="This expander has an expander inside" />
-                    </controls:Expander.Header>
-                    <controls:Expander AutomationProperties.Name="NestedExpander" HorizontalContentAlignment="Left" IsExpanded="False" Margin="30,0,0,0" >
-                        <controls:Expander.Header>
-                            <TextBlock Style="{StaticResource HeaderTextBlockStyle}" Text="Nested expander" />
-                        </controls:Expander.Header>
-                        <StackPanel HorizontalAlignment="Left">
-                            <Button>Button1</Button>
-                            <Button>Button2</Button>
-                        </StackPanel>
-                    </controls:Expander>
-                </controls:Expander>
-                
-                <controls:Expander AutomationProperties.Name="ExpanderWithButtons" HorizontalContentAlignment="Left" IsExpanded="False">
-                    <controls:Expander.Header>
-                        <ToggleButton>This is a toggle button in the header</ToggleButton>
-                    </controls:Expander.Header>
-                    <StackPanel>
-                        <TextBlock>Content</TextBlock>
-                    </StackPanel>
-                </controls:Expander>
+        <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
+            <StackPanel.ChildrenTransitions>
+                <TransitionCollection>
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </TransitionCollection>
+            </StackPanel.ChildrenTransitions>
 
-                <controls:Expander AutomationProperties.Name="ExpanderWithUpwardsDirection" HorizontalContentAlignment="Left" ExpandDirection="Up" IsExpanded="False">
-                    <controls:Expander.Header>
-                        <TextBlock Style="{StaticResource HeaderTextBlockStyle}">This expander will expand upwards</TextBlock>
-                    </controls:Expander.Header>
-                    <StackPanel>
-                        <TextBlock>Content</TextBlock>
-                    </StackPanel>
-                </controls:Expander>
+            <controls:Expander x:Name ="ExpandedExpander" AutomationProperties.Name="ExpandedExpander" IsExpanded="True" Margin="12" HorizontalAlignment="Left">
+                <controls:Expander.Header>
+                    <TextBlock Text="This expander is expanded by default." />
+                </controls:Expander.Header>
+                <TextBlock AutomationProperties.AutomationId="ExpandedExpanderContent">Content</TextBlock>
+            </controls:Expander>
+
+            <controls:Expander AutomationProperties.AutomationId="CollapsedExpander" AutomationProperties.Name="Expander2" IsExpanded="False" Margin="12">
+                <controls:Expander.Header>
+                    <TextBlock Text="This expander is collapsed by default. This is a long title to test the header width. ext should be wrapping here." TextWrapping="Wrap" />
+                </controls:Expander.Header>
+                <TextBlock AutomationProperties.AutomationId="CollapsedExpanderContent">Content</TextBlock>
+            </controls:Expander>
+
+            <controls:Expander AutomationProperties.Name="ExpanderWithButtons" IsExpanded="False" Margin="12">
+                <controls:Expander.Header>
+                    <ToggleButton>This is a toggle button in the header</ToggleButton>
+                </controls:Expander.Header>
+                <StackPanel>
+                    <TextBlock TextWrapping="Wrap">Content. This is long content to test wrapping on the content section, this content should be wrapping.</TextBlock>
+                </StackPanel>
+            </controls:Expander>
 
-                <controls:Expander IsEnabled="False" AutomationProperties.Name="ExpanderNotEnabled" HorizontalContentAlignment="Left" ExpandDirection="Down" IsExpanded="False">
+            <controls:Expander AutomationProperties.Name="ExpanderWithUpwardsDirection" ExpandDirection="Up" IsExpanded="False" Margin="12">
+                <controls:Expander.Header>
+                    <TextBlock>This expander will expand upwards</TextBlock>
+                </controls:Expander.Header>
+                <StackPanel>
+                    <TextBlock>Content</TextBlock>
+                </StackPanel>
+            </controls:Expander>
+
+            <controls:Expander IsEnabled="False" AutomationProperties.Name="ExpanderNotEnabled" ExpandDirection="Down" IsExpanded="False" Margin="12">
+                <controls:Expander.Header>
+                    <TextBlock>This expander is not enabled</TextBlock>
+                </controls:Expander.Header>
+                <StackPanel>
+                    <TextBlock>Content</TextBlock>
+                </StackPanel>
+            </controls:Expander>
+
+            <local:TestControl IsTabStop="True" x:Name="CustomControl" AutomationProperties.Name="CustomControl" Margin="12">
+                <controls:Expander x:Name="ExpanderWithCustomEventsSource" ExpandDirection="Down" IsExpanded="False">
                     <controls:Expander.Header>
-                        <TextBlock Style="{StaticResource HeaderTextBlockStyle}">This expander is not enabled</TextBlock>
+                        <TextBlock>This expander has a custom events source</TextBlock>
                     </controls:Expander.Header>
                     <StackPanel>
                         <TextBlock>Content</TextBlock>
                     </StackPanel>
                 </controls:Expander>
-
-                <local:TestControl IsTabStop="True" x:Name="CustomControl" AutomationProperties.Name="CustomControl">
-                    <controls:Expander x:Name="ExpanderWithCustomEventsSource"  HorizontalContentAlignment="Left" ExpandDirection="Down" IsExpanded="False">
-                        <controls:Expander.Header>
-                            <TextBlock Style="{StaticResource HeaderTextBlockStyle}">This expander has a custom events source</TextBlock>
-                        </controls:Expander.Header>
-                        <StackPanel>
-                            <TextBlock>Content</TextBlock>
-                        </StackPanel>
-                    </controls:Expander>
-                </local:TestControl>
-            </StackPanel>
-        </ScrollViewer>
+            </local:TestControl>
+        </StackPanel>
 
     </Grid>
 </local:TestPage>