diff --git a/src/Uno.UI.FluentTheme/Resources/Version2/Priority01/Common_themeresources_any.xaml b/src/Uno.UI.FluentTheme/Resources/Version2/Priority01/Common_themeresources_any.xaml
index 7e40e1f9b0ab..0489bd8804cd 100644
--- a/src/Uno.UI.FluentTheme/Resources/Version2/Priority01/Common_themeresources_any.xaml
+++ b/src/Uno.UI.FluentTheme/Resources/Version2/Priority01/Common_themeresources_any.xaml
@@ -224,13 +224,8 @@
             <SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="#FF00FF" />
 
             <!-- Elevation border brushes-->
-            <!-- TODO Uno: LinearGradientBrush as border is not supported well -->
 
-            <SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-
-            <!-- <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+            <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
                 <LinearGradientBrush.GradientStops>
                     <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
@@ -252,7 +247,7 @@
                     <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush> -->
+            </LinearGradientBrush>
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="Light">
@@ -465,13 +460,7 @@
             <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
 
             <!-- Elevation border brushes-->
-
-            <!-- TODO Uno: LinearGradientBrush as border is not supported well -->
-            <SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-            <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-            
-            <!-- 
+ 
             <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
@@ -497,7 +486,7 @@
                     <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush> -->
+            </LinearGradientBrush>
 
             <!-- Duplication from HighContrast colors to match keys, set to magenta to show these should not be used  -->
             <SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="#FF00FF" />
diff --git a/src/Uno.UI.FluentTheme/Resources/Version2/Priority02/TextBox_themeresources.xaml b/src/Uno.UI.FluentTheme/Resources/Version2/Priority02/TextBox_themeresources.xaml
index c8792d758952..0dd186837720 100644
--- a/src/Uno.UI.FluentTheme/Resources/Version2/Priority02/TextBox_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme/Resources/Version2/Priority02/TextBox_themeresources.xaml
@@ -56,10 +56,7 @@
             <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
 
-            <!-- TODO Uno: Cannot use LinearGradientBrush for border -->
-            <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="#50FFFFFF" />
-            <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorLight2}" />
-            <!-- <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
                 </LinearGradientBrush.RelativeTransform>
@@ -77,7 +74,7 @@
                     <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorLight2}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush> -->
+            </LinearGradientBrush>
         </ResourceDictionary>
         
         <ResourceDictionary x:Key="HighContrast">
@@ -109,10 +106,7 @@
             <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
             <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
 
-            <!-- TODO Uno: Cannot use LinearGradientBrush for border -->
-            <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorDefault}" />
-            <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorLight2}" />
-            <!--<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
                 </LinearGradientBrush.RelativeTransform>
@@ -130,7 +124,7 @@
                     <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorLight2}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush>-->
+            </LinearGradientBrush>
         </ResourceDictionary>
         
         <ResourceDictionary x:Key="Light">
@@ -182,10 +176,7 @@
             <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
 
-            <!-- TODO Uno: Cannot use LinearGradientBrush for border -->
-            <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="#50000000" />
-            <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorDark1}" />
-            <!--<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+            <LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
                 <LinearGradientBrush.RelativeTransform>
                     <ScaleTransform ScaleY="-1" CenterY="0.5"/>
                 </LinearGradientBrush.RelativeTransform>
@@ -203,7 +194,7 @@
                     <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorDark1}"/>
                     <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}"/>
                 </LinearGradientBrush.GradientStops>
-            </LinearGradientBrush>-->
+            </LinearGradientBrush>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
diff --git a/src/Uno.UI.FluentTheme/themeresources_v1.xaml b/src/Uno.UI.FluentTheme/themeresources_v1.xaml
index 5ef1df78e79f..a4acab91ffe3 100644
--- a/src/Uno.UI.FluentTheme/themeresources_v1.xaml
+++ b/src/Uno.UI.FluentTheme/themeresources_v1.xaml
@@ -1,193 +1,7 @@
-<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" xmlns:media="using:Microsoft.UI.Xaml.Media" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives" xmlns:wasm="http://uno.ui/wasm" xmlns:uno="using:Uno.UI.Xaml.Controls" xmlns:automation="clr-namespace:Windows.UI.Xaml.Automation" xmlns:netstdref="http://uno.ui/netstdref" xmlns:skia="http://uno.ui/skia" xmlns:not_mux="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:contract4NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:unouwp="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Uno.WinUI,1)" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)" xmlns:ios="http://platform.uno/ios" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" xmlns:media="using:Microsoft.UI.Xaml.Media" xmlns:controls="using:Microsoft.UI.Xaml.Controls" xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives" xmlns:wasm="http://uno.ui/wasm" xmlns:uno="using:Uno.UI.Xaml.Controls" xmlns:automation="clr-namespace:Windows.UI.Xaml.Automation" xmlns:netstdref="http://uno.ui/netstdref" xmlns:skia="http://uno.ui/skia" xmlns:not_mux="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract4NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,4)" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:unouwp="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Uno.WinUI,1)" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)" xmlns:ios="http://platform.uno/ios" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" x:Key="Default">
-      <Color x:Key="TextFillColorPrimary">#FFFFFF</Color>
-      <Color x:Key="TextFillColorSecondary">#C5FFFFFF</Color>
-      <Color x:Key="TextFillColorTertiary">#87FFFFFF</Color>
-      <Color x:Key="TextFillColorDisabled">#5DFFFFFF</Color>
-      <Color x:Key="TextFillColorInverse">#E4000000</Color>
-      <Color x:Key="AccentTextFillColorDisabled">#5DFFFFFF</Color>
-      <Color x:Key="TextOnAccentFillColorSelectedText">#FFFFFF</Color>
-      <Color x:Key="TextOnAccentFillColorPrimary">#000000</Color>
-      <Color x:Key="TextOnAccentFillColorSecondary">#80000000</Color>
-      <Color x:Key="TextOnAccentFillColorDisabled">#87FFFFFF</Color>
-      <Color x:Key="ControlFillColorDefault">#0FFFFFFF</Color>
-      <Color x:Key="ControlFillColorSecondary">#15FFFFFF</Color>
-      <Color x:Key="ControlFillColorTertiary">#08FFFFFF</Color>
-      <Color x:Key="ControlFillColorDisabled">#0BFFFFFF</Color>
-      <Color x:Key="ControlFillColorTransparent">#00FFFFFF</Color>
-      <Color x:Key="ControlFillColorInputActive">#B31E1E1E</Color>
-      <Color x:Key="ControlStrongFillColorDefault">#8BFFFFFF</Color>
-      <Color x:Key="ControlStrongFillColorDisabled">#3FFFFFFF</Color>
-      <Color x:Key="ControlSolidFillColorDefault">#454545</Color>
-      <Color x:Key="SubtleFillColorTransparent">#00FFFFFF</Color>
-      <Color x:Key="SubtleFillColorSecondary">#0FFFFFFF</Color>
-      <Color x:Key="SubtleFillColorTertiary">#0AFFFFFF</Color>
-      <Color x:Key="SubtleFillColorDisabled">#00FFFFFF</Color>
-      <Color x:Key="ControlAltFillColorTransparent">#00FFFFFF</Color>
-      <Color x:Key="ControlAltFillColorSecondary">#19000000</Color>
-      <Color x:Key="ControlAltFillColorTertiary">#0BFFFFFF</Color>
-      <Color x:Key="ControlAltFillColorQuarternary">#12FFFFFF</Color>
-      <Color x:Key="ControlAltFillColorDisabled">#00FFFFFF</Color>
-      <Color x:Key="ControlOnImageFillColorDefault">#B31C1C1C</Color>
-      <Color x:Key="ControlOnImageFillColorSecondary">#1A1A1A</Color>
-      <Color x:Key="ControlOnImageFillColorTertiary">#131313</Color>
-      <Color x:Key="ControlOnImageFillColorDisabled">#1E1E1E</Color>
-      <Color x:Key="AccentFillColorDisabled">#28FFFFFF</Color>
-      <Color x:Key="ControlStrokeColorDefault">#12FFFFFF</Color>
-      <Color x:Key="ControlStrokeColorSecondary">#18FFFFFF</Color>
-      <Color x:Key="ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
-      <Color x:Key="ControlStrokeColorOnAccentSecondary">#23000000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentTertiary">#37000000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentDisabled">#33000000</Color>
-      <Color x:Key="ControlStrokeColorForStrongFillWhenOnImage">#6B000000</Color>
-      <Color x:Key="CardStrokeColorDefault">#19000000</Color>
-      <Color x:Key="CardStrokeColorDefaultSolid">#1C1C1C</Color>
-      <Color x:Key="ControlStrongStrokeColorDefault">#8BFFFFFF</Color>
-      <Color x:Key="ControlStrongStrokeColorDisabled">#28FFFFFF</Color>
-      <Color x:Key="SurfaceStrokeColorDefault">#66757575</Color>
-      <Color x:Key="SurfaceStrokeColorFlyout">#33000000</Color>
-      <Color x:Key="SurfaceStrokeColorInverse">#0F000000</Color>
-      <Color x:Key="DividerStrokeColorDefault">#15FFFFFF</Color>
-      <Color x:Key="FocusStrokeColorOuter">#FFFFFF</Color>
-      <Color x:Key="FocusStrokeColorInner">#B3000000</Color>
-      <Color x:Key="CardBackgroundFillColorDefault">#0DFFFFFF</Color>
-      <Color x:Key="CardBackgroundFillColorSecondary">#08FFFFFF</Color>
-      <Color x:Key="SmokeFillColorDefault">#4D000000</Color>
-      <Color x:Key="LayerFillColorDefault">#4C3A3A3A</Color>
-      <Color x:Key="LayerFillColorAlt">#0DFFFFFF</Color>
-      <Color x:Key="LayerOnAcrylicFillColorDefault">#09FFFFFF</Color>
-      <Color x:Key="LayerOnAccentAcrylicFillColorDefault">#09FFFFFF</Color>
-      <Color x:Key="SolidBackgroundFillColorBase">#202020</Color>
-      <Color x:Key="SolidBackgroundFillColorSecondary">#1C1C1C</Color>
-      <Color x:Key="SolidBackgroundFillColorTertiary">#282828</Color>
-      <Color x:Key="SolidBackgroundFillColorQuarternary">#2C2C2C</Color>
-      <Color x:Key="SolidBackgroundFillColorTransparent">#00202020</Color>
-      <Color x:Key="SystemFillColorSuccess">#6CCB5F</Color>
-      <Color x:Key="SystemFillColorCaution">#FCE100</Color>
-      <Color x:Key="SystemFillColorCritical">#FF99A4</Color>
-      <Color x:Key="SystemFillColorNeutral">#8BFFFFFF</Color>
-      <Color x:Key="SystemFillColorSolidNeutral">#9D9D9D</Color>
-      <Color x:Key="SystemFillColorAttentionBackground">#08FFFFFF</Color>
-      <Color x:Key="SystemFillColorSuccessBackground">#393D1B</Color>
-      <Color x:Key="SystemFillColorCautionBackground">#433519</Color>
-      <Color x:Key="SystemFillColorCriticalBackground">#442726</Color>
-      <Color x:Key="SystemFillColorNeutralBackground">#08FFFFFF</Color>
-      <Color x:Key="SystemFillColorSolidAttentionBackground">#2E2E2E</Color>
-      <Color x:Key="SystemFillColorSolidNeutralBackground">#2E2E2E</Color>
-      <SolidColorBrush x:Key="TextFillColorPrimaryBrush" Color="{StaticResource TextFillColorPrimary}" />
-      <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{StaticResource TextFillColorSecondary}" />
-      <SolidColorBrush x:Key="TextFillColorTertiaryBrush" Color="{StaticResource TextFillColorTertiary}" />
-      <SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource TextFillColorDisabled}" />
-      <SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource TextFillColorInverse}" />
-      <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{ThemeResource SystemAccentColorLight3}" />
-      <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorLight3}" />
-      <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColorLight2}" />
-      <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource AccentTextFillColorDisabled}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="{StaticResource TextOnAccentFillColorSelectedText}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush" Color="{StaticResource TextOnAccentFillColorSecondary}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush" Color="{StaticResource TextOnAccentFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{StaticResource ControlFillColorDefault}" />
-      <SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="{StaticResource ControlFillColorSecondary}" />
-      <SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="{StaticResource ControlFillColorTertiary}" />
-      <SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="{StaticResource ControlFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlFillColorTransparentBrush" Color="{StaticResource ControlFillColorTransparent}" />
-      <SolidColorBrush x:Key="ControlFillColorInputActiveBrush" Color="{StaticResource ControlFillColorInputActive}" />
-      <SolidColorBrush x:Key="ControlStrongFillColorDefaultBrush" Color="{StaticResource ControlStrongFillColorDefault}" />
-      <SolidColorBrush x:Key="ControlStrongFillColorDisabledBrush" Color="{StaticResource ControlStrongFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlSolidFillColorDefaultBrush" Color="{StaticResource ControlSolidFillColorDefault}" />
-      <SolidColorBrush x:Key="SubtleFillColorTransparentBrush" Color="{StaticResource SubtleFillColorTransparent}" />
-      <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{StaticResource SubtleFillColorSecondary}" />
-      <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{StaticResource SubtleFillColorTertiary}" />
-      <SolidColorBrush x:Key="SubtleFillColorDisabledBrush" Color="{StaticResource SubtleFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlAltFillColorTransparentBrush" Color="{StaticResource ControlAltFillColorTransparent}" />
-      <SolidColorBrush x:Key="ControlAltFillColorSecondaryBrush" Color="{StaticResource ControlAltFillColorSecondary}" />
-      <SolidColorBrush x:Key="ControlAltFillColorTertiaryBrush" Color="{StaticResource ControlAltFillColorTertiary}" />
-      <SolidColorBrush x:Key="ControlAltFillColorQuarternaryBrush" Color="{StaticResource ControlAltFillColorQuarternary}" />
-      <SolidColorBrush x:Key="ControlAltFillColorDisabledBrush" Color="{StaticResource ControlAltFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorDefaultBrush" Color="{StaticResource ControlOnImageFillColorDefault}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorSecondaryBrush" Color="{StaticResource ControlOnImageFillColorSecondary}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorTertiaryBrush" Color="{StaticResource ControlOnImageFillColorTertiary}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorDisabledBrush" Color="{StaticResource ControlOnImageFillColorDisabled}" />
-      <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{ThemeResource SystemAccentColor}" />
-      <SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{ThemeResource SystemAccentColorLight2}" />
-      <SolidColorBrush x:Key="AccentFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorLight2}" Opacity="0.9" />
-      <SolidColorBrush x:Key="AccentFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColorLight2}" Opacity="0.8" />
-      <SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
-      <SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="{StaticResource ControlStrokeColorOnAccentTertiary}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="{StaticResource ControlStrokeColorOnAccentDisabled}" />
-      <SolidColorBrush x:Key="ControlStrokeColorForStrongFillWhenOnImageBrush" Color="{StaticResource ControlStrokeColorForStrongFillWhenOnImage}" />
-      <SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{StaticResource CardStrokeColorDefault}" />
-      <SolidColorBrush x:Key="CardStrokeColorDefaultSolidBrush" Color="{StaticResource CardStrokeColorDefaultSolid}" />
-      <SolidColorBrush x:Key="ControlStrongStrokeColorDefaultBrush" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-      <SolidColorBrush x:Key="ControlStrongStrokeColorDisabledBrush" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorDefaultBrush" Color="{StaticResource SurfaceStrokeColorDefault}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorFlyoutBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorInverseBrush" Color="{StaticResource SurfaceStrokeColorInverse}" />
-      <SolidColorBrush x:Key="DividerStrokeColorDefaultBrush" Color="{StaticResource DividerStrokeColorDefault}" />
-      <SolidColorBrush x:Key="FocusStrokeColorOuterBrush" Color="{StaticResource FocusStrokeColorOuter}" />
-      <SolidColorBrush x:Key="FocusStrokeColorInnerBrush" Color="{StaticResource FocusStrokeColorInner}" />
-      <SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
-      <SolidColorBrush x:Key="CardBackgroundFillColorSecondaryBrush" Color="{StaticResource CardBackgroundFillColorSecondary}" />
-      <SolidColorBrush x:Key="SmokeFillColorDefaultBrush" Color="{StaticResource SmokeFillColorDefault}" />
-      <SolidColorBrush x:Key="LayerFillColorDefaultBrush" Color="{StaticResource LayerFillColorDefault}" />
-      <SolidColorBrush x:Key="LayerFillColorAltBrush" Color="{StaticResource LayerFillColorAlt}" />
-      <SolidColorBrush x:Key="LayerOnAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAcrylicFillColorDefault}" />
-      <SolidColorBrush x:Key="LayerOnAccentAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAccentAcrylicFillColorDefault}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SolidBackgroundFillColorQuarternary}" />
-      <SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{ThemeResource SystemAccentColorLight2}" />
-      <SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{StaticResource SystemFillColorSuccess}" />
-      <SolidColorBrush x:Key="SystemFillColorCautionBrush" Color="{StaticResource SystemFillColorCaution}" />
-      <SolidColorBrush x:Key="SystemFillColorCriticalBrush" Color="{StaticResource SystemFillColorCritical}" />
-      <SolidColorBrush x:Key="SystemFillColorNeutralBrush" Color="{StaticResource SystemFillColorNeutral}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidNeutralBrush" Color="{StaticResource SystemFillColorSolidNeutral}" />
-      <SolidColorBrush x:Key="SystemFillColorAttentionBackgroundBrush" Color="{StaticResource SystemFillColorAttentionBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorSuccessBackgroundBrush" Color="{StaticResource SystemFillColorSuccessBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorCautionBackgroundBrush" Color="{StaticResource SystemFillColorCautionBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush" Color="{StaticResource SystemFillColorCriticalBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush" Color="{StaticResource SystemFillColorNeutralBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
-      <SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorButtonTextColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorHighlightColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="#FF00FF" />
-      <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.GradientStops>
-          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
-          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-      </LinearGradientBrush>
-      <LinearGradientBrush x:Key="CircleElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-          <GradientStop Offset="0.70" Color="{StaticResource ControlStrokeColorSecondary}" />
-          <GradientStop Offset="0.50" Color="{StaticResource ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-      </LinearGradientBrush>
-      <LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-          <ScaleTransform ScaleY="-1" CenterY="0.5" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
-          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-        </LinearGradientBrush.GradientStops>
-      </LinearGradientBrush>
       <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="SystemControlHighlightListAccentVeryHighBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.9" />
-      <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>
@@ -1108,7 +922,6 @@
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
-      <StaticResource x:Key="NavigationViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
       <StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="SystemControlForegroundAccentBrush" />
       <StaticResource x:Key="TopNavigationViewItemForeground" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
       <StaticResource x:Key="TopNavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
@@ -1118,8 +931,6 @@
       <StaticResource x:Key="TopNavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
-      <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
-      <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealBackgroundFocused" ResourceKey="SystemControlHighlightAccentBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealIconForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealContentForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
@@ -1671,196 +1482,7 @@
       <x:Double x:Key="TreeViewItemMinHeight">32</x:Double>
     </ResourceDictionary>
     <ResourceDictionary xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" x:Key="Light">
-      <Color x:Key="TextFillColorPrimary">#E4000000</Color>
-      <Color x:Key="TextFillColorSecondary">#9E000000</Color>
-      <Color x:Key="TextFillColorTertiary">#72000000</Color>
-      <Color x:Key="TextFillColorDisabled">#5C000000</Color>
-      <Color x:Key="TextFillColorInverse">#FFFFFF</Color>
-      <Color x:Key="AccentTextFillColorDisabled">#5C000000</Color>
-      <Color x:Key="TextOnAccentFillColorSelectedText">#FFFFFF</Color>
-      <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFF</Color>
-      <Color x:Key="TextOnAccentFillColorSecondary">#B3FFFFFF</Color>
-      <Color x:Key="TextOnAccentFillColorDisabled">#FFFFFF</Color>
-      <Color x:Key="ControlFillColorDefault">#B3FFFFFF</Color>
-      <Color x:Key="ControlFillColorSecondary">#80F9F9F9</Color>
-      <Color x:Key="ControlFillColorTertiary">#4DF9F9F9</Color>
-      <Color x:Key="ControlFillColorDisabled">#4DF9F9F9</Color>
-      <Color x:Key="ControlFillColorTransparent">#00FFFFFF</Color>
-      <Color x:Key="ControlFillColorInputActive">#FFFFFF</Color>
-      <Color x:Key="ControlStrongFillColorDefault">#72000000</Color>
-      <Color x:Key="ControlStrongFillColorDisabled">#51000000</Color>
-      <Color x:Key="ControlSolidFillColorDefault">#FFFFFF</Color>
-      <Color x:Key="SubtleFillColorTransparent">#00FFFFFF</Color>
-      <Color x:Key="SubtleFillColorSecondary">#09000000</Color>
-      <Color x:Key="SubtleFillColorTertiary">#06000000</Color>
-      <Color x:Key="SubtleFillColorDisabled">#00FFFFFF</Color>
-      <Color x:Key="ControlAltFillColorTransparent">#00FFFFFF</Color>
-      <Color x:Key="ControlAltFillColorSecondary">#06000000</Color>
-      <Color x:Key="ControlAltFillColorTertiary">#0F000000</Color>
-      <Color x:Key="ControlAltFillColorQuarternary">#18000000</Color>
-      <Color x:Key="ControlAltFillColorDisabled">#00FFFFFF</Color>
-      <Color x:Key="ControlOnImageFillColorDefault">#C9FFFFFF</Color>
-      <Color x:Key="ControlOnImageFillColorSecondary">#F3F3F3</Color>
-      <Color x:Key="ControlOnImageFillColorTertiary">#EBEBEB</Color>
-      <Color x:Key="ControlOnImageFillColorDisabled">#00FFFFFF</Color>
-      <Color x:Key="AccentFillColorDisabled">#37000000</Color>
-      <Color x:Key="ControlStrokeColorDefault">#0F000000</Color>
-      <Color x:Key="ControlStrokeColorSecondary">#29000000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
-      <Color x:Key="ControlStrokeColorOnAccentSecondary">#66000000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentTertiary">#37000000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentDisabled">#0F000000</Color>
-      <Color x:Key="ControlStrokeColorForStrongFillWhenOnImage">#59FFFFFF</Color>
-      <Color x:Key="CardStrokeColorDefault">#0F000000</Color>
-      <Color x:Key="CardStrokeColorDefaultSolid">#EBEBEB</Color>
-      <Color x:Key="ControlStrongStrokeColorDefault">#72000000</Color>
-      <Color x:Key="ControlStrongStrokeColorDisabled">#37000000</Color>
-      <Color x:Key="SurfaceStrokeColorDefault">#66757575</Color>
-      <Color x:Key="SurfaceStrokeColorFlyout">#0F000000</Color>
-      <Color x:Key="SurfaceStrokeColorInverse">#15FFFFFF</Color>
-      <Color x:Key="DividerStrokeColorDefault">#0F000000</Color>
-      <Color x:Key="FocusStrokeColorOuter">#E4000000</Color>
-      <Color x:Key="FocusStrokeColorInner">#B3FFFFFF</Color>
-      <Color x:Key="CardBackgroundFillColorDefault">#B3FFFFFF</Color>
-      <Color x:Key="CardBackgroundFillColorSecondary">#80F6F6F6</Color>
-      <Color x:Key="SmokeFillColorDefault">#4D000000</Color>
-      <Color x:Key="LayerFillColorDefault">#80FFFFFF</Color>
-      <Color x:Key="LayerFillColorAlt">#FFFFFF</Color>
-      <Color x:Key="LayerOnAcrylicFillColorDefault">#40FFFFFF</Color>
-      <Color x:Key="LayerOnAccentAcrylicFillColorDefault">#40FFFFFF</Color>
-      <Color x:Key="SolidBackgroundFillColorBase">#F3F3F3</Color>
-      <Color x:Key="SolidBackgroundFillColorSecondary">#EEEEEE</Color>
-      <Color x:Key="SolidBackgroundFillColorTertiary">#F9F9F9</Color>
-      <Color x:Key="SolidBackgroundFillColorQuarternary">#FFFFFF</Color>
-      <Color x:Key="SolidBackgroundFillColorTransparent">#00F3F3F3</Color>
-      <Color x:Key="SystemFillColorSuccess">#0F7B0F</Color>
-      <Color x:Key="SystemFillColorCaution">#9D5D00</Color>
-      <Color x:Key="SystemFillColorCritical">#C42B1C</Color>
-      <Color x:Key="SystemFillColorNeutral">#72000000</Color>
-      <Color x:Key="SystemFillColorSolidNeutral">#8A8A8A</Color>
-      <Color x:Key="SystemFillColorAttentionBackground">#80F6F6F6</Color>
-      <Color x:Key="SystemFillColorSuccessBackground">#DFF6DD</Color>
-      <Color x:Key="SystemFillColorCautionBackground">#FFF4CE</Color>
-      <Color x:Key="SystemFillColorCriticalBackground">#FDE7E9</Color>
-      <Color x:Key="SystemFillColorNeutralBackground">#06000000</Color>
-      <Color x:Key="SystemFillColorSolidAttentionBackground">#F7F7F7</Color>
-      <Color x:Key="SystemFillColorSolidNeutralBackground">#F3F3F3</Color>
-      <SolidColorBrush x:Key="TextFillColorPrimaryBrush" Color="{StaticResource TextFillColorPrimary}" />
-      <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{StaticResource TextFillColorSecondary}" />
-      <SolidColorBrush x:Key="TextFillColorTertiaryBrush" Color="{StaticResource TextFillColorTertiary}" />
-      <SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource TextFillColorDisabled}" />
-      <SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource TextFillColorInverse}" />
-      <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{ThemeResource SystemAccentColorDark2}" />
-      <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorDark3}" />
-      <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColorDark1}" />
-      <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource AccentTextFillColorDisabled}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="{StaticResource TextOnAccentFillColorSelectedText}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush" Color="{StaticResource TextOnAccentFillColorSecondary}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush" Color="{StaticResource TextOnAccentFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{StaticResource ControlFillColorDefault}" />
-      <SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="{StaticResource ControlFillColorSecondary}" />
-      <SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="{StaticResource ControlFillColorTertiary}" />
-      <SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="{StaticResource ControlFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlFillColorTransparentBrush" Color="{StaticResource ControlFillColorTransparent}" />
-      <SolidColorBrush x:Key="ControlFillColorInputActiveBrush" Color="{StaticResource ControlFillColorInputActive}" />
-      <SolidColorBrush x:Key="ControlStrongFillColorDefaultBrush" Color="{StaticResource ControlStrongFillColorDefault}" />
-      <SolidColorBrush x:Key="ControlStrongFillColorDisabledBrush" Color="{StaticResource ControlStrongFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlSolidFillColorDefaultBrush" Color="{StaticResource ControlSolidFillColorDefault}" />
-      <SolidColorBrush x:Key="SubtleFillColorTransparentBrush" Color="{StaticResource SubtleFillColorTransparent}" />
-      <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{StaticResource SubtleFillColorSecondary}" />
-      <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{StaticResource SubtleFillColorTertiary}" />
-      <SolidColorBrush x:Key="SubtleFillColorDisabledBrush" Color="{StaticResource SubtleFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlAltFillColorTransparentBrush" Color="{StaticResource ControlAltFillColorTransparent}" />
-      <SolidColorBrush x:Key="ControlAltFillColorSecondaryBrush" Color="{StaticResource ControlAltFillColorSecondary}" />
-      <SolidColorBrush x:Key="ControlAltFillColorTertiaryBrush" Color="{StaticResource ControlAltFillColorTertiary}" />
-      <SolidColorBrush x:Key="ControlAltFillColorQuarternaryBrush" Color="{StaticResource ControlAltFillColorQuarternary}" />
-      <SolidColorBrush x:Key="ControlAltFillColorDisabledBrush" Color="{StaticResource ControlAltFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorDefaultBrush" Color="{StaticResource ControlOnImageFillColorDefault}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorSecondaryBrush" Color="{StaticResource ControlOnImageFillColorSecondary}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorTertiaryBrush" Color="{StaticResource ControlOnImageFillColorTertiary}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorDisabledBrush" Color="{StaticResource ControlOnImageFillColorDisabled}" />
-      <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{ThemeResource SystemAccentColor}" />
-      <SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{ThemeResource SystemAccentColorDark1}" />
-      <SolidColorBrush x:Key="AccentFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorDark1}" Opacity="0.9" />
-      <SolidColorBrush x:Key="AccentFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColorDark1}" Opacity="0.8" />
-      <SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />
-      <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
-      <SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="{StaticResource ControlStrokeColorOnAccentTertiary}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="{StaticResource ControlStrokeColorOnAccentDisabled}" />
-      <SolidColorBrush x:Key="ControlStrokeColorForStrongFillWhenOnImageBrush" Color="{StaticResource ControlStrokeColorForStrongFillWhenOnImage}" />
-      <SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{StaticResource CardStrokeColorDefault}" />
-      <SolidColorBrush x:Key="CardStrokeColorDefaultSolidBrush" Color="{StaticResource CardStrokeColorDefaultSolid}" />
-      <SolidColorBrush x:Key="ControlStrongStrokeColorDefaultBrush" Color="{StaticResource ControlStrongStrokeColorDefault}" />
-      <SolidColorBrush x:Key="ControlStrongStrokeColorDisabledBrush" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorDefaultBrush" Color="{StaticResource SurfaceStrokeColorDefault}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorFlyoutBrush" Color="{StaticResource SurfaceStrokeColorFlyout}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorInverseBrush" Color="{StaticResource SurfaceStrokeColorInverse}" />
-      <SolidColorBrush x:Key="DividerStrokeColorDefaultBrush" Color="{StaticResource DividerStrokeColorDefault}" />
-      <SolidColorBrush x:Key="FocusStrokeColorOuterBrush" Color="{StaticResource FocusStrokeColorOuter}" />
-      <SolidColorBrush x:Key="FocusStrokeColorInnerBrush" Color="{StaticResource FocusStrokeColorInner}" />
-      <SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
-      <SolidColorBrush x:Key="CardBackgroundFillColorSecondaryBrush" Color="{StaticResource CardBackgroundFillColorSecondary}" />
-      <SolidColorBrush x:Key="SmokeFillColorDefaultBrush" Color="{StaticResource SmokeFillColorDefault}" />
-      <SolidColorBrush x:Key="LayerFillColorDefaultBrush" Color="{StaticResource LayerFillColorDefault}" />
-      <SolidColorBrush x:Key="LayerFillColorAltBrush" Color="{StaticResource LayerFillColorAlt}" />
-      <SolidColorBrush x:Key="LayerOnAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAcrylicFillColorDefault}" />
-      <SolidColorBrush x:Key="LayerOnAccentAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAccentAcrylicFillColorDefault}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{StaticResource SolidBackgroundFillColorBase}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SolidBackgroundFillColorQuarternary}" />
-      <SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{ThemeResource SystemAccentColor}" />
-      <SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{StaticResource SystemFillColorSuccess}" />
-      <SolidColorBrush x:Key="SystemFillColorCautionBrush" Color="{StaticResource SystemFillColorCaution}" />
-      <SolidColorBrush x:Key="SystemFillColorCriticalBrush" Color="{StaticResource SystemFillColorCritical}" />
-      <SolidColorBrush x:Key="SystemFillColorNeutralBrush" Color="{StaticResource SystemFillColorNeutral}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidNeutralBrush" Color="{StaticResource SystemFillColorSolidNeutral}" />
-      <SolidColorBrush x:Key="SystemFillColorAttentionBackgroundBrush" Color="{StaticResource SystemFillColorAttentionBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorSuccessBackgroundBrush" Color="{StaticResource SystemFillColorSuccessBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorCautionBackgroundBrush" Color="{StaticResource SystemFillColorCautionBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush" Color="{StaticResource SystemFillColorCriticalBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush" Color="{StaticResource SystemFillColorNeutralBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
-      <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-          <ScaleTransform ScaleY="-1" CenterY="0.5" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
-          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
-        </LinearGradientBrush.GradientStops>
-      </LinearGradientBrush>
-      <LinearGradientBrush x:Key="CircleElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-          <GradientStop Offset="0.50" Color="{StaticResource ControlStrokeColorDefault}" />
-          <GradientStop Offset="0.70" Color="{StaticResource ControlStrokeColorSecondary}" />
-        </LinearGradientBrush.GradientStops>
-      </LinearGradientBrush>
-      <LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
-        <LinearGradientBrush.RelativeTransform>
-          <ScaleTransform ScaleY="-1" CenterY="0.5" />
-        </LinearGradientBrush.RelativeTransform>
-        <LinearGradientBrush.GradientStops>
-          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
-          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
-        </LinearGradientBrush.GradientStops>
-      </LinearGradientBrush>
-      <SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorButtonTextColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorHighlightColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="#FF00FF" />
       <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="SystemControlHighlightListAccentVeryHighBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.9" />
-      <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>
@@ -2781,7 +2403,6 @@
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
-      <StaticResource x:Key="NavigationViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
       <StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="SystemControlForegroundAccentBrush" />
       <StaticResource x:Key="TopNavigationViewItemForeground" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
       <StaticResource x:Key="TopNavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
@@ -2791,8 +2412,6 @@
       <StaticResource x:Key="TopNavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
-      <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
-      <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealBackgroundFocused" ResourceKey="SystemControlHighlightAccentBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealIconForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealContentForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
@@ -3344,175 +2963,7 @@
       <x:Double x:Key="TreeViewItemMinHeight">32</x:Double>
     </ResourceDictionary>
     <ResourceDictionary xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="ios android wasm skia" x:Key="HighContrast">
-      <SolidColorBrush x:Key="TextFillColorPrimaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="TextFillColorTertiaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
-      <SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="TextOnAccentFillColorDisabledBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
-      <SolidColorBrush x:Key="ControlFillColorDefaultBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlFillColorSecondaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlFillColorTertiaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlFillColorDisabledBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlFillColorTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="ControlFillColorInputActiveBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlStrongFillColorDefaultBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlStrongFillColorDisabledBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlSolidFillColorDefaultBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="SubtleFillColorTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="SubtleFillColorSecondaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="SubtleFillColorTertiaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="SubtleFillColorDisabledBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlAltFillColorTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="ControlAltFillColorSecondaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlAltFillColorTertiaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlAltFillColorQuarternaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlAltFillColorDisabledBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorDefaultBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorSecondaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorTertiaryBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="ControlOnImageFillColorDisabledBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-      <SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="AccentFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="AccentFillColorTertiaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
-      <SolidColorBrush x:Key="ControlStrokeColorForStrongFillWhenOnImageBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="CardStrokeColorDefaultSolidBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="ControlStrongStrokeColorDefaultBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="ControlStrongStrokeColorDisabledBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorDefaultBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorFlyoutBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SurfaceStrokeColorInverseBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="DividerStrokeColorDefaultBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="FocusStrokeColorOuterBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="FocusStrokeColorInnerBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="CardBackgroundFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SmokeFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="LayerFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="LayerFillColorAltBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="LayerOnAcrylicFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="LayerOnAccentAcrylicFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SystemFillColorCautionBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SystemFillColorCriticalBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SystemFillColorNeutralBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidNeutralBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="SystemFillColorAttentionBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SystemFillColorSuccessBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SystemFillColorCautionBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SystemFillColorCriticalBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}" />
-      <SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-      <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}" />
-      <Color x:Key="TextFillColorPrimary">#FF0000</Color>
-      <Color x:Key="TextFillColorSecondary">#FF0000</Color>
-      <Color x:Key="TextFillColorTertiary">#FF0000</Color>
-      <Color x:Key="TextFillColorDisabled">#FF0000</Color>
-      <Color x:Key="TextFillColorInverse">#FF0000</Color>
-      <Color x:Key="AccentTextFillColorDisabled">#FF0000</Color>
-      <Color x:Key="ControlFillColorDefault">#FF0000</Color>
-      <Color x:Key="ControlFillColorSecondary">#FF0000</Color>
-      <Color x:Key="ControlFillColorTertiary">#FF0000</Color>
-      <Color x:Key="ControlFillColorDisabled">#FF0000</Color>
-      <Color x:Key="ControlFillColorTransparent">#FF0000</Color>
-      <Color x:Key="ControlFillColorInputActive">#FF0000</Color>
-      <Color x:Key="ControlSolidFillColorDefault">#FF0000</Color>
-      <Color x:Key="SubtleFillColorTransparent">#FF0000</Color>
-      <Color x:Key="SubtleFillColorSecondary">#FF0000</Color>
-      <Color x:Key="SubtleFillColorTertiary">#FF0000</Color>
-      <Color x:Key="SubtleFillColorDisabled">#FF0000</Color>
-      <Color x:Key="ControlAltFillColorTransparent">#FF0000</Color>
-      <Color x:Key="ControlAltFillColorSecondary">#FF0000</Color>
-      <Color x:Key="ControlAltFillColorTertiary">#FF0000</Color>
-      <Color x:Key="ControlAltFillColorQuarternary">#FF0000</Color>
-      <Color x:Key="ControlAltFillColorDisabled">#FF0000</Color>
-      <Color x:Key="ControlOnImageFillColorDefault">#FF0000</Color>
-      <Color x:Key="ControlOnImageFillColorSecondary">#FF0000</Color>
-      <Color x:Key="ControlOnImageFillColorTertiary">#FF0000</Color>
-      <Color x:Key="ControlOnImageFillColorDisabled">#FF0000</Color>
-      <Color x:Key="ControlStrokeColorDefault">#FF0000</Color>
-      <Color x:Key="ControlStrokeColorSecondary">#FF0000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentDefault">#FF0000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentSecondary">#FF0000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentTertiary">#FF0000</Color>
-      <Color x:Key="ControlStrokeColorOnAccentDisabled">#FF0000</Color>
-      <Color x:Key="CardStrokeColorDefault">#FF0000</Color>
-      <Color x:Key="CardStrokeColorDefaultSolid">#FF0000</Color>
-      <Color x:Key="SurfaceStrokeColorDefault">#FF0000</Color>
-      <Color x:Key="SurfaceStrokeColorFlyout">#FF0000</Color>
-      <Color x:Key="SurfaceStrokeColorInverse">#FF0000</Color>
-      <Color x:Key="DividerStrokeColorDefault">#FF0000</Color>
-      <Color x:Key="FocusStrokeColorOuter">#FF0000</Color>
-      <Color x:Key="FocusStrokeColorInner">#FF0000</Color>
-      <Color x:Key="CardBackgroundFillColorDefault">#FF0000</Color>
-      <Color x:Key="CardBackgroundFillColorSecondary">#FF0000</Color>
-      <Color x:Key="SmokeFillColorDefault">#FF0000</Color>
-      <Color x:Key="LayerFillColorDefault">#FF0000</Color>
-      <Color x:Key="LayerFillColorAlt">#FF0000</Color>
-      <Color x:Key="LayerOnAcrylicFillColorDefault">#FF0000</Color>
-      <Color x:Key="LayerOnAccentAcrylicFillColorDefault">#FF0000</Color>
-      <Color x:Key="SolidBackgroundFillColorBase">#FF0000</Color>
-      <Color x:Key="SolidBackgroundFillColorSecondary">#FF0000</Color>
-      <Color x:Key="SolidBackgroundFillColorTertiary">#FF0000</Color>
-      <Color x:Key="SolidBackgroundFillColorQuarternary">#FF0000</Color>
-      <Color x:Key="SolidBackgroundFillColorTransparent">#FF0000</Color>
-      <Color x:Key="SystemFillColorSuccess">#FF0000</Color>
-      <Color x:Key="SystemFillColorCaution">#FF0000</Color>
-      <Color x:Key="SystemFillColorCritical">#FF0000</Color>
-      <Color x:Key="SystemFillColorNeutral">#FF0000</Color>
-      <Color x:Key="SystemFillColorSolidNeutral">#FF0000</Color>
-      <Color x:Key="SystemFillColorAttentionBackground">#FF0000</Color>
-      <Color x:Key="SystemFillColorSuccessBackground">#FF0000</Color>
-      <Color x:Key="SystemFillColorCautionBackground">#FF0000</Color>
-      <Color x:Key="SystemFillColorCriticalBackground">#FF0000</Color>
-      <Color x:Key="SystemFillColorNeutralBackground">#FF0000</Color>
-      <Color x:Key="SystemFillColorSolidAttentionBackground">#FF0000</Color>
-      <Color x:Key="SystemFillColorSolidNeutralBackground">#FF0000</Color>
-      <Color x:Key="TextOnAccentFillColorSelectedText">#FF0000</Color>
-      <Color x:Key="TextOnAccentFillColorPrimary">#FF0000</Color>
-      <Color x:Key="TextOnAccentFillColorSecondary">#FF0000</Color>
-      <Color x:Key="TextOnAccentFillColorDisabled">#FF0000</Color>
-      <Color x:Key="ControlStrongFillColorDefault">#FF0000</Color>
-      <Color x:Key="ControlStrongFillColorDisabled">#FF0000</Color>
-      <Color x:Key="AccentFillColorDisabled">#FF0000</Color>
-      <Color x:Key="ControlStrokeColorForStrongFillWhenOnImage">#FF0000</Color>
-      <Color x:Key="ControlStrongStrokeColorDefault">#FF0000</Color>
-      <Color x:Key="ControlStrongStrokeColorDisabled">#FF0000</Color>
       <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
-      <SolidColorBrush x:Key="SystemControlHighlightListAccentVeryHighBrush" Color="{ThemeResource SystemColorHighlightColor}" />
-      <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>
@@ -4433,7 +3884,6 @@
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlHighlightAltTransparentRevealBorderBrush" />
       <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="NavigationViewItemSeparatorForeground" ResourceKey="SystemControlForegroundBaseLowBrush" />
-      <StaticResource x:Key="NavigationViewItemHeaderForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
       <StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="SystemColorHighlightTextColor" />
       <StaticResource x:Key="TopNavigationViewItemForeground" ResourceKey="NavigationViewItemForeground" />
       <StaticResource x:Key="TopNavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
@@ -4443,8 +3893,6 @@
       <StaticResource x:Key="TopNavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
-      <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
-      <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealBackgroundFocused" ResourceKey="SystemControlHighlightAccentBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealIconForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
       <StaticResource x:Key="TopNavigationViewItemRevealContentForegroundFocused" ResourceKey="SystemControlHighlightAltChromeWhiteBrush" />
@@ -4995,11 +4443,6 @@
       <x:Double x:Key="TreeViewItemMinHeight">32</x:Double>
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
-  <x:String x:Key="ControlFastOutSlowInKeySpline">0,0,0,1</x:String>
-  <x:String x:Key="ControlNormalAnimationDuration">00:00:00.250</x:String>
-  <x:String x:Key="ControlFastAnimationDuration">00:00:00.167</x:String>
-  <x:String x:Key="ControlFastAnimationAfterDuration">00:00:00.168</x:String>
-  <x:String x:Key="ControlFasterAnimationDuration">00:00:00.083</x:String>
   <Thickness x:Key="DateTimeFlyoutBorderPadding">0</Thickness>
   <DataTemplate x:Key="DefaultInputValidationErrorTemplate">
     <ItemsControl ItemsSource="{Binding ValidationErrors}">
@@ -16628,11 +16071,9 @@
     </Setter>
   </Style>
   <x:Double x:Key="MenuBarHeight">40</x:Double>
-  <x:Double x:Key="NavigationBackButtonWidth">40</x:Double>
-  <x:Double x:Key="NavigationBackButtonHeight">40</x:Double>
   <Style x:Key="NavigationBackButtonNormalStyle" TargetType="Button">
     <Setter Property="Background" Value="{ThemeResource NavigationViewBackButtonBackground}" />
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+    <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
     <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
     <Setter Property="FontSize" Value="16" />
     <Setter Property="Height" Value="{ThemeResource NavigationBackButtonHeight}" />
@@ -16688,576 +16129,746 @@
     <Setter Property="Height" Value="32" />
     <Setter Property="Width" Value="32" />
   </Style>
-  <Thickness x:Key="NavigationViewAutoSuggestBoxMargin">10,0,16,0</Thickness>
-  <Thickness x:Key="TopNavigationViewAutoSuggestBoxMargin">12,0,12,0</Thickness>
-  <x:Double x:Key="PaneToggleButtonSize">40</x:Double>
-  <x:Double x:Key="PaneToggleButtonHeight">40</x:Double>
-  <x:Double x:Key="PaneToggleButtonWidth">40</x:Double>
-  <x:Double x:Key="NavigationViewCompactPaneLength">40</x:Double>
-  <x:Double x:Key="NavigationViewTopPaneHeight">40</x:Double>
-  <x:Double x:Key="TopNavigationViewPaneCustomContentMinWidth">48</x:Double>
-  <x:Double x:Key="TopNavigationViewOverflowButtonWidth">48</x:Double>
-  <x:Double x:Key="TopNavigationViewOverflowButtonHeight">40</x:Double>
-  <x:Double x:Key="NavigationViewItemOnLeftMinHeight">40</x:Double>
-  <x:Double x:Key="NavigationViewPaneHeaderRowMinHeight">4</x:Double>
-  <x:Double x:Key="NavigationViewItemSeparatorHeight">1</x:Double>
-  <x:Double x:Key="TopNavigationViewItemSeparatorWidth">1</x:Double>
-  <Thickness x:Key="NavigationViewToggleBorderThickness">1</Thickness>
-  <Thickness x:Key="NavigationViewItemBorderThickness">1</Thickness>
-  <Thickness x:Key="NavigationViewItemOnLeftIconBoxMargin">12,0,12,0</Thickness>
-  <Thickness x:Key="NavigationViewItemInnerHeaderMargin">10,0,0,0</Thickness>
-  <Thickness x:Key="NavigationViewMinimalHeaderMargin">8,5,0,0</Thickness>
-  <Thickness x:Key="NavigationViewHeaderMargin">12,5,0,11</Thickness>
-  <Thickness x:Key="NavigationViewPaneTitlePresenterMargin">8,4,0,0</Thickness>
-  <Thickness x:Key="NavigationViewItemMargin">0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemMargin">0</Thickness>
-  <Thickness x:Key="NavigationViewItemSeparatorMargin">16,10</Thickness>
-  <Thickness x:Key="NavigationViewCompactItemSeparatorMargin">16,10</Thickness>
-  <Thickness x:Key="TopNavigationViewItemSeparatorMargin">10,0</Thickness>
-  <Thickness x:Key="TopNavigationViewOverflowButtonMargin">0</Thickness>
-  <Thickness x:Key="NavigationViewItemContentPresenterMargin">0,0,20,0</Thickness>
-  <Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,0,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,0,16,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemContentOnlyContentPresenterMargin">12,0</Thickness>
-  <Thickness x:Key="NavigationViewItemExpandChevronMargin">-20,0,6,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemExpandChevronMargin">-16,0,0,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemIconOnlyExpandChevronMargin">0,0,0,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemContentOnlyExpandChevronMargin">-12,0,0,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemOnOverflowContentPresenterMargin">12,0,20,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemOnOverflowNoIconContentPresenterMargin">16,0,20,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemOnOverflowExpandChevronMargin">-4,0,6,0</Thickness>
-  <Thickness x:Key="TopNavigationViewItemOnOverflowExpandChevronPadding">12,0,12,0</Thickness>
-  <Thickness x:Key="TopNavigationViewOverflowMenuPadding">0,8</Thickness>
-  <Thickness x:Key="NavigationViewItemChildrenMenuFlyoutPadding">0,8</Thickness>
-  <x:Double x:Key="NavigationViewItemExpandedGlyphFontSize">12.0</x:Double>
-  <x:String x:Key="NavigationViewItemExpandedGlyph">&#xE70D;</x:String>
-  <Style x:Key="PaneToggleButtonStyle" TargetType="Button">
-    <Setter Property="FontSize" Value="16" />
-    <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}" />
-    <Setter Property="MinHeight" Value="{StaticResource PaneToggleButtonHeight}" />
-    <Setter Property="MinWidth" Value="{StaticResource PaneToggleButtonWidth}" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
-    <Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
+  <x:Double x:Key="NavigationBackButtonWidth">40</x:Double>
+  <x:Double x:Key="NavigationBackButtonHeight">40</x:Double>
+  <Style TargetType="controls:NavigationView">
+    <Setter Property="PaneToggleButtonStyle" Value="{StaticResource PaneToggleButtonStyle}" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="CompactPaneLength" Value="{ThemeResource NavigationViewCompactPaneLength}" />
     <Setter Property="Template">
       <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Grid x:Name="LayoutRoot" MinWidth="{TemplateBinding MinWidth}" Height="{TemplateBinding MinHeight}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalAlignment="Stretch">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="{ThemeResource PaneToggleButtonHeight}" />
-            </Grid.RowDefinitions>
+        <ControlTemplate TargetType="controls:NavigationView">
+          <Grid x:Name="RootGrid">
             <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
-                  <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Disabled">
+              <VisualStateGroup x:Name="DisplayModeGroup">
+                <VisualState x:Name="Compact" />
+                <VisualState x:Name="Expanded">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewButtonBackgroundDisabled}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewButtonForegroundDisabled}" />
+                    <Setter Target="RootSplitView.PaneBackground" Value="{ThemeResource NavigationViewExpandedPaneBackground}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Checked">
+                <VisualState x:Name="Minimal">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundChecked}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundChecked}" />
+                    <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="CheckedPointerOver">
+                <VisualState x:Name="TopNavigationMinimal" />
+                <VisualState x:Name="MinimalWithBackButton">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundCheckedPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundCheckedPointerOver}" />
+                    <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="CheckedPressed">
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="TogglePaneGroup">
+                <VisualState x:Name="TogglePaneButtonVisible" />
+                <VisualState x:Name="TogglePaneButtonCollapsed" />
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="HeaderGroup">
+                <VisualState x:Name="HeaderVisible" />
+                <VisualState x:Name="HeaderCollapsed">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundCheckedPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundCheckedPressed}" />
+                    <Setter Target="HeaderContent.Visibility" Value="Collapsed" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="CheckedDisabled">
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="AutoSuggestGroup">
+                <VisualState x:Name="AutoSuggestBoxVisible" />
+                <VisualState x:Name="AutoSuggestBoxCollapsed">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundCheckedDisabled}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundCheckedDisabled}" />
+                    <Setter Target="AutoSuggestArea.Visibility" Value="Collapsed" />
+                    <Setter Target="TopPaneAutoSuggestArea.Visibility" Value="Collapsed" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border Width="{TemplateBinding MinWidth}">
-              <Viewbox x:Name="IconHost" Width="16" Height="16" HorizontalAlignment="Center" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw">
-                <TextBlock x:Name="Icon" Text="&#xE700;" FontSize="{TemplateBinding FontSize}" AutomationProperties.AccessibilityView="Raw" />
-              </Viewbox>
-            </Border>
-            <ContentPresenter x:Name="ContentPresenter" VerticalContentAlignment="Center" Content="{TemplateBinding Content}" FontSize="{TemplateBinding FontSize}" Grid.Column="1" />
-            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="NavigationViewPaneSearchButtonStyle" TargetType="Button">
-    <Setter Property="MinHeight" Value="40" />
-    <Setter Property="Content" Value="&#xE11A;" />
-    <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-    <Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
-    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
-  </Style>
-  <Style x:Key="NavigationViewOverflowButtonStyleWhenPaneOnTop" TargetType="Button">
-    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
-    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
-    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
-    <Setter Property="Height" Value="{StaticResource TopNavigationViewOverflowButtonHeight}" />
-    <Setter Property="Width" Value="{StaticResource TopNavigationViewOverflowButtonWidth}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="FocusVisualMargin" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Grid x:Name="RootGrid" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" Background="{TemplateBinding Background}">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
+              <VisualStateGroup x:Name="PaneStateGroup">
+                <VisualState x:Name="NotClosedCompact" />
+                <VisualState x:Name="ClosedCompact">
                   <VisualState.Setters>
-                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
-                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="PointerOver" />
+                    <Setter Target="PaneAutoSuggestBoxPresenter.Visibility" Value="Collapsed" />
+                    <Setter Target="PaneAutoSuggestButton.Visibility" Value="Visible" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Pressed">
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="PaneStateListSizeGroup">
+                <VisualState x:Name="ListSizeFull" />
+                <VisualState x:Name="ListSizeCompact">
                   <VisualState.Setters>
-                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
-                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="Pressed" />
+                    <Setter Target="PaneContentGrid.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
+                    <Setter Target="PaneTitleTextBlock.Visibility" Value="Collapsed" />
+                    <Setter Target="PaneHeaderContentBorder.Visibility" Value="Collapsed" />
+                    <Setter Target="PaneCustomContentBorder.HorizontalAlignment" Value="Left" />
+                    <Setter Target="FooterContentBorder.HorizontalAlignment" Value="Left" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Disabled">
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="TitleBarVisibilityGroup">
+                <VisualState x:Name="TitleBarVisible" />
+                <VisualState x:Name="TitleBarCollapsed">
                   <VisualState.Setters>
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
+                    <Setter Target="PaneContentGrid.Margin" Value="0,32,0,0" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="PointerRectangle" Fill="Transparent" Visibility="Collapsed" />
-            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <FontIcon x:Name="Icon" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="20" Glyph="&#xE10C;" Foreground="{TemplateBinding Foreground}" IsHitTestVisible="False" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop" TargetType="Button">
-    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
-    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
-    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
-    <Setter Property="Height" Value="{StaticResource TopNavigationViewOverflowButtonHeight}" />
-    <Setter Property="Width" Value="{StaticResource TopNavigationViewOverflowButtonWidth}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="FocusVisualMargin" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Grid x:Name="RootGrid" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" Background="{TemplateBinding Background}">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
+              <VisualStateGroup x:Name="OverflowLabelGroup">
+                <VisualState x:Name="OverflowButtonWithLabel" />
+                <VisualState x:Name="OverflowButtonNoLabel">
                   <VisualState.Setters>
-                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
-                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="PointerOver" />
+                    <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Pressed">
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="BackButtonGroup">
+                <VisualState x:Name="BackButtonVisible" />
+                <VisualState x:Name="BackButtonCollapsed">
                   <VisualState.Setters>
-                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
-                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="Pressed" />
+                    <Setter Target="BackButtonPlaceholderOnTopNav.Width" Value="0" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Disabled">
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="PaneVisibilityGroup">
+                <VisualState x:Name="PaneVisible" />
+                <VisualState x:Name="PaneCollapsed">
                   <VisualState.Setters>
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
+                    <!-- Note that RootSplitView.DisplayMode is set in code so we don't want to -->
+                    <!-- write it here and interfere. But these values work together to hide -->
+                    <!-- the left pane. -->
+                    <Setter Target="RootSplitView.CompactPaneLength" Value="0" />
+                    <Setter Target="PaneToggleButtonGrid.Visibility" Value="Collapsed" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="PointerRectangle" Fill="Transparent" />
-            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <FontIcon x:Name="Icon" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="20" Glyph="&#xE10C;" Foreground="{TemplateBinding Foreground}" IsHitTestVisible="False" />
+            <!-- Content layouts -->
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <!-- DisplayMode top -->
+              <StackPanel x:Name="TopNavArea" Background="{ThemeResource NavigationViewTopPaneBackground}" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Canvas.ZIndex="1" contract4Present:XYFocusKeyboardNavigation="Enabled">
+                <Grid x:Name="TopNavTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}" />
+                <Grid x:Name="TopNavGrid" Height="{ThemeResource NavigationViewTopPaneHeight}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition x:Name="BackButtonPlaceholderOnTopNav" Width="{ThemeResource NavigationBackButtonWidth}" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" MinWidth="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+                  <Grid x:Name="TopNavLeftPadding" Grid.Column="1" Width="0" />
+                  <ContentControl x:Name="PaneHeaderOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="2" />
+                  <ContentControl x:Name="PaneTitleOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="2" />
+                  <!-- Top nav ItemsRepeater -->
+                  <controls:ItemsRepeaterScrollHost Grid.Column="3">
+                    <ScrollViewer HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollMode="Disabled" VerticalScrollBarVisibility="Hidden">
+                      <controls:ItemsRepeater AutomationProperties.LandmarkType="Navigation" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" AutomationProperties.AccessibilityView="Content" x:Name="TopNavMenuItemsHost">
+                        <controls:ItemsRepeater.Layout>
+                          <controls:StackLayout Orientation="Horizontal" />
+                        </controls:ItemsRepeater.Layout>
+                      </controls:ItemsRepeater>
+                    </ScrollViewer>
+                  </controls:ItemsRepeaterScrollHost>
+                  <Button x:Name="TopNavOverflowButton" Grid.Column="4" Content="More" Margin="{ThemeResource TopNavigationViewOverflowButtonMargin}" Style="{StaticResource NavigationViewOverflowButtonStyleWhenPaneOnTop}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OverflowButtonVisibility}">
+                    <Button.Flyout>
+                      <Flyout contract7NotPresent:Placement="Bottom" contract7Present:Placement="BottomEdgeAlignedRight" ElementSoundMode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ElementSoundMode}">
+                        <Flyout.FlyoutPresenterStyle>
+                          <Style TargetType="FlyoutPresenter">
+                            <Setter Property="Padding" Value="{ThemeResource TopNavigationViewOverflowMenuPadding}" />
+                            <!-- Set negative top margin to make the flyout align exactly with the button -->
+                            <Setter Property="Margin" Value="0,-4,0,0" />
+                            <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
+                            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                            <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+                            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+                            <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+                            <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+                            <Setter Property="Template">
+                              <Setter.Value>
+                                <ControlTemplate TargetType="FlyoutPresenter">
+                                  <ScrollViewer x:Name="ScrollViewer" ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" AutomationProperties.AccessibilityView="Raw">
+                                    <ContentPresenter x:Name="ContentPresenter" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" contract7Present:CornerRadius="{TemplateBinding CornerRadius}" contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}" />
+                                  </ScrollViewer>
+                                </ControlTemplate>
+                              </Setter.Value>
+                            </Setter>
+                          </Style>
+                        </Flyout.FlyoutPresenterStyle>
+                        <controls:ItemsRepeaterScrollHost>
+                          <ScrollViewer VerticalScrollBarVisibility="Auto">
+                            <controls:ItemsRepeater AutomationProperties.AccessibilityView="Content" x:Name="TopNavMenuItemsOverflowHost" />
+                          </ScrollViewer>
+                        </controls:ItemsRepeaterScrollHost>
+                      </Flyout>
+                    </Button.Flyout>
+                  </Button>
+                  <ContentControl x:Name="PaneCustomContentOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="5" />
+                  <Grid x:Name="TopPaneAutoSuggestArea" Height="{ThemeResource NavigationViewTopPaneHeight}" Grid.Column="6">
+                    <ContentControl x:Name="TopPaneAutoSuggestBoxPresenter" Margin="{ThemeResource TopNavigationViewAutoSuggestBoxMargin}" MinWidth="48" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" />
+                  </Grid>
+                  <ContentControl x:Name="PaneFooterOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="7" />
+                  <!-- Top footer menu ItemsRepeater -->
+                  <controls:ItemsRepeater Grid.Column="8" AutomationProperties.LandmarkType="Navigation" AutomationProperties.AccessibilityView="Content" x:Name="TopFooterMenuItemsHost">
+                    <controls:ItemsRepeater.Layout>
+                      <controls:StackLayout Orientation="Horizontal" />
+                    </controls:ItemsRepeater.Layout>
+                  </controls:ItemsRepeater>
+                </Grid>
+                <Border x:Name="TopNavContentOverlayAreaGrid" Child="{TemplateBinding ContentOverlay}" />
+              </StackPanel>
+              <!-- Displaymode (compact/minimal/normal) left -->
+              <SplitView x:Name="RootSplitView" Background="{TemplateBinding Background}" CompactPaneLength="{TemplateBinding CompactPaneLength}" DisplayMode="Inline" IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}" IsTabStop="False" OpenPaneLength="{TemplateBinding OpenPaneLength}" PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}" Grid.Row="1">
+                <SplitView.Pane>
+                  <Grid x:Name="PaneContentGrid" HorizontalAlignment="Left" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}">
+                    <Grid.RowDefinitions>
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="0" />
+                      <!-- above button margin + back button space -->
+                      <RowDefinition x:Name="PaneContentGridToggleButtonRow" Height="Auto" MinHeight="{StaticResource NavigationViewPaneHeaderRowMinHeight}" />
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="8" />
+                      <!-- above list margin -->
+                      <RowDefinition x:Name="ItemsContainerRow" Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid x:Name="ContentPaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
+                    <Grid Grid.Row="2" x:Name="PaneHeaderContentBorderWrapper" MinHeight="{StaticResource NavigationViewPaneHeaderRowMinHeight}">
+                      <!-- TODO: Uno specific: MinHeight and x:Name used here as RowDefinifiont.MinHeight does not work (issue #4727)-->
+                      <Grid.RowDefinitions>
+                        <RowDefinition x:Name="PaneHeaderContentBorderRow" />
+                      </Grid.RowDefinitions>
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition x:Name="PaneHeaderCloseButtonColumn" />
+                        <ColumnDefinition x:Name="PaneHeaderToggleButtonColumn" />
+                        <ColumnDefinition Width="*" />
+                      </Grid.ColumnDefinitions>
+                      <ContentControl x:Name="PaneHeaderContentBorder" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="2" />
+                    </Grid>
+                    <Grid x:Name="AutoSuggestArea" Grid.Row="3" Height="{ThemeResource NavigationViewTopPaneHeight}" VerticalAlignment="Center">
+                      <ContentControl x:Name="PaneAutoSuggestBoxPresenter" Margin="{ThemeResource NavigationViewAutoSuggestBoxMargin}" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" />
+                      <Button x:Name="PaneAutoSuggestButton" Visibility="Collapsed" Style="{ThemeResource NavigationViewPaneSearchButtonStyle}" Width="{TemplateBinding CompactPaneLength}" />
+                    </Grid>
+                    <ContentControl x:Name="PaneCustomContentBorder" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Row="4" />
+                    <!-- "Non header" content -->
+                    <Grid x:Name="ItemsContainerGrid" Grid.Row="6" Margin="0,0,0,8">
+                      <Grid.RowDefinitions>
+                        <RowDefinition x:Name="MenuItemsRow" Height="Auto" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" />
+                        <!-- MenuItems -->
+                        <RowDefinition Height="*" MinHeight="21" />
+                        <!-- Fill spacing -->
+                        <RowDefinition Height="Auto" />
+                        <!-- PaneFooter -->
+                        <RowDefinition x:Name="FooterItemsRow" Height="Auto" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" />
+                        <!-- FooterItems -->
+                      </Grid.RowDefinitions>
+                      <!-- MenuItems -->
+                      <controls:ItemsRepeaterScrollHost HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <ScrollViewer x:Name="MenuItemsScrollViewer" TabNavigation="Local" VerticalScrollBarVisibility="Auto">
+                          <!-- Left nav ItemsRepeater -->
+                          <controls:ItemsRepeater x:Name="MenuItemsHost" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" AutomationProperties.AccessibilityView="Content" />
+                        </ScrollViewer>
+                      </controls:ItemsRepeaterScrollHost>
+                      <controls:NavigationViewItemSeparator x:Name="VisualItemsSeparator" Grid.Row="1" VerticalAlignment="Center" Visibility="Collapsed" HorizontalAlignment="Stretch" />
+                      <!-- PaneFooter -->
+                      <ContentControl x:Name="FooterContentBorder" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Row="2" />
+                      <!-- FooterItems -->
+                      <controls:ItemsRepeaterScrollHost Grid.Row="3">
+                        <ScrollViewer x:Name="FooterItemsScrollViewer" contract7Present:VerticalAnchorRatio="1">
+                          <controls:ItemsRepeater x:Name="FooterMenuItemsHost" AutomationProperties.AccessibilityView="Content" />
+                        </ScrollViewer>
+                      </controls:ItemsRepeaterScrollHost>
+                    </Grid>
+                  </Grid>
+                </SplitView.Pane>
+                <SplitView.Content>
+                  <Grid x:Name="ContentGrid">
+                    <Grid.RowDefinitions>
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid x:Name="ContentTopPadding" Grid.ColumnSpan="2" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}" />
+                    <Grid x:Name="ContentLeftPadding" Grid.Row="1" />
+                    <ContentControl x:Name="HeaderContent" Grid.Row="1" Grid.Column="1" MinHeight="{StaticResource PaneToggleButtonHeight}" IsTabStop="False" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Style="{StaticResource NavigationViewTitleHeaderContentControlTextStyle}" />
+                    <ContentPresenter AutomationProperties.LandmarkType="Main" Grid.Row="2" Grid.ColumnSpan="2" Content="{TemplateBinding Content}" />
+                  </Grid>
+                </SplitView.Content>
+              </SplitView>
+            </Grid>
+            <!-- Button grid -->
+            <!-- TODO: Uno Specific: Canvas.ZIndex is not implemented, so the
+						button Grid is moved below the content SplitView in the template -->
+            <Grid x:Name="PaneToggleButtonGrid" Margin="0,0,0,8" HorizontalAlignment="Left" VerticalAlignment="Top" Canvas.ZIndex="100">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Grid x:Name="TogglePaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
+              <Grid x:Name="ButtonHolderGrid" Grid.Row="1">
+                <Button x:Name="NavigationViewBackButton" Style="{StaticResource NavigationBackButtonNormalStyle}" VerticalAlignment="Top" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.BackButtonVisibility}" IsEnabled="{TemplateBinding IsBackEnabled}">
+                  <ToolTipService.ToolTip>
+                    <ToolTip x:Name="NavigationViewBackButtonToolTip" />
+                  </ToolTipService.ToolTip>
+                </Button>
+                <Button x:Name="NavigationViewCloseButton" Style="{StaticResource NavigationBackButtonNormalStyle}" VerticalAlignment="Top">
+                  <ToolTipService.ToolTip>
+                    <ToolTip x:Name="NavigationViewCloseButtonToolTip" />
+                  </ToolTipService.ToolTip>
+                </Button>
+                <Button x:Name="TogglePaneButton" Style="{TemplateBinding PaneToggleButtonStyle}" AutomationProperties.LandmarkType="Navigation" HorizontalAlignment="Center" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}" VerticalAlignment="Top">
+                  <TextBlock x:Name="PaneTitleTextBlock" Grid.Column="0" Text="{TemplateBinding PaneTitle}" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NavigationViewItemHeaderTextStyle}" />
+                </Button>
+                <Grid x:Name="PaneTitleHolder" Visibility="Collapsed">
+                  <ContentControl x:Name="PaneTitlePresenter" Margin="{ThemeResource NavigationViewPaneTitlePresenterMargin}" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
+                </Grid>
+              </Grid>
+            </Grid>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnLeftPane">
+  <Style TargetType="controls:NavigationViewItem">
     <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
     <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
     <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
     <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
+    <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+    <Setter Property="Margin" Value="{ThemeResource NavigationViewItemMargin}" />
     <Setter Property="UseSystemFocusVisuals" Value="True" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="TabNavigation" Value="Once" />
+    <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
     <Setter Property="Template">
       <Setter.Value>
-        <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
-          <Grid x:Name="LayoutRoot" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
-            <Grid.Resources>
-              <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
-                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
-              </Storyboard>
-              <Storyboard x:Name="ExpandCollapseRotateCollapsedStoryboard">
-                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="180.0" To="0.0" Duration="0:0:0.1" />
-              </Storyboard>
-            </Grid.Resources>
+        <ControlTemplate TargetType="controls:NavigationViewItem">
+          <Grid x:Name="NVIRootGrid">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="*" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
             <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="PointerStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
+              <VisualStateGroup x:Name="ItemOnNavigationViewListPositionStates">
+                <VisualState x:Name="OnLeftNavigation">
                   <VisualState.Setters>
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnLeftPane}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Pressed">
+                <VisualState x:Name="OnLeftNavigationReveal">
                   <VisualState.Setters>
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
-                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
+                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnLeftPaneWithRevealFocus}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Selected">
+                <VisualState x:Name="OnTopNavigationPrimary">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
-                    <contract4Present:Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushSelected}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
+                    <Setter Target="NavigationViewItemPresenter.Margin" Value="{ThemeResource TopNavigationViewItemMargin}" />
+                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPane}" />
+                    <contract7NotPresent:Setter Target="ChildrenFlyout.Placement" Value="Bottom" />
+                    <contract7Present:Setter Target="ChildrenFlyout.Placement" Value="BottomEdgeAlignedLeft" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="PointerOverSelected">
+                <VisualState x:Name="OnTopNavigationPrimaryReveal">
                   <VisualState.Setters>
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
-                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushSelectedPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPointerOver}" />
+                    <Setter Target="NavigationViewItemPresenter.Margin" Value="{ThemeResource TopNavigationViewItemMargin}" />
+                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPaneWithRevealFocus}" />
+                    <contract7NotPresent:Setter Target="ChildrenFlyout.Placement" Value="Bottom" />
+                    <contract7Present:Setter Target="ChildrenFlyout.Placement" Value="BottomEdgeAlignedLeft" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="PressedSelected">
+                <VisualState x:Name="OnTopNavigationOverflow">
                   <VisualState.Setters>
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
-                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushSelectedPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPressed}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="DisabledStates">
-                <VisualState x:Name="Enabled" />
-                <VisualState x:Name="Disabled">
-                  <VisualState.Setters>
-                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushCheckedDisabled}" />
-                    <Setter Target="LayoutRoot.Opacity" Value="{ThemeResource ListViewItemDisabledThemeOpacity}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="IconStates">
-                <VisualState x:Name="IconVisible" />
-                <VisualState x:Name="IconCollapsed">
-                  <VisualState.Setters>
-                    <Setter Target="IconBox.Visibility" Value="Collapsed" />
-                    <Setter Target="IconColumn.Width" Value="16" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="ChevronStates">
-                <VisualState x:Name="ChevronHidden" />
-                <VisualState x:Name="ChevronVisibleOpen">
-                  <VisualState.Setters>
-                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
-                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="180" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="ChevronVisibleClosed">
-                  <VisualState.Setters>
-                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
-                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="0" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="PaneAndTopLevelItemStates">
-                <VisualState x:Name="NotClosedCompactAndTopLevelItem" />
-                <VisualState x:Name="ClosedCompactAndTopLevelItem">
-                  <VisualState.Setters>
-                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource NavigationViewCompactItemContentPresenterMargin}" />
+                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPaneOverflow}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <Grid x:Name="PresenterContentRootGrid">
-              <!-- Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation. -->
-              <Grid Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
-                <Rectangle x:Name="SelectionIndicator" Width="2" Height="24" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0.0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-              </Grid>
-              <Grid HorizontalAlignment="Stretch" x:Name="ContentGrid" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Border x:Name="IconColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IconWidth}">
-                  <Viewbox x:Name="IconBox" Height="16" Margin="{ThemeResource NavigationViewItemOnLeftIconBoxMargin}">
-                    <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" />
-                  </Viewbox>
-                </Border>
-                <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource NavigationViewItemContentPresenterMargin}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Padding="{TemplateBinding Padding}" AutomationProperties.AccessibilityView="Raw" />
-                <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource NavigationViewItemExpandChevronMargin}" Background="Transparent">
-                  <TextBlock RenderTransformOrigin="0.5, 0.5" Foreground="{ThemeResource NavigationViewItemForeground}" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
-                    <TextBlock.RenderTransform>
-                      <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0" />
-                    </TextBlock.RenderTransform>
-                  </TextBlock>
+            <primitives:NavigationViewItemPresenter x:Name="NavigationViewItemPresenter" Icon="{TemplateBinding Icon}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Margin="{TemplateBinding Margin}" Padding="{TemplateBinding Padding}" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" VerticalAlignment="{TemplateBinding VerticalAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Content="{TemplateBinding Content}" primitiveContract7Present:CornerRadius="{TemplateBinding CornerRadius}" IsTabStop="false" Control.IsTemplateFocusTarget="True" />
+            <controls:ItemsRepeater Grid.Row="1" Visibility="Collapsed" x:Name="NavigationViewItemMenuItemsHost">
+              <controls:ItemsRepeater.Layout>
+                <controls:StackLayout Orientation="Vertical" />
+              </controls:ItemsRepeater.Layout>
+            </controls:ItemsRepeater>
+            <FlyoutBase.AttachedFlyout>
+              <Flyout x:Name="ChildrenFlyout" contract7NotPresent:Placement="Right" contract7Present:Placement="RightEdgeAlignedTop">
+                <Flyout.FlyoutPresenterStyle>
+                  <Style TargetType="FlyoutPresenter">
+                    <Setter Property="Padding" Value="{ThemeResource NavigationViewItemChildrenMenuFlyoutPadding}" />
+                    <!-- Set negative top margin to make the flyout align exactly with the button -->
+                    <Setter Property="Margin" Value="0,-4,0,0" />
+                    <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
+                    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                    <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+                    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+                    <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+                    <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+                    <Setter Property="Template">
+                      <Setter.Value>
+                        <ControlTemplate TargetType="FlyoutPresenter">
+                          <ScrollViewer x:Name="ScrollViewer" ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" AutomationProperties.AccessibilityView="Raw">
+                            <ContentPresenter x:Name="ContentPresenter" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" contract7Present:CornerRadius="{TemplateBinding CornerRadius}" contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}" />
+                          </ScrollViewer>
+                        </ControlTemplate>
+                      </Setter.Value>
+                    </Setter>
+                  </Style>
+                </Flyout.FlyoutPresenterStyle>
+                <Grid x:Name="FlyoutRootGrid">
+                  <Grid x:Name="FlyoutContentGrid" />
                 </Grid>
-              </Grid>
-            </Grid>
+              </Flyout>
+            </FlyoutBase.AttachedFlyout>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnLeftPaneWithRevealFocus">
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
-    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
-    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
-    <Setter Property="UseSystemFocusVisuals" Value="True" />
+  <Style TargetType="primitives:NavigationViewItemPresenter" />
+  <Style TargetType="controls:NavigationViewItemHeader">
+    <Setter Property="IsEnabled" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="MinHeight" Value="0" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
     <Setter Property="Template">
       <Setter.Value>
-        <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
-          <Grid x:Name="LayoutRoot" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
-            <Grid.Resources>
-              <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
-                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
-              </Storyboard>
-              <Storyboard x:Name="ExpandCollapseRotateCollapsedStoryboard">
-                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="180.0" To="0.0" Duration="0:0:0.1" />
-              </Storyboard>
-            </Grid.Resources>
+        <ControlTemplate TargetType="controls:NavigationViewItemHeader">
+          <Grid x:Name="NavigationViewItemHeaderRootGrid">
             <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="DisabledStates">
-                <VisualState x:Name="Enabled" />
-                <VisualState x:Name="Disabled">
-                  <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Opacity" Value="{ThemeResource ListViewItemDisabledThemeOpacity}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource SystemControlHighlightAccentBrush}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-                <VisualState x:Name="PointerFocused" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="IconStates">
-                <VisualState x:Name="IconVisible" />
-                <VisualState x:Name="IconCollapsed">
+              <VisualStateGroup x:Name="PaneStates">
+                <VisualStateGroup.Transitions>
+                  <VisualTransition From="HeaderTextCollapsed" To="HeaderTextVisible">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerHeaderGrid" Storyboard.TargetProperty="Height">
+                        <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="40" />
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Visibility">
+                        <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                      </ObjectAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="0:0:0" Value="0.0" />
+                        <LinearDoubleKeyFrame KeyTime="0:0:0.1" Value="0.0" />
+                        <SplineDoubleKeyFrame KeyTime="0:0:0.2" KeySpline="0.0,0.35 0.15,1.0" Value="1.0" />
+                      </DoubleAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualTransition>
+                  <VisualTransition From="HeaderTextVisible" To="HeaderTextCollapsed">
+                    <Storyboard>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerHeaderGrid" Storyboard.TargetProperty="Height">
+                        <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="20" />
+                      </ObjectAnimationUsingKeyFrames>
+                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Visibility">
+                        <DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
+                      </ObjectAnimationUsingKeyFrames>
+                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Opacity">
+                        <LinearDoubleKeyFrame KeyTime="0:0:0" Value="1.0" />
+                        <SplineDoubleKeyFrame KeyTime="0:0:0.1" KeySpline="0.0,0.35 0.15,1.0" Value="0.0" />
+                      </DoubleAnimationUsingKeyFrames>
+                    </Storyboard>
+                  </VisualTransition>
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="HeaderTextVisible" />
+                <VisualState x:Name="HeaderTextCollapsed">
                   <VisualState.Setters>
-                    <Setter Target="IconBox.Visibility" Value="Collapsed" />
-                    <Setter Target="IconColumn.Width" Value="16" />
+                    <Setter Target="HeaderText.Visibility" Value="Collapsed" />
+                    <Setter Target="InnerHeaderGrid.Height" Value="20" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="ChevronStates">
-                <VisualState x:Name="ChevronHidden" />
-                <VisualState x:Name="ChevronVisibleOpen">
-                  <VisualState.Setters>
-                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
-                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="180" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="ChevronVisibleClosed">
+            </VisualStateManager.VisualStateGroups>
+            <Grid x:Name="InnerHeaderGrid" Height="40" HorizontalAlignment="Left" Margin="{ThemeResource NavigationViewItemInnerHeaderMargin}">
+              <TextBlock x:Name="HeaderText" VerticalAlignment="Center" Margin="0,-1,0,-1" Style="{StaticResource NavigationViewItemHeaderTextStyle}" Text="{TemplateBinding Content}" TextWrapping="NoWrap" />
+            </Grid>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="controls:NavigationViewItemSeparator">
+    <Setter Property="IsEnabled" Value="False" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Grid x:Name="NavigationViewItemSeparatorRootGrid">
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="NavigationSeparatorLineStates">
+                <VisualState x:Name="HorizontalLine" />
+                <VisualState x:Name="HorizontalLineCompact">
                   <VisualState.Setters>
-                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
-                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="0" />
+                    <Setter Target="SeparatorLine.Margin" Value="{ThemeResource NavigationViewCompactItemSeparatorMargin}" />
                   </VisualState.Setters>
                 </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="PaneAndTopLevelItemStates">
-                <VisualState x:Name="NotClosedCompactAndTopLevelItem" />
-                <VisualState x:Name="ClosedCompactAndTopLevelItem">
+                <VisualState x:Name="VerticalLine">
                   <VisualState.Setters>
-                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource NavigationViewCompactItemContentPresenterMargin}" />
+                    <Setter Target="SeparatorLine.Height" Value="20" />
+                    <Setter Target="SeparatorLine.Width" Value="{ThemeResource TopNavigationViewItemSeparatorWidth}" />
+                    <Setter Target="SeparatorLine.Margin" Value="{ThemeResource TopNavigationViewItemSeparatorMargin}" />
+                    <Setter Target="SeparatorLine.VerticalAlignment" Value="Center" />
+                    <Setter Target="SeparatorLine.Fill" Value="{ThemeResource TopNavigationViewItemSeparatorForeground}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <Grid x:Name="PresenterContentRootGrid">
-              <!-- Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation. -->
-              <Grid Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
-                <Rectangle x:Name="SelectionIndicator" Width="2" Height="24" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0.0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-              </Grid>
-              <Grid x:Name="ContentGrid" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" HorizontalAlignment="Left">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition x:Name="IconColumn" Width="{ThemeResource NavigationViewCompactPaneLength}" />
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Viewbox x:Name="IconBox" Height="16" Margin="{ThemeResource NavigationViewItemOnLeftIconBoxMargin}">
-                  <ContentPresenter x:Name="Icon" Foreground="{TemplateBinding Foreground}" Content="{TemplateBinding Icon}" />
-                </Viewbox>
-                <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Foreground="{TemplateBinding Foreground}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Margin="{ThemeResource NavigationViewItemContentPresenterMargin}" Padding="{TemplateBinding Padding}" AutomationProperties.AccessibilityView="Raw" />
-                <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource NavigationViewItemExpandChevronMargin}" Background="Transparent">
-                  <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
-                    <TextBlock.RenderTransform>
-                      <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
-                    </TextBlock.RenderTransform>
-                  </TextBlock>
-                </Grid>
-              </Grid>
-            </Grid>
+            <Rectangle x:Name="SeparatorLine" Height="{ThemeResource NavigationViewItemSeparatorHeight}" Margin="{ThemeResource NavigationViewItemSeparatorMargin}" Fill="{ThemeResource NavigationViewItemSeparatorForeground}" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style TargetType="controls:NavigationViewItem" x:Key="MUX_NavigationViewSettingsItemStyleWhenOnTopPane">
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
-    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+  <Thickness x:Key="NavigationViewAutoSuggestBoxMargin">10,0,16,0</Thickness>
+  <Thickness x:Key="TopNavigationViewAutoSuggestBoxMargin">12,0,12,0</Thickness>
+  <x:Double x:Key="PaneToggleButtonSize">40</x:Double>
+  <x:Double x:Key="PaneToggleButtonHeight">40</x:Double>
+  <x:Double x:Key="PaneToggleButtonWidth">40</x:Double>
+  <x:Double x:Key="NavigationViewCompactPaneLength">40</x:Double>
+  <x:Double x:Key="NavigationViewTopPaneHeight">40</x:Double>
+  <x:Double x:Key="TopNavigationViewPaneCustomContentMinWidth">48</x:Double>
+  <x:Double x:Key="TopNavigationViewOverflowButtonWidth">48</x:Double>
+  <x:Double x:Key="TopNavigationViewOverflowButtonHeight">40</x:Double>
+  <x:Double x:Key="NavigationViewItemOnLeftMinHeight">40</x:Double>
+  <x:Double x:Key="NavigationViewPaneHeaderRowMinHeight">4</x:Double>
+  <x:Double x:Key="NavigationViewItemSeparatorHeight">1</x:Double>
+  <x:Double x:Key="TopNavigationViewItemSeparatorWidth">1</x:Double>
+  <Thickness x:Key="NavigationViewToggleBorderThickness">1</Thickness>
+  <Thickness x:Key="NavigationViewItemBorderThickness">1</Thickness>
+  <Thickness x:Key="NavigationViewItemOnLeftIconBoxMargin">12,0,12,0</Thickness>
+  <Thickness x:Key="NavigationViewItemInnerHeaderMargin">10,0,0,0</Thickness>
+  <Thickness x:Key="NavigationViewMinimalHeaderMargin">8,5,0,0</Thickness>
+  <Thickness x:Key="NavigationViewHeaderMargin">12,5,0,11</Thickness>
+  <Thickness x:Key="NavigationViewPaneTitlePresenterMargin">8,4,0,0</Thickness>
+  <Thickness x:Key="NavigationViewItemMargin">0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemMargin">0</Thickness>
+  <Thickness x:Key="NavigationViewItemSeparatorMargin">16,10</Thickness>
+  <Thickness x:Key="NavigationViewCompactItemSeparatorMargin">16,10</Thickness>
+  <Thickness x:Key="TopNavigationViewItemSeparatorMargin">10,0</Thickness>
+  <Thickness x:Key="TopNavigationViewOverflowButtonMargin">0</Thickness>
+  <Thickness x:Key="NavigationViewItemContentPresenterMargin">0,0,20,0</Thickness>
+  <Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">0,0,0,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemContentPresenterMargin">8,0,16,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemContentOnlyContentPresenterMargin">12,0</Thickness>
+  <Thickness x:Key="NavigationViewItemExpandChevronMargin">-20,0,6,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemExpandChevronMargin">-16,0,0,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemIconOnlyExpandChevronMargin">0,0,0,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemContentOnlyExpandChevronMargin">-12,0,0,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemOnOverflowContentPresenterMargin">12,0,20,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemOnOverflowNoIconContentPresenterMargin">16,0,20,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemOnOverflowExpandChevronMargin">-4,0,6,0</Thickness>
+  <Thickness x:Key="TopNavigationViewItemOnOverflowExpandChevronPadding">12,0,12,0</Thickness>
+  <Thickness x:Key="TopNavigationViewOverflowMenuPadding">0,8</Thickness>
+  <Thickness x:Key="NavigationViewItemChildrenMenuFlyoutPadding">0,8</Thickness>
+  <x:Double x:Key="NavigationViewItemExpandedGlyphFontSize">12.0</x:Double>
+  <x:String x:Key="NavigationViewItemExpandedGlyph">&#xE70D;</x:String>
+  <Style x:Key="PaneToggleButtonStyle" TargetType="Button">
+    <Setter Property="FontSize" Value="16" />
+    <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}" />
+    <Setter Property="MinHeight" Value="{StaticResource PaneToggleButtonHeight}" />
+    <Setter Property="MinWidth" Value="{StaticResource PaneToggleButtonWidth}" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+    <Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Grid x:Name="LayoutRoot" MinWidth="{TemplateBinding MinWidth}" Height="{TemplateBinding MinHeight}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalAlignment="Stretch">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition x:Name="PaneToggleButtonIconWidthColumn" Width="{ThemeResource PaneToggleButtonWidth}" />
+              <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+              <RowDefinition Height="{ThemeResource PaneToggleButtonHeight}" />
+            </Grid.RowDefinitions>
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="CommonStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="PointerOver">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Pressed">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Disabled">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewButtonBackgroundDisabled}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewButtonForegroundDisabled}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Checked">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundChecked}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundChecked}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="CheckedPointerOver">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundCheckedPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundCheckedPointerOver}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="CheckedPressed">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundCheckedPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundCheckedPressed}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="CheckedDisabled">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource ToggleButtonBackgroundCheckedDisabled}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ToggleButtonForegroundCheckedDisabled}" />
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Viewbox x:Name="IconHost" Width="16" Height="16" HorizontalAlignment="Center" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw">
+              <TextBlock x:Name="Icon" Text="&#xE700;" FontFamily="{StaticResource SymbolThemeFontFamily}" FontSize="{TemplateBinding FontSize}" AutomationProperties.AccessibilityView="Raw" />
+            </Viewbox>
+            <ContentPresenter x:Name="ContentPresenter" VerticalContentAlignment="Center" Content="{TemplateBinding Content}" FontSize="{TemplateBinding FontSize}" Grid.Column="1" />
+            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="NavigationViewPaneSearchButtonStyle" TargetType="Button">
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Content" Value="&#xE11A;" />
+    <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+    <Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
+    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+  </Style>
+  <Style x:Key="NavigationViewOverflowButtonStyleWhenPaneOnTop" TargetType="Button">
+    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
     <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
     <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
-    <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+    <Setter Property="Height" Value="{StaticResource TopNavigationViewOverflowButtonHeight}" />
+    <Setter Property="Width" Value="{StaticResource TopNavigationViewOverflowButtonWidth}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
     <Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="FocusVisualMargin" Value="0" />
     <Setter Property="Template">
       <Setter.Value>
-        <ControlTemplate TargetType="controls:NavigationViewItem">
-          <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
+        <ControlTemplate TargetType="Button">
+          <Grid x:Name="RootGrid" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" Background="{TemplateBinding Background}">
             <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="PointerStates">
+              <VisualStateGroup x:Name="CommonStates">
                 <VisualState x:Name="Normal" />
                 <VisualState x:Name="PointerOver">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
                     <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
                     <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
+                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="PointerOver" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Pressed">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
+                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
                     <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
                     <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
+                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="Pressed" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Selected">
+                <VisualState x:Name="Disabled">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelected}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundSelected}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="PointerOverSelected">
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Rectangle x:Name="PointerRectangle" Fill="Transparent" Visibility="Collapsed" />
+            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+            <FontIcon x:Name="Icon" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="20" Glyph="&#xE10C;" Foreground="{TemplateBinding Foreground}" IsHitTestVisible="False" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop" TargetType="Button">
+    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
+    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
+    <Setter Property="Height" Value="{StaticResource TopNavigationViewOverflowButtonHeight}" />
+    <Setter Property="Width" Value="{StaticResource TopNavigationViewOverflowButtonWidth}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="UseSystemFocusVisuals" Value="True" />
+    <Setter Property="FocusVisualMargin" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Grid x:Name="RootGrid" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" Background="{TemplateBinding Background}">
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="CommonStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="PointerOver">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelectedPointerOver}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
+                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
                     <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
+                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="PointerOver" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="PressedSelected">
+                <VisualState x:Name="Pressed">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelectedPressed}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
+                    <Setter Target="RootGrid.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
                     <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
-                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
+                    <contract4Present:Setter Target="RootGrid.(media:RevealBrush.State)" Value="Pressed" />
                   </VisualState.Setters>
                 </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="DisabledStates">
-                <VisualState x:Name="Enabled" />
                 <VisualState x:Name="Disabled">
                   <VisualState.Setters>
                     <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
-                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushCheckedDisabled}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
             <Rectangle x:Name="PointerRectangle" Fill="Transparent" />
             <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <Grid x:Name="ContentGrid">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition x:Name="IconRow" Height="Auto" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <Viewbox x:Name="IconBox" Grid.Row="1" Grid.Column="1" Height="16" Width="48" Margin="0,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
-              </Viewbox>
-            </Grid>
+            <FontIcon x:Name="Icon" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="20" Glyph="&#xE10C;" Foreground="{TemplateBinding Foreground}" IsHitTestVisible="False" />
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnTopPane">
-    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
+  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnLeftPane">
+    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
+    <Setter Property="UseSystemFocusVisuals" Value="True" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
-          <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
+          <Grid x:Name="LayoutRoot" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
             <Grid.Resources>
               <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
                 <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
@@ -17271,46 +16882,46 @@
                 <VisualState x:Name="Normal" />
                 <VisualState x:Name="PointerOver">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
                     <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Pressed">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
                     <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
+                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Selected">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelected}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundSelected}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundSelected}" />
-                  </VisualState.Setters>
-                </VisualState>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
+                    <contract4Present:Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushSelected}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
+                  </VisualState.Setters>
+                </VisualState>
                 <VisualState x:Name="PointerOverSelected">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelectedPointerOver}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
                     <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
+                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushSelectedPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPointerOver}" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="PressedSelected">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelectedPressed}" />
-                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
                     <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
+                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushSelectedPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelectedPressed}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
@@ -17318,29 +16929,17 @@
                 <VisualState x:Name="Enabled" />
                 <VisualState x:Name="Disabled">
                   <VisualState.Setters>
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
                     <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushCheckedDisabled}" />
+                    <Setter Target="LayoutRoot.Opacity" Value="{ThemeResource ListViewItemDisabledThemeOpacity}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="NavigationViewIconPositionStates">
-                <VisualState x:Name="IconOnLeft" />
-                <VisualState x:Name="IconOnly">
-                  <VisualState.Setters>
-                    <Setter Target="PointerRectangle.Visibility" Value="Visible" />
-                    <Setter Target="LayoutRoot.MinWidth" Value="48" />
-                    <Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
-                    <Setter Target="SelectionIndicatorGrid.Margin" Value="4,0,4,4" />
-                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemIconOnlyExpandChevronMargin}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="ContentOnly">
+              <VisualStateGroup x:Name="IconStates">
+                <VisualState x:Name="IconVisible" />
+                <VisualState x:Name="IconCollapsed">
                   <VisualState.Setters>
                     <Setter Target="IconBox.Visibility" Value="Collapsed" />
-                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyContentPresenterMargin}" />
-                    <Setter Target="SelectionIndicatorGrid.Margin" Value="12,0,12,4" />
-                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyExpandChevronMargin}" />
+                    <Setter Target="IconColumn.Width" Value="16" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
@@ -17359,41 +16958,56 @@
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
+              <VisualStateGroup x:Name="PaneAndTopLevelItemStates">
+                <VisualState x:Name="NotClosedCompactAndTopLevelItem" />
+                <VisualState x:Name="ClosedCompactAndTopLevelItem">
+                  <VisualState.Setters>
+                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource NavigationViewCompactItemContentPresenterMargin}" />
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="PointerRectangle" Fill="Transparent" Visibility="Collapsed" />
             <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <Grid x:Name="ContentGrid">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="16,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
-              </Viewbox>
-              <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemContentPresenterMargin}" TextWrapping="NoWrap" Foreground="{TemplateBinding Foreground}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
-              <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource TopNavigationViewItemExpandChevronMargin}" Background="Transparent">
-                <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
-                  <TextBlock.RenderTransform>
-                    <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
-                  </TextBlock.RenderTransform>
-                </TextBlock>
+            <Grid x:Name="PresenterContentRootGrid">
+              <!-- Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation. -->
+              <Grid Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
+                <Rectangle x:Name="SelectionIndicator" Width="2" Height="24" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0.0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+              </Grid>
+              <Grid HorizontalAlignment="Stretch" x:Name="ContentGrid" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition x:Name="IconColumn" Width="{ThemeResource NavigationViewCompactPaneLength}" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Viewbox x:Name="IconBox" Height="16" Margin="{ThemeResource NavigationViewItemOnLeftIconBoxMargin}">
+                  <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" />
+                </Viewbox>
+                <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource NavigationViewItemContentPresenterMargin}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Padding="{TemplateBinding Padding}" AutomationProperties.AccessibilityView="Raw" />
+                <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource NavigationViewItemExpandChevronMargin}" Background="Transparent">
+                  <TextBlock RenderTransformOrigin="0.5, 0.5" Foreground="{ThemeResource NavigationViewItemForeground}" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
+                    <TextBlock.RenderTransform>
+                      <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0" />
+                    </TextBlock.RenderTransform>
+                  </TextBlock>
+                </Grid>
               </Grid>
-            </Grid>
-            <Grid x:Name="SelectionIndicatorGrid" Margin="16,0,16,4" VerticalAlignment="Bottom">
-              <Rectangle x:Name="SelectionIndicator" Height="2" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
             </Grid>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnTopPaneWithRevealFocus">
-    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
+  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnLeftPaneWithRevealFocus">
+    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
+    <Setter Property="UseSystemFocusVisuals" Value="True" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
-          <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
+          <Grid x:Name="LayoutRoot" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
             <Grid.Resources>
               <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
                 <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
@@ -17407,39 +17021,27 @@
                 <VisualState x:Name="Enabled" />
                 <VisualState x:Name="Disabled">
                   <VisualState.Setters>
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
+                    <Setter Target="LayoutRoot.Opacity" Value="{ThemeResource ListViewItemDisabledThemeOpacity}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
               <VisualStateGroup x:Name="FocusStates">
                 <VisualState x:Name="Focused">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemRevealBackgroundFocused}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemRevealIconForegroundFocused}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemRevealContentForegroundFocused}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource SystemControlHighlightAccentBrush}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Unfocused" />
                 <VisualState x:Name="PointerFocused" />
               </VisualStateGroup>
-              <VisualStateGroup x:Name="NavigationViewIconPositionStates">
-                <VisualState x:Name="IconOnLeft" />
-                <VisualState x:Name="IconOnly">
-                  <VisualState.Setters>
-                    <Setter Target="PointerRectangle.Visibility" Value="Visible" />
-                    <Setter Target="LayoutRoot.MinWidth" Value="48" />
-                    <Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
-                    <Setter Target="SelectionIndicatorGrid.Margin" Value="4,0" />
-                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemIconOnlyExpandChevronMargin}" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="ContentOnly">
+              <VisualStateGroup x:Name="IconStates">
+                <VisualState x:Name="IconVisible" />
+                <VisualState x:Name="IconCollapsed">
                   <VisualState.Setters>
                     <Setter Target="IconBox.Visibility" Value="Collapsed" />
-                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyContentPresenterMargin}" />
-                    <Setter Target="SelectionIndicatorGrid.Margin" Value="12,0" />
-                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyExpandChevronMargin}" />
+                    <Setter Target="IconColumn.Width" Value="16" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
@@ -17458,84 +17060,99 @@
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
+              <VisualStateGroup x:Name="PaneAndTopLevelItemStates">
+                <VisualState x:Name="NotClosedCompactAndTopLevelItem" />
+                <VisualState x:Name="ClosedCompactAndTopLevelItem">
+                  <VisualState.Setters>
+                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource NavigationViewCompactItemContentPresenterMargin}" />
+                  </VisualState.Setters>
+                </VisualState>
+              </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="PointerRectangle" Fill="Transparent" Visibility="Collapsed" />
-            <Grid x:Name="ContentGrid">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="16,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
-              </Viewbox>
-              <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemContentPresenterMargin}" Foreground="{TemplateBinding Foreground}" TextWrapping="NoWrap" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
-              <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource NavigationViewItemExpandChevronMargin}" Background="Transparent">
-                <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
-                  <TextBlock.RenderTransform>
-                    <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
-                  </TextBlock.RenderTransform>
-                </TextBlock>
+            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+            <Grid x:Name="PresenterContentRootGrid">
+              <!-- Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation. -->
+              <Grid Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
+                <Rectangle x:Name="SelectionIndicator" Width="2" Height="24" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0.0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+              </Grid>
+              <Grid x:Name="ContentGrid" MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}" HorizontalAlignment="Left">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition x:Name="IconColumn" Width="{ThemeResource NavigationViewCompactPaneLength}" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Viewbox x:Name="IconBox" Height="16" Margin="{ThemeResource NavigationViewItemOnLeftIconBoxMargin}">
+                  <ContentPresenter x:Name="Icon" Foreground="{TemplateBinding Foreground}" Content="{TemplateBinding Icon}" />
+                </Viewbox>
+                <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Foreground="{TemplateBinding Foreground}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Margin="{ThemeResource NavigationViewItemContentPresenterMargin}" Padding="{TemplateBinding Padding}" AutomationProperties.AccessibilityView="Raw" />
+                <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource NavigationViewItemExpandChevronMargin}" Background="Transparent">
+                  <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
+                    <TextBlock.RenderTransform>
+                      <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
+                    </TextBlock.RenderTransform>
+                  </TextBlock>
+                </Grid>
               </Grid>
-            </Grid>
-            <Grid x:Name="SelectionIndicatorGrid" Margin="16,0,16,4" VerticalAlignment="Bottom">
-              <Rectangle x:Name="SelectionIndicator" Height="2" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
             </Grid>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnTopPaneOverflow">
-    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
+  <Style TargetType="controls:NavigationViewItem" x:Key="MUX_NavigationViewSettingsItemStyleWhenOnTopPane">
+    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
+    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
+    <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+    <Setter Property="UseSystemFocusVisuals" Value="True" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="Template">
       <Setter.Value>
-        <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
-          <Grid x:Name="LayoutRoot" Height="40" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
-            <Grid.Resources>
-              <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
-                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
-              </Storyboard>
-              <Storyboard x:Name="ExpandCollapseRotateCollapsedStoryboard">
-                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="180.0" To="0.0" Duration="0:0:0.1" />
-              </Storyboard>
-            </Grid.Resources>
+        <ControlTemplate TargetType="controls:NavigationViewItem">
+          <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="PointerStates">
                 <VisualState x:Name="Normal" />
                 <VisualState x:Name="PointerOver">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Pressed">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Selected">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelected}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundSelected}" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="PointerOverSelected">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
                   </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="PressedSelected">
                   <VisualState.Setters>
-                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
-                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
@@ -17544,570 +17161,394 @@
                 <VisualState x:Name="Disabled">
                   <VisualState.Setters>
                     <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
-                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="NavigationViewIconPositionStates">
-                <VisualState x:Name="IconOnLeft" />
-                <VisualState x:Name="IconOnly" />
-                <VisualState x:Name="ContentOnly">
-                  <VisualState.Setters>
-                    <Setter Target="IconBox.Visibility" Value="Collapsed" />
-                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource TopNavigationViewItemOnOverflowNoIconContentPresenterMargin}" />
-                  </VisualState.Setters>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="ChevronStates">
-                <VisualState x:Name="ChevronHidden" />
-                <VisualState x:Name="ChevronVisibleOpen">
-                  <VisualState.Setters>
-                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
-                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="180" />
-                  </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="ChevronVisibleClosed">
-                  <VisualState.Setters>
-                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
-                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="0" />
+                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushCheckedDisabled}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Grid x:Name="PresenterContentRootGrid">
-              <!-- Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation. -->
-              <Grid Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
-                <Rectangle x:Name="SelectionIndicator" Width="2" Height="24" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0.0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
-              </Grid>
-              <Grid x:Name="ContentGrid">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="16,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
-                  <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
-                </Viewbox>
-                <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemOnOverflowContentPresenterMargin}" Foreground="{TemplateBinding Foreground}" TextWrapping="NoWrap" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
-                <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource TopNavigationViewItemOnOverflowExpandChevronMargin}" Padding="{ThemeResource TopNavigationViewItemOnOverflowExpandChevronPadding}" Background="Transparent">
-                  <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
-                    <TextBlock.RenderTransform>
-                      <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
-                    </TextBlock.RenderTransform>
-                  </TextBlock>
-                </Grid>
-              </Grid>
+            <Rectangle x:Name="PointerRectangle" Fill="Transparent" />
+            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+            <Grid x:Name="ContentGrid">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+              </Grid.ColumnDefinitions>
+              <Grid.RowDefinitions>
+                <RowDefinition x:Name="IconRow" Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Viewbox x:Name="IconBox" Grid.Row="1" Grid.Column="1" Height="16" Width="48" Margin="0,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
+              </Viewbox>
             </Grid>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style x:Key="NavigationViewItemHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-    <Setter Property="FontWeight" Value="SemiBold" />
-    <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
-    <Setter Property="TextWrapping" Value="NoWrap" />
-  </Style>
-  <Style x:Key="NavigationViewTitleHeaderContentControlTextStyle" TargetType="ContentControl">
-    <Setter Property="FontWeight" Value="SemiLight" />
-    <Setter Property="FontSize" Value="24" />
-    <Setter Property="FontFamily" Value="XamlAutoFontFamily" />
-    <Setter Property="Margin" Value="{ThemeResource NavigationViewHeaderMargin}" />
-    <Setter Property="VerticalAlignment" Value="Stretch" />
-  </Style>
-  <Style TargetType="controls:NavigationView">
-    <Setter Property="PaneToggleButtonStyle" Value="{StaticResource PaneToggleButtonStyle}" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="CompactPaneLength" Value="{ThemeResource NavigationViewCompactPaneLength}" />
+  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnTopPane">
+    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
     <Setter Property="Template">
       <Setter.Value>
-        <ControlTemplate TargetType="controls:NavigationView">
-          <Grid x:Name="RootGrid">
+        <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
+          <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
+            <Grid.Resources>
+              <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
+                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
+              </Storyboard>
+              <Storyboard x:Name="ExpandCollapseRotateCollapsedStoryboard">
+                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="180.0" To="0.0" Duration="0:0:0.1" />
+              </Storyboard>
+            </Grid.Resources>
             <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="DisplayModeGroup">
-                <VisualState x:Name="Compact" />
-                <VisualState x:Name="Expanded">
+              <VisualStateGroup x:Name="PointerStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="PointerOver">
                   <VisualState.Setters>
-                    <Setter Target="RootSplitView.PaneBackground" Value="{ThemeResource NavigationViewExpandedPaneBackground}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="Minimal">
+                <VisualState x:Name="Pressed">
                   <VisualState.Setters>
-                    <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="TopNavigationMinimal" />
-                <VisualState x:Name="MinimalWithBackButton">
+                <VisualState x:Name="Selected">
                   <VisualState.Setters>
-                    <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundSelected}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundSelected}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundSelected}" />
                   </VisualState.Setters>
                 </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="TogglePaneGroup">
-                <VisualState x:Name="TogglePaneButtonVisible" />
-                <VisualState x:Name="TogglePaneButtonCollapsed" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="HeaderGroup">
-                <VisualState x:Name="HeaderVisible" />
-                <VisualState x:Name="HeaderCollapsed">
+                <VisualState x:Name="PointerOverSelected">
                   <VisualState.Setters>
-                    <Setter Target="HeaderContent.Visibility" Value="Collapsed" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPointerOver}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="PointerOver" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="PressedSelected">
+                  <VisualState.Setters>
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemBackgroundPressed}" />
+                    <Setter Target="PointerRectangle.Fill" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundPressed}" />
+                    <contract4Present:Setter Target="LayoutRoot.(media:RevealBrush.State)" Value="Pressed" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="AutoSuggestGroup">
-                <VisualState x:Name="AutoSuggestBoxVisible" />
-                <VisualState x:Name="AutoSuggestBoxCollapsed">
+              <VisualStateGroup x:Name="DisabledStates">
+                <VisualState x:Name="Enabled" />
+                <VisualState x:Name="Disabled">
                   <VisualState.Setters>
-                    <Setter Target="AutoSuggestArea.Visibility" Value="Collapsed" />
-                    <Setter Target="TopPaneAutoSuggestArea.Visibility" Value="Collapsed" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
+                    <Setter Target="RevealBorder.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushCheckedDisabled}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="PaneStateGroup">
-                <VisualState x:Name="NotClosedCompact" />
-                <VisualState x:Name="ClosedCompact">
+              <VisualStateGroup x:Name="NavigationViewIconPositionStates">
+                <VisualState x:Name="IconOnLeft" />
+                <VisualState x:Name="IconOnly">
                   <VisualState.Setters>
-                    <Setter Target="PaneAutoSuggestBoxPresenter.Visibility" Value="Collapsed" />
-                    <Setter Target="PaneAutoSuggestButton.Visibility" Value="Visible" />
+                    <Setter Target="PointerRectangle.Visibility" Value="Visible" />
+                    <Setter Target="LayoutRoot.MinWidth" Value="48" />
+                    <Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
+                    <Setter Target="SelectionIndicatorGrid.Margin" Value="4,0,4,4" />
+                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemIconOnlyExpandChevronMargin}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ContentOnly">
+                  <VisualState.Setters>
+                    <Setter Target="IconBox.Visibility" Value="Collapsed" />
+                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyContentPresenterMargin}" />
+                    <Setter Target="SelectionIndicatorGrid.Margin" Value="12,0,12,4" />
+                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyExpandChevronMargin}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="PaneStateListSizeGroup">
-                <VisualState x:Name="ListSizeFull" />
-                <VisualState x:Name="ListSizeCompact">
+              <VisualStateGroup x:Name="ChevronStates">
+                <VisualState x:Name="ChevronHidden" />
+                <VisualState x:Name="ChevronVisibleOpen">
                   <VisualState.Setters>
-                    <Setter Target="PaneContentGrid.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                    <Setter Target="PaneTitleTextBlock.Visibility" Value="Collapsed" />
-                    <Setter Target="PaneHeaderContentBorder.Visibility" Value="Collapsed" />
-                    <Setter Target="PaneCustomContentBorder.HorizontalAlignment" Value="Left" />
-                    <Setter Target="FooterContentBorder.HorizontalAlignment" Value="Left" />
+                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
+                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="180" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ChevronVisibleClosed">
+                  <VisualState.Setters>
+                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
+                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="0" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="TitleBarVisibilityGroup">
-                <VisualState x:Name="TitleBarVisible" />
-                <VisualState x:Name="TitleBarCollapsed">
+            </VisualStateManager.VisualStateGroups>
+            <Rectangle x:Name="PointerRectangle" Fill="Transparent" Visibility="Collapsed" />
+            <Border x:Name="RevealBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+            <Grid x:Name="ContentGrid">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="16,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
+              </Viewbox>
+              <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemContentPresenterMargin}" TextWrapping="NoWrap" Foreground="{TemplateBinding Foreground}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
+              <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource TopNavigationViewItemExpandChevronMargin}" Background="Transparent">
+                <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
+                  <TextBlock.RenderTransform>
+                    <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
+                  </TextBlock.RenderTransform>
+                </TextBlock>
+              </Grid>
+            </Grid>
+            <Grid x:Name="SelectionIndicatorGrid" Margin="16,0,16,4" VerticalAlignment="Bottom">
+              <Rectangle x:Name="SelectionIndicator" Height="2" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+            </Grid>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnTopPaneWithRevealFocus">
+    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
+          <Grid x:Name="LayoutRoot" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
+            <Grid.Resources>
+              <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
+                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
+              </Storyboard>
+              <Storyboard x:Name="ExpandCollapseRotateCollapsedStoryboard">
+                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="180.0" To="0.0" Duration="0:0:0.1" />
+              </Storyboard>
+            </Grid.Resources>
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="DisabledStates">
+                <VisualState x:Name="Enabled" />
+                <VisualState x:Name="Disabled">
                   <VisualState.Setters>
-                    <Setter Target="PaneContentGrid.Margin" Value="0,32,0,0" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="OverflowLabelGroup">
-                <VisualState x:Name="OverflowButtonWithLabel" />
-                <VisualState x:Name="OverflowButtonNoLabel">
+              <VisualStateGroup x:Name="FocusStates">
+                <VisualState x:Name="Focused">
                   <VisualState.Setters>
-                    <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource TopNavigationViewItemRevealBackgroundFocused}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemRevealIconForegroundFocused}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemRevealContentForegroundFocused}" />
                   </VisualState.Setters>
                 </VisualState>
+                <VisualState x:Name="Unfocused" />
+                <VisualState x:Name="PointerFocused" />
               </VisualStateGroup>
-              <VisualStateGroup x:Name="BackButtonGroup">
-                <VisualState x:Name="BackButtonVisible" />
-                <VisualState x:Name="BackButtonCollapsed">
+              <VisualStateGroup x:Name="NavigationViewIconPositionStates">
+                <VisualState x:Name="IconOnLeft" />
+                <VisualState x:Name="IconOnly">
                   <VisualState.Setters>
-                    <Setter Target="BackButtonPlaceholderOnTopNav.Width" Value="0" />
+                    <Setter Target="PointerRectangle.Visibility" Value="Visible" />
+                    <Setter Target="LayoutRoot.MinWidth" Value="48" />
+                    <Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
+                    <Setter Target="SelectionIndicatorGrid.Margin" Value="4,0" />
+                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemIconOnlyExpandChevronMargin}" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ContentOnly">
+                  <VisualState.Setters>
+                    <Setter Target="IconBox.Visibility" Value="Collapsed" />
+                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyContentPresenterMargin}" />
+                    <Setter Target="SelectionIndicatorGrid.Margin" Value="12,0" />
+                    <Setter Target="ExpandCollapseChevron.Margin" Value="{ThemeResource TopNavigationViewItemContentOnlyExpandChevronMargin}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-              <VisualStateGroup x:Name="PaneVisibilityGroup">
-                <VisualState x:Name="PaneVisible" />
-                <VisualState x:Name="PaneCollapsed">
+              <VisualStateGroup x:Name="ChevronStates">
+                <VisualState x:Name="ChevronHidden" />
+                <VisualState x:Name="ChevronVisibleOpen">
                   <VisualState.Setters>
-                    <!-- Note that RootSplitView.DisplayMode is set in code so we don't want to -->
-                    <!-- write it here and interfere. But these values work together to hide -->
-                    <!-- the left pane. -->
-                    <Setter Target="RootSplitView.CompactPaneLength" Value="0" />
-                    <Setter Target="PaneToggleButtonGrid.Visibility" Value="Collapsed" />
+                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
+                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="180" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ChevronVisibleClosed">
+                  <VisualState.Setters>
+                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
+                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="0" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <!-- Content layouts -->
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <!-- DisplayMode top -->
-              <StackPanel x:Name="TopNavArea" Background="{ThemeResource NavigationViewTopPaneBackground}" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Canvas.ZIndex="1" contract4Present:XYFocusKeyboardNavigation="Enabled">
-                <Grid x:Name="TopNavTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}" />
-                <Grid x:Name="TopNavGrid" Height="{ThemeResource NavigationViewTopPaneHeight}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition x:Name="BackButtonPlaceholderOnTopNav" Width="{ThemeResource NavigationBackButtonWidth}" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" MinWidth="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-                  <Grid x:Name="TopNavLeftPadding" Grid.Column="1" Width="0" />
-                  <ContentControl x:Name="PaneHeaderOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="2" />
-                  <ContentControl x:Name="PaneTitleOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="2" />
-                  <!-- Top nav ItemsRepeater -->
-                  <controls:ItemsRepeaterScrollHost Grid.Column="3">
-                    <ScrollViewer HorizontalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollMode="Disabled" VerticalScrollBarVisibility="Hidden">
-                      <controls:ItemsRepeater AutomationProperties.LandmarkType="Navigation" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" AutomationProperties.AccessibilityView="Content" x:Name="TopNavMenuItemsHost">
-                        <controls:ItemsRepeater.Layout>
-                          <controls:StackLayout Orientation="Horizontal" />
-                        </controls:ItemsRepeater.Layout>
-                      </controls:ItemsRepeater>
-                    </ScrollViewer>
-                  </controls:ItemsRepeaterScrollHost>
-                  <Button x:Name="TopNavOverflowButton" Grid.Column="4" Content="More" Margin="{ThemeResource TopNavigationViewOverflowButtonMargin}" Style="{StaticResource NavigationViewOverflowButtonStyleWhenPaneOnTop}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OverflowButtonVisibility}">
-                    <Button.Flyout>
-                      <Flyout contract7NotPresent:Placement="Bottom" contract7Present:Placement="BottomEdgeAlignedRight" ElementSoundMode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ElementSoundMode}">
-                        <Flyout.FlyoutPresenterStyle>
-                          <Style TargetType="FlyoutPresenter">
-                            <Setter Property="Padding" Value="{ThemeResource TopNavigationViewOverflowMenuPadding}" />
-                            <!-- Set negative top margin to make the flyout align exactly with the button -->
-                            <Setter Property="Margin" Value="0,-4,0,0" />
-                            <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
-                            <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-                            <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
-                            <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-                            <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
-                            <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
-                            <Setter Property="Template">
-                              <Setter.Value>
-                                <ControlTemplate TargetType="FlyoutPresenter">
-                                  <ScrollViewer x:Name="ScrollViewer" ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" AutomationProperties.AccessibilityView="Raw">
-                                    <ContentPresenter x:Name="ContentPresenter" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" contract7Present:CornerRadius="{TemplateBinding CornerRadius}" contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}" />
-                                  </ScrollViewer>
-                                </ControlTemplate>
-                              </Setter.Value>
-                            </Setter>
-                          </Style>
-                        </Flyout.FlyoutPresenterStyle>
-                        <controls:ItemsRepeaterScrollHost>
-                          <ScrollViewer VerticalScrollBarVisibility="Auto">
-                            <controls:ItemsRepeater AutomationProperties.AccessibilityView="Content" x:Name="TopNavMenuItemsOverflowHost" />
-                          </ScrollViewer>
-                        </controls:ItemsRepeaterScrollHost>
-                      </Flyout>
-                    </Button.Flyout>
-                  </Button>
-                  <ContentControl x:Name="PaneCustomContentOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="5" />
-                  <Grid x:Name="TopPaneAutoSuggestArea" Height="{ThemeResource NavigationViewTopPaneHeight}" Grid.Column="6">
-                    <ContentControl x:Name="TopPaneAutoSuggestBoxPresenter" Margin="{ThemeResource TopNavigationViewAutoSuggestBoxMargin}" MinWidth="48" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" />
-                  </Grid>
-                  <ContentControl x:Name="PaneFooterOnTopPane" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="7" />
-                  <!-- Top footer menu ItemsRepeater -->
-                  <controls:ItemsRepeater Grid.Column="8" AutomationProperties.LandmarkType="Navigation" AutomationProperties.AccessibilityView="Content" x:Name="TopFooterMenuItemsHost">
-                    <controls:ItemsRepeater.Layout>
-                      <controls:StackLayout Orientation="Horizontal" />
-                    </controls:ItemsRepeater.Layout>
-                  </controls:ItemsRepeater>
-                </Grid>
-                <Border x:Name="TopNavContentOverlayAreaGrid" Child="{TemplateBinding ContentOverlay}" />
-              </StackPanel>
-              <!-- Displaymode (compact/minimal/normal) left -->
-              <SplitView x:Name="RootSplitView" Background="{TemplateBinding Background}" CompactPaneLength="{TemplateBinding CompactPaneLength}" DisplayMode="Inline" IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}" IsTabStop="False" OpenPaneLength="{TemplateBinding OpenPaneLength}" PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}" Grid.Row="1">
-                <SplitView.Pane>
-                  <Grid x:Name="PaneContentGrid" HorizontalAlignment="Left" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}">
-                    <Grid.RowDefinitions>
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="0" />
-                      <!-- above button margin + back button space -->
-                      <RowDefinition x:Name="PaneContentGridToggleButtonRow" Height="Auto" MinHeight="{StaticResource NavigationViewPaneHeaderRowMinHeight}" />
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="8" />
-                      <!-- above list margin -->
-                      <RowDefinition x:Name="ItemsContainerRow" Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid x:Name="ContentPaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
-                    <Grid Grid.Row="2">
-                      <Grid.RowDefinitions>
-                        <RowDefinition x:Name="PaneHeaderContentBorderRow" />
-                      </Grid.RowDefinitions>
-                      <Grid.ColumnDefinitions>
-                        <ColumnDefinition x:Name="PaneHeaderCloseButtonColumn" />
-                        <ColumnDefinition x:Name="PaneHeaderToggleButtonColumn" />
-                        <ColumnDefinition Width="*" />
-                      </Grid.ColumnDefinitions>
-                      <ContentControl x:Name="PaneHeaderContentBorder" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Column="2" />
-                    </Grid>
-                    <Grid x:Name="AutoSuggestArea" Grid.Row="3" Height="{ThemeResource NavigationViewTopPaneHeight}" VerticalAlignment="Center">
-                      <ContentControl x:Name="PaneAutoSuggestBoxPresenter" Margin="{ThemeResource NavigationViewAutoSuggestBoxMargin}" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" />
-                      <Button x:Name="PaneAutoSuggestButton" Visibility="Collapsed" Style="{ThemeResource NavigationViewPaneSearchButtonStyle}" Width="{TemplateBinding CompactPaneLength}" />
-                    </Grid>
-                    <ContentControl x:Name="PaneCustomContentBorder" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Row="4" />
-                    <!-- "Non header" content -->
-                    <Grid x:Name="ItemsContainerGrid" Grid.Row="6" Margin="0,0,0,8">
-                      <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <!-- MenuItems -->
-                        <RowDefinition Height="Auto" />
-                        <!-- Fill spacing -->
-                        <RowDefinition Height="Auto" />
-                        <!-- PaneFooter -->
-                        <RowDefinition Height="Auto" />
-                        <!-- FooterItems -->
-                      </Grid.RowDefinitions>
-                      <!-- MenuItems -->
-                      <controls:ItemsRepeaterScrollHost HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                        <ScrollViewer x:Name="MenuItemsScrollViewer" TabNavigation="Local" VerticalScrollBarVisibility="Auto">
-                          <!-- Left nav ItemsRepeater -->
-                          <controls:ItemsRepeater x:Name="MenuItemsHost" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" AutomationProperties.AccessibilityView="Content" />
-                        </ScrollViewer>
-                      </controls:ItemsRepeaterScrollHost>
-                      <controls:NavigationViewItemSeparator x:Name="VisualItemsSeparator" Grid.Row="1" VerticalAlignment="Center" Visibility="Collapsed" HorizontalAlignment="Stretch" />
-                      <!-- PaneFooter -->
-                      <ContentControl x:Name="FooterContentBorder" IsTabStop="False" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.Row="2" />
-                      <!-- FooterItems -->
-                      <controls:ItemsRepeaterScrollHost Grid.Row="3">
-                        <ScrollViewer x:Name="FooterItemsScrollViewer" VerticalScrollBarVisibility="Auto" contract7Present:VerticalAnchorRatio="1">
-                          <controls:ItemsRepeater x:Name="FooterMenuItemsHost" AutomationProperties.AccessibilityView="Content" />
-                        </ScrollViewer>
-                      </controls:ItemsRepeaterScrollHost>
-                    </Grid>
-                  </Grid>
-                </SplitView.Pane>
-                <SplitView.Content>
-                  <Grid x:Name="ContentGrid">
-                    <Grid.RowDefinitions>
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid x:Name="ContentTopPadding" Grid.ColumnSpan="2" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}" />
-                    <Grid x:Name="ContentLeftPadding" Grid.Row="1" />
-                    <ContentControl x:Name="HeaderContent" Grid.Row="1" Grid.Column="1" MinHeight="{StaticResource PaneToggleButtonHeight}" IsTabStop="False" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Style="{StaticResource NavigationViewTitleHeaderContentControlTextStyle}" />
-                    <ContentPresenter AutomationProperties.LandmarkType="Main" Grid.Row="2" Grid.ColumnSpan="2" Content="{TemplateBinding Content}" />
-                  </Grid>
-                </SplitView.Content>
-              </SplitView>
-            </Grid>
-            <!-- Button grid -->
-            <Grid x:Name="PaneToggleButtonGrid" Margin="0,0,0,8" HorizontalAlignment="Left" VerticalAlignment="Top" Canvas.ZIndex="100">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <Grid x:Name="TogglePaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
-              <Grid x:Name="ButtonHolderGrid" Grid.Row="1">
-                <Button x:Name="NavigationViewBackButton" Style="{StaticResource NavigationBackButtonNormalStyle}" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonWidth}" VerticalAlignment="Top" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.BackButtonVisibility}" IsEnabled="{TemplateBinding IsBackEnabled}">
-                  <ToolTipService.ToolTip>
-                    <ToolTip x:Name="NavigationViewBackButtonToolTip" />
-                  </ToolTipService.ToolTip>
-                </Button>
-                <Button x:Name="NavigationViewCloseButton" Style="{StaticResource NavigationBackButtonNormalStyle}" VerticalAlignment="Top">
-                  <ToolTipService.ToolTip>
-                    <ToolTip x:Name="NavigationViewCloseButtonToolTip" />
-                  </ToolTipService.ToolTip>
-                </Button>
-                <Button x:Name="TogglePaneButton" Style="{TemplateBinding PaneToggleButtonStyle}" AutomationProperties.LandmarkType="Navigation" HorizontalAlignment="Center" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}" VerticalAlignment="Top" MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonWidth}">
-                  <TextBlock x:Name="PaneTitleTextBlock" Grid.Column="0" Text="{TemplateBinding PaneTitle}" HorizontalAlignment="Left" VerticalAlignment="Center" Style="{StaticResource NavigationViewItemHeaderTextStyle}" />
-                </Button>
-                <Grid x:Name="PaneTitleHolder" Visibility="Collapsed">
-                  <ContentControl x:Name="PaneTitlePresenter" Margin="{ThemeResource NavigationViewPaneTitlePresenterMargin}" IsTabStop="False" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
-                </Grid>
+            <Rectangle x:Name="PointerRectangle" Fill="Transparent" Visibility="Collapsed" />
+            <Grid x:Name="ContentGrid">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="16,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
+              </Viewbox>
+              <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemContentPresenterMargin}" Foreground="{TemplateBinding Foreground}" TextWrapping="NoWrap" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
+              <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource NavigationViewItemExpandChevronMargin}" Background="Transparent">
+                <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" VerticalAlignment="Center" HorizontalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
+                  <TextBlock.RenderTransform>
+                    <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
+                  </TextBlock.RenderTransform>
+                </TextBlock>
               </Grid>
             </Grid>
+            <Grid x:Name="SelectionIndicatorGrid" Margin="16,0,16,4" VerticalAlignment="Bottom">
+              <Rectangle x:Name="SelectionIndicator" Height="2" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+            </Grid>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
-  <Style TargetType="controls:NavigationViewItem">
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
-    <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
-    <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
-    <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
-    <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-    <Setter Property="Margin" Value="{ThemeResource NavigationViewItemMargin}" />
-    <Setter Property="UseSystemFocusVisuals" Value="True" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="TabNavigation" Value="Once" />
-    <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+  <Style TargetType="primitives:NavigationViewItemPresenter" x:Key="MUX_NavigationViewItemPresenterStyleWhenOnTopPaneOverflow">
+    <Setter Property="Foreground" Value="{ThemeResource TopNavigationViewItemForeground}" />
     <Setter Property="Template">
       <Setter.Value>
-        <ControlTemplate TargetType="controls:NavigationViewItem">
-          <Grid x:Name="NVIRootGrid">
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
+          <Grid x:Name="LayoutRoot" Height="40" Background="{TemplateBinding Background}" Control.IsTemplateFocusTarget="True">
+            <Grid.Resources>
+              <Storyboard x:Name="ExpandCollapseRotateExpandedStoryboard">
+                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="0.0" To="180.0" Duration="0:0:0.1" />
+              </Storyboard>
+              <Storyboard x:Name="ExpandCollapseRotateCollapsedStoryboard">
+                <DoubleAnimation Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle" From="180.0" To="0.0" Duration="0:0:0.1" />
+              </Storyboard>
+            </Grid.Resources>
             <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="ItemOnNavigationViewListPositionStates">
-                <VisualState x:Name="OnLeftNavigation">
+              <VisualStateGroup x:Name="PointerStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="PointerOver">
                   <VisualState.Setters>
-                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnLeftPane}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="OnLeftNavigationReveal">
+                <VisualState x:Name="Pressed">
                   <VisualState.Setters>
-                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnLeftPaneWithRevealFocus}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="OnTopNavigationPrimary">
+                <VisualState x:Name="Selected">
                   <VisualState.Setters>
-                    <Setter Target="NavigationViewItemPresenter.Margin" Value="{ThemeResource TopNavigationViewItemMargin}" />
-                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPane}" />
-                    <contract7NotPresent:Setter Target="ChildrenFlyout.Placement" Value="Bottom" />
-                    <contract7Present:Setter Target="ChildrenFlyout.Placement" Value="BottomEdgeAlignedLeft" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="OnTopNavigationPrimaryReveal">
+                <VisualState x:Name="PointerOverSelected">
                   <VisualState.Setters>
-                    <Setter Target="NavigationViewItemPresenter.Margin" Value="{ThemeResource TopNavigationViewItemMargin}" />
-                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPaneWithRevealFocus}" />
-                    <contract7NotPresent:Setter Target="ChildrenFlyout.Placement" Value="Bottom" />
-                    <contract7Present:Setter Target="ChildrenFlyout.Placement" Value="BottomEdgeAlignedLeft" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="OnTopNavigationOverflow">
+                <VisualState x:Name="PressedSelected">
                   <VisualState.Setters>
-                    <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPaneOverflow}" />
+                    <Setter Target="LayoutRoot.Background" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <primitives:NavigationViewItemPresenter x:Name="NavigationViewItemPresenter" Icon="{TemplateBinding Icon}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Margin="{TemplateBinding Margin}" Padding="{TemplateBinding Padding}" Foreground="{TemplateBinding Foreground}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" VerticalAlignment="{TemplateBinding VerticalAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Content="{TemplateBinding Content}" primitiveContract7Present:CornerRadius="{TemplateBinding CornerRadius}" IsTabStop="false" Control.IsTemplateFocusTarget="True" />
-            <controls:ItemsRepeater Grid.Row="1" Visibility="Collapsed" x:Name="NavigationViewItemMenuItemsHost">
-              <controls:ItemsRepeater.Layout>
-                <controls:StackLayout Orientation="Vertical" />
-              </controls:ItemsRepeater.Layout>
-            </controls:ItemsRepeater>
-            <FlyoutBase.AttachedFlyout>
-              <Flyout x:Name="ChildrenFlyout" contract7NotPresent:Placement="Right" contract7Present:Placement="RightEdgeAlignedTop">
-                <Flyout.FlyoutPresenterStyle>
-                  <Style TargetType="FlyoutPresenter">
-                    <Setter Property="Padding" Value="{ThemeResource NavigationViewItemChildrenMenuFlyoutPadding}" />
-                    <!-- Set negative top margin to make the flyout align exactly with the button -->
-                    <Setter Property="Margin" Value="0,-4,0,0" />
-                    <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
-                    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-                    <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
-                    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-                    <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
-                    <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
-                    <Setter Property="Template">
-                      <Setter.Value>
-                        <ControlTemplate TargetType="FlyoutPresenter">
-                          <ScrollViewer x:Name="ScrollViewer" ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" AutomationProperties.AccessibilityView="Raw">
-                            <ContentPresenter x:Name="ContentPresenter" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" contract7Present:CornerRadius="{TemplateBinding CornerRadius}" contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}" />
-                          </ScrollViewer>
-                        </ControlTemplate>
-                      </Setter.Value>
-                    </Setter>
-                  </Style>
-                </Flyout.FlyoutPresenterStyle>
-                <Grid x:Name="FlyoutRootGrid">
-                  <Grid x:Name="FlyoutContentGrid" />
-                </Grid>
-              </Flyout>
-            </FlyoutBase.AttachedFlyout>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="primitives:NavigationViewItemPresenter" />
-  <Style TargetType="controls:NavigationViewItemHeader">
-    <Setter Property="IsEnabled" Value="False" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="MinHeight" Value="0" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
-    <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemHeaderForeground}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="controls:NavigationViewItemHeader">
-          <Grid x:Name="NavigationViewItemHeaderRootGrid">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="PaneStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition From="HeaderTextCollapsed" To="HeaderTextVisible">
-                    <Storyboard>
-                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerHeaderGrid" Storyboard.TargetProperty="Height">
-                        <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="40" />
-                      </ObjectAnimationUsingKeyFrames>
-                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Visibility">
-                        <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
-                      </ObjectAnimationUsingKeyFrames>
-                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Opacity">
-                        <LinearDoubleKeyFrame KeyTime="0:0:0" Value="0.0" />
-                        <LinearDoubleKeyFrame KeyTime="0:0:0.1" Value="0.0" />
-                        <SplineDoubleKeyFrame KeyTime="0:0:0.2" KeySpline="0.0,0.35 0.15,1.0" Value="1.0" />
-                      </DoubleAnimationUsingKeyFrames>
-                    </Storyboard>
-                  </VisualTransition>
-                  <VisualTransition From="HeaderTextVisible" To="HeaderTextCollapsed">
-                    <Storyboard>
-                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerHeaderGrid" Storyboard.TargetProperty="Height">
-                        <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="20" />
-                      </ObjectAnimationUsingKeyFrames>
-                      <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Visibility">
-                        <DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
-                      </ObjectAnimationUsingKeyFrames>
-                      <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Opacity">
-                        <LinearDoubleKeyFrame KeyTime="0:0:0" Value="1.0" />
-                        <SplineDoubleKeyFrame KeyTime="0:0:0.1" KeySpline="0.0,0.35 0.15,1.0" Value="0.0" />
-                      </DoubleAnimationUsingKeyFrames>
-                    </Storyboard>
-                  </VisualTransition>
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="HeaderTextVisible" />
-                <VisualState x:Name="HeaderTextCollapsed">
+              <VisualStateGroup x:Name="DisabledStates">
+                <VisualState x:Name="Enabled" />
+                <VisualState x:Name="Disabled">
                   <VisualState.Setters>
-                    <Setter Target="HeaderText.Visibility" Value="Collapsed" />
-                    <Setter Target="InnerHeaderGrid.Height" Value="20" />
+                    <Setter Target="Icon.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
+                    <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TopNavigationViewItemForegroundDisabled}" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid x:Name="InnerHeaderGrid" Height="40" HorizontalAlignment="Left" Margin="{ThemeResource NavigationViewItemInnerHeaderMargin}">
-              <TextBlock x:Name="HeaderText" VerticalAlignment="Center" Margin="0,-1,0,-1" Style="{StaticResource NavigationViewItemHeaderTextStyle}" Text="{TemplateBinding Content}" TextWrapping="NoWrap" />
-            </Grid>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="controls:NavigationViewItemSeparator">
-    <Setter Property="IsEnabled" Value="False" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="MinHeight" Value="0" />
-    <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Grid x:Name="NavigationViewItemSeparatorRootGrid">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="NavigationSeparatorLineStates">
-                <VisualState x:Name="HorizontalLine" />
-                <VisualState x:Name="HorizontalLineCompact">
+              <VisualStateGroup x:Name="NavigationViewIconPositionStates">
+                <VisualState x:Name="IconOnLeft" />
+                <VisualState x:Name="IconOnly" />
+                <VisualState x:Name="ContentOnly">
                   <VisualState.Setters>
-                    <Setter Target="SeparatorLine.Margin" Value="{ThemeResource NavigationViewCompactItemSeparatorMargin}" />
+                    <Setter Target="IconBox.Visibility" Value="Collapsed" />
+                    <Setter Target="ContentPresenter.Margin" Value="{ThemeResource TopNavigationViewItemOnOverflowNoIconContentPresenterMargin}" />
                   </VisualState.Setters>
                 </VisualState>
-                <VisualState x:Name="VerticalLine">
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="ChevronStates">
+                <VisualState x:Name="ChevronHidden" />
+                <VisualState x:Name="ChevronVisibleOpen">
                   <VisualState.Setters>
-                    <Setter Target="SeparatorLine.Height" Value="20" />
-                    <Setter Target="SeparatorLine.Width" Value="{ThemeResource TopNavigationViewItemSeparatorWidth}" />
-                    <Setter Target="SeparatorLine.Margin" Value="{ThemeResource TopNavigationViewItemSeparatorMargin}" />
-                    <Setter Target="SeparatorLine.VerticalAlignment" Value="Center" />
-                    <Setter Target="SeparatorLine.Fill" Value="{ThemeResource TopNavigationViewItemSeparatorForeground}" />
+                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
+                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="180" />
+                  </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ChevronVisibleClosed">
+                  <VisualState.Setters>
+                    <Setter Target="ExpandCollapseChevron.Visibility" Value="Visible" />
+                    <Setter Target="ExpandCollapseChevronRotateTransform.Angle" Value="0" />
                   </VisualState.Setters>
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="SeparatorLine" Height="{ThemeResource NavigationViewItemSeparatorHeight}" Margin="{ThemeResource NavigationViewItemSeparatorMargin}" Fill="{ThemeResource NavigationViewItemSeparatorForeground}" />
+            <Grid x:Name="PresenterContentRootGrid">
+              <!-- Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation. -->
+              <Grid Margin="4,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
+                <Rectangle x:Name="SelectionIndicator" Width="2" Height="24" Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}" Opacity="0.0" contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" />
+              </Grid>
+              <Grid x:Name="ContentGrid">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Viewbox x:Name="IconBox" Height="16" Width="16" Margin="16,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                  <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
+                </Viewbox>
+                <ContentPresenter x:Name="ContentPresenter" Grid.Column="1" Margin="{ThemeResource TopNavigationViewItemOnOverflowContentPresenterMargin}" Foreground="{TemplateBinding Foreground}" TextWrapping="NoWrap" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" />
+                <Grid x:Name="ExpandCollapseChevron" Grid.Column="2" Visibility="Collapsed" HorizontalAlignment="Right" Width="40" Margin="{ThemeResource TopNavigationViewItemOnOverflowExpandChevronMargin}" Padding="{ThemeResource TopNavigationViewItemOnOverflowExpandChevronPadding}" Background="Transparent">
+                  <TextBlock Foreground="{ThemeResource NavigationViewItemForeground}" RenderTransformOrigin="0.5, 0.5" FontSize="{ThemeResource NavigationViewItemExpandedGlyphFontSize}" Text="{StaticResource NavigationViewItemExpandedGlyph}" FontFamily="{StaticResource SymbolThemeFontFamily}" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.AccessibilityView="Raw" IsTextScaleFactorEnabled="False">
+                    <TextBlock.RenderTransform>
+                      <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" />
+                    </TextBlock.RenderTransform>
+                  </TextBlock>
+                </Grid>
+              </Grid>
+            </Grid>
           </Grid>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
   </Style>
+  <Style x:Key="NavigationViewItemHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+    <Setter Property="FontWeight" Value="SemiBold" />
+    <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />
+    <Setter Property="TextWrapping" Value="NoWrap" />
+  </Style>
+  <Style x:Key="NavigationViewTitleHeaderContentControlTextStyle" TargetType="ContentControl">
+    <Setter Property="FontWeight" Value="SemiLight" />
+    <Setter Property="FontSize" Value="24" />
+    <Setter Property="FontFamily" Value="XamlAutoFontFamily" />
+    <Setter Property="Margin" Value="{ThemeResource NavigationViewHeaderMargin}" />
+    <Setter Property="VerticalAlignment" Value="Stretch" />
+  </Style>
   <Style TargetType="controls:NumberBox">
     <Setter Property="IsTabStop" Value="False" />
     <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextControlSelectionHighlightColor}" />
diff --git a/src/Uno.UI.FluentTheme/themeresources_v2.xaml b/src/Uno.UI.FluentTheme/themeresources_v2.xaml
index 66f1466154d1..448226a0dded 100644
--- a/src/Uno.UI.FluentTheme/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme/themeresources_v2.xaml
@@ -175,9 +175,27 @@
       <SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="#FF00FF" />
       <SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="#FF00FF" />
       <SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="#FF00FF" />
-      <SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-      <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-      <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
+      <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
+      <LinearGradientBrush x:Key="CircleElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="0.70" Color="{StaticResource ControlStrokeColorSecondary}" />
+          <GradientStop Offset="0.50" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
+      <LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.RelativeTransform>
+          <ScaleTransform ScaleY="-1" CenterY="0.5" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
       <CornerRadius x:Key="ControlCornerRadius">4,4,4,4</CornerRadius>
       <CornerRadius x:Key="OverlayCornerRadius">8,8,8,8</CornerRadius>
       <AcrylicBrush x:Key="AcrylicBackgroundFillColorDefaultBrush" TintColor="#2C2C2C" TintOpacity="0.8" FallbackColor="#2C2C2C" BackgroundSource="HostBackdrop" />
@@ -524,8 +542,24 @@
       <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
       <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
       <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
-      <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="#50FFFFFF" />
-      <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorLight2}" />
+      <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.5" Color="{StaticResource ControlStrongStrokeColorDefault}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
+      <LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+        <LinearGradientBrush.RelativeTransform>
+          <ScaleTransform ScaleY="-1" CenterY="0.5" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorLight2}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
       <StaticResource x:Key="AppBarButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="AppBarButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
       <StaticResource x:Key="AppBarButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
@@ -1981,9 +2015,30 @@
       <SolidColorBrush x:Key="SystemFillColorNeutralBackgroundBrush" Color="{StaticResource SystemFillColorNeutralBackground}" />
       <SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
       <SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
-      <SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-      <SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource ControlStrokeColorAverage}" />
-      <SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
+      <LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.RelativeTransform>
+          <ScaleTransform ScaleY="-1" CenterY="0.5" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
+      <LinearGradientBrush x:Key="CircleElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="0.50" Color="{StaticResource ControlStrokeColorDefault}" />
+          <GradientStop Offset="0.70" Color="{StaticResource ControlStrokeColorSecondary}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
+      <LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
+        <LinearGradientBrush.RelativeTransform>
+          <ScaleTransform ScaleY="-1" CenterY="0.5" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
       <SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="#FF00FF" />
       <SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="#FF00FF" />
       <SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="#FF00FF" />
@@ -2338,8 +2393,24 @@
       <StaticResource x:Key="TextControlButtonForeground" ResourceKey="TextFillColorSecondaryBrush" />
       <StaticResource x:Key="TextControlButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
       <StaticResource x:Key="TextControlButtonForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
-      <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="#50000000" />
-      <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorDark1}" />
+      <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.5" Color="{StaticResource ControlStrongStrokeColorDefault}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
+      <LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+        <LinearGradientBrush.RelativeTransform>
+          <ScaleTransform ScaleY="-1" CenterY="0.5" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorDark1}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
       <StaticResource x:Key="AppBarButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
       <StaticResource x:Key="AppBarButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
       <StaticResource x:Key="AppBarButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
@@ -4133,8 +4204,24 @@
       <StaticResource x:Key="TextControlButtonForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
       <StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
       <StaticResource x:Key="TextControlPlaceholderForegroundFocused" ResourceKey="SystemControlForegroundBaseMediumLowBrush" />
-      <SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="{StaticResource ControlStrokeColorDefault}" />
-      <SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{ThemeResource SystemAccentColorLight2}" />
+      <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.5" Color="{StaticResource ControlAAStrokeColorDefault}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
+      <LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
+        <LinearGradientBrush.RelativeTransform>
+          <ScaleTransform ScaleY="-1" CenterY="0.5" />
+        </LinearGradientBrush.RelativeTransform>
+        <LinearGradientBrush.GradientStops>
+          <GradientStop Offset="1.0" Color="{ThemeResource SystemAccentColorLight2}" />
+          <GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
+        </LinearGradientBrush.GradientStops>
+      </LinearGradientBrush>
       <StaticResource x:Key="AppBarButtonBackground" ResourceKey="SystemControlTransparentBrush" />
       <StaticResource x:Key="AppBarButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
       <StaticResource x:Key="AppBarButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />