diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 83845359833..0f014681364 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -31,6 +31,7 @@ Please check if your PR fulfills the following requirements:
 - [ ] Sample in sample app has been added / updated (for bug fixes / features)
     - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/Microsoft/UWPCommunityToolkit-design-assets)
 - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
+- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
 - [ ] Contains **NO** breaking changes
 
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 437e56bd302..e89738becb8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -69,11 +69,11 @@
   </Choose>
   
   <PropertyGroup>
-    <NerdbankGitVersioningVersion>2.0.37-beta</NerdbankGitVersioningVersion>
+    <NerdbankGitVersioningVersion>2.1.23</NerdbankGitVersioningVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.37-beta" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.23" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -81,14 +81,4 @@
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
-
-  <!-- https://github.com/NuGet/Home/issues/4337 -->
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">
-    <Import Project="$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets"
-            Condition="Exists('$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Target Name="FixUpVersion"
-          BeforeTargets="_GenerateRestoreProjectSpec"
-          DependsOnTargets="GetBuildVersion"
-          Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Services/Services/Bing/BingLanguage.cs b/Microsoft.Toolkit.Services/Services/Bing/BingLanguage.cs
index 47fdb7320f5..6dc1f265e71 100644
--- a/Microsoft.Toolkit.Services/Services/Bing/BingLanguage.cs
+++ b/Microsoft.Toolkit.Services/Services/Bing/BingLanguage.cs
@@ -661,12 +661,6 @@ public enum BingLanguage
         [StringValue("mn")]
         Mongolian,
 
-        /// <summary>
-        /// Moldavian
-        /// </summary>
-        [StringValue("mo")]
-        Moldavian,
-
         /// <summary>
         /// Marathi
         /// </summary>
@@ -1141,4 +1135,4 @@ public enum BingLanguage
         [StringValue("zu")]
         Zulu
     }
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorCode.bind
index c963c735c51..7fbe48c54cd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RangeSelector/RangeSelectorCode.bind
@@ -27,7 +27,7 @@
                               Grid.Column="1"                              
                               Minimum="@[Minimum:Slider:0:0-100]@"
                               Maximum="@[Maximum:Slider:100:0-100]@"
-                              StepFrequency="@[StepFrequency:DoubleSlider:1.0:0.25-10.0]@"/>
+                              StepFrequency="@[StepFrequency:Slider:1:1-10]@"/>
       <TextBlock Grid.Column="2"
                  HorizontalAlignment="Right"
                  VerticalAlignment="Center"
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs
index 2670117739c..0d148ed7e68 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/ConnectedAnimationHelper.cs
@@ -66,7 +66,14 @@ private void Frame_Navigating(object sender, Windows.UI.Xaml.Navigation.Navigati
                         if (listAnimProperty.ListViewBase.ItemsSource is IEnumerable<object> items &&
                             items.Contains(e.Parameter))
                         {
-                            listAnimProperty.ListViewBase.PrepareConnectedAnimation(props.Key, e.Parameter, listAnimProperty.ElementName);
+                            try
+                            {
+                                listAnimProperty.ListViewBase.PrepareConnectedAnimation(props.Key, e.Parameter, listAnimProperty.ElementName);
+                            }
+                            catch
+                            {
+                                // Ignore
+                            }
                         }
                     }
                 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
index a99e56d1c59..380731e7489 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs
@@ -512,7 +512,6 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
             var compositeTransform = new CompositeTransform();
             compositeTransform.CenterX = 0.5;
             compositeTransform.CenterY = 0.5;
-            compositeTransform.CenterY = 0.5;
 
             carouselItem.Projection = planeProjection;
             carouselItem.RenderTransform = compositeTransform;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs
index b7c13a3e0a1..e5024001a88 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs
@@ -19,18 +19,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     /// </summary>
     public partial class Expander
     {
-        /// <summary>
-        /// Identifies the <see cref="Header"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderProperty =
-            DependencyProperty.Register(nameof(Header), typeof(string), typeof(Expander), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Identifies the <see cref="HeaderTemplate"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty HeaderTemplateProperty =
-            DependencyProperty.Register(nameof(HeaderTemplate), typeof(DataTemplate), typeof(Expander), new PropertyMetadata(null));
-
         /// <summary>
         /// Identifies the <see cref="IsExpanded"/> dependency property.
         /// </summary>
@@ -50,22 +38,10 @@ public partial class Expander
             DependencyProperty.Register(nameof(ContentOverlay), typeof(UIElement), typeof(Expander), new PropertyMetadata(default(UIElement)));
 
         /// <summary>
-        /// Gets or sets a value indicating whether the Header of the control.
-        /// </summary>
-        public string Header
-        {
-            get { return (string)GetValue(HeaderProperty); }
-            set { SetValue(HeaderProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the HeaderTemplate of the control.
+        /// Identifies the <see cref="HeaderStyle"/> dependency property.
         /// </summary>
-        public DataTemplate HeaderTemplate
-        {
-            get { return (DataTemplate)GetValue(HeaderTemplateProperty); }
-            set { SetValue(HeaderTemplateProperty, value); }
-        }
+        public static readonly DependencyProperty HeaderStyleProperty =
+            DependencyProperty.Register(nameof(HeaderStyle), typeof(Style), typeof(Expander), new PropertyMetadata(default(Style)));
 
         /// <summary>
         /// Gets or sets a value indicating whether the content of the control is opened/visible or closed/hidden.
@@ -94,6 +70,15 @@ public UIElement ContentOverlay
             set { SetValue(ContentOverlayProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or sets a value for the style to use for the Header of the Expander.
+        /// </summary>
+        public Style HeaderStyle
+        {
+            get { return (Style)GetValue(HeaderStyleProperty);  }
+            set { SetValue(HeaderStyleProperty, value);  }
+        }
+
         private static void OnIsExpandedPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var expander = d as Expander;
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs
index 975571fca7d..cf3c5289323 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs
@@ -40,7 +40,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     [TemplatePart(Name = LayoutTransformerPart, Type = typeof(LayoutTransformControl))]
     [TemplatePart(Name = ContentOverlayPart, Type = typeof(ContentPresenter))]
     [ContentProperty(Name = "Content")]
-    public partial class Expander : ContentControl
+    public partial class Expander : HeaderedContentControl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Expander"/> class.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml
index 2fde0d3ee49..ae4adf77c3a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml
@@ -11,9 +11,11 @@
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
         <Setter Property="BorderThickness" Value="{ThemeResource ToggleButtonBorderThemeThickness}" />
+        <Setter Property="Height" Value="40" />
         <Setter Property="Padding" Value="8,4,8,4" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
@@ -251,10 +253,11 @@
                                           ContentTemplate="{TemplateBinding ContentTemplate}"
                                           ContentTransitions="{TemplateBinding ContentTransitions}"
                                           Content="{TemplateBinding Content}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           Padding="{TemplateBinding Padding}"
+                                          VerticalAlignment="{TemplateBinding VerticalAlignment}"
                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          HorizontalAlignment="Left"
                                           RenderTransformOrigin="0.5,0.5" />
                     </Grid>
                 </ControlTemplate>
@@ -265,6 +268,7 @@
     <Style TargetType="controls:Expander">
         <Setter Property="Header" Value="Header" />
         <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HeaderStyle" Value="{StaticResource HeaderToggleButtonStyle}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Expander">
@@ -580,11 +584,9 @@
                                     <RotateTransform x:Name="RotateLayoutTransform" Angle="0" />
                                 </controls:LayoutTransformControl.Transform>
                                 <ToggleButton x:Name="PART_ExpanderToggleButton" 
-                                              Height="40"
                                               TabIndex="0"
                                               AutomationProperties.Name="Expand"
-                                              Style="{StaticResource HeaderToggleButtonStyle}" 
-                                              VerticalAlignment="Bottom" HorizontalAlignment="Stretch" 
+                                              Style="{TemplateBinding HeaderStyle}" 
                                               Foreground="{TemplateBinding Foreground}"
                                               ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}"
                                               IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" />
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
index 1fcc0e56e32..11c6ec49428 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs
@@ -332,31 +332,26 @@ private void SetDetailsContent()
 
         private void OnMasterCommandBarChanged()
         {
-            var panel = GetTemplateChild("DetailsCommandBarPanel") as Panel;
-            if (panel == null)
-            {
-                return;
-            }
-
-            panel.Children.Clear();
-            if (DetailsCommandBar != null)
-            {
-                panel.Children.Add(DetailsCommandBar);
-            }
+            OnCommandBarChanged("MasterCommandBarPanel", MasterCommandBar);
         }
 
         private void OnDetailsCommandBarChanged()
         {
-            var panel = GetTemplateChild("MasterCommandBarPanel") as Panel;
+            OnCommandBarChanged("DetailsCommandBarPanel", DetailsCommandBar);
+        }
+
+        private void OnCommandBarChanged(string panelName, CommandBar commandbar)
+        {
+            var panel = GetTemplateChild(panelName) as Panel;
             if (panel == null)
             {
                 return;
             }
 
             panel.Children.Clear();
-            if (MasterCommandBar != null)
+            if (commandbar != null)
             {
-                panel.Children.Add(MasterCommandBar);
+                panel.Children.Add(commandbar);
             }
         }
     }
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
index 29a34648f67..3fca1b509f8 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml
@@ -40,6 +40,7 @@
                                           Grid.Row="1"
                                           IsTabStop="False"
                                           ItemContainerStyle="{TemplateBinding ItemContainerStyle}"
+                                          ItemContainerStyleSelector="{TemplateBinding ItemContainerStyleSelector}"
                                           ItemTemplate="{TemplateBinding ItemTemplate}"
                                           ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
                                           ItemsSource="{TemplateBinding ItemsSource}"
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
index e2a33207af1..0588820dc98 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
@@ -38,7 +38,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
     public class RangeSelector : Control
     {
         private const double Epsilon = 0.01;
-        private const double DefaultStepFrequency = 0.01;
+        private const double DefaultStepFrequency = 1;
 
         /// <summary>
         /// Identifies the Minimum dependency property.
diff --git a/Microsoft.Toolkit.Uwp.UI/AdvancedCollectionView/AdvancedCollectionView.cs b/Microsoft.Toolkit.Uwp.UI/AdvancedCollectionView/AdvancedCollectionView.cs
index f599db23312..6db56933c14 100644
--- a/Microsoft.Toolkit.Uwp.UI/AdvancedCollectionView/AdvancedCollectionView.cs
+++ b/Microsoft.Toolkit.Uwp.UI/AdvancedCollectionView/AdvancedCollectionView.cs
@@ -534,16 +534,19 @@ private void HandleSortChanged()
 
         private void HandleFilterChanged()
         {
-            for (var index = 0; index < _view.Count; index++)
+            if (_filter != null)
             {
-                var item = _view.ElementAt(index);
-                if (_filter(item))
+                for (var index = 0; index < _view.Count; index++)
                 {
-                    continue;
-                }
+                    var item = _view.ElementAt(index);
+                    if (_filter(item))
+                    {
+                        continue;
+                    }
 
-                RemoveFromView(index, item);
-                index--;
+                    RemoveFromView(index, item);
+                    index--;
+                }
             }
 
             var viewHash = new HashSet<object>(_view);
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewExtensions.cs
index 976c62f8b9f..79b2005bbd5 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewExtensions.cs
@@ -10,6 +10,8 @@
 // THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
 // ******************************************************************
 
+using System.Collections.Generic;
+using Windows.Foundation.Collections;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -22,6 +24,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Extensions
     /// </summary>
     public static class ListViewExtensions
     {
+        private static Dictionary<IObservableVector<object>, Windows.UI.Xaml.Controls.ListViewBase> _itemsForList = new Dictionary<IObservableVector<object>, Windows.UI.Xaml.Controls.ListViewBase>();
+
         /// <summary>
         /// Attached <see cref="DependencyProperty"/> for binding a <see cref="Brush"/> as an alternate background color to a <see cref="Windows.UI.Xaml.Controls.ListViewBase"/>
         /// </summary>
@@ -107,26 +111,23 @@ private static void OnAlternateColorPropertyChanged(DependencyObject sender, Dep
             }
 
             listViewBase.ContainerContentChanging -= ColorContainerContentChanging;
+            listViewBase.Items.VectorChanged -= ColorItemsVectorChanged;
+            listViewBase.Unloaded -= OnListViewBaseUnloaded;
 
+            _itemsForList[listViewBase.Items] = listViewBase;
             if (AlternateColorProperty != null)
             {
                 listViewBase.ContainerContentChanging += ColorContainerContentChanging;
+                listViewBase.Items.VectorChanged += ColorItemsVectorChanged;
+                listViewBase.Unloaded += OnListViewBaseUnloaded;
             }
         }
 
         private static void ColorContainerContentChanging(Windows.UI.Xaml.Controls.ListViewBase sender, ContainerContentChangingEventArgs args)
         {
-            var itemContainer = args.ItemContainer as SelectorItem;
-            var itemIndex = sender.IndexFromContainer(itemContainer);
+            var itemContainer = args.ItemContainer as Control;
 
-            if (itemIndex % 2 == 0)
-            {
-                itemContainer.Background = GetAlternateColor(sender);
-            }
-            else
-            {
-                itemContainer.Background = null;
-            }
+            SetItemContainerBackground(sender, itemContainer, args.ItemIndex);
         }
 
         private static void OnAlternateItemTemplatePropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
@@ -139,19 +140,20 @@ private static void OnAlternateItemTemplatePropertyChanged(DependencyObject send
             }
 
             listViewBase.ContainerContentChanging -= ItemTemplateContainerContentChanging;
+            listViewBase.Unloaded -= OnListViewBaseUnloaded;
 
             if (AlternateItemTemplateProperty != null)
             {
                 listViewBase.ContainerContentChanging += ItemTemplateContainerContentChanging;
+                listViewBase.Unloaded += OnListViewBaseUnloaded;
             }
         }
 
         private static void ItemTemplateContainerContentChanging(Windows.UI.Xaml.Controls.ListViewBase sender, ContainerContentChangingEventArgs args)
         {
             var itemContainer = args.ItemContainer as SelectorItem;
-            var itemIndex = sender.IndexFromContainer(itemContainer);
 
-            if (itemIndex % 2 == 0)
+            if (args.ItemIndex % 2 == 0)
             {
                 itemContainer.ContentTemplate = GetAlternateItemTemplate(sender);
             }
@@ -171,10 +173,12 @@ private static void OnStretchItemContainerDirectionPropertyChanged(DependencyObj
             }
 
             listViewBase.ContainerContentChanging -= StretchItemContainerDirectionChanging;
+            listViewBase.Unloaded -= OnListViewBaseUnloaded;
 
             if (StretchItemContainerDirectionProperty != null)
             {
                 listViewBase.ContainerContentChanging += StretchItemContainerDirectionChanging;
+                listViewBase.Unloaded += OnListViewBaseUnloaded;
             }
         }
 
@@ -193,5 +197,59 @@ private static void StretchItemContainerDirectionChanging(Windows.UI.Xaml.Contro
                 itemContainer.HorizontalContentAlignment = HorizontalAlignment.Stretch;
             }
         }
+
+        private static void OnListViewBaseUnloaded(object sender, RoutedEventArgs e)
+        {
+            Windows.UI.Xaml.Controls.ListViewBase listViewBase = sender as Windows.UI.Xaml.Controls.ListViewBase;
+            _itemsForList.Remove(listViewBase.Items);
+
+            listViewBase.ContainerContentChanging -= StretchItemContainerDirectionChanging;
+            listViewBase.ContainerContentChanging -= ItemTemplateContainerContentChanging;
+            listViewBase.ContainerContentChanging -= ColorContainerContentChanging;
+            listViewBase.Items.VectorChanged -= ColorItemsVectorChanged;
+            listViewBase.Unloaded -= OnListViewBaseUnloaded;
+        }
+
+        private static void ColorItemsVectorChanged(IObservableVector<object> sender, IVectorChangedEventArgs args)
+        {
+            // If the index is at the end we can ignore
+            if (args.Index == (sender.Count - 1))
+            {
+                return;
+            }
+
+            // Only need to handle Inserted and Removed because we'll handle everything else in the
+            // ColorContainerContentChanging method
+            if ((args.CollectionChange == CollectionChange.ItemInserted) || (args.CollectionChange == CollectionChange.ItemRemoved))
+            {
+                _itemsForList.TryGetValue(sender, out Windows.UI.Xaml.Controls.ListViewBase listViewBase);
+                if (listViewBase == null)
+                {
+                    return;
+                }
+
+                int index = (int)args.Index;
+                for (int i = index; i < sender.Count; i++)
+                {
+                    var itemContainer = listViewBase.ContainerFromIndex(i) as Control;
+                    if (itemContainer != null)
+                    {
+                        SetItemContainerBackground(listViewBase, itemContainer, i);
+                    }
+                }
+            }
+        }
+
+        private static void SetItemContainerBackground(Windows.UI.Xaml.Controls.ListViewBase sender, Control itemContainer, int itemIndex)
+        {
+            if (itemIndex % 2 == 0)
+            {
+                itemContainer.Background = GetAlternateColor(sender);
+            }
+            else
+            {
+                itemContainer.Background = null;
+            }
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/NavigationView/NavigationViewExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/NavigationView/NavigationViewExtensions.cs
index ea4cb4c0e10..370394cd013 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/NavigationView/NavigationViewExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/NavigationView/NavigationViewExtensions.cs
@@ -145,9 +145,13 @@ private static void Navview_Loaded(object sender, RoutedEventArgs e)
 
             int value = GetSelectedIndex(navview);
 
-            if (value >= 0 && value < navview.MenuItems.Count && navview.SelectedItem != navview.MenuItems[value])
+            if (value >= 0 && value < navview.MenuItems.Count)
             {
-                navview.SelectedItem = navview.MenuItems[value];
+                // Only update if we need to.
+                if (navview.SelectedItem == null || !navview.SelectedItem.Equals(navview.MenuItems[value] as NavigationViewItem))
+                {
+                    navview.SelectedItem = navview.MenuItems[value];
+                }
             }
             else
             {
diff --git a/build/build.cake b/build/build.cake
index 214d39faec7..08999bba105 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -15,7 +15,7 @@ var target = Argument("target", "Default");
 // VERSIONS
 //////////////////////////////////////////////////////////////////////
 
-var gitVersioningVersion = "2.0.41";
+var gitVersioningVersion = "2.1.23";
 var signClientVersion = "0.9.0";
 
 //////////////////////////////////////////////////////////////////////
@@ -154,8 +154,6 @@ Task("Build")
     .SetConfiguration("Release")
     .WithTarget("Restore");
 
-    // Force a restore again to get proper version numbers https://github.com/NuGet/Home/issues/4337
-    MSBuild(Solution, buildSettings);
     MSBuild(Solution, buildSettings);
 
     EnsureDirectoryExists(nupkgDir);
diff --git a/docs/animations/AnimationSet.md b/docs/animations/AnimationSet.md
index 0c2b6c2e188..77a0f5daf97 100644
--- a/docs/animations/AnimationSet.md
+++ b/docs/animations/AnimationSet.md
@@ -7,7 +7,7 @@ keywords: windows 10, uwp, uwp community toolkit, uwp toolkit, animationset, ani
 
 # AnimationSet
 
-The AnimationSet class defines an object for storing and managing Storyboard and CompositionAnimations for an element. AnimationSet includes [Blur](\Blur.md), [Fade](\Fade.md), [Light](\Light.md), [Offset](\Offset.md), [Rotate](\Rotate.md), [Saturation](\Saturation.md) and [Scale](\Scale.md) animations. AnimationSet animations is applied to all the XAML elements in its parent control/panel. AnimationSet animations doesn't affect the functionality of the control.
+The AnimationSet class defines an object for storing and managing Storyboard and CompositionAnimations for an element. AnimationSet includes [Blur](Blur.md), [Fade](Fade.md), [Light](Light.md), [Offset](Offset.md), [Rotate](Rotate.md), [Saturation](Saturation.md) and [Scale](Scale.md) animations. AnimationSet animations is applied to all the XAML elements in its parent control/panel. AnimationSet animations doesn't affect the functionality of the control.
 
 ## Syntax
 
diff --git a/docs/animations/Blur.md b/docs/animations/Blur.md
index 4fe4baa5af1..52c9a58fa95 100644
--- a/docs/animations/Blur.md
+++ b/docs/animations/Blur.md
@@ -62,7 +62,7 @@ await MyUIElement.Blur(value: 5, duration: 2500, delay: 250).StartAsync();  //Bl
 
     ![Use Case 1 Output](../resources/images/Animations/Blur/Use-Case-1.gif)
 
-- Use this to create chaining animations with other animations. Visit the [AnimationSet](\AnimationSet.md) documentation for more information.
+- Use this to create chaining animations with other animations. Visit the [AnimationSet](AnimationSet.md) documentation for more information.
 
     **Sample Code**
 
diff --git a/docs/animations/Fade.md b/docs/animations/Fade.md
index f38ca51893b..171368a1adc 100644
--- a/docs/animations/Fade.md
+++ b/docs/animations/Fade.md
@@ -61,7 +61,7 @@ You can change the way how the animation interpolates between keyframes by defin
 
 ## Examples
 
-- Use this to create chaining animations with other animations. Visit the [AnimationSet](\AnimationSet.md) documentation for more information.
+- Use this to create chaining animations with other animations. Visit the [AnimationSet](AnimationSet.md) documentation for more information.
 
     **Sample Code**
 
diff --git a/docs/animations/Light.md b/docs/animations/Light.md
index 3cc427ad51c..637ae98c2b4 100644
--- a/docs/animations/Light.md
+++ b/docs/animations/Light.md
@@ -52,7 +52,7 @@ The color of the spot light specified as a Brush
 ## Examples
 
 - The light behavior is great at drawing the user's eye towards a particular pieces of user interface. Closer the light source, the more focused it will be, but, will make the overall UI element darker. The further away from the light source the more the light will spread over the UIElement.
-- Use this to create chaining animations with other animations. Visit the [AnimationSet](\AnimationSet.md) documentation for more information.
+- Use this to create chaining animations with other animations. Visit the [AnimationSet](AnimationSet.md) documentation for more information.
 
     **Sample Code**
 
diff --git a/docs/animations/Offset.md b/docs/animations/Offset.md
index dd523ea6628..feb7cf22918 100644
--- a/docs/animations/Offset.md
+++ b/docs/animations/Offset.md
@@ -87,7 +87,7 @@ You can change the way how the animation interpolates between keyframes by defin
 
     ![Use Case 2 Output](../resources/images/Animations/Offset/Use-Case-1.gif)
 
-- Use this to create chaining animations with other animations. Visit the [AnimationSet](\AnimationSet.md) documentation for more information.
+- Use this to create chaining animations with other animations. Visit the [AnimationSet](AnimationSet.md) documentation for more information.
 
     **Sample Code**
 
diff --git a/docs/animations/Rotate.md b/docs/animations/Rotate.md
index 1c51b34c4a1..dc14f2da206 100644
--- a/docs/animations/Rotate.md
+++ b/docs/animations/Rotate.md
@@ -64,7 +64,7 @@ You can change the way how the animation interpolates between keyframes by defin
 
 ## Examples
 
-- Use this to create chaining animations with other animations. Visit the [AnimationSet](\AnimationSet.md) documentation for more information.
+- Use this to create chaining animations with other animations. Visit the [AnimationSet](AnimationSet.md) documentation for more information.
 
     **Sample Code**
 
diff --git a/docs/animations/Saturation.md b/docs/animations/Saturation.md
index 4c688d15b74..a0dd1aac426 100644
--- a/docs/animations/Saturation.md
+++ b/docs/animations/Saturation.md
@@ -60,7 +60,7 @@ ToolkitLogo.Saturation(value: 0, duration: 500, delay: 250);
 
     ![Use Case 1 Output](../resources/images/Animations/Saturation/Use-Case-1.gif)
 
-- Use this to create chaining animations with other animations. Visit the [AnimationSet](\AnimationSet.md) documentation for more information.
+- Use this to create chaining animations with other animations. Visit the [AnimationSet](AnimationSet.md) documentation for more information.
 
     **Sample Code**
 
diff --git a/docs/animations/Scale.md b/docs/animations/Scale.md
index a2c7772bcf4..477827b7fea 100644
--- a/docs/animations/Scale.md
+++ b/docs/animations/Scale.md
@@ -85,7 +85,7 @@ You can change the way how the animation interpolates between keyframes by defin
 
     ![Use Case 1 Output](../resources/images/Animations/Scale/Sample-Output.gif)
 
-- Use this to create chaining animations with other animations. Visit the [AnimationSet](\AnimationSet.md) documentation for more information.
+- Use this to create chaining animations with other animations. Visit the [AnimationSet](AnimationSet.md) documentation for more information.
 
     **Sample Code**
 
diff --git a/docs/controls/Expander.md b/docs/controls/Expander.md
index 84d50b5c4b6..18b5d549abb 100644
--- a/docs/controls/Expander.md
+++ b/docs/controls/Expander.md
@@ -7,20 +7,8 @@ keywords: windows 10, uwp, uwp community toolkit, uwp toolkit, Expander, xaml Co
 
 # Expander Control
 
-The **Expander Control** provides an expandable container to host any content.
-You can show or hide this content by toggling a Header.
-
-You can use these properties :
-
-* Header
-* HeaderTemplate
-* IsExpanded (define if the content is visible or not)
-* ExpandDirection
-
-You can also use these events :
-
-* Expanded (fires when the expander is opened)
-* Collapsed (fires when the expander is closed)
+The **Expander Control** provides an expandable container to host any content.  It is a specialized form of a [HeaderedContentControl](HeaderedContentControl.md)
+You can show or hide this content by interacting with the Header.
 
 ## Syntax
 
@@ -43,14 +31,12 @@ You can also use these events :
 
 ## Properties
 
-### ExpandDirection
-
-The `ExpandDirection` property can take 4 values that will expand the content based on the selected direction:
-
-* `Down` - from top to bottom (default)
-* `Up` - from bottom to top
-* `Right` - from left to right
-* `Left` - from right to left
+| Property | Type | Description |
+| -- | -- | -- |
+| ContentOverlay | UIElement | Specifies alternate content to show when the Expander is collapsed. |
+| ExpandDirection | ExpandDirection enum | Specifies the direction of where expanded content should be displayed in relation to the header. |
+| HeaderStyle | Style | Specifies an alternate style template for the `ToggleButton` header control. |
+| IsExpanded | bool | Indicates if the Expander is currently open or closed.  The default is `False`. |
 
 ### ContentOverlay
 
@@ -70,11 +56,54 @@ The `ContentOverlay` property can be used to define the content to be shown when
 </controls:Expander>
 ```
 
+### ExpandDirection
+
+The `ExpandDirection` property can take 4 values that will expand the content based on the selected direction:
+
+* `Down` - from top to bottom (default)
+* `Up` - from bottom to top
+* `Right` - from left to right
+* `Left` - from right to left
+
+### HeaderStyle
+
+Allows creating an alternate style for the entire Expander header including the arrow symbol, in contrast to the `HeaderTemplate` which can control the content next to the arrow.
+
+For instance to remove the header entirely from the Expander:
+
+```xaml
+  <Page.Resources>
+    <Style x:Key="NoExpanderHeaderStyle" TargetType="ToggleButton">
+      <Setter Property="Height" Value="0"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="ToggleButton">
+            <Grid/>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+  </Page.Resources>
+
+  <controls:Expander HeaderStyle="{StaticResource NoExpanderHeaderStyle} IsExpanded="True">
+    <TextBlock Text="My Content"/>
+  </controls:Expander>
+```
+
+## Events
+
+<!-- Explain all events in a table format -->
+
+| Events | Description |
+| -- | -- |
+| Collapsed | Fires when the expander is closed. |
+| Expanded | Fires when the expander is opened. |
+
 ## Example Image
 
 ![Expander animation](../resources/images/Controls-Expander.gif "Expander")
 
-## Example Code
+## Sample Code
 
 [Expander Sample Page](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Expander)
 
@@ -90,4 +119,9 @@ The `ContentOverlay` property can be used to define the content to be shown when
 
 ## API
 
-* [Expander source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/Expander)
\ No newline at end of file
+- [Expander source code](https://github.com/Microsoft/UWPCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/Expander)
+
+## Related Topics
+
+- [HeaderedControlControl](HeaderedContentControl.md)
+- [ToggleButton](https://docs.microsoft.com/en-us/uwp/api/Windows.UI.Xaml.Controls.Primitives.ToggleButton)