diff --git a/Images/Plus Minus.psd b/Images/Plus Minus.psd
new file mode 100644
index 00000000..ae3fff21
Binary files /dev/null and b/Images/Plus Minus.psd differ
diff --git a/Source/LibationWinForms/Resources/Stoplight1 with pdf.psd b/Images/Stoplight with pdf.psd
similarity index 100%
rename from Source/LibationWinForms/Resources/Stoplight1 with pdf.psd
rename to Images/Stoplight with pdf.psd
diff --git a/Source/LibationWinForms/Resources/Stoplight1.psd b/Images/Stoplight.psd
similarity index 100%
rename from Source/LibationWinForms/Resources/Stoplight1.psd
rename to Images/Stoplight.psd
diff --git a/Source/LibationAvalonia/App.axaml b/Source/LibationAvalonia/App.axaml
index e76d03e1..da3b6fad 100644
--- a/Source/LibationAvalonia/App.axaml
+++ b/Source/LibationAvalonia/App.axaml
@@ -2,15 +2,71 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:LibationAvalonia"
 			 x:Class="LibationAvalonia.App">
-	
+
 	<Application.DataTemplates>
 		<local:ViewLocator/>
 	</Application.DataTemplates>
-	
-    <Application.Styles>
+
+	<Application.Resources>
+
+		<ResourceDictionary>
+			<ResourceDictionary.ThemeDictionaries>
+				<ResourceDictionary x:Key="Light">
+					<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.3" Color="#abffab" />
+					<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="LightCoral" />
+					<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="PaleGreen" />
+					<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
+					<SolidColorBrush x:Key="HyperlinkNew" Color="Blue" />
+					<SolidColorBrush x:Key="HyperlinkVisited" Color="Purple" />
+					<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="White" />
+					<SolidColorBrush x:Key="SystemOpaqueBase" Color="White" />
+
+					<SolidColorBrush x:Key="CancelRed" Color="FireBrick" />
+					<SolidColorBrush x:Key="IconFill" Color="#231F20" />
+					<SolidColorBrush x:Key="StoplightRed" Color="#F06060" />
+					<SolidColorBrush x:Key="StoplightYellow" Color="#F0E160" />
+					<SolidColorBrush x:Key="StoplightGreen" Color="#70FA70" />
+
+					<SolidColorBrush x:Key="DisabledGrayBrush" Opacity="0.4"  Color="{StaticResource SystemChromeMediumColor}" />
+
+				</ResourceDictionary>
+				<ResourceDictionary x:Key="Dark">
+					<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.3" Color="#bed2fa" />
+					<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="#502727" />
+					<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="#1c3e20" />
+					<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="#4e4b15" />
+					<SolidColorBrush x:Key="HyperlinkNew" Color="CornflowerBlue" />
+					<SolidColorBrush x:Key="HyperlinkVisited" Color="Orchid" />
+					<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="Black" />
+					<SolidColorBrush x:Key="SystemOpaqueBase" Color="Black" />
+
+					<SolidColorBrush x:Key="CancelRed" Color="#802727" />
+					<SolidColorBrush x:Key="IconFill" Color="#DCE0DF" />
+					<SolidColorBrush x:Key="StoplightRed" Color="#5F0707" />
+					<SolidColorBrush x:Key="StoplightYellow" Color="#5F5B1A" />
+					<SolidColorBrush x:Key="StoplightGreen" Color="#174E15" />
+
+
+					<SolidColorBrush x:Key="DisabledGrayBrush" Opacity="0.4"  Color="{StaticResource SystemChromeMediumColor}" />
+					
+				</ResourceDictionary>
+			</ResourceDictionary.ThemeDictionaries>
+			
+</ResourceDictionary>
+	</Application.Resources>
+
+	<Application.Styles>
 		<FluentTheme />
 		<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml"/>
-		<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
-		<StyleInclude Source="/Assets/LibationStyles.xaml"/>
+		<StyleInclude Source="/Assets/DataGridFluentTheme.xaml"/>
+		<StyleInclude Source="/Assets/LibationVectorIcons.xaml"/>
+
+		<Style Selector="TextBox[IsReadOnly=true]">
+			<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+			<Setter Property="CaretBrush" Value="{DynamicResource SystemControlTransparentBrush}" />
+			<Style Selector="^ /template/ Border#PART_BorderElement">
+				<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+			</Style>
+		</Style>
 	</Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Source/LibationAvalonia/App.axaml.cs b/Source/LibationAvalonia/App.axaml.cs
index b1d0fed2..13fa7356 100644
--- a/Source/LibationAvalonia/App.axaml.cs
+++ b/Source/LibationAvalonia/App.axaml.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.IO;
 using ApplicationServices;
 using Avalonia.Controls;
+using Avalonia.Styling;
 
 namespace LibationAvalonia
 {
@@ -23,6 +24,7 @@ namespace LibationAvalonia
 		public static IBrush ProcessQueueBookCancelledBrush { get; private set; }
 		public static IBrush ProcessQueueBookDefaultBrush { get; private set; }
 		public static IBrush SeriesEntryGridBackgroundBrush { get; private set; }
+		public static IBrush HyperlinkVisited { get; private set; }
 
 		public static IAssetLoader AssetLoader { get; private set; }
 
@@ -58,7 +60,7 @@ namespace LibationAvalonia
 
 					if (config.LibationSettingsAreValid)
 					{
-						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));						
 						ShowMainWindow(desktop);
 					}
 					else
@@ -214,6 +216,10 @@ namespace LibationAvalonia
 
 		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
 		{
+			Current.RequestedThemeVariant = Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)) is "Dark" ? ThemeVariant.Dark : ThemeVariant.Light;
+
+			//Reload colors for current theme
+			LoadStyles();
 			var mainWindow = new MainWindow();
 			desktop.MainWindow = MainWindow = mainWindow;
 			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
@@ -227,8 +233,9 @@ namespace LibationAvalonia
 			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookFailedBrush");
 			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCompletedBrush");
 			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCancelledBrush");
-			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
 			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
+			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
+			HyperlinkVisited = AvaloniaUtils.GetBrushFromResources(nameof(HyperlinkVisited));
 		}
 	}
 }
diff --git a/Source/LibationAvalonia/Assets/Arrows_left.png b/Source/LibationAvalonia/Assets/Arrows_left.png
deleted file mode 100644
index a1a73311..00000000
Binary files a/Source/LibationAvalonia/Assets/Arrows_left.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/Arrows_right.png b/Source/LibationAvalonia/Assets/Arrows_right.png
deleted file mode 100644
index 126dfa40..00000000
Binary files a/Source/LibationAvalonia/Assets/Arrows_right.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/DataGridFluentTheme.xaml b/Source/LibationAvalonia/Assets/DataGridFluentTheme.xaml
new file mode 100644
index 00000000..82ef3f10
--- /dev/null
+++ b/Source/LibationAvalonia/Assets/DataGridFluentTheme.xaml
@@ -0,0 +1,588 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:collections="using:Avalonia.Collections">
+  <Styles.Resources>
+   <ResourceDictionary>
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Dark">
+          <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+          <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridGridLinesBrush" Opacity="0.4" Color="{DynamicResource SystemBaseMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Default">
+          <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+          <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+          <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+          <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridGridLinesBrush" Opacity="0.4" Color="{DynamicResource SystemBaseMediumLowColor}" />
+          <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+    
+    <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
+    <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
+
+    <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridSortIconAscendingPath">M1965 947l-941 -941l-941 941l90 90l787 -787v1798h128v-1798l787 787z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M109 486 19 576 1024 1581 2029 576 1939 486 1024 1401z</StreamGeometry>
+
+    <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
+    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
+
+    <ControlTheme x:Key="DataGridCellTextBlockTheme" TargetType="TextBlock">
+      <Setter Property="Margin" Value="12,0,12,0" />
+      <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+    <ControlTheme x:Key="DataGridCellTextBoxTheme" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="Background" Value="Transparent" />
+      <Style Selector="^ /template/ DataValidationErrors">
+        <Setter Property="Theme" Value="{StaticResource TooltipDataValidationErrors}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridCell}" TargetType="DataGridCell">
+      <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="CellBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
+
+              <Rectangle x:Name="CurrencyVisual"
+                         IsVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                         StrokeThickness="1" />
+              <Grid Grid.Column="0" x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+
+              <ContentPresenter Grid.Column="0" Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}" />
+
+              <Rectangle Grid.Column="0" x:Name="InvalidVisualElement"
+                         IsVisible="False"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellInvalidBrush}"
+                         StrokeThickness="1" />
+
+              <Rectangle Name="PART_RightGridLine"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:current /template/ Rectangle#CurrencyVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:focus /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+      <Style Selector="^:invalid /template/ Rectangle#InvalidVisualElement">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridColumnHeader}" TargetType="DataGridColumnHeader">
+      <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="Padding" Value="8,0,0,0" />
+      <Setter Property="FontSize" Value="12" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="HeaderBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
+
+              <Grid Margin="{TemplateBinding Padding}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="*" />
+                  <ColumnDefinition Width="16" />
+                </Grid.ColumnDefinitions>
+
+                <ContentPresenter Content="{TemplateBinding Content}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                <Path Name="SortIcon"
+                      IsVisible="False"
+                      Grid.Column="1"
+                      Height="12"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
+                      Fill="{TemplateBinding Foreground}"
+                      Stretch="Uniform" />
+              </Grid>
+
+              <Rectangle Name="VerticalSeparator"
+                         Grid.Column="1"
+                         Width="1"
+                         VerticalAlignment="Stretch"
+                         Fill="{TemplateBinding SeparatorBrush}"
+                         IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+              <Grid x:Name="FocusVisual" IsHitTestVisible="False"
+                    IsVisible="False">
+                <Rectangle x:Name="FocusVisualPrimary"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                           StrokeThickness="2" />
+                <Rectangle x:Name="FocusVisualSecondary"
+                           Margin="2"
+                           HorizontalAlignment="Stretch"
+                           VerticalAlignment="Stretch"
+                           Fill="Transparent"
+                           IsHitTestVisible="False"
+                           Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                           StrokeThickness="1" />
+              </Grid>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:focus-visible /template/ Grid#FocusVisual">
+        <Setter Property="IsVisible" Value="True" />
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot">
+        <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+      </Style>
+
+      <Style Selector="^:dragIndicator">
+        <Setter Property="Opacity" Value="0.5" />
+      </Style>
+
+      <Style Selector="^:sortascending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconAscendingPath}" />
+      </Style>
+
+      <Style Selector="^:sortdescending /template/ Path#SortIcon">
+        <Setter Property="IsVisible" Value="True" />
+        <Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="DataGridTopLeftColumnHeader" TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="TopLeftHeaderRoot"
+                RowDefinitions="*,*,Auto">
+            <Border Grid.RowSpan="2"
+                    BorderThickness="0,0,1,0"
+                    BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
+            <Rectangle Grid.Row="0" Grid.RowSpan="2"
+                       VerticalAlignment="Bottom"
+                       StrokeThickness="1"
+                       Height="1"
+                       Fill="{DynamicResource DataGridGridLinesBrush}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowHeader}" TargetType="DataGridRowHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="AreSeparatorsVisible" Value="False" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid x:Name="PART_Root"
+                RowDefinitions="*,*,Auto"
+                ColumnDefinitions="Auto,*">
+            <Border Grid.RowSpan="3"
+                    Grid.ColumnSpan="2"
+                    BorderBrush="{TemplateBinding SeparatorBrush}"
+                    BorderThickness="0,0,1,0">
+              <Grid Background="{TemplateBinding Background}">
+                <Rectangle x:Name="RowInvalidVisualElement"
+                           Opacity="0"
+                           Fill="{DynamicResource DataGridRowInvalidBrush}"
+                           Stretch="Fill" />
+                <Rectangle x:Name="BackgroundRectangle"
+                           Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                           Stretch="Fill" />
+              </Grid>
+            </Border>
+            <Rectangle x:Name="HorizontalSeparator"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2"
+                       Height="1"
+                       Margin="1,0,1,0"
+                       HorizontalAlignment="Stretch"
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+            <ContentPresenter Grid.RowSpan="2"
+                              Grid.Column="1"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Content="{TemplateBinding Content}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRow}" TargetType="DataGridRow">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="RowBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <DataGridFrozenGrid Name="PART_Root"
+                                ColumnDefinitions="Auto,*"
+                                RowDefinitions="*,Auto,Auto">
+
+              <Rectangle Name="BackgroundRectangle"
+                         Fill="{DynamicResource DataGridRowBackgroundBrush}"
+                         Grid.RowSpan="2"
+                         Grid.ColumnSpan="2" />
+              <Rectangle x:Name="InvalidVisualElement"
+                         Opacity="0"
+                         Grid.ColumnSpan="2"
+                         Fill="{DynamicResource DataGridRowInvalidBrush}" />
+
+              <DataGridRowHeader Name="PART_RowHeader"
+                                 Grid.RowSpan="3"
+                                 DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                      Grid.Column="1"
+                                      DataGridFrozenGrid.IsFrozen="True" />
+              <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
+              <Rectangle Name="PART_BottomGridLine"
+                         Grid.Row="2"
+                         Grid.Column="1"
+                         Height="1"
+                         HorizontalAlignment="Stretch" />
+
+            </DataGridFrozenGrid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:invalid">
+        <Style Selector="^ /template/ Rectangle#InvalidVisualElement">
+          <Setter Property="Opacity" Value="0.4" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Opacity" Value="0" />
+        </Style>
+      </Style>
+
+      <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+        <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+      </Style>
+
+      <Style Selector="^:selected">
+        <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+        </Style>
+        <Style Selector="^:pointerover:focus /template/ Rectangle#BackgroundRectangle">
+          <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+          <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+        </Style>
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="FluentDataGridRowGroupExpanderButtonTheme" TargetType="ToggleButton">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border Width="12"
+                  Height="12"
+                  Background="Transparent"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center">
+            <Path Fill="{TemplateBinding Foreground}"
+                  Data="{StaticResource DataGridRowGroupHeaderIconClosedPath}"
+                  HorizontalAlignment="Right"
+                  VerticalAlignment="Center"
+                  Stretch="Uniform" />
+          </Border>
+        </ControlTemplate>
+      </Setter>
+      <Style Selector="^:checked /template/ Path">
+        <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconOpenedPath}" />
+      </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
+      <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
+      <Setter Property="FontSize" Value="15" />
+      <Setter Property="MinHeight" Value="32" />
+      <Setter Property="Template">
+        <ControlTemplate x:DataType="collections:DataGridCollectionViewGroup">
+          <DataGridFrozenGrid Name="PART_Root"
+                              Background="{TemplateBinding Background}"
+                              MinHeight="{TemplateBinding MinHeight}"
+                              ColumnDefinitions="Auto,Auto,Auto,Auto,*"
+                              RowDefinitions="*,Auto">
+
+            <Rectangle Name="PART_IndentSpacer"
+                       Grid.Column="1" />
+            <ToggleButton Name="PART_ExpanderButton"
+                          Grid.Column="2"
+                          Width="12"
+                          Height="12"
+                          Margin="12,0,0,0"
+                          Theme="{StaticResource FluentDataGridRowGroupExpanderButtonTheme}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          Background="{TemplateBinding Background}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Focusable="False"
+                          Foreground="{TemplateBinding Foreground}" />
+
+            <StackPanel Grid.Column="3"
+                        Orientation="Horizontal"
+                        VerticalAlignment="Center"
+                        Margin="12,0,0,0">
+              <TextBlock Name="PART_PropertyNameElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsPropertyNameVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Margin="4,0,0,0"
+                         Text="{Binding Key}"
+                         Foreground="{TemplateBinding Foreground}" />
+              <TextBlock Name="PART_ItemCountElement"
+                         Margin="4,0,0,0"
+                         IsVisible="{TemplateBinding IsItemCountVisible}"
+                         Foreground="{TemplateBinding Foreground}" />
+            </StackPanel>
+
+            <Rectangle x:Name="CurrencyVisual"
+                       Grid.ColumnSpan="5"
+                       IsVisible="False"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                       StrokeThickness="1" />
+            <Grid x:Name="FocusVisual"
+                  Grid.ColumnSpan="5"
+                  IsVisible="False"
+                  IsHitTestVisible="False">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                         StrokeThickness="2" />
+              <Rectangle Margin="2"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         StrokeThickness="1" />
+            </Grid>
+
+            <DataGridRowHeader Name="PART_RowHeader"
+                               Grid.RowSpan="2"
+                               DataGridFrozenGrid.IsFrozen="True" />
+
+            <Rectangle x:Name="PART_BottomGridLine"
+                       Grid.Row="1"
+                       Grid.ColumnSpan="5"
+                       Height="1" />
+          </DataGridFrozenGrid>
+        </ControlTemplate>
+      </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type DataGrid}" TargetType="DataGrid">
+      <Setter Property="RowBackground" Value="Transparent" />
+      <Setter Property="HeadersVisibility" Value="Column" />
+      <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="SelectionMode" Value="Extended" />
+      <Setter Property="GridLinesVisibility" Value="None" />
+      <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+      <Setter Property="DropLocationIndicatorTemplate">
+        <Template>
+          <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
+                     Width="2" />
+        </Template>
+      </Setter>
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Border x:Name="DataGridBorder"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  CornerRadius="{TemplateBinding CornerRadius}">
+            <Grid ColumnDefinitions="Auto,*,Auto" 
+                  RowDefinitions="Auto,*,Auto,Auto"
+                  ClipToBounds="True">
+              <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                    Theme="{StaticResource DataGridTopLeftColumnHeader}" />
+              <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                              Grid.Column="1"
+                                              Grid.Row="0" Grid.ColumnSpan="2" />
+              <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                         Grid.Row="0" Grid.ColumnSpan="3" Grid.Column="0"
+                         VerticalAlignment="Bottom"
+                         Height="1"
+                         Fill="{DynamicResource DataGridGridLinesBrush}" />
+
+              <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                     Grid.Row="1"
+                                     Grid.RowSpan="2"
+                                     Grid.ColumnSpan="3" Grid.Column="0">
+                <DataGridRowsPresenter.GestureRecognizers>
+                  <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+                </DataGridRowsPresenter.GestureRecognizers>
+              </DataGridRowsPresenter>
+              <Rectangle Name="PART_BottomRightCorner"
+                         Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                         Grid.Column="2"
+                         Grid.Row="2" />
+              <ScrollBar Name="PART_VerticalScrollbar"
+                         Orientation="Vertical"
+                         Grid.Column="2"
+                         Grid.Row="1"
+                         Width="{DynamicResource ScrollBarSize}" />
+
+              <Grid Grid.Column="1"
+                    Grid.Row="2"
+                    ColumnDefinitions="Auto,*">
+                <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+                <ScrollBar Name="PART_HorizontalScrollbar"
+                           Grid.Column="1"
+                           Orientation="Horizontal"
+                           Height="{DynamicResource ScrollBarSize}" />
+              </Grid>
+              <Border x:Name="PART_DisabledVisualElement"
+                      Grid.ColumnSpan="3" Grid.Column="0"
+                      Grid.Row="0" Grid.RowSpan="4"
+                      IsHitTestVisible="False"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      CornerRadius="2"
+                      Background="{DynamicResource DataGridDisabledVisualElementBackground}"
+                      IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter>
+
+      <Style Selector="^:empty-columns">
+        <Style Selector="^ /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
+          <Setter Property="IsVisible" Value="False" />
+        </Style>
+      </Style>
+    </ControlTheme>
+   </ResourceDictionary>
+  </Styles.Resources>
+</Styles>
diff --git a/Source/LibationAvalonia/Assets/LibationStyles.xaml b/Source/LibationAvalonia/Assets/LibationStyles.xaml
deleted file mode 100644
index e3569ba2..00000000
--- a/Source/LibationAvalonia/Assets/LibationStyles.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	<Styles.Resources>
-		<Color x:Key="SeriesEntryGridBackgroundColor">#cdffcd</Color>
-
-		<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.5" Color="{StaticResource SeriesEntryGridBackgroundColor}" />
-		<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="LightCoral" />
-		<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="PaleGreen" />
-		<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
-		<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="{StaticResource SystemAltHighColor}" />
-		<SolidColorBrush x:Key="ProcessQueueBookBorderBrush" Color="Gray" />
-		<SolidColorBrush x:Key="DisabledGrayBrush" Color="#60D3D3D3" />
-		
-	</Styles.Resources>
-	<Style Selector="TextBox[IsReadOnly=true]">
-		<Setter Property="Background" Value="LightGray" />
-		<Setter Property="CaretBrush" Value="#00000000" />
-	</Style>
-</Styles>
\ No newline at end of file
diff --git a/Source/LibationAvalonia/Assets/LibationVectorIcons.xaml b/Source/LibationAvalonia/Assets/LibationVectorIcons.xaml
new file mode 100644
index 00000000..d2e2d278
--- /dev/null
+++ b/Source/LibationAvalonia/Assets/LibationVectorIcons.xaml
@@ -0,0 +1,69 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:collections="using:Avalonia.Collections">
+  <Styles.Resources>
+   <ResourceDictionary>   
+		<StreamGeometry x:Key="LeftArrows">M30,0 H60 L30,50 L60,100 H30 L0,50 M85,0 H115 L85,50 L115,100 H85 L55,50 M140,0 H170 L140,50 L170,100 H140 L110,50</StreamGeometry>
+		<StreamGeometry x:Key="FirstButtonIcon">M0,0 H100 V12 H53 L100,46 H0 L47,12 H0</StreamGeometry>
+		<StreamGeometry x:Key="UpButtonIcon">M0,36.66 L50,0 L100,36.66</StreamGeometry>
+		<StreamGeometry x:Key="DownButtonIcon">M0,0 L100,0 L50,36.66</StreamGeometry>
+		<StreamGeometry x:Key="LastButtonIcon">M0,0 H100 L53,34 H100 V46 H0 V34 H47</StreamGeometry>
+		<StreamGeometry x:Key="CancelButtonIcon">M30,0 H50 V30 H80 V50 H50 V80 H30 V50 H0 V30 H30</StreamGeometry>
+		<StreamGeometry x:Key="QueuedIcon">M31,0 H49 V100 H31 M58,0 H76 V100 H58 M85,0 H103 V100 H85 M8,85 V122 H129 V85 H117 V109 H20 V85 H8 M0,36 V66 L24,51 M114,36 V66 L138,51</StreamGeometry>
+		<StreamGeometry x:Key="QueueCompletedIcon">M0,0 H100 V100 H0 V0 M2,50 L36,82 L 93,27 L81,15 L36,59 L14,38</StreamGeometry>
+		<StreamGeometry x:Key="QueueErrorIcon">M0,0 H100 V100 H0 V0 M15,71 L29,85 L50,64 L71,85 L85,71 L64,50 L85,29 L71,15 L50,36 L29,15 L15,29 L36,50</StreamGeometry>
+		<StreamGeometry x:Key="BookErrorIcon">M32,0 a 32,32 0 0 1 0,64 a 32,32 0 0 1 0,-64 m 0,4 a 28,28 0 0 1 0,56 a 28,28 0 0 1 0,-56 m-21,24 h42 a 1,1 0 0 1 1,1 v6 a 1,1 0 0 1 -1,1 h-42 a 1,1 0 0 1 -1,-1 v-6 a 1,1 0 0 1 1,-1</StreamGeometry>
+
+		<RotateTransform x:Key="Rotate45Transform" Angle="45" />
+
+		<StreamGeometry x:Key="EditTagsIcon">
+			M39,35 L50,24 H11
+			A 11,11 0 0 0 0,35 V89 A 11,11 0 0 0 11,100 H64 A 11,11 0 0 0 75,89 V52 L64,63 V89 H11 V35
+			M 51,65 H36 V50
+			M 90.5,26.5 L55,62 L 39,45 L74,10
+			M 78,6 L81.5,2.5 A 8,8 0 0 1 91.5,2 L98.5,9 A 8,8 0 0 1 97.5,19.5 L94,23
+		</StreamGeometry>
+
+		<StreamGeometry x:Key="CollapseIcon">
+			M0,2 A 2,2 0 0 1 2,0 H62 A2,2 0 0 1 64,2 V62 A 2,2 0 0 1 62,64 H 2 A 2,2 0 0 1 0,62 V2
+			M 2,2 H62 V62 H2 V2
+			M11,28 h42 a 1,1 0 0 1 1,1 v6 a 1,1 0 0 1 -1,1 h-42 a 1,1 0 0 1 -1,-1 v-6 a 1,1 0 0 1 1,-1
+		</StreamGeometry>
+	   <StreamGeometry x:Key="VerticalBarIcon">M28,53 v-42 a 1,1 0 0 1 1,-1 h6 a 1,1 0 0 1 1,1 v42 a 1,1 0 0 1 -1,1 h-6 a 1,1 0 0 1 -1,-1</StreamGeometry>
+
+
+	   <CombinedGeometry x:Key="ExpandIcon" Geometry1="{StaticResource CollapseIcon}" Geometry2="{StaticResource VerticalBarIcon}" />
+
+		<StreamGeometry x:Key="StoplightBodyIcon">
+			M0,12 A 12,12 0 0 1 12,0 H34 A 12,12 0 0 1 46,12 V88 A 12,12 0 0 1 34,100 H12 A 12,12 0 0 1 0,88 V12
+			M20,8 H26 A 12,12 0 0 1 26,32 H20 A 12,12 0 0 1 20,8
+			M20,38 H26 A 12,12 0 0 1 26,62 H20 A 12,12 0 0 1 20,38
+			M20,68 H26 A 12,12 0 0 1 26,92 H20 A 12,12 0 0 1 20,68
+		</StreamGeometry>
+
+		<StreamGeometry x:Key="PdfDownloadedIcon">
+			M4,38.5 H3 A 3,3 0 0 1 0,35.5 V21.4 A 3,3 0 0 1 3,18.4 H4 V2 A 2,2 0 0 1 6,0 H30.5 L41,12 V18.4 A 3,3 0 0 1 45,21.4 V35.5 A 3,3 0 0 1 42,38.5 H41 V48.5 A 2,2 0 0 1 39,50.5 H6 A 2,2 0 0 1 4,48.5
+			M6,38.5 H39 V48.5 H6 V38.5
+			M6,18.4 V2 H29 V12 A 1,1 0 0 0 30,13 H39 V18.4
+			M 4.3179,36 c 0,0 0.122,-14.969 0.122,-14.969 1.469,-0.194 2.939,-0.388 4.5,-0.362 1.561,0.026 3.214,0.27 4.357,0.944 1.143,0.674 1.775,1.776 2.015,2.959 0.24,1.184 0.087,2.449 -0.5,3.52 -0.587,1.071 -1.607,1.949 -2.816,2.352 -1.209,0.403 -2.607,0.332 -4.005,0.26 0,0 -0.031,5.265 -0.031,5.265 0,0 -3.673,0.122 -3.673,0.122 0,0 0.031,-0.092 0.031,-0.092
+			m 3.643,-12.428 c 0,0 0.031,4.286 0.031,4.286 0.735,0.051 1.47,0.102 2.107,-0.056 0.638,-0.158 1.178,-0.526 1.459,-1.122 0.281,-0.597 0.301,-1.423 0.01,-2.005 -0.291,-0.582 -0.893,-0.918 -1.546,-1.061 -0.653,-0.143 -1.357,-0.092 -1.709,-0.066 -0.352,0.026 -0.352,0.026 -0.352,0.026
+			m 9.428,12.428 c 2.265,0.245 4.531,0.49 6.674,0.066 2.143,-0.424 4.163,-1.515 5.285,-3.081 1.122,-1.566 1.347,-3.607 1.27,-5.306 -0.076,-1.699 -0.454,-3.056 -1.454,-4.219 -1,-1.163 -2.622,-2.133 -4.704,-2.505 -2.082,-0.373 -4.623,-0.148 -7.164,0.076 0,0 0.092,14.969 0.092,14.969
+			m 3.49,-12.398 c 0,0 0,9.673 0,9.673 0.888,0.02 1.776,0.041 2.653,-0.179 0.877,-0.219 1.745,-0.679 2.367,-1.541 0.622,-0.862 1,-2.127 0.98,-3.403 -0.02,-1.275 -0.439,-2.561 -1.193,-3.337 -0.755,-0.776 -1.847,-1.041 -2.704,-1.158 -0.857,-0.117 -1.48,-0.087 -2.102,-0.056
+			m 11.908,12.245 v-14.785 h8.969 v2.51 h-5.786 v3.612 h5.388 v2.51 h-5.449 v6.092
+		</StreamGeometry>
+
+		<StreamGeometry x:Key="PdfDownArrowIcon">
+			M29,44 V58.7498 H35.0491 A 1.5,1.5 0 0 1 36.1342,61.2861 L23.5607,73.8595 A 1.5,1.5 0 0 1 21.4393,73.8595 L8.8658,61.2861 A 1.5,1.5 0 0 1 9.9509,58.7498 H16 V44 A 1.5,1.5 0 0 1 17.5,42.5 H27.5 A 1.5,1.5 0 0 1 29,44
+		</StreamGeometry>			
+
+		<CombinedGeometry x:Key="PdfNotDownloadedIcon" Geometry1="{StaticResource PdfDownloadedIcon}" Geometry2="{StaticResource PdfDownArrowIcon}" />
+
+	   <StreamGeometry  x:Key="ImportIcon">
+		   M5.65,4.3 h-2.75 a2.9,2.25 0 0 0 -2.9,2.25 v7.2
+		   a2.9,2.25 0 0 0 2.9,2.25 h10.2 a2.9,2.25 0 0 0 2.9,-2.25 v-7.2 a2.9,2.25 0 0 0 -2.9,-2.25
+		   h-2.75 v1.6 h2.75 a1.3,0.65 0 0 1 1.3,0.65 v7.2 a1.3,0.65 0 0 1 -1.3,0.65 h-10.2 a1.3,0.65 0 0 1 -1.3,-0.65 v-7.2 a1.3,0.65 0 0 1 1.3,-0.65 h2.75 v-1.6
+		   M7.2,0.8 a 0.8,0.8 0 0 1 1.6,0 v8 l0.9929,-0.9929 a 0.8,0.8 0 0 1 1.1314,1.1314 l-2.3586,2.3586
+		   a 0.8,0.8 0 0 1 -1.1314,0 l-2.3586,-2.3586  a 0.8,0.8 0 0 1 1.1314,-1.1314 l0.9929,0.9929 v8
+	   </StreamGeometry>
+   </ResourceDictionary>
+  </Styles.Resources>
+</Styles>
diff --git a/Source/LibationAvalonia/Assets/cancel.png b/Source/LibationAvalonia/Assets/cancel.png
deleted file mode 100644
index fa34f935..00000000
Binary files a/Source/LibationAvalonia/Assets/cancel.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/completed.png b/Source/LibationAvalonia/Assets/completed.png
deleted file mode 100644
index 3cd61981..00000000
Binary files a/Source/LibationAvalonia/Assets/completed.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/down.png b/Source/LibationAvalonia/Assets/down.png
deleted file mode 100644
index 2536c961..00000000
Binary files a/Source/LibationAvalonia/Assets/down.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/download-arrow.png b/Source/LibationAvalonia/Assets/download-arrow.png
deleted file mode 100644
index 16617998..00000000
Binary files a/Source/LibationAvalonia/Assets/download-arrow.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/edit-tags-25x25.png b/Source/LibationAvalonia/Assets/edit-tags-25x25.png
deleted file mode 100644
index 82b24209..00000000
Binary files a/Source/LibationAvalonia/Assets/edit-tags-25x25.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/edit-tags-50x50.png b/Source/LibationAvalonia/Assets/edit-tags-50x50.png
deleted file mode 100644
index 7b0043ac..00000000
Binary files a/Source/LibationAvalonia/Assets/edit-tags-50x50.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/edit_25x25.png b/Source/LibationAvalonia/Assets/edit_25x25.png
deleted file mode 100644
index 12e70d0f..00000000
Binary files a/Source/LibationAvalonia/Assets/edit_25x25.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/edit_64x64.png b/Source/LibationAvalonia/Assets/edit_64x64.png
deleted file mode 100644
index 1d9e5f83..00000000
Binary files a/Source/LibationAvalonia/Assets/edit_64x64.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/error.png b/Source/LibationAvalonia/Assets/error.png
deleted file mode 100644
index 700ce41e..00000000
Binary files a/Source/LibationAvalonia/Assets/error.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/errored.png b/Source/LibationAvalonia/Assets/errored.png
deleted file mode 100644
index bb8ba7ef..00000000
Binary files a/Source/LibationAvalonia/Assets/errored.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/first.png b/Source/LibationAvalonia/Assets/first.png
deleted file mode 100644
index e470c697..00000000
Binary files a/Source/LibationAvalonia/Assets/first.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/glass-with-glow_16.png b/Source/LibationAvalonia/Assets/glass-with-glow_16.png
deleted file mode 100644
index 05e40bec..00000000
Binary files a/Source/LibationAvalonia/Assets/glass-with-glow_16.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/import_16x16.png b/Source/LibationAvalonia/Assets/import_16x16.png
deleted file mode 100644
index 40b582b1..00000000
Binary files a/Source/LibationAvalonia/Assets/import_16x16.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/last.png b/Source/LibationAvalonia/Assets/last.png
deleted file mode 100644
index 3c3ea886..00000000
Binary files a/Source/LibationAvalonia/Assets/last.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_green.png b/Source/LibationAvalonia/Assets/liberate_green.png
deleted file mode 100644
index 86171e0c..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_green.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_green_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_green_pdf_no.png
deleted file mode 100644
index a128c088..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_green_pdf_no.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png
deleted file mode 100644
index baac0151..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_red.png b/Source/LibationAvalonia/Assets/liberate_red.png
deleted file mode 100644
index 8e4b34e4..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_red.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_red_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_red_pdf_no.png
deleted file mode 100644
index 6506603c..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_red_pdf_no.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png
deleted file mode 100644
index 0d5b5eb6..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_yellow.png b/Source/LibationAvalonia/Assets/liberate_yellow.png
deleted file mode 100644
index 8b3e8aab..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_yellow.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png
deleted file mode 100644
index 2bddcffd..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png
deleted file mode 100644
index b51a28ad..00000000
Binary files a/Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/minus.png b/Source/LibationAvalonia/Assets/minus.png
deleted file mode 100644
index c0c5d15c..00000000
Binary files a/Source/LibationAvalonia/Assets/minus.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/plus.png b/Source/LibationAvalonia/Assets/plus.png
deleted file mode 100644
index 1cd1c630..00000000
Binary files a/Source/LibationAvalonia/Assets/plus.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/queued.png b/Source/LibationAvalonia/Assets/queued.png
deleted file mode 100644
index f30221c3..00000000
Binary files a/Source/LibationAvalonia/Assets/queued.png and /dev/null differ
diff --git a/Source/LibationAvalonia/Assets/up.png b/Source/LibationAvalonia/Assets/up.png
deleted file mode 100644
index 7c00155a..00000000
Binary files a/Source/LibationAvalonia/Assets/up.png and /dev/null differ
diff --git a/Source/LibationAvalonia/AvaloniaUtils.cs b/Source/LibationAvalonia/AvaloniaUtils.cs
index 842777cf..f92e1c4d 100644
--- a/Source/LibationAvalonia/AvaloniaUtils.cs
+++ b/Source/LibationAvalonia/AvaloniaUtils.cs
@@ -13,9 +13,8 @@ namespace LibationAvalonia
 		public static IBrush GetBrushFromResources(string name)
 			=> GetBrushFromResources(name, Brushes.Transparent);
 		public static IBrush GetBrushFromResources(string name, IBrush defaultBrush)
-		{
-			//TODO: use ThemeVariant
-			if (App.Current.Styles.TryGetResource(name, null, out var value) && value is IBrush brush)
+		{			
+			if (App.Current.TryGetResource(name, App.Current.ActualThemeVariant, out var value) && value is IBrush brush)
 				return brush;
 			return defaultBrush;
 		}
diff --git a/Source/LibationAvalonia/Controls/GroupBox.axaml b/Source/LibationAvalonia/Controls/GroupBox.axaml
index f8c2b755..91246b19 100644
--- a/Source/LibationAvalonia/Controls/GroupBox.axaml
+++ b/Source/LibationAvalonia/Controls/GroupBox.axaml
@@ -27,7 +27,7 @@
 							VerticalAlignment="Top">
 							<TextBlock
 								Padding="4,0,4,0"
-								Background="{StaticResource SystemAltHighColor}"
+								Background="{DynamicResource SystemAltHighColor}"
 								Text="{TemplateBinding Label}"
 								/>
 						</Grid>
diff --git a/Source/LibationAvalonia/Controls/LinkLabel.axaml b/Source/LibationAvalonia/Controls/LinkLabel.axaml
index e1043dfc..f15725b0 100644
--- a/Source/LibationAvalonia/Controls/LinkLabel.axaml
+++ b/Source/LibationAvalonia/Controls/LinkLabel.axaml
@@ -6,7 +6,7 @@
              x:Class="LibationAvalonia.Controls.LinkLabel">
 	<TextBlock.Styles>
 		<Style Selector="TextBlock">
-			<Setter Property="Foreground" Value="Blue"/>
+			<Setter Property="Foreground" Value="{DynamicResource HyperlinkNew}"/>
 			<Setter Property="TextDecorations" Value="Underline"/>
 		</Style>
 	</TextBlock.Styles>
diff --git a/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs
index ac31ff40..4d7ee7ac 100644
--- a/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs
+++ b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs
@@ -20,7 +20,7 @@ namespace LibationAvalonia.Controls
 
 		private void LinkLabel_Tapped(object sender, TappedEventArgs e)
 		{
-			Foreground = Brushes.Purple;
+			Foreground = App.HyperlinkVisited;
 		}
 
 		protected override void OnPointerEntered(PointerEventArgs e)
diff --git a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
index c49b9dbb..07647a43 100644
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
@@ -33,9 +33,9 @@
 						<DataTemplate>
 
 							<Button
-								Width="60"
-								Height="30"
 								Content="X"
+								VerticalAlignment="Stretch"
+								HorizontalAlignment="Stretch"
 								HorizontalContentAlignment="Center"
 								IsEnabled="{Binding !IsDefault}"
 								Click="DeleteButton_Clicked" />
@@ -49,9 +49,10 @@
 						<DataTemplate>
 
 							<Button
-								Width="60"
-								Height="30"
 								Content="Export"
+								VerticalAlignment="Stretch"
+								HorizontalAlignment="Stretch"
+								HorizontalContentAlignment="Center"
 								IsEnabled="{Binding !IsDefault}"
 								ToolTip.Tip="Export account authorization to audible-cli"
 								Click="ExportButton_Clicked" />
diff --git a/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml b/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml
index 17962b60..e1d5fd56 100644
--- a/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml
@@ -5,8 +5,13 @@
         mc:Ignorable="d" d:DesignWidth="540" d:DesignHeight="140"
         x:Class="LibationAvalonia.Dialogs.DescriptionDisplayDialog"
 		SystemDecorations="None"
-        Title="DescriptionDisplay">	
-		
+        Title="DescriptionDisplay">
+
+	<Window.Styles>
+		<Style Selector="TextBox[IsReadOnly=true] /template/ Border#PART_BorderElement">
+			<Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+		</Style>
+	</Window.Styles>
 	<TextBox
 		Text="{Binding DescriptionText}"
 		IsReadOnly="True"
@@ -15,5 +20,5 @@
 		Name="DescriptionTextBox"
 		CaretBrush="{StaticResource SystemControlTransparentBrush}"
 		LostFocus="DescriptionTextBox_LostFocus" />
-	
-</Window>
+
+</Window>
\ No newline at end of file
diff --git a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
index b4811e46..d10beafc 100644
--- a/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
+++ b/Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
@@ -33,9 +33,10 @@
 						<DataTemplate>
 
 							<Button
-								Width="55"
-								Height="30"
 								Content="X"
+								VerticalAlignment="Stretch"
+								HorizontalAlignment="Stretch"
+								HorizontalContentAlignment="Center"
 								IsEnabled="{Binding !IsDefault}"
 								Click="DeleteButton_Clicked" />
 
@@ -49,15 +50,15 @@
 					Binding="{Binding FilterString, Mode=TwoWay}"
 					Header="Filter"/>
 
-
 				<DataGridTemplateColumn Header="Move&#xa;Up">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
 
 							<Button
-								Width="50"
-								Height="30"
 								Content="▲"
+								VerticalAlignment="Stretch"
+								HorizontalAlignment="Stretch"
+								HorizontalContentAlignment="Center"
 								IsEnabled="{Binding !IsDefault}"
 								ToolTip.Tip="Export account authorization to audible-cli"
 								Click="MoveUpButton_Clicked" />
@@ -73,9 +74,10 @@
 						<DataTemplate>
 
 							<Button
-								Width="50"
-								Height="30"
 								Content="▼"
+								VerticalAlignment="Stretch"
+								HorizontalAlignment="Stretch"
+								HorizontalContentAlignment="Center"
 								IsEnabled="{Binding !IsDefault}"
 								ToolTip.Tip="Export account authorization to audible-cli"
 								Click="MoveDownButton_Clicked" />
diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
index 07a617f9..a6e3c036 100644
--- a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
+++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml
@@ -10,7 +10,7 @@
 		Icon="/Assets/1x1.png">
 	<Grid ColumnDefinitions="*" RowDefinitions="*,Auto">
 		
-		<DockPanel Margin="5,10,10,20" Grid.Row="0" Background="White">
+		<DockPanel Margin="5,10,10,20" Grid.Row="0">
 			<StackPanel DockPanel.Dock="Top" Orientation="Horizontal"
 				VerticalAlignment="Top">
 			
@@ -26,7 +26,7 @@
 			</StackPanel>
 		</DockPanel>
 
-		<DockPanel Height="45" Grid.Row="1" Background="WhiteSmoke">
+		<DockPanel Height="45" Grid.Row="1" Background="{DynamicResource SystemChromeMediumLowColor}">
 			<DockPanel.Styles>
 				<Style Selector="Button:focus">
 					<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
index 6c7c0419..d984dc3b 100644
--- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
@@ -113,6 +113,32 @@
 
 						</CheckBox>
 -->
+						<Grid
+							Grid.Row="2"
+							ColumnDefinitions="Auto,Auto,*"
+							Margin="10"
+							VerticalAlignment="Bottom">
+							<TextBlock
+								Grid.Column="0"
+								FontSize="16"
+								VerticalAlignment="Center"
+								Text="Theme:  "/>
+							
+							<controls:WheelComboBox
+								Grid.Column="1"
+								 SelectedItem="{Binding ImportantSettings.ThemeVariant, Mode=TwoWay}"
+								 Items="{Binding ImportantSettings.Themes}" />
+							<TextBlock
+								Grid.Column="2"
+								FontSize="16"
+								FontWeight="Bold"
+								Margin="10,0,0,0"
+								VerticalAlignment="Center"
+								IsVisible="{Binding	ImportantSettings.SelectionChanged}"
+								Text="Theme change takes effect on restart"/>
+
+						</Grid>
+
 					</Grid>
 				</Border>
 			</TabItem>
diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
index 6dcb2ae7..69bb7967 100644
--- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using LibationFileManager;
 using System;
 using System.Collections.Generic;
@@ -9,7 +7,6 @@ using ReactiveUI;
 using Dinah.Core;
 using System.Linq;
 using FileManager;
-using System.IO;
 using Avalonia.Collections;
 using LibationUiBase;
 
@@ -129,7 +126,7 @@ namespace LibationAvalonia.Dialogs
 		}
 	}
 
-	public class ImportantSettings : ISettingsDisplay
+	public class ImportantSettings : ViewModels.ViewModelBase, ISettingsDisplay
 	{
 		public ImportantSettings(Configuration config)
 		{
@@ -142,6 +139,10 @@ namespace LibationAvalonia.Dialogs
 			SavePodcastsToParentFolder = config.SavePodcastsToParentFolder;
 			LoggingLevel = config.LogLevel;
 			BetaOptIn = config.BetaOptIn;
+			ThemeVariant = InitialThemeVariant
+				= Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)) is nameof(Avalonia.Styling.ThemeVariant.Dark)
+				? nameof(Avalonia.Styling.ThemeVariant.Dark)
+				: nameof(Avalonia.Styling.ThemeVariant.Light);
 		}
 
 		public async Task<bool> SaveSettingsAsync(Configuration config)
@@ -163,6 +164,7 @@ namespace LibationAvalonia.Dialogs
 			config.SavePodcastsToParentFolder = SavePodcastsToParentFolder;
 			config.LogLevel = LoggingLevel;
 			config.BetaOptIn = BetaOptIn;
+			Configuration.Instance.SetString(ThemeVariant, nameof(ThemeVariant));
 
 			return true;
 		}
@@ -179,11 +181,27 @@ namespace LibationAvalonia.Dialogs
 		public string SavePodcastsToParentFolderText { get; } = Configuration.GetDescription(nameof(Configuration.SavePodcastsToParentFolder));
 		public Serilog.Events.LogEventLevel[] LoggingLevels { get; } = Enum.GetValues<Serilog.Events.LogEventLevel>();
 		public string BetaOptInText { get; } = Configuration.GetDescription(nameof(Configuration.BetaOptIn));
+		public string[] Themes { get; } = { nameof(Avalonia.Styling.ThemeVariant.Light), nameof(Avalonia.Styling.ThemeVariant.Dark) };
+
 
 		public string BooksDirectory { get; set; }
 		public bool SavePodcastsToParentFolder { get; set; }
 		public Serilog.Events.LogEventLevel LoggingLevel { get; set; }
 		public bool BetaOptIn { get; set; }
+		private string themeVariant;
+		public string ThemeVariant
+		{
+			get => themeVariant;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref themeVariant, value);
+
+				SelectionChanged = ThemeVariant != InitialThemeVariant;
+				this.RaisePropertyChanged(nameof(SelectionChanged));				
+			}
+		}
+		public string InitialThemeVariant { get; private set; }
+		public bool SelectionChanged { get; private set; }
 	}
 
 	public class ImportSettings : ISettingsDisplay
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index 51999c32..47eb7468 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -5,7 +5,7 @@
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net7.0</TargetFramework>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-		<ApplicationIcon>libation.ico</ApplicationIcon>
+		<ApplicationIcon>Assets/libation.ico</ApplicationIcon>
 		<AssemblyName>Libation</AssemblyName>
 		<IsPublishable>true</IsPublishable>
 		<PublishReadyToRun>true</PublishReadyToRun>
@@ -30,48 +30,16 @@
 
 	<ItemGroup>
 		<AvaloniaResource Include="Assets\**" />
-		<None Remove=".gitignore" />
-		<None Remove="Assets\Arrows_left.png" />
-		<None Remove="Assets\Arrows_right.png" />
-		<None Remove="Assets\Asterisk.png" />
-		<None Remove="Assets\cancel.png" />
-		<None Remove="Assets\completed.png" />
-		<None Remove="Assets\down.png" />
-		<None Remove="Assets\download-arrow.png" />
-		<None Remove="Assets\edit-tags-25x25.png" />
-		<None Remove="Assets\edit-tags-50x50.png" />
-		<None Remove="Assets\edit_25x25.png" />
-		<None Remove="Assets\edit_64x64.png" />
-		<None Remove="Assets\error.png" />
-		<None Remove="Assets\errored.png" />
-		<None Remove="Assets\Exclamation.png" />
-		<None Remove="Assets\first.png" />
-		<None Remove="Assets\glass-with-glow_16.png" />
+		<None Remove=".gitignore" />		
+		<None Remove="Assets\DataGridFluentTheme.xaml" />
 		<None Remove="Assets\img-coverart-prod-unavailable_300x300.jpg" />
 		<None Remove="Assets\img-coverart-prod-unavailable_500x500.jpg" />
 		<None Remove="Assets\img-coverart-prod-unavailable_80x80.jpg" />
-		<None Remove="Assets\import_16x16.png" />
-		<None Remove="Assets\last.png" />
-		<None Remove="Assets\libation.ico" />
-		<None Remove="Assets\LibationStyles.xaml" />
-		<None Remove="Assets\liberate_green.png" />
-		<None Remove="Assets\liberate_green_pdf_no.png" />
-		<None Remove="Assets\liberate_green_pdf_yes.png" />
-		<None Remove="Assets\liberate_red.png" />
-		<None Remove="Assets\liberate_red_pdf_no.png" />
-		<None Remove="Assets\liberate_red_pdf_yes.png" />
-		<None Remove="Assets\liberate_yellow.png" />
-		<None Remove="Assets\liberate_yellow_pdf_no.png" />
-		<None Remove="Assets\liberate_yellow_pdf_yes.png" />
+		<None Remove="Assets\1x1.png" />
 		<None Remove="Assets\MBIcons\Asterisk.png" />
 		<None Remove="Assets\MBIcons\error.png" />
 		<None Remove="Assets\MBIcons\Exclamation.png" />
 		<None Remove="Assets\MBIcons\Question.png" />
-		<None Remove="Assets\minus.png" />
-		<None Remove="Assets\plus.png" />
-		<None Remove="Assets\Question.png" />
-		<None Remove="Assets\queued.png" />
-		<None Remove="Assets\up.png" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -80,6 +48,9 @@
 			<AutoGen>True</AutoGen>
 			<DependentUpon>Resources.resx</DependentUpon>
 		</Compile>
+		<Compile Update="Views\LiberateStatusButton.axaml.cs">
+		  <DependentUpon>LiberateStatusButton.axaml</DependentUpon>
+		</Compile>
 		<Compile Update="Views\MainWindow.*.cs">
 			<DependentUpon>MainWindow.axaml</DependentUpon>
 		</Compile>
diff --git a/Source/LibationAvalonia/ViewModels/AvaloniaEntryStatus.cs b/Source/LibationAvalonia/ViewModels/AvaloniaEntryStatus.cs
index 2664489f..0ad70c44 100644
--- a/Source/LibationAvalonia/ViewModels/AvaloniaEntryStatus.cs
+++ b/Source/LibationAvalonia/ViewModels/AvaloniaEntryStatus.cs
@@ -16,11 +16,7 @@ namespace LibationAvalonia.ViewModels
 		protected override Bitmap LoadImage(byte[] picture)
 			=> AvaloniaUtils.TryLoadImageOrDefault(picture, LibationFileManager.PictureSize._80x80);
 
-		protected override Bitmap GetResourceImage(string rescName)
-		{
-			//These images are assest, so assume they will never corrupt.
-			using var stream = App.OpenAsset(rescName + ".png");
-			return new Bitmap(stream);
-		}
+		//Button icons are handled by LiberateStatusButton
+		protected override Bitmap GetResourceImage(string rescName) => null;
 	}
 }
diff --git a/Source/LibationAvalonia/ViewModels/LiberateStatusButtonViewModel.cs b/Source/LibationAvalonia/ViewModels/LiberateStatusButtonViewModel.cs
new file mode 100644
index 00000000..c5e8e148
--- /dev/null
+++ b/Source/LibationAvalonia/ViewModels/LiberateStatusButtonViewModel.cs
@@ -0,0 +1,27 @@
+using ReactiveUI;
+
+namespace LibationAvalonia.ViewModels
+{
+	public class LiberateStatusButtonViewModel : ViewModelBase
+	{
+		private bool isSeries;
+		private bool isError;
+		private bool isButtonEnabled;
+		private bool expanded;
+		private bool redVisible = true;
+		private bool yellowVisible;
+		private bool greenVisible;
+		private bool pdfNotDownloadedVisible;
+		private bool pdfDownloadedVisible;
+
+		public bool IsError { get => isError; set => this.RaiseAndSetIfChanged(ref isError, value); }
+		public bool IsButtonEnabled { get => isButtonEnabled; set => this.RaiseAndSetIfChanged(ref isButtonEnabled, value); }
+		public bool IsSeries { get => isSeries; set => this.RaiseAndSetIfChanged(ref isSeries, value); }
+		public bool Expanded { get => expanded; set => this.RaiseAndSetIfChanged(ref expanded, value); }
+		public bool RedVisible { get => redVisible; set => this.RaiseAndSetIfChanged(ref redVisible, value); }
+		public bool YellowVisible { get => yellowVisible; set => this.RaiseAndSetIfChanged(ref yellowVisible, value); }
+		public bool GreenVisible { get => greenVisible; set => this.RaiseAndSetIfChanged(ref greenVisible, value); }
+		public bool PdfDownloadedVisible { get => pdfDownloadedVisible; set => this.RaiseAndSetIfChanged(ref pdfDownloadedVisible, value); }
+		public bool PdfNotDownloadedVisible { get => pdfNotDownloadedVisible; set => this.RaiseAndSetIfChanged(ref pdfNotDownloadedVisible, value); }
+	}
+}
diff --git a/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs b/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
index ba953362..8c76b2c8 100644
--- a/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
+++ b/Source/LibationAvalonia/ViewModels/MainWindowViewModel.cs
@@ -134,8 +134,11 @@ namespace LibationAvalonia.ViewModels
 			set
 			{
 				this.RaiseAndSetIfChanged(ref _queueOpen, value);
+				QueueButtonAngle = value ? 180 : 0;
+				this.RaisePropertyChanged(nameof(QueueButtonAngle));
 			}
 		}
+		public double QueueButtonAngle { get; private set; }
 
 
 		/// <summary> The number of books visible in the Product Display </summary>
diff --git a/Source/LibationAvalonia/Views/LiberateStatusButton.axaml b/Source/LibationAvalonia/Views/LiberateStatusButton.axaml
new file mode 100644
index 00000000..8c20263c
--- /dev/null
+++ b/Source/LibationAvalonia/Views/LiberateStatusButton.axaml
@@ -0,0 +1,82 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:vm="clr-namespace:LibationAvalonia.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="200" MinWidth="64" MinHeight="64"
+			 Background="Transparent"
+			 x:DataType="vm:LiberateStatusButtonViewModel"
+             x:Class="LibationAvalonia.Views.LiberateStatusButton">
+
+	<UserControl.Styles>
+		<Style Selector="Path">
+			<Setter Property="Fill" Value="{DynamicResource IconFill}" />
+			<Setter Property="Stretch" Value="Uniform" />
+			<Setter Property="HorizontalAlignment" Value="Center" />
+			<Setter Property="VerticalAlignment" Value="Center" />
+		</Style>
+		<Style Selector="Rectangle">
+			<Setter Property="Width" Value="20" />
+			<Setter Property="Height" Value="18" />
+		</Style>
+
+		<Style Selector="Grid > Path">
+			<Setter Property="Margin" Value="4,0,0,0" />
+			<Setter Property="Width" Value="28.8" />
+		</Style>
+
+		<Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
+			<Setter Property="Background" Value="Transparent" />
+			<Setter Property="BorderBrush" Value="Transparent" />
+		</Style>
+	</UserControl.Styles>
+
+	<Button
+		Name="button"
+		HorizontalAlignment="Stretch"
+		VerticalAlignment="Stretch"
+		IsEnabled="{Binding	IsButtonEnabled}" Padding="0" Click="Button_Click" >
+		<Panel>
+	
+			<Panel
+				Width="64" Height="64"
+				IsVisible="{CompiledBinding !IsError}">
+
+				<Panel IsVisible="{CompiledBinding IsSeries}">
+					<Path IsVisible="{CompiledBinding Expanded}" Data="{StaticResource CollapseIcon}" />
+					<Path IsVisible="{CompiledBinding !Expanded}" Data="{StaticResource ExpandIcon}" />
+				</Panel>
+
+				<Grid
+					IsVisible="{CompiledBinding	!IsSeries}"
+					HorizontalAlignment="Center"
+					ColumnDefinitions="Auto,Auto">
+
+					<Canvas Width="29.44" Height="64">
+						<Rectangle Canvas.Left="5" Canvas.Top="5" IsVisible="{CompiledBinding RedVisible}" Fill="{DynamicResource StoplightRed}" />
+						<Rectangle Canvas.Left="5" Canvas.Top="23" IsVisible="{CompiledBinding YellowVisible}" Fill="{DynamicResource StoplightYellow}" />
+						<Rectangle Canvas.Left="5" Canvas.Top="42" IsVisible="{CompiledBinding GreenVisible}" Fill="{DynamicResource StoplightGreen}" />
+						<Path Height="64" Stretch="Uniform" Data="{StaticResource StoplightBodyIcon}"/>
+					</Canvas>
+
+					<Path Grid.Column="1" IsVisible="{CompiledBinding PdfDownloadedVisible}" Data="{StaticResource PdfDownloadedIcon}"/>
+					<Path Grid.Column="1" IsVisible="{CompiledBinding PdfNotDownloadedVisible}" Data="{StaticResource PdfNotDownloadedIcon}"/>
+				</Grid>
+
+			</Panel>
+			 
+			<Path
+				Stretch="None" Width="64"
+				IsVisible="{CompiledBinding IsError}"
+				Fill="{DynamicResource CancelRed}"
+				Data="{StaticResource BookErrorIcon}" />
+			
+			<Path 
+				Stretch="Fill"
+				IsVisible="{CompiledBinding !IsButtonEnabled}"
+				Fill="{DynamicResource DisabledGrayBrush}"
+				Data="M0,0 H1 V1 H0" />
+		</Panel>
+	</Button>
+
+</UserControl>
diff --git a/Source/LibationAvalonia/Views/LiberateStatusButton.axaml.cs b/Source/LibationAvalonia/Views/LiberateStatusButton.axaml.cs
new file mode 100644
index 00000000..edb1b24a
--- /dev/null
+++ b/Source/LibationAvalonia/Views/LiberateStatusButton.axaml.cs
@@ -0,0 +1,80 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using DataLayer;
+using LibationAvalonia.ViewModels;
+using System;
+
+namespace LibationAvalonia.Views
+{
+	public partial class LiberateStatusButton : UserControl
+	{
+		public event EventHandler Click;
+
+		public static readonly StyledProperty<LiberatedStatus> BookStatusProperty =
+		AvaloniaProperty.Register<LiberateStatusButton, LiberatedStatus>(nameof(BookStatus));
+
+		public static readonly StyledProperty<LiberatedStatus?> PdfStatusProperty =
+		AvaloniaProperty.Register<LiberateStatusButton, LiberatedStatus?>(nameof(PdfStatus));
+
+		public static readonly StyledProperty<bool> IsUnavailableProperty =
+		AvaloniaProperty.Register<LiberateStatusButton, bool>(nameof(IsUnavailable));
+
+		public static readonly StyledProperty<bool> ExpandedProperty =
+		AvaloniaProperty.Register<LiberateStatusButton, bool>(nameof(Expanded));
+
+		public static readonly StyledProperty<bool> IsSeriesProperty =
+		AvaloniaProperty.Register<LiberateStatusButton, bool>(nameof(IsSeries));
+
+		public LiberatedStatus BookStatus { get => GetValue(BookStatusProperty); set => SetValue(BookStatusProperty, value); }
+		public LiberatedStatus? PdfStatus { get => GetValue(PdfStatusProperty); set => SetValue(PdfStatusProperty, value); }
+		public bool IsUnavailable { get => GetValue(IsUnavailableProperty); set => SetValue(IsUnavailableProperty, value); }
+		public bool Expanded { get => GetValue(ExpandedProperty); set => SetValue(ExpandedProperty, value); }
+		public bool IsSeries { get => GetValue(IsSeriesProperty); set => SetValue(IsSeriesProperty, value); }
+
+		private readonly LiberateStatusButtonViewModel viewModel = new();
+
+		public LiberateStatusButton()
+		{
+			InitializeComponent();
+			button.DataContext = viewModel;
+
+			if (Design.IsDesignMode)
+			{
+				BookStatus = LiberatedStatus.PartialDownload;
+				PdfStatus = null;
+				IsSeries = true;
+			}
+		}
+
+		private void Button_Click(object sender, RoutedEventArgs e) => Click?.Invoke(this, EventArgs.Empty);
+
+		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+		{
+			if (change.Property == BookStatusProperty)
+			{
+				viewModel.IsError = BookStatus is LiberatedStatus.Error;
+				viewModel.RedVisible = BookStatus is LiberatedStatus.NotLiberated;
+				viewModel.YellowVisible = BookStatus is LiberatedStatus.PartialDownload;
+				viewModel.GreenVisible = BookStatus is LiberatedStatus.Liberated;
+			}
+			else if (change.Property == PdfStatusProperty)
+			{
+				viewModel.PdfDownloadedVisible = PdfStatus is LiberatedStatus.Liberated;
+				viewModel.PdfNotDownloadedVisible = PdfStatus is LiberatedStatus.NotLiberated;
+			}
+			else if (change.Property == IsSeriesProperty)
+			{
+				viewModel.IsSeries = IsSeries;
+			}
+			else if (change.Property == ExpandedProperty)
+			{
+				viewModel.Expanded = Expanded;
+			}
+
+			viewModel.IsButtonEnabled = !viewModel.IsError && (!IsUnavailable || (BookStatus is LiberatedStatus.Liberated && PdfStatus is null or LiberatedStatus.Liberated));
+
+			base.OnPropertyChanged(change);
+		}
+	}
+}
diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml b/Source/LibationAvalonia/Views/MainWindow.axaml
index d2feee33..d4485a6a 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml
@@ -138,7 +138,7 @@
 					</MenuItem>
 				</Menu>
 				<StackPanel IsVisible="{Binding ActivelyScanning}" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-					<Image Width="16" Height="16" Source="/Assets/import_16x16.png" />
+					<Path VerticalAlignment="Center" Fill="{StaticResource IconFill}" Data="{StaticResource ImportIcon}" />
 					<TextBlock Margin="5,0,5,0" VerticalAlignment="Center" Text="{Binding ScanningText}"/>
 				</StackPanel>
 			</Grid>
@@ -172,12 +172,13 @@
 				<TextBox Grid.Column="1" Margin="10,0,0,0" IsVisible="{Binding !RemoveButtonsVisible}" Text="{Binding FilterString, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
 
 				<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
-					<Button Click="filterBtn_Click" Height="30" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
-					<Button Padding="5,0,5,0" Click="ToggleQueueHideBtn_Click">
-						<Panel>
-							<Image Stretch="None" IsVisible="{Binding !QueueOpen}" Source="/Assets/Arrows_left.png" />
-							<Image Stretch="None" IsVisible="{Binding QueueOpen}" Source="/Assets/Arrows_right.png" />
-						</Panel>
+					<Button Click="filterBtn_Click" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
+					<Button Padding="2,6,2,6" VerticalAlignment="Stretch" Click="ToggleQueueHideBtn_Click">
+						<Path Stretch="Uniform" Fill="{DynamicResource IconFill}" Data="{StaticResource	LeftArrows}">
+							<Path.RenderTransform>
+								<RotateTransform Angle="{Binding QueueButtonAngle}"/>
+							</Path.RenderTransform>
+						</Path>
 					</Button>
 				</StackPanel>
 
@@ -198,8 +199,8 @@
 						LiberateSeriesClicked="ProductsDisplay_LiberateSeriesClicked"
 						ConvertToMp3Clicked="ProductsDisplay_ConvertToMp3Clicked" />				
 				</SplitView>
-			</Border>
-
+			</Border>			
+			
 			<!-- Bottom Status Strip -->
 			<Grid Grid.Row="3" Margin="0,10,0,0" VerticalAlignment="Bottom" ColumnDefinitions="Auto,Auto,*,Auto">
 				<Grid.Styles>
diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
index 6344c083..6a436916 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
@@ -2,9 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using ApplicationServices;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 using DataLayer;
 using LibationAvalonia.ViewModels;
diff --git a/Source/LibationAvalonia/Views/ProcessBookControl.axaml b/Source/LibationAvalonia/Views/ProcessBookControl.axaml
index e9bf30ac..0c2cb800 100644
--- a/Source/LibationAvalonia/Views/ProcessBookControl.axaml
+++ b/Source/LibationAvalonia/Views/ProcessBookControl.axaml
@@ -2,16 +2,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="90" MaxHeight="90" MinHeight="90" MinWidth="300"
+             mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="87" MaxHeight="87" MinHeight="87" MinWidth="300"
              x:Class="LibationAvalonia.Views.ProcessBookControl" Background="{Binding BackgroundColor}">
 	
-	<Border BorderBrush="{DynamicResource ProcessQueueBookBorderBrush}" BorderThickness="2">
+	<Border BorderBrush="{DynamicResource SystemControlForegroundBaseMediumBrush}" BorderThickness="0,0,0,1">
 		<Grid ColumnDefinitions="Auto,*,Auto">
 			
-			<Panel Grid.Column="0" Margin="3" Background="LightGray" Width="80" Height="80" HorizontalAlignment="Left">
+			<Panel Grid.Column="0" Margin="3" Width="80" Height="80" HorizontalAlignment="Left">
 				<Image Width="80" Height="80" Source="{Binding Cover}" Stretch="Uniform" />
 			</Panel>
-			<Grid Margin="0,3,0,3" Grid.Column="1" ColumnDefinitions="1*" RowDefinitions="1*,16">
+			<Grid Margin="0,3,0,3" Grid.Column="1" ColumnDefinitions="*" RowDefinitions="*,16">
 				<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Vertical">
 					<TextBlock ClipToBounds="True" TextWrapping="Wrap" FontSize="11" Text="{Binding Title}" />
 					<TextBlock FontSize="10" TextWrapping="NoWrap" Text="{Binding Author}" />
@@ -28,23 +28,35 @@
 				</Panel>
 			</Grid>
 			<Grid Margin="3" Grid.Column="2" HorizontalAlignment="Right" ColumnDefinitions="Auto,Auto">
+				<Grid.Styles>
+					<Style Selector="Button">
+						<Setter Property="Padding" Value="0,1,0,1" />
+						<Setter Property="Height" Value="20" />
+						<Setter Property="Width" Value="30" />
+						<Style Selector="^ > Path">
+							<Setter Property="Stretch" Value="Uniform" />
+							<Setter Property="Fill" Value="{DynamicResource IconFill}" />
+						</Style>
+					</Style>
+				</Grid.Styles>
 				<StackPanel IsVisible="{Binding Queued}" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Vertical">
-					<Button Height="20" Width="30" Click="MoveFirst_Click">
-						<Image Height="20" Width="30" Source="/Assets/first.png" Stretch="Uniform" VerticalAlignment="Bottom"/>
+					
+					<Button Click="MoveFirst_Click">
+						<Path VerticalAlignment="Top" Data="{StaticResource	FirstButtonIcon}" />
 					</Button>
-					<Button Height="20" Width="30" Click="MoveUp_Click">
-						<Image Height="20" Width="30" Source="/Assets/up.png" Stretch="Uniform" VerticalAlignment="Bottom" />
+					<Button Click="MoveUp_Click">
+						<Path VerticalAlignment="Top" Data="{StaticResource	UpButtonIcon}" />
 					</Button>
-					<Button Height="20" Width="30" Click="MoveDown_Click">
-						<Image Height="20" Width="30" Source="/Assets/down.png" Stretch="Uniform" VerticalAlignment="Top" />
+					<Button Click="MoveDown_Click">
+						<Path VerticalAlignment="Bottom" Data="{StaticResource	DownButtonIcon}" />
 					</Button>
-					<Button Height="20" Width="30" Click="MoveLast_Click">
-						<Image Height="20" Width="30" Source="/Assets/last.png" Stretch="Uniform" VerticalAlignment="Top"/>
+					<Button Click="MoveLast_Click">
+						<Path VerticalAlignment="Bottom" Data="{StaticResource	LastButtonIcon}" />
 					</Button>
 				</StackPanel>
-				<Panel Margin="3" Grid.Column="1" VerticalAlignment="Top">
-					<Button Height="32" Width="22" IsVisible="{Binding !IsFinished}" CornerRadius="11" Click="Cancel_Click">
-						<Image Width="20" Height="20" Source="/Assets/cancel.png" Stretch="Uniform" />
+				<Panel Margin="3,0,0,0" Grid.Column="1" VerticalAlignment="Top">
+					<Button Height="32" Background="{DynamicResource CancelRed}" Width="22" IsVisible="{Binding !IsFinished}" CornerRadius="11" Click="Cancel_Click">
+						<Path Fill="{DynamicResource ProcessQueueBookDefaultBrush}" VerticalAlignment="Center" Data="{StaticResource CancelButtonIcon}" RenderTransform="{StaticResource Rotate45Transform}" />
 					</Button>
 				</Panel>
 			</Grid>
diff --git a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
index 79962d8f..87b50442 100644
--- a/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
+++ b/Source/LibationAvalonia/Views/ProcessQueueControl.axaml
@@ -38,7 +38,7 @@
 					<TextBlock FontSize="14" VerticalAlignment="Center">Process Queue</TextBlock>
 				</TabItem.Header>
 				<Grid ColumnDefinitions="*" RowDefinitions="*,40">
-					<Border Grid.Column="0" Grid.Row="0" BorderThickness="1" BorderBrush="{DynamicResource DataGridGridLinesBrush}" Background="WhiteSmoke">
+					<Border Grid.Column="0" Grid.Row="0" BorderThickness="1" BorderBrush="{DynamicResource SystemBaseMediumColor}" Background="{DynamicResource SystemChromeMediumLowColor}">
 						<ScrollViewer
 							Name="scroller"
 							HorizontalScrollBarVisibility="Disabled"
@@ -83,7 +83,7 @@
 					<TextBlock FontSize="14" VerticalAlignment="Center">Queue Log</TextBlock>
 				</TabItem.Header>
 				<Grid ColumnDefinitions="*" RowDefinitions="*,40">
-					<Border Grid.Column="0" Grid.Row="0" BorderThickness="1" BorderBrush="{DynamicResource DataGridGridLinesBrush}" Background="WhiteSmoke">
+					<Border Grid.Column="0" Grid.Row="0" BorderThickness="1" BorderBrush="{DynamicResource SystemBaseMediumColor}" Background="{DynamicResource SystemChromeMediumLowColor}">
 						<DataGrid AutoGenerateColumns="False" Items="{Binding LogEntries}">
 							<DataGrid.Columns>
 								<DataGridTextColumn SortMemberPath="LogDate" Header="Timestamp" CanUserSort="True" Binding="{Binding LogDateString}" Width="90"/>
@@ -99,7 +99,7 @@
 							</DataGrid.Columns>
 						</DataGrid>
 					</Border>
-					<Grid Grid.Column="0" Grid.Row="1" ColumnDefinitions="*,Auto" Margin="6,0,6,0">
+					<Grid Grid.Column="0" Grid.Row="1" ColumnDefinitions="*,Auto">
 						<Button Grid.Column="0" FontSize="12" HorizontalAlignment="Left" Click="LogCopyBtn_Click">Copy Log Entries to Clipboard</Button>
 						<Button Grid.Column="1" FontSize="12" HorizontalAlignment="Right" Click="ClearLogBtn_Click">Clear Log</Button>
 					</Grid>
@@ -108,6 +108,7 @@
 		</TabControl>
 		<!-- Queue Status -->
 		<Grid Grid.Row="1" Margin="5,0,0,0" ColumnDefinitions="Auto,*,Auto">
+			
 			<Panel Grid.Column="0">
 				<Panel.Styles>
 					<Style Selector="ProgressBar:horizontal">
@@ -117,17 +118,32 @@
 				<ProgressBar IsVisible="{Binding ProgressBarVisible}" Value="{Binding Progress}" ShowProgressText="True" />
 			</Panel>
 			<StackPanel Orientation="Horizontal" Grid.Column="1">
-				<StackPanel Margin="5,0,0,0" Orientation="Horizontal">
-					<Image IsVisible="{Binding AnyQueued}" Width="20" Height="20" Source="/Assets/queued.png" />
-					<TextBlock IsVisible="{Binding AnyQueued}" VerticalAlignment="Center" Text="{Binding QueuedCount}" />
+				<StackPanel.Styles>
+					<Style Selector="StackPanel">
+						<Setter Property="Height" Value="15" />
+						<Setter Property="Margin" Value="10,0,0,0" />
+						<Setter Property="Orientation" Value="Horizontal" />
+						<Style Selector="^ > Path">
+							<Setter Property="Stretch" Value="Uniform" />
+							<Setter Property="Fill" Value="{DynamicResource IconFill}" />
+						</Style>
+						<Style Selector="^ > TextBlock">
+							<Setter Property="Margin" Value="3,0,0,0" />
+							<Setter Property="VerticalAlignment" Value="Center" />
+						</Style>
+					</Style>
+				</StackPanel.Styles>
+				<StackPanel IsVisible="{Binding AnyQueued}">
+					<Path Data="{StaticResource QueuedIcon}" />
+					<TextBlock Text="{Binding QueuedCount}" />
 				</StackPanel>
-				<StackPanel Margin="5,0,0,0" Orientation="Horizontal">
-					<Image IsVisible="{Binding AnyCompleted}" Width="20" Height="20" Source="/Assets/completed.png" />
-					<TextBlock IsVisible="{Binding AnyCompleted}" VerticalAlignment="Center" Text="{Binding CompletedCount}" />
+				<StackPanel IsVisible="{Binding AnyCompleted}">
+					<Path Data="{StaticResource QueueCompletedIcon}" />
+					<TextBlock Text="{Binding CompletedCount}" />
 				</StackPanel>
-				<StackPanel Margin="5,0,0,0" Orientation="Horizontal">
-					<Image IsVisible="{Binding AnyErrors}" Width="20" Height="20" Source="/Assets/errored.png" />
-					<TextBlock IsVisible="{Binding AnyErrors}" VerticalAlignment="Center" Text="{Binding ErrorCount}" />
+				<StackPanel IsVisible="{Binding AnyErrors}">
+					<Path Data="{StaticResource QueueErrorIcon}"/>
+					<TextBlock Text="{Binding ErrorCount}" />
 				</StackPanel>
 			</StackPanel>
 			<Panel Grid.Column="2" Margin="0,0,5,0" HorizontalAlignment="Right" VerticalAlignment="Center">
diff --git a/Source/LibationAvalonia/Views/ProductsDisplay.axaml b/Source/LibationAvalonia/Views/ProductsDisplay.axaml
index a81c7cfd..38a6b59d 100644
--- a/Source/LibationAvalonia/Views/ProductsDisplay.axaml
+++ b/Source/LibationAvalonia/Views/ProductsDisplay.axaml
@@ -32,6 +32,11 @@
 					<Setter Property="Padding" Value="4"/>
 					<Setter Property="FontSize" Value="12"/>
 				</Style>
+				<Style Selector="DataGridCell Path">
+					<Setter Property="Stretch" Value="Uniform" />
+					<Setter Property="VerticalAlignment" Value="Center" />
+					<Setter Property="Fill" Value="{DynamicResource	IconFill}" />
+				</Style>
 			</DataGrid.Styles>
 			
 			<DataGrid.Columns>
@@ -58,13 +63,14 @@
 				<controls:DataGridTemplateColumnExt CanUserSort="True" Width="75" Header="Liberate" SortMemberPath="Liberate" ClipboardContentBinding="{Binding Liberate.ToolTip}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate>
-							<Panel ToolTip.Tip="{Binding Liberate.ToolTip}">
-								<Button Opacity="{Binding Liberate.Opacity}" Padding="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Click="LiberateButton_Click" IsVisible="{Binding !Liberate.IsUnavailable}">
-									<Image Source="{Binding Liberate.ButtonImage}" Stretch="None" />
-								</Button>
-								<Image Source="{Binding Liberate.ButtonImage}" Stretch="None" IsVisible="{Binding Liberate.IsUnavailable}"/>
-								<Panel Background="{StaticResource DisabledGrayBrush}" IsVisible="{Binding Liberate.IsUnavailable}" />
-							</Panel>
+							<views:LiberateStatusButton
+								ToolTip.Tip="{Binding Liberate.ToolTip}"
+								BookStatus="{Binding Liberate.BookStatus}"
+								PdfStatus="{Binding Liberate.PdfStatus}"
+								IsUnavailable="{Binding Liberate.IsUnavailable}"
+								IsSeries="{Binding Liberate.IsSeries}"
+								Expanded="{Binding Liberate.Expanded}"
+								Click="LiberateButton_Click" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
@@ -202,7 +208,9 @@
 						<DataTemplate>
 							<Button IsVisible="{Binding !Liberate.IsSeries}" Width="100" Height="80" Click="OnTagsButtonClick" ToolTip.Tip="Click to edit tags" >
 								<Panel Opacity="{Binding Liberate.Opacity}">
-									<Image IsVisible="{Binding BookTags, Converter={x:Static StringConverters.IsNullOrEmpty}}" Stretch="None" Source="/Assets/edit_25x25.png" />
+									<Panel Width="24" Height="24" IsVisible="{Binding BookTags, Converter={x:Static StringConverters.IsNullOrEmpty}}">
+										<Path Stretch="Uniform" Fill="{DynamicResource IconFill}" Data="{StaticResource EditTagsIcon}" />
+									</Panel>
 									<TextBlock IsVisible="{Binding BookTags, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" FontSize="12" TextWrapping="WrapWithOverflow" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding BookTags}"/>
 								</Panel>
 							</Button>
diff --git a/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
index eed0e4d9..8f29b4ca 100644
--- a/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
+++ b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs
@@ -354,9 +354,9 @@ namespace LibationAvalonia.Views
 
 		#region Button Click Handlers
 
-		public async void LiberateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
+		public async void LiberateButton_Click(object sender, EventArgs e)
 		{
-			var button = args.Source as Button;
+			var button = sender as LiberateStatusButton;
 
 			if (button.DataContext is ISeriesEntry sEntry)
 			{
@@ -364,8 +364,7 @@ namespace LibationAvalonia.Views
 
 				//Expanding and collapsing reset the list, which will cause focus to shift
 				//to the topright cell. Reset focus onto the clicked button's cell.
-				var parentControl = (sender as Button).Parent as Control;
-				parentControl?.Focus();
+				button.Focus();
 			}
 			else if (button.DataContext is ILibraryBookEntry lbEntry)
 			{
diff --git a/Source/LibationAvalonia/libation.ico b/Source/LibationAvalonia/libation.ico
deleted file mode 100644
index d3e00443..00000000
Binary files a/Source/LibationAvalonia/libation.ico and /dev/null differ
diff --git a/Source/LibationWinForms/Resources/minus.png b/Source/LibationWinForms/Resources/minus.png
index c0c5d15c..8aee13b4 100644
Binary files a/Source/LibationWinForms/Resources/minus.png and b/Source/LibationWinForms/Resources/minus.png differ
diff --git a/Source/LibationWinForms/Resources/plus.png b/Source/LibationWinForms/Resources/plus.png
index 1cd1c630..41b056db 100644
Binary files a/Source/LibationWinForms/Resources/plus.png and b/Source/LibationWinForms/Resources/plus.png differ