diff --git a/src/Certify.UI.Desktop/App.xaml b/src/Certify.UI.Desktop/App.xaml
index 05f269b45..de8f9f8b3 100644
--- a/src/Certify.UI.Desktop/App.xaml
+++ b/src/Certify.UI.Desktop/App.xaml
@@ -2,77 +2,100 @@
     x:Class="Certify.UI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:utils="clr-namespace:Certify.UI.Utils;assembly=Certify.UI.Shared"
     StartupUri="pack://application:,,,/Certify.UI.Shared;component/Windows/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Green.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Green.xaml" />
-
                 <ResourceDictionary Source="pack://application:,,,/ToastNotifications.Messages;component/Themes/Default.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Themes/Fluent.xaml" />
+
+
             </ResourceDictionary.MergedDictionaries>
+
+            <Color x:Key="SystemAccentColor">#FF78B83E</Color>
+            <Color x:Key="SystemAccentColorLight1">#FF8FC75A</Color>
+            <Color x:Key="SystemAccentColorLight2">#FFA8D27A</Color>
+            <Color x:Key="SystemAccentColorLight3">#FFDDEECD</Color>
+            <Color x:Key="SystemAccentColorDark1">#FF5EA02D</Color>
+            <Color x:Key="SystemAccentColorDark2">#FF467D1F</Color>
+            <Color x:Key="SystemAccentColorDark3">#FF315916</Color>
+            <SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="#FF78B83E" />
+            <SolidColorBrush x:Key="AccentFillColorSecondaryBrush" Color="#FF6EAA38" />
+            <SolidColorBrush x:Key="AccentFillColorTertiaryBrush" Color="#FFDDEECD" />
+            <SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="#6680B950" />
+            <SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush" Color="#FFFFFFFF" />
+            <SolidColorBrush x:Key="ValidationErrorBrush" Color="#FFD32F2F" />
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="#FF78B83E" />
+
             <!--  Heading  -->
-            <Style x:Key="Subheading" TargetType="TextBlock">
+            <Style
+                x:Key="Subheading"
+                BasedOn="{StaticResource {x:Type TextBlock}}"
+                TargetType="TextBlock">
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="FontFamily" Value="Segoe UI Semibold" />
                 <Setter Property="FontSize" Value="14" />
                 <Setter Property="Padding" Value="0,0,0,4" />
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
             </Style>
             <!--  Heading With Top Margin  -->
-            <Style x:Key="SubheadingWithMargin" TargetType="TextBlock">
+            <Style
+                x:Key="SubheadingWithMargin"
+                BasedOn="{StaticResource {x:Type TextBlock}}"
+                TargetType="TextBlock">
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="FontFamily" Value="Segoe UI Semibold" />
                 <Setter Property="FontSize" Value="14" />
                 <Setter Property="Padding" Value="0,8,0,4" />
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
             </Style>
             <!--  Instruction Text  -->
 
-            <Style x:Key="Instructions" TargetType="TextBlock">
+            <Style
+                x:Key="Instructions"
+                BasedOn="{StaticResource {x:Type TextBlock}}"
+                TargetType="TextBlock">
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="FontFamily" Value="Segoe UI" />
-                <Setter Property="FontSize" Value="12" />
-                <Setter Property="Padding" Value="0,6,0,6" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMediumHigh}" />
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
                 <Setter Property="TextWrapping" Value="WrapWithOverflow" />
 
             </Style>
-            <Style x:Key="Info" TargetType="TextBlock">
+            <Style
+                x:Key="Info"
+                BasedOn="{StaticResource {x:Type TextBlock}}"
+                TargetType="TextBlock">
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="FontFamily" Value="Segoe UI" />
-                <Setter Property="FontSize" Value="12" />
-                <Setter Property="Padding" Value="0,2,0,2" />
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMediumHigh}" />
+
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
                 <Setter Property="TextWrapping" Value="WrapWithOverflow" />
             </Style>
 
-            <!--  brush color overrides (tab items and disabled buttons)  -->
-            <SolidColorBrush x:Key="MahApps.Brushes.Gray" Color="{DynamicResource MahApps.Colors.SystemChromeHigh}" />
-            <SolidColorBrush x:Key="MahApps.Brushes.Control.Disabled" Color="{DynamicResource MahApps.Colors.SystemAltLow}" />
+            <Style BasedOn="{StaticResource {x:Type Window}}" TargetType="Window">
+                <Setter Property="Background" Value="{DynamicResource LayerFillColorDefaultBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
 
-            <Style TargetType="controls:NumericUpDown">
-                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
+                <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+                <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.ComboBox}" TargetType="ComboBox">
-                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
+            <Style BasedOn="{StaticResource {x:Type UserControl}}" TargetType="UserControl">
+                <Setter Property="Background" Value="{DynamicResource LayerFillColorDefaultBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.TextBox}" TargetType="TextBox">
-                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
+            <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.Button}" TargetType="Button">
-                <Setter Property="FontSize" Value="12" />
-                <Setter Property="FontWeight" Value="Normal" />
-                <Setter Property="BorderThickness" Value="1" />
+            <Style BasedOn="{StaticResource {x:Type ListView}}" TargetType="ListView">
+                <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+            </Style>
 
-                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}" />
-                <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
-                <Setter Property="controls:ControlsHelper.CornerRadius" Value="0" />
+            <Style BasedOn="{StaticResource {x:Type ListViewItem}}" TargetType="ListViewItem">
+                <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
             </Style>
 
             <!--  control templates  -->
diff --git a/src/Certify.UI.Shared/Certify.UI.Shared.csproj b/src/Certify.UI.Shared/Certify.UI.Shared.csproj
index a2ff71ac2..b1accc0fb 100644
--- a/src/Certify.UI.Shared/Certify.UI.Shared.csproj
+++ b/src/Certify.UI.Shared/Certify.UI.Shared.csproj
@@ -6,7 +6,7 @@
         <UseWindowsForms>true</UseWindowsForms>
         <!--assembly version specified here to allow WPF to load windows via startupUI without version dependency-->
         <AssemblyVersion>6.0.0.*</AssemblyVersion>
-        <NoWarn>NU1701</NoWarn>
+        <NoWarn>$(NoWarn);NU1701;WPF0001</NoWarn>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
@@ -25,12 +25,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ControlzEx" Version="7.0.4" />
         <PackageReference Include="Fody" Version="6.9.3" PrivateAssets="All" />
         <PackageReference Include="FontAwesome.WPF" Version="4.7.0.9">
             <NoWarn>NU1701</NoWarn>
         </PackageReference>
-        <PackageReference Include="MahApps.Metro" Version="3.0.0-rc0529" />
         <PackageReference Include="Markdig" Version="1.1.3" />
         <PackageReference Include="Markdig.Wpf" Version="0.5.0.1" />
         <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
diff --git a/src/Certify.UI.Shared/Controls/Fluent/NumberBox.cs b/src/Certify.UI.Shared/Controls/Fluent/NumberBox.cs
new file mode 100644
index 000000000..c4495d523
--- /dev/null
+++ b/src/Certify.UI.Shared/Controls/Fluent/NumberBox.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Certify.UI.Controls.Fluent
+{
+    public class NumberBox : TextBox
+    {
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register(nameof(Value), typeof(double?), typeof(NumberBox), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, CoerceValue));
+
+        public static readonly DependencyProperty MinimumProperty =
+            DependencyProperty.Register(nameof(Minimum), typeof(double), typeof(NumberBox), new PropertyMetadata(double.MinValue, OnLimitChanged));
+
+        public static readonly DependencyProperty MaximumProperty =
+            DependencyProperty.Register(nameof(Maximum), typeof(double), typeof(NumberBox), new PropertyMetadata(double.MaxValue, OnLimitChanged));
+
+        public static readonly DependencyProperty IntervalProperty =
+            DependencyProperty.Register(nameof(Interval), typeof(double), typeof(NumberBox), new PropertyMetadata(1d));
+
+        private bool _updatingText;
+
+        public NumberBox()
+        {
+            TextChanged += NumberBox_TextChanged;
+            PreviewKeyDown += NumberBox_PreviewKeyDown;
+        }
+
+        public event RoutedPropertyChangedEventHandler<double?> ValueChanged;
+
+        public double? Value
+        {
+            get => (double?)GetValue(ValueProperty);
+            set => SetValue(ValueProperty, value);
+        }
+
+        public double Minimum
+        {
+            get => (double)GetValue(MinimumProperty);
+            set => SetValue(MinimumProperty, value);
+        }
+
+        public double Maximum
+        {
+            get => (double)GetValue(MaximumProperty);
+            set => SetValue(MaximumProperty, value);
+        }
+
+        public double Interval
+        {
+            get => (double)GetValue(IntervalProperty);
+            set => SetValue(IntervalProperty, value);
+        }
+
+        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is NumberBox numberBox)
+            {
+                numberBox.UpdateText();
+                numberBox.ValueChanged?.Invoke(numberBox, new RoutedPropertyChangedEventArgs<double?>((double?)e.OldValue, (double?)e.NewValue));
+            }
+        }
+
+        private static void OnLimitChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.CoerceValue(ValueProperty);
+        }
+
+        private static object CoerceValue(DependencyObject d, object baseValue)
+        {
+            if (d is NumberBox numberBox && baseValue is double value)
+            {
+                return numberBox.CoerceValueWithinBounds(value);
+            }
+
+            return baseValue;
+        }
+
+        private void NumberBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_updatingText)
+            {
+                return;
+            }
+
+            if (double.TryParse(Text, NumberStyles.Float, CultureInfo.CurrentCulture, out var value))
+            {
+                Value = value;
+            }
+        }
+
+        private void NumberBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key != Key.Up && e.Key != Key.Down)
+            {
+                return;
+            }
+
+            var currentValue = Value ?? (Minimum != double.MinValue ? Minimum : 0);
+            Value = currentValue + (e.Key == Key.Up ? Interval : -Interval);
+            e.Handled = true;
+        }
+
+        private double CoerceValueWithinBounds(double value)
+        {
+            return Math.Max(Minimum, Math.Min(Maximum, value));
+        }
+
+        private void UpdateText()
+        {
+            _updatingText = true;
+            Text = Value?.ToString(CultureInfo.CurrentCulture) ?? string.Empty;
+            _updatingText = false;
+        }
+    }
+}
diff --git a/src/Certify.UI.Shared/Controls/GettingStarted.xaml b/src/Certify.UI.Shared/Controls/GettingStarted.xaml
index 638d6be29..c6cb70b38 100644
--- a/src/Certify.UI.Shared/Controls/GettingStarted.xaml
+++ b/src/Certify.UI.Shared/Controls/GettingStarted.xaml
@@ -2,7 +2,6 @@
     x:Class="Certify.UI.Controls.GettingStarted"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Custom="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
     xmlns:local="clr-namespace:Certify.UI.Controls"
@@ -27,13 +26,13 @@
                     Margin="0,0,0,0"
                     FontFamily="Segoe UI"
                     FontSize="30"
-                    Foreground="{DynamicResource MahApps.Brushes.Gray1}"
+                    Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                     TextWrapping="Wrap"><Run FontWeight="Bold" Text="Certify" /><Run Text=" the web" /></TextBlock>
                 <TextBlock
                     Margin="0,0,0,8"
                     FontFamily="Segoe UI"
                     FontSize="16"
-                    Foreground="{DynamicResource MahApps.Brushes.Gray1}"
+                    Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                     Text="Certify Certificate Manager"
                     TextWrapping="Wrap" />
                 <TextBlock Style="{StaticResource Instructions}" TextWrapping="Wrap">
@@ -47,7 +46,6 @@
                 <GroupBox
                     x:Name="CommunityEdition"
                     Margin="0,16,0,0"
-                    Custom:HeaderedControlHelper.HeaderBackground="{StaticResource ErrorColorBrush}"
                     BorderThickness="0"
                     Header="License Not Activated"
                     Visibility="{Binding IsLicenseUpgradeRecommended, Converter={StaticResource ResourceKey=BooleanToVisibilityConverter}}">
@@ -72,7 +70,7 @@
                         VerticalAlignment="Top"
                         FontSize="12"
                         FontWeight="Bold"
-                        Foreground="{StaticResource MahApps.Brushes.IdealForeground}"
+                        Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                         Text="Your license key has expired. Some features will be reduced or unavailable. Please Sign In to https://certifytheweb.com and renew your license key, then re-open the app."
                         TextWrapping="Wrap" />
 
@@ -119,7 +117,7 @@
                                 Margin="0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
-                                Foreground="#FF6BB039"
+                                Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                 Icon="PlayCircle" />
                             <TextBlock Margin="8,0,0,0" HorizontalAlignment="Left"><Run Text="Quick Start Guide" /></TextBlock>
                         </StackPanel>
@@ -153,7 +151,7 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         FontSize="12"
-                        Foreground="{StaticResource MahApps.Brushes.IdealForeground}"
+                        Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                         Text="{Binding SystemDiagnosticError}"
                         TextWrapping="Wrap" />
 
@@ -280,7 +278,7 @@
                                         Margin="0"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        Foreground="#FF6BB039"
+                                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                         Icon="PlusCircle" />
                                     <TextBlock Margin="8,0,0,0" HorizontalAlignment="Center"><Run Text="{x:Static res:SR.GettingStarted_AddToDashboard}" /></TextBlock>
                                 </StackPanel>
@@ -298,7 +296,7 @@
                                         Margin="0"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        Foreground="#FF6BB039"
+                                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                         Icon="Leaf" />
                                     <TextBlock Margin="8,0,0,0" HorizontalAlignment="Center"><Run Text="{x:Static res:SR.GettingStarted_ViewDashboard}" /></TextBlock>
                                 </StackPanel>
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml
index b378b10c5..ae1ba113e 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/AdvancedOptions.xaml
@@ -2,7 +2,6 @@
     x:Class="Certify.UI.Controls.ManagedCertificate.AdvancedOptions"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -32,14 +31,11 @@
                 Margin="0,0,0,0"
                 HorizontalContentAlignment="Left"
                 VerticalContentAlignment="Stretch"
-                Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
-                Controls:TabControlHelper.Underlined="TabPanel"
                 DockPanel.Dock="Top"
                 TabStripPlacement="Left">
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="{x:Static Resources:SR.ManagedCertificateSettings_CertificateAuthority_Title}"
                     IsSelected="true"
                     Visibility="{Binding IsExternalManagedCertificateItem, Converter={StaticResource ResourceKey=InvBoolToVisConverter}, UpdateSourceTrigger=PropertyChanged}">
@@ -89,8 +85,7 @@
 
                         <TextBox
                             Width="200"
-                            HorizontalAlignment="left"
-                            Controls:TextBoxHelper.Watermark="e.g. DST Root CA X3"
+                            HorizontalAlignment="left" ToolTip="e.g. DST Root CA X3"
                             DockPanel.Dock="Top"
                             Text="{Binding SelectedItem.RequestConfig.PreferredChain}" />
                         <TextBlock
@@ -104,8 +99,7 @@
                         </TextBlock>
                         <TextBox
                             Width="200"
-                            HorizontalAlignment="left"
-                            Controls:TextBoxHelper.Watermark="e.g. classic"
+                            HorizontalAlignment="left" ToolTip="e.g. classic"
                             DockPanel.Dock="Top"
                             Text="{Binding SelectedItem.RequestConfig.AcmeProfile}" />
                     </DockPanel>
@@ -114,7 +108,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Signing &amp; Security"
                     IsSelected="False"
                     Visibility="{Binding IsExternalManagedCertificateItem, Converter={StaticResource ResourceKey=InvBoolToVisConverter}, UpdateSourceTrigger=PropertyChanged}">
@@ -258,8 +251,7 @@
                             <TextBox
                                 Width="180"
                                 Margin="8,0,4,0"
-                                HorizontalAlignment="left"
-                                Controls:TextBoxHelper.Watermark="e.g. 0.5 or 30. Blank for none."
+                                HorizontalAlignment="left" ToolTip="e.g. 0.5 or 30. Blank for none."
                                 InputScope="Number"
                                 Text="{Binding SelectedItem.RequestConfig.PreferredExpiryDays, Converter={StaticResource NullValueConverter}}" />
 
@@ -274,7 +266,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="General Options"
                     IsSelected="false">
                     <!--  General Options  -->
@@ -291,8 +282,7 @@
                                 Height="38"
                                 MinWidth="300"
                                 MaxWidth="600"
-                                HorizontalAlignment="Left"
-                                Controls:TextBoxHelper.Watermark="{x:Static Resources:SR.Comments}"
+                                HorizontalAlignment="Left" ToolTip="{x:Static Resources:SR.Comments}"
                                 AcceptsReturn="True"
                                 DockPanel.Dock="Top"
                                 VerticalScrollBarVisibility="Auto">
@@ -349,7 +339,6 @@
 
                 <TabItem
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Actions"
                     IsSelected="False">
                     <!--  Actions  -->
@@ -378,8 +367,7 @@
                                 x:Name="PFXPassword"
                                 Width="220"
                                 Margin="0,4,0,8"
-                                HorizontalAlignment="Left"
-                                Controls:TextBoxHelper.Watermark="Pfx Unlock Password (if applicable)"
+                                HorizontalAlignment="Left" ToolTip="Pfx Unlock Password (if applicable)"
                                 PasswordChanged="PFXPassword_PasswordChanged" />
                         </StackPanel>
 
@@ -424,7 +412,7 @@
                                     BorderThickness="2"
                                     Content="{x:Static Resources:SR.ManagedCertificateSettings_CertificateRevokeWarning}"
                                     FontWeight="Bold"
-                                    Foreground="{DynamicResource MahApps.Brushes.IdealForeground}" />
+                                    Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}" />
                             </Border>
                         </StackPanel>
 
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/AuthorityTokenList.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/AuthorityTokenList.xaml
index c2047c3e3..fb8651354 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/AuthorityTokenList.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/AuthorityTokenList.xaml
@@ -1,8 +1,7 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.AuthorityTokenList"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
@@ -35,7 +34,7 @@
                         Margin="0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Foreground="#FF6BB039"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="FolderOpen" />
                     <TextBlock Margin="8,0,0,0" HorizontalAlignment="Center"><Run Text="Browse to file" /></TextBlock>
                 </StackPanel>
@@ -47,14 +46,12 @@
             Orientation="Vertical">
             <TextBox
                 x:Name="Token"
-                Height="48"
-                Controls:TextBoxHelper.Watermark="Token"
+                Height="48" ToolTip="Token"
                 Text="" />
             <TextBox
                 x:Name="CRL"
                 Width="Auto"
-                Margin="0,8"
-                Controls:TextBoxHelper.Watermark="CRL Distribution Point URL"
+                Margin="0,8" ToolTip="CRL Distribution Point URL"
                 Text="" />
             <Button
                 x:Name="AddToken"
@@ -68,7 +65,7 @@
                         Margin="0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Foreground="#FF6BB039"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="PlusCircle" />
                     <TextBlock Margin="8,0,0,0" HorizontalAlignment="Center"><Run Text="Add" /></TextBlock>
                 </StackPanel>
@@ -101,7 +98,7 @@
                                     <fa:ImageAwesome
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                         Icon="Trash" />
 
                                 </StackPanel>
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml
index 0edeb233b..c363b260f 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/CertificateIdentifiers.xaml
@@ -2,7 +2,6 @@
     x:Class="Certify.UI.Controls.ManagedCertificate.CertificateIdentifiers"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -29,12 +28,9 @@
             Height="auto"
             Margin="0,0,0,0"
             HorizontalContentAlignment="Left"
-            VerticalContentAlignment="Stretch"
-            Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
-            Controls:TabControlHelper.Underlined="TabPanel">
+            VerticalContentAlignment="Stretch">
             <TabItem
                 MinWidth="100"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Identifiers"
                 IsSelected="False">
 
@@ -105,15 +101,14 @@
                                     </StackPanel.Style>
                                     <ComboBox
                                         x:Name="HubCertificateBrowser"
-                                        Width="320"
-                                        Controls:TextBoxHelper.Watermark="Browse available hub certificates..."
+                                        Width="320" ToolTip="Browse available hub certificates..."
                                         ItemsSource="{Binding SubscribableManagedCertificates}"
                                         SelectedItem="{Binding SelectedSubscribableCertificate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                                         <ComboBox.ItemTemplate>
                                             <DataTemplate>
                                                 <StackPanel Orientation="Vertical">
                                                     <TextBlock FontWeight="SemiBold" Text="{Binding Title}" />
-                                                    <TextBlock Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Text="{Binding InstanceTitle}" />
+                                                    <TextBlock Foreground="{DynamicResource TextFillColorSecondaryBrush}" Text="{Binding InstanceTitle}" />
                                                 </StackPanel>
                                             </DataTemplate>
                                         </ComboBox.ItemTemplate>
@@ -225,7 +220,7 @@
                                             <Setter Property="ToolTip" Value="Site currently has no https bindings" />
                                             <Style.Triggers>
                                                 <DataTrigger Binding="{Binding HasCertificate}" Value="true">
-                                                    <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+                                                    <Setter Property="Foreground" Value="{DynamicResource AccentFillColorTertiaryBrush}" />
                                                     <Setter Property="FontWeight" Value="SemiBold" />
                                                     <Setter Property="ToolTip" Value="Site already has one or more https bindings" />
                                                 </DataTrigger>
@@ -242,7 +237,7 @@
                                     ToolTip="Refresh Site List">
                                     <fa:ImageAwesome
                                         Height="12"
-                                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                         Icon="Refresh"
                                         Spin="{Binding IsSiteListQueryProgress}" />
 
@@ -260,8 +255,7 @@
                                     <Label Width="160" Content="{x:Static Resources:SR.ManagedCertificateSettings_AddDomainsToCertificate}" />
                                     <TextBox
                                         x:Name="ManualDomains"
-                                        Width="240"
-                                        Controls:TextBoxHelper.Watermark="{x:Static Resources:SR.ManagedCertificateSettings_AddDomainsHelpText}"
+                                        Width="240" ToolTip="{x:Static Resources:SR.ManagedCertificateSettings_AddDomainsHelpText}"
                                         AutomationProperties.HelpText="{x:Static Resources:SR.ManagedCertificateSettings_AddDomainsHelpText}"
                                         AutomationProperties.Name="{x:Static Resources:SR.ManagedCertificateSettings_AddDomainsToCertificate}"
                                         KeyUp="ManualDomains_KeyUp" />
@@ -276,7 +270,7 @@
                                         ToolTip="Add Domains">
                                         <fa:ImageAwesome
                                             Height="12"
-                                            Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                             Icon="Plus" />
 
                                     </Button>
@@ -340,7 +334,7 @@
                                         ToolTip="{x:Static Resources:SR.SelectAll}">
                                         <fa:ImageAwesome
                                             Height="12"
-                                            Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                             Icon="CheckSquare" />
 
                                     </Button>
@@ -354,7 +348,7 @@
                                         ToolTip="{x:Static Resources:SR.ManagedCertificateSettings_SelectNone}">
                                         <fa:ImageAwesome
                                             Height="12"
-                                            Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                             Icon="SquareOutline" />
 
                                     </Button>
@@ -369,7 +363,7 @@
                                         ToolTip="{x:Static Resources:SR.ManagedCertificatesSettings_RefreshDomains}">
                                         <fa:ImageAwesome
                                             Height="12"
-                                            Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                             Icon="Refresh" />
 
                                     </Button>
@@ -405,12 +399,11 @@
                                                             AutomationProperties.Name="Set As Primary Domain"
                                                             BorderThickness="0"
                                                             Click="SetPrimaryDomainOption_Click"
-                                                            Style="{DynamicResource MahApps.Styles.Button.Circle}"
                                                             Visibility="{Binding IsPrimaryDomain, Converter={StaticResource ResourceKey=InvBoolToVisConverter}}">
                                                             <fa:ImageAwesome
                                                                 Height="12"
                                                                 Margin="0,0,0,0"
-                                                                Foreground="{DynamicResource MahApps.Brushes.Control.Disabled}"
+                                                                Foreground="{DynamicResource ControlStrokeColorDefaultBrush}"
                                                                 Icon="CircleOutline" />
 
                                                         </Button>
@@ -421,12 +414,11 @@
                                                             AutomationProperties.Name="Selected as Primary Domain"
                                                             BorderThickness="0"
                                                             Click="SetPrimaryDomainOption_Click"
-                                                            Style="{DynamicResource MahApps.Styles.Button.Circle}"
                                                             Visibility="{Binding IsPrimaryDomain, Converter={StaticResource ResourceKey=BoolToVisConverter}}">
                                                             <fa:ImageAwesome
                                                                 Height="12"
                                                                 Margin="0,0,0,0"
-                                                                Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                                                Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                                                 Icon="CheckCircleOutline" />
 
                                                         </Button>
@@ -437,13 +429,10 @@
                                         </DataGridTemplateColumn>
                                         <DataGridCheckBoxColumn
                                             Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}"
-                                            EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
-                                            ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
                                             Header="{x:Static Resources:SR.ManagedCertificateSettings_Include}" />
                                         <DataGridTextColumn
                                             MinWidth="200"
                                             Binding="{Binding Domain, UpdateSourceTrigger=PropertyChanged}"
-                                            EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"
                                             Header="{x:Static Resources:SR.ManagedCertificateSettings_Domain}"
                                             IsReadOnly="True" />
                                         <DataGridTemplateColumn>
@@ -458,7 +447,7 @@
                                                         <fa:ImageAwesome
                                                             Height="12"
                                                             Margin="0,0,0,0"
-                                                            Foreground="{DynamicResource MahApps.Brushes.Accent3}"
+                                                            Foreground="{DynamicResource AccentFillColorSecondaryBrush}"
                                                             Icon="Trash" />
 
                                                     </Button>
@@ -509,7 +498,6 @@
 
             <TabItem
                 MinWidth="100"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Authorization"
                 IsSelected="False"
                 Visibility="{Binding IsExternalManagedCertificateItem, Converter={StaticResource ResourceKey=InvBoolToVisConverter}, UpdateSourceTrigger=PropertyChanged}">
@@ -518,7 +506,6 @@
 
             <TabItem
                 MinWidth="100"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Advanced"
                 IsSelected="False">
                 <managedcertificate:AdvancedOptions />
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/ChallengeConfigItem.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/ChallengeConfigItem.xaml
index 8a84415f7..919e9feed 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/ChallengeConfigItem.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/ChallengeConfigItem.xaml
@@ -6,7 +6,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
     xmlns:local="clr-namespace:Certify.UI.Windows"
-    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="clr-namespace:Certify.Models;assembly=Certify.Models"
     d:DesignHeight="200"
@@ -23,7 +22,6 @@
                 <TextBox
                     Width="250"
                     Height="100"
-                    mah:TextBoxHelper.Watermark="{Binding Description}"
                     AcceptsReturn="True"
                     KeyUp="OnParameterModified"
                     Text="{Binding Value}"
@@ -39,8 +37,7 @@
                 Orientation="Horizontal">
                 <Label Width="160" Content="{Binding Name}" />
                 <TextBox
-                    Width="250"
-                    mah:TextBoxHelper.Watermark="{Binding Description}"
+                    Width="250" ToolTip="{Binding Description}"
                     KeyUp="OnParameterModified"
                     Text="{Binding Value}" />
                 <Button
@@ -136,8 +133,7 @@
             <StackPanel Margin="0,8,0,0" Orientation="Horizontal">
                 <Label Width="160" Content="{x:Static Resources:SR.ManagedCertificateSettings_WebsiteRoot}" />
                 <TextBox
-                    Width="225"
-                    mah:TextBoxHelper.Watermark="(optional, leave blank to auto discover)"
+                    Width="225" ToolTip="(optional, leave blank to auto discover)"
                     Text="{Binding SelectedItem.ChallengeRootPath}" />
                 <Button
                     x:Name="Button_WebRoot"
@@ -261,7 +257,7 @@
                         x:Name="RefreshingDnsZones"
                         Height="12"
                         Margin="4,0,0,0"
-                        Foreground="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
+                        Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                         Icon="Refresh"
                         Spin="True"
                         SpinDuration="1"
@@ -284,8 +280,7 @@
                     <Label Width="160" Content="CNAME Delegation Rule" />
                     <TextBox
                         x:Name="ChallengeDelegationRule"
-                        Width="270"
-                        mah:TextBoxHelper.Watermark="(optional) *.example.com:*.auth.example.org"
+                        Width="270" ToolTip="(optional) *.example.com:*.auth.example.org"
                         Text="{Binding SelectedItem.ChallengeDelegationRule}" />
                 </StackPanel>
                 <StackPanel Margin="160,0,0,0">
@@ -301,8 +296,7 @@
                 <Label Width="160" Content="Domain Match" />
                 <TextBox
                     x:Name="DomainMatchText"
-                    Width="270"
-                    mah:TextBoxHelper.Watermark="(optional) *.example.com; www.sub.example.com"
+                    Width="270" ToolTip="(optional) *.example.com; www.sub.example.com"
                     Text="{Binding SelectedItem.DomainMatch}" />
             </StackPanel>
             <StackPanel Margin="160,0,0,0">
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/Dashboard.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/Dashboard.xaml
index 457ee832e..84cdeb664 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/Dashboard.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/Dashboard.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.Dashboard"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/Deployment.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/Deployment.xaml
index a1a0dace1..7a5b9c81d 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/Deployment.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/Deployment.xaml
@@ -2,7 +2,6 @@
     x:Class="Certify.UI.Controls.ManagedCertificate.Deployment"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/DeploymentTask.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/DeploymentTask.xaml
index ea4cfe4ff..4e1539e58 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/DeploymentTask.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/DeploymentTask.xaml
@@ -1,8 +1,7 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.DeploymentTask"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:diag="clr-namespace:System.Diagnostics;assembly=WindowsBase"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
@@ -19,8 +18,7 @@
                 Orientation="Horizontal">
                 <Label Width="160" Content="{Binding Name}" />
                 <TextBox
-                    Width="250"
-                    Controls:TextBoxHelper.Watermark="{Binding Description}"
+                    Width="250" ToolTip="{Binding Description}"
                     KeyUp="ParameterInput_KeyUp"
                     Text="{Binding Value}" />
                 <Button
@@ -118,7 +116,7 @@
                                         <fa:ImageAwesome
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
-                                            Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                             Icon="PlayCircleOutline" />
                                         <TextBlock Margin="8,0,0,0" VerticalAlignment="Center">Select</TextBlock>
                                     </StackPanel>
@@ -130,7 +128,7 @@
                                     <StackPanel HorizontalAlignment="Stretch" Orientation="Horizontal">
                                         <TextBlock
                                             DockPanel.Dock="Left"
-                                            Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                                            Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                             Text="{Binding Description}" />
 
                                         <StackPanel
@@ -179,12 +177,10 @@
                 Margin="8,8,8,8"
                 HorizontalContentAlignment="Left"
                 VerticalContentAlignment="Stretch"
-                Controls:TabControlHelper.Underlined="SelectedTabItem"
                 DockPanel.Dock="Top">
 
                 <TabItem
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="General Settings"
                     IsSelected="True">
 
@@ -242,8 +238,7 @@
                             <TextBox
                                 x:Name="TaskName"
                                 Width="225"
-                                Margin="0,0,8,0"
-                                Controls:TextBoxHelper.Watermark="A unique name for this task"
+                                Margin="0,0,8,0" ToolTip="A unique name for this task"
                                 KeyUp="TaskName_KeyUp"
                                 Text="{Binding SelectedItem.TaskName, UpdateSourceTrigger=PropertyChanged}" />
                         </StackPanel>
@@ -260,8 +255,7 @@
                                 x:Name="TaskDescription"
                                 Width="225"
                                 Height="48"
-                                Margin="0,0,8,0"
-                                Controls:TextBoxHelper.Watermark="Optionally describe this task."
+                                Margin="0,0,8,0" ToolTip="Optionally describe this task."
                                 AcceptsReturn="True"
                                 Text="{Binding SelectedItem.Description, UpdateSourceTrigger=PropertyChanged}"
                                 TextWrapping="Wrap"
@@ -337,7 +331,6 @@
                 </TabItem>
                 <TabItem
                     Width="auto"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Task Parameters">
 
                     <DockPanel Margin="8,0,0,0" LastChildFill="False">
@@ -373,8 +366,7 @@
                             <TextBox
                                 x:Name="TargetHost"
                                 Width="225"
-                                Margin="0,0,8,0"
-                                Controls:TextBoxHelper.Watermark="(optional, blank for local) IP or hostname to connect to"
+                                Margin="0,0,8,0" ToolTip="(optional, blank for local) IP or hostname to connect to"
                                 Text="{Binding SelectedItem.TargetHost, UpdateSourceTrigger=PropertyChanged}" />
                         </StackPanel>
 
@@ -400,7 +392,7 @@
                         </StackPanel>
                         <ItemsControl
                             x:Name="DeploymentTaskParams"
-                            BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderColor}}"
+                            BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
                             DockPanel.Dock="Top"
                             ItemsSource="{Binding EditableParameters}">
                             <ItemsControl.ItemTemplateSelector>
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/IdentifiersAuthorization.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/IdentifiersAuthorization.xaml
index 3608ca285..f7ee1aff0 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/IdentifiersAuthorization.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/IdentifiersAuthorization.xaml
@@ -2,8 +2,6 @@
     x:Class="Certify.UI.Controls.ManagedCertificate.IdentifierAuthorization"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
-    xmlns:Custom="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -50,7 +48,7 @@
                                     Style="{StaticResource Subheading}"
                                     Text="{Binding SelectedItem.DomainMatch}" />
                             </StackPanel>
-                            <Border Padding="8,8,8,8" Background="{DynamicResource MahApps.Brushes.Control.Background}">
+                            <Border Padding="8,8,8,8" Background="{DynamicResource CardBackgroundFillColorDefaultBrush}">
                                 <managedcertificate:ChallengeConfigItem DataContext="{Binding}" />
                             </Border>
                         </StackPanel>
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml
index 975155f5c..a979a0b08 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml
@@ -2,8 +2,6 @@
     x:Class="Certify.UI.Controls.ManagedCertificate.ManagedCertificateSettings"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
-    xmlns:Custom="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -43,7 +41,6 @@
                     Height="24"
                     MinWidth="400"
                     Margin="16,0,0,0"
-                    Controls:TextBoxHelper.Watermark="Display Name"
                     DockPanel.Dock="Left"
                     KeyDown="DisplayName_KeyDown"
                     Text="{Binding SelectedItem.Name, UpdateSourceTrigger=PropertyChanged}"
@@ -54,12 +51,12 @@
                     Margin="0,4,8,4"
                     VerticalAlignment="Top"
                     AutomationProperties.Name="Finish Edit"
-                    Background="{DynamicResource MahApps.Brushes.Control.Background}"
+                    Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
                     BorderThickness="0"
                     Click="FinishedEditName_Click"
                     DockPanel.Dock="Left"
                     ToolTip="Finish Edit">
-                    <fa:ImageAwesome Foreground="{DynamicResource MahApps.Brushes.Accent3}" Icon="CheckCircleOutline" />
+                    <fa:ImageAwesome Foreground="{DynamicResource AccentFillColorSecondaryBrush}" Icon="CheckCircleOutline" />
                 </Button>
             </StackPanel>
             <StackPanel
@@ -73,19 +70,19 @@
                     AutomationProperties.Name="{Binding SelectedItem.Name}"
                     DockPanel.Dock="Left"
                     FontSize="20"
-                    Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMediumHigh}"
+                    Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                     Text="{Binding SelectedItem.Name}" />
                 <Button
                     x:Name="EditName"
                     Margin="16,4,8,4"
                     VerticalAlignment="Top"
                     AutomationProperties.Name="Edit Name"
-                    Background="{DynamicResource MahApps.Brushes.Control.Background}"
+                    Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
                     BorderThickness="0"
                     Click="EditName_Click"
                     DockPanel.Dock="Left"
                     ToolTip="Edit Name">
-                    <fa:ImageAwesome Foreground="{DynamicResource MahApps.Brushes.Accent2}" Icon="Edit" />
+                    <fa:ImageAwesome Foreground="{DynamicResource AccentFillColorSecondaryBrush}" Icon="Edit" />
                 </Button>
 
 
@@ -96,14 +93,14 @@
                 HorizontalAlignment="Right"
                 VerticalAlignment="Top"
                 AutomationProperties.Name="Dismiss"
-                Background="{DynamicResource MahApps.Brushes.Control.Background}"
+                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
                 BorderThickness="0"
                 Click="Dismiss_Click"
                 DockPanel.Dock="Right"
                 ToolTip="Dismiss"
                 Visibility="{Binding IsNameEditMode, Converter={StaticResource ResourceKey=InvBoolToVisConverter}, UpdateSourceTrigger=PropertyChanged}">
 
-                <fa:ImageAwesome Foreground="{DynamicResource MahApps.Brushes.Accent3}" Icon="AngleDoubleDown" />
+                <fa:ImageAwesome Foreground="{DynamicResource AccentFillColorSecondaryBrush}" Icon="AngleDoubleDown" />
 
             </Button>
         </DockPanel>
@@ -112,7 +109,7 @@
             Margin="16,8"
             HorizontalAlignment="Stretch"
             DockPanel.Dock="Top"
-            Fill="{DynamicResource MahApps.Brushes.Accent4}" />
+            Fill="{DynamicResource AccentFillColorTertiaryBrush}" />
 
         <!--  save/request buttons  -->
         <DockPanel
@@ -132,7 +129,7 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="Save" />
                     <TextBlock Margin="8,0,0,0" VerticalAlignment="Center"><Run Text="{x:Static Resources:SR.Save}" /></TextBlock>
                 </StackPanel>
@@ -148,7 +145,7 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="Undo" />
                     <TextBlock Margin="8,0,0,0" VerticalAlignment="Center"><Run Text="{x:Static Resources:SR.DiscardChanges}" /></TextBlock>
                 </StackPanel>
@@ -163,7 +160,7 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="Trash" />
                     <TextBlock Margin="8,0,0,0" VerticalAlignment="Center"><Run Text="{x:Static Resources:SR.Delete}" /></TextBlock>
                 </StackPanel>
@@ -178,7 +175,7 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="Play" />
                     <TextBlock Margin="8,0,0,0" VerticalAlignment="Center"><Run Text="{x:Static Resources:SR.ManagedCertificateSettings_RequestCertificate}" /></TextBlock>
                 </StackPanel>
@@ -198,7 +195,7 @@
                         Height="16"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="Refresh"
                         Spin="True"
                         SpinDuration="1"
@@ -207,7 +204,7 @@
                         Height="16"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="CheckCircle"
                         Spin="False"
                         Visibility="{Binding IsTestInProgress, Converter={StaticResource ResourceKey=InvBoolToVisConverter}}" />
@@ -217,28 +214,27 @@
         </DockPanel>
 
         <!--  managed cert detail tabs  -->
-        <DockPanel
+        <Border
             Margin="8,0,8,0"
-            Background="{DynamicResource MahApps.Brushes.Control.Background}"
+            Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+            BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
+            BorderThickness="1"
             DockPanel.Dock="Top"
             Visibility="{Binding SelectedItem, Converter={StaticResource ResourceKey=NullCollapsedConverter}}">
+            <DockPanel>
 
 
-            <Controls:MetroTabControl
+            <TabControl
                 x:Name="SettingsTab"
                 Margin="8"
                 HorizontalContentAlignment="Stretch"
                 VerticalContentAlignment="Stretch"
-                Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled="True"
-                Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseLow}"
-                Controls:TabControlHelper.Underlined="TabPanel"
                 DockPanel.Dock="Top"
                 TabStripPlacement="Right">
 
                 <TabItem
                     x:Name="TabStatusInfo"
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     AutomationProperties.Name="Status">
                     <TabItem.HeaderTemplate>
                         <DataTemplate>
@@ -252,7 +248,6 @@
                     x:Name="TabDomains"
                     MinWidth="130"
                     Margin="0"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     AutomationProperties.Name="Certificate"
                     IsSelected="True">
                     <TabItem.HeaderTemplate>
@@ -266,7 +261,6 @@
                 <TabItem
                     x:Name="TabDeployment"
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     AutomationProperties.Name="Deployment">
                     <TabItem.HeaderTemplate>
                         <DataTemplate>
@@ -279,7 +273,6 @@
                 <TabItem
                     x:Name="TabTasks"
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     AutomationProperties.Name="Tasks">
                     <TabItem.HeaderTemplate>
                         <DataTemplate>
@@ -294,7 +287,6 @@
                 <TabItem
                     x:Name="TabPreview"
                     MinWidth="100"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     AutomationProperties.Name="Preview">
                     <TabItem.HeaderTemplate>
                         <DataTemplate>
@@ -303,7 +295,8 @@
                     </TabItem.HeaderTemplate>
                     <managedcertificate:Preview Margin="0,8,0,0" />
                 </TabItem>
-            </Controls:MetroTabControl>
-        </DockPanel>
+            </TabControl>
+            </DockPanel>
+        </Border>
     </DockPanel>
 </UserControl>
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs
index 2f60e0525..d2616b645 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/ManagedCertificateSettings.xaml.cs
@@ -6,7 +6,6 @@
 using Certify.Locales;
 using Certify.Models;
 using Certify.UI.Shared;
-using MahApps.Metro.Controls;
 
 namespace Certify.UI.Controls.ManagedCertificate
 {
@@ -248,10 +247,10 @@ private void ShowTestResultsUI()
         {
             var parentWindow = Window.GetWindow(this);
             var obj = parentWindow.FindName("MainFlyout");
-            var flyout = (Flyout)obj;
+            var flyout = (GroupBox)obj;
             flyout.Header = "Test Progress";
             flyout.Content = new TestProgress();
-            flyout.IsOpen = !flyout.IsOpen;
+            flyout.Visibility = flyout.Visibility != Visibility.Visible ? Visibility.Visible : Visibility.Collapsed;
         }
 
         private async void TestChallenge_Click(object sender, EventArgs e)
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/Preview.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/Preview.xaml
index bfe0d3be2..5c6db8cfd 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/Preview.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/Preview.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.Preview"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml
index 9eddae5a2..9e672f549 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/StatusInfo.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.StatusInfo"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -52,13 +52,13 @@
                 <StackPanel Orientation="Horizontal">
                     <fa:ImageAwesome
                         Height="32"
-                        Foreground="{StaticResource MahApps.Brushes.ValidationSummary1}"
+                        Foreground="{DynamicResource ValidationErrorBrush}"
                         Icon="ExclamationTriangle" />
 
                     <TextBlock
                         Margin="8,0,0,0"
                         VerticalAlignment="Center"
-                        Foreground="{StaticResource MahApps.Brushes.ValidationSummary1}"
+                        Foreground="{DynamicResource ValidationErrorBrush}"
                         Style="{StaticResource Subheading}"
                         Text="Renewal Required" />
                 </StackPanel>
@@ -128,12 +128,12 @@
                 </StackPanel>
                 <Border
                     Margin="0,16,8,8"
-                    Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
+                    Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
                     DockPanel.Dock="Top">
                     <TextBlock
                         Margin="8,8,8,8"
                         FontStyle="Italic"
-                        Foreground="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
+                        Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                         Text="{Binding SelectedItem.RenewalFailureMessage}"
                         TextWrapping="Wrap" />
                 </Border>
@@ -143,13 +143,13 @@
                 <StackPanel Orientation="Horizontal">
                     <fa:ImageAwesome
                         Height="32"
-                        Foreground="{StaticResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="CheckCircle" />
 
                     <TextBlock
                         Margin="8,0,0,0"
                         VerticalAlignment="Center"
-                        Foreground="{StaticResource MahApps.Brushes.AccentBase}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Style="{StaticResource Subheading}">
                         Certificate Active
                     </TextBlock>
@@ -208,13 +208,13 @@
                 <StackPanel Orientation="Horizontal">
                     <fa:ImageAwesome
                         Height="32"
-                        Foreground="{StaticResource MahApps.Brushes.ValidationSummary1}"
+                        Foreground="{DynamicResource ValidationErrorBrush}"
                         Icon="PauseCircle" />
 
                     <TextBlock
                         Margin="8,0,0,0"
                         VerticalAlignment="Center"
-                        Foreground="{StaticResource MahApps.Brushes.ValidationSummary1}"
+                        Foreground="{DynamicResource ValidationErrorBrush}"
                         Style="{StaticResource Subheading}"
                         Text="Waiting for User Action" />
                 </StackPanel>
@@ -228,13 +228,13 @@
                 </StackPanel>
                 <Border
                     Margin="0,0,0,0"
-                    Background="{DynamicResource {x:Static SystemColors.ControlBrush}}"
+                    Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
                     BorderThickness="1">
 
                     <TextBox
                         Margin="0,8,0,8"
                         Padding="8,8,8,8"
-                        Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseHigh}"
+                        Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                         IsReadOnly="True"
                         Text="{Binding SelectedItem.RenewalFailureMessage}"
                         TextWrapping="WrapWithOverflow" />
@@ -269,7 +269,7 @@
                                 Margin="0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
-                                Foreground="#FF6BB039"
+                                Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                 Icon="Database" />
                             <TextBlock
                                 Margin="8,0,0,0"
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/TabHeader.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/TabHeader.xaml
index 6b472ae06..871486b34 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/TabHeader.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/TabHeader.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.TabHeader"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,10 +13,10 @@
     <DockPanel LastChildFill="True">
         <DockPanel.Style>
             <Style>
-                <Setter Property="DockPanel.Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+                <Setter Property="DockPanel.Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />
                 <Style.Triggers>
                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Path=(IsSelected)}" Value="true">
-                        <Setter Property="DockPanel.Background" Value="{StaticResource MahApps.Brushes.Accent4}" />
+                        <Setter Property="DockPanel.Background" Value="{DynamicResource AccentFillColorTertiaryBrush}" />
                     </DataTrigger>
                 </Style.Triggers>
             </Style>
@@ -27,7 +27,7 @@
                 Width="16"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                Foreground="{StaticResource MahApps.Brushes.Accent}"
+                Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                 Icon="{Binding IconName}" />
             <Label
                 x:Name="TabLabel"
@@ -38,11 +38,11 @@
                 FontSize="11">
                 <Label.Style>
                     <Style>
-                        <Setter Property="Label.Foreground" Value="{DynamicResource TextBrush}" />
+                        <Setter Property="Label.Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
                         <Setter Property="Label.FontWeight" Value="SemiBold" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type TabItem}}, Path=IsSelected}" Value="true">
-                                <Setter Property="Label.Foreground" Value="{DynamicResource TextBrush}" />
+                                <Setter Property="Label.Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -50,4 +50,4 @@
             </Label>
         </StackPanel>
     </DockPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/TaskList.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/TaskList.xaml
index 785a13405..b8449dd04 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/TaskList.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/TaskList.xaml
@@ -2,7 +2,6 @@
     x:Class="Certify.UI.Controls.ManagedCertificate.TaskList"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -50,7 +49,7 @@
                                 <fa:ImageAwesome
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                    Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                     Icon="Play" />
 
                             </StackPanel>
@@ -68,7 +67,7 @@
                                 <fa:ImageAwesome
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                    Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                     Icon="Trash" />
 
                             </StackPanel>
@@ -84,7 +83,7 @@
                                 <fa:ImageAwesome
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                    Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                     Icon="Edit" />
 
                             </StackPanel>
@@ -95,7 +94,7 @@
                             <TextBlock DockPanel.Dock="Left" Text="{Binding TaskTrigger, Converter={StaticResource TaskTriggerConverter}}" />
                             <TextBlock
                                 DockPanel.Dock="Left"
-                                Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                 Text="{Binding Description}"
                                 TextWrapping="WrapWithOverflow"
                                 Visibility="Collapsed" />
@@ -130,13 +129,13 @@
 
                                 <TextBlock
                                     Margin="8,0,0,0"
-                                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                     Text="{Binding DateLastExecuted, StringFormat=F}" />
                             </StackPanel>
 
                             <TextBlock
                                 MaxHeight="32"
-                                Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                 Text="{Binding LastResult}"
                                 TextTrimming="WordEllipsis"
                                 TextWrapping="WrapWithOverflow" />
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/Tasks.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/Tasks.xaml
index ee544b25a..74f1ddd59 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/Tasks.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/Tasks.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.Tasks"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -40,7 +40,7 @@
                             <fa:ImageAwesome
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                 Icon="PlusCircle" />
                             <TextBlock Margin="8,0,0,0" VerticalAlignment="Center">Add</TextBlock>
                         </StackPanel>
@@ -65,7 +65,7 @@
                             <fa:ImageAwesome
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
-                                Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                 Icon="PlusCircle" />
                             <TextBlock Margin="8,0,0,0" VerticalAlignment="Center">Add</TextBlock>
                         </StackPanel>
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificate/TestProgress.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificate/TestProgress.xaml
index eebf55c1e..9a343e69e 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificate/TestProgress.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificate/TestProgress.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.ManagedCertificate.TestProgress"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/Certify.UI.Shared/Controls/ManagedCertificates.xaml b/src/Certify.UI.Shared/Controls/ManagedCertificates.xaml
index ac335bf52..78dbd0d81 100644
--- a/src/Certify.UI.Shared/Controls/ManagedCertificates.xaml
+++ b/src/Certify.UI.Shared/Controls/ManagedCertificates.xaml
@@ -2,7 +2,6 @@
     x:Class="Certify.UI.Controls.ManagedCertificates"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:certifyui="clr-namespace:Certify.UI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
@@ -15,7 +14,7 @@
     Height="487"
     d:DataContext="{d:DesignInstance Type=certifyui:AppViewModelDesign,
                                      IsDesignTimeCreatable=True}"
-    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     Loaded="UserControl_OnLoaded"
     mc:Ignorable="d">
 
@@ -59,7 +58,7 @@
                         <fa:ImageAwesome
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Foreground="{StaticResource MahApps.Brushes.AccentBase}"
+                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                             Icon="Plug" />
 
                     </StackPanel>
@@ -71,7 +70,7 @@
                 <TextBlock
                     Margin="4,0,0,0"
                     DockPanel.Dock="Left"
-                    Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMedium}"
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                     Text="{Binding ConnectionTitle}" />
             </DockPanel>
             <DockPanel
@@ -80,9 +79,7 @@
                 LastChildFill="true">
 
                 <TextBox
-                    Name="txtFilter"
-                    Controls:TextBoxHelper.ClearTextButton="True"
-                    Controls:TextBoxHelper.Watermark="{x:Static res:SR.ManagedCertificates_Filter}"
+                    Name="txtFilter" ToolTip="{x:Static res:SR.ManagedCertificates_Filter}"
                     AutomationProperties.Name="{x:Static res:SR.ManagedCertificates_Filter}"
                     DockPanel.Dock="Right"
                     PreviewKeyDown="TxtFilter_PreviewKeyDown"
@@ -98,7 +95,7 @@
                 <TextBlock
                     Margin="16,4,16,4"
                     DockPanel.Dock="Left"
-                    Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMedium}"
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                     Text="Loading..."
                     TextAlignment="Center" />
             </DockPanel>
@@ -106,7 +103,8 @@
             <ListView
                 Name="lvManagedCertificates"
                 AutomationProperties.Name="Managed Certificates List"
-                Background="{DynamicResource MahApps.Brushes.Control.Background}"
+                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
                 DockPanel.Dock="Top"
                 ItemsSource="{Binding ManagedCertificates}"
                 ScrollViewer.CanContentScroll="True"
@@ -139,14 +137,22 @@
                 </ListView.ContextMenu>
                 <ListView.ItemContainerStyle>
                     <Style TargetType="ListViewItem">
+                        <Setter Property="Padding" Value="8,7" />
+                        <Setter Property="Margin" Value="0,0,0,2" />
+                        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+                        <Setter Property="Background" Value="Transparent" />
                         <EventSetter Event="PreviewMouseLeftButtonDown" Handler="ListViewItem_InteractionEvent" />
                         <EventSetter Event="PreviewTouchDown" Handler="ListViewItem_InteractionEvent" />
                         <EventSetter Event="PreviewKeyDown" Handler="ListViewItem_PreviewKeyDown" />
-                        <Style.Resources>
-                            <!--  for non-Aero systems (windows server 2008 r2 and below)  -->
-                            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}" Color="Black" />
-                            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#efefef" />
-                        </Style.Resources>
+                        <Style.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}" />
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource AccentFillColorTertiaryBrush}" />
+                                <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDefaultBrush}" />
+                            </Trigger>
+                        </Style.Triggers>
                     </Style>
                 </ListView.ItemContainerStyle>
                 <ListView.ItemTemplate>
@@ -185,13 +191,13 @@
                                             Margin="0,0,0,0"
                                             FontSize="10"
                                             FontWeight="Normal"
-                                            Foreground="DarkGray"
+                                            Foreground="{DynamicResource TextFillColorTertiaryBrush}"
                                             Text="Managed by " />
                                         <TextBlock
                                             Margin="0,0,0,0"
                                             FontSize="10"
                                             FontWeight="DemiBold"
-                                            Foreground="DarkGray"
+                                            Foreground="{DynamicResource TextFillColorTertiaryBrush}"
                                             Text="{Binding Path=SourceName}" />
                                     </StackPanel>
                                 </StackPanel>
@@ -208,7 +214,7 @@
             Width="2"
             Margin="8,0,0,0"
             HorizontalAlignment="Stretch"
-            Background="{StaticResource MahApps.Brushes.Accent4}" />
+            Background="{DynamicResource AccentFillColorTertiaryBrush}" />
         <Grid x:Name="MainItemView" Grid.Column="2">
 
             <managedcertificate:ManagedCertificateSettings
diff --git a/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml b/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml
index 8030bfe77..8143f79cf 100644
--- a/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml
+++ b/src/Certify.UI.Shared/Controls/ProgressMonitor.xaml
@@ -46,7 +46,7 @@
             SelectionMode="Single">
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListViewItem">
-                    <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+                    <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />
                 </Style>
             </ListView.ItemContainerStyle>
 
@@ -114,7 +114,7 @@
                             HorizontalAlignment="Stretch"
                             DockPanel.Dock="Top"
                             FontSize="10"
-                            Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundChromeGray}"
+                            Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                             Text="{Binding Message}"
                             TextWrapping="WrapWithOverflow" />
 
diff --git a/src/Certify.UI.Shared/Controls/QuickStart.xaml b/src/Certify.UI.Shared/Controls/QuickStart.xaml
index d6d253d74..4cd8484ce 100644
--- a/src/Certify.UI.Shared/Controls/QuickStart.xaml
+++ b/src/Certify.UI.Shared/Controls/QuickStart.xaml
@@ -1,21 +1,18 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.QuickStart"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
     <DockPanel MinHeight="300">
 
-        <controls:FlipView
+        <TabControl
             x:Name="QuickStartFlipView"
-            Margin="16"
-            IsBannerEnabled="False"
-            MouseHoverBorderEnabled="False">
+            Margin="16">
 
-            <controls:FlipViewItem>
+            <TabItem>
                 <DockPanel Margin="16">
                     <TextBlock
                         DockPanel.Dock="Top"
@@ -36,8 +33,8 @@
                         Source="/Certify.UI.Shared;component/Assets/Images/QuickStart/ChooseDomains.png" />
 
                 </DockPanel>
-            </controls:FlipViewItem>
-            <controls:FlipViewItem>
+            </TabItem>
+            <TabItem>
                 <DockPanel Margin="16">
                     <TextBlock
                         DockPanel.Dock="Top"
@@ -56,8 +53,8 @@
                         DockPanel.Dock="Top"
                         Source="/Certify.UI.Shared;component/Assets/Images/QuickStart/ChooseAuth.png" />
                 </DockPanel>
-            </controls:FlipViewItem>
-            <controls:FlipViewItem>
+            </TabItem>
+            <TabItem>
                 <DockPanel Margin="16">
                     <TextBlock
                         DockPanel.Dock="Top"
@@ -76,8 +73,8 @@
                         DockPanel.Dock="Top"
                         Source="/Certify.UI.Shared;component/Assets/Images/QuickStart/PreviewDeployment.png" />
                 </DockPanel>
-            </controls:FlipViewItem>
+            </TabItem>
 
-        </controls:FlipView>
+        </TabControl>
     </DockPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Certify.UI.Shared/Controls/Settings/CertificateAuthorities.xaml b/src/Certify.UI.Shared/Controls/Settings/CertificateAuthorities.xaml
index 293bd78a4..7ee72802d 100644
--- a/src/Certify.UI.Shared/Controls/Settings/CertificateAuthorities.xaml
+++ b/src/Certify.UI.Shared/Controls/Settings/CertificateAuthorities.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.Settings.CertificateAuthorities"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -110,7 +110,7 @@
                                         <fa:ImageAwesome
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
-                                            Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                             Icon="Trash" />
 
                                     </StackPanel>
@@ -127,7 +127,7 @@
                                         <fa:ImageAwesome
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
-                                            Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                             Icon="Edit" />
 
                                     </StackPanel>
diff --git a/src/Certify.UI.Shared/Controls/Settings/Experiments.xaml b/src/Certify.UI.Shared/Controls/Settings/Experiments.xaml
index 192120d19..3d9325621 100644
--- a/src/Certify.UI.Shared/Controls/Settings/Experiments.xaml
+++ b/src/Certify.UI.Shared/Controls/Settings/Experiments.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.Settings.Experiments"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/Certify.UI.Shared/Controls/Settings/General.xaml b/src/Certify.UI.Shared/Controls/Settings/General.xaml
index 04d03a055..8b8ce06df 100644
--- a/src/Certify.UI.Shared/Controls/Settings/General.xaml
+++ b/src/Certify.UI.Shared/Controls/Settings/General.xaml
@@ -2,7 +2,7 @@
     x:Class="Certify.UI.Controls.Settings.General"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
+    xmlns:fluent="clr-namespace:Certify.UI.Controls.Fluent"
     xmlns:clr="clr-namespace:System;assembly=mscorlib"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
@@ -23,14 +23,11 @@
                 Margin="0,0,0,0"
                 HorizontalContentAlignment="Left"
                 VerticalContentAlignment="Stretch"
-                Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
-                Controls:TabControlHelper.Underlined="TabPanel"
                 DockPanel.Dock="Top"
                 TabStripPlacement="Left">
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="General Settings"
                     IsSelected="true">
                     <StackPanel
@@ -49,7 +46,7 @@
                                     Width="180"
                                     HorizontalAlignment="Left"
                                     Content="Renewal Mode" />
-                                <Controls:NumericUpDown
+                                <fluent:NumberBox
                                     x:Name="RenewalIntervalDays"
                                     Width="100"
                                     Margin="8,0,0,4"
@@ -96,7 +93,7 @@
                                 DockPanel.Dock="Right"
                                 Orientation="Vertical">
                                 <Label HorizontalAlignment="Left" Content="{x:Static res:SR.Settings_AutoRenewalRequestLimit}" />
-                                <Controls:NumericUpDown
+                                <fluent:NumberBox
                                     x:Name="RenewalMaxRequests"
                                     Width="100"
                                     Margin="4,0,0,0"
@@ -291,8 +288,7 @@
                                 <Label Content="Time Check NTP Server" />
                                 <TextBox
                                     Width="240"
-                                    Margin="4,0"
-                                    Controls:TextBoxHelper.Watermark="e.g. pool.ntp.org or blank to skip check."
+                                    Margin="4,0" ToolTip="e.g. pool.ntp.org or blank to skip check."
                                     Text="{Binding Prefs.NtpServer}" />
                                 <Button Margin="0,0,0,0" Click="SettingsUpdated">Apply</Button>
                             </StackPanel>
@@ -353,7 +349,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Certificate Authorities">
                     <StackPanel Margin="16,0,0,0">
                         <TextBlock Style="{StaticResource Subheading}">Certificate Authority Settings</TextBlock>
@@ -364,7 +359,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Stored Credentials">
                     <StackPanel Margin="16,0,0,0">
                         <TextBlock Style="{StaticResource Subheading}">Stored Credentials</TextBlock>
@@ -376,7 +370,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Maintenance Windows">
                     <StackPanel Margin="16,0,0,0">
                         <TextBlock Style="{StaticResource Subheading}">Maintenance Windows</TextBlock>
@@ -387,7 +380,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Import &amp; Export"
                     IsSelected="false"
                     Visibility="{Binding Converter={StaticResource FeatureVisibilityConverter}, ConverterParameter='IMPORT_EXPORT', Path=Prefs}">
@@ -422,7 +414,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="UI Settings"
                     IsSelected="true">
                     <StackPanel Margin="16,0" DockPanel.Dock="Top">
@@ -452,13 +443,12 @@
 
                         <StackPanel Margin="0,4" Orientation="Horizontal">
                             <Label Width="100" Content="Text/UI Size" />
-                            <Controls:NumericUpDown
+                            <fluent:NumberBox
                                 x:Name="UIScaling"
                                 Width="100"
                                 Interval="0.1"
                                 Maximum="2"
                                 Minimum="1"
-                                NumericInputMode="Decimal"
                                 Value="{Binding MainViewModel.UIScaleFactor}" />
 
                         </StackPanel>
@@ -478,7 +468,6 @@
                 <TabItem
                     Height="32"
                     MinWidth="140"
-                    Controls:HeaderedControlHelper.HeaderFontSize="12"
                     Header="Management Hub">
                     <StackPanel Margin="16,0,0,0">
                         <local:ManagementHub />
diff --git a/src/Certify.UI.Shared/Controls/Settings/MaintenanceWindows.xaml b/src/Certify.UI.Shared/Controls/Settings/MaintenanceWindows.xaml
index b24b5e792..a9b41f2a5 100644
--- a/src/Certify.UI.Shared/Controls/Settings/MaintenanceWindows.xaml
+++ b/src/Certify.UI.Shared/Controls/Settings/MaintenanceWindows.xaml
@@ -2,7 +2,6 @@
     x:Class="Certify.UI.Controls.Settings.MaintenanceWindows"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
     xmlns:local="clr-namespace:Certify.UI.Controls.Settings"
@@ -33,7 +32,7 @@
                             Height="16"
                             Margin="0,0,8,0"
                             VerticalAlignment="Center"
-                            Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                             Icon="Plus" />
                         <TextBlock VerticalAlignment="Center">Add Window</TextBlock>
                     </StackPanel>
diff --git a/src/Certify.UI.Shared/Controls/Settings/ManagementHub.xaml b/src/Certify.UI.Shared/Controls/Settings/ManagementHub.xaml
index 0e261ae53..72b910372 100644
--- a/src/Certify.UI.Shared/Controls/Settings/ManagementHub.xaml
+++ b/src/Certify.UI.Shared/Controls/Settings/ManagementHub.xaml
@@ -1,8 +1,7 @@
-<UserControl
+<UserControl
     x:Class="Certify.UI.Controls.Settings.ManagementHub"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Resources="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -35,8 +34,7 @@
         </TextBlock>
         <TextBox
             Width="400"
-            HorizontalAlignment="left"
-            Controls:TextBoxHelper.Watermark="e.g. https://hub.internal.yourdomain.com"
+            HorizontalAlignment="left" ToolTip="e.g. https://hub.internal.yourdomain.com"
             Text="{Binding ManagementHubAPIUrl}" />
         <TextBlock DockPanel.Dock="Top" Style="{StaticResource Instructions}">
             Client ID:
diff --git a/src/Certify.UI.Shared/ICertifyApp.cs b/src/Certify.UI.Shared/ICertifyApp.cs
index 2c58a93f9..f4f31aa28 100644
--- a/src/Certify.UI.Shared/ICertifyApp.cs
+++ b/src/Certify.UI.Shared/ICertifyApp.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.Windows;
+using System.Windows.Threading;
 using Certify.Models.Providers;
-using ControlzEx.Theming;
 using ToastNotifications;
 using ToastNotifications.Lifetime;
 using ToastNotifications.Messages;
@@ -38,38 +38,52 @@ public static string ToggleTheme(System.Windows.Application application, Certify
             {
                 if (initialTheme == "Dark")
                 {
-                    ThemeManager.Current.ChangeTheme(application, "Dark.Green");
+                    application.ThemeMode = ThemeMode.Dark;
                 }
                 else
                 {
-                    ThemeManager.Current.ChangeTheme(application, "Light.Green");
+                    application.ThemeMode = ThemeMode.Light;
                 }
 
-                // refresh bindings to force dynamic resources to redraw
-                mainViewModel.RaisePropertyChangedEvent(nameof(mainViewModel.ManagedCertificates));
+                RefreshTheme(application, mainViewModel);
                 return initialTheme;
             }
             else
             {
-                var theme = ThemeManager.Current.DetectTheme();
                 string themeSelection;
 
-                if (theme.BaseColorScheme == "Light")
+                if (application.ThemeMode == ThemeMode.Light)
                 {
-                    ThemeManager.Current.ChangeTheme(application, "Dark.Green");
+                    application.ThemeMode = ThemeMode.Dark;
                     themeSelection = "Dark";
                 }
                 else
                 {
-                    ThemeManager.Current.ChangeTheme(application, "Light.Green");
+                    application.ThemeMode = ThemeMode.Light;
                     themeSelection = "Light";
                 }
 
-                mainViewModel.RaisePropertyChangedEvent(nameof(mainViewModel.ManagedCertificates));
+                RefreshTheme(application, mainViewModel);
                 return themeSelection;
             }
         }
 
+        private static void RefreshTheme(System.Windows.Application application, Certify.UI.ViewModel.AppViewModel mainViewModel)
+        {
+            foreach (Window window in application.Windows)
+            {
+                window.Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    window.InvalidateVisual();
+                    window.UpdateLayout();
+                }), DispatcherPriority.Background);
+            }
+
+            // refresh bindings that use converters returning theme brushes
+            mainViewModel.RaisePropertyChangedEvent(nameof(mainViewModel.ManagedCertificates));
+            mainViewModel.RaisePropertyChangedEvent(nameof(mainViewModel.SelectedItem));
+        }
+
         public static Notifier Startup(ILog log, ViewModel.AppViewModel mainViewModel, StartupEventArgs e)
         {
             log?.Information("UI Startup");
diff --git a/src/Certify.UI.Shared/Utils/ExpiryDateConverter.cs b/src/Certify.UI.Shared/Utils/ExpiryDateConverter.cs
index 0097f4042..0ac63ff1e 100644
--- a/src/Certify.UI.Shared/Utils/ExpiryDateConverter.cs
+++ b/src/Certify.UI.Shared/Utils/ExpiryDateConverter.cs
@@ -89,11 +89,12 @@ public static System.Windows.Media.Brush GetColour(Lifetime lifetime)
             {
                 try
                 {
-                    return (System.Windows.Media.Brush)ViewModel.AppViewModel.Current.GetApplication().Resources["MahApps.Brushes.SystemControlForegroundBaseMediumHigh"];
+                    return System.Windows.Application.Current?.TryFindResource("TextFillColorPrimaryBrush") as System.Windows.Media.Brush
+                        ?? System.Windows.SystemColors.ControlTextBrush;
                 }
                 catch
                 {
-                    //unit test may not reference MahApps
+                    //unit test may not reference WPF application resources
                     return System.Windows.Media.Brushes.Green;
                 }
             }
diff --git a/src/Certify.UI.Shared/Utils/ManagedCertificateHealthColourConverter.cs b/src/Certify.UI.Shared/Utils/ManagedCertificateHealthColourConverter.cs
index 884932cf2..569d4c96e 100644
--- a/src/Certify.UI.Shared/Utils/ManagedCertificateHealthColourConverter.cs
+++ b/src/Certify.UI.Shared/Utils/ManagedCertificateHealthColourConverter.cs
@@ -41,9 +41,8 @@ public static System.Windows.Media.Brush GetColour(ManagedCertificateHealth heal
             {
                 if (mode == "standard")
                 {
-                    return (System.Windows.Media.Brush)
-                        ViewModel.AppViewModel.Current.GetApplication()
-                        .Resources["MahApps.Brushes.SystemControlForegroundBaseHigh"];
+                    return System.Windows.Application.Current?.TryFindResource("TextFillColorPrimaryBrush") as System.Windows.Media.Brush
+                        ?? System.Windows.SystemColors.ControlTextBrush;
                 }
                 else
                 {
diff --git a/src/Certify.UI.Shared/Windows/AddToDashboard.xaml b/src/Certify.UI.Shared/Windows/AddToDashboard.xaml
index 30acdc6c0..c5f0cd1bd 100644
--- a/src/Certify.UI.Shared/Windows/AddToDashboard.xaml
+++ b/src/Certify.UI.Shared/Windows/AddToDashboard.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.AddToDashboard"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -10,15 +9,13 @@
     Title="{x:Static res:SR.GettingStarted_AddToDashboard}"
     Width="430"
     Height="288"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     ResizeMode="NoResize"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding UIScaleFactor}" ScaleY="{Binding UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
     <StackPanel Margin="16" Orientation="Vertical">
 
         <TextBlock x:Name="IntroText" Style="{StaticResource Instructions}"><Run Text="{x:Static res:SR.Dashboard_AddIntro}" /></TextBlock>
@@ -65,4 +62,4 @@
             </StackPanel>
         </StackPanel>
     </StackPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml b/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml
index 5fd39d995..fe1119f7d 100644
--- a/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml
+++ b/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.DataStoreConnections"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
     xmlns:local="clr-namespace:Certify.UI.Windows"
@@ -11,11 +10,9 @@
     Title="Data Store Connections"
     Width="450"
     Height="390"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    Closing="MetroWindow_Closing"
-    TitleCharacterCasing="Normal"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
+    Closing="Window_Closing"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
 
 
@@ -42,14 +39,11 @@
             Margin="0,0,0,0"
             HorizontalContentAlignment="Left"
             VerticalContentAlignment="Stretch"
-            Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
-            Controls:TabControlHelper.Underlined="TabPanel"
             DockPanel.Dock="Top"
             TabStripPlacement="Top">
             <TabItem
                 Height="32"
                 MinWidth="140"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Managed Data Stores"
                 IsSelected="true">
                 <DockPanel Margin="8" LastChildFill="False">
@@ -71,8 +65,8 @@
                                                 <Setter Property="CornerRadius" Value="3" />
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding IsDefault}" Value="True">
-                                                        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent4}" />
-                                                        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                                                        <Setter Property="Background" Value="{DynamicResource AccentFillColorTertiaryBrush}" />
+                                                        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDefaultBrush}" />
                                                     </DataTrigger>
                                                 </Style.Triggers>
                                             </Style>
@@ -85,7 +79,6 @@
                                             Click="Connect_Click"
                                             CommandParameter="{Binding}"
                                             DockPanel.Dock="Left"
-                                            Style="{DynamicResource MahApps.Styles.Button.Reveal}"
                                             ToolTip="Select this Data Store">
                                             <StackPanel Orientation="Horizontal">
                                                 <fa:ImageAwesome
@@ -106,7 +99,7 @@
                                                 <fa:ImageAwesome
                                                     HorizontalAlignment="Center"
                                                     VerticalAlignment="Bottom"
-                                                    Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                                    Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                                     Icon="Edit" />
 
                                             </StackPanel>
@@ -118,7 +111,7 @@
                                             <StackPanel Orientation="Vertical">
                                                 <TextBlock
                                                     DockPanel.Dock="Left"
-                                                    Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                                     Text="{Binding Path=TypeId}"
                                                     TextWrapping="WrapWithOverflow" />
                                             </StackPanel>
@@ -135,7 +128,6 @@
             <TabItem
                 Height="32"
                 MinWidth="140"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Migrate Data"
                 IsSelected="true">
                 <DockPanel Margin="8" LastChildFill="False">
@@ -177,7 +169,7 @@
                                     Margin="4,0,0,0"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                    Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                     Icon="Database" />
 
                             </StackPanel>
@@ -208,4 +200,4 @@
             </Button>
         </DockPanel>
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml.cs b/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml.cs
index ad6c82fd8..daa3d6feb 100644
--- a/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml.cs
+++ b/src/Certify.UI.Shared/Windows/DataStoreConnections.xaml.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Windows;
@@ -101,7 +101,7 @@ private async void Connect_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void MetroWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             // cancel pending operations (if any)
             _cts.Cancel();
diff --git a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml
index 3ff3a1e74..94988e854 100644
--- a/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml
+++ b/src/Certify.UI.Shared/Windows/EditAccountDialog.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.EditAccountDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -10,15 +9,13 @@
     Title="{x:Static res:SR.Account_Edit_SectionTitle}"
     Width="590"
     Height="480"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     ResizeMode="CanResizeWithGrip"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding MainViewModel.UIScaleFactor}" ScaleY="{Binding MainViewModel.UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
     <DockPanel Margin="8" LastChildFill="False">
 
         <TabControl
@@ -26,13 +23,10 @@
             Margin="0,0,0,0"
             HorizontalContentAlignment="Left"
             VerticalContentAlignment="Stretch"
-            Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
-            Controls:TabControlHelper.Underlined="TabPanel"
             DockPanel.Dock="Top"
             TabStripPlacement="Top">
             <TabItem
                 MinWidth="140"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Account Settings"
                 IsSelected="true">
                 <DockPanel Margin="8,0,0,0">
@@ -110,7 +104,6 @@
 
             <TabItem
                 MinWidth="140"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Advanced">
                 <ScrollViewer MaxHeight="350">
                     <DockPanel Margin="8,0,8,0">
@@ -135,8 +128,7 @@
                                     Width="300"
                                     Height="23"
                                     HorizontalAlignment="Left"
-                                    VerticalAlignment="Top"
-                                    Controls:TextBoxHelper.Watermark="(optional) e.g. DST Root CA X3"
+                                    VerticalAlignment="Top" ToolTip="(optional) e.g. DST Root CA X3"
                                     Text="{Binding Item.PreferredChain}"
                                     TextWrapping="Wrap" />
                             </StackPanel>
@@ -193,8 +185,7 @@
                                 Width="300"
                                 Height="23"
                                 HorizontalAlignment="Left"
-                                VerticalAlignment="Top"
-                                Controls:TextBoxHelper.Watermark="optional, e.g. HS256 (default), HS384 or HS512"
+                                VerticalAlignment="Top" ToolTip="optional, e.g. HS256 (default), HS384 or HS512"
                                 Text="{Binding Item.EabKeyAlgorithm}"
                                 TextWrapping="Wrap" />
                         </StackPanel>
@@ -288,4 +279,4 @@
                 DockPanel.Dock="Left" />
         </DockPanel>
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml
index e6e4c896f..f9e3aa416 100644
--- a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml
+++ b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.EditCertificateAuthority"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Models="clr-namespace:Certify.Models;assembly=Certify.Core"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
@@ -11,15 +10,13 @@
     Title="Edit Certificate Authority"
     Width="580"
     Height="430"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     ResizeMode="CanResize"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding MainViewModel.UIScaleFactor}" ScaleY="{Binding MainViewModel.UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
     <DockPanel LastChildFill="False">
         <!--  Certificate Authority Preference  -->
         <StackPanel
@@ -51,8 +48,7 @@
                 Width="300"
                 Height="23"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="{x:Static res:SR.EditCertificateAuthority_TitleHelp}"
+                VerticalAlignment="Top" ToolTip="{x:Static res:SR.EditCertificateAuthority_TitleHelp}"
                 Text="{Binding Model.Item.Title}"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -70,8 +66,7 @@
                 Width="300"
                 Height="48"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="(Optional description)"
+                VerticalAlignment="Top" ToolTip="(Optional description)"
                 Text="{Binding Model.Item.Description}"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -88,8 +83,7 @@
                 Width="300"
                 Height="23"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="{x:Static res:SR.EditCertificateAuthority_ProductionDirectoryHelp}"
+                VerticalAlignment="Top" ToolTip="{x:Static res:SR.EditCertificateAuthority_ProductionDirectoryHelp}"
                 Text="{Binding Model.Item.ProductionAPIEndpoint}"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -106,8 +100,7 @@
                 Width="300"
                 Height="23"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="(Optional Url for the staging/test directory endpoint)"
+                VerticalAlignment="Top" ToolTip="(Optional Url for the staging/test directory endpoint)"
                 Text="{Binding Model.Item.StagingAPIEndpoint}"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -121,12 +114,12 @@
                 VerticalAlignment="Top"
                 Content="Features" />
             <StackPanel Orientation="Vertical">
-                <Controls:ToggleSwitch Content="Enabled" IsOn="{Binding Model.Item.IsEnabled}" />
-                <Controls:ToggleSwitch Content="Email Address Required" IsOn="{Binding Model.Item.RequiresEmailAddress}" />
-                <Controls:ToggleSwitch Content="Allow Untrusted TLS" IsOn="{Binding Model.Item.AllowUntrustedTls}" />
-                <Controls:ToggleSwitch Content="Allow Internal Hostnames" IsOn="{Binding Model.Item.AllowInternalHostnames}" />
-                <Controls:ToggleSwitch Content="Requires CN (Common Name)" IsOn="{Binding Model.Item.RequiresCN}" />
-                <Controls:ToggleSwitch Content="Requires External Account Binding" IsOn="{Binding Model.Item.RequiresExternalAccountBinding}" />
+                <CheckBox Content="Enabled" IsChecked="{Binding Model.Item.IsEnabled}" />
+                <CheckBox Content="Email Address Required" IsChecked="{Binding Model.Item.RequiresEmailAddress}" />
+                <CheckBox Content="Allow Untrusted TLS" IsChecked="{Binding Model.Item.AllowUntrustedTls}" />
+                <CheckBox Content="Allow Internal Hostnames" IsChecked="{Binding Model.Item.AllowInternalHostnames}" />
+                <CheckBox Content="Requires CN (Common Name)" IsChecked="{Binding Model.Item.RequiresCN}" />
+                <CheckBox Content="Requires External Account Binding" IsChecked="{Binding Model.Item.RequiresExternalAccountBinding}" />
             </StackPanel>
         </StackPanel>
 
@@ -159,4 +152,4 @@
         </StackPanel>
 
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs
index 8a058f2d4..9e1221d94 100644
--- a/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs
+++ b/src/Certify.UI.Shared/Windows/EditCertificateAuthority.xaml.cs
@@ -156,7 +156,7 @@ private void OnFeatureToggled(object sender, RoutedEventArgs e)
         {
             if (sender != null)
             {
-                var s = ((MahApps.Metro.Controls.ToggleSwitch)sender);
+                var s = ((System.Windows.Controls.Primitives.ToggleButton)sender);
                 var featureTag = s.Tag.ToString();
 
                 Model.ToggleFeature(featureTag);
diff --git a/src/Certify.UI.Shared/Windows/EditCredential.xaml b/src/Certify.UI.Shared/Windows/EditCredential.xaml
index f894de907..22f40f605 100644
--- a/src/Certify.UI.Shared/Windows/EditCredential.xaml
+++ b/src/Certify.UI.Shared/Windows/EditCredential.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.EditCredential"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -10,21 +9,19 @@
     Title="{x:Static res:SR.Credentials_EditCredential}"
     Width="460"
     Height="540"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     ResizeMode="CanResizeWithGrip"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding MainViewModel.UIScaleFactor}" ScaleY="{Binding MainViewModel.UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
     <Window.Resources>
         <DataTemplate x:Key="ProviderStringParameter">
             <DockPanel>
                 <StackPanel Margin="8,0,0,0" DockPanel.Dock="Left">
                     <TextBlock FontWeight="SemiBold" Text="{Binding Name}" />
-                    <TextBox Controls:TextBoxHelper.Watermark="{Binding Description}" Text="{Binding Value}" />
+                    <TextBox ToolTip="{Binding Description}" Text="{Binding Value}" />
                 </StackPanel>
             </DockPanel>
         </DataTemplate>
@@ -34,7 +31,6 @@
                     <TextBlock FontWeight="SemiBold" Text="{Binding Name}" />
                     <TextBox
                         Height="100"
-                        Controls:TextBoxHelper.Watermark="{Binding Description}"
                         AcceptsReturn="True"
                         Text="{Binding Value}"
                         ToolTip="{Binding Description}"
@@ -131,8 +127,7 @@
                 VerticalAlignment="Top"
                 Content="Credential Name" />
             <TextBox
-                Width="250"
-                Controls:TextBoxHelper.Watermark="Display name for this saved credential"
+                Width="250" ToolTip="Display name for this saved credential"
                 Text="{Binding Item.Title}" />
         </StackPanel>
         <ScrollViewer DockPanel.Dock="Top">
@@ -168,4 +163,4 @@
                 DockPanel.Dock="Right" />
         </DockPanel>
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml b/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml
index 994865ef0..4289170d3 100644
--- a/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml
+++ b/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml
@@ -1,24 +1,21 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.EditDataStoreConnectionDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:res="clr-namespace:Certify.Locales;assembly=Certify.Locales"
     Title="Edit Data Store Connection"
     Width="522"
     Height="276"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    Loaded="MetroWindow_Loaded"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
+    Loaded="Window_Loaded"
     ResizeMode="CanResizeWithGrip"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding MainViewModel.UIScaleFactor}" ScaleY="{Binding MainViewModel.UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
 
     <DockPanel
         Margin="8,0,0,0"
@@ -43,8 +40,7 @@
                 Width="300"
                 Height="23"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="e.g. A display name, e.g. SQL Server on SRV01 etc "
+                VerticalAlignment="Top" ToolTip="e.g. A display name, e.g. SQL Server on SRV01 etc "
                 Text="{Binding Item.Title}"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -80,8 +76,7 @@
                 Width="300"
                 Height="42"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="e.g. a database connection string"
+                VerticalAlignment="Top" ToolTip="e.g. a database connection string"
                 Text="{Binding Item.ConnectionConfig}"
                 TextWrapping="Wrap"
                 VerticalScrollBarVisibility="Auto" />
@@ -113,4 +108,4 @@
 
     </DockPanel>
 
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml.cs b/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml.cs
index a940849d3..1d2b39ad1 100644
--- a/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml.cs
+++ b/src/Certify.UI.Shared/Windows/EditDataStoreConnection.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
@@ -47,7 +47,7 @@ public EditDataStoreConnectionDialog(DataStoreConnection editItem = null)
 
         }
 
-        private async void MetroWindow_Loaded(object sender, RoutedEventArgs e)
+        private async void Window_Loaded(object sender, RoutedEventArgs e)
         {
             Model.DataStoreProviders = await MainViewModel.GetDataStoreProviders();
         }
diff --git a/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml b/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml
index 4de36a956..45e0afd0d 100644
--- a/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml
+++ b/src/Certify.UI.Shared/Windows/EditDeploymentTask.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.EditDeploymentTask"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:ManagedCertificate="clr-namespace:Certify.UI.Controls.ManagedCertificate"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
@@ -10,15 +9,13 @@
     Title="Edit Deployment Task"
     Width="500"
     Height="460"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     ResizeMode="CanResize"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding UIScaleFactor}" ScaleY="{Binding UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
     <DockPanel LastChildFill="True">
 
 
@@ -48,4 +45,4 @@
             VerticalAlignment="Top"
             DockPanel.Dock="Top" />
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml b/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml
index 8bde37cbf..50f74b28a 100644
--- a/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml
+++ b/src/Certify.UI.Shared/Windows/EditMaintenanceWindow.xaml
@@ -1,22 +1,20 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.EditMaintenanceWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
+    xmlns:fluent="clr-namespace:Certify.UI.Controls.Fluent"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="Edit Maintenance Window"
     Width="600"
     Height="650"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
+    BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
     BorderThickness="1"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
 
     <DockPanel Margin="16">
@@ -41,8 +39,7 @@
                 <TextBlock Style="{StaticResource Subheading}">Name</TextBlock>
                 <TextBox
                     x:Name="WindowName"
-                    Margin="0,4,0,16"
-                    Controls:TextBoxHelper.Watermark="e.g., Nightly Maintenance"
+                    Margin="0,4,0,16" ToolTip="e.g., Nightly Maintenance"
                     Text="{Binding EditWindow.Name, UpdateSourceTrigger=PropertyChanged}" />
 
                 <TextBlock Style="{StaticResource Subheading}">Description</TextBlock>
@@ -50,8 +47,7 @@
                     x:Name="WindowDescription"
                     Height="60"
                     Margin="0,4,0,16"
-                    AcceptsReturn="True"
-                    Controls:TextBoxHelper.Watermark="Optional description of this maintenance window"
+                    AcceptsReturn="True" ToolTip="Optional description of this maintenance window"
                     Text="{Binding EditWindow.Description, UpdateSourceTrigger=PropertyChanged}"
                     VerticalScrollBarVisibility="Auto" />
 
@@ -153,7 +149,7 @@
                 <StackPanel Orientation="Horizontal" Margin="0,8,0,8">
                     <StackPanel Margin="0,0,16,0">
                         <TextBlock Margin="0,0,0,4">Start Time (24-hour format)</TextBlock>
-                        <Controls:NumericUpDown
+                        <fluent:NumberBox
                             x:Name="StartHour"
                             Width="60"
                             Margin="0,0,4,0"
@@ -164,7 +160,7 @@
                     </StackPanel>
                     <StackPanel Margin="0,0,16,0">
                         <TextBlock Margin="0,0,0,4">:</TextBlock>
-                        <Controls:NumericUpDown
+                        <fluent:NumberBox
                             x:Name="StartMinute"
                             Width="60"
                             Margin="0,0,4,0"
@@ -175,7 +171,7 @@
                     </StackPanel>
                     <StackPanel Margin="16,0,16,0">
                         <TextBlock Margin="0,0,0,4">End Time (24-hour format)</TextBlock>
-                        <Controls:NumericUpDown
+                        <fluent:NumberBox
                             x:Name="EndHour"
                             Width="60"
                             Margin="0,0,4,0"
@@ -186,7 +182,7 @@
                     </StackPanel>
                     <StackPanel>
                         <TextBlock Margin="0,0,0,4">:</TextBlock>
-                        <Controls:NumericUpDown
+                        <fluent:NumberBox
                             x:Name="EndMinute"
                             Width="60"
                             Margin="0,0,4,0"
@@ -201,8 +197,8 @@
                     x:Name="OvernightWarning"
                     Margin="0,8,0,16"
                     Padding="8"
-                    Background="{DynamicResource MahApps.Brushes.Accent4}"
-                    BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
+                    Background="{DynamicResource AccentFillColorTertiaryBrush}"
+                    BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
                     BorderThickness="1"
                     Visibility="Collapsed">
                     <TextBlock TextWrapping="Wrap">
@@ -227,8 +223,8 @@
                 <Border
                     Margin="0,8,0,0"
                     Padding="8"
-                    Background="{DynamicResource MahApps.Brushes.Gray10}"
-                    BorderBrush="{DynamicResource MahApps.Brushes.Gray5}"
+                    Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
+                    BorderBrush="{DynamicResource TextFillColorSecondaryBrush}"
                     BorderThickness="1">
                     <StackPanel>
                         <TextBlock FontWeight="SemiBold">Schedule Preview:</TextBlock>
@@ -241,4 +237,4 @@
             </StackPanel>
         </ScrollViewer>
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/EditServerConnection.xaml b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml
index 64722da9a..b4a42dc55 100644
--- a/src/Certify.UI.Shared/Windows/EditServerConnection.xaml
+++ b/src/Certify.UI.Shared/Windows/EditServerConnection.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.EditServerConnectionDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Models="clr-namespace:Certify.Models;assembly=Certify.Core"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
@@ -11,15 +10,13 @@
     Title="Edit Server Connection"
     Width="540"
     Height="320"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     ResizeMode="CanResizeWithGrip"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding MainViewModel.UIScaleFactor}" ScaleY="{Binding MainViewModel.UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
 
 
     <DockPanel Margin="8,0,0,0" LastChildFill="False">
@@ -45,8 +42,7 @@
                 Width="300"
                 Height="23"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="e.g. Primary Server, WEB01 etc "
+                VerticalAlignment="Top" ToolTip="e.g. Primary Server, WEB01 etc "
                 Text="{Binding Item.DisplayName}"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -79,8 +75,7 @@
                 Width="300"
                 Height="23"
                 HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Controls:TextBoxHelper.Watermark="e.g. 9696"
+                VerticalAlignment="Top" ToolTip="e.g. 9696"
                 Text="{Binding Item.Port}"
                 TextWrapping="Wrap" />
         </StackPanel>
@@ -131,4 +126,4 @@
 
     </DockPanel>
 
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/Feedback.xaml b/src/Certify.UI.Shared/Windows/Feedback.xaml
index 334ed3d0f..10269cd96 100644
--- a/src/Certify.UI.Shared/Windows/Feedback.xaml
+++ b/src/Certify.UI.Shared/Windows/Feedback.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.Feedback"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -12,14 +11,12 @@
     Height="333.8"
     MinWidth="300"
     MinHeight="300"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    TitleCharacterCasing="Normal"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding UIScaleFactor}" ScaleY="{Binding UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
     <Grid Margin="0,0,2,6.8">
         <TextBox
             x:Name="Comment"
@@ -72,4 +69,4 @@
             VerticalAlignment="Top"
             TextWrapping="Wrap" />
     </Grid>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml b/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml
index 6a33c0cfb..8cb59671a 100644
--- a/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml
+++ b/src/Certify.UI.Shared/Windows/GettingStartedGuide.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.GettingStartedGuide"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Controls1="clr-namespace:Certify.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
@@ -13,12 +12,10 @@
     Height="600"
     MinWidth="300"
     MinHeight="300"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    TitleCharacterCasing="Normal"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
     <DockPanel>
         <Controls1:QuickStart />
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/ImportExport.xaml b/src/Certify.UI.Shared/Windows/ImportExport.xaml
index 922e0b9b4..11409e17d 100644
--- a/src/Certify.UI.Shared/Windows/ImportExport.xaml
+++ b/src/Certify.UI.Shared/Windows/ImportExport.xaml
@@ -1,18 +1,15 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.ImportExport"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="Import or Export Settings"
     Width="800"
     Height="740"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    TitleCharacterCasing="Normal"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
 
     <DockPanel Margin="16" LastChildFill="true">
@@ -23,8 +20,7 @@
             <PasswordBox
                 x:Name="txtSecret"
                 Width="200"
-                HorizontalAlignment="Left"
-                Controls:TextBoxHelper.Watermark="Password" />
+                HorizontalAlignment="Left" ToolTip="Password" />
 
         </StackPanel>
 
@@ -34,14 +30,11 @@
             Margin="0,8,0,0"
             HorizontalContentAlignment="Left"
             VerticalContentAlignment="Stretch"
-            Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
-            Controls:TabControlHelper.Underlined="TabPanel"
             DockPanel.Dock="Top"
             TabStripPlacement="Top">
             <TabItem
                 Height="32"
                 MinWidth="140"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Export Settings"
                 IsSelected="true">
                 <StackPanel DockPanel.Dock="Top" Orientation="Vertical">
@@ -59,7 +52,6 @@
             <TabItem
                 Height="32"
                 MinWidth="140"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="Import Settings">
                 <StackPanel Margin="0,16,0,0" Orientation="Vertical">
                     <TextBlock DockPanel.Dock="Top" Style="{StaticResource Instructions}">Import a settings bundle exported from another instance of the app.</TextBlock>
@@ -97,7 +89,7 @@
                         </Button>
                     </StackPanel>
 
-                    <Controls:MetroProgressBar
+                    <ProgressBar
                         Width="250"
                         Height="32"
                         Margin="4"
@@ -125,4 +117,4 @@
 
 
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/MainWindow.xaml b/src/Certify.UI.Shared/Windows/MainWindow.xaml
index 024e378d3..543dc4efe 100644
--- a/src/Certify.UI.Shared/Windows/MainWindow.xaml
+++ b/src/Certify.UI.Shared/Windows/MainWindow.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:CustomControls="clr-namespace:Certify.UI.Controls"
     xmlns:SettingsControls="clr-namespace:Certify.UI.Controls.Settings"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -18,28 +17,32 @@
     MinHeight="400"
     d:DataContext="{d:DesignInstance Type=local:AppViewModelDesign,
                                      IsDesignTimeCreatable=True}"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    Closing="MetroWindow_Closing"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
+    Closing="Window_Closing"
     Loaded="Window_Loaded"
-    TitleCharacterCasing="Normal"
-    WindowButtonCommandsOverlayBehavior="Never"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
 
-    <Controls:MetroWindow.Resources>
+    <Window.Resources>
         <utils:InverseBooleanConverter x:Key="InvBoolConverter" />
-    </Controls:MetroWindow.Resources>
+    </Window.Resources>
 
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="48" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+        <Grid Background="{DynamicResource LayerFillColorDefaultBrush}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="48" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
 
-        <Grid.LayoutTransform>
-            <ScaleTransform CenterX="0" CenterY="0" ScaleX="{Binding UIScaleFactor}" ScaleY="{Binding UIScaleFactor}" />
-        </Grid.LayoutTransform>
+            <Grid.LayoutTransform>
+                <ScaleTransform CenterX="0" CenterY="0" ScaleX="{Binding UIScaleFactor}" ScaleY="{Binding UIScaleFactor}" />
+            </Grid.LayoutTransform>
+
+            <Border
+                Grid.RowSpan="3"
+                Width="4"
+                HorizontalAlignment="Left"
+                Background="{DynamicResource AccentFillColorDefaultBrush}" />
 
         <!--  Degraded Mode Banner  -->
         <Border
@@ -57,7 +60,7 @@
                     <StackPanel Orientation="Horizontal">
                         <fa:ImageAwesome
                             Height="12"
-                            Foreground="{StaticResource MahApps.Brushes.Accent}"
+                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                             Icon="Refresh"
                             Spin="{Binding IsReconnecting}" />
                         <TextBlock
@@ -81,7 +84,7 @@
 
         <DockPanel
             Grid.Row="1"
-            Margin="8,8,8,0"
+            Margin="16,12,16,0"
             VerticalAlignment="Top">
 
             <Button
@@ -95,7 +98,7 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{StaticResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="PlusCircle" />
                     <TextBlock Margin="8,0,0,0" VerticalAlignment="Center"><Run Text="{x:Static res:SR.New_Certificate}" /></TextBlock>
                 </StackPanel>
@@ -111,7 +114,7 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Foreground="{StaticResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="Refresh" />
                     <TextBlock Margin="8,0,0,0" VerticalAlignment="Center"><Run Text="{x:Static res:SR.Renew_All}" /></TextBlock>
                 </StackPanel>
@@ -126,17 +129,17 @@
                     Height="32"
                     Margin="8,0,0,5"
                     AutomationProperties.Name="{x:Static res:SR.Update_Available}"
-                    Background="{DynamicResource MahApps.Brushes.AccentBase}"
+                    Background="{DynamicResource AccentFillColorDefaultBrush}"
                     Click="ButtonUpdateAvailable_Click"
                     FontWeight="DemiBold"
-                    Foreground="{DynamicResource MahApps.Brushes.SystemControlBackgroundAltMediumHigh}">
+                    Foreground="{DynamicResource LayerFillColorDefaultBrush}">
 
                     <StackPanel Orientation="Horizontal">
                         <fa:ImageAwesome
                             Name="UpdateIcon"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundAltMediumHigh}"
+                            Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"
                             Icon="Download" />
                         <TextBlock Margin="8,0,0,0" VerticalAlignment="Center"><Run Text="{x:Static res:SR.Update_Available}" /></TextBlock>
                     </StackPanel>
@@ -151,9 +154,9 @@
 
                 <fa:ImageAwesome
                     x:Name="ConnectingService"
-                    Height="12                                      "
+                    Height="12"
                     Margin="4,0,0,0"
-                    Foreground="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                     Icon="Refresh"
                     Spin="True"
                     SpinDuration="1"
@@ -161,7 +164,7 @@
                 <TextBlock
                     Margin="8,0,0,0"
                     VerticalAlignment="Center"
-                    Foreground="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"><Run Text="Loading.." /></TextBlock>
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"><Run Text="Loading.." /></TextBlock>
             </StackPanel>
 
             <DockPanel
@@ -182,7 +185,7 @@
                         <fa:ImageAwesome
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Foreground="{StaticResource MahApps.Brushes.AccentBase}"
+                            Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                             Icon="Plug" />
 
                     </StackPanel>
@@ -190,12 +193,12 @@
                 <TextBlock
                     Margin="4,0,0,0"
                     DockPanel.Dock="top"
-                    Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMedium}"
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                     Text="{Binding ConnectionState}" />
                 <TextBlock
                     Margin="4,0,0,0"
                     DockPanel.Dock="Left"
-                    Foreground="{DynamicResource MahApps.Brushes.SystemControlForegroundBaseMedium}"
+                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                     Text="{Binding ConnectionTitle}" />
 
 
@@ -203,24 +206,21 @@
 
         </DockPanel>
 
-        <TabControl
-            x:Name="MainTabControl"
-            Grid.Row="2"
-            Width="auto"
-            Height="auto"
-            Margin="8,8,8,8"
+            <TabControl
+                x:Name="MainTabControl"
+                Grid.Row="2"
+                Width="auto"
+                Height="auto"
+                Margin="16,8,16,16"
             HorizontalAlignment="Stretch"
             HorizontalContentAlignment="Left"
             VerticalContentAlignment="Stretch"
-            Controls:TabControlHelper.UnderlineBrush="{DynamicResource MahApps.Brushes.Accent4}"
-            Controls:TabControlHelper.Underlined="TabPanel"
             SelectedIndex="{Binding MainUITabIndex}">
 
             <TabItem
                 MinWidth="100"
                 HorizontalContentAlignment="Stretch"
                 VerticalContentAlignment="Stretch"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="{x:Static res:SR.Managed_Certificates}"
                 IsSelected="True">
                 <CustomControls:ManagedCertificates
@@ -233,7 +233,6 @@
                 HorizontalAlignment="Left"
                 HorizontalContentAlignment="Stretch"
                 VerticalContentAlignment="Stretch"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="{x:Static res:SR.In_Progress}"
                 IsEnabled="{Binding IsServiceAvailable}">
                 <CustomControls:ProgressMonitor />
@@ -243,7 +242,6 @@
                 HorizontalAlignment="Left"
                 HorizontalContentAlignment="Stretch"
                 VerticalContentAlignment="Stretch"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="{x:Static res:SR.Settings}"
                 IsEnabled="{Binding IsServiceAvailable}">
                 <SettingsControls:General Height="Auto" />
@@ -252,25 +250,26 @@
                 MinWidth="80"
                 HorizontalContentAlignment="Stretch"
                 VerticalContentAlignment="Stretch"
-                Controls:HeaderedControlHelper.HeaderFontSize="12"
                 Header="{x:Static res:SR.About}">
                 <CustomControls:AboutControl Width="Auto" Height="Auto" />
             </TabItem>
         </TabControl>
 
-    </Grid>
-    <Controls:MetroWindow.Flyouts>
+        </Grid>
 
-        <Controls:FlyoutsControl>
-            <Controls:FlyoutsControl.LayoutTransform>
+        <GroupBox
+            x:Name="MainFlyout"
+            Width="300"
+            Margin="8"
+            Padding="8"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Stretch"
+            Background="{DynamicResource LayerFillColorDefaultBrush}"
+            Header="Flyout"
+            Visibility="Collapsed">
+            <GroupBox.LayoutTransform>
                 <ScaleTransform x:Name="FlyoutScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding UIScaleFactor}" ScaleY="{Binding UIScaleFactor}" />
-            </Controls:FlyoutsControl.LayoutTransform>
-            <Controls:Flyout
-                Name="MainFlyout"
-                Width="300"
-                Header="Flyout"
-                Position="Right"
-                Theme="Adapt" />
-        </Controls:FlyoutsControl>
-    </Controls:MetroWindow.Flyouts>
-</Controls:MetroWindow>
+            </GroupBox.LayoutTransform>
+        </GroupBox>
+    </Grid>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/MainWindow.xaml.cs b/src/Certify.UI.Shared/Windows/MainWindow.xaml.cs
index aee510dca..4a1fa82db 100644
--- a/src/Certify.UI.Shared/Windows/MainWindow.xaml.cs
+++ b/src/Certify.UI.Shared/Windows/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
@@ -521,7 +521,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private async void MetroWindow_Closing(object sender, CancelEventArgs e)
+        private async void Window_Closing(object sender, CancelEventArgs e)
         {
             // allow canceling exit to save changes
             if (!await _itemViewModel.ConfirmDiscardUnsavedChanges())
diff --git a/src/Certify.UI.Shared/Windows/Registration.xaml b/src/Certify.UI.Shared/Windows/Registration.xaml
index d4161ea99..9abd4560b 100644
--- a/src/Certify.UI.Shared/Windows/Registration.xaml
+++ b/src/Certify.UI.Shared/Windows/Registration.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.Registration"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Certify.UI.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -11,16 +10,14 @@
     Title="{x:Static res:SR.Registration}"
     Width="421.946"
     Height="255.15"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     ResizeMode="NoResize"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
 
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding MainViewModel.UIScaleFactor}" ScaleY="{Binding MainViewModel.UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
 
     <DockPanel>
         <StackPanel DockPanel.Dock="Top" Visibility="{Binding IsRegistrationMode, Converter={StaticResource ResourceKey=BoolToVisConverter}}">
@@ -121,4 +118,4 @@
         </DockPanel>
 
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/ServerConnections.xaml b/src/Certify.UI.Shared/Windows/ServerConnections.xaml
index e58c7707e..dee73b0bc 100644
--- a/src/Certify.UI.Shared/Windows/ServerConnections.xaml
+++ b/src/Certify.UI.Shared/Windows/ServerConnections.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.ServerConnections"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
     xmlns:local="clr-namespace:Certify.UI.Windows"
@@ -10,11 +9,9 @@
     Title="Server Connections"
     Width="384"
     Height="500"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
-    Closing="MetroWindow_Closing"
-    TitleCharacterCasing="Normal"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
+    Closing="Window_Closing"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
 
     <DockPanel Margin="8" LastChildFill="False">
@@ -48,7 +45,7 @@
                                     <fa:ImageAwesome
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                         Icon="Plug" />
 
                                 </StackPanel>
@@ -67,7 +64,7 @@
                                     <fa:ImageAwesome
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Foreground="{StaticResource MahApps.Brushes.Accent}"
+                                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                                         Icon="Edit" />
 
 
@@ -80,13 +77,13 @@
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock
                                         DockPanel.Dock="Left"
-                                        Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                                        Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                         Text="{Binding Path=Host}"
                                         TextWrapping="WrapWithOverflow" />
                                     <TextBlock
                                         Margin="4,0,0,0"
                                         DockPanel.Dock="Left"
-                                        Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
+                                        Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                         Text="{Binding Path=Port}"
                                         TextWrapping="WrapWithOverflow" />
                                 </StackPanel>
@@ -120,4 +117,4 @@
             </Button>
         </DockPanel>
     </DockPanel>
-</Controls:MetroWindow>
+</Window>
diff --git a/src/Certify.UI.Shared/Windows/ServerConnections.xaml.cs b/src/Certify.UI.Shared/Windows/ServerConnections.xaml.cs
index 284df9483..4e7488999 100644
--- a/src/Certify.UI.Shared/Windows/ServerConnections.xaml.cs
+++ b/src/Certify.UI.Shared/Windows/ServerConnections.xaml.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using Certify.Shared;
@@ -42,7 +42,7 @@ private async void Connect_Click(object sender, RoutedEventArgs e)
             Close();
         }
 
-        private void MetroWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             // cancel pending operations (if any)
             _cts.Cancel();
diff --git a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml
index 8e29d649c..8e567eedc 100644
--- a/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml
+++ b/src/Certify.UI.Shared/Windows/UpdateAvailable.xaml
@@ -1,8 +1,7 @@
-<Controls:MetroWindow
+<Window
     x:Class="Certify.UI.Windows.UpdateAvailable"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
     xmlns:Controls1="clr-namespace:Certify.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:fa="http://schemas.fontawesome.io/icons/"
@@ -14,17 +13,13 @@
     Height="423"
     MinWidth="300"
     MinHeight="300"
-    Background="{DynamicResource MahApps.Brushes.Window.Background}"
+    Background="{DynamicResource LayerFillColorDefaultBrush}"
     IsVisibleChanged="UserControl_IsVisibleChanged"
-    ShowMaxRestoreButton="False"
-    ShowMinButton="False"
-    TitleCharacterCasing="Normal"
     WindowStartupLocation="CenterOwner"
-    WindowTransitionsEnabled="False"
     mc:Ignorable="d">
-    <Controls:MetroWindow.LayoutTransform>
+    <Window.LayoutTransform>
         <ScaleTransform x:Name="ApplicationScaleTransform" CenterX="0" CenterY="0" ScaleX="{Binding UIScaleFactor}" ScaleY="{Binding UIScaleFactor}" />
-    </Controls:MetroWindow.LayoutTransform>
+    </Window.LayoutTransform>
     <DockPanel Margin="16,16,16,16" LastChildFill="False">
         <TextBlock
             x:Name="UpdateMessage"
@@ -57,7 +52,7 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="Download" />
                     <TextBlock Margin="8,0,0,0">Download</TextBlock>
                 </StackPanel>
@@ -71,11 +66,11 @@
                     <fa:ImageAwesome
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                        Foreground="{DynamicResource AccentFillColorDefaultBrush}"
                         Icon="ArrowCircleLeft" />
                     <TextBlock Margin="8,0,0,0">Later</TextBlock>
                 </StackPanel>
             </Button>
         </DockPanel>
     </DockPanel>
-</Controls:MetroWindow>
+</Window>