diff --git a/CharacterMap/CharacterMap/App.xaml b/CharacterMap/CharacterMap/App.xaml
index a5d58fe0..ed997bbd 100644
--- a/CharacterMap/CharacterMap/App.xaml
+++ b/CharacterMap/CharacterMap/App.xaml
@@ -20,6 +20,7 @@
 
                 <ResourceDictionary>
                     <converters:ZoomBackgroundConverter x:Key="ZoomBackgroundConverter" />
+                    <converters:CasingConverter x:Key="CasingConverter" />
 
                     <Style TargetType="FontIcon">
                         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
diff --git a/CharacterMap/CharacterMap/Assets/ZuneAssets/HoverOverlay.png b/CharacterMap/CharacterMap/Assets/ZuneAssets/HoverOverlay.png
new file mode 100644
index 00000000..7b78cd04
Binary files /dev/null and b/CharacterMap/CharacterMap/Assets/ZuneAssets/HoverOverlay.png differ
diff --git a/CharacterMap/CharacterMap/CharacterMap.csproj b/CharacterMap/CharacterMap/CharacterMap.csproj
index dd39d29b..60aa13ca 100644
--- a/CharacterMap/CharacterMap/CharacterMap.csproj
+++ b/CharacterMap/CharacterMap/CharacterMap.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>CharacterMap</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22000.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.20348.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <LangVersion>9.0</LangVersion>
@@ -220,7 +220,7 @@
       <DependentUpon>UnhandledExceptionDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\UXSlider.cs" />
-    <Compile Include="Converters\ZoomBackgroundConverter.cs" />
+    <Compile Include="Converters\Converters.cs" />
     <Compile Include="Core\AlphaKeyGroup.cs" />
     <Compile Include="Core\AppSettings.cs" />
     <Compile Include="Core\ExceptionHandlingSynchronizationContext.cs" />
@@ -403,6 +403,7 @@
     <Content Include="Assets\FileAssociationTile.png" />
     <None Include="Package.StoreAssociation.xml" />
     <Content Include="Assets\ZBG.png" />
+    <Content Include="Assets\ZuneAssets\HoverOverlay.png" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
     <Content Include="Assets\Square150x150Logo.scale-200.png" />
diff --git a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
index c504b50b..772c1eef 100644
--- a/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
+++ b/CharacterMap/CharacterMap/Controls/CharacterGridView.cs
@@ -388,7 +388,7 @@ void UpdateUnicode(GlyphAnnotation value)
             {
                 if (_xamlDirect.GetXamlDirectObject(item.ContentTemplateRoot) is IXamlDirectObject root)
                 {
-                    if (_xamlDirect.GetXamlDirectObjectProperty(root, XamlPropertyIndex.FrameworkElement_Tag) is Character c)
+                    if (_xamlDirect.GetObjectProperty(root, XamlPropertyIndex.FrameworkElement_Tag) is Character c)
                     {
                         var childs = _xamlDirect.GetXamlDirectObjectProperty(root, XamlPropertyIndex.Panel_Children);
                         IXamlDirectObject tb = _xamlDirect.GetXamlDirectObjectFromCollectionAt(childs, 1);
diff --git a/CharacterMap/CharacterMap/Controls/UXButton.cs b/CharacterMap/CharacterMap/Controls/UXButton.cs
index 78237b04..9d1719a0 100644
--- a/CharacterMap/CharacterMap/Controls/UXButton.cs
+++ b/CharacterMap/CharacterMap/Controls/UXButton.cs
@@ -1,11 +1,29 @@
 using CharacterMap.Core;
 using CharacterMap.Helpers;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
 namespace CharacterMap.Controls
 {
+    [ObservableObject]
+    public partial class UXButtonTemplateSettings
+    {
+        [ObservableProperty]
+        string _effectiveLabel;
+
+        public void Update(string text, CharacterCasing casing)
+        {
+            EffectiveLabel = casing switch
+            {
+                CharacterCasing.Upper => text.ToUpper(),
+                CharacterCasing.Lower => text.ToLower(),
+                _ => text
+            };
+        }
+    }
+
     public class UXButton : Button//, IThemeableControl
     {
         public bool IsHintVisible
@@ -32,6 +50,17 @@ public bool IsLabelVisible
                 ((UXButton)d).UpdateLabel();
             }));
 
+        public CharacterCasing LabelCasing
+        {
+            get { return (CharacterCasing)GetValue(LabelCasingProperty); }
+            set { SetValue(LabelCasingProperty, value); }
+        }
+
+        public static readonly DependencyProperty LabelCasingProperty =
+            DependencyProperty.Register(nameof(LabelCasing), typeof(CharacterCasing), typeof(UXButton), new PropertyMetadata(CharacterCasing.Normal, (d, e) =>
+            {
+                ((UXButton)d).UpdateLabelText();
+            }));
 
         public string Label
         {
@@ -40,8 +69,12 @@ public string Label
         }
 
         public static readonly DependencyProperty LabelProperty =
-            DependencyProperty.Register(nameof(Label), typeof(string), typeof(UXButton), new PropertyMetadata(null));
+            DependencyProperty.Register(nameof(Label), typeof(string), typeof(UXButton), new PropertyMetadata(null, (d, e) =>
+            {
+                ((UXButton)d).UpdateLabelText();
+            }));
 
+        public UXButtonTemplateSettings TemplateSettings { get; } = new UXButtonTemplateSettings();
 
         bool _isTemplateApplied = false;
 
@@ -77,6 +110,11 @@ private void UpdateLabel(bool animate = true)
                 VisualStateManager.GoToState(this, IsLabelVisible ? "LabelVisible" : "LabelHidden", animate);
         }
 
+        private void UpdateLabelText()
+        {
+            TemplateSettings.Update(Label, LabelCasing);
+        }
+
         public void UpdateTheme()
         {
             //_themer.Update();
diff --git a/CharacterMap/CharacterMap/Converters/ZoomBackgroundConverter.cs b/CharacterMap/CharacterMap/Converters/Converters.cs
similarity index 75%
rename from CharacterMap/CharacterMap/Converters/ZoomBackgroundConverter.cs
rename to CharacterMap/CharacterMap/Converters/Converters.cs
index 03116d18..e8e2553c 100644
--- a/CharacterMap/CharacterMap/Converters/ZoomBackgroundConverter.cs
+++ b/CharacterMap/CharacterMap/Converters/Converters.cs
@@ -4,6 +4,7 @@
 using Windows.UI.Xaml.Media;
 using CharacterMap.Core;
 using CharacterMap.Helpers;
+using Windows.UI.Xaml.Controls;
 
 namespace CharacterMap.Converters
 {
@@ -23,6 +24,29 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
         }
     }
 
+    public class CasingConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (parameter is CharacterCasing casing && value is string s)
+            {
+                return casing switch
+                {
+                    CharacterCasing.Upper => s.ToUpper(),
+                    CharacterCasing.Lower => s.ToLower(),
+                    _ => s
+                };
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
 
     public class LowerConverter : IValueConverter
     {
diff --git a/CharacterMap/CharacterMap/Core/Localizer.cs b/CharacterMap/CharacterMap/Core/Localizer.cs
index aff25f76..68dda42d 100644
--- a/CharacterMap/CharacterMap/Core/Localizer.cs
+++ b/CharacterMap/CharacterMap/Core/Localizer.cs
@@ -1,4 +1,5 @@
 using CharacterMap.Helpers;
+using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Markup;
 
 namespace CharacterMap.Core
@@ -8,14 +9,21 @@ public class Localizer : MarkupExtension
     {
         public string Key { get; set; }
 
-        public bool Lowercase { get; set; }
+        public CharacterCasing Casing { get; set; } = CharacterCasing.Normal;
 
         protected override object ProvideValue()
         {
-            if (Lowercase)
-                return Localization.Get(Key).ToLower();
+            string text = Localization.Get(Key);
 
-            return Localization.Get(Key);
+            if (Casing != CharacterCasing.Normal)
+                text = Casing switch
+                {
+                    CharacterCasing.Upper => text.ToUpper(),
+                    CharacterCasing.Lower => text.ToLower(),
+                    _ => text
+                };
+
+            return text;
         }
     }
 }
diff --git a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
index bfb52e69..b70bc1d2 100644
--- a/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
+++ b/CharacterMap/CharacterMap/Helpers/FlyoutHelper.cs
@@ -226,9 +226,11 @@ static void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
                     var newCollection = new MenuFlyoutItem
                     {
                         Text = Localization.Get("NewCollectionItem/Text"),
-                        Icon = new FontIcon { Glyph = "\uE109" }
-                };
+                        Icon = new FontIcon { Glyph = "\uE109" },
+                        DataContext = font
+                    };
                     newCollection.Click += CreateCollection_Click;
+
                     if (newColl.Items != null)
                     {
                         newColl.Items.Add(newCollection);
@@ -241,7 +243,8 @@ static void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
                             var symb = new MenuFlyoutItem
                             {
                                 Text = Localization.Get("OptionSymbolFonts/Text"),
-                                IsEnabled = !_collections.SymbolCollection.Fonts.Contains(font.Name)
+                                IsEnabled = !_collections.SymbolCollection.Fonts.Contains(font.Name),
+                                DataContext = font
                             };
                             symb.Click += AddToSymbolFonts_Click;
                             newColl.Items.Add(symb);
@@ -306,7 +309,8 @@ static void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
                         {
                             Text = Localization.Get("RemoveFromCollectionItem/Text"),
                             Icon = new FontIcon { Glyph = "\uE108" },
-                            Tag = font
+                            Tag = font,
+                            DataContext = font
                         };
                         removeItem.Click += RemoveFrom_Click;
                         menu.Items.Add(removeItem);
@@ -321,7 +325,7 @@ static void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
                         {
                             Text = Localization.Get("BtnPrint/Content"),
                             Icon = new FontIcon { Glyph = "\uE749" }
-                    }.AddKeyboardAccelerator(VirtualKey.P, VirtualKeyModifiers.Control);
+                        }.AddKeyboardAccelerator(VirtualKey.P, VirtualKeyModifiers.Control);
 
                         item.Click += Print_Click;
                         menu.Items.Insert(standalone ? 2 : 3, item);
@@ -339,7 +343,8 @@ static void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
                         {
                             Text = Localization.Get("RemoveFontFlyout/Text"),
                             Icon = new FontIcon { Glyph = "\uE107" },
-                            Tag = font
+                            Tag = font,
+                            DataContext = font
                         };
 
                         if (showAdvanced)
@@ -355,7 +360,7 @@ static void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
                 {
                     Text = Localization.Get("CompareFontsButton/Text"),
                     Icon = new FontIcon { Glyph = "\uE1D3" }
-            }.AddKeyboardAccelerator(VirtualKey.K, VirtualKeyModifiers.Control);
+                }.AddKeyboardAccelerator(VirtualKey.K, VirtualKeyModifiers.Control);
 
                 qq.Click += (s, e) =>
                 {
@@ -372,7 +377,7 @@ static void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
                     {
                         Text = Localization.Get("AddToQuickCompare/Text"),
                         Icon = new FontIcon { Glyph = "\uE109" }
-                }.AddKeyboardAccelerator(VirtualKey.Q, VirtualKeyModifiers.Control);
+                    }.AddKeyboardAccelerator(VirtualKey.Q, VirtualKeyModifiers.Control);
 
                     item.Click += (s, e) =>
                     {
diff --git a/CharacterMap/CharacterMap/Helpers/TitleBarHelper.cs b/CharacterMap/CharacterMap/Helpers/TitleBarHelper.cs
index 6fb22ec8..f8282394 100644
--- a/CharacterMap/CharacterMap/Helpers/TitleBarHelper.cs
+++ b/CharacterMap/CharacterMap/Helpers/TitleBarHelper.cs
@@ -38,7 +38,7 @@ internal static string GetTitle()
             return ApplicationView.GetForCurrentView().Title;
         }
 
-        internal static void SetTitleBar(FrameworkElement e)
+        internal static void SetTitleBar(UIElement e)
         {
             SetDefaultTitleBar(Window.Current.Content, e);
 
@@ -61,7 +61,7 @@ internal static void RestoreDefaultTitleBar()
             if (GetDefaultTitleBar(Window.Current.Content) is XamlTitleBar bar)
                 bar.IsDragTarget = true;
 
-            Window.Current.SetTitleBar(GetDefaultTitleBar(Window.Current.Content));
+            SetTitleBar(GetDefaultTitleBar(Window.Current.Content));
         }
     }
 }
diff --git a/CharacterMap/CharacterMap/Styles/Button.xaml b/CharacterMap/CharacterMap/Styles/Button.xaml
index 4b030403..75c85d68 100644
--- a/CharacterMap/CharacterMap/Styles/Button.xaml
+++ b/CharacterMap/CharacterMap/Styles/Button.xaml
@@ -16,6 +16,74 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <Style x:Key="ChromelessButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
+        <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <ContentPresenter
+                        x:Name="ContentPresenter"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        AutomationProperties.AccessibilityView="Raw"
+                        Background="{TemplateBinding Background}"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        ContentTransitions="{TemplateBinding ContentTransitions}">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <PointerDownThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentPresenter.Opacity" Value="0.5" />
+                                    </VisualState.Setters>
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+                    </ContentPresenter>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
 
     <Style x:Key="IconButton" BasedOn="{StaticResource ButtonRevealStyle}" TargetType="Button">
         <Setter Property="Background" Value="{ThemeResource ListViewItemRevealBackground}" />
diff --git a/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml b/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml
index f21bc2ce..17cfff78 100644
--- a/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml
+++ b/CharacterMap/CharacterMap/Styles/ItemTemplates.xaml
@@ -43,12 +43,7 @@
         <Grid
             ColumnSpacing="12"
             Padding="12 4"
-            Background="Transparent"
-            PointerPressed="Grid_PointerPressed">
-            <Grid.ContextFlyout>
-                <!--  Menu content created dynamically  -->
-                <MenuFlyout MenuFlyoutPresenterStyle="{StaticResource DefaultFlyoutStyle}" Opening="FontContextFlyout_Opening" />
-            </Grid.ContextFlyout>
+            Background="Transparent">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
diff --git a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
index 3ec277ee..f642faf1 100644
--- a/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ClassicThemeStyles.xaml
@@ -6,46 +6,40 @@
     xmlns:helpers="using:CharacterMap.Helpers"
     xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <SolidColorBrush x:Key="DefaultHostBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="DefaultPageBackgroundBrush" Color="#191919" />
+            <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#0C0C0C" />
+            <SolidColorBrush x:Key="ControlForegroundBrush" Color="White" />
+            <SolidColorBrush x:Key="CardBorderBrush" Color="#535353" />
+            <SolidColorBrush x:Key="ControlBorderBrush" Color="#535353" />
+            <SolidColorBrush x:Key="ControlActiveBorderBrush" Color="#0078D4" />
+            <SolidColorBrush x:Key="ControlPointerOverBackgroundBrush" Color="#4D4D4D" />
+            <SolidColorBrush x:Key="ControlDisabledForegroundBrush" Color="#838383" />
+            <SolidColorBrush x:Key="ControlPressedBackgroundBrush" Color="#CCE4F7" />
+            <SolidColorBrush x:Key="ControlHighlightBackgroundBrush" Color="#0078D7" />
+            <SolidColorBrush x:Key="ControlHighlightContrastForegroundBrush" Color="White" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <SolidColorBrush x:Key="DefaultHostBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="DefaultPageBackgroundBrush" Color="#F0F0F0" />
+            <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FDFDFD" />
+            <SolidColorBrush x:Key="ControlForegroundBrush" Color="Black" />
+            <SolidColorBrush x:Key="CardBorderBrush" Color="#DCDCDC" />
+            <SolidColorBrush x:Key="ControlBorderBrush" Color="#BABBBB" />
+            <SolidColorBrush x:Key="ControlActiveBorderBrush" Color="#0078D4" />
+            <SolidColorBrush x:Key="ControlPointerOverBackgroundBrush" Color="#E5F1FB" />
+            <SolidColorBrush x:Key="ControlDisabledForegroundBrush" Color="#838383" />
+            <SolidColorBrush x:Key="ControlPressedBackgroundBrush" Color="#CCE4F7" />
+            <SolidColorBrush x:Key="ControlHighlightBackgroundBrush" Color="#0078D7" />
+            <SolidColorBrush x:Key="ControlHighlightContrastForegroundBrush" Color="White" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
     <x:Boolean x:Key="SupportsDarkTheme">False</x:Boolean>
     <x:Boolean x:Key="SupportsShadows">False</x:Boolean>
-
-
-    <Color x:Key="SystemAccentColor">#FF0073CF</Color>
-    <Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltLowColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltMediumColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltMediumHighColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltMediumLowColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemBaseHighColor">#FF000000</Color>
-    <Color x:Key="SystemBaseLowColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemBaseMediumColor">#FF898989</Color>
-    <Color x:Key="SystemBaseMediumHighColor">#FF5D5D5D</Color>
-    <Color x:Key="SystemBaseMediumLowColor">#FF737373</Color>
-    <Color x:Key="SystemChromeAltLowColor">#FF5D5D5D</Color>
-    <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
-    <Color x:Key="SystemChromeBlackLowColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemChromeBlackMediumColor">#FF5D5D5D</Color>
-    <Color x:Key="SystemChromeBlackMediumLowColor">#FF898989</Color>
-    <Color x:Key="SystemChromeDisabledHighColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemChromeDisabledLowColor">#FF898989</Color>
-    <Color x:Key="SystemChromeGrayColor">#FF737373</Color>
-    <Color x:Key="SystemChromeHighColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemChromeLowColor">#FFECECEC</Color>
-    <Color x:Key="SystemChromeMediumColor">#FFE6E6E6</Color>
-    <Color x:Key="SystemChromeMediumLowColor">#FFECECEC</Color>
-    <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemListLowColor">#FFE6E6E6</Color>
-    <Color x:Key="SystemListMediumColor">#FFCCCCCC</Color>
-
-    <Color x:Key="SystemChromeAltMediumHighColor">#CCFFFFFF</Color>
-    <Color x:Key="SystemChromeAltHighColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemRevealListLowColor">#FFE6E6E6</Color>
-    <Color x:Key="SystemRevealListMediumColor">#FFCCCCCC</Color>
-
-    <!--  Override system shape defaults  -->
-    <CornerRadius x:Key="ControlCornerRadius">1</CornerRadius>
-    <CornerRadius x:Key="ButtonControlCornerRadius">2</CornerRadius>
-    <CornerRadius x:Key="OverlayCornerRadius">2</CornerRadius>
+    <CharacterCasing x:Key="TitleCasing">Normal</CharacterCasing>
 
     <!--  Override system generated accent colors  -->
     <Color x:Key="SystemAccentColorLight1">#FF1D85D7</Color>
@@ -54,18 +48,12 @@
     <Color x:Key="SystemAccentColorDark1">#FF0064BE</Color>
     <Color x:Key="SystemAccentColorDark2">#FF0055AD</Color>
     <Color x:Key="SystemAccentColorDark3">#FF00459D</Color>
+    <Color x:Key="SystemAccentColor">#FF0073CF</Color>
 
-    <SolidColorBrush x:Key="DefaultHostBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DefaultPageBackgroundBrush" Color="#F0F0F0" />
-    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FDFDFD" />
-    <SolidColorBrush x:Key="ControlForegroundBrush" Color="Black" />
-    <SolidColorBrush x:Key="ControlBorderBrush" Color="#BABBBB" />
-    <SolidColorBrush x:Key="ControlActiveBorderBrush" Color="#0078D4" />
-    <SolidColorBrush x:Key="ControlPointerOverBackgroundBrush" Color="#E5F1FB" />
-    <SolidColorBrush x:Key="ControlDisabledForegroundBrush" Color="#838383" />
-    <SolidColorBrush x:Key="ControlPressedBackgroundBrush" Color="#CCE4F7" />
-    <SolidColorBrush x:Key="ControlHighlightBackgroundBrush" Color="#0078D7" />
-    <SolidColorBrush x:Key="ControlHighlightContrastForegroundBrush" Color="White" />
+    <!--  Override system shape defaults  -->
+    <CornerRadius x:Key="ControlCornerRadius">1</CornerRadius>
+    <CornerRadius x:Key="ButtonControlCornerRadius">2</CornerRadius>
+    <CornerRadius x:Key="OverlayCornerRadius">2</CornerRadius>
 
     <x:Double x:Key="ContentControlThemeFontSize">12</x:Double>
     <x:Double x:Key="ControlContentThemeFontSize">12</x:Double>
@@ -143,6 +131,10 @@
         <Setter Property="OpticalMarginAlignment" Value="None" />
     </Style>
 
+
+
+    <!--  MISC TEMPLATES  -->
+
     <DataTemplate x:Key="DefaultControlHeaderTemplate">
         <ContentPresenter
             Margin="0 12 0 0"
@@ -153,7 +145,7 @@
     <Style TargetType="controls:XamlTitleBar">
         <Setter Property="Background" Value="{ThemeResource SystemColorControlAccentBrush}" />
         <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}" />
-        <Setter Property="Foreground" Value="White" />
+        <Setter Property="Foreground" Value="{ThemeResource ControlHighlightContrastForegroundBrush}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
@@ -193,7 +185,7 @@
                                 VerticalAlignment="Center"
                                 FontSize="12"
                                 FontWeight="Normal"
-                                Foreground="White"
+                                Foreground="{ThemeResource ControlHighlightContrastForegroundBrush}"
                                 IsHitTestVisible="False"
                                 Style="{StaticResource BaseTextStyle}"
                                 Text="Character Map UWP"
@@ -831,6 +823,8 @@
         </Setter>
     </Style>
 
+    <Style x:Key="QuickCompareContainerStyle" BasedOn="{StaticResource ChromelessButtonStyle}" TargetType="Button" />
+
 
 
 
@@ -965,7 +959,7 @@
 
     <Style x:Key="DefaultSettingsPresenterStyle" TargetType="controls:SettingsPresenter">
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="BorderBrush" Value="#DCDCDC" />
+        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Margin" Value="0 12 0 0" />
         <Setter Property="Template">
@@ -1044,7 +1038,7 @@
 
     <Style x:Key="CompareCardStyle" TargetType="controls:ContentGroup">
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="BorderBrush" Value="#DCDCDC" />
+        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Margin" Value="0 12 0 0" />
         <Setter Property="Template">
diff --git a/CharacterMap/CharacterMap/Themes/SystemThemes.xaml b/CharacterMap/CharacterMap/Themes/SystemThemes.xaml
index 9e6684fc..38b5f8b9 100644
--- a/CharacterMap/CharacterMap/Themes/SystemThemes.xaml
+++ b/CharacterMap/CharacterMap/Themes/SystemThemes.xaml
@@ -5,6 +5,7 @@
     xmlns:converters="using:CharacterMap.Converters"
     xmlns:win1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)">
 
+    <CharacterCasing x:Key="TitleCasing">Normal</CharacterCasing>
     <x:Boolean x:Key="LowercaseTitles">False</x:Boolean>
     <x:Boolean x:Key="SupportsDarkTheme">True</x:Boolean>
     <x:Double x:Key="FontListFlyoutHeight">40</x:Double>
@@ -66,7 +67,6 @@
 
     <Style x:Key="SettingsMenuStyle" TargetType="StackPanel" />
 
-
     <converters:PassthroughConverter x:Key="TitleConverter" />
 
     <StaticResource x:Key="FontSelectorTitleConverter" ResourceKey="TitleConverter" />
@@ -171,14 +171,7 @@
         <ContentPresenter Margin="0 12 0 0" Content="{Binding}" />
     </DataTemplate>
 
-    <!--<Style x:Key="DefaultThemeListViewItemStyle" BasedOn="{StaticResource ListViewItemRevealStyle}" TargetType="ListViewItem">
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="BorderThickness" Value="0 0.5 1 0.5" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ButtonRevealBorderBrush}" />
-    </Style>-->
+    <Style x:Key="QuickCompareContainerStyle" BasedOn="{StaticResource ChromelessButtonStyle}" TargetType="Button" />
 
     <Style x:Key="FontListStyle" TargetType="Border" />
 
@@ -239,7 +232,6 @@
         </Setter>
     </Style>
 
-
     <Style TargetType="ContentDialog">
         <Setter Property="Foreground" Value="{ThemeResource ContentDialogForeground}" />
         <Setter Property="Background" Value="{ThemeResource ContentDialogBackground}" />
@@ -541,7 +533,6 @@
         </Setter>
     </Style>
 
-
     <Style x:Key="CompareCardStyle" TargetType="controls:ContentGroup">
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}" />
diff --git a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
index 5a7d684f..f5d82c91 100644
--- a/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
+++ b/CharacterMap/CharacterMap/Themes/ZuneThemeStyles.xaml
@@ -7,6 +7,7 @@
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
+    <CharacterCasing x:Key="TitleCasing">Lower</CharacterCasing>
     <x:Boolean x:Key="LowercaseTitles">True</x:Boolean>
     <x:Boolean x:Key="SupportsDarkTheme">False</x:Boolean>
     <x:Boolean x:Key="SupportsShadows">False</x:Boolean>
@@ -14,8 +15,8 @@
     <BrushTransition x:Key="DefaultBrushTransition" Duration="0:0:0.1" />
 
 
-    
-    
+
+
     <!--  SYSTEM BRUSHES  -->
 
     <Color x:Key="SystemAccentColor">#F10DA2</Color>
@@ -107,8 +108,9 @@
     <SolidColorBrush x:Key="DefaultHostBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ScrollBarBorderBrush" Color="#B8B5B5" />
     <SolidColorBrush x:Key="ControlFocusedAccentBrush" Color="#FA6EC9" />
-    <SolidColorBrush x:Key="CheckBoxBorderBrush" Color="#7F7E7D" />
+    <SolidColorBrush x:Key="CheckBoxBorderBrush" Color="#FF000000" />
     <SolidColorBrush x:Key="ControlPointerOverForegroundBrush" Color="#828689" />
+
     <SolidColorBrush x:Key="DefaultControlForegroundBrush" Color="#373A3D" />
     <SolidColorBrush x:Key="ButtonForegroundBrush" Color="Black" />
     <SolidColorBrush x:Key="ButtonForegroundPointerOverBrush" Color="#A3A3A3" />
@@ -123,6 +125,8 @@
     <SolidColorBrush x:Key="ComboBoxDropDownBorderBrush" Color="#A6A6A6" />
     <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#D8D8D9" />
     <SolidColorBrush x:Key="SelectedPointerOverBackgroundBrush" Color="#E7E8E8" />
+    <SolidColorBrush x:Key="ControlGlyphBrush" Color="#555555" />
+    <SolidColorBrush x:Key="ControlContentPointerOverForeground" Color="#B1B4B6" />
 
     <LinearGradientBrush x:Key="ComboBoxBackground" StartPoint="0.5,0" EndPoint="0.5,1">
         <GradientStop Offset="1" Color="#FFD8D8D8" />
@@ -160,6 +164,8 @@
 
     <!--  TEXT STYLES  -->
 
+    <CharacterCasing x:Key="UpperCasing">Upper</CharacterCasing>
+
     <Style x:Key="FontFilterTitleStyle" TargetType="TextBlock">
         <Setter Property="FontSize" Value="16" />
         <Setter Property="FontWeight" Value="Light" />
@@ -390,9 +396,11 @@
 
     <!--  GRIDVIEW  -->
 
+    <ImageBrush x:Key="TileOverlayBrush" ImageSource="ms-appx:///Assets/ZuneAssets/HoverOverlay.png" />
+
     <Style x:Key="DefaultGridViewItemStyle" TargetType="GridViewItem">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="TabNavigation" Value="Local" />
         <Setter Property="IsHoldingEnabled" Value="False" />
@@ -405,19 +413,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GridViewItem">
-                    <ContentPresenter
-                        x:Name="ContentPresenter"
-                        Margin="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        ContentTransitions="{TemplateBinding ContentTransitions}"
-                        Control.IsTemplateFocusTarget="True"
-                        FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-                        FocusVisualSecondaryBrush="{ThemeResource SystemControlHighlightListLowBrush}"
-                        FocusVisualSecondaryThickness="2">
+                    <Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -427,6 +423,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxBorderBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ImageHover" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="0.8" />
+                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
 
@@ -441,7 +440,7 @@
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAccentBrush}" />
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxBorderBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -451,6 +450,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CheckBoxBorderBrush}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ImageHover" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
 
@@ -463,7 +465,29 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                    </ContentPresenter>
+
+                        <ContentPresenter
+                            x:Name="ContentPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                            Control.IsTemplateFocusTarget="True"
+                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
+                            FocusVisualSecondaryBrush="{ThemeResource SystemControlHighlightListLowBrush}"
+                            FocusVisualSecondaryThickness="2" />
+
+                        <Rectangle
+                            x:Name="ImageHover"
+                            x:Load="False"
+                            helpers:CompositionFactory.OpacityDuration="0:0:0.08"
+                            Fill="{StaticResource TileOverlayBrush}"
+                            IsHitTestVisible="False"
+                            Opacity="0" />
+                    </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -754,10 +778,10 @@
                             Margin="0 0 0 6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Bottom"
-                            FontSize="11.333"
+                            FontSize="10"
                             FontWeight="SemiBold"
-                            Foreground="{ThemeResource TextControlPlaceholderForeground}"
-                            Text="{TemplateBinding Label}"
+                            Foreground="{ThemeResource DefaultControlForegroundBrush}"
+                            Text="{Binding TemplateSettings.EffectiveLabel, RelativeSource={RelativeSource Mode=TemplatedParent}}"
                             Visibility="Collapsed" />
 
                         <FontIcon
@@ -803,6 +827,7 @@
     <Style x:Key="DevToolsAppBarButtonStyle" BasedOn="{StaticResource DefaultThemeAppBarButtonStyle}" TargetType="controls:UXButton">
         <Setter Property="Height" Value="52" />
         <Setter Property="IsLabelVisible" Value="True" />
+        <Setter Property="LabelCasing" Value="Upper" />
     </Style>
 
     <Style x:Key="CopyButtonStyle" BasedOn="{StaticResource DefaultThemeAppBarButtonStyle}" TargetType="controls:UXButton">
@@ -810,16 +835,6 @@
         <Setter Property="Width" Value="50" />
     </Style>
 
-    <!--<Style x:Key="DefaultThemeListViewItemStyle" BasedOn="{StaticResource ListViewItemRevealStyle}" TargetType="ListViewItem">
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="BorderThickness" Value="0 0.5 1 0.5" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ButtonRevealBorderBrush}" />
-    </Style>-->
-
-
     <Style x:Key="DefaultThemeButtonStyle" TargetType="Button">
         <Setter Property="Background" Value="{ThemeResource ButtonBackgroundBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource ControlForegroundBrush}" />
@@ -903,6 +918,83 @@
 
     <Style x:Key="AccentButtonStyle" BasedOn="{StaticResource DefaultThemeButtonStyle}" TargetType="Button" />
 
+    <Style x:Key="QuickCompareContainerStyle" TargetType="Button">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ImageHover" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="0.8" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <PointerDownThemeAnimation Storyboard.TargetName="ContentPresenter" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ImageHover" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="0.8" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootGrid.Opacity" Value="0.5" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+                        <ContentPresenter
+                            x:Name="ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Background="{TemplateBinding Background}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        <Rectangle
+                            x:Name="ImageHover"
+                            x:Load="False"
+                            Margin="-8 0 0 0"
+                            helpers:CompositionFactory.OpacityDuration="0:0:0.08"
+                            Fill="{StaticResource TileOverlayBrush}"
+                            IsHitTestVisible="False"
+                            Opacity="0" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
 
 
 
@@ -2357,6 +2449,22 @@
                         Orientation="Horizontal"
                         Spacing="8">
                         <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup>
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="NormalRectangle.Stroke" Value="Black" />
+                                        <Setter Target="CheckGlyph.Fill" Value="Black" />
+                                        <Setter Target="Presenter.Foreground" Value="{ThemeResource ControlContentPointerOverForeground}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="Presenter.Foreground" Value="{ThemeResource ControlContentPointerOverForeground}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
                             <VisualStateGroup x:Name="CheckStates">
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
@@ -2379,12 +2487,12 @@
                         <Grid Width="18" Height="20">
                             <Rectangle
                                 x:Name="NormalRectangle"
-                                Width="18"
-                                Height="18"
+                                Width="16"
+                                Height="16"
                                 Fill="{ThemeResource CheckBoxBackgroundBrush}"
                                 RadiusX="10"
                                 RadiusY="10"
-                                Stroke="{ThemeResource CheckBoxBorderBrush}"
+                                Stroke="{ThemeResource ControlGlyphBrush}"
                                 StrokeThickness="1"
                                 UseLayoutRounding="False" />
 
@@ -2393,7 +2501,7 @@
                                 Width="9"
                                 Height="9"
                                 helpers:CompositionFactory.OpacityDuration="{StaticResource BrushDuration}"
-                                Fill="{ThemeResource CheckBoxBorderBrush}"
+                                Fill="{ThemeResource ControlGlyphBrush}"
                                 Opacity="0"
                                 RadiusX="10"
                                 RadiusY="10"
@@ -2401,6 +2509,7 @@
                         </Grid>
 
                         <ContentPresenter
+                            x:Name="Presenter"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Content}"
                             TextLineBounds="Tight" />
@@ -4686,20 +4795,15 @@
                                 <VisualState x:Name="Normal" />
 
                                 <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="White" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContainerBackgroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="SwitchKnobOn.Fill" Value="Black" />
+                                        <Setter Target="SwitchKnobOff.Fill" Value="Black" />
+                                        <!--<Setter Target="OuterBorder.Background" Value="White" />-->
+                                        <Setter Target="OuterBorder.BorderBrush" Value="Black" />
+                                        <!--<Setter Target="SwitchKnobBounds.Stroke" Value="Black" />-->
+                                        <Setter Target="OnContentPresenter.Foreground" Value="{ThemeResource ControlContentPointerOverForeground}" />
+                                        <Setter Target="OffContentPresenter.Foreground" Value="{ThemeResource ControlContentPointerOverForeground}" />
+                                    </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
@@ -4961,7 +5065,7 @@
                                 RadiusX="4"
                                 RadiusY="4"
                                 Stroke="Transparent"
-                                StrokeThickness="2" />
+                                StrokeThickness="1" />
                             <Grid
                                 x:Name="SwitchKnob"
                                 Grid.Row="1"
@@ -4972,7 +5076,7 @@
                                     x:Name="SwitchKnobOn"
                                     Width="10"
                                     Height="10"
-                                    Fill="Black"
+                                    Fill="{ThemeResource ControlGlyphBrush}"
                                     Opacity="0"
                                     RadiusX="2"
                                     RadiusY="2" />
@@ -4980,7 +5084,7 @@
                                     x:Name="SwitchKnobOff"
                                     Width="10"
                                     Height="10"
-                                    Fill="{ThemeResource CheckBoxBorderBrush}"
+                                    Fill="{ThemeResource ControlGlyphBrush}"
                                     RadiusX="2"
                                     RadiusY="2" />
                                 <Grid.RenderTransform>
@@ -4998,11 +5102,8 @@
                                     </ControlTemplate>
                                 </Thumb.Template>
                             </Thumb>
-
                         </Grid>
-
                     </Grid>
-
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/CharacterMap/CharacterMap/Views/FontMapView.xaml.cs b/CharacterMap/CharacterMap/Views/FontMapView.xaml.cs
index 6e6b978f..84632728 100644
--- a/CharacterMap/CharacterMap/Views/FontMapView.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/FontMapView.xaml.cs
@@ -228,6 +228,9 @@ private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e
                         {
                             try
                             {
+                                if (PreviewGrid.Visibility == Visibility.Collapsed || PreviewGridContent.Visibility == Visibility.Collapsed)
+                                    return;
+
                                 // Empty glyphs will cause the connected animation service to crash, so manually
                                 // check if the rendered glyph contains content
                                 if (CharGrid.ContainerFromItem(ViewModel.SelectedChar) is FrameworkElement container
diff --git a/CharacterMap/CharacterMap/Views/MainPage.xaml b/CharacterMap/CharacterMap/Views/MainPage.xaml
index 7165bf39..ff136879 100644
--- a/CharacterMap/CharacterMap/Views/MainPage.xaml
+++ b/CharacterMap/CharacterMap/Views/MainPage.xaml
@@ -27,6 +27,10 @@
             IsSourceGrouped="True"
             Source="{Binding GroupedFontList}" />
 
+        <MenuFlyout
+            x:Name="FontListFlyout"
+            MenuFlyoutPresenterStyle="{StaticResource DefaultFlyoutStyle}"
+            Placement="Bottom" />
     </Page.Resources>
 
     <Grid
@@ -47,7 +51,7 @@
             Grid.ColumnSpan="2"
             VerticalAlignment="Top"
             Canvas.ZIndex="10">
-            <StackPanel Orientation="Horizontal">
+            <Grid>
                 <ToggleButton
                     x:Name="ToggleFullScreenModeButton"
                     x:Uid="ToggleFullScreenModeButton"
@@ -59,7 +63,22 @@
                     ToolTipService.Placement="Right">
                     <FontIcon FontSize="14" Glyph="&#xE740;" />
                 </ToggleButton>
-            </StackPanel>
+
+                <controls:UXButton
+                    x:Name="ZuneSettingsButton"
+                    x:Load="False"
+                    HorizontalAlignment="Right"
+                    Click="BtnSettings_OnClick"
+                    FontSize="9"
+                    Foreground="#8A8D90"
+                    Style="{StaticResource MapInfoButtonStyle}">
+                    <TextBlock
+                        CharacterSpacing="30"
+                        FontWeight="Bold"
+                        Text="{core:Localizer Key='SettingsHeader/Text', Casing=Upper}" />
+                </controls:UXButton>
+
+            </Grid>
         </controls:XamlTitleBar>
 
         <!--  Main Content  -->
@@ -374,6 +393,7 @@
                                 <SemanticZoom.ZoomedInView>
                                     <controls:ExtendedListView
                                         x:Name="LstFontFamily"
+                                        ContainerContentChanging="LstFontFamily_ContainerContentChanging"
                                         IsItemClickEnabled="False"
                                         IsSwipeEnabled="False"
                                         ItemTemplate="{StaticResource FontListItemTemplate}"
@@ -534,10 +554,10 @@
                             Margin="-6 0 0 0"
                             Click="BtnSettings_OnClick"
                             Foreground="{ThemeResource AppBarItemForegroundThemeBrush}"
-                            Label="Settings"
+                            Label="{core:Localizer Key='SettingsHeader/Text'}"
                             Style="{StaticResource MapInfoButtonStyle}">
                             <ToolTipService.ToolTip>
-                                <TextBlock x:Uid="SettingsHeader" Text="Settings" />
+                                <TextBlock x:Uid="SettingsHeader" d:Text="Settings" />
                             </ToolTipService.ToolTip>
                             <FontIcon
                                 HorizontalAlignment="Center"
@@ -629,7 +649,7 @@
                 <TextBlock
                     HorizontalAlignment="Center"
                     Style="{StaticResource TitleTextStyle}"
-                    Text="{core:Localizer Key=TxtLoadingFonts/Text, Lowercase={StaticResource LowercaseTitles}}" />
+                    Text="{core:Localizer Key=TxtLoadingFonts/Text, Casing={StaticResource TitleCasing}}" />
             </StackPanel>
 
         </Grid>
@@ -748,6 +768,8 @@
                 </VisualState>
                 <VisualState x:Name="ZuneThemeState">
                     <VisualState.Setters>
+                        <Setter Target="BtnSettings.Visibility" Value="Collapsed" />
+                        <Setter Target="ZuneSettingsButton.Visibility" Value="Visible" />
                         <Setter Target="InlineLabelCount.IsHitTestVisible" Value="False" />
                         <Setter Target="InlineLabelCount.FontSize" Value="11" />
                         <Setter Target="InlineLabelCount.FontWeight" Value="SemiBold" />
diff --git a/CharacterMap/CharacterMap/Views/MainPage.xaml.cs b/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
index c02d1a14..1c4cd52d 100644
--- a/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
+++ b/CharacterMap/CharacterMap/Views/MainPage.xaml.cs
@@ -18,12 +18,14 @@
 using System.Windows.Input;
 using Windows.ApplicationModel.Core;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.Foundation;
 using Windows.Storage.Pickers;
 using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Navigation;
@@ -465,6 +467,47 @@ private void FontCompareButton_Click(object sender, RoutedEventArgs e)
             _ = QuickCompareView.CreateWindowAsync(false);
         }
 
+        private void LstFontFamily_ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
+        {
+            args.ItemContainer.PointerPressed -= ItemContainer_PointerPressed;
+            args.ItemContainer.PointerPressed += ItemContainer_PointerPressed;
+
+            args.ItemContainer.ContextRequested -= ItemContainer_ContextRequested;
+            args.ItemContainer.ContextRequested += ItemContainer_ContextRequested;
+        }
+
+        private void ItemContainer_PointerPressed(object sender, PointerRoutedEventArgs e)
+        {
+            /* MIDDLE CLICK FOR FONT LIST */
+            var pointer = e.GetCurrentPoint(sender as FrameworkElement);
+            if (pointer.Properties.IsMiddleButtonPressed
+                && sender is ListViewItem f
+                && f.Content is InstalledFont font)
+            {
+                _ = FontMapView.CreateNewViewForFontAsync(font);
+            }
+        }
+
+        private void ItemContainer_ContextRequested(UIElement sender, ContextRequestedEventArgs args)
+        {
+            /* RIGHT CLICK FOR FONT LIST */
+            if (sender is ListViewItem f
+                && f.Content is InstalledFont font)
+            {
+                args.Handled = true;
+                FlyoutBase.SetAttachedFlyout(f, FontListFlyout);
+                FlyoutHelper.CreateMenu(
+                        FontListFlyout,
+                        font,
+                        null,
+                        null,
+                        false);
+
+                args.TryGetPosition(sender, out Point pos);
+                FontListFlyout.ShowAt(sender, pos);
+            }
+        }
+
 
 
 
diff --git a/CharacterMap/CharacterMap/Views/QuickCompareView.xaml b/CharacterMap/CharacterMap/Views/QuickCompareView.xaml
index 47ea88d9..10720d3f 100644
--- a/CharacterMap/CharacterMap/Views/QuickCompareView.xaml
+++ b/CharacterMap/CharacterMap/Views/QuickCompareView.xaml
@@ -34,68 +34,6 @@
                 Icon="NewWindow" />
         </MenuFlyout>
 
-        <Style x:Key="ChromelessButtonStyle" BasedOn="{StaticResource ButtonRevealStyle}" TargetType="Button">
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
-            <Setter Property="BorderBrush" Value="Transparent" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Stretch" />
-            <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-            <Setter Property="FontWeight" Value="Normal" />
-            <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-            <Setter Property="FocusVisualMargin" Value="-3" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            AutomationProperties.AccessibilityView="Raw"
-                            Background="{TemplateBinding Background}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}">
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal">
-                                        <Storyboard>
-                                            <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                        </Storyboard>
-                                    </VisualState>
-
-                                    <VisualState x:Name="PointerOver">
-                                        <Storyboard>
-                                            <PointerUpThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                        </Storyboard>
-                                    </VisualState>
-
-                                    <VisualState x:Name="Pressed">
-                                        <Storyboard>
-                                            <PointerDownThemeAnimation Storyboard.TargetName="ContentPresenter" />
-                                        </Storyboard>
-                                    </VisualState>
-
-                                    <VisualState x:Name="Disabled">
-                                        <VisualState.Setters>
-                                            <Setter Target="RootGrid.Opacity" Value="0.5" />
-                                        </VisualState.Setters>
-                                    </VisualState>
-
-                                </VisualStateGroup>
-
-                            </VisualStateManager.VisualStateGroups>
-                        </ContentPresenter>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
         <muxc:UniformGridLayout
             x:Name="GridLayout"
             ItemsStretch="Fill"
@@ -520,7 +458,8 @@
                         </Border.RenderTransform>
                         <GridView
                             x:Name="Repeater"
-                            Padding="0 0 0 0"
+                            Margin="-8 0 0 0"
+                            Padding="8 0 0 0"
                             ContainerContentChanging="Repeater_ContainerContentChanging"
                             ItemTemplate="{StaticResource StackTemplate}"
                             ItemsSource="{x:Bind ViewModel.ItemsSource, Mode=OneWay}">
@@ -550,7 +489,7 @@
                                                     Content="{TemplateBinding Content}"
                                                     ContentTemplate="{TemplateBinding ContentTemplate}"
                                                     ContextRequested="ItemContextRequested"
-                                                    Style="{StaticResource ChromelessButtonStyle}" />
+                                                    Style="{StaticResource QuickCompareContainerStyle}" />
                                             </ControlTemplate>
                                         </Setter.Value>
                                     </Setter>
@@ -625,7 +564,7 @@
                                     <DataTemplate x:DataType="core:FontVariant">
                                         <controls:ContentGroup>
                                             <controls:ContentGroup.Text>
-                                                <TextBlock Foreground="{ThemeResource TextControlPlaceholderForeground}" Text="{x:Bind PreferredName}" />
+                                                <TextBlock FontSize="{StaticResource ControlContentThemeFontSize}" Foreground="{ThemeResource TextControlPlaceholderForeground}" Text="{x:Bind PreferredName}" />
                                             </controls:ContentGroup.Text>
                                             <controls:ContentGroup.SecondaryContent>
                                                 <TextBlock