diff --git a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml
index f7b74b15f8d..37bc22cada3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/App.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/App.xaml
@@ -4,25 +4,25 @@
              xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
              RequiresPointerMode="Auto">
 
-  <Application.Resources>
-    <ResourceDictionary>
-      <!-- Color Resources -->
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Styles/Themes.xaml" />
-        <ResourceDictionary Source="ms-appx:///Styles/Generic.xaml" />
+    <Application.Resources>
+        <ResourceDictionary>
+            <!--  Color Resources  -->
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///Styles/Themes.xaml" />
+                <ResourceDictionary Source="ms-appx:///Styles/Generic.xaml" />
 
-        <!-- WinUI -->
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
-      </ResourceDictionary.MergedDictionaries>
+                <!--  WinUI  -->
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+            </ResourceDictionary.MergedDictionaries>
 
-      <!-- Converters -->
-      <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
+            <!--  Converters  -->
+            <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
 
-      <converters:EmptyStringToObjectConverter x:Key="EmptyStringToObject"
-                                               EmptyValue="Collapsed"
-                                               NotEmptyValue="Visible" />
+            <converters:EmptyStringToObjectConverter x:Key="EmptyStringToObject"
+                                                     EmptyValue="Collapsed"
+                                                     NotEmptyValue="Visible" />
 
-      <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-    </ResourceDictionary>
-  </Application.Resources>
+            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.xaml
index 07dbe5a069d..0b9a08e9a16 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.xaml
@@ -1,8 +1,7 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.SampleApp.Controls"
-    xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="using:Microsoft.Toolkit.Uwp.SampleApp.Controls"
+                    xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Controls">
 
     <Style TargetType="controls:CodeRenderer">
         <Setter Property="Template">
@@ -14,25 +13,24 @@
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid x:Name="Container"
-                                  Grid.RowSpan="2"
-                                  Opacity="0" />
-                        <ScrollViewer
-                                          Grid.Row="0"
-                                          HorizontalScrollMode="Auto"
-                                          HorizontalScrollBarVisibility="Auto">
+                              Grid.RowSpan="2"
+                              Opacity="0" />
+                        <ScrollViewer Grid.Row="0"
+                                      HorizontalScrollBarVisibility="Auto"
+                                      HorizontalScrollMode="Auto">
                             <RichTextBlock Name="codeView"
-                                               FontFamily="Consolas"
-                                               Padding="10" />
+                                           Padding="10"
+                                           FontFamily="Consolas" />
                         </ScrollViewer>
                         <StackPanel Grid.Row="1"
-                                        HorizontalAlignment="Center"
-                                        Orientation="Horizontal">
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
                             <Button x:Name="CopyButton"
-                                        Margin="5"
-                                        Content="Copy" />
+                                    Margin="5"
+                                    Content="Copy" />
                             <Button x:Name="PrintButton"
-                                        Margin="5"
-                                        Content="Print" />
+                                    Margin="5"
+                                    Content="Print" />
                         </StackPanel>
                     </Grid>
                 </ControlTemplate>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 25628323a43..c3982a685b1 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -272,6 +272,12 @@
     <Content Include="Icons\More.png" />
     <Content Include="Icons\Notifications.png" />
     <Content Include="Icons\Services.png" />
+    <Content Include="SamplePages\Animations\Effects\EffectAnimations.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="SamplePages\Graph\LoginButton.png" />
+    <Content Include="SamplePages\Graph\PeoplePicker.png" />
+    <Content Include="SamplePages\Graph\PersonView.png" />
     <Content Include="SamplePages\Primitives\SwitchPresenter.png" />
     <Content Include="SamplePages\TabbedCommandBar\TabbedCommandBar.png" />
     <Content Include="SamplePages\Animations\Effects\FadeBehavior.png" />
@@ -490,12 +496,6 @@
       <DependentUpon>AutoFocusBehaviorPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="SamplePages\CanvasPathGeometry\GeometryStreamReader.cs" />
-    <Compile Include="SamplePages\ColorPicker\ColorPickerButtonPage.xaml.cs">
-      <DependentUpon>ColorPickerButtonPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SamplePages\ColorPicker\ColorPickerPage.xaml.cs">
-      <DependentUpon>ColorPickerPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\EnumValuesExtension\Animal.cs" />
     <Compile Include="SamplePages\EnumValuesExtension\AnimalToColorConverter.xaml.cs" />
     <Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
@@ -619,6 +619,9 @@
     <Content Include="SamplePages\VisualEffectFactory\VisualEffectFactory.bind" />
     <Content Include="SamplePages\Animations\Activities\InvokeActionsActivityCode.bind" />
     <Content Include="SamplePages\Animations\Activities\StartAnimationActivityCode.bind" />
+    <Content Include="SamplePages\Graph\LoginButtonXaml.bind" />
+    <Content Include="SamplePages\Graph\PeoplePickerXaml.bind" />
+    <Content Include="SamplePages\Graph\PersonViewXaml.bind" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -900,9 +903,6 @@
     <Compile Include="SamplePages\RadialGauge\RadialGaugePage.xaml.cs">
       <DependentUpon>RadialGaugePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\RangeSelector\RangeSelectorPage.xaml.cs">
-      <DependentUpon>RangeSelectorPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="SamplePages\WrapPanel\WrapPanelPage.xaml.cs">
       <DependentUpon>WrapPanelPage.xaml</DependentUpon>
     </Compile>
@@ -956,14 +956,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="SamplePages\ColorPicker\ColorPickerButtonPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="SamplePages\ColorPicker\ColorPickerPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1349,10 +1341,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\RangeSelector\RangeSelectorPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="SamplePages\WrapLayout\WrapLayoutPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs
index a016bccc80d..e35400d752b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs
@@ -21,7 +21,7 @@ public class GitHubRelease
         [JsonPropertyName("name")]
         public string Name { get; set; }
 
-        public string FullName => $"Version {Name.Replace("v", string.Empty)} notes";
+        public string FullName => $"Version {Name.Substring(1)} notes"; // Skip the initial 'v' we put at the front. If we replace all 'v's then we hit 'preview'.
 
         [JsonPropertyName("draft")]
         public bool IsDraft { get; set; }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index eaed8186ef9..805ad0b4383 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -27,6 +27,7 @@
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Media;
 using Microsoft.UI.Xaml;
+using Windows.ApplicationModel;
 using Windows.Foundation.Metadata;
 using Windows.Storage;
 using Windows.Storage.Streams;
@@ -71,7 +72,6 @@ public static async void EnsureCacheLatest()
         }
 
         private string _cachedDocumentation = string.Empty;
-        private string _cachedPath = string.Empty;
 
         internal static async Task<Sample> FindAsync(string category, string name)
         {
@@ -118,7 +118,7 @@ public string CodeUrl
 #if DEBUG
                 _codeUrl = value;
 #else
-                var regex = new Regex("^https://github.com/Microsoft/WindowsCommunityToolkit/(tree|blob)/(?<branch>.+?)/(?<path>.*)");
+                var regex = new Regex("^https://github.com/windows-toolkit/WindowsCommunityToolkit/(tree|blob)/(?<branch>.+?)/(?<path>.*)");
                 var docMatch = regex.Match(value);
 
                 var branch = string.Empty;
@@ -135,7 +135,8 @@ public string CodeUrl
                 }
                 else
                 {
-                    _codeUrl = $"https://github.com/Microsoft/WindowsCommunityToolkit/tree/master/{path}";
+                    var packageVersion = Package.Current.Id.Version.ToFormattedString(3);
+                    _codeUrl = $"https://github.com/Microsoft/WindowsCommunityToolkit/tree/rel/{packageVersion}/{path}";
                 }
 #endif
             }
@@ -149,8 +150,21 @@ public string CodeUrl
 
         public string XamlCode { get; private set; }
 
+        /// <summary>
+        /// Gets or sets the path set in the samples.json pointing to the doc for the sample.
+        /// </summary>
         public string DocumentationUrl { get; set; }
 
+        /// <summary>
+        /// Gets or sets the absolute local doc path for cached file in app.
+        /// </summary>
+        public string LocalDocumentationFilePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the base path segment to the current document location.
+        /// </summary>
+        public string RemoteDocumentationPath { get; set; }
+
         public string Icon { get; set; }
 
         public string BadgeUpdateVersionRequired { get; set; }
@@ -191,32 +205,29 @@ public async Task<string> GetCSharpSourceAsync()
             }
         }
 
-#pragma warning disable SA1009 // Doesn't like ValueTuples.
-        public async Task<(string contents, string path)> GetDocumentationAsync()
-#pragma warning restore SA1009 // Doesn't like ValueTuples.
+        public async Task<string> GetDocumentationAsync()
         {
             if (!string.IsNullOrWhiteSpace(_cachedDocumentation))
             {
-                return (_cachedDocumentation, _cachedPath);
+                return _cachedDocumentation;
             }
 
             var filepath = string.Empty;
             var filename = string.Empty;
-            var localPath = string.Empty;
+            LocalDocumentationFilePath = string.Empty;
 
             var docRegex = new Regex("^" + _docsOnlineRoot + "(?<branch>.+?)/docs/(?<file>.+)");
             var docMatch = docRegex.Match(DocumentationUrl);
             if (docMatch.Success)
             {
                 filepath = docMatch.Groups["file"].Value;
-                filename = Path.GetFileName(filepath);
-                localPath = $"ms-appx:///docs/{Path.GetDirectoryName(filepath)}/";
+                filename = Path.GetFileName(RemoteDocumentationPath);
+                RemoteDocumentationPath = Path.GetDirectoryName(filepath);
+                LocalDocumentationFilePath = $"ms-appx:///docs/{RemoteDocumentationPath}/";
             }
 
 #if !DEBUG // use the docs repo in release mode
-            string modifiedDocumentationUrl = $"{_docsOnlineRoot}master/docs/{filepath}";
-
-            _cachedPath = modifiedDocumentationUrl.Replace(filename, string.Empty);
+            string modifiedDocumentationUrl = $"{_docsOnlineRoot}live/docs/{filepath}";
 
             // Read from Cache if available.
             try
@@ -264,7 +275,6 @@ public async Task<string> GetCSharpSourceAsync()
                     {
                         var result = await localDocsStream.ReadTextAsync(Encoding.UTF8);
                         _cachedDocumentation = ProcessDocs(result);
-                        _cachedPath = localPath;
                     }
                 }
                 catch (Exception)
@@ -272,7 +282,7 @@ public async Task<string> GetCSharpSourceAsync()
                 }
             }
 
-            return (_cachedDocumentation, _cachedPath);
+            return _cachedDocumentation;
         }
 
         /// <summary>
@@ -661,7 +671,7 @@ private static async Task<string> GetDocsSHA()
         {
             try
             {
-                var branchEndpoint = "https://api.github.com/repos/microsoftdocs/uwpcommunitytoolkitdocs/git/refs/heads/live";
+                var branchEndpoint = "https://api.github.com/repos/microsoftdocs/windowscommunitytoolkitdocs/git/refs/heads/live";
 
                 var request = new HttpRequestMessage(HttpMethod.Get, branchEndpoint);
                 request.Headers.Add("User-Agent", "Windows Community Toolkit Sample App");
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Package.appxmanifest b/Microsoft.Toolkit.Uwp.SampleApp/Package.appxmanifest
index c9118ddbe4f..7f74b3e4e90 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Package.appxmanifest
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp uap3">
-  <Identity Name="52b9212c-97a9-4639-9426-3e1ea9c1569e" Publisher="CN=Nikola" Version="6.1.0.0" />
+  <Identity Name="52b9212c-97a9-4639-9426-3e1ea9c1569e" Publisher="CN=Nikola" Version="7.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="52b9212c-97a9-4639-9426-3e1ea9c1569e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Microsoft.Toolkit.Uwp.SampleApp</DisplayName>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
index 84530064626..195b204a818 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
@@ -4,10 +4,10 @@
       xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp"
+      xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       Loaded="Page_Loaded"
       mc:Ignorable="d">
 
@@ -150,7 +150,7 @@
                             <TextBlock Margin="0,20,0,0"
                                        FontSize="14"
                                        Foreground="{ThemeResource Brush-Link-Normal}"
-                                       Text="The Windows Community Toolkit is a collection of helper functions, custom controls, and app services. It simplifies and demonstrates common developer patterns when building experiences for Windows 10."
+                                       Text="The Windows Community Toolkit is a collection of helpers, extensions, and custom controls. It simplifies and demonstrates common developer tasks for building UWP and .NET apps for Windows 10."
                                        TextWrapping="Wrap" />
                         </StackPanel>
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
index e3937fe1c41..554f7d4d790 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs
@@ -273,10 +273,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 
                 if (CurrentSample.HasDocumentation)
                 {
-#pragma warning disable SA1008 // Opening parenthesis must be spaced correctly
-                    var (contents, path) = await CurrentSample.GetDocumentationAsync();
-#pragma warning restore SA1008 // Opening parenthesis must be spaced correctly
-                    documentationPath = path;
+                    var contents = await CurrentSample.GetDocumentationAsync();
                     if (!string.IsNullOrWhiteSpace(contents))
                     {
                         DocumentationTextBlock.Text = contents;
@@ -431,9 +428,15 @@ private async void DocumentationTextBlock_OnLinkClicked(object sender, LinkClick
         {
             TrackingManager.TrackEvent("Link", e.Link);
             var link = e.Link;
-            if (e.Link.EndsWith(".md"))
+            if (link.EndsWith(".md"))
             {
-                link = string.Format("https://docs.microsoft.com/en-us/windows/communitytoolkit/{0}/{1}", CurrentSample.CategoryName.ToLower(), link.Replace(".md", string.Empty));
+                // Link to one of our other documents, so we'll construct the proper link here
+                link = string.Format("https://docs.microsoft.com/windows/communitytoolkit/{0}/{1}", CurrentSample.RemoteDocumentationPath, link.Replace(".md", string.Empty));
+            }
+            else if (link.StartsWith("/"))
+            {
+                // We don't root our links to other docs.microsoft.com pages anymore, so we'll add it here.
+                link = string.Format("https://docs.microsoft.com{0}", link);
             }
 
             if (Uri.TryCreate(link, UriKind.Absolute, out Uri result))
@@ -450,7 +453,7 @@ private async void DocumentationTextBlock_ImageResolving(object sender, ImageRes
             // Determine if the link is not absolute, meaning it is relative.
             if (!Uri.TryCreate(e.Url, UriKind.Absolute, out Uri url))
             {
-                url = new Uri(documentationPath + e.Url);
+                url = new Uri(CurrentSample.LocalDocumentationFilePath + e.Url);
             }
 
             if (url.Scheme == "ms-appx")
@@ -698,7 +701,6 @@ public bool UseBackground
 
         private PaneState _paneState;
         private bool _onlyDocumentation;
-        private string documentationPath;
 
         private ThemeListener _themeListener;
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/EffectAnimations.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/EffectAnimations.png
new file mode 100644
index 00000000000..16b49268b3d
Binary files /dev/null and b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Effects/EffectAnimations.png differ
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml
deleted file mode 100644
index 979f2b497d4..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ColorPickerButtonPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-      mc:Ignorable="d">
-
-    <Grid Visibility="Collapsed">
-        <controls:ColorPickerButton />
-        <primitives:ColorPickerSlider />
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml.cs
deleted file mode 100644
index 72e50046b8f..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    /// <summary>
-    /// A page that shows how to use the <see cref="UI.Controls.ColorPicker"/> control.
-    /// </summary>
-    public sealed partial class ColorPickerButtonPage : Page
-    {
-        public ColorPickerButtonPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml
deleted file mode 100644
index f92683d69d6..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ColorPickerPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
-      mc:Ignorable="d"
-      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <Grid
-        Visibility="Collapsed">
-        <controls:ColorPicker />
-        <primitives:ColorPickerSlider />
-    </Grid>
-
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs
deleted file mode 100644
index 15d297b2527..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    /// <summary>
-    /// A page that shows how to use the <see cref="UI.Controls.ColorPicker"/> control.
-    /// </summary>
-    public sealed partial class ColorPickerPage : Page
-    {
-        public ColorPickerPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButton.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/LoginButton.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButton.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/LoginButton.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/LoginButtonXaml.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonXaml.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/LoginButtonXaml.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePicker.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PeoplePicker.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePicker.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PeoplePicker.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PeoplePickerXaml.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerXaml.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PeoplePickerXaml.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonView.png b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PersonView.png
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonView.png
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PersonView.png
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PersonViewXaml.bind
similarity index 100%
rename from Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewXaml.bind
rename to Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Graph/PersonViewXaml.bind
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonPage.xaml
deleted file mode 100644
index ca429d0df3f..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.LoginButtonPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:providers="using:Microsoft.Toolkit.Graph.Providers"
-      xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"
-      mc:Ignorable="d">
-
-    <Interactivity:Interaction.Behaviors>
-        <!--<providers:MockProviderBehavior SignedIn="False"/>-->
-    </Interactivity:Interaction.Behaviors>
-
-    <!--  Shallow Copy  -->
-    <Grid>
-        <!--<wgt:LoginButton />-->
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonPage.xaml.cs
deleted file mode 100644
index 63479a471c4..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LoginButton/LoginButtonPage.xaml.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class LoginButtonPage : Page, IXamlRenderListener
-    {
-        public LoginButtonPage()
-        {
-            InitializeComponent();
-        }
-
-        public void OnXamlRendered(FrameworkElement control)
-        {
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerPage.xaml
deleted file mode 100644
index c4da0eaa5ae..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerPage.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.PeoplePickerPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"
-      mc:Ignorable="d">
-    <Page.Resources>
-        <converters:EmptyObjectToObjectConverter x:Key="NullToVisibilityConverter"
-                                                 EmptyValue="Collapsed"
-                                                 NotEmptyValue="Visible" />
-    </Page.Resources>
-    <!--  Shallow Copy  -->
-    <Grid>
-        <!--<wgt:PeoplePicker/>-->
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerPage.xaml.cs
deleted file mode 100644
index 358d55c7412..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PeoplePicker/PeoplePickerPage.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    /// <summary>
-    /// A page that shows how to use the opacity behavior.
-    /// </summary>
-    public sealed partial class PeoplePickerPage : Page, IXamlRenderListener
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PeoplePickerPage"/> class.
-        /// </summary>
-        public PeoplePickerPage()
-        {
-            InitializeComponent();
-        }
-
-        public void OnXamlRendered(FrameworkElement control)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewPage.xaml
deleted file mode 100644
index fc19d88e848..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewPage.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.PersonViewPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:wgt="using:Microsoft.Toolkit.Graph.Controls"
-      mc:Ignorable="d">
-    <!--  Shallow Copy  -->
-    <Grid>
-        <!--<wgt:PersonView/>-->
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewPage.xaml.cs
deleted file mode 100644
index 03a794dd610..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PersonView/PersonViewPage.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Windows.UI.Xaml;
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class PersonViewPage : IXamlRenderListener
-    {
-        public PersonViewPage()
-        {
-            InitializeComponent();
-        }
-
-        public void OnXamlRendered(FrameworkElement control)
-        {
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorPage.xaml
deleted file mode 100644
index 9b3903d4ea6..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorPage.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.RangeSelectorPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-	<!-- Shallow Copy -->
-    <Page.Resources>
-        <converters:StringFormatConverter x:Key="StringFormatConverter" />
-    </Page.Resources>
-
-    <Grid Visibility="Collapsed">
-            <controls:RangeSelector  />
-    </Grid>
-</Page>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorPage.xaml.cs
deleted file mode 100644
index 7ebf26cf880..00000000000
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorPage.xaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
-{
-    public sealed partial class RangeSelectorPage
-    {
-        public RangeSelectorPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
index 8577def2b8d..2a74f960039 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml
@@ -11,6 +11,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
       xmlns:mediaactions="using:Microsoft.Xaml.Interactions.Media"
+      xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
       xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers"
       xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -20,8 +21,9 @@
     <!--  Put a copy of any controls/resources required for XAML Parsing within XAML Only Samples  -->
     <!--  This page is never loaded by the app, but used to trick the compiler...  -->
     <Page.Resources>
-        <converters:VisibilityToBoolConverter x:Key="VisibilityBoolConverter" />
         <converters:BoolToVisibilityConverter x:Key="BoolVisibilityConverter" />
+        <converters:VisibilityToBoolConverter x:Key="VisibilityBoolConverter" />
+        <converters:StringFormatConverter x:Key="StringFormatConverter" />
         <triggers:CompareStateTrigger x:Key="CompareStateTrigger" />
         <triggers:IsEqualStateTrigger x:Key="IsEqualStateTrigger" />
         <triggers:IsNotEqualStateTrigger x:Key="IsNotEqualStateTrigger" />
@@ -30,6 +32,10 @@
         <triggers:UserHandPreferenceStateTrigger x:Key="UserHandPreferenceStateTrigger" />
         <triggers:UserInteractionModeStateTrigger x:Key="UserInteractionModeStateTrigger" />
         <behaviors:StartAnimationAction x:Key="StartAnimationAction" />
+        <controls:ColorPicker x:Key="ColorPicker" />
+        <controls:ColorPickerButton x:Key="ColorPickerButton" />
+        <primitives:ColorPickerSlider x:Key="ColorPickerSlider" />
+        <controls:RangeSelector x:Key="RangeSelector" />
         <TextBox x:Key="TextBoxExtensions">
             <ui:TextBoxExtensions.SurfaceDialOptions>
                 <ui:SurfaceDialOptions />
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
index 70cb74a12d9..766ba4b922f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json
@@ -36,23 +36,21 @@
       },
       {
         "Name": "ColorPicker",
-        "Type": "ColorPickerPage",
         "Subcategory": "Input",
         "About": "An improved color picker control providing more options to select colors.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker",
-        "XamlCodeFile": "ColorPickerXaml.bind",
+        "XamlCodeFile": "/SamplePages/ColorPicker/ColorPickerXaml.bind",
         "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPicker.md"
       },
       {
         "Name": "ColorPickerButton",
-        "Type": "ColorPickerButtonPage",
         "Subcategory": "Input",
         "About": "A color picker within a flyout opened by pressing a dropdown button containing the selected color.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker",
         "XamlCodeFile": "/SamplePages/ColorPicker/ColorPickerButtonXaml.bind",
         "Icon": "/SamplePages/ColorPicker/ColorPicker.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPickerButton.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPicker.md"
       },
       {
         "Name": "AdaptiveGridView",
@@ -76,11 +74,10 @@
       },
       {
         "Name": "RangeSelector",
-        "Type": "RangeSelectorPage",
         "Subcategory": "Input",
         "About": "The RangeSelector is a \"double slider\" control for range values.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector",
-        "XamlCodeFile": "RangeSelectorCode.bind",
+        "XamlCodeFile": "/SamplePages/RangeSelector/RangeSelectorCode.bind",
         "Icon": "/SamplePages/RangeSelector/RangeSelector.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/RangeSelector.md"
       },
@@ -386,44 +383,39 @@
         "Icon": "/SamplePages/Eyedropper/Eyedropper.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Eyedropper.md"
       },
-      /* TODO Reintroduce graph controls
       {
         "Name": "LoginButton",
-        "Type": "LoginButtonPage",
         "Subcategory": "Graph",
         "About": "The LoginButton control is a button and flyout to facilitate Microsoft identity platform authentication for AAD or MSA accounts.",
         "CodeUrl": "https://github.com/windows-toolkit/Graph-Controls/tree/master/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton",
-        "XamlCodeFile": "LoginButtonXaml.bind",
-        "Icon": "/SamplePages/LoginButton/LoginButton.png",
+        /*"XamlCodeFile": "/SamplePages/Graph/LoginButtonXaml.bind",*/
+        "Icon": "/SamplePages/Graph/LoginButton.png",
         "BadgeUpdateVersionRequired": "PREVIEW",
         "DeprecatedWarning": "The LoginButton control is in preview. Find out more here: https://aka.ms/wgt",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/controls/LoginButton.md"
       },
       {
         "Name": "PersonView",
-        "Type": "PersonViewPage",
         "Subcategory": "Graph",
         "About": "The PersonView control is used to display a person or contact by using their photo, name, and/or email address from Microsoft Graph.",
         "CodeUrl": "https://github.com/windows-toolkit/Graph-Controls/tree/master/Microsoft.Toolkit.Graph.Controls/Controls/PersonView",
-        "XamlCodeFile": "PersonViewXaml.bind",
-        "Icon": "/SamplePages/PersonView/PersonView.png",
+        /*"XamlCodeFile": "/SamplePages/Graph/PersonViewXaml.bind",*/
+        "Icon": "/SamplePages/Graph/PersonView.png",
         "BadgeUpdateVersionRequired": "PREVIEW",
         "DeprecatedWarning": "The PersonView control is in preview. Find out more here: https://aka.ms/wgt",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/controls/PersonView.md"
       },
       {
         "Name": "PeoplePicker",
-        "Type": "PeoplePickerPage",
         "Subcategory": "Graph",
         "About": "The PeoplePicker Control searchs for people and renders the list of results from Microsoft Graph. By default, the component will search for all people.",
         "CodeUrl": "https://github.com/windows-toolkit/Graph-Controls/tree/master/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker",
-        "XamlCodeFile": "PeoplePickerXaml.bind",
-        "Icon": "/SamplePages/PeoplePicker/PeoplePicker.png",
+        /*"XamlCodeFile": "/SamplePages/Graph/PeoplePickerXaml.bind",*/
+        "Icon": "/SamplePages/Graph/PeoplePicker.png",
         "BadgeUpdateVersionRequired": "PREVIEW",
         "DeprecatedWarning": "The PeoplePicker control is in preview. Find out more here: https://aka.ms/wgt",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/controls/PeoplePicker.md"
       },
-      */
       {
         "Name": "AlignmentGrid",
         "Type": "AlignmentGridPage",
@@ -483,29 +475,31 @@
         "Name": "StartAnimationActivity",
         "Subcategory": "Activities",
         "About": "Activity for Animations to Start another Animation",
+        "Icon": "/Assets/Helpers.png",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Activities",
         "XamlCodeFile": "/SamplePages/Animations/Activities/StartAnimationActivity.bind",
         "CodeFile": "/SamplePages/Animations/Activities/StartAnimationActivityCode.bind",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Fade.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/AnimationSet.md"
       },
       {
         "Name": "InvokeActionsActivity",
         "Subcategory": "Activities",
+        "Icon": "/Assets/Helpers.png",
         "About": "Activity chaining Actions from the Behaviors package into an Animation schedule.",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Behaviors/Animations",
         "CodeFile": "/SamplePages/Animations/Activities/InvokeActionsActivityCode.bind",
         "XamlCodeFile": "/SamplePages/Animations/Activities/InvokeActionsActivity.bind",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Fade.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/AnimationSet.md"
       },
       {
         "Name": "Fade",
-        "Subcategory": "Effect",
+        "Subcategory": "Behavior",
         "About": "Opacity of XAML elements using composition animations",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Animations/Behaviors",
         "CodeFile": "/SamplePages/Animations/Effects/FadeBehaviorCode.bind",
         "XamlCodeFile": "/SamplePages/Animations/Effects/FadeBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Effects/FadeBehavior.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Fade.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/AnimationSet.md"
       },
       {
         "Name": "Scale",
@@ -515,7 +509,7 @@
         "CodeFile": "/SamplePages/Animations/Behaviors/ScaleBehaviorCode.bind",
         "XamlCodeFile": "/SamplePages/Animations/Behaviors/ScaleBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Behaviors/ScaleBehavior.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Scale.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/AnimationSet.md"
       },
       {
         "Name": "Offset",
@@ -525,7 +519,7 @@
         "CodeFile": "/SamplePages/Animations/Behaviors/OffsetBehaviorCode.bind",
         "XamlCodeFile": "/SamplePages/Animations/Behaviors/OffsetBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Behaviors/OffsetBehavior.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Offset.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/AnimationSet.md"
       },
       {
         "Name": "Rotate",
@@ -535,7 +529,7 @@
         "CodeFile": "/SamplePages/Animations/Behaviors/RotateBehaviorCode.bind",
         "XamlCodeFile": "/SamplePages/Animations/Behaviors/RotateBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Behaviors/RotateBehavior.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Rotate.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/AnimationSet.md"
       },
       {
         "Name": "Blur",
@@ -546,7 +540,7 @@
         "XamlCodeFile": "/SamplePages/Animations/Behaviors/BlurBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Behaviors/BlurBehavior.png",
         "BadgeUpdateVersionRequired": "Anniversary Update required",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Blur.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/brushes/PipelineVisualFactory.md"
       },
       {
         "Name": "Saturation",
@@ -557,7 +551,7 @@
         "XamlCodeFile": "/SamplePages/Animations/Behaviors/SaturationBehaviorXaml.bind",
         "Icon": "/SamplePages/Animations/Behaviors/SaturationBehavior.png",
         "BadgeUpdateVersionRequired": "Anniversary Update required",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Saturation.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/brushes/PipelineVisualFactory.md"
       },
       {
         "Name": "FadeHeader",
@@ -587,15 +581,16 @@
         "XamlCodeFile": "ItemsReorderAnimation.bind",
         "Icon": "/SamplePages/ItemsReorderAnimation/ItemsReorderAnimation.png",
         "BadgeUpdateVersionRequired": "Anniversary Update required",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ReorderGrid.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ItemsReorderAnimation.md"
       },
       {
         "Name": "EffectAnimations",
         "Subcategory": "Effect",
         "About": "Effects from the Media package that can be animated from an AnimationSet schedule.",
+        "Icon": "/SamplePages/Animations/Effects/EffectAnimations.png",
         "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Media/Animations",
         "XamlCodeFile": "/SamplePages/Animations/Effects/EffectAnimations.bind",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Fade.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/AnimationSet.md"
       },
       {
         "Name": "Implicit Animations",
@@ -606,7 +601,7 @@
         "Icon": "/SamplePages/Implicit Animations/ImplicitAnimations.png",
         "XamlCodeFile": "ImplicitAnimationsCode.bind",
         "BadgeUpdateVersionRequired": "Creators Update required",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ImplicitAnimations.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ImplicitAnimationSet.md"
       },
       {
         "Name": "Connected Animations",
@@ -622,60 +617,6 @@
       }
     ]
   },
-  {
-    "Name": "WPF and WinForms Controls",
-    "Samples": [
-      {
-        "Name": "WindowsXamlHost",
-        "About": "This guide helps you add UWP XAML controls to your WPF",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/wpf-winforms/WindowsXamlHost.md",
-        "CodeUrl": "https://github.com/windows-toolkit/Microsoft.Toolkit.Win32"
-      },
-      {
-        "Name": "WebView",
-        "About": "The Windows Community Toolkit provides a version of the UWP web view control that can be used in WPF and Windows Forms applications. This control embeds a view into your application that renders web content using the Microsoft Edge rendering engine",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/wpf-winforms/WebView.md",
-        "CodeUrl": "https://github.com/windows-toolkit/Microsoft.Toolkit.Win32"
-      },
-      {
-        "Name": "WebViewCompatible",
-        "About": "The Windows Community Toolkit provides a version of the UWP web view control that can be used in WPF and Windows Forms applications. This control embeds a view into your application that renders web content in one of two ways. For client environments that support the WebViewControl (Windows 10), that implementation is used. For legacy systems, System.Windows.Controls.WebBrowser implements the view",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/wpf-winforms/WebViewCompatible.md",
-        "CodeUrl": "https://github.com/windows-toolkit/Microsoft.Toolkit.Win32"
-      },
-      {
-        "Name": "InkCanvas",
-        "About": "This control is a wrapper to enable use of the UWP InkCanvas control in Windows Forms or WPF",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/wpf-winforms/InkCanvas.md",
-        "CodeUrl": "https://github.com/windows-toolkit/Microsoft.Toolkit.Win32"
-      },
-      {
-        "Name": "InkToolbar",
-        "About": "This control is a wrapper to enable use of the UWP InkToolbar control in Windows Forms or WPF",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/wpf-winforms/InkToolbar.md",
-        "CodeUrl": "https://github.com/windows-toolkit/Microsoft.Toolkit.Win32"
-      },
-      {
-        "Name": "MediaPlayerElement",
-        "About": "This control is a wrapper to enable use of the UWP MediaPlayerElement control in Windows Forms or WPF",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/wpf-winforms/MediaPlayerElement.md",
-        "CodeUrl": "https://github.com/windows-toolkit/Microsoft.Toolkit.Win32"
-      },
-      {
-        "Name": "MapControl",
-        "About": "This control is a wrapper to enable use of the UWP MapControl control in Windows Forms or WPF",
-        "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/wpf-winforms/MapControl.md",
-        "CodeUrl": "https://github.com/windows-toolkit/Microsoft.Toolkit.Win32"
-      }
-    ]
-  },
   {
     "Name": "Services",
     "Icon": "Icons/Services.png",
@@ -783,10 +724,10 @@
         "Type": "DispatcherQueueHelperPage",
         "Subcategory": "Developer",
         "About": "Allows easy interaction with Windows Runtime message dispatcher queue for multi-threaded scenario (I.E: Run code on UI thread).",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp/Helpers/DispatcherQueueHelper.cs",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp/Extensions/DispatcherQueueExtensions.cs",
         "CodeFile": "DispatcherQueueHelperCode.bind",
         "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/DispatcherQueueHelper.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/DispatcherQueueExtensions.md"
       },
       {
         "Name": "AdvancedCollectionView",
@@ -803,7 +744,7 @@
         "Type": "ObservableGroupPage",
         "Subcategory": "Data",
         "About": "Allows you to easily create observable grouped collections.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit/ObservableGroup",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit/Collections",
         "CodeFile": "ObservableGroup.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/collections/ObservableGroups.md"
@@ -824,6 +765,7 @@
         "Type": "ThemeListenerPage",
         "Subcategory": "Systems",
         "About": "The ThemeListener allows you to keep track of changes to the System Theme.",
+        "CodeUrl" : "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Helpers/ThemeListener.cs",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/ThemeListener.md"
       },
@@ -842,37 +784,38 @@
         "Type": "ViewportBehaviorPage",
         "Subcategory": "Systems",
         "About": "Behavior for listening element enter or exit viewport",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Behaviors",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Behaviors/Viewport",
         "CodeFile": "ViewportBehaviorCode.bind",
         "XamlCodeFile": "ViewportBehaviorXaml.bind",
         "Icon": "/SamplePages/ViewportBehavior/ViewportBehavior.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/ViewportBehavior.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/ViewportBehavior.md"
       },
       {
         "Name": "AutoFocusBehavior",
         "Type": "AutoFocusBehaviorPage",
         "Subcategory": "Systems",
         "About": "Behavior to automatically set the focus on a control when it loads",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Behaviors/",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI.Behaviors/Focus/AutoFocusBehavior.cs",
         "XamlCodeFile": "AutoFocusBehaviorXaml.bind",
         "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/AutoFocusBehavior.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/FocusBehaviors.md"
       },
       {
         "Name": "FocusBehavior",
         "Type": "FocusBehaviorPage",
         "Subcategory": "Systems",
         "About": "Behavior to automatically set the focus on the first control which accepts it",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Behaviors/",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI.Behaviors/Focus/FocusBehavior.cs",
         "CodeFile": "FocusBehaviorXaml.bind",
         "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/FocusBehavior.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/FocusBehaviors.md"
       },
       {
         "Name": "Win2d Path Mini Language Parser",
         "Type": "CanvasPathGeometryPage",
         "Subcategory": "Parser",
         "About": "CanvasPathGeometry class allows you to convert Win2d Path Mini Language string to CanvasGeometry, Brushes, CanvasStrokes or CanvasStrokeStyles.",
+        "CodeUrl" : "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Media/Geometry",
         "Icon": "/SamplePages/CanvasPathGeometry/CanvasPathGeometry.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/parsers/CanvasPathGeometry.md"
       },
@@ -881,7 +824,7 @@
         "Type": "LiveTilePage",
         "Subcategory": "Notifications",
         "About": "This shows how to update a Live Tile with a rich Adaptive notification.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications/Tiles",
         "CodeFile": "LiveTileCode.bind",
         "Icon": "/SamplePages/LiveTile/LiveTile.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/notifications/NotificationsOverview.md"
@@ -891,7 +834,7 @@
         "Type": "ToastPage",
         "Subcategory": "Notifications",
         "About": "This shows how to send a Toast notification.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Notifications/Toasts",
         "CodeFile": "ToastCode.bind",
         "Icon": "/SamplePages/Toast/Toast.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/notifications/NotificationsOverview.md"
@@ -910,6 +853,7 @@
         "Name": "Guard APIs",
         "Subcategory": "Developer",
         "About": "The Guard APIs can be used to validate method arguments in a streamlined manner, which is also faster, less verbose, more expressive and less error prone than manually writing checks and throwing exceptions.",
+        "CodeUrl" : "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Diagnostics",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/developer-tools/Guard.md"
       },
@@ -917,14 +861,23 @@
         "Name": "High Performance APIs",
         "Subcategory": "Developer",
         "About": "The High Performance package contains a set of APIs that are heavily focused on optimization. All the new APIs have been carefully crafted to achieve the best possible performance when using them, either through reduced memory allocation, micro-optimizations at the assembly level, or by structuring the APIs in a way that facilitates writing performance oriented code in general.",
+        "CodeUrl" : "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.HighPerformance",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/high-performance/Introduction.md"
       },
+      {
+        "Name": "MVVM Toolkit",
+        "Subcategory": "Developer",
+        "About": "The MVVM Toolkit package is a modern, fast, and modular MVVM library for .NET Standard 2.0.",
+        "Icon": "/Assets/Helpers.png",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/mvvm/Introduction.md",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Mvvm"
+      },
       {
         "Name": "CompareStateTrigger",
         "Subcategory": "State Triggers",
         "About": "Enables a state if the value is equal to, greater than, or less than another value",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/CompareStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/CompareStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -933,7 +886,7 @@
         "Name": "IsEqualStateTrigger",
         "Subcategory": "State Triggers",
         "About": "Enables a state if the value is equal to another value",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/IsEqualStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/IsEqualStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -943,7 +896,7 @@
         "Type": "FullScreenModeStateTriggerPage",
         "Subcategory": "State Triggers",
         "About": "Trigger for switching when in full screen mode",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/FullScreenModeStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/FullScreenModeStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -953,7 +906,7 @@
         "Type": "IsNullOrEmptyStateTriggerPage",
         "Subcategory": "State Triggers",
         "About": "Enables a state if an Object is null or a String/IEnumerable is empty",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/IsNullOrEmptyStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/IsNullOrEmptyStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -962,7 +915,7 @@
         "Name": "NetworkConnectionStateTrigger",
         "Subcategory": "State Triggers",
         "About": "Trigger for switching when the network availability changes",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/NetworkConnectionStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/NetworkConnectionStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -971,7 +924,7 @@
         "Name": "IsNotEqualStateTrigger",
         "Subcategory": "State Triggers",
         "About": "Enables a state if the value is not equal to another value",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/IsNotEqualStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/IsNotEqualStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -980,7 +933,7 @@
         "Name": "RegexStateTrigger",
         "Subcategory": "State Triggers",
         "About": "Enables a state if the regex expression is true for a given string value",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/RegexStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/RegexStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -989,7 +942,7 @@
         "Name": "UserHandPreferenceStateTrigger",
         "Subcategory": "State Triggers",
         "About": "Trigger for switching UI based on whether the user favours their left or right hand.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/UserHandPreferenceStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/UserHandPreferenceStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -998,7 +951,7 @@
         "Name": "UserInteractionModeStateTrigger",
         "Subcategory": "State Triggers",
         "About": "Trigger for switching when the User interaction mode changes (tablet mode)",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Triggers",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Triggers/UserInteractionModeStateTrigger.cs",
         "XamlCodeFile": "/SamplePages/Triggers/UserInteractionModeStateTrigger.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/helpers/Triggers.md"
@@ -1095,11 +1048,11 @@
       {
         "Name": "VisualEffectFactory",
         "About": "A composition pipeline which can render any custom Win2D/Composition effects chain directly on a Composition visual.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Media/Brushes/PipelineBrush.cs",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Media/Visuals",
         "XamlCodeFile": "VisualEffectFactory.bind",
         "Icon": "/SamplePages/PipelineBrush/PipelineBrush.png",
         "ApiCheck": "Windows.UI.Xaml.Media.XamlCompositionBrushBase",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/brushes/PipelineBrush.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/brushes/PipelineVisualFactory.md"
       },
       {
         "Name": "AcrylicBrush",
@@ -1131,7 +1084,7 @@
         "Name": "ListViewExtensions",
         "Type": "ListViewExtensionsPage",
         "About": "Extensions for all controls that inherit from ListViewBase like ListView.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewExtensions",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase",
         "XamlCodeFile": "ListViewExtensionsCode.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/ListViewExtensions.md"
@@ -1149,7 +1102,7 @@
         "Name": "TextBoxMask",
         "Type": "TextBoxMaskPage",
         "About": "TextBox Mask property allows a user to more easily enter fixed width text in TextBox control where you would like them to enter the data in a certain format",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxMask",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBox",
         "XamlCodeFile": "TextBoxMask.bind",
         "Icon": "/SamplePages/TextBoxMask/TextBoxMask.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/TextBoxMask.md"
@@ -1158,7 +1111,7 @@
         "Name": "Mouse",
         "Type": "MouseCursorPage",
         "About": "Mouse.Cursor attached property enables you to easily change the mouse cursor over specific Framework elements.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/Mouse",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/FrameworkElement/FrameworkElementExtensions.Mouse.cs",
         "XamlCodeFile": "MouseCursorPage.bind",
         "Icon": "/SamplePages/Mouse/MouseCursor.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/MouseCursor.md"
@@ -1167,7 +1120,7 @@
         "Name": "TextBoxRegex",
         "Type": "TextBoxRegexPage",
         "About": "TextBoxRegex helps developer to validate a TextBox with a regular expression using the Regex property.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBoxRegEx",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBox",
         "XamlCodeFile": "TextBoxRegex.bind",
         "Icon": "/SamplePages/TextBoxRegex/TextBoxRegex.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/TextBoxRegex.md"
@@ -1175,7 +1128,7 @@
       {
         "Name": "SurfaceDialTextbox",
         "About": "Enables support for Surface Dial on any given Textbox. Rotate the Dial to change the numeric value of the Textbox.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/TextBox/TextBoxExtensions.SurfaceDial.cs",
         "XamlCodeFile": "/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind",
         "Icon": "/SamplePages/SurfaceDialTextbox/SurfaceDialTextbox.png",
         "BadgeUpdateVersionRequired": "Anniversary Update required",
@@ -1185,7 +1138,7 @@
         "Name": "Visual Extensions",
         "Type": "VisualExtensionsPage",
         "About": "Attached properties to modify object visual properties through XAML",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/Visual",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/VisualExtensions.cs",
         "XamlCodeFile": "VisualExtensionsCode.bind",
         "Icon": "/SamplePages/Visual Extensions/VisualExtensions.png",
         "BadgeUpdateVersionRequired": "Creators Update required",
@@ -1204,7 +1157,7 @@
         "Name": "ClipToBounds",
         "Type": "ClipToBoundsPage",
         "About": "Extension to clip the UIElement inner controls inside its bounds.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/UIElement",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/UIElementExtensions.cs",
         "XamlCodeFile": "ClipToBoundsCode.bind",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/UIElementExtensions.md"
@@ -1213,7 +1166,7 @@
         "Name": "StringExtensions",
         "Type": "StringExtensionsPage",
         "About": "String Extensions to validate strings",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit/Extensions",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit/Extensions/StringExtensions.cs",
         "Icon": "/Assets/Helpers.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/StringExtensions.md"
       },
@@ -1231,6 +1184,7 @@
         "Name": "OnDevice",
         "Type": "OnDevicePage",
         "About": "The OnDevice markup extension allows you to customize UI appearance on a per-DeviceFamily basis.",
+        "CodeUrl" : "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/OnDeviceExtension.cs",
         "Icon": "/SamplePages/OnDevice/OnDevice.png",
         "XamlCodeFile": "OnDeviceXaml.bind",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/OnDeviceMarkup.md"
@@ -1239,18 +1193,20 @@
         "Name": "IconExtensions",
         "Type": "IconExtensionsPage",
         "About": "Markup extensions to easily create various types of icons.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/FontIconExtension",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/Markup",
         "XamlCodeFile": "IconExtensionsXaml.bind",
         "Icon": "/Assets/Helpers.png",
-        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/IconExtensions.md"
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/IconMarkupExtensions.md"
       },
       {
         "Name": "EnumValuesExtension",
         "Type": "EnumValuesExtensionPage",
         "About": "The EnumValuesExtension markup extension allows you to easily retrieve a collection of all values from an enum type.",
+        "CodeUrl" : "https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/Microsoft.Toolkit.Uwp.UI/Extensions/Markup/EnumValuesExtension.cs",
         "Icon": "/Assets/Helpers.png",
         "XamlCodeFile": "EnumValuesExtensionXaml.bind",
-        "CodeFile": "EnumValuesExtensionCode.bind"
+        "CodeFile": "EnumValuesExtensionCode.bind",
+        "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/EnumValuesExtension.md"
       }
     ]
   },
@@ -1264,6 +1220,7 @@
         "About": "Demonstrate the properties and events of the Gaze Interaction library",
         "XamlCodeFile": "GazeInteractionXaml.bind",
         "CodeFile": "GazeInteractionCode.bind",
+        "CodeUrl" : "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.Input.GazeInteraction",
         "Icon": "/SamplePages/GazeInteraction/GazeInteraction.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/gaze/GazeInteractionLibrary.md",
         "ApiCheck": "Windows.Devices.Input.Preview.GazeInputSourcePreview"
@@ -1276,7 +1233,8 @@
         "XamlCodeFile": "GazeTracingXaml.bind",
         "CodeFile": "GazeTracingCode.bind",
         "Icon": "/SamplePages/GazeTracing/GazeTracing.png",
-        "ApiCheck": "Windows.Devices.Input.Preview.GazeInputSourcePreview"
+        "ApiCheck": "Windows.Devices.Input.Preview.GazeInputSourcePreview",
+        "DocumentationUrl" : "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/gaze/GazeInteractionLibrary.md"
       }
     ]
   }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
index 92787cb3450..eac023de9ae 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
@@ -124,15 +124,7 @@ SamplePickerGridView.ItemsSource is Sample[] currentSamples &&
 
         private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)
         {
-            //// Temp Workaround for WinUI Bug https://github.com/microsoft/microsoft-ui-xaml/issues/2520
-            var invokedItem = args.InvokedItem;
-            if (invokedItem is FrameworkElement fe && fe.DataContext is SampleCategory cat2)
-            {
-                invokedItem = cat2;
-            }
-            //// End Workaround - args.InvokedItem
-
-            if (invokedItem is SampleCategory category)
+            if (args.InvokedItem is SampleCategory category)
             {
                 if (SamplePickerGrid.Visibility != Visibility.Collapsed && _selectedCategory == category)
                 {
@@ -149,13 +141,16 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
                     dispatcherQueue.EnqueueAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
                 }
             }
-            else if (args.IsSettingsInvoked)
+        }
+
+        private void SettingsTopNavPaneItem_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            // Can't get FooterMenuItems to work properly right now with ItemInvoked above, bug?
+            // For now just hard-code an event.
+            HideSamplePicker();
+            if (NavigationFrame.CurrentSourcePageType != typeof(About))
             {
-                HideSamplePicker();
-                if (NavigationFrame.CurrentSourcePageType != typeof(About))
-                {
-                    NavigateToSample(null);
-                }
+                NavigateToSample(null);
             }
         }
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
index a107b2e94fa..767cbeae87e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
@@ -4,10 +4,10 @@
       xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
+      xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       xmlns:winui="using:Microsoft.UI.Xaml.Controls"
       ui:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}"
       ui:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}"
@@ -29,13 +29,12 @@
     </Page.Resources>
     <Grid>
         <winui:NavigationView x:Name="NavView"
-                              IsSettingsVisible="True"
+                              IsSettingsVisible="False"
                               ItemInvoked="NavView_ItemInvoked"
                               MenuItemTemplate="{StaticResource CategoryTemplate}"
                               PaneDisplayMode="Top"
-                              SelectionFollowsFocus="Disabled"
-                              Style="{StaticResource ToolkitNavViewStyle}">
-            <winui:NavigationView.PaneFooter>
+                              SelectionFollowsFocus="Disabled">
+            <winui:NavigationView.AutoSuggestBox>
                 <AutoSuggestBox x:Name="SearchBox"
                                 MinWidth="150"
                                 VerticalAlignment="Center"
@@ -43,6 +42,13 @@
                                 QueryIcon="Find"
                                 QuerySubmitted="SearchBox_QuerySubmitted"
                                 TextChanged="SearchBox_TextChanged" />
+            </winui:NavigationView.AutoSuggestBox>
+            <winui:NavigationView.PaneFooter>
+                <!--  Not sure why we can't get to display properly with FooterMenuItems  -->
+                <winui:NavigationViewItem x:Name="SettingsTopNavPaneItem"
+                                          Icon="Home"
+                                          PointerReleased="SettingsTopNavPaneItem_PointerReleased"
+                                          Style="{ThemeResource MUX_NavigationViewSettingsItemStyleWhenOnTopPane}" />
             </winui:NavigationView.PaneFooter>
             <Grid>
                 <winui:ParallaxView x:Name="Parallax"
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Styles/Generic.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Styles/Generic.xaml
index ff5a58a9b4f..79c87297241 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Styles/Generic.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Styles/Generic.xaml
@@ -1,10 +1,9 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:toolkitControls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
-    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
-    xmlns:winui="using:Microsoft.UI.Xaml.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
+                    xmlns:toolkitControls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+                    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
+                    xmlns:winui="using:Microsoft.UI.Xaml.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///Controls/CodeRenderer.xaml" />
@@ -14,66 +13,66 @@
 
     <!--  Styles  -->
     <Style x:Key="AboutHyperlinkButtonStyle"
-               TargetType="HyperlinkButton">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{ThemeResource Brush-Link-Normal}" />
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="0,0,0,10" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="FontFamily" Value="Segoe UI" />
-            <Setter Property="FontSize" Value="12" />
-            <Setter Property="UseSystemFocusVisuals" Value="True" />
-            <Setter Property="FocusVisualMargin" Value="-3" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="HyperlinkButton">
-                        <Grid x:Name="RootGrid">
-                            <ContentPresenter x:Name="ContentPresenter"
-                                              Padding="{TemplateBinding Padding}"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              AutomationProperties.AccessibilityView="Raw"
-                                              Background="{TemplateBinding Background}"
-                                              BorderBrush="{TemplateBinding BorderBrush}"
-                                              BorderThickness="{TemplateBinding BorderThickness}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              ContentTransitions="{TemplateBinding ContentTransitions}" />
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal" />
-                                    <VisualState x:Name="PointerOver">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                           Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Pressed">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                           Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Disabled" />
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
+           TargetType="HyperlinkButton">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{ThemeResource Brush-Link-Normal}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Margin" Value="0,0,0,10" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="HyperlinkButton">
+                    <Grid x:Name="RootGrid">
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          AutomationProperties.AccessibilityView="Raw"
+                                          Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <Style x:Key="TooltipFlyoutPresenterStyle"
-               TargetType="FlyoutPresenter">
+           TargetType="FlyoutPresenter">
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
@@ -90,22 +89,22 @@
             <Setter.Value>
                 <ControlTemplate TargetType="FlyoutPresenter">
                     <Border Margin="5"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}">
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
                         <ScrollViewer x:Name="ScrollViewer"
-                                          AutomationProperties.AccessibilityView="Raw"
-                                          HorizontalScrollBarVisibility="Disabled"
-                                          HorizontalScrollMode="Disabled"
-                                          VerticalScrollBarVisibility="Auto"
-                                          VerticalScrollMode="Auto"
-                                          ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
+                                      AutomationProperties.AccessibilityView="Raw"
+                                      HorizontalScrollBarVisibility="Disabled"
+                                      HorizontalScrollMode="Disabled"
+                                      VerticalScrollBarVisibility="Auto"
+                                      VerticalScrollMode="Auto"
+                                      ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
                             <ContentPresenter Margin="{TemplateBinding Padding}"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  Content="{TemplateBinding Content}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                  ContentTransitions="{TemplateBinding ContentTransitions}" />
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTransitions="{TemplateBinding ContentTransitions}" />
                         </ScrollViewer>
                     </Border>
                 </ControlTemplate>
@@ -115,8 +114,9 @@
 
     <DataTemplate x:Key="PivotHeaderTemplate">
         <Grid>
-            <TextBlock FontSize="16" FontWeight="SemiBold"
-                           Text="{Binding}" />
+            <TextBlock FontSize="16"
+                       FontWeight="SemiBold"
+                       Text="{Binding}" />
         </Grid>
     </DataTemplate>
 
@@ -131,11 +131,14 @@
         <Setter Property="UseSystemFocusVisuals" Value="True" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="Transitions" Value="{x:Null}"></Setter>
+        <Setter Property="Transitions" Value="{x:Null}" />
         <Setter Property="animations:Implicit.ShowAnimations">
             <Setter.Value>
                 <animations:ImplicitAnimationSet>
-                    <animations:OpacityAnimation Duration="0:0:0.2" Delay="0:0:0.2" From="0" To="1"/>
+                    <animations:OpacityAnimation Delay="0:0:0.2"
+                                                 From="0"
+                                                 To="1"
+                                                 Duration="0:0:0.2" />
                 </animations:ImplicitAnimationSet>
             </Setter.Value>
         </Setter>
@@ -143,34 +146,32 @@
             <Setter.Value>
                 <ControlTemplate TargetType="GridViewItem">
                     <Grid x:Name="LayoutRoot"
-                              Background="{TemplateBinding Background}"
-                              Control.IsTemplateFocusTarget="True">
+                          Background="{TemplateBinding Background}"
+                          Control.IsTemplateFocusTarget="True">
                         <!--  Wrap SelectionIndicator in a grid so that its offset is 0,0 - this enables the offset animation.  -->
                         <Grid HorizontalAlignment="Stretch"
-                                  VerticalAlignment="Bottom">
+                              VerticalAlignment="Bottom">
                             <Rectangle x:Name="SelectionIndicator"
-                                           Height="3"
-                                           Fill="{ThemeResource SystemControlHighlightAccentBrush}"
-                                           Opacity="0.0" />
+                                       Height="3"
+                                       Fill="{ThemeResource SystemControlHighlightAccentBrush}"
+                                       Opacity="0.0" />
                         </Grid>
                         <ContentPresenter x:Name="ContentPresenter"
-                                              Grid.Column="1"
-                                              Margin="{TemplateBinding Padding}"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              ContentTransitions="{TemplateBinding ContentTransitions}" />
+                                          Grid.Column="1"
+                                          Margin="{TemplateBinding Padding}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="PointerStates">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="PointerOver">
-                                    <VisualState.Setters>
-                                    </VisualState.Setters>
+                                    <VisualState.Setters />
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
-                                    <VisualState.Setters>
-                                    </VisualState.Setters>
+                                    <VisualState.Setters />
                                 </VisualState>
                                 <VisualState x:Name="Selected">
                                     <VisualState.Setters>
@@ -191,8 +192,7 @@
                             <VisualStateGroup x:Name="DisabledStates">
                                 <VisualState x:Name="Enabled" />
                                 <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                    </VisualState.Setters>
+                                    <VisualState.Setters />
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
@@ -203,7 +203,7 @@
     </Style>
 
     <Style x:Key="SampleAppHeaderToggleButtonStyle"
-               TargetType="ToggleButton">
+           TargetType="ToggleButton">
         <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
@@ -219,82 +219,82 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <Grid x:Name="RootGrid"
-                              Background="{TemplateBinding Background}">
+                          Background="{TemplateBinding Background}">
                         <SymbolIcon x:Name="Arrow"
-                                        Width="40"
-                                        RenderTransformOrigin="0.5,0.5"
-                                        Symbol="Forward"
-                                        Visibility="Collapsed">
+                                    Width="40"
+                                    RenderTransformOrigin="0.5,0.5"
+                                    Symbol="Forward"
+                                    Visibility="Collapsed">
                             <SymbolIcon.RenderTransform>
                                 <RotateTransform />
                             </SymbolIcon.RenderTransform>
                         </SymbolIcon>
 
                         <ContentPresenter x:Name="ContentPresenter"
-                                              Padding="{TemplateBinding Padding}"
-                                              HorizontalAlignment="Left"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                              AutomationProperties.AccessibilityView="Raw"
-                                              BorderBrush="{TemplateBinding BorderBrush}"
-                                              BorderThickness="{TemplateBinding BorderThickness}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              ContentTransitions="{TemplateBinding ContentTransitions}"
-                                              RenderTransformOrigin="0.5,0.5" />
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalAlignment="Left"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          AutomationProperties.AccessibilityView="Raw"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTransitions="{TemplateBinding ContentTransitions}"
+                                          RenderTransformOrigin="0.5,0.5" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal">
                                     <Storyboard>
                                         <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="0.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="0.0"
+                                                         Duration="0:0:0.1" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                           Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
-                                                                           Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="0.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="0.0"
+                                                         Duration="0:0:0.1" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                           Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
-                                                                           Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightBaseHighBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="0.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="0.0"
+                                                         Duration="0:0:0.1" />
                                         <PointerDownThemeAnimation Storyboard.TargetName="RootGrid" />
                                     </Storyboard>
                                 </VisualState>
@@ -302,73 +302,73 @@
                                     <Storyboard>
 
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
-                                                                           Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                           Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="0.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="0.0"
+                                                         Duration="0:0:0.1" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Checked">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
-                                                                           Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                           Storyboard.TargetProperty="Foreground">
+                                                                       Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightAltChromeWhiteBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="90.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="90.0"
+                                                         Duration="0:0:0.1" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="CheckedPointerOver">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                           Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="90.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="90.0"
+                                                         Duration="0:0:0.1" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="CheckedPressed">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                           Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlHighlightBaseMediumLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlHighlightBaseMediumLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="90.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="90.0"
+                                                         Duration="0:0:0.1" />
                                         <PointerDownThemeAnimation Storyboard.TargetName="RootGrid" />
                                     </Storyboard>
                                 </VisualState>
@@ -376,10 +376,10 @@
                                     <Storyboard>
 
                                         <DoubleAnimation BeginTime="0:0:0"
-                                                             Storyboard.TargetName="Arrow"
-                                                             Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                                             To="90.0"
-                                                             Duration="0:0:0.1" />
+                                                         Storyboard.TargetName="Arrow"
+                                                         Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                                         To="90.0"
+                                                         Duration="0:0:0.1" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Indeterminate">
@@ -390,9 +390,9 @@
                                 <VisualState x:Name="IndeterminatePointerOver">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                           Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                         <PointerUpThemeAnimation Storyboard.TargetName="RootGrid" />
                                     </Storyboard>
@@ -400,9 +400,9 @@
                                 <VisualState x:Name="IndeterminatePressed">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                           Storyboard.TargetProperty="Background">
+                                                                       Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}" />
+                                                                    Value="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
 
                                         <PointerDownThemeAnimation Storyboard.TargetName="RootGrid" />
@@ -420,55 +420,58 @@
     </Style>
 
     <DataTemplate x:Key="SampleTemplate">
-        <StackPanel Padding="16,28, 16, 10"
-                        Background="Transparent">
+        <StackPanel Padding="16,28,16,10"
+                    Background="Transparent">
             <Grid Width="120"
-                      Height="80"
-                      ui:VisualExtensions.CenterPoint="40,60,0">
+                  Height="80"
+                  ui:VisualExtensions.CenterPoint="40,60,0">
                 <toolkitControls:DropShadowPanel HorizontalContentAlignment="Stretch"
-                                              VerticalContentAlignment="Stretch"
-                                              BlurRadius="30"
-                                              ShadowOpacity="0.6"
-                                              OffsetY="3"
-                                              ui:VisualExtensions.Opacity="0"
-                                              Visibility="Collapsed">
-                    <Border></Border>
+                                                 VerticalContentAlignment="Stretch"
+                                                 ui:VisualExtensions.Opacity="0"
+                                                 BlurRadius="30"
+                                                 OffsetY="3"
+                                                 ShadowOpacity="0.6"
+                                                 Visibility="Collapsed">
+                    <Border />
                 </toolkitControls:DropShadowPanel>
                 <Border Background="{ThemeResource SampleIconBacking}">
-                    <Image x:Name="SampleIcon" Source="{Binding Icon}" />
+                    <Image x:Name="SampleIcon"
+                           Source="{Binding Icon}" />
                 </Border>
             </Grid>
 
-            <Grid Margin="0,8,0,0" Width="120">
+            <Grid Width="120"
+                  Margin="0,8,0,0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
-                    <ColumnDefinition Width="Auto"></ColumnDefinition>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <TextBlock FontSize="12"
-                               FontWeight="Light"
-                               VerticalAlignment="Center"
-                               TextTrimming="CharacterEllipsis"
-                               Text="{Binding Name}" />
-                <Button Opacity="0.6"
-                            Grid.Column="1"
-                            Padding="0"
-                            HorizontalAlignment="Right"
-                            AutomationProperties.Name="Main button"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            TabIndex="0">
-                    <FontIcon VerticalAlignment="Center"
-                                  HorizontalAlignment="Right"
-                                  Margin="10"
-                                  FontFamily="Segoe MDL2 Assets"
-                                  FontSize="10"
-                                  Glyph="&#xE946;" />
+                <TextBlock VerticalAlignment="Center"
+                           FontSize="12"
+                           FontWeight="Light"
+                           Text="{Binding Name}"
+                           TextTrimming="CharacterEllipsis" />
+                <Button Grid.Column="1"
+                        Padding="0"
+                        HorizontalAlignment="Right"
+                        AutomationProperties.Name="Main button"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Opacity="0.6"
+                        TabIndex="0">
+                    <FontIcon Margin="10"
+                              HorizontalAlignment="Right"
+                              VerticalAlignment="Center"
+                              FontFamily="Segoe MDL2 Assets"
+                              FontSize="10"
+                              Glyph="&#xE946;" />
                 </Button>
             </Grid>
         </StackPanel>
     </DataTemplate>
 
-    <Style x:Key="DismissTextBlockButtonStyle" TargetType="ButtonBase">
+    <Style x:Key="DismissTextBlockButtonStyle"
+           TargetType="ButtonBase">
         <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
         <Setter Property="MinWidth" Value="0" />
@@ -477,50 +480,69 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ButtonBase">
-                    <Grid Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}">
+                    <Grid Margin="{TemplateBinding Padding}"
+                          Background="{TemplateBinding Background}">
                         <ContentPresenter x:Name="Text"
-                            Content="{TemplateBinding Content}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Content="{TemplateBinding Content}" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Red" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="Red" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundPointerOver}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBackgroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="DarkRed" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="DarkRed" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundPressed}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBackgroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text"
+                                                                       Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -533,123 +555,127 @@
     </Style>
 
     <Style x:Key="ExceptionNotification"
-        TargetType="toolkitControls:InAppNotification">
-    <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
-    <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
-    <Setter Property="BorderThickness" Value="2" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Bottom" />
-    <Setter Property="MinHeight" Value="55" />
-    <Setter Property="FontSize" Value="13" />
-    <Setter Property="Visibility" Value="Collapsed" />
-    <Setter Property="RenderTransformOrigin" Value="0.5,1" />
-    <Setter Property="Margin" Value="20,0" />
-    <Setter Property="Padding" Value="15,10,25,10" />
-    <Setter Property="MaxWidth" Value="1200" />
-    <Setter Property="Template">
-        <Setter.Value>
-            <ControlTemplate TargetType="toolkitControls:InAppNotification">
-                <Grid>
-                    <Grid x:Name="RootGrid"
-                            MaxWidth="{TemplateBinding MaxWidth}"
-                            Margin="{TemplateBinding Margin}"
-                            RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
-                            Visibility="{TemplateBinding Visibility}">
-                        <Grid.RenderTransform>
-                            <CompositeTransform />
-                        </Grid.RenderTransform>
-                        <toolkitControls:DropShadowPanel HorizontalContentAlignment="Stretch"
-                                                            VerticalContentAlignment="Stretch"
-                                                            BlurRadius="10"
-                                                            ShadowOpacity="1"
-                                                            Color="DarkRed">
+           TargetType="toolkitControls:InAppNotification">
+        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
+        <Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+        <Setter Property="MinHeight" Value="55" />
+        <Setter Property="FontSize" Value="13" />
+        <Setter Property="Visibility" Value="Collapsed" />
+        <Setter Property="RenderTransformOrigin" Value="0.5,1" />
+        <Setter Property="Margin" Value="20,0" />
+        <Setter Property="Padding" Value="15,10,25,10" />
+        <Setter Property="MaxWidth" Value="1200" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="toolkitControls:InAppNotification">
+                    <Grid>
+                        <Grid x:Name="RootGrid"
+                              MaxWidth="{TemplateBinding MaxWidth}"
+                              Margin="{TemplateBinding Margin}"
+                              RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
+                              Visibility="{TemplateBinding Visibility}">
+                            <Grid.RenderTransform>
+                                <CompositeTransform />
+                            </Grid.RenderTransform>
+                            <toolkitControls:DropShadowPanel HorizontalContentAlignment="Stretch"
+                                                             VerticalContentAlignment="Stretch"
+                                                             BlurRadius="10"
+                                                             ShadowOpacity="1"
+                                                             Color="DarkRed">
+
+                                <Grid Padding="{TemplateBinding Padding}"
+                                      Background="{TemplateBinding Background}">
+
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
 
-                            <Grid Padding="{TemplateBinding Padding}"
-                                    Background="{TemplateBinding Background}">
+                                    <FontIcon Margin="0,0,10,0"
+                                              FontFamily="Segoe MDL2 Assets"
+                                              Foreground="DarkRed"
+                                              Glyph="&#xEA39;" />
 
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
+                                    <ContentPresenter Grid.Column="1"
+                                                      HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                                      VerticalAlignment="Center"
+                                                      HorizontalContentAlignment="Stretch"
+                                                      VerticalContentAlignment="Center"
+                                                      TextWrapping="WrapWholeWords" />
 
-                                <FontIcon Margin="0,0,10,0"
+                                    <Button x:Name="PART_DismissButton"
+                                            Grid.Column="3"
+                                            Margin="10,0,-10,0"
+                                            AutomationProperties.Name="Dismiss"
+                                            Content="&#xE894;"
                                             FontFamily="Segoe MDL2 Assets"
-                                            Foreground="DarkRed"
-                                            Glyph="&#xEA39;" />
+                                            FontSize="12"
+                                            Style="{StaticResource DismissTextBlockButtonStyle}" />
+                                </Grid>
+                            </toolkitControls:DropShadowPanel>
+                        </Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="State">
+                                <VisualState x:Name="Collapsed">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <EasingDoubleKeyFrame KeyTime="0"
+                                                                  Value="1" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:0.3"
+                                                                  Value="0" />
+                                        </DoubleAnimationUsingKeyFrames>
 
-                                <ContentPresenter Grid.Column="1"
-                                                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                                    VerticalAlignment="Center"
-                                                    HorizontalContentAlignment="Stretch"
-                                                    VerticalContentAlignment="Center"
-                                                    TextWrapping="WrapWholeWords" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="(UIElement.Visibility)">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.3">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Collapsed</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
 
-                                <Button x:Name="PART_DismissButton"
-                                        Grid.Column="3"
-                                        Margin="10,0,-10,0"
-                                        AutomationProperties.Name="Dismiss"
-                                        Content="&#xE894;"
-                                        FontFamily="Segoe MDL2 Assets"
-                                        FontSize="12"
-                                        Style="{StaticResource DismissTextBlockButtonStyle}" />
-                            </Grid>
-                        </toolkitControls:DropShadowPanel>
+                                <VisualState x:Name="Visible">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <EasingDoubleKeyFrame KeyTime="0"
+                                                                  Value="0" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:0.1"
+                                                                  Value="1" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
                     </Grid>
-                    <VisualStateManager.VisualStateGroups>
-                        <VisualStateGroup x:Name="State">
-                            <VisualState x:Name="Collapsed">
-                                <Storyboard>
-                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                    Storyboard.TargetProperty="Opacity">
-                                        <EasingDoubleKeyFrame KeyTime="0"
-                                                                Value="1" />
-                                        <EasingDoubleKeyFrame KeyTime="0:0:0.3"
-                                                                Value="0" />
-                                    </DoubleAnimationUsingKeyFrames>
-
-                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                    Storyboard.TargetProperty="(UIElement.Visibility)">
-                                        <DiscreteObjectKeyFrame KeyTime="0">
-                                            <DiscreteObjectKeyFrame.Value>
-                                                <Visibility>Visible</Visibility>
-                                            </DiscreteObjectKeyFrame.Value>
-                                        </DiscreteObjectKeyFrame>
-                                        <DiscreteObjectKeyFrame KeyTime="0:0:0.3">
-                                            <DiscreteObjectKeyFrame.Value>
-                                                <Visibility>Collapsed</Visibility>
-                                            </DiscreteObjectKeyFrame.Value>
-                                        </DiscreteObjectKeyFrame>
-                                    </ObjectAnimationUsingKeyFrames>
-                                </Storyboard>
-                            </VisualState>
-
-                            <VisualState x:Name="Visible">
-                                <Storyboard>
-                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid"
-                                                                    Storyboard.TargetProperty="Opacity">
-                                        <EasingDoubleKeyFrame KeyTime="0"
-                                                                Value="0" />
-                                        <EasingDoubleKeyFrame KeyTime="0:0:0.1"
-                                                                Value="1" />
-                                    </DoubleAnimationUsingKeyFrames>
-                                </Storyboard>
-                            </VisualState>
-                        </VisualStateGroup>
-                    </VisualStateManager.VisualStateGroups>
-                </Grid>
-            </ControlTemplate>
-        </Setter.Value>
-    </Setter>
-</Style>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
-    <ControlTemplate x:Name="ScrollViewerScrollBarlessTemplate" TargetType="ScrollViewer">
+    <ControlTemplate x:Name="ScrollViewerScrollBarlessTemplate"
+                     TargetType="ScrollViewer">
         <Grid Background="{TemplateBinding Background}">
-            <ScrollContentPresenter x:Name="ScrollContentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Margin="{TemplateBinding Padding}" />
+            <ScrollContentPresenter x:Name="ScrollContentPresenter"
+                                    Margin="{TemplateBinding Padding}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
         </Grid>
     </ControlTemplate>
 
-    <Style x:Key="PivotUnderlineStyle" TargetType="Pivot">
+    <Style x:Key="PivotUnderlineStyle"
+           TargetType="Pivot">
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Background" Value="{ThemeResource PivotBackground}" />
@@ -664,180 +690,189 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Pivot">
-                    <Grid x:Name="RootElement" Background="{TemplateBinding Background}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                    <Grid x:Name="RootElement"
+                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                          Background="{TemplateBinding Background}">
                         <Grid.Resources>
-                            <Style x:Key="BaseContentControlStyle" TargetType="ContentControl">
+                            <Style x:Key="BaseContentControlStyle"
+                                   TargetType="ContentControl">
                                 <Setter Property="FontFamily" Value="XamlAutoFontFamily" />
                                 <Setter Property="FontWeight" Value="SemiBold" />
                                 <Setter Property="FontSize" Value="15" />
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="ContentControl">
-                                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" OpticalMarginAlignment="TrimSideBearings" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                            <ContentPresenter Margin="{TemplateBinding Padding}"
+                                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                              Content="{TemplateBinding Content}"
+                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                              ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                              OpticalMarginAlignment="TrimSideBearings" />
                                         </ControlTemplate>
                                     </Setter.Value>
                                 </Setter>
                             </Style>
-                            <Style x:Key="TitleContentControlStyle" BasedOn="{StaticResource BaseContentControlStyle}" TargetType="ContentControl">
+                            <Style x:Key="TitleContentControlStyle"
+                                   BasedOn="{StaticResource BaseContentControlStyle}"
+                                   TargetType="ContentControl">
                                 <Setter Property="FontFamily" Value="{ThemeResource PivotTitleFontFamily}" />
                                 <Setter Property="FontWeight" Value="{ThemeResource PivotTitleThemeFontWeight}" />
                                 <Setter Property="FontSize" Value="{ThemeResource PivotTitleFontSize}" />
                             </Style>
 
-                            <Style BasedOn="{StaticResource PivotHeaderItemUnderlineStyle}" TargetType="PivotHeaderItem" />
+                            <Style BasedOn="{StaticResource PivotHeaderItemUnderlineStyle}"
+                                   TargetType="PivotHeaderItem" />
                         </Grid.Resources>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="Orientation">
-                                <VisualState x:Name="Portrait">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPortraitThemePadding}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Landscape">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotLandscapeThemePadding}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="NavigationButtonsVisibility">
-                                <VisualState x:Name="NavigationButtonsHidden" />
-                                <VisualState x:Name="NavigationButtonsVisible">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="PreviousButtonVisible">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="NextButtonVisible">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="HeaderStates">
-                                <VisualState x:Name="HeaderDynamic" />
-                                <VisualState x:Name="HeaderStatic">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Header" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="StaticHeader" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <ContentControl x:Name="TitleContentControl" ContentTemplate="{TemplateBinding TitleTemplate}" Content="{TemplateBinding Title}" IsTabStop="False" Margin="{StaticResource PivotPortraitThemePadding}" Style="{StaticResource TitleContentControlStyle}" Visibility="Collapsed" />
+                        <ContentControl x:Name="TitleContentControl"
+                                        Margin="{StaticResource PivotPortraitThemePadding}"
+                                        Content="{TemplateBinding Title}"
+                                        ContentTemplate="{TemplateBinding TitleTemplate}"
+                                        IsTabStop="False"
+                                        Style="{StaticResource TitleContentControlStyle}"
+                                        Visibility="Collapsed" />
                         <Grid Grid.Row="1">
                             <Grid.Resources>
-                                <ControlTemplate x:Key="NextTemplate" TargetType="Button">
-                                    <Border x:Name="Root" Background="{ThemeResource PivotNextButtonBackground}" BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}" BorderBrush="{ThemeResource PivotNextButtonBorderBrush}">
+                                <ControlTemplate x:Key="NextTemplate"
+                                                 TargetType="Button">
+                                    <Border x:Name="Root"
+                                            Background="{ThemeResource PivotNextButtonBackground}"
+                                            BorderBrush="{ThemeResource PivotNextButtonBorderBrush}"
+                                            BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}">
+                                        <FontIcon x:Name="Arrow"
+                                                  HorizontalAlignment="Center"
+                                                  VerticalAlignment="Center"
+                                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                  FontSize="12"
+                                                  Foreground="{ThemeResource PivotNextButtonForeground}"
+                                                  Glyph="&#xE0E3;"
+                                                  MirroredWhenRightToLeft="True"
+                                                  UseLayoutRounding="False" />
                                         <VisualStateManager.VisualStateGroups>
                                             <VisualStateGroup x:Name="CommonStates">
                                                 <VisualState x:Name="Normal" />
                                                 <VisualState x:Name="PointerOver">
                                                     <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBackgroundPointerOver}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotNextButtonBackgroundPointerOver}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBorderBrushPointerOver}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotNextButtonBorderBrushPointerOver}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonForegroundPointerOver}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
+                                                                                       Storyboard.TargetProperty="Foreground">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotNextButtonForegroundPointerOver}" />
                                                         </ObjectAnimationUsingKeyFrames>
                                                     </Storyboard>
                                                 </VisualState>
                                                 <VisualState x:Name="Pressed">
                                                     <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBackgroundPressed}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotNextButtonBackgroundPressed}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBorderBrushPressed}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotNextButtonBorderBrushPressed}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonForegroundPressed}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
+                                                                                       Storyboard.TargetProperty="Foreground">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotNextButtonForegroundPressed}" />
                                                         </ObjectAnimationUsingKeyFrames>
                                                     </Storyboard>
                                                 </VisualState>
                                             </VisualStateGroup>
                                         </VisualStateManager.VisualStateGroups>
-                                        <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Foreground="{ThemeResource PivotNextButtonForeground}" FontSize="12" Glyph="&#xE0E3;" HorizontalAlignment="Center" MirroredWhenRightToLeft="True" UseLayoutRounding="False" VerticalAlignment="Center" />
                                     </Border>
                                 </ControlTemplate>
-                                <ControlTemplate x:Key="PreviousTemplate" TargetType="Button">
-                                    <Border x:Name="Root" Background="{ThemeResource PivotPreviousButtonBackground}" BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}" BorderBrush="{ThemeResource PivotPreviousButtonBorderBrush}">
+                                <ControlTemplate x:Key="PreviousTemplate"
+                                                 TargetType="Button">
+                                    <Border x:Name="Root"
+                                            Background="{ThemeResource PivotPreviousButtonBackground}"
+                                            BorderBrush="{ThemeResource PivotPreviousButtonBorderBrush}"
+                                            BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}">
+                                        <FontIcon x:Name="Arrow"
+                                                  HorizontalAlignment="Center"
+                                                  VerticalAlignment="Center"
+                                                  FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                  FontSize="12"
+                                                  Foreground="{ThemeResource PivotPreviousButtonForeground}"
+                                                  Glyph="&#xE0E2;"
+                                                  MirroredWhenRightToLeft="True"
+                                                  UseLayoutRounding="False" />
                                         <VisualStateManager.VisualStateGroups>
                                             <VisualStateGroup x:Name="CommonStates">
                                                 <VisualState x:Name="Normal" />
                                                 <VisualState x:Name="PointerOver">
                                                     <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBackgroundPointerOver}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotPreviousButtonBackgroundPointerOver}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBorderBrushPointerOver}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotPreviousButtonBorderBrushPointerOver}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonForegroundPointerOver}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
+                                                                                       Storyboard.TargetProperty="Foreground">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotPreviousButtonForegroundPointerOver}" />
                                                         </ObjectAnimationUsingKeyFrames>
                                                     </Storyboard>
                                                 </VisualState>
                                                 <VisualState x:Name="Pressed">
                                                     <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBackgroundPressed}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="Background">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotPreviousButtonBackgroundPressed}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBorderBrushPressed}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root"
+                                                                                       Storyboard.TargetProperty="BorderBrush">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotPreviousButtonBorderBrushPressed}" />
                                                         </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonForegroundPressed}" />
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
+                                                                                       Storyboard.TargetProperty="Foreground">
+                                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                                    Value="{ThemeResource PivotPreviousButtonForegroundPressed}" />
                                                         </ObjectAnimationUsingKeyFrames>
                                                     </Storyboard>
                                                 </VisualState>
                                             </VisualStateGroup>
                                         </VisualStateManager.VisualStateGroups>
-                                        <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Foreground="{ThemeResource PivotPreviousButtonForeground}" FontSize="12" Glyph="&#xE0E2;" HorizontalAlignment="Center" MirroredWhenRightToLeft="True" UseLayoutRounding="False" VerticalAlignment="Center" />
                                     </Border>
                                 </ControlTemplate>
                             </Grid.Resources>
-                            <ScrollViewer x:Name="ScrollViewer" BringIntoViewOnFocusChange="False" HorizontalScrollBarVisibility="Hidden" HorizontalSnapPointsAlignment="Center" HorizontalSnapPointsType="MandatorySingle" Margin="{TemplateBinding Padding}" Template="{StaticResource ScrollViewerScrollBarlessTemplate}" VerticalContentAlignment="Stretch" VerticalSnapPointsType="None" VerticalScrollMode="Disabled" VerticalScrollBarVisibility="Disabled" ZoomMode="Disabled">
-                                <PivotPanel x:Name="Panel" VerticalAlignment="Stretch">
+                            <ScrollViewer x:Name="ScrollViewer"
+                                          Margin="{TemplateBinding Padding}"
+                                          VerticalContentAlignment="Stretch"
+                                          BringIntoViewOnFocusChange="False"
+                                          HorizontalScrollBarVisibility="Hidden"
+                                          HorizontalSnapPointsAlignment="Center"
+                                          HorizontalSnapPointsType="MandatorySingle"
+                                          Template="{StaticResource ScrollViewerScrollBarlessTemplate}"
+                                          VerticalScrollBarVisibility="Disabled"
+                                          VerticalScrollMode="Disabled"
+                                          VerticalSnapPointsType="None"
+                                          ZoomMode="Disabled">
+                                <PivotPanel x:Name="Panel"
+                                            VerticalAlignment="Stretch">
                                     <Grid x:Name="PivotLayoutElement">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto" />
@@ -851,8 +886,15 @@
                                         <Grid.RenderTransform>
                                             <CompositeTransform x:Name="PivotLayoutElementTranslateTransform" />
                                         </Grid.RenderTransform>
-                                        <ContentPresenter x:Name="LeftHeaderPresenter" ContentTemplate="{TemplateBinding LeftHeaderTemplate}" Content="{TemplateBinding LeftHeader}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
-                                        <ContentControl x:Name="HeaderClipper" Grid.Column="1" HorizontalContentAlignment="Stretch" UseSystemFocusVisuals="True">
+                                        <ContentPresenter x:Name="LeftHeaderPresenter"
+                                                          HorizontalAlignment="Stretch"
+                                                          VerticalAlignment="Stretch"
+                                                          Content="{TemplateBinding LeftHeader}"
+                                                          ContentTemplate="{TemplateBinding LeftHeaderTemplate}" />
+                                        <ContentControl x:Name="HeaderClipper"
+                                                        Grid.Column="1"
+                                                        HorizontalContentAlignment="Stretch"
+                                                        UseSystemFocusVisuals="True">
                                             <ContentControl.Clip>
                                                 <RectangleGeometry x:Name="HeaderClipperGeometry" />
                                             </ContentControl.Clip>
@@ -860,7 +902,8 @@
                                                 <Grid.RenderTransform>
                                                     <CompositeTransform x:Name="HeaderOffsetTranslateTransform" />
                                                 </Grid.RenderTransform>
-                                                <PivotHeaderPanel x:Name="StaticHeader" Visibility="Collapsed">
+                                                <PivotHeaderPanel x:Name="StaticHeader"
+                                                                  Visibility="Collapsed">
                                                     <PivotHeaderPanel.RenderTransform>
                                                         <CompositeTransform x:Name="StaticHeaderTranslateTransform" />
                                                     </PivotHeaderPanel.RenderTransform>
@@ -872,10 +915,41 @@
                                                 </PivotHeaderPanel>
                                             </Grid>
                                         </ContentControl>
-                                        <Button x:Name="PreviousButton" Background="Transparent" Grid.Column="1" HorizontalAlignment="Left" Height="36" IsEnabled="False" IsTabStop="False" Margin="{ThemeResource PivotNavButtonMargin}" Opacity="0" Template="{StaticResource PreviousTemplate}" UseSystemFocusVisuals="False" VerticalAlignment="Top" Width="20" />
-                                        <Button x:Name="NextButton" Background="Transparent" Grid.Column="1" HorizontalAlignment="Right" Height="36" IsEnabled="False" IsTabStop="False" Margin="{ThemeResource PivotNavButtonMargin}" Opacity="0" Template="{StaticResource NextTemplate}" UseSystemFocusVisuals="False" VerticalAlignment="Top" Width="20" />
-                                        <ContentPresenter x:Name="RightHeaderPresenter" ContentTemplate="{TemplateBinding RightHeaderTemplate}" Content="{TemplateBinding RightHeader}" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
-                                        <ItemsPresenter x:Name="PivotItemPresenter" Grid.ColumnSpan="3" Grid.Row="1">
+                                        <Button x:Name="PreviousButton"
+                                                Grid.Column="1"
+                                                Width="20"
+                                                Height="36"
+                                                Margin="{ThemeResource PivotNavButtonMargin}"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Top"
+                                                Background="Transparent"
+                                                IsEnabled="False"
+                                                IsTabStop="False"
+                                                Opacity="0"
+                                                Template="{StaticResource PreviousTemplate}"
+                                                UseSystemFocusVisuals="False" />
+                                        <Button x:Name="NextButton"
+                                                Grid.Column="1"
+                                                Width="20"
+                                                Height="36"
+                                                Margin="{ThemeResource PivotNavButtonMargin}"
+                                                HorizontalAlignment="Right"
+                                                VerticalAlignment="Top"
+                                                Background="Transparent"
+                                                IsEnabled="False"
+                                                IsTabStop="False"
+                                                Opacity="0"
+                                                Template="{StaticResource NextTemplate}"
+                                                UseSystemFocusVisuals="False" />
+                                        <ContentPresenter x:Name="RightHeaderPresenter"
+                                                          Grid.Column="2"
+                                                          HorizontalAlignment="Stretch"
+                                                          VerticalAlignment="Stretch"
+                                                          Content="{TemplateBinding RightHeader}"
+                                                          ContentTemplate="{TemplateBinding RightHeaderTemplate}" />
+                                        <ItemsPresenter x:Name="PivotItemPresenter"
+                                                        Grid.Row="1"
+                                                        Grid.ColumnSpan="3">
                                             <ItemsPresenter.RenderTransform>
                                                 <TransformGroup>
                                                     <TranslateTransform x:Name="ItemsPresenterTranslateTransform" />
@@ -887,478 +961,110 @@
                                 </PivotPanel>
                             </ScrollViewer>
                         </Grid>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="AboutPageHeader" TargetType="TextBlock">
-        <Setter Property="FontFamily" Value="Segoe UI" />
-        <Setter Property="FontSize" Value="20" />
-        <Setter Property="FontWeight" Value="Bold" />
-    </Style>
-
-    <Style x:Key="ToolkitNavViewStyle" TargetType="winui: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="winui:NavigationView">
-                    <Grid x:Name="RootGrid">
-
                         <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="DisplayModeGroup">
-                                <VisualState x:Name="Compact" />
-
-                                <VisualState x:Name="Expanded">
-                                    <VisualState.Setters>
-                                        <Setter Target="RootSplitView.PaneBackground" Value="{ThemeResource NavigationViewExpandedPaneBackground}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                                <VisualState x:Name="Minimal">
-                                    <VisualState.Setters>
-                                        <Setter Target="HeaderContent.Margin" Value="48,5,0,0" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                                <VisualState x:Name="MinimalWithBackButton">
-                                    <VisualState.Setters>
-                                        <Setter Target="HeaderContent.Margin" Value="104,5,0,0" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="TogglePaneGroup">
-                                <VisualState x:Name="TogglePaneButtonVisible" />
-                                <VisualState x:Name="TogglePaneButtonCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="PaneContentGridToggleButtonRow.Height" Value="4" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="HeaderGroup">
-                                <VisualState x:Name="HeaderVisible" />
-                                <VisualState x:Name="HeaderCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="HeaderContent.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="SettingsGroup">
-                                <VisualState x:Name="SettingsVisible" />
-                                <VisualState x:Name="SettingsCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="SettingsNavPaneItem.Visibility" Value="Collapsed" />
-                                        <Setter Target="SettingsTopNavPaneItem.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="AutoSuggestGroup">
-                                <VisualState x:Name="AutoSuggestBoxVisible" />
-                                <VisualState x:Name="AutoSuggestBoxCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="AutoSuggestArea.Visibility" Value="Collapsed" />
-                                        <Setter Target="TopPaneAutoSuggestArea.Visibility" Value="Collapsed" />
-                                    </VisualState.Setters>
+                            <VisualStateGroup x:Name="Orientation">
+                                <VisualState x:Name="Portrait">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl"
+                                                                       Storyboard.TargetProperty="Margin">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource PivotPortraitThemePadding}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
                                 </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="PaneStateGroup">
-                                <VisualState x:Name="NotClosedCompact" />
-                                <VisualState x:Name="ClosedCompact">
-                                    <VisualState.Setters>
-                                        <Setter Target="PaneAutoSuggestBoxPresenter.Visibility" Value="Collapsed" />
-                                        <Setter Target="PaneAutoSuggestButton.Visibility" Value="Visible" />
-                                    </VisualState.Setters>
+                                <VisualState x:Name="Landscape">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl"
+                                                                       Storyboard.TargetProperty="Margin">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="{ThemeResource PivotLandscapeThemePadding}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
                                 </VisualState>
-
                             </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="PaneStateListSizeGroup">
-                                <VisualState x:Name="ListSizeFull" />
-                                <VisualState x:Name="ListSizeCompact">
-                                    <VisualState.Setters>
-                                        <Setter Target="MenuItemsHost.HorizontalAlignment" Value="Left" />
-                                        <!-- This is essentially a TemplateBinding: -->
-                                        <Setter Target="MenuItemsHost.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                                        <Setter Target="SettingsNavPaneItem.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SettingsNavPaneItem.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="PaneCustomContentBorder.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                                        <Setter Target="FooterContentBorder.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="FooterContentBorder.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
-                                    </VisualState.Setters>
+                            <VisualStateGroup x:Name="NavigationButtonsVisibility">
+                                <VisualState x:Name="NavigationButtonsHidden" />
+                                <VisualState x:Name="NavigationButtonsVisible">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton"
+                                                                       Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="True" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton"
+                                                                       Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="True" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
                                 </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="TitleBarVisibilityGroup">
-                                <VisualState x:Name="TitleBarVisible" />
-                                <VisualState x:Name="TitleBarCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="PaneContentGrid.Margin" Value="0,32,0,0" />
-                                    </VisualState.Setters>
+                                <VisualState x:Name="PreviousButtonVisible">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton"
+                                                                       Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="True" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
                                 </VisualState>
-
-                            </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="OverflowLabelGroup">
-                                <VisualState x:Name="OverflowButtonWithLabel" />
-                                <VisualState x:Name="OverflowButtonNoLabel">
-                                    <VisualState.Setters>
-                                        <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
-                                    </VisualState.Setters>
+                                <VisualState x:Name="NextButtonVisible">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton"
+                                                                       Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton"
+                                                                       Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="True" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
                                 </VisualState>
-
                             </VisualStateGroup>
-
-                            <VisualStateGroup x:Name="BackButtonGroup">
-                                <VisualState x:Name="BackButtonVisible" />
-                                <VisualState x:Name="BackButtonCollapsed">
-                                    <VisualState.Setters>
-                                        <Setter Target="BackButtonPlaceholderOnTopNav.Width" Value="0" />
-                                    </VisualState.Setters>
+                            <VisualStateGroup x:Name="HeaderStates">
+                                <VisualState x:Name="HeaderDynamic" />
+                                <VisualState x:Name="HeaderStatic">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Header"
+                                                                       Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="Collapsed" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="StaticHeader"
+                                                                       Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0"
+                                                                    Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
                                 </VisualState>
-
                             </VisualStateGroup>
-
                         </VisualStateManager.VisualStateGroups>
-
-                        <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="ButtonHolderGrid" Grid.Row="1">
-                                <Button x:Name="NavigationViewBackButton"
-                                        Height="48"
-                                        Style="{StaticResource NavigationBackButtonNormalStyle}"
-                                        VerticalAlignment="Center"
-                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.BackButtonVisibility}"
-                                        IsEnabled="{TemplateBinding IsBackEnabled}"/>
-
-                                <Button
-                                    x:Name="TogglePaneButton"
-                                    Style="{TemplateBinding PaneToggleButtonStyle}"
-                                    AutomationProperties.LandmarkType="Navigation"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}"
-                                    VerticalAlignment="Center"/>
-                            </Grid>
-
-                        </Grid>
-
-                        <Grid>
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <StackPanel
-                                x:Name="TopNavArea"
-                                Background="{ThemeResource Background-NavigationBar}"
-                                Grid.Row="0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Top"                                
-                                Canvas.ZIndex="1">
-
-                                <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="48"
-                                      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="48" />
-                                        <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"/>
-
-                                    <!-- Top nav list -->
-                                    <winui:ItemsRepeaterScrollHost
-                                            AutomationProperties.LandmarkType="Navigation"
-                                            Grid.Column="3"
-                                            ScrollViewer.HorizontalScrollMode="Disabled"
-                                            ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                                            ScrollViewer.VerticalScrollMode="Disabled"
-                                            ScrollViewer.VerticalScrollBarVisibility="Hidden">
-                                        <ScrollViewer
-                                            HorizontalScrollMode="Disabled"
-                                            HorizontalScrollBarVisibility="Hidden"
-                                            VerticalScrollMode="Disabled"
-                                            VerticalScrollBarVisibility="Hidden">
-                                            <winui:ItemsRepeater 
-                                                x:Name="TopNavMenuItemsHost"
-                                                ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
-                                                AutomationProperties.LandmarkType="Navigation"
-                                                AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
-                                                AutomationProperties.AccessibilityView = "Content">
-                                                <winui:ItemsRepeater.Layout>
-                                                    <winui:StackLayout Orientation="Horizontal"/>
-                                                </winui:ItemsRepeater.Layout>
-                                            </winui:ItemsRepeater>
-                                        </ScrollViewer>
-                                    </winui:ItemsRepeaterScrollHost>
-
-                                    <Button 
-                                        x:Name="TopNavOverflowButton"
-                                        Grid.Column="4"
-                                        Content="More"
-                                        FontFamily="Segoe UI"
-                                        FontSize="15px"
-                                        FontWeight="Normal"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource NavigationViewOverflowButtonStyleWhenPaneOnTop}"
-                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OverflowButtonVisibility}">
-
-                                        <Button.Flyout>
-                                            <Flyout Placement="Bottom">
-                                                <Flyout.FlyoutPresenterStyle>
-                                                    <Style TargetType="FlyoutPresenter">
-                                                        <Setter Property="Padding" Value="0,8" />
-                                                        <!-- Set negative top margin to make the flyout align exactly with the button -->
-                                                        <Setter Property="Margin" Value="0,-4,0,0" />
-                                                    </Style>
-                                                </Flyout.FlyoutPresenterStyle>
-                                                <winui:ItemsRepeaterScrollHost>
-                                                    <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                                        <winui:ItemsRepeater
-                                                                    x:Name="TopNavMenuItemsOverflowHost"
-                                                                    ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
-                                                                    AutomationProperties.AccessibilityView = "Content">
-                                                            <winui:ItemsRepeater.Layout>
-                                                                <winui:StackLayout Orientation="Vertical"/>
-                                                            </winui:ItemsRepeater.Layout>
-                                                        </winui:ItemsRepeater>
-                                                    </ScrollViewer>
-                                                </winui: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="12,0,12,0"
-                                            MinWidth="200"
-                                            IsTabStop="False"
-                                            HorizontalContentAlignment="Stretch"
-                                            VerticalContentAlignment="Center"/>
-                                    </Grid>
-
-                                    <ContentControl
-                                        x:Name="PaneFooterOnTopPane"
-                                        IsTabStop="False"
-                                        VerticalContentAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        Grid.Column="7" />
-                                    <winui:NavigationViewItem x:Name="SettingsTopNavPaneItem" Style="{ThemeResource MUX_NavigationViewSettingsItemStyleWhenOnTopPane}" Grid.Column="8" Icon="Home" />
-
-                                </Grid>
-
-                                <Border Background="{ThemeResource Border-NavigationBar}"
-                                        Height="1" />
-
-                                <Border
-                                    x:Name="TopNavContentOverlayAreaGrid"
-                                    Child="{TemplateBinding ContentOverlay}" />
-                            </StackPanel>
-
-                            <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"
-                                        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" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="8" />
-                                            <!-- above list margin -->
-                                            <RowDefinition Height="*" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="8" />
-                                        </Grid.RowDefinitions>
-
-                                        <Grid x:Name="ContentPaneTopPadding"
-                                              Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"/>
-
-                                        <Grid Grid.Row="2" Height="{StaticResource PaneToggleButtonHeight}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <TextBlock
-                                                x:Name="PaneTitleTextBlock" 
-                                                Grid.Column="0"
-                                                Text="{TemplateBinding PaneTitle}"
-                                                HorizontalAlignment="Left"
-                                                VerticalAlignment="Center"
-                                                Style="{StaticResource NavigationViewItemHeaderTextStyle}"/>
-
-                                            <ContentControl
-                                                x:Name="PaneHeaderContentBorder"
-                                                IsTabStop="False"
-                                                VerticalContentAlignment="Stretch"
-                                                HorizontalContentAlignment="Stretch"
-                                                Grid.Column="1" />
-                                        </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" />
-
-                                        <!-- Left nav list -->
-                                        <winui:ItemsRepeaterScrollHost
-                                            Grid.Row="6"
-                                            Margin="0,0,0,20"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Top">
-                                            <ScrollViewer
-                                                TabNavigation="Once"
-                                                VerticalScrollBarVisibility="Auto">
-                                                <winui:ItemsRepeater
-                                                        x:Name="MenuItemsHost"
-                                                        ItemTemplate="{TemplateBinding MenuItemTemplateSelector}"
-                                                        AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}"
-                                                        AutomationProperties.AccessibilityView = "Content">
-                                                    <winui:ItemsRepeater.Layout>
-                                                        <winui:StackLayout Orientation="Vertical"/>
-                                                    </winui:ItemsRepeater.Layout>
-                                                </winui:ItemsRepeater>
-                                            </ScrollViewer>
-                                        </winui:ItemsRepeaterScrollHost>
-
-                                        <ContentControl
-                                            x:Name="FooterContentBorder"
-                                            IsTabStop="False"
-                                            VerticalContentAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            Grid.Row="7" />
-                                        <winui:NavigationViewItem x:Name="SettingsNavPaneItem" Grid.Row="8" Icon="Setting" />
-                                    </Grid>
-                                </SplitView.Pane>
-
-                                <SplitView.Content>
-                                    <Grid x:Name="ContentGrid">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
-                                        </Grid.RowDefinitions>
-
-                                        <ContentControl
-                                            x:Name="HeaderContent"
-                                            MinHeight="{StaticResource PaneToggleButtonHeight}"
-                                            IsTabStop="False"
-                                            Content="{TemplateBinding Header}"
-                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                            VerticalContentAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            Style="{StaticResource NavigationViewTitleHeaderContentControlTextStyle}"/>
-
-                                        <ContentPresenter
-                                            AutomationProperties.LandmarkType="Main"
-                                            Grid.Row="1"
-                                            Content="{TemplateBinding Content}"/>
-                                    </Grid>
-                                </SplitView.Content>
-                            </SplitView>
-
-                        </Grid>
-
                     </Grid>
-
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
+
+    <Style x:Key="AboutPageHeader"
+           TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Segoe UI" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Styles/GithubIcon.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Styles/GithubIcon.xaml
index ea3ceee5c78..c1968130be5 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Styles/GithubIcon.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Styles/GithubIcon.xaml
@@ -1,8 +1,7 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Styles">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Styles">
 
-    <!-- https://github.com/logos -->
+    <!--  https://github.com/logos  -->
     <x:String x:Key="GithubIcon">M21.7999992370605,0L19.220495223999,0.26007080078125 16.81787109375,1.00595712661743 14.6436157226563,2.18616962432861 12.7492189407349,3.74921894073486 11.1861696243286,5.64361572265625 10.0059566497803,7.81787109375 9.26007080078125,10.2204961776733 9,12.8000001907349 9.65248012542725,16.8459720611572 11.4694375991821,20.3591785430908 14.2401514053345,23.1291217803955 17.7539005279541,24.9453010559082 18.4305686950684,24.8080005645752 18.6273498535156,24.3296756744385 18.6207065582275,23.4247951507568 18.609375,21.9468746185303 16.4340572357178,22.0373229980469 15.1187467575073,21.4822216033936 14.4708204269409,20.7821025848389 14.2976503372192,20.4375 13.8297338485718,19.5214366912842 13.3685493469238,18.947265625 12.8765497207642,18.5656261444092 12.3995819091797,18.1091804504395 12.4844465255737,17.87890625 12.7874250411987,17.7974605560303 12.9647998809814,17.7875003814697 13.8134965896606,18.0311241149902 14.4276065826416,18.4802703857422 14.8007507324219,18.9127178192139 14.926549911499,19.1062507629395 15.8880548477173,20.1437015533447 16.9443283081055,20.494140625 17.9229640960693,20.416259765625 18.6515502929688,20.1687507629395 18.9645938873291,19.1242198944092 19.4640502929688,18.4593753814697 17.3543262481689,18.0241260528564 15.4833002090454,17.014066696167 14.1450357437134,15.1450166702271 13.6336002349854,12.1328001022339 13.9853601455688,10.2268438339233 14.9500007629395,8.69764995574951 14.7027282714844,7.54188776016235 14.7441072463989,6.53565359115601 15.0765495300293,5.30859994888306 15.2825078964233,5.28076791763306 15.9191312789917,5.34375619888306 17.0145378112793,5.71729135513306 18.596851348877,6.62109994888306 21.799976348877,6.19062519073486 25.004674911499,6.62265014648438 26.5845413208008,5.71818733215332 27.6791000366211,5.34472513198853 28.315746307373,5.28210020065308 28.5218753814697,5.31015014648438 28.8556652069092,6.53784370422363 28.8976573944092,7.5438346862793 28.6499996185303,8.69764995574951 29.6154251098633,10.2268533706665 29.9656257629395,12.1328001022339 29.453296661377,15.1497011184692 28.1123065948486,17.0164012908936 26.2366523742676,18.020601272583 24.120325088501,18.4500007629395 24.7275562286377,19.3355484008789 24.9890747070313,20.8187503814697 24.9804744720459,23.0584030151367 24.9718742370605,24.3312511444092 25.1693305969238,24.8128852844238 25.8531246185303,24.9453010559082 29.3641395568848,23.1273632049561 32.1326217651367,20.3568344116211 33.948070526123,16.8442134857178 34.5999984741211,12.8000001907349 34.3399276733398,10.2204961776733 33.5940399169922,7.81787109375 32.4138298034668,5.64361572265625 30.8507804870605,3.74921894073486 28.9563827514648,2.18616962432861 26.7821273803711,1.00595712661743 24.3795032501221,0.26007080078125 21.7999992370605,0z</x:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Styles/Themes.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Styles/Themes.xaml
index 0fa938e4864..c3bc16e4dbd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Styles/Themes.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Styles/Themes.xaml
@@ -4,7 +4,8 @@
     <!--  Branding  -->
     <Color x:Key="Brand-Color">#3750D1</Color>
 
-    <SolidColorBrush x:Key="Brush-Brand-Color" Color="{StaticResource Brand-Color}" />
+    <SolidColorBrush x:Key="Brush-Brand-Color"
+                     Color="{StaticResource Brand-Color}" />
 
     <!--  Colors  -->
     <Color x:Key="White">#FFFFFFFF</Color>
@@ -12,15 +13,16 @@
     <Color x:Key="Blue-01">#FF0078D7</Color>
     <Color x:Key="Red">#FFFF0000</Color>
 
-    <!-- Titlebar -->
+    <!--  Titlebar  -->
     <Color x:Key="Titlebar-Foreground">#FFDDDDDD</Color>
 
-    <SolidColorBrush x:Key="Brush-Red" Color="{StaticResource Red}" />
+    <SolidColorBrush x:Key="Brush-Red"
+                     Color="{StaticResource Red}" />
 
     <!--  Brushes  -->
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
-            <!-- Colors -->
+            <!--  Colors  -->
             <Color x:Key="Color-Main">White</Color>
             <Color x:Key="Color-Alt">Black</Color>
             <Color x:Key="Grey-01">#FF333333</Color>
@@ -30,32 +32,32 @@
             <Color x:Key="Grey-05">#FFF0F0F0</Color>
             <Color x:Key="SampleInfo-Background">#FFEEEEEE</Color>
 
-            <!-- Branding Colors -->
+            <!--  Branding Colors  -->
             <SolidColorBrush x:Key="SystemControlHighlightAccentBrush"
-                         Color="{StaticResource Brand-Color}" />
+                             Color="{StaticResource Brand-Color}" />
             <SolidColorBrush x:Key="Brush-Link-Normal"
-                         Color="#CC191919" />
-            <!-- UI Elements -->
+                             Color="#CC191919" />
+            <!--  UI Elements  -->
             <SolidColorBrush x:Key="SliderThumbBackground"
                              Color="Black" />
             <SolidColorBrush x:Key="Brush-Grey-01"
-                         Color="{ThemeResource Grey-01}" />
+                             Color="{ThemeResource Grey-01}" />
             <SolidColorBrush x:Key="Brush-Grey-02"
-                         Color="{ThemeResource Grey-02}" />
+                             Color="{ThemeResource Grey-02}" />
             <SolidColorBrush x:Key="Brush-Grey-03"
-                         Color="{ThemeResource Grey-03}" />
+                             Color="{ThemeResource Grey-03}" />
             <SolidColorBrush x:Key="Brush-Grey-04"
-                         Color="{ThemeResource Grey-04}" />
+                             Color="{ThemeResource Grey-04}" />
             <SolidColorBrush x:Key="Brush-Grey-05"
-                         Color="{ThemeResource Grey-05}" />
+                             Color="{ThemeResource Grey-05}" />
             <SolidColorBrush x:Key="Brush-Main"
-                         Color="{StaticResource White}" />
+                             Color="{StaticResource White}" />
             <SolidColorBrush x:Key="Brush-Alt"
-                          Color="Black" />
+                             Color="Black" />
             <SolidColorBrush x:Key="Brush-Sample-Background"
                              Color="White" />
             <SolidColorBrush x:Key="Brush-Blue-01"
-                         Color="{StaticResource Blue-01}" />
+                             Color="{StaticResource Blue-01}" />
             <SolidColorBrush x:Key="Border-AboutPage-Horizontal"
                              Color="#33000000" />
             <SolidColorBrush x:Key="Border-AboutPage-Vertical"
@@ -93,11 +95,13 @@
             <SolidColorBrush x:Key="Brush-Sample-TransparentHeader"
                              Color="#AA000000" />
 
-            <SolidColorBrush x:Key="SampleMarkdownBackgroundBrush" Color="#FFF6F8FA" />
-            <SolidColorBrush x:Key="SampleMarkdownInlineCodeBackgroundBrush" Color="#FFC2C4C6" />
+            <SolidColorBrush x:Key="SampleMarkdownBackgroundBrush"
+                             Color="#FFF6F8FA" />
+            <SolidColorBrush x:Key="SampleMarkdownInlineCodeBackgroundBrush"
+                             Color="#FFC2C4C6" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
-            <!-- Colors -->
+            <!--  Colors  -->
             <Color x:Key="Color-Main">Black</Color>
             <Color x:Key="Color-Alt">White</Color>
             <Color x:Key="Grey-01">#FFF0F0F0</Color>
@@ -107,32 +111,32 @@
             <Color x:Key="Grey-05">#FF333333</Color>
             <Color x:Key="SampleInfo-Background">#FF222222</Color>
 
-            <!-- Branding Colors -->
+            <!--  Branding Colors  -->
             <SolidColorBrush x:Key="SystemControlHighlightAccentBrush"
-                         Color="{StaticResource Brand-Color}" />
+                             Color="{StaticResource Brand-Color}" />
             <SolidColorBrush x:Key="Brush-Link-Normal"
-                         Color="#CCFFFFFF" />
-            <!-- UI Elements -->
+                             Color="#CCFFFFFF" />
+            <!--  UI Elements  -->
             <SolidColorBrush x:Key="SliderThumbBackground"
                              Color="White" />
             <SolidColorBrush x:Key="Brush-Grey-01"
-                         Color="{ThemeResource Grey-01}" />
+                             Color="{ThemeResource Grey-01}" />
             <SolidColorBrush x:Key="Brush-Grey-02"
-                         Color="{ThemeResource Grey-02}" />
+                             Color="{ThemeResource Grey-02}" />
             <SolidColorBrush x:Key="Brush-Grey-03"
-                         Color="{ThemeResource Grey-03}" />
+                             Color="{ThemeResource Grey-03}" />
             <SolidColorBrush x:Key="Brush-Grey-04"
-                         Color="{ThemeResource Grey-04}" />
+                             Color="{ThemeResource Grey-04}" />
             <SolidColorBrush x:Key="Brush-Grey-05"
-                         Color="{ThemeResource Grey-05}" />
+                             Color="{ThemeResource Grey-05}" />
             <SolidColorBrush x:Key="Brush-Main"
-                         Color="{StaticResource Black}" />
+                             Color="{StaticResource Black}" />
             <SolidColorBrush x:Key="Brush-Alt"
-                          Color="White" />
+                             Color="White" />
             <SolidColorBrush x:Key="Brush-Sample-Background"
                              Color="{ThemeResource Grey-05}" />
             <SolidColorBrush x:Key="Brush-Blue-01"
-                         Color="{StaticResource Blue-01}" />
+                             Color="{StaticResource Blue-01}" />
             <SolidColorBrush x:Key="Border-AboutPage-Horizontal"
                              Color="#33FFFFFF" />
             <SolidColorBrush x:Key="Border-AboutPage-Vertical"
@@ -170,8 +174,10 @@
             <SolidColorBrush x:Key="Brush-Sample-TransparentHeader"
                              Color="#66FFFFFF" />
 
-            <SolidColorBrush x:Key="SampleMarkdownBackgroundBrush" Color="#FF171717" />
-            <SolidColorBrush x:Key="SampleMarkdownInlineCodeBackgroundBrush" Color="#FF404040" />
+            <SolidColorBrush x:Key="SampleMarkdownBackgroundBrush"
+                             Color="#FF171717" />
+            <SolidColorBrush x:Key="SampleMarkdownInlineCodeBackgroundBrush"
+                             Color="#FF404040" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json b/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json
index da4679187e2..05acdfa32a3 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json
+++ b/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json
@@ -1,6 +1,6 @@
 {
   "new-section-title": "What's New",
-  "new-samples": [ "TokenizingTextBox", "PipelineBrush", "WrapLayout", "IsNullOrEmptyStateTrigger", "High Performance APIs" ],
+  "new-samples": [ "MVVM Toolkit", "EffectAnimations", "TabbedCommandBar", "ColorPicker", "ColorPickerButton", "SwitchPresenter" ],
   "resources": [
     {
       "title": "Toolkit",
@@ -28,6 +28,10 @@
         {
           "title": "UWP Community Discord",
           "url": "https://discord.gg/zBA5aCn"
+        },
+        {
+          "title": "Contribution Wiki",
+          "url": "https://aka.ms/wct/wiki"
         }
       ]
     },
@@ -82,11 +86,11 @@
       "links": [
         {
           "title": "Version",
-          "url": "http://aka.ms/uwptoolkit"
+          "url": "http://aka.ms/windowstoolkit"
         },
         {
           "title": "ColorCode-Universal (Dependency)",
-          "url": "https://github.com/WilliamABradley/ColorCode-Universal"
+          "url": "https://github.com/windows-toolkit/ColorCode-Universal"
         },
         {
           "title": "Monaco Editor UWP (Dependency)",
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
index c977b1b3681..16a99d19a52 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs
@@ -46,7 +46,7 @@ public CaseCollection SwitchCases
         /// Indicates the <see cref="SwitchCases"/> property.
         /// </summary>
         public static readonly DependencyProperty SwitchCasesProperty =
-            DependencyProperty.Register(nameof(SwitchCases), typeof(CaseCollection), typeof(SwitchPresenter), new PropertyMetadata(null));
+            DependencyProperty.Register(nameof(SwitchCases), typeof(CaseCollection), typeof(SwitchPresenter), new PropertyMetadata(null, OnSwitchCasesPropertyChanged));
 
         /// <summary>
         /// Gets or sets a value indicating the value to compare all cases against. When this value is bound to and changes, the presenter will automatically evaluate cases and select the new appropriate content from the switch.
@@ -81,9 +81,19 @@ public Type TargetType
         private static void OnValuePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             // When our Switch's expression changes, re-evaluate.
-            var xswitch = (SwitchPresenter)d;
+            if (d is SwitchPresenter xswitch)
+            {
+                xswitch.EvaluateCases();
+            }
+        }
 
-            xswitch.EvaluateCases();
+        private static void OnSwitchCasesPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            // If our collection somehow changes, we should re-evaluate.
+            if (d is SwitchPresenter xswitch)
+            {
+                xswitch.EvaluateCases();
+            }
         }
 
         /// <summary>
@@ -92,6 +102,14 @@ private static void OnValuePropertyChanged(DependencyObject d, DependencyPropert
         public SwitchPresenter()
         {
             this.SwitchCases = new CaseCollection();
+
+            Loaded += this.SwitchPresenter_Loaded;
+        }
+
+        private void SwitchPresenter_Loaded(object sender, RoutedEventArgs e)
+        {
+            // In case we're in a template, we may have loaded cases later.
+            EvaluateCases();
         }
 
         /// <inheritdoc/>
@@ -104,8 +122,20 @@ protected override void OnApplyTemplate()
 
         private void EvaluateCases()
         {
-            if (CurrentCase != null &&
-                CurrentCase.Value != null &&
+            if (SwitchCases == null ||
+                SwitchCases.Count == 0)
+            {
+                // If we have no cases, then we can't match anything.
+                if (CurrentCase != null)
+                {
+                    // Only bother clearing our actual content if we had something before.
+                    Content = null;
+                    CurrentCase = null;
+                }
+
+                return;
+            }
+            else if (CurrentCase?.Value != null &&
                 CurrentCase.Value.Equals(Value))
             {
                 // If the current case we're on already matches our current value,
@@ -134,7 +164,7 @@ private void EvaluateCases()
 
             if (newcase == null && xdefault != null)
             {
-                // Inject default if we found one.
+                // Inject default if we found one without matching anything
                 newcase = xdefault;
             }
 
diff --git a/Microsoft.Toolkit.Uwp/Helpers/PackageVersionHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/PackageVersionHelper.cs
index db05533a07c..fcf71a4ac8a 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/PackageVersionHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/PackageVersionHelper.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using Windows.ApplicationModel;
 
 namespace Microsoft.Toolkit.Uwp.Helpers
@@ -15,10 +16,28 @@ public static class PackageVersionHelper
         /// Returns a string representation of a version with the format 'Major.Minor.Build.Revision'.
         /// </summary>
         /// <param name="packageVersion">The <see cref="PackageVersion"/> to convert to a string</param>
+        /// <param name="significance">The number of version numbers to return, default is 4 for the full version number.</param>
         /// <returns>Version string of the format 'Major.Minor.Build.Revision'</returns>
-        public static string ToFormattedString(this PackageVersion packageVersion)
+        /// <example>
+        /// Package.Current.Id.Version.ToFormattedString(2); // Returns "7.0" for instance.
+        /// </example>
+        public static string ToFormattedString(this PackageVersion packageVersion, int significance = 4)
         {
-            return $"{packageVersion.Major}.{packageVersion.Minor}.{packageVersion.Build}.{packageVersion.Revision}";
+            switch (significance)
+            {
+                case 4:
+                    return $"{packageVersion.Major}.{packageVersion.Minor}.{packageVersion.Build}.{packageVersion.Revision}";
+                case 3:
+                    return $"{packageVersion.Major}.{packageVersion.Minor}.{packageVersion.Build}";
+                case 2:
+                    return $"{packageVersion.Major}.{packageVersion.Minor}";
+                case 1:
+                    return $"{packageVersion.Major}";
+            }
+
+            static string ThrowArgumentOutOfRangeException() => throw new ArgumentOutOfRangeException(nameof(significance), "Value must be a value 1 through 4.");
+
+            return ThrowArgumentOutOfRangeException();
         }
 
         /// <summary>