incr ver

Use old activation bytes if present.

.github/workflows/build-windows.yml

@@ -69,7 +69,7 @@ jobs:
               LoadByOS/${{ matrix.os }}ConfigApp/${{ matrix.os }}ConfigApp.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
-              -p:PublishProfile=LoadByOS/Properties/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
+              -p:PublishProfile=LoadByOS/${{ matrix.os }}ConfigApp/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               LibationCli/LibationCli.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `

Documentation/Advanced.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

Documentation/Docker.md

@@ -1,9 +1,12 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
+### Disclaimer
+The docker image is provided as-is. We hope it can be useful to you but it is not officially supported.
+
 ### Setup
 In order to use the docker image, you'll need to provide it with a copy of the `AccountsSettings.json`, `Settings.json`, and `LibationContext.db` files. These files can usually be found in the Libation folder in your user's home directory. If you haven't run Libation yet, you'll need to launch it to generate these files and setup your accounts. Once you have them, copy these files to a new location, such as `/opt/libation/config`. Before using them we'll need to make a couple edits so that the filepaths referenced are correct when running from the docker image.
 

Documentation/GettingStarted.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

Documentation/InstallOnLinux.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

Documentation/InstallOnMac.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

Documentation/SearchingAndFiltering.md

@@ -1,6 +1,6 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 

README.md

@@ -2,7 +2,7 @@
 
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 # Table of Contents

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="1.0.1" />
+	  <PackageReference Include="AAXClean.Codecs" Version="1.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -32,7 +32,11 @@ namespace AaxDecrypter
 		protected bool Step_GetMetadata()
 		{
 			AaxFile = new AaxFile(InputFileStream);
-			AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+
+			if (DownloadOptions.AudibleKey?.Length == 8 && DownloadOptions.AudibleIV is null)
+				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey);
+			else
+				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
 
 			if (DownloadOptions.StripUnabridged)
 			{

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -182,7 +182,6 @@ namespace AaxDecrypter
 			FileUtility.SaferDelete(jsonDownloadState);
 
 			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
-				!string.IsNullOrEmpty(DownloadOptions.AudibleIV) &&
 				DownloadOptions.RetainEncryptedFile)
 			{
 				string aaxPath = Path.ChangeExtension(tempFilePath, ".aax");

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,10 +2,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>9.4.7.1</Version>
+    <Version>10.2.1.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="5.0.2" />
+    <PackageReference Include="Octokit" Version="5.0.4" />
+    <PackageReference Include="Serilog.Sinks.ZipFile" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -118,8 +118,15 @@ namespace AppScaffolding
 
 		private static void ensureSerilogConfig(Configuration config)
 		{
-			if (config.GetObject("Serilog") is not null)
+			if (config.GetObject("Serilog") is JObject serilog)
+			{
+				if (serilog["WriteTo"] is JArray sinks && sinks.FirstOrDefault(s => s["Name"].Value<string>() is "File") is JToken fileSink)
+				{
+					fileSink["Name"] = "ZipFile";
+					config.SetNonString(serilog.DeepClone(), "Serilog");
+				}
 				return;
+			}
 
 			var serilogObj = new JObject
 			{
@@ -129,7 +136,7 @@ namespace AppScaffolding
 						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
 						new JObject
 						{
-							{ "Name", "File" },
+							{ "Name", "ZipFile" },
 							{ "Args",
 								new JObject
 								{

Source/AppScaffolding/UpgradeProperties.cs

@@ -1,5 +1,4 @@
-using NPOI.XWPF.UserModel;
-using System;
+using System;
 using System.Text.RegularExpressions;
 
 namespace AppScaffolding

Source/ApplicationServices/LibraryCommands.cs

@@ -12,7 +12,6 @@ using DtoImporterService;
 using FileManager;
 using LibationFileManager;
 using Newtonsoft.Json.Linq;
-using NPOI.OpenXmlFormats.Spreadsheet;
 using Serilog;
 using static DtoImporterService.PerfLogger;
 
@@ -21,7 +20,7 @@ namespace ApplicationServices
     public static class LibraryCommands
     {
         public static event EventHandler<int> ScanBegin;
-        public static event EventHandler ScanEnd;
+        public static event EventHandler<int> ScanEnd;
 
         public static bool Scanning { get; private set; }
         private static object _lock { get; } = new();
@@ -95,7 +94,7 @@ namespace ApplicationServices
             {
                 stop();
                 var putBreakPointHere = logOutput;
-                ScanEnd?.Invoke(null, null);
+                ScanEnd?.Invoke(null, 0);
 				GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
 			}
         }
@@ -108,7 +107,8 @@ namespace ApplicationServices
             if (accounts is null || accounts.Length == 0)
                 return (0, 0);
 
-            try
+            int newCount = 0;
+			try
             {
                 lock (_lock)
                 {
@@ -134,7 +134,7 @@ namespace ApplicationServices
 
                 Log.Logger.Information("Begin long-running import");
                 logTime($"pre {nameof(importIntoDbAsync)}");
-                var newCount = await importIntoDbAsync(importItems);
+                newCount = await importIntoDbAsync(importItems);
                 logTime($"post {nameof(importIntoDbAsync)}");
                 Log.Logger.Information($"Import complete. New count {newCount}");
 
@@ -167,7 +167,7 @@ namespace ApplicationServices
             {
                 stop();
                 var putBreakPointHere = logOutput;
-                ScanEnd?.Invoke(null, null);
+                ScanEnd?.Invoke(null, newCount);
                 GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true, true);
             }
         }
@@ -283,7 +283,8 @@ namespace ApplicationServices
             catch(ImportValidationException ex)
 			{
 				await logDtoItemsAsync(ex.Items, ex.InnerExceptions.ToArray());
-				throw;
+				//If ImportValidationException is thrown, all Dto items get logged as part of the exception
+				throw new AggregateException(ex.InnerExceptions);
             }
 
             async Task logDtoItemsAsync(IEnumerable<AudibleApi.Common.Item> dtoItems, IEnumerable<Exception> exceptions = null)

Source/AudibleUtilities/ApiExtended.cs

@@ -152,13 +152,17 @@ namespace AudibleUtilities
 				SetSeries(parent, children);
 			}
 
+			int orphansRemoved = items.RemoveAll(i => (i.IsEpisodes || i.IsSeriesParent) && i.Series is null);
+			if (orphansRemoved > 0)
+				Serilog.Log.Debug("{orphansRemoved} podcast orphans not imported", orphansRemoved);
+
 			sw.Stop();
 			totalTime += sw.Elapsed;
 			Serilog.Log.Logger.Information("Completed indexing series episodes after {elappsed_ms} ms.", sw.ElapsedMilliseconds);
 			Serilog.Log.Logger.Information($"Completed library scan in {totalTime.TotalMilliseconds:F0} ms.");
 
-			var allExceptions = IValidator.GetAllValidators().SelectMany(v => v.Validate(items));
-			if (allExceptions?.Any() is true)
+			var allExceptions = IValidator.GetAllValidators().SelectMany(v => v.Validate(items)).ToList();
+			if (allExceptions?.Count > 0)
 				throw new ImportValidationException(items, allExceptions);
 
 			return items;

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="8.2.3.1" />
+    <PackageReference Include="AudibleApi" Version="8.4.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/DtoImporterService/BookImporter.cs

@@ -46,7 +46,7 @@ namespace DtoImporterService
 			var productIds = importItems
 				.Select(i => i.DtoItem.ProductId)
 				.Distinct()
-				.ToList();
+				.ToHashSet();
 
 			Cache = DbContext.Books
 				.GetBooks(b => productIds.Contains(b.AudibleProductId))

Source/DtoImporterService/LibraryBookImporter.cs

@@ -41,11 +41,18 @@ namespace DtoImporterService
 			//
 			// CURRENT SOLUTION: don't re-insert
 
-			var existingEntries = DbContext.LibraryBooks.AsEnumerable().Where(l => l.Book is not null).ToDictionary(l => l.Book.AudibleProductId);
-			var hash = ToDictionarySafe(importItems, dto => dto.DtoItem.ProductId, tieBreak);
+
+			//When Books are upserted during the BookImporter run, they are linked to their LibraryBook in the DbContext
+			//instance. If a LibraryBook has a null book here, that means it's Book was not imported during by BookImporter.
+			//There should never be duplicates, but this is defensive.
+			var existingEntries = DbContext.LibraryBooks.AsEnumerable().Where(l => l.Book is not null).ToDictionarySafe(l => l.Book.AudibleProductId);
+
+			//If importItems are contains duplicates by asin, keep the Item that's "available"
+			var uniqueImportItems = ToDictionarySafe(importItems, dto => dto.DtoItem.ProductId, tieBreak);
+
 			int qtyNew = 0;
 
-			foreach (var item in hash.Values)
+			foreach (var item in uniqueImportItems.Values)
 			{
 				if (existingEntries.TryGetValue(item.DtoItem.ProductId, out LibraryBook existing))
 				{
@@ -109,7 +116,7 @@ namespace DtoImporterService
 			=> isPlusTitleUnavailable(item1) && !isPlusTitleUnavailable(item2) ? item2 : item1;
 
 		private static bool isPlusTitleUnavailable(ImportItem item)
-			=> item.DtoItem.IsAyce is true
-			&& item.DtoItem.Plans?.Any(p => p.IsAyce) is not true;
+			=> item.DtoItem.ContentType is null
+			|| (item.DtoItem.IsAyce is true && item.DtoItem.Plans?.Any(p => p.IsAyce) is not true);
 	}
 }

Source/FileManager/BackgroundFileSystem.cs

@@ -147,7 +147,8 @@ namespace FileManager
         private void AddPath(LongPath path)
         {
             path = path.LongPathName;
-            if (!File.Exists(path) && !Directory.Exists(path))
+            //Temporary files created when updating the db will disappear before their attributes can be read.
+            if (Path.GetFileName(path).Contains("LibationContext.db") || !File.Exists(path) && !Directory.Exists(path))
                 return;
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
                 AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));

Source/LibationAvalonia/App.axaml

@@ -1,7 +1,9 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:LibationAvalonia"
-			 x:Class="LibationAvalonia.App">
+             xmlns:controls="using:LibationAvalonia.Controls"
+			 x:Class="LibationAvalonia.App"
+             Name="Libation">
 
 	<Application.DataTemplates>
 		<local:ViewLocator/>
@@ -68,5 +70,19 @@
 				<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
 			</Style>
 		</Style>
+		<Style Selector="controls|LinkLabel">
+			<Setter Property="Foreground" Value="{DynamicResource HyperlinkNew}"/>
+			<Setter Property="ForegroundVisited" Value="{DynamicResource HyperlinkVisited}"/>
+		</Style>
+		<Style Selector="Button">
+			<Setter Property="VerticalContentAlignment" Value="Center"/>
+		</Style>
 	</Application.Styles>
+
+	<NativeMenu.Menu>
+		<NativeMenu>
+			<NativeMenuItem Header="About Libation" />
+		</NativeMenu>
+	</NativeMenu.Menu>
+
 </Application>

Source/LibationAvalonia/App.axaml.cs

@@ -1,30 +1,32 @@
-using Avalonia;
+using ApplicationServices;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
-using LibationFileManager;
-using LibationAvalonia.Views;
-using System;
 using Avalonia.Platform;
+using Avalonia.Styling;
 using LibationAvalonia.Dialogs;
-using System.Threading.Tasks;
+using LibationAvalonia.Views;
+using LibationFileManager;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using ApplicationServices;
-using Avalonia.Controls;
-using Avalonia.Styling;
+using System.Threading.Tasks;
+using ReactiveUI;
+using DataLayer;
 
 namespace LibationAvalonia
 {
 	public class App : Application
 	{
-		public static Window MainWindow { get;private set; }
+		public static Window MainWindow { get; private set; }
 		public static IBrush ProcessQueueBookFailedBrush { get; private set; }
 		public static IBrush ProcessQueueBookCompletedBrush { get; private set; }
 		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; }
 
@@ -39,18 +41,15 @@ namespace LibationAvalonia
 		}
 
 		public static Task<List<DataLayer.LibraryBook>> LibraryTask;
-		public static bool SetupRequired;
 
 		public override void OnFrameworkInitializationCompleted()
 		{
-			LoadStyles();
-
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
-				if (SetupRequired)
-				{
-					var config = Configuration.Instance;
+				var config = Configuration.Instance;
 
+				if (!config.LibationSettingsAreValid)
+				{
 					var defaultLibationFilesDir = Configuration.UserProfile;
 
 					// check for existing settings in default location
@@ -60,7 +59,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
@@ -86,11 +85,29 @@ namespace LibationAvalonia
 			{
 				// all returns should be preceded by either:
 				// - if config.LibationSettingsAreValid
-				// - error message, Exit()
+				// - error message, Exit()				
 				if (setupDialog.IsNewUser)
 				{
 					Configuration.SetLibationFiles(Configuration.UserProfile);
-					ShowSettingsWindow(desktop, setupDialog.Config, OnSettingsCompleted);
+					setupDialog.Config.Books = Path.Combine(Configuration.UserProfile, nameof(Configuration.Books));
+
+					if (setupDialog.Config.LibationSettingsAreValid)
+					{
+						var theme
+							= setupDialog.SelectedTheme.Content is nameof(ThemeVariant.Dark)
+							? nameof(ThemeVariant.Dark)
+							: nameof(ThemeVariant.Light);
+
+						setupDialog.Config.SetString(theme, nameof(ThemeVariant));
+
+
+						await RunMigrationsAsync(setupDialog.Config);
+						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+						AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+						ShowMainWindow(desktop);
+					}
+					else
+						await CancelInstallation();
 				}
 				else if (setupDialog.IsReturningUser)
 				{
@@ -130,40 +147,6 @@ namespace LibationAvalonia
 			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
 		}
 
-		private void ShowSettingsWindow(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, SettingsDialog, Configuration> OnClose)
-		{
-			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
-
-			var settingsDialog = new SettingsDialog();
-			desktop.MainWindow = settingsDialog;
-			settingsDialog.RestoreSizeAndLocation(Configuration.Instance);
-			settingsDialog.Show();
-
-			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
-			{
-				settingsDialog.Closing -= WindowClosing;
-				e.Cancel = true;
-				OnClose?.Invoke(desktop, settingsDialog, config);
-			}
-			settingsDialog.Closing += WindowClosing;
-		}
-
-		private async void OnSettingsCompleted(IClassicDesktopStyleApplicationLifetime desktop, SettingsDialog settingsDialog, Configuration config)
-		{
-			if (config.LibationSettingsAreValid)
-			{
-				await RunMigrationsAsync(config);
-				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
-				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
-				ShowMainWindow(desktop);
-			}
-			else
-				await CancelInstallation();
-
-			settingsDialog.Close();
-		}
-
-
 		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)
 		{
 			var libationFilesDialog = new LibationFilesDialog();
@@ -200,11 +183,23 @@ namespace LibationAvalonia
 					MessageBoxIcon.Question);
 
 				if (continueResult == DialogResult.Yes)
-					ShowSettingsWindow(desktop, config, OnSettingsCompleted);
+				{
+					config.Books = Path.Combine(libationFilesDialog.SelectedDirectory, nameof(Configuration.Books));
+
+					if (config.LibationSettingsAreValid)
+					{
+						await RunMigrationsAsync(config);
+						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+						AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+						ShowMainWindow(desktop);
+					}
+					else
+						await CancelInstallation();
+				}
 				else
 					await CancelInstallation();
-
 			}
+
 			libationFilesDialog.Close();
 		}
 
@@ -222,20 +217,18 @@ namespace LibationAvalonia
 			LoadStyles();
 			var mainWindow = new MainWindow();
 			desktop.MainWindow = MainWindow = mainWindow;
-			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
-			mainWindow.OnLoad();
 			mainWindow.OnLibraryLoaded(LibraryTask.GetAwaiter().GetResult());
+			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
 			mainWindow.Show();
 		}
 
 		private static void LoadStyles()
 		{
-			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookFailedBrush");
-			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCompletedBrush");
-			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCancelledBrush");
-			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
-			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
-			HyperlinkVisited = AvaloniaUtils.GetBrushFromResources(nameof(HyperlinkVisited));
+			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookFailedBrush));
+			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookCompletedBrush));
+			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookCancelledBrush));
+			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources(nameof(SeriesEntryGridBackgroundBrush));
+			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookDefaultBrush));
 		}
 	}
 }

Source/LibationAvalonia/Assets/LibationVectorIcons.xaml

@@ -64,6 +64,33 @@
 		   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>
+	   
+	   <StreamGeometry  x:Key="LibationCheersIcon">
+		   M139,2
+		   A 192,200 0 0 0 103,84
+		   A 222,334 41 0 0 241,320
+		   V478
+		   H160
+		   A 16,16 0 0 0 160,510
+		   H352
+		   A16 16 0 0 0 352,478
+		   H271
+		   V320
+		   A 222,334 -41 0 0 409,84
+		   A 192,200 0 0 0 373,2
+		   M355,32
+		   A 192,200 0 0 1 381,127
+		   A 187.5,334 -35 0 1 256,286
+		   A 187.5,334 35 0 1 131,127
+		   A 192,200 0 0 1 157,32
+		   H355
+		   M146,147
+		   A 168,300 35 0 0 256,270
+		   A 168,300 -35 0 0 366,128
+		   S 360,50 280,110
+		   S 192,128 147,147
+	   </StreamGeometry>
+	   
    </ResourceDictionary>
   </Styles.Resources>
 </Styles>

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -13,7 +13,7 @@ namespace LibationAvalonia
 		public static IBrush GetBrushFromResources(string name)
 			=> GetBrushFromResources(name, Brushes.Transparent);
 		public static IBrush GetBrushFromResources(string name, IBrush defaultBrush)
-		{			
+		{
 			if (App.Current.TryGetResource(name, App.Current.ActualThemeVariant, out var value) && value is IBrush brush)
 				return brush;
 			return defaultBrush;

Source/LibationAvalonia/Controls/CheckedListBox.axaml.cs

@@ -3,9 +3,6 @@ using Avalonia.Collections;
 using Avalonia.Controls;
 using LibationAvalonia.ViewModels;
 using ReactiveUI;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace LibationAvalonia.Controls
 {
@@ -15,7 +12,7 @@ namespace LibationAvalonia.Controls
 		AvaloniaProperty.Register<CheckedListBox, AvaloniaList<CheckBoxViewModel>>(nameof(Items));
 
 		public AvaloniaList<CheckBoxViewModel> Items { get => GetValue(ItemsProperty); set => SetValue(ItemsProperty, value); }
-		private CheckedListBoxViewModel _viewModel = new();	
+		private CheckedListBoxViewModel _viewModel = new();
 
 		public CheckedListBox()
 		{

Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.cs

@@ -3,7 +3,7 @@ using LibationUiBase.GridView;
 
 namespace LibationAvalonia.Controls
 {
-    public class DataGridCheckBoxColumnExt : DataGridCheckBoxColumn
+	public class DataGridCheckBoxColumnExt : DataGridCheckBoxColumn
 	{
 		protected override Control GenerateEditingElementDirect(DataGridCell cell, object dataItem)
 		{

Source/LibationAvalonia/Controls/DataGridContextMenus.cs

@@ -15,7 +15,7 @@ namespace LibationAvalonia.Controls
 
 		static DataGridContextMenus()
 		{
-			ContextMenu.Items = MenuItems;
+			ContextMenu.ItemsSource = MenuItems;
 			OwningColumnProperty = typeof(DataGridCell).GetProperty("OwningColumn", BindingFlags.Instance | BindingFlags.NonPublic);
 		}
 
@@ -66,6 +66,6 @@ namespace LibationAvalonia.Controls
 		public IGridEntry GridEntry { get; init; }
 		public ContextMenu ContextMenu { get; init; }
 		public AvaloniaList<Control> ContextMenuItems
-			=> ContextMenu.Items as AvaloniaList<Control>;
+			=> ContextMenu.ItemsSource as AvaloniaList<Control>;
 	}
 }

Source/LibationAvalonia/Controls/DataGridMyRatingColumn.cs

@@ -4,7 +4,6 @@ using Avalonia.Data;
 using Avalonia.Interactivity;
 using DataLayer;
 using ReactiveUI;
-using System;
 
 namespace LibationAvalonia.Controls
 {

Source/LibationAvalonia/Controls/DataGridTemplateColumnExt.cs

@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using System;
-using System.Linq;
 
 namespace LibationAvalonia.Controls
 {

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml

@@ -5,29 +5,30 @@
              xmlns:controls="clr-namespace:LibationAvalonia.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="LibationAvalonia.Controls.DirectoryOrCustomSelectControl">
-	<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
-	<controls:DirectorySelectControl
-		Grid.Column="1"
-		Grid.Row="0"
-		Name="directorySelectControl"
-		SubDirectory="{Binding $parent.SubDirectory}"
-		KnownDirectories="{Binding $parent.KnownDirectories}" />
+	
+	<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto" Name="grid">
+		<controls:DirectorySelectControl
+			Grid.Column="1"
+			Grid.Row="0"
+			IsEnabled="{Binding KnownChecked}"
+			SelectedDirectory="{Binding SelectedDirectory, Mode=TwoWay}"
+			SubDirectory="{Binding $parent[1].SubDirectory}"
+			KnownDirectories="{Binding $parent[1].KnownDirectories}" />
 
 		<RadioButton
 			Grid.Column="0"
 			Grid.Row="0"
-			Name="knownDirRadio"
-			IsChecked="{Binding KnownChecked, Mode=TwoWay}" />
+			IsChecked="{Binding KnownChecked, Mode=TwoWay}"/>
 
 		<RadioButton
 			Grid.Column="0"
 			Grid.Row="1"
-			Name="customDirRadio"
-			IsChecked="{Binding CustomChecked, Mode=TwoWay}" />
+			IsChecked="{Binding CustomChecked, Mode=TwoWay}"/>
 
-		<Grid Grid.Column="1" Grid.Row="1" ColumnDefinitions="*,Auto">
-			<TextBox IsEnabled="{Binding CustomChecked}" Name="customDirTbox" Grid.Column="0" IsReadOnly="True" Text="{Binding CustomDir, Mode=TwoWay}" />
-			<Button Name="customDirBrowseBtn" Grid.Column="1" Content="..." Margin="5,0,0,0" Padding="10,0,10,0" VerticalAlignment="Stretch" />
+		<Grid Grid.Column="1" Grid.Row="1" ColumnDefinitions="*,Auto"
+			  IsEnabled="{Binding CustomChecked}">
+			<TextBox Grid.Column="0" IsReadOnly="True" Text="{Binding CustomDir, Mode=TwoWay}" />
+			<Button Grid.Column="1" Content="..." Margin="5,0,0,0" Padding="10,0,10,0" Click="CustomDirBrowseBtn_Click" VerticalAlignment="Stretch" />
 		</Grid>
 	</Grid>
 </UserControl>

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -1,10 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Dinah.Core;
 using LibationFileManager;
-using System.Collections.Generic;
 using ReactiveUI;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace LibationAvalonia.Controls
@@ -37,55 +36,49 @@ namespace LibationAvalonia.Controls
 			get => GetValue(SubDirectoryProperty);
 			set => SetValue(SubDirectoryProperty, value);
 		}
-		CustomState customStates = new();
+
+		private readonly DirectoryState directoryState = new();
 
 		public DirectoryOrCustomSelectControl()
 		{
 			InitializeComponent();
 
-			customDirBrowseBtn = this.Find<Button>(nameof(customDirBrowseBtn));
-			directorySelectControl = this.Find<DirectorySelectControl>(nameof(directorySelectControl));
+			grid.DataContext = directoryState;
 
-			this.Find<TextBox>(nameof(customDirTbox)).DataContext = customStates;
-			this.Find<RadioButton>(nameof(knownDirRadio)).DataContext = customStates;
-			this.Find<RadioButton>(nameof(customDirRadio)).DataContext = customStates;
-
-			customStates.PropertyChanged += CheckStates_PropertyChanged;
-			customDirBrowseBtn.Click += CustomDirBrowseBtn_Click;
+			directoryState.PropertyChanged += DirectoryState_PropertyChanged;
 			PropertyChanged += DirectoryOrCustomSelectControl_PropertyChanged;
-			directorySelectControl.PropertyChanged += DirectorySelectControl_PropertyChanged;
 		}
 
-		private class CustomState: ViewModels.ViewModelBase
+		private void DirectoryState_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName is nameof(DirectoryState.SelectedDirectory) or nameof(DirectoryState.KnownChecked) &&
+				directoryState.KnownChecked &&
+				directoryState.SelectedDirectory is Configuration.KnownDirectories kdir &&
+				kdir is not Configuration.KnownDirectories.None)
+			{
+				Directory = kdir is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute : Configuration.GetKnownDirectoryPath(kdir);
+			}
+			else if (e.PropertyName is nameof(DirectoryState.CustomDir) or nameof(DirectoryState.CustomChecked) &&
+				directoryState.CustomChecked &&
+				directoryState.CustomDir is not null)
+			{
+				Directory = directoryState.CustomDir;
+			}
+		}
+
+		private class DirectoryState : ViewModels.ViewModelBase
 		{
 			private string _customDir;
+			private string _subDirectory;
 			private bool _knownChecked;
 			private bool _customChecked;
-			public string CustomDir { get=> _customDir; set => this.RaiseAndSetIfChanged(ref _customDir, value); }
-			public bool KnownChecked
-			{
-				get => _knownChecked;
-				set
-				{
-					this.RaiseAndSetIfChanged(ref _knownChecked, value);
-					if (value)
-						CustomChecked = false;
-					else if (!CustomChecked)
-						CustomChecked = true;
-				}
-			}
-			public bool CustomChecked
-			{
-				get => _customChecked;
-				set
-				{
-					this.RaiseAndSetIfChanged(ref _customChecked, value);
-					if (value)
-						KnownChecked = false;
-					else if (!KnownChecked)
-						KnownChecked = true;
-				}
-			}
+			private Configuration.KnownDirectories? _selectedDirectory;
+			public string CustomDir { get => _customDir; set => this.RaiseAndSetIfChanged(ref _customDir, value); }
+			public string SubDirectory { get => _subDirectory; set => this.RaiseAndSetIfChanged(ref _subDirectory, value); }
+			public bool KnownChecked { get => _knownChecked; set => this.RaiseAndSetIfChanged(ref _knownChecked, value); }
+			public bool CustomChecked { get => _customChecked; set => this.RaiseAndSetIfChanged(ref _customChecked, value); }
+
+			public Configuration.KnownDirectories? SelectedDirectory { get => _selectedDirectory; set => this.RaiseAndSetIfChanged(ref _selectedDirectory, value); }
 		}
 
 		private async void CustomDirBrowseBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -97,43 +90,12 @@ namespace LibationAvalonia.Controls
 
 			var selectedFolders = await (VisualRoot as Window).StorageProvider.OpenFolderPickerAsync(options);
 
-			customStates.CustomDir = selectedFolders.SingleOrDefault()?.Path?.LocalPath ?? customStates.CustomDir;
-		}
-
-		private void CheckStates_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-		{
-			if (e.PropertyName != nameof(CustomState.CustomDir))
-			{
-				directorySelectControl.IsEnabled = !customStates.CustomChecked;
-				customDirBrowseBtn.IsEnabled = customStates.CustomChecked;
-			}
-
-			setDirectory();
-		}
-
-
-		private void DirectorySelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
-		{
-			if (e.Property.Name == nameof(DirectorySelectControl.SelectedDirectory))
-			{
-				setDirectory();
-			}
-		}
-
-		private void setDirectory()
-		{
-			var selectedDir
-				= customStates.CustomChecked ? customStates.CustomDir
-					: directorySelectControl.SelectedDirectory is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute
-					: Configuration.GetKnownDirectoryPath(directorySelectControl.SelectedDirectory);
-			selectedDir ??= string.Empty;
-
-			Directory = customStates.CustomChecked ? selectedDir : System.IO.Path.Combine(selectedDir, SubDirectory ?? "");
+			directoryState.CustomDir = selectedFolders.SingleOrDefault()?.Path?.LocalPath ?? directoryState.CustomDir;
 		}
 
 		private void DirectoryOrCustomSelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
 		{
-			if (e.Property.Name == nameof(Directory) && e.OldValue is null)
+			if (e.Property == DirectoryProperty)
 			{
 				var directory = Directory?.Trim() ?? "";
 
@@ -141,23 +103,23 @@ namespace LibationAvalonia.Controls
 				var known = Configuration.GetKnownDirectory(noSubDir);
 
 				if (known == Configuration.KnownDirectories.None && noSubDir == Configuration.AppDir_Absolute)
-					known = Configuration.KnownDirectories.AppDir;				
+					known = Configuration.KnownDirectories.AppDir;
 
 				if (known is Configuration.KnownDirectories.None)
 				{
-					customStates.CustomChecked = true;
-					customStates.CustomDir = directory;
+					directoryState.CustomDir = noSubDir;
+					directoryState.CustomChecked = true;
 				}
 				else
 				{
-					customStates.KnownChecked = true;
-					directorySelectControl.SelectedDirectory = known;
+					directoryState.SelectedDirectory = known;
+					directoryState.KnownChecked = true;
 				}
 			}
-			else if (e.Property.Name == nameof(KnownDirectories))
-				directorySelectControl.KnownDirectories = KnownDirectories;
-			else if (e.Property.Name == nameof(SubDirectory))
-				directorySelectControl.SubDirectory = SubDirectory;
+			else if (e.Property == KnownDirectoriesProperty &&
+					KnownDirectories.Count > 0 &&
+					directoryState.SelectedDirectory is null or Configuration.KnownDirectories.None)
+				directoryState.SelectedDirectory = KnownDirectories[0];
 		}
 
 		private string RemoveSubDirectoryFromPath(string path)

Source/LibationAvalonia/Controls/DirectorySelectControl.axaml

@@ -8,6 +8,7 @@
 	
 	<UserControl.Resources>
 		<controls:KnownDirectoryConverter x:Key="KnownDirectoryConverter" />
+		<controls:KnownDirectoryPath x:Key="KnownDirectoryPath" />
 	</UserControl.Resources>
 
 
@@ -20,19 +21,26 @@
 		<controls:WheelComboBox
 					HorizontalContentAlignment = "Stretch"
 					HorizontalAlignment = "Stretch"
+					Name="combo"
 					MinHeight="{Binding #displayPathTbox.MinHeight}"
 					SelectedItem="{Binding $parent[1].SelectedDirectory, Mode=TwoWay}"
-					Items="{Binding $parent[1].KnownDirectories}">
+					ItemsSource="{Binding $parent[1].KnownDirectories}">
 			<ComboBox.ItemTemplate>
 				<DataTemplate>
-
-					<TextBlock
-						Text="{Binding, Converter={StaticResource KnownDirectoryConverter}}" />
-
+					<TextBlock Text="{Binding Converter={StaticResource KnownDirectoryConverter}}" />
 				</DataTemplate>
 			</ComboBox.ItemTemplate>
 		</controls:WheelComboBox>
-		<TextBox Margin="0,10,0,10" IsReadOnly="True" Name="displayPathTbox" />
+		<TextBox Margin="0,10,0,10" IsReadOnly="True">
+			<TextBox.Text>
+				<MultiBinding Converter="{StaticResource KnownDirectoryPath}">
+					<MultiBinding.Bindings>
+						<Binding Path="#combo.SelectedItem"/>
+						<Binding Path="$parent[1].SubDirectory"/>
+					</MultiBinding.Bindings>
+				</MultiBinding>
+			</TextBox.Text>
+		</TextBox>
 	</StackPanel>
 	
 </UserControl>

Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs

@@ -1,15 +1,13 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Dinah.Core;
 using LibationFileManager;
-using System.Collections.Generic;
-using Avalonia.Data.Converters;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
-using Avalonia.Data;
 using System.IO;
-using System.Reactive.Subjects;
 
 namespace LibationAvalonia.Controls
 {
@@ -27,6 +25,24 @@ namespace LibationAvalonia.Controls
 			return new BindingNotification(new InvalidCastException(), BindingErrorType.Error);
 		}
 	}
+	public class KnownDirectoryPath : IMultiValueConverter
+	{
+		public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (values?.Count == 2 && values[0] is Configuration.KnownDirectories kdir && kdir is not Configuration.KnownDirectories.None)
+			{
+				var subdir = values[1] as string ?? "";
+				var path = kdir is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute : Configuration.GetKnownDirectoryPath(kdir);
+				return Path.Combine(path, subdir);
+			}
+			return "";
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return new BindingNotification(new InvalidCastException(), BindingErrorType.Error);
+		}
+	}
 
 	public partial class DirectorySelectControl : UserControl
 	{
@@ -40,8 +56,8 @@ namespace LibationAvalonia.Controls
 				Configuration.KnownDirectories.LibationFiles
 			};
 
-		public static readonly StyledProperty<Configuration.KnownDirectories> SelectedDirectoryProperty =
-		AvaloniaProperty.Register<DirectorySelectControl, Configuration.KnownDirectories>(nameof(SelectedDirectory));
+		public static readonly StyledProperty<Configuration.KnownDirectories?> SelectedDirectoryProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, Configuration.KnownDirectories?>(nameof(SelectedDirectory));
 
 		public static readonly StyledProperty<List<Configuration.KnownDirectories>> KnownDirectoriesProperty =
 		AvaloniaProperty.Register<DirectorySelectControl, List<Configuration.KnownDirectories>>(nameof(KnownDirectories), DefaultKnownDirectories);
@@ -52,25 +68,6 @@ namespace LibationAvalonia.Controls
 		public DirectorySelectControl()
 		{
 			InitializeComponent();
-
-			displayPathTbox = this.Get<TextBox>(nameof(displayPathTbox));
-			displayPathTbox.Bind(TextBox.TextProperty, TextboxPath);
-			PropertyChanged += DirectorySelectControl_PropertyChanged;
-		}
-
-		private Subject<string> TextboxPath = new Subject<string>();
-
-		private void DirectorySelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
-		{
-			if (e.Property.Name == nameof(SelectedDirectory))
-			{
-				TextboxPath.OnNext(
-					Path.Combine(
-						SelectedDirectory is Configuration.KnownDirectories.None ? string.Empty
-						: SelectedDirectory is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute
-						: Configuration.GetKnownDirectoryPath(SelectedDirectory)
-						, SubDirectory ?? string.Empty));
-			}
 		}
 
 		public List<Configuration.KnownDirectories> KnownDirectories
@@ -79,7 +76,7 @@ namespace LibationAvalonia.Controls
 			set => SetValue(KnownDirectoriesProperty, value);
 		}
 
-		public Configuration.KnownDirectories SelectedDirectory
+		public Configuration.KnownDirectories? SelectedDirectory
 		{
 			get => GetValue(SelectedDirectoryProperty);
 			set => SetValue(SelectedDirectoryProperty, value);

Source/LibationAvalonia/Controls/GroupBox.axaml

@@ -3,49 +3,53 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="200"
              x:Class="LibationAvalonia.Controls.GroupBox">
 
-	<Design.DataContext>
-	</Design.DataContext>
-
 	<ContentControl.Styles>
-		<Style Selector="controls|GroupBox Border">
-			<Setter Property="BorderBrush" Value="DarkGray" />
-		</Style>
 		<Style Selector="controls|GroupBox">
+			<Setter Property="BorderBrush" Value="{DynamicResource SystemBaseMediumLowColor}" /> 
+			<Setter Property="BorderThickness" Value="1" />
+			<Setter Property="CornerRadius" Value="3" />
 			<Setter Property="Template">
 				<ControlTemplate>
-					<Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="7,10,*,Auto">
-
+					<Grid ColumnDefinitions="Auto,Auto,*,Auto" RowDefinitions="Auto,*,Auto">
+						<Panel
+							Name="PART_LabelOffsetter"							
+							Grid.Column="1"
+							Margin="8,9,0,0"  /> 
 						<Grid
 							ZIndex="1"
 							Grid.Row="0"
 							Grid.RowSpan="2"
-							Grid.Column="1" Margin="8,0,0,0"
+							Grid.Column="2"
 							ColumnDefinitions="Auto,*"
 							VerticalAlignment="Top">
 							<TextBlock
-								Padding="4,0,4,0"
+								Name="PART_Label"
+								Padding="4,0"
 								Background="{DynamicResource SystemAltHighColor}"
 								Text="{TemplateBinding Label}"
 								/>
 						</Grid>
 
 						<ContentPresenter
-							Margin="8,0,8,5"
-							Grid.Row="2"
+							Name="PART_ContentPresenter"
+							Margin="8,10,8,5"
+							Grid.Row="1"
 							Grid.Column="1"
+							Grid.ColumnSpan="2"
 							Content="{TemplateBinding Content}"/>
 
 						<Border
-							BorderBrush="DarkGray"
-							BorderThickness="{TemplateBinding BorderWidth}"
-							CornerRadius="3"
+							Name="PART_Border"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							CornerRadius="{TemplateBinding CornerRadius}"
 							Grid.Column="0"
-							Grid.ColumnSpan="3"
+							Grid.ColumnSpan="4"
 							Grid.Row="1"
-							Grid.RowSpan="3"/>
+							Grid.RowSpan="2"/>
 					
 					</Grid>
 				</ControlTemplate>

Source/LibationAvalonia/Controls/GroupBox.axaml.cs

@@ -1,28 +1,19 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
 
 namespace LibationAvalonia.Controls
 {
 	public partial class GroupBox : ContentControl
 	{
 
-		public static readonly StyledProperty<Thickness> BorderWidthProperty =
-		AvaloniaProperty.Register<GroupBox, Thickness>(nameof(BorderWidth));
-
 		public static readonly StyledProperty<string> LabelProperty =
 		AvaloniaProperty.Register<GroupBox, string>(nameof(Label));
 		public GroupBox()
 		{
 			InitializeComponent();
-			BorderWidth = new Thickness(3);
 			Label = "This is a groupbox label";
 		}
-		public Thickness BorderWidth
-		{
-			get { return GetValue(BorderWidthProperty); }
-			set { SetValue(BorderWidthProperty, value); }
-		}
 
 		public string Label
 		{

Source/LibationAvalonia/Controls/LinkLabel.axaml

@@ -3,10 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             xmlns:controls="using:LibationAvalonia.Controls"
              x:Class="LibationAvalonia.Controls.LinkLabel">
 	<TextBlock.Styles>
-		<Style Selector="TextBlock">
-			<Setter Property="Foreground" Value="{DynamicResource HyperlinkNew}"/>
+		<Style Selector="controls|LinkLabel">
 			<Setter Property="TextDecorations" Value="Underline"/>
 		</Style>
 	</TextBlock.Styles>

Source/LibationAvalonia/Controls/LinkLabel.axaml.cs

@@ -1,17 +1,57 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.Input;
-using Avalonia.Markup.Xaml;
+using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Styling;
 using System;
+using System.Windows.Input;
 
 namespace LibationAvalonia.Controls
 {
-	public partial class LinkLabel : TextBlock, IStyleable
+	public partial class LinkLabel : TextBlock, IStyleable, ICommandSource
 	{
-		Type IStyleable.StyleKey => typeof(TextBlock);
+		Type IStyleable.StyleKey => typeof(LinkLabel);
+
+		public static readonly StyledProperty<ICommand> CommandProperty =
+			AvaloniaProperty.Register<LinkLabel, ICommand>(nameof(Command), enableDataValidation: true);
+
+		public static readonly StyledProperty<object> CommandParameterProperty =
+		   AvaloniaProperty.Register<LinkLabel, object>(nameof(CommandParameter));
+
+		public static readonly StyledProperty<IBrush> ForegroundVisitedProperty =
+		   AvaloniaProperty.Register<LinkLabel, IBrush>(nameof(ForegroundVisited));
+
+		public static readonly RoutedEvent<RoutedEventArgs> ClickEvent =
+			RoutedEvent.Register<Button, RoutedEventArgs>(nameof(Click), RoutingStrategies.Bubble);
+
+		public ICommand Command
+		{
+			get => GetValue(CommandProperty);
+			set => SetValue(CommandProperty, value);
+		}
+
+		public object CommandParameter
+		{
+			get => GetValue(CommandParameterProperty);
+			set => SetValue(CommandParameterProperty, value);
+		}
+
+		public IBrush ForegroundVisited
+		{
+			get => GetValue(ForegroundVisitedProperty);
+			set => SetValue(ForegroundVisitedProperty, value);
+		}
+
+		public event EventHandler<RoutedEventArgs> Click
+		{
+			add => AddHandler(ClickEvent, value);
+			remove => RemoveHandler(ClickEvent, value);
+		}
+
 		private static readonly Cursor HandCursor = new Cursor(StandardCursorType.Hand);
+		private bool _commandCanExecute = true;
 		public LinkLabel()
 		{
 			InitializeComponent();
@@ -20,7 +60,19 @@ namespace LibationAvalonia.Controls
 
 		private void LinkLabel_Tapped(object sender, TappedEventArgs e)
 		{
-			Foreground = App.HyperlinkVisited;
+			Foreground = ForegroundVisited;
+			if (IsEffectivelyEnabled)
+			{
+
+				var args = new RoutedEventArgs(ClickEvent);
+				RaiseEvent(args);
+
+				if (!args.Handled && Command?.CanExecute(CommandParameter) == true)
+				{
+					Command.Execute(CommandParameter);
+					args.Handled = true;
+				}
+			}
 		}
 
 		protected override void OnPointerEntered(PointerEventArgs e)
@@ -33,5 +85,33 @@ namespace LibationAvalonia.Controls
 			this.Cursor = Cursor.Default;
 			base.OnPointerExited(e);
 		}
+		protected override bool IsEnabledCore => base.IsEnabledCore && _commandCanExecute;
+
+		protected override void UpdateDataValidation(AvaloniaProperty property, BindingValueType state, Exception error)
+		{
+			base.UpdateDataValidation(property, state, error);
+			if (property == CommandProperty)
+			{
+				if (state == BindingValueType.BindingError)
+				{
+					if (_commandCanExecute)
+					{
+						_commandCanExecute = false;
+						UpdateIsEffectivelyEnabled();
+					}
+				}
+			}
+		}
+
+		public void CanExecuteChanged(object sender, EventArgs e)
+		{
+			var canExecute = Command == null || Command.CanExecute(CommandParameter);
+
+			if (canExecute != _commandCanExecute)
+			{
+				_commandCanExecute = canExecute;
+				UpdateIsEffectivelyEnabled();
+			}
+		}
 	}
 }

Source/LibationAvalonia/Controls/MyRatingCellEditor.axaml.cs

@@ -18,7 +18,7 @@ namespace LibationAvalonia.Controls
 
 		public bool IsEditingMode { get; set; }
 		public Rating Rating { get => GetValue(RatingProperty); set => SetValue(RatingProperty, value); }
-		
+
 		public MyRatingCellEditor()
 		{
 			InitializeComponent();

Source/LibationAvalonia/Controls/NativeWebView.cs

@@ -0,0 +1,176 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Platform;
+using Avalonia;
+using LibationFileManager;
+using System;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Controls;
+
+#nullable enable
+public class NativeWebView : NativeControlHost, IWebView
+{
+	private IWebViewAdapter? _webViewAdapter;
+	private Uri? _delayedSource;
+	private TaskCompletionSource _webViewReadyCompletion = new();
+
+	public event EventHandler<WebViewNavigationEventArgs>? NavigationCompleted;
+
+	public event EventHandler<WebViewNavigationEventArgs>? NavigationStarted;
+	public event EventHandler? DOMContentLoaded;
+
+	public bool CanGoBack => _webViewAdapter?.CanGoBack ?? false;
+
+	public bool CanGoForward => _webViewAdapter?.CanGoForward ?? false;
+
+	public Uri? Source
+	{
+		get => _webViewAdapter?.Source ?? throw new InvalidOperationException("Control was not initialized");
+		set
+		{
+			if (_webViewAdapter is null)
+			{
+				_delayedSource = value;
+				return;
+			}
+			_webViewAdapter.Source = value;
+		}
+	}
+
+
+	public bool GoBack()
+	{
+		return _webViewAdapter?.GoBack() ?? throw new InvalidOperationException("Control was not initialized");
+	}
+
+	public bool GoForward()
+	{
+		return _webViewAdapter?.GoForward() ?? throw new InvalidOperationException("Control was not initialized");
+	}
+
+	public Task<string?> InvokeScriptAsync(string scriptName)
+	{
+		return _webViewAdapter is null
+			? throw new InvalidOperationException("Control was not initialized")
+			: _webViewAdapter.InvokeScriptAsync(scriptName);
+	}
+
+	public void Navigate(Uri url)
+	{
+		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
+			.Navigate(url);
+	}
+
+	public Task NavigateToString(string text)
+	{
+		return (_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
+			.NavigateToString(text);
+	}
+
+	public void Refresh()
+	{
+		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
+			.Refresh();
+	}
+
+	public void Stop()
+	{
+		(_webViewAdapter ?? throw new InvalidOperationException("Control was not initialized"))
+			.Stop();
+	}
+
+	public Task WaitForNativeHost()
+	{
+		return _webViewReadyCompletion.Task;
+	}
+
+	private class PlatformHandle : IPlatformHandle
+	{
+		public nint Handle { get; init; }
+
+		public string? HandleDescriptor { get; init; }
+	}
+
+	protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
+	{
+		_webViewAdapter = InteropFactory.Create().CreateWebViewAdapter();
+
+		if (_webViewAdapter is null)
+			return base.CreateNativeControlCore(parent);
+		else
+		{
+			SubscribeOnEvents();
+			var handle = new PlatformHandle
+			{
+				Handle = _webViewAdapter.PlatformHandle.Handle,
+				HandleDescriptor = _webViewAdapter.PlatformHandle.HandleDescriptor
+			};
+
+			if (_delayedSource is not null)
+			{
+				_webViewAdapter.Source = _delayedSource;
+			}
+
+			_webViewReadyCompletion.TrySetResult();
+
+			return handle;
+		}
+	}
+
+	private void SubscribeOnEvents()
+	{
+		if (_webViewAdapter is not null)
+		{
+			_webViewAdapter.NavigationStarted += WebViewAdapterOnNavigationStarted;
+			_webViewAdapter.NavigationCompleted += WebViewAdapterOnNavigationCompleted;
+			_webViewAdapter.DOMContentLoaded += _webViewAdapter_DOMContentLoaded;
+		}
+	}
+
+	private void _webViewAdapter_DOMContentLoaded(object? sender, EventArgs e)
+	{
+		DOMContentLoaded?.Invoke(this, e);
+	}
+
+	private void WebViewAdapterOnNavigationStarted(object? sender, WebViewNavigationEventArgs e)
+	{
+		NavigationStarted?.Invoke(this, e);
+	}
+
+	private void WebViewAdapterOnNavigationCompleted(object? sender, WebViewNavigationEventArgs e)
+	{
+		NavigationCompleted?.Invoke(this, e);
+	}
+
+	protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+	{
+		base.OnPropertyChanged(change);
+		if (change.Property == BoundsProperty && change.NewValue is Rect rect)
+		{
+			var scaling = (float)(VisualRoot?.RenderScaling ?? 1.0f);
+			_webViewAdapter?.HandleResize((int)(rect.Width * scaling), (int)(rect.Height * scaling), scaling);
+		}
+	}
+
+	protected override void OnKeyDown(KeyEventArgs e)
+	{
+		if (_webViewAdapter != null)
+		{
+			e.Handled = _webViewAdapter.HandleKeyDown((uint)e.Key, (uint)e.KeyModifiers);
+		}
+
+		base.OnKeyDown(e);
+	}
+
+	protected override void DestroyNativeControlCore(IPlatformHandle control)
+	{
+		if (_webViewAdapter is not null)
+		{
+			_webViewReadyCompletion = new TaskCompletionSource();
+			_webViewAdapter.NavigationStarted -= WebViewAdapterOnNavigationStarted;
+			_webViewAdapter.NavigationCompleted -= WebViewAdapterOnNavigationCompleted;
+			(_webViewAdapter as IDisposable)?.Dispose();
+		}
+	}
+}

Source/LibationAvalonia/Controls/Settings/Audio.axaml

@@ -0,0 +1,329 @@
+<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"
+             mc:Ignorable="d" d:DesignWidth="750" d:DesignHeight="600"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+			 xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Settings"
+			 x:DataType="vm:AudioSettingsVM"
+             x:Class="LibationAvalonia.Controls.Settings.Audio">
+
+	<Grid
+		Margin="5"
+		RowDefinitions="Auto,*,Auto"
+		ColumnDefinitions="*,*">
+
+		<Grid.Styles>
+			<Style Selector="CheckBox">
+				<Setter Property="Margin" Value="0,0,0,5" />
+				<Style Selector="^ > TextBlock">
+					<Setter Property="TextWrapping" Value="Wrap" />
+				</Style>
+			</Style>
+			<Style Selector="RadioButton">
+				<Setter Property="Margin" Value="0,0,0,5" />
+				<Style Selector="^ TextBlock">
+					<Setter Property="TextWrapping" Value="Wrap" />
+				</Style>
+			</Style>
+		</Grid.Styles>
+
+		<StackPanel
+			Grid.Row="0"
+			Grid.Column="0">
+
+			<CheckBox IsChecked="{CompiledBinding CreateCueSheet, Mode=TwoWay}">
+				<TextBlock Text="{CompiledBinding CreateCueSheetText}" />
+			</CheckBox>
+
+			<CheckBox IsChecked="{CompiledBinding DownloadCoverArt, Mode=TwoWay}">
+				<TextBlock Text="{CompiledBinding DownloadCoverArtText}" />
+			</CheckBox>
+
+			<Grid ColumnDefinitions="*,Auto">
+				<CheckBox IsChecked="{CompiledBinding DownloadClipsBookmarks, Mode=TwoWay}">
+					<TextBlock Text="Download Clips, Notes and Bookmarks as" />
+				</CheckBox>
+
+				<controls:WheelComboBox
+					Margin="5,0,0,0"
+					Grid.Column="1"
+					IsEnabled="{CompiledBinding DownloadClipsBookmarks}"
+					ItemsSource="{CompiledBinding ClipBookmarkFormats}"
+					SelectedItem="{CompiledBinding ClipBookmarkFormat}"/>
+			</Grid>
+
+			<CheckBox IsChecked="{CompiledBinding RetainAaxFile, Mode=TwoWay}">
+				<TextBlock Text="{CompiledBinding RetainAaxFileText}" />
+			</CheckBox>
+
+			<CheckBox IsChecked="{CompiledBinding MergeOpeningAndEndCredits, Mode=TwoWay}">
+				<TextBlock Text="{CompiledBinding MergeOpeningEndCreditsText}" />
+			</CheckBox>
+
+			<CheckBox IsChecked="{CompiledBinding AllowLibationFixup, Mode=TwoWay}">
+				<TextBlock Text="{CompiledBinding AllowLibationFixupText}" />
+			</CheckBox>
+		</StackPanel>
+
+		<controls:GroupBox
+			Grid.Row="1"
+			Label="Audiobook Fix-ups"
+			IsEnabled="{CompiledBinding AllowLibationFixup}">
+
+			<StackPanel Orientation="Vertical">
+
+				<CheckBox IsChecked="{CompiledBinding SplitFilesByChapter, Mode=TwoWay}">
+					<TextBlock Text="{CompiledBinding SplitFilesByChapterText}" />
+				</CheckBox>
+
+				<CheckBox IsChecked="{CompiledBinding StripAudibleBrandAudio, Mode=TwoWay}">
+					<TextBlock Text="{CompiledBinding StripAudibleBrandingText}" />
+				</CheckBox>
+
+				<CheckBox IsChecked="{CompiledBinding StripUnabridged, Mode=TwoWay}">
+					<TextBlock Text="{CompiledBinding StripUnabridgedText}" />
+				</CheckBox>
+
+				<RadioButton IsChecked="{CompiledBinding !DecryptToLossy, Mode=TwoWay}">
+
+					<StackPanel VerticalAlignment="Center">
+
+						<TextBlock
+							Text="Download my books in the original audio format (Lossless)" />
+						<CheckBox
+							IsEnabled="{CompiledBinding !DecryptToLossy}"
+							IsChecked="{CompiledBinding MoveMoovToBeginning, Mode=TwoWay}">
+
+							<TextBlock Text="{CompiledBinding MoveMoovToBeginningText}" />
+
+						</CheckBox>
+
+					</StackPanel>
+				</RadioButton>
+
+				<RadioButton IsChecked="{CompiledBinding DecryptToLossy, Mode=TwoWay}">
+
+					<TextBlock
+						TextWrapping="Wrap"
+						Text="Download my books as .MP3 files (transcode if necessary)" />
+
+				</RadioButton>
+			</StackPanel>
+		</controls:GroupBox>
+
+		<controls:GroupBox
+			Grid.Column="1"
+			Grid.RowSpan="2"
+			Margin="10,0,0,0"
+			Label="Mp3 Encoding Options">
+
+			<Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
+				
+				<Grid
+					Margin="0,5"
+					ColumnDefinitions="Auto,*">
+
+					<controls:GroupBox
+						Grid.Column="0"
+						Label="Target">
+
+						<Grid ColumnDefinitions="Auto,Auto">
+							<RadioButton
+								Margin="5"
+								Content="Bitrate"
+								IsChecked="{CompiledBinding LameTargetBitrate, Mode=TwoWay}"/>
+
+							<RadioButton
+								Grid.Column="1"
+								Margin="5"
+								Content="Quality"
+								IsChecked="{CompiledBinding !LameTargetBitrate, Mode=TwoWay}"/>
+						</Grid>
+					</controls:GroupBox>
+
+					<CheckBox
+						HorizontalAlignment="Right"
+						Grid.Column="1"
+						IsChecked="{CompiledBinding LameDownsampleMono, Mode=TwoWay}">
+
+						<TextBlock
+							TextWrapping="Wrap"
+							Text="Downsample to mono? (Recommended)" />
+
+					</CheckBox>
+				</Grid>
+				
+				<Grid Grid.Row="1" Margin="0,5" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto">
+
+					<TextBlock Margin="0,0,0,5" Text="Max audio sample rate:" />
+					<controls:WheelComboBox
+						Grid.Row="1"
+						HorizontalAlignment="Stretch"
+						ItemsSource="{CompiledBinding SampleRates}"
+						SelectedItem="{CompiledBinding SelectedSampleRate, Mode=TwoWay}"/>
+
+					<TextBlock Margin="0,0,0,5" Grid.Column="2" Text="Encoder Quality:" />
+
+					<controls:WheelComboBox
+						Grid.Column="2"
+						Grid.Row="1"
+						HorizontalAlignment="Stretch"
+						ItemsSource="{CompiledBinding EncoderQualities}"
+						SelectedItem="{CompiledBinding SelectedEncoderQuality, Mode=TwoWay}"/>
+				</Grid>
+
+				<controls:GroupBox
+					Grid.Row="2"
+					Margin="0,5"
+					Label="Bitrate"
+					IsEnabled="{CompiledBinding LameTargetBitrate}" >
+
+					<StackPanel>
+						<Grid ColumnDefinitions="*,25,Auto">
+
+							<Slider
+								Grid.Column="0"
+								IsEnabled="{CompiledBinding !LameMatchSource}"
+								Value="{CompiledBinding LameBitrate, Mode=TwoWay}"
+								Minimum="16"
+								Maximum="320"
+								IsSnapToTickEnabled="True" TickFrequency="16"
+								Ticks="16,32,48,64,80,96,112,128,144,160,176,192,208,224,240,256,272,288,304,320"
+								TickPlacement="Outside">
+
+								<Slider.Styles>
+									<Style Selector="Slider /template/ Thumb">
+										<Setter Property="ToolTip.Tip" Value="{CompiledBinding $parent[Slider].Value, Mode=OneWay, StringFormat='\{0:f0\} Kbps'}" />
+										<Setter Property="ToolTip.Placement" Value="Top" />
+										<Setter Property="ToolTip.VerticalOffset" Value="-10" />
+										<Setter Property="ToolTip.HorizontalOffset" Value="-30" />
+									</Style>
+								</Slider.Styles>
+							</Slider>
+
+							<TextBlock
+								Grid.Column="1"
+								HorizontalAlignment="Right"
+								Text="{CompiledBinding LameBitrate}" />
+
+							<TextBlock
+								Grid.Column="2"
+								Text=" Kbps" />
+
+						</Grid>
+
+						<Grid ColumnDefinitions="*,*">
+
+							<CheckBox
+								Grid.Column="0"
+								IsChecked="{CompiledBinding LameConstantBitrate, Mode=TwoWay}">
+
+								<TextBlock
+									TextWrapping="Wrap"
+									Text="Restrict Encoder to Constant Bitrate?" />
+
+							</CheckBox>
+
+							<CheckBox
+								Grid.Column="1"
+								HorizontalAlignment="Right"
+								IsChecked="{CompiledBinding LameMatchSource, Mode=TwoWay}">
+
+								<TextBlock
+									TextWrapping="Wrap"
+									Text="Match Source Bitrate?" />
+
+							</CheckBox>
+						</Grid>
+					</StackPanel>
+				</controls:GroupBox>
+				
+				<controls:GroupBox
+					Grid.Row="3"
+					Margin="0,5"
+					Label="Quality"
+					IsEnabled="{CompiledBinding !LameTargetBitrate}">
+
+					<Grid
+						ColumnDefinitions="*,Auto,25"
+						RowDefinitions="*,Auto">
+
+						<Slider
+							Grid.Column="0"
+							Grid.ColumnSpan="2"
+							Value="{CompiledBinding LameVBRQuality, Mode=TwoWay}"
+							Minimum="0"
+							Maximum="9"
+							IsSnapToTickEnabled="True" TickFrequency="1"
+							Ticks="0,1,2,3,4,5,6,7,8,9"
+							TickPlacement="Outside">
+							<Slider.Styles>
+								<Style Selector="Slider /template/ Thumb">
+									<Setter Property="ToolTip.Tip" Value="{CompiledBinding $parent[Slider].Value, Mode=OneWay, StringFormat='V\{0:f0\}'}" />
+									<Setter Property="ToolTip.Placement" Value="Top" />
+									<Setter Property="ToolTip.VerticalOffset" Value="-10" />
+									<Setter Property="ToolTip.HorizontalOffset" Value="-30" />
+								</Style>
+							</Slider.Styles>
+						</Slider>
+
+						<StackPanel
+							Grid.Column="2"
+							HorizontalAlignment="Right"
+							Orientation="Horizontal">
+
+							<TextBlock Text="V" />
+							<TextBlock Text="{CompiledBinding LameVBRQuality}" />
+
+						</StackPanel>
+
+						<TextBlock
+							Grid.Column="0"
+							Grid.Row="1"
+							Text="Higher" />
+
+						<TextBlock
+							Grid.Column="1"
+							Grid.Row="1"
+							HorizontalAlignment="Right"
+							Text="Lower" />
+
+					</Grid>
+				</controls:GroupBox>
+
+				<TextBlock
+					Grid.Row="4"
+					Margin="0,5"
+					VerticalAlignment="Bottom"
+					Text="Using L.A.M.E encoding engine"
+					FontStyle="Oblique" />
+			</Grid>			
+		</controls:GroupBox>
+
+		<controls:GroupBox
+			Grid.Row="2"
+			Grid.ColumnSpan="2"
+			Margin="0,10,0,0"
+			IsEnabled="{CompiledBinding SplitFilesByChapter}"
+			Label="{CompiledBinding ChapterTitleTemplateText}">
+
+			<Grid ColumnDefinitions="*,Auto" Margin="0,8" >
+
+				<TextBox
+					Grid.Column="0"
+					FontSize="14"
+					IsReadOnly="True"
+					Text="{CompiledBinding ChapterTitleTemplate}" />
+
+				<Button
+					Grid.Column="1"
+					Content="Edit"
+					Padding="30,0"
+					Margin="10,0,0,0"
+					VerticalAlignment="Stretch"
+					Click="EditChapterTitleTemplateButton_Click" />
+			</Grid>
+		</controls:GroupBox>
+	</Grid>
+</UserControl>

Source/LibationAvalonia/Controls/Settings/Audio.axaml.cs

@@ -0,0 +1,38 @@
+using Avalonia.Controls;
+using LibationAvalonia.Dialogs;
+using LibationAvalonia.ViewModels.Settings;
+using LibationFileManager;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Controls.Settings
+{
+	public partial class Audio : UserControl
+	{
+		private AudioSettingsVM _viewModel => DataContext as AudioSettingsVM; 
+		public Audio()
+		{
+			InitializeComponent();
+			if (Design.IsDesignMode)
+			{
+				_ = Configuration.Instance.LibationFiles;
+				DataContext = new AudioSettingsVM(Configuration.Instance);
+			}
+		}
+
+		public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (_viewModel is null) return;
+			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(_viewModel.ChapterTitleTemplate));
+			if (newTemplate is not null)
+				_viewModel.ChapterTitleTemplate = newTemplate;
+		}
+
+		private async Task<string> editTemplate(ITemplateEditor template)
+		{
+			var form = new EditTemplateDialog(template);
+			if (await form.ShowDialog<DialogResult>(this.GetParentWindow()) == DialogResult.OK)
+				return template.EditingTemplate.TemplateText;
+			else return null;
+		}
+	}
+}

Source/LibationAvalonia/Controls/Settings/DownloadDecrypt.axaml

@@ -0,0 +1,182 @@
+<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"
+             mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="700"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+			 xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Settings"
+			 x:DataType="vm:DownloadDecryptSettingsVM"
+             x:Class="LibationAvalonia.Controls.Settings.DownloadDecrypt">
+	
+	<Grid RowDefinitions="Auto,Auto,Auto,*">
+		<controls:GroupBox
+			Grid.Row="0"
+			Margin="5"
+			Label="{CompiledBinding BadBookGroupboxText}">
+
+			<Grid
+				ColumnDefinitions="*,*"
+				RowDefinitions="Auto,Auto">
+				<Grid.Styles>
+					<Style Selector="RadioButton">
+						<Setter Property="Margin" Value="0,5,0,5" />
+						<Style Selector="^ > TextBlock">
+							<Setter Property="TextWrapping" Value="Wrap" />
+						</Style>
+					</Style>
+				</Grid.Styles>
+
+				<RadioButton
+					Grid.Column="0"
+					Grid.Row="0"
+					IsChecked="{CompiledBinding BadBookAsk, Mode=TwoWay}">
+
+					<TextBlock Text="{CompiledBinding BadBookAskText}" />
+
+				</RadioButton>
+
+				<RadioButton
+					Grid.Column="1"
+					Grid.Row="0"
+					IsChecked="{CompiledBinding BadBookAbort, Mode=TwoWay}">
+
+					<TextBlock Text="{CompiledBinding BadBookAbortText}" />
+
+				</RadioButton>
+
+				<RadioButton
+					Grid.Column="0"
+					Grid.Row="1"
+					IsChecked="{CompiledBinding BadBookRetry, Mode=TwoWay}">
+
+					<TextBlock Text="{CompiledBinding BadBookRetryText}" />
+
+				</RadioButton>
+
+				<RadioButton
+					Grid.Column="1"
+					Grid.Row="1"
+					IsChecked="{CompiledBinding BadBookIgnore, Mode=TwoWay}">
+
+					<TextBlock Text="{CompiledBinding BadBookIgnoreText}" />
+
+				</RadioButton>
+			</Grid>
+		</controls:GroupBox>
+
+		<controls:GroupBox
+			Margin="5"
+			Grid.Row="1"
+			Label="Custom File Naming">
+
+			<Grid
+				RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
+				ColumnDefinitions="*,Auto">
+
+				<Grid.Styles>
+					<Style Selector="TextBox">
+						<Setter Property="Margin" Value="0,5,10,10" />
+						<Setter Property="FontSize" Value="14" />
+						<Setter Property="IsReadOnly" Value="True" />
+					</Style>
+					<Style Selector="Button">
+						<Setter Property="VerticalAlignment" Value="Stretch" />
+						<Setter Property="Margin" Value="0,5,0,10" />
+						<Setter Property="Padding" Value="30,0" />
+					</Style>
+				</Grid.Styles>
+
+				<TextBlock
+					Grid.Row="0"
+					Grid.Column="0"
+					Margin="0,5,0,0"
+					Text="{CompiledBinding FolderTemplateText}" />
+
+				<TextBox
+					Grid.Row="1"
+					Grid.Column="0"
+					Text="{CompiledBinding FolderTemplate}" />
+
+				<Button
+					Grid.Row="1"
+					Grid.Column="1"
+					Content="Edit"
+					Click="EditFolderTemplateButton_Click" />
+
+				<TextBlock
+					Grid.Row="2"
+					Grid.Column="0"
+					Text="{CompiledBinding FileTemplateText}" />
+
+				<TextBox
+					Grid.Row="3"
+					Grid.Column="0"
+					Text="{CompiledBinding FileTemplate}" />
+
+				<Button
+					Grid.Row="3"
+					Grid.Column="1"
+					Content="Edit"
+					Click="EditFileTemplateButton_Click" />
+
+				<TextBlock
+					Grid.Row="4"
+					Grid.Column="0"
+					Text="{CompiledBinding ChapterFileTemplateText}" />
+
+				<TextBox
+					Grid.Row="5"
+					Grid.Column="0"
+					Text="{CompiledBinding ChapterFileTemplate}" />
+
+				<Button
+					Grid.Row="5"
+					Grid.Column="1"
+					Content="Edit"
+					Click="EditChapterFileTemplateButton_Click" />
+
+				<Button
+					Grid.Row="6"
+					Grid.Column="0"
+					Height="30"
+					Margin="0"
+					Content="{CompiledBinding EditCharReplacementText}"
+					Click="EditCharReplacementButton_Click" />
+
+			</Grid>
+		</controls:GroupBox>
+		<controls:GroupBox
+			Grid.Row="2"
+			Margin="5"
+			Label="Temporary Files Location">
+
+			<StackPanel
+				Margin="0,5" >
+
+				<TextBlock
+					Margin="0,0,0,10"
+					TextWrapping="Wrap"
+					Text="{CompiledBinding InProgressDescriptionText}" />
+
+				<controls:DirectoryOrCustomSelectControl
+					Directory="{CompiledBinding InProgressDirectory, Mode=TwoWay}"
+					KnownDirectories="{CompiledBinding KnownDirectories}" />
+
+			</StackPanel>
+		</controls:GroupBox>
+
+		<CheckBox
+			Grid.Row="3"
+			Margin="5"
+			VerticalAlignment="Top"
+			IsVisible="{CompiledBinding !Config.IsLinux}"
+			IsChecked="{CompiledBinding UseCoverAsFolderIcon, Mode=TwoWay}">
+
+			<TextBlock
+				TextWrapping="Wrap"
+				Text="{CompiledBinding UseCoverAsFolderIconText}" />
+
+		</CheckBox>
+
+	</Grid>
+</UserControl>

Source/LibationAvalonia/Controls/Settings/DownloadDecrypt.axaml.cs

@@ -0,0 +1,62 @@
+using Avalonia.Controls;
+using LibationAvalonia.Dialogs;
+using LibationAvalonia.ViewModels.Settings;
+using LibationFileManager;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Controls.Settings
+{
+	public partial class DownloadDecrypt : UserControl
+	{
+		private DownloadDecryptSettingsVM _viewModel => DataContext as DownloadDecryptSettingsVM;
+		public DownloadDecrypt()
+		{
+			InitializeComponent();
+			if (Design.IsDesignMode)
+			{
+				_ = Configuration.Instance.LibationFiles;
+				DataContext = new DownloadDecryptSettingsVM(Configuration.Instance);
+			}
+		}
+
+		public async void EditFolderTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (_viewModel is null) return;
+			var newTemplate = await editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(_viewModel.Config.Books, _viewModel.FolderTemplate));
+			if (newTemplate is not null)
+				_viewModel.FolderTemplate = newTemplate;
+		}
+
+		public async void EditFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (_viewModel is null) return;
+			var newTemplate = await editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(_viewModel.Config.Books, _viewModel.FileTemplate));
+			if (newTemplate is not null)
+				_viewModel.FileTemplate = newTemplate;
+		}
+
+		public async void EditChapterFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (_viewModel is null) return;
+			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(_viewModel.Config.Books, _viewModel.ChapterFileTemplate));
+			if (newTemplate is not null)
+				_viewModel.ChapterFileTemplate = newTemplate;
+		}
+
+		public async void EditCharReplacementButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (_viewModel is null) return;
+			var form = new EditReplacementChars(_viewModel.Config);
+			await form.ShowDialog<DialogResult>(this.GetParentWindow());
+		}
+
+
+		private async Task<string> editTemplate(ITemplateEditor template)
+		{
+			var form = new EditTemplateDialog(template);
+			if (await form.ShowDialog<DialogResult>(this.GetParentWindow()) == DialogResult.OK)
+				return template.EditingTemplate.TemplateText;
+			else return null;
+		}
+	}
+}

Source/LibationAvalonia/Controls/Settings/Import.axaml

@@ -0,0 +1,41 @@
+<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"
+             mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+			 xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Settings"
+			 x:DataType="vm:ImportSettingsVM"
+             x:Class="LibationAvalonia.Controls.Settings.Import">
+	
+	<StackPanel Margin="5">
+		<StackPanel.Styles>
+			<Style Selector="CheckBox">
+				<Setter Property="Margin" Value="0,0,0,10" />
+				<Style Selector="^ > TextBlock">
+					<Setter Property="TextWrapping" Value="Wrap" />
+				</Style>
+			</Style>
+		</StackPanel.Styles>
+
+		<CheckBox IsChecked="{CompiledBinding AutoScan, Mode=TwoWay}">
+			<TextBlock Text="{CompiledBinding AutoScanText}" />
+		</CheckBox>
+
+		<CheckBox IsChecked="{CompiledBinding ShowImportedStats, Mode=TwoWay}">
+			<TextBlock Text="{CompiledBinding ShowImportedStatsText}" />
+		</CheckBox>
+
+		<CheckBox IsChecked="{CompiledBinding ImportEpisodes, Mode=TwoWay}">
+			<TextBlock Text="{CompiledBinding ImportEpisodesText}" />
+		</CheckBox>
+
+		<CheckBox IsChecked="{CompiledBinding DownloadEpisodes, Mode=TwoWay}">
+			<TextBlock Text="{CompiledBinding DownloadEpisodesText}" />
+		</CheckBox>
+
+		<CheckBox IsChecked="{CompiledBinding AutoDownloadEpisodes, Mode=TwoWay}">
+			<TextBlock Text="{CompiledBinding AutoDownloadEpisodesText}" />
+		</CheckBox>
+	</StackPanel>
+</UserControl>

Source/LibationAvalonia/Controls/Settings/Import.axaml.cs

@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+using LibationAvalonia.ViewModels.Settings;
+using LibationFileManager;
+
+namespace LibationAvalonia.Controls.Settings
+{
+	public partial class Import : UserControl
+	{
+		public Import()
+		{
+			InitializeComponent();
+
+			if (Design.IsDesignMode)
+			{
+				_ = Configuration.Instance.LibationFiles;
+				DataContext = new ImportSettingsVM(Configuration.Instance);
+			}
+		}
+	}
+}

Source/LibationAvalonia/Controls/Settings/Important.axaml

@@ -0,0 +1,88 @@
+<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"
+             mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+			 xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Settings"
+			 x:DataType="vm:ImportantSettingsVM"
+             x:Class="LibationAvalonia.Controls.Settings.Important">
+
+	<Grid RowDefinitions="Auto,Auto,*">
+		<controls:GroupBox
+			Grid.Row="0"
+			Margin="5"
+			Label="Books Location">
+
+			<StackPanel>
+				<TextBlock
+					Margin="5"
+					Text="{CompiledBinding BooksText}" />
+
+				<controls:DirectoryOrCustomSelectControl Margin="0,10,0,10"
+									SubDirectory="Books"
+									Directory="{CompiledBinding BooksDirectory, Mode=TwoWay}"
+									KnownDirectories="{CompiledBinding KnownDirectories}" />
+
+				<CheckBox IsChecked="{CompiledBinding SavePodcastsToParentFolder, Mode=TwoWay}">
+					<TextBlock Text="{CompiledBinding SavePodcastsToParentFolderText}" />
+				</CheckBox>
+
+			</StackPanel>
+
+		</controls:GroupBox>
+
+		<StackPanel
+			Grid.Row="1" Margin="5"
+			Orientation="Horizontal">
+
+			<TextBlock
+				Margin="0,0,10,0"
+				VerticalAlignment="Center"
+				Text="Logging level" />
+
+			<controls:WheelComboBox
+				Width="120"
+				Height="25"
+				HorizontalContentAlignment="Stretch"
+				SelectedItem="{CompiledBinding LoggingLevel, Mode=TwoWay}"
+				ItemsSource="{CompiledBinding LoggingLevels}" />
+
+			<Button
+				Margin="50,0,0,0"
+				Padding="20,0"
+				VerticalAlignment="Stretch"
+				Content="Open Log Folder"
+				Command="{CompiledBinding OpenLogFolderButton}" />
+
+		</StackPanel>
+
+		<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"
+				MinWidth="80"
+				SelectedItem="{CompiledBinding ThemeVariant, Mode=TwoWay}"
+				ItemsSource="{CompiledBinding Themes}"/>
+			
+			<TextBlock
+				Grid.Column="2"
+				FontSize="16"
+				FontWeight="Bold"
+				Margin="10,0"
+				VerticalAlignment="Center"
+				IsVisible="{CompiledBinding	SelectionChanged}"
+				Text="Theme change takes effect on restart"/>
+
+		</Grid>
+	</Grid>
+</UserControl>

Source/LibationAvalonia/Controls/Settings/Important.axaml.cs

@@ -0,0 +1,26 @@
+using Avalonia.Controls;
+using Dinah.Core;
+using FileManager;
+using LibationAvalonia.ViewModels.Settings;
+using LibationFileManager;
+
+namespace LibationAvalonia.Controls.Settings
+{
+	public partial class Important : UserControl
+	{
+		public Important()
+		{
+			InitializeComponent();
+			if (Design.IsDesignMode)
+			{
+				_ = Configuration.Instance.LibationFiles;
+				DataContext = new ImportantSettingsVM(Configuration.Instance);
+			}
+		}
+
+		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
+		}
+	}
+}

Source/LibationAvalonia/Controls/WheelComboBox.axaml.cs

@@ -1,11 +1,7 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 using System;
-using System.Collections;
-using System.Linq;
 
 namespace LibationAvalonia.Controls
 {

Source/LibationAvalonia/Dialogs/AboutDialog.axaml

@@ -0,0 +1,73 @@
+<Window 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"
+		mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="520"
+		MinWidth="400" MinHeight="520"
+		Width="400" Height="520"
+        x:Class="LibationAvalonia.Dialogs.AboutDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        Title="About Libation"
+		Icon="/Assets/libation.ico">
+	
+	<Grid Margin="10" ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
+		
+		<controls:LinkLabel Grid.ColumnSpan="2" FontSize="16" FontWeight="Bold" Text="{Binding Version}" ToolTip.Tip="View Release Notes" Tapped="ViewReleaseNotes_Tapped" />
+
+		<controls:LinkLabel Grid.Column="1" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Right" Text="https://getlibation.com" Tapped="Link_getlibation"/>
+		
+		<Button Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Margin="0,20,0,0"  IsEnabled="{Binding CanCheckForUpgrade}" Content="{Binding UpgradeButtonText}" Click="CheckForUpgrade_Click" />
+
+		<Canvas Grid.Row="2" Grid.ColumnSpan="2" Margin="0,30,0,20" Width="280" Height="220">
+			<Path Stretch="None" Fill="{DynamicResource IconFill}" Data="{DynamicResource LibationCheersIcon}">
+				<Path.RenderTransform>
+					<TransformGroup>
+						<RotateTransform Angle="12" />
+						<ScaleTransform ScaleX="0.4" ScaleY="0.4" />
+						<TranslateTransform X="-160" Y="-150" /> 
+					</TransformGroup>
+				</Path.RenderTransform>
+			</Path>
+			<Path Stretch="None" Fill="{DynamicResource IconFill}" Data="{DynamicResource LibationCheersIcon}">
+				<Path.RenderTransform>
+					<TransformGroup>
+						<ScaleTransform ScaleX="-1" ScaleY="1" />
+						<RotateTransform Angle="-12" />
+						<ScaleTransform ScaleX="0.4" ScaleY="0.4" />
+						<TranslateTransform X="23" Y="-150" />
+					</TransformGroup>			
+				</Path.RenderTransform>
+			</Path>
+		</Canvas>
+
+		<controls:GroupBox Grid.Row="3" Label="Acknowledgements" Grid.ColumnSpan="2">
+			<StackPanel>
+
+				<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
+					<controls:LinkLabel FontWeight="Bold" Text="rmcrackan" Tapped="Link_GithubUser" />
+					<TextBlock Grid.Column="1" Margin="10,0" Text="Creator" />
+					<controls:LinkLabel Grid.Row="1" FontWeight="Bold" Text="Mbucari" Tapped="Link_GithubUser" />
+					<TextBlock Grid.Row="1" Grid.Column="1" Margin="10,0" Text="Developer" />
+				</Grid>
+				
+				<TextBlock Margin="0,10" FontSize="12" Text="Additional Contributions by:" TextDecorations="Underline"/>
+
+				<WrapPanel>
+					<WrapPanel.Styles>
+						<Style Selector="controls|LinkLabel">
+							<Setter Property="Margin" Value="5,0" />
+							<Setter Property="FontSize" Value="13" />
+						</Style>
+					</WrapPanel.Styles>
+					<controls:LinkLabel Text="pixil98" Tapped="Link_GithubUser" />
+					<controls:LinkLabel Text="hutattedonmyarm" Tapped="Link_GithubUser" />
+					<controls:LinkLabel Text="seanke" Tapped="Link_GithubUser" />
+					<controls:LinkLabel Text="wtanksleyjr" Tapped="Link_GithubUser" />
+					<controls:LinkLabel Text="Dr.Blank" Tapped="Link_GithubUser" />
+					<controls:LinkLabel Text="CharlieRussel" Tapped="Link_GithubUser" />
+				</WrapPanel>
+			</StackPanel>			
+		</controls:GroupBox>
+		
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs

@@ -0,0 +1,80 @@
+using Avalonia.Controls;
+using LibationAvalonia.Controls;
+using LibationAvalonia.ViewModels;
+using LibationFileManager;
+using LibationUiBase;
+using ReactiveUI;
+using System;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class AboutDialog : DialogWindow
+	{
+		private readonly AboutVM _viewModel;
+		public AboutDialog() : base(saveAndRestorePosition:false)
+		{
+			if (Design.IsDesignMode)
+				_ = Configuration.Instance.LibationFiles;
+
+			InitializeComponent();
+
+			DataContext = _viewModel = new AboutVM();
+		}
+
+		private async void CheckForUpgrade_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			var mainWindow = Owner as Views.MainWindow;
+
+			var upgrader = new Upgrader();
+			upgrader.DownloadProgress += async (_, e) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => mainWindow.ViewModel.DownloadProgress = e.ProgressPercentage);
+			upgrader.DownloadCompleted += async (_, _) => await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => mainWindow.ViewModel.DownloadProgress = null);
+
+			_viewModel.CanCheckForUpgrade = false;
+			Version latestVersion = null;
+			await upgrader.CheckForUpgradeAsync(OnUpgradeAvailable);
+
+			_viewModel.CanCheckForUpgrade = latestVersion is null;
+
+			_viewModel.UpgradeButtonText = latestVersion is null ? "Libation is up to date. Check Again." : $"Version {latestVersion:3} is available";
+
+			async Task OnUpgradeAvailable(UpgradeEventArgs e)
+			{
+				var notificationResult = await new UpgradeNotificationDialog(e.UpgradeProperties, e.CapUpgrade).ShowDialogAsync(this);
+
+				e.Ignore = notificationResult == DialogResult.Ignore;
+				e.InstallUpgrade = notificationResult == DialogResult.OK;
+				latestVersion = e.UpgradeProperties.LatestRelease;
+			}
+		}
+
+		private void Link_GithubUser(object sender, Avalonia.Input.TappedEventArgs e)
+		{
+			if (sender is LinkLabel lbl)
+			{
+				Dinah.Core.Go.To.Url($"ht" + $"tps://github.com/{lbl.Text.Replace('.','-')}");
+			}
+		}
+
+		private void Link_getlibation(object sender, Avalonia.Input.TappedEventArgs e) => Dinah.Core.Go.To.Url(AppScaffolding.LibationScaffolding.WebsiteUrl);
+
+		private void ViewReleaseNotes_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
+			=> Dinah.Core.Go.To.Url($"{AppScaffolding.LibationScaffolding.RepositoryUrl}/releases/tag/v{AppScaffolding.LibationScaffolding.BuildVersion.ToString(3)}");
+	}
+
+	public class AboutVM : ViewModelBase
+	{
+		public string Version { get; }
+		public bool CanCheckForUpgrade { get => canCheckForUpgrade; set => this.RaiseAndSetIfChanged(ref canCheckForUpgrade, value); }
+		public string UpgradeButtonText { get => upgradeButtonText; set => this.RaiseAndSetIfChanged(ref upgradeButtonText, value); }
+
+
+		private bool canCheckForUpgrade = true;
+		private string upgradeButtonText = "Check for Upgrade";
+
+		public AboutVM()
+		{
+			Version = $"Libation {AppScaffolding.LibationScaffolding.Variety} v{AppScaffolding.LibationScaffolding.BuildVersion}";
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml

@@ -64,11 +64,14 @@
 				<DataGridCheckBoxColumn
 					Binding="{Binding LibraryScan, Mode=TwoWay}"
 					Header="Include in&#xa;library scan?"/>
-
-				<DataGridTextColumn
-					Width="2*"
-					Binding="{Binding AccountId, Mode=TwoWay}"
-					Header="Audible&#xa;email/login"/>
+				
+				<DataGridTemplateColumn Width="2*" Header="Audible&#xa;email/login">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding AccountId, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
 				<DataGridTemplateColumn Width="Auto" Header="Locale">
 					<DataGridTemplateColumn.CellTemplate>
@@ -78,7 +81,7 @@
 							  HorizontalContentAlignment = "Stretch"
 							  HorizontalAlignment = "Stretch"
 							  SelectedItem="{Binding SelectedLocale, Mode=TwoWay}"
-							  Items="{Binding Locales}">
+							  ItemsSource="{Binding Locales}">
 
 								<ComboBox.ItemTemplate>
 									<DataTemplate>
@@ -93,10 +96,13 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 
-				<DataGridTextColumn
-					Width="3*"
-					Binding="{Binding AccountName, Mode=TwoWay}"
-					Header="Account Nickname&#xa;(optional)"/>
+				<DataGridTemplateColumn Width="3*" Header="Account Nickname&#xa;(optional)">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding AccountName, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
 			</DataGrid.Columns>
 		</DataGrid>
@@ -107,14 +113,13 @@
 
 			<Button
 				Grid.Column="0"
-				Height="30"
+				Padding="5,5"
 				Content="Import from audible-cli"
 				Click="ImportButton_Clicked" />
 
 			<Button
 				Grid.Column="1"
-				Height="30"
-				Padding="30,3,30,3"
+				Padding="30,5"
 				Content="Save"
 				Click="SaveButton_Clicked" />
 		</Grid>

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs

@@ -1,27 +1,24 @@
+using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Platform.Storage;
+using ReactiveUI;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using ReactiveUI;
-using AudibleApi;
-using Avalonia.Platform.Storage;
-using LibationFileManager;
-using Avalonia.Platform.Storage.FileIO;
 
 namespace LibationAvalonia.Dialogs
 {
 	public partial class AccountsDialog : DialogWindow
 	{
-		public ObservableCollection<AccountDto> Accounts { get; } = new();
+		public AvaloniaList<AccountDto> Accounts { get; } = new();
 		public class AccountDto : ViewModels.ViewModelBase
 		{
 			private string _accountId;
-			private Locale _selectedLocale;
 			public IReadOnlyList<Locale> Locales => AccountsDialog.Locales;
 			public bool LibraryScan { get; set; } = true;
 			public string AccountId
@@ -31,19 +28,21 @@ namespace LibationAvalonia.Dialogs
 				{
 					this.RaiseAndSetIfChanged(ref _accountId, value);
 					this.RaisePropertyChanged(nameof(IsDefault));
-				} 
-			}
-			public Locale SelectedLocale
-			{
-				get => _selectedLocale;
-				set
-				{
-					this.RaiseAndSetIfChanged(ref _selectedLocale, value);
-					this.RaisePropertyChanged(nameof(IsDefault));
 				}
 			}
+
+			public Locale SelectedLocale { get; set; }
 			public string AccountName { get; set; }
-			public bool IsDefault => string.IsNullOrEmpty(AccountId) && SelectedLocale is null;
+			public bool IsDefault => string.IsNullOrEmpty(AccountId);
+
+			public AccountDto() { }
+			public AccountDto(Account account)
+			{
+				LibraryScan = account.LibraryScan;
+				AccountId = account.AccountId;
+				SelectedLocale = Locales.Single(l => l.Name == account.Locale.Name);
+				AccountName = account.AccountName;
+			}
 		}
 
 		private static string GetAudibleCliAppDataPath()
@@ -58,57 +57,40 @@ namespace LibationAvalonia.Dialogs
 			// here: copy strings and dispose of persister
 			// only persist in 'save' step
 			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
-			var accounts = persister.AccountsSettings.Accounts;
-			if (accounts.Any())
-			{
-				foreach (var account in accounts)
-					AddAccountToGrid(account);
-			}
+
+			Accounts.CollectionChanged += Accounts_CollectionChanged;
+			Accounts.AddRange(persister.AccountsSettings.Accounts.Select(a => new AccountDto(a)));
 
 			DataContext = this;
 			addBlankAccount();
 		}
-		private void addBlankAccount()
-		{
 
-			var newBlank = new AccountDto();
-			newBlank.PropertyChanged += AccountDto_PropertyChanged;
-			Accounts.Insert(Accounts.Count, newBlank);
-		}
-
-		private void AddAccountToGrid(Account account)
+		private void Accounts_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
 		{
-			AccountDto accountDto = new()
+			if (e.Action is NotifyCollectionChangedAction.Add && e.NewItems?.Count > 0)
 			{
-				LibraryScan = account.LibraryScan,
-				AccountId = account.AccountId,
-				SelectedLocale = Locales.Single(l => l.Name == account.Locale.Name),
-				AccountName = account.AccountName,
-			};
-			accountDto.PropertyChanged += AccountDto_PropertyChanged;
-
-			//ObservableCollection doesn't fire CollectionChanged on Add, so use Insert instead
-			Accounts.Insert(Accounts.Count, accountDto);
+				foreach (var newItem in  e.NewItems.OfType<AccountDto>())
+					newItem.PropertyChanged += AccountDto_PropertyChanged;
+			}
+			else if (e.Action is NotifyCollectionChangedAction.Remove && e.OldItems?.Count > 0)
+			{
+				foreach (var oldItem in e.OldItems.OfType<AccountDto>())
+					oldItem.PropertyChanged -= AccountDto_PropertyChanged;
+			}
 		}
 
+		private void addBlankAccount() => Accounts.Insert(Accounts.Count, new AccountDto());
+
 		private void AccountDto_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
 		{
-			if (Accounts.Any(a => a.IsDefault))
-				return;
-
-			addBlankAccount();
+			if (!Accounts.Any(a => a.IsDefault))
+				addBlankAccount();
 		}
 
 		public void DeleteButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			if (e.Source is Button expBtn && expBtn.DataContext is AccountDto acc)
-			{
-				var index = Accounts.IndexOf(acc);
-				if (index < 0) return;
-
-				acc.PropertyChanged -= AccountDto_PropertyChanged;
 				Accounts.Remove(acc);
-			}
 		}
 
 		public async void ImportButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -119,11 +101,11 @@ namespace LibationAvalonia.Dialogs
 				AllowMultiple = false,
 				FileTypeFilter = new FilePickerFileType[]
 				{
-						new("JSON files (*.json)")
-						{
-							Patterns = new[] { "*.json" },
-							AppleUniformTypeIdentifiers  = new[] { "public.json" }
-						}
+					new("JSON files (*.json)")
+					{
+						Patterns = new[] { "*.json" },
+						AppleUniformTypeIdentifiers  = new[] { "public.json" }
+					}
 				}
 			};
 
@@ -153,7 +135,7 @@ namespace LibationAvalonia.Dialogs
 
 				persister.AccountsSettings.Add(account);
 
-				AddAccountToGrid(account);
+				Accounts.Add(new AccountDto(account));
 			}
 			catch (Exception ex)
 			{

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml

@@ -45,7 +45,6 @@
 		<controls:GroupBox
 			Label="Edit Tags"
 			Grid.Row="1"
-			BorderWidth="1"
 			Margin="10,0,10,0">
 			
 			<StackPanel Orientation="Vertical">
@@ -63,7 +62,6 @@
 		<controls:GroupBox
 			Label="Liberated status: Whether the book/pdf has been downloaded"
 			Grid.Row="2"
-			BorderWidth="1"
 			Margin="10,10,10,10">
 			
 			<StackPanel Orientation="Vertical">
@@ -95,7 +93,7 @@
 						Height="25"
 						VerticalAlignment="Center"
 						SelectedItem="{Binding BookLiberatedSelectedItem, Mode=TwoWay}"
-						Items="{Binding BookLiberatedItems}">
+						ItemsSource="{Binding BookLiberatedItems}">
 						
 						<ComboBox.ItemTemplate>
 							<DataTemplate>
@@ -116,8 +114,8 @@
 						Height="25"
 						Width="150"
 						VerticalAlignment="Center"
-						SelectedItem="{Binding PdfLiberatedSelectedItem, Mode=TwoWay}"						
-						Items="{Binding PdfLiberatedItems}">
+						SelectedItem="{Binding PdfLiberatedSelectedItem, Mode=TwoWay}"
+						ItemsSource="{Binding PdfLiberatedItems}">
 						
 						<ComboBox.ItemTemplate>
 							<DataTemplate>

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs

@@ -1,11 +1,10 @@
 using ApplicationServices;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media.Imaging;
 using DataLayer;
 using Dinah.Core;
-using LibationFileManager;
 using LibationAvalonia.ViewModels;
+using LibationFileManager;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -42,14 +41,14 @@ namespace LibationAvalonia.Dialogs
 				LibraryBook = context.GetLibraryBook_Flat_NoTracking("B017V4IM1G");
 			}
 		}
-		public BookDetailsDialog(LibraryBook libraryBook) :this()
+		public BookDetailsDialog(LibraryBook libraryBook) : this()
 		{
 			LibraryBook = libraryBook;
 		}
 
 		protected override void SaveAndClose()
-        {
-            LibraryBook.Book.UpdateUserDefinedItem(NewTags, bookStatus: BookLiberatedStatus, pdfStatus: PdfLiberatedStatus);
+		{
+			LibraryBook.Book.UpdateUserDefinedItem(NewTags, bookStatus: BookLiberatedStatus, pdfStatus: PdfLiberatedStatus);
 			base.SaveAndClose();
 		}
 
@@ -61,7 +60,7 @@ namespace LibationAvalonia.Dialogs
 		}
 
 		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-            => SaveAndClose();
+			=> SaveAndClose();
 
 		private class BookDetailsDialogViewModel : ViewModelBase
 		{

Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml

@@ -101,13 +101,13 @@
 				Grid.Column="0"
 				Grid.Row="0"
 				Content="Check All"
-				Click="CheckAll_Click"/>
+				Command="{Binding CheckAll}"/>
 
 			<Button
 				Grid.Column="0"
 				Grid.Row="1"
 				Content="Uncheck All"
-				Click="UncheckAll_Click"/>
+				Command="{Binding UncheckAll}"/>
 			
 			<Button
 				Grid.Column="1"

Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml.cs

@@ -77,12 +77,12 @@ namespace LibationAvalonia.Dialogs
 			await setControlEnabled(sender, true);
 		}
 
-		public void CheckAll_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public void CheckAll()
 		{
-			foreach (var record in bookRecordEntries) 
+			foreach (var record in bookRecordEntries)
 				record.IsChecked = true;
 		}
-		public void UncheckAll_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public void UncheckAll()
 		{
 			foreach (var record in bookRecordEntries)
 				record.IsChecked = false;

Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using System;
 
 namespace LibationAvalonia.Dialogs
@@ -12,9 +11,7 @@ namespace LibationAvalonia.Dialogs
 		public DescriptionDisplayDialog()
 		{
 			InitializeComponent();
-#if DEBUG
-			this.AttachDevTools();
-#endif
+
 			DescriptionTextBox = this.FindControl<TextBox>(nameof(DescriptionTextBox));
 			this.Activated += DescriptionDisplay_Activated;
 			Opened += DescriptionDisplay_Opened;

Source/LibationAvalonia/Dialogs/DialogWindow.cs

@@ -1,5 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using LibationFileManager;
 using System;
 using System.Threading.Tasks;
@@ -17,10 +16,6 @@ namespace LibationAvalonia.Dialogs
 			this.Initialized += DialogWindow_Initialized;
 			this.Opened += DialogWindow_Opened;
 			this.Closing += DialogWindow_Closing;
-
-#if DEBUG
-			this.AttachDevTools();
-#endif
 		}
 		public DialogWindow(bool saveAndRestorePosition) : this()
 		{

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml

@@ -42,13 +42,16 @@
 
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
-				</DataGridTemplateColumn>				
+				</DataGridTemplateColumn>
+				
+				<DataGridTemplateColumn Width="*" Header="Filter">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding FilterString, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
-				<DataGridTextColumn
-					Width="*"
-					IsReadOnly="False"
-					Binding="{Binding FilterString, Mode=TwoWay}"
-					Header="Filter"/>
 
 				<DataGridTemplateColumn Header="Move&#xa;Up">
 					<DataGridTemplateColumn.CellTemplate>
@@ -96,10 +99,10 @@
 
 			<Button
 				Grid.Column="1"
-				Height="30"
-				Padding="30,3,30,3"
+				Padding="30,5"
+				Name="saveBtn"
 				Content="Save"
-				Click="SaveButton_Clicked" />
+				Command="{Binding SaveAndClose}" />
 		</Grid>
 	</Grid>
 </Window>

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs

@@ -1,9 +1,9 @@
 using AudibleUtilities;
 using Avalonia.Controls;
 using LibationFileManager;
+using ReactiveUI;
 using System.Collections.ObjectModel;
 using System.Linq;
-using ReactiveUI;
 
 namespace LibationAvalonia.Dialogs
 {
@@ -38,7 +38,7 @@ namespace LibationAvalonia.Dialogs
 			if (!accounts.Any())
 				return;
 
-			ControlToFocusOnShow = this.FindControl<Button>(nameof(SaveButton_Clicked));
+			ControlToFocusOnShow = this.FindControl<Button>(nameof(saveBtn));
 
 			var allFilters = QuickFilters.Filters.Select(f => new Filter { FilterString = f }).ToList();
 			allFilters.Add(new Filter());
@@ -100,10 +100,5 @@ namespace LibationAvalonia.Dialogs
 				Filters.Insert(index + 1, filter);
 			}
 		}
-
-		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			SaveAndClose();
-		}
 	}
 }

Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml

@@ -4,6 +4,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
 		MinWidth="500" MinHeight="450"
+		Width="500" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditReplacementChars"
         Title="Illegal Character Replacement"		
 		Icon="/Assets/libation.ico">
@@ -22,25 +23,35 @@
 			IsReadOnly="False"
 			BeginningEdit="ReplacementGrid_BeginningEdit"
 			CellEditEnding="ReplacementGrid_CellEditEnding"
-			KeyDown="ReplacementGrid_KeyDown"			 
+			KeyDown="ReplacementGrid_KeyDown"
 			Items="{Binding replacements}">
 
 			<DataGrid.Columns>
+
+
+				<DataGridTemplateColumn Header="Char to&#xa;Replace">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox IsReadOnly="{Binding Mandatory}" Text="{Binding CharacterToReplace, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 				
-				<DataGridTextColumn
-					IsReadOnly="False"
-					Binding="{Binding CharacterToReplace, Mode=TwoWay}"
-					Header="Char to&#xa;Replace"/>
+				<DataGridTemplateColumn Header="Replacement&#xa;Text">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox Text="{Binding ReplacementText, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
-				<DataGridTextColumn
-					IsReadOnly="False"
-					Binding="{Binding ReplacementText, Mode=TwoWay}"
-					Header="Replacement&#xa;Text"/>
-
-				<DataGridTextColumn Width="*"
-					IsReadOnly="False"
-					Binding="{Binding Description, Mode=TwoWay}"
-					Header="Description"/>
+				<DataGridTemplateColumn Width="*" Header="Description">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBox IsReadOnly="{Binding Mandatory}" Text="{Binding Description, Mode=TwoWay}" />
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
 
 			</DataGrid.Columns>
 		</DataGrid>
@@ -51,9 +62,9 @@
 			Margin="5"
 			Orientation="Horizontal">
 			
-			<Button Margin="0,0,10,0" Click="Defaults_Click" Content="Defaults" />
-			<Button Margin="0,0,10,0" Click="LoFiDefaults_Click" Content="LoFi Defaults" />
-			<Button Click="Barebones_Click" Content="Barebones" />
+			<Button Margin="0,0,10,0" Command="{Binding Defaults}" Content="Defaults" />
+			<Button Margin="0,0,10,0" Command="{Binding LoFiDefaults}" Content="LoFi Defaults" />
+			<Button Command="{Binding Barebones}" Content="Barebones" />
 		</StackPanel>
 
 		<StackPanel
@@ -62,8 +73,8 @@
 			Margin="5"
 			Orientation="Horizontal">
 
-			<Button Margin="0,0,10,0" Click="Cancel_Click" Content="Cancel" />
-			<Button Padding="20,5,20,6" Click="Save_Click" Content="Save" />
+			<Button Margin="0,0,10,0" Command="{Binding Close}" Content="Cancel" />
+			<Button Padding="20,5,20,6" Command="{Binding SaveAndClose}" Content="Save" />
 		</StackPanel>
 		
 	</Grid>

Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs

@@ -1,12 +1,11 @@
+using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Data;
 using FileManager;
 using LibationFileManager;
-using System.Collections.Generic;
 using ReactiveUI;
+using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Collections;
-using Avalonia.Data;
 
 namespace LibationAvalonia.Dialogs
 {
@@ -36,21 +35,17 @@ namespace LibationAvalonia.Dialogs
 			LoadTable(config.ReplacementCharacters.Replacements);
 		}
 
-		public void Defaults_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=>	LoadTable(ReplacementCharacters.Default.Replacements);
-		public void LoFiDefaults_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public void Defaults()
+			=> LoadTable(ReplacementCharacters.Default.Replacements);
+		public void LoFiDefaults()
 			=> LoadTable(ReplacementCharacters.LoFiDefault.Replacements);
-		public void Barebones_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public void Barebones()
 			=> LoadTable(ReplacementCharacters.Barebones.Replacements);
-		public void Save_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> SaveAndClose();
-		public void Cancel_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> Close();
 
 		protected override void SaveAndClose()
 		{
 			var replacements = SOURCE
-				.Where(r=> !r.IsDefault)
+				.Where(r => !r.IsDefault)
 				.Select(r => new Replacement(r.Character, r.ReplacementText, r.Description) { Mandatory = r.Mandatory })
 				.ToList();
 

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml

@@ -3,6 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+		Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditTemplateDialog"
 		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
 		Icon="/Assets/libation.ico"
@@ -32,7 +33,7 @@
 				VerticalAlignment="Stretch"
 				VerticalContentAlignment="Center"
 				Content="Reset to Default"
-				Click="ResetButton_Click" />
+				Command="{Binding ResetToDefault}"/>
 		</Grid>
 		<Grid Grid.Row="1" ColumnDefinitions="Auto,*">
 
@@ -68,8 +69,7 @@
 
 					</DataGrid.Columns>
 				</DataGrid>
-
-
+			
 			<Grid
 			Grid.Column="1"
 			Margin="5,0,5,0"

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs

@@ -1,17 +1,15 @@
-using Avalonia.Markup.Xaml;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Controls.Documents;
+using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Dinah.Core;
 using LibationFileManager;
+using ReactiveUI;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using ReactiveUI;
-using Avalonia.Controls.Documents;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Templates;
 
 namespace LibationAvalonia.Dialogs
 {
@@ -21,14 +19,14 @@ namespace LibationAvalonia.Dialogs
 
 		public EditTemplateDialog()
 		{
-			AvaloniaXamlLoader.Load(this);
-			userEditTbox = this.FindControl<TextBox>(nameof(userEditTbox));
+			InitializeComponent();
+
 			if (Design.IsDesignMode)
 			{
 				_ = Configuration.Instance.LibationFiles;
 				var editor = TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(Configuration.Instance.Books, Configuration.Instance.FileTemplate);
 				_viewModel = new(Configuration.Instance, editor);
-				_viewModel.resetTextBox(editor.EditingTemplate.TemplateText);
+				_viewModel.ResetTextBox(editor.EditingTemplate.TemplateText);
 				Title = $"Edit {editor.TemplateName}";
 				DataContext = _viewModel;
 			}
@@ -39,7 +37,7 @@ namespace LibationAvalonia.Dialogs
 			ArgumentValidator.EnsureNotNull(templateEditor, nameof(templateEditor));
 
 			_viewModel = new EditTemplateViewModel(Configuration.Instance, templateEditor);
-			_viewModel.resetTextBox(templateEditor.EditingTemplate.TemplateText);
+			_viewModel.ResetTextBox(templateEditor.EditingTemplate.TemplateText);
 			Title = $"Edit {templateEditor.TemplateName}";
 			DataContext = _viewModel;
 		}
@@ -69,9 +67,6 @@ namespace LibationAvalonia.Dialogs
 		public async void SaveButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> await SaveAndCloseAsync();
 
-		public void ResetButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> _viewModel.resetTextBox(_viewModel.TemplateEditor.DefaultTemplate);
-
 		private class EditTemplateViewModel : ViewModels.ViewModelBase
 		{
 			private readonly Configuration config;
@@ -117,7 +112,8 @@ namespace LibationAvalonia.Dialogs
 
 			public AvaloniaList<Tuple<string, string, string>> ListItems { get; set; }
 
-			public void resetTextBox(string value) => UserTemplateText = value;
+			public void ResetTextBox(string value) => UserTemplateText = value;
+			public void ResetToDefault() => ResetTextBox(TemplateEditor.DefaultTemplate);
 
 			public async Task<bool> Validate()
 			{

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml

@@ -5,6 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="500"		
         x:Class="LibationAvalonia.Dialogs.ImageDisplayDialog"
 		MinWidth="500" MinHeight="500"
+		Width="500" Height="520"
         Title="Cover"
 		WindowStartupLocation="CenterOwner"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs

@@ -1,9 +1,8 @@
-using Avalonia.Markup.Xaml;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform.Storage;
+using ReactiveUI;
 using System;
 using System.ComponentModel;
-using ReactiveUI;
-using Avalonia.Platform.Storage;
 
 namespace LibationAvalonia.Dialogs
 {

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml

@@ -27,6 +27,6 @@
 			Margin="5"
 			Padding="30,3,30,3"
 			Content="Save"
-			Click="SaveButton_Click" />
+			Command="{Binding SaveButtonAsync}" />
 	</Grid>
 </Window>

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs

@@ -1,8 +1,5 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using LibationFileManager;
-using LibationAvalonia.Controls;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -18,7 +15,7 @@ namespace LibationAvalonia.Dialogs
 				Configuration.KnownDirectories.AppDir,
 				Configuration.KnownDirectories.MyDocs
 			};
-			
+
 			public string Directory { get; set; } = Configuration.GetKnownDirectoryPath(Configuration.KnownDirectories.UserProfile);
 		}
 		private DirSelectOptions dirSelectOptions;
@@ -28,15 +25,11 @@ namespace LibationAvalonia.Dialogs
 		{
 			InitializeComponent();
 
-#if DEBUG
-			this.AttachDevTools();
-#endif
 			DataContext = dirSelectOptions = new();
 		}
 
-		public async void SaveButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public async Task SaveButtonAsync()
 		{
-
 			var libationDir = dirSelectOptions.Directory;
 
 			if (!System.IO.Directory.Exists(libationDir))

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml

@@ -2,20 +2,21 @@
         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="120"
+        mc:Ignorable="d" d:DesignWidth="550" d:DesignHeight="135"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         x:Class="LibationAvalonia.Dialogs.LiberatedStatusBatchAutoDialog"
         Title="Liberated status: Whether the book has been downloaded"
-		MinHeight="100" MaxHeight="165"
-		MinWidth="600" MaxWidth="800"
+		MinHeight="135" MaxHeight="135"
+		MinWidth="550" MaxWidth="550"
+		Width="550" Height="135"
 		WindowStartupLocation="CenterOwner"
 		Icon="/Assets/libation.ico">
-
-	<Grid RowDefinitions="Auto,Auto,Auto">
+ 
+	<Grid Margin="10" RowDefinitions="Auto,Auto">
 		
 		<StackPanel
 			Grid.Row="0"
-			Orientation="Horizontal">
+			Orientation="Vertical">
 
 			<CheckBox
 				Margin="0,0,0,10"
@@ -25,12 +26,6 @@
 					TextWrapping="Wrap"
 					Text="If the audio file can be found, set download status to 'Downloaded'" />
 			</CheckBox>
-		</StackPanel>
-
-		<StackPanel
-			Grid.Row="1"
-			Orientation="Horizontal">
-
 			<CheckBox
 				Margin="0,0,0,10"
 				IsChecked="{Binding SetNotDownloaded, Mode=TwoWay}">
@@ -42,12 +37,10 @@
 		</StackPanel>
 		
 		<Button
-			Grid.Row="2"
-			Padding="30,0,30,0"
-			Margin="10,0,10,10"
+			Grid.Row="1"
+			Padding="30,5"
 			HorizontalAlignment="Right"
-			Height="25"
 			Content="Save"
-			Click="SaveButton_Clicked"/>
+			Command="{Binding SaveAndClose}"/>
 	</Grid>
 </Window>

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml.cs

@@ -1,19 +1,14 @@
-using Avalonia.Markup.Xaml;
-
 namespace LibationAvalonia.Dialogs
 {
 	public partial class LiberatedStatusBatchAutoDialog : DialogWindow
-    {
-        public bool SetDownloaded { get; set; }
-        public bool SetNotDownloaded { get; set; }
+	{
+		public bool SetDownloaded { get; set; }
+		public bool SetNotDownloaded { get; set; }
 
-        public LiberatedStatusBatchAutoDialog()
+		public LiberatedStatusBatchAutoDialog()
 		{
 			InitializeComponent();
 			DataContext = this;
 		}
-
-		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-			=> SaveAndClose();
 	}
 }

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml

@@ -2,24 +2,25 @@
         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="120"
+        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="100"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         x:Class="LibationAvalonia.Dialogs.LiberatedStatusBatchManualDialog"
         Title="Liberated status: Whether the book has been downloaded"
-		MinWidth="400" MinHeight="120"
-		MaxWidth="400" MaxHeight="120"
+		MinWidth="400" MinHeight="100"
+		MaxWidth="400" MaxHeight="100"
+		Width="400" Height="100"
 		WindowStartupLocation="CenterOwner"
 		Icon="/Assets/libation.ico">
 
-	<Grid RowDefinitions="Auto,Auto,Auto">
+	<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,Auto">
 
 		<TextBlock
-			Grid.Row="0"
-			Margin="10,10,10,0"
+			Grid.ColumnSpan="2"
+			Margin="10"
 			Text="To download again next time: change to Not Downloaded&#xa;To not download: change to Downloaded"/>
 		
 		<StackPanel
-			Margin="10"
+			Margin="10,0"
 			Grid.Row="1"
 			Orientation="Horizontal">
 
@@ -35,7 +36,7 @@
 				Height="25"
 				VerticalAlignment="Center"
 				SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
-				Items="{Binding BookStatuses}">
+				ItemsSource="{Binding BookStatuses}">
 
 				<ComboBox.ItemTemplate>
 					<DataTemplate>
@@ -48,14 +49,15 @@
 				</ComboBox.ItemTemplate>
 			</controls:WheelComboBox>
 		</StackPanel>
-		
+
 		<Button
-			Grid.Row="2"
-			Padding="30,0,30,0"
-			Margin="10,0,10,10"
+			Grid.Row="1"
+			Grid.Column="1"
+			Margin="10,0"
+			Padding="30,5"
+			VerticalAlignment="Stretch"
 			HorizontalAlignment="Right"
-			Height="25"
 			Content="Save"
-			Click="SaveButton_Clicked"/>
+			Click="SaveButton_Clicked" />
 	</Grid>
 </Window>

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml.cs

@@ -1,4 +1,3 @@
-using Avalonia.Markup.Xaml;
 using DataLayer;
 using System.Collections;
 using System.Collections.Generic;
@@ -34,13 +33,13 @@ namespace LibationAvalonia.Dialogs
 			new liberatedComboBoxItem { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" },
 		};
 
-        public LiberatedStatusBatchManualDialog(bool isPdf) : this()
-        {
-            if (isPdf)
-                this.Title = this.Title.Replace("book", "PDF");
-        }
+		public LiberatedStatusBatchManualDialog(bool isPdf) : this()
+		{
+			if (isPdf)
+				this.Title = this.Title.Replace("book", "PDF");
+		}
 
-        public LiberatedStatusBatchManualDialog()
+		public LiberatedStatusBatchManualDialog()
 		{
 			InitializeComponent();
 			SelectedItem = BookStatuses[0] as liberatedComboBoxItem;

Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml

@@ -16,7 +16,7 @@
 			<TextBlock Text="IDs Found: " />
 			<TextBlock Text="{Binding FoundAsins}" />
 		</StackPanel>
-		<ListBox Margin="0,5,0,0" Grid.Row="1" Grid.ColumnSpan="2" Name="foundAudiobooksLB" Items="{Binding FoundFiles}" AutoScrollToSelectedItem="true">
+		<ListBox Margin="0,5,0,0" Grid.Row="1" Grid.ColumnSpan="2" Name="foundAudiobooksLB" ItemsSource="{Binding FoundFiles}" AutoScrollToSelectedItem="true">
 			<ListBox.ItemTemplate>
 				<DataTemplate>
 					<Grid ColumnDefinitions="Auto,*">

Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml.cs

@@ -2,7 +2,6 @@ using ApplicationServices;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
-using Avalonia.Platform.Storage.FileIO;
 using DataLayer;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
@@ -53,7 +52,7 @@ namespace LibationAvalonia.Dialogs
 
 		private void LocateAudiobooks_FileFound(object sender, FilePathCache.CacheEntry e)
 		{
-			var newItem = new Tuple<string,string>($"[{e.Id}]", Path.GetFileName(e.Path));
+			var newItem = new Tuple<string, string>($"[{e.Id}]", Path.GetFileName(e.Path));
 			_viewModel.FoundFiles.Add(newItem);
 			foundAudiobooksLB.SelectedItem = newItem;
 
@@ -70,7 +69,7 @@ namespace LibationAvalonia.Dialogs
 			{
 				Title = "Select the folder to search for audiobooks",
 				AllowMultiple = false,
-				SuggestedStartLocation = await StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books.PathWithoutPrefix) 
+				SuggestedStartLocation = await StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books.PathWithoutPrefix)
 			};
 
 			var selectedFolder = (await StorageProvider.OpenFolderPickerAsync(folderPicker))?.SingleOrDefault()?.TryGetLocalPath();
@@ -90,7 +89,7 @@ namespace LibationAvalonia.Dialogs
 					FilePathCache.Insert(book);
 
 					var lb = context.GetLibraryBook_Flat_NoTracking(book.Id);
-					if (lb.Book.UserDefinedItem.BookStatus is not LiberatedStatus.Liberated)
+					if (lb?.Book?.UserDefinedItem.BookStatus is not LiberatedStatus.Liberated)
 						await Task.Run(() => lb.UpdateBookStatus(LiberatedStatus.Liberated));
 
 					FileFound?.Invoke(this, book);

Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml

@@ -2,9 +2,11 @@
         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="240" d:DesignHeight="120"
-		MinWidth="240" MinHeight="120"
-		MaxWidth="240" MaxHeight="120"
+        mc:Ignorable="d" d:DesignWidth="240" d:DesignHeight="140"
+		MinWidth="240" MinHeight="140"
+		MaxWidth="240" MaxHeight="140"
+		Width="240" Height="140"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.ApprovalNeededDialog"
         Title="Approval Alert Detected"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml.cs

@@ -1,13 +1,10 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs.Login
 {
 	public partial class ApprovalNeededDialog : DialogWindow
 	{
-		public ApprovalNeededDialog()
+		public ApprovalNeededDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 		}

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginCallback.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Threading.Tasks;
-using AudibleApi;
+using AudibleApi;
 using AudibleUtilities;
+using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs.Login
 {

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs

@@ -1,7 +1,9 @@
-using System;
-using System.Threading.Tasks;
-using AudibleApi;
+using AudibleApi;
 using AudibleUtilities;
+using Avalonia.Threading;
+using LibationFileManager;
+using System;
+using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs.Login
 {
@@ -23,9 +25,24 @@ namespace LibationAvalonia.Dialogs.Login
 
 		public async Task<ChoiceOut> StartAsync(ChoiceIn choiceIn)
 		{
+			if (Configuration.IsWindows && Environment.OSVersion.Version.Major >= 10)
+			{
+				try
+				{
+					var weblogin = new WebLoginDialog(_account.AccountId, choiceIn.LoginUrl);
+					if (await weblogin.ShowDialog<DialogResult>(App.MainWindow) is DialogResult.OK)
+						return ChoiceOut.External(weblogin.ResponseUrl);
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, $"Failed to run {nameof(WebLoginDialog)}");
+				}
+			}
+
 			var dialog = new LoginChoiceEagerDialog(_account);
 
-			if (await dialog.ShowDialogAsync() is not DialogResult.OK || string.IsNullOrWhiteSpace(dialog.Password))
+			if (await dialog.ShowDialogAsync() is not DialogResult.OK ||
+				(dialog.LoginMethod is LoginMethod.Api && string.IsNullOrWhiteSpace(dialog.Password)))
 				return null;
 
 			switch (dialog.LoginMethod)

Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml

@@ -5,6 +5,8 @@
         mc:Ignorable="d" d:DesignWidth="220" d:DesignHeight="250"
 		MinWidth="220" MinHeight="250"
 		MaxWidth="220" MaxHeight="250"
+		Width="220" Height="250"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.CaptchaDialog"
         Title="CAPTCHA"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media.Imaging;
 using LibationAvalonia.ViewModels;
 using ReactiveUI;
@@ -14,14 +13,14 @@ namespace LibationAvalonia.Dialogs.Login
 		public string Answer => _viewModel.Answer;
 
 		private readonly CaptchaDialogViewModel _viewModel;
-		public CaptchaDialog()
+		public CaptchaDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 			passwordBox = this.FindControl<TextBox>(nameof(passwordBox));
 			captchaBox = this.FindControl<TextBox>(nameof(captchaBox));
 		}
 
-		public CaptchaDialog(string password, byte[] captchaImage) :this()
+		public CaptchaDialog(string password, byte[] captchaImage) : this()
 		{
 			//Avalonia doesn't support animated gifs.
 			//Deconstruct gifs into frames and manually switch them.
@@ -34,7 +33,7 @@ namespace LibationAvalonia.Dialogs.Login
 			{
 				var frameMetadata = gif.Frames[i].Metadata.GetFormatMetadata(SixLabors.ImageSharp.Formats.Gif.GifFormat.Instance);
 
-                using var clonedFrame = gif.Frames.CloneFrame(i);
+				using var clonedFrame = gif.Frames.CloneFrame(i);
 				using var framems = new MemoryStream();
 
 				clonedFrame.Save(framems, gifEncoder);
@@ -66,7 +65,7 @@ namespace LibationAvalonia.Dialogs.Login
 		protected override async Task CancelAndCloseAsync()
 		{
 			await _viewModel.StopAsync();
-			await base.CancelAndCloseAsync();	
+			await base.CancelAndCloseAsync();
 		}
 
 		public async void Submit_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -106,7 +105,7 @@ namespace LibationAvalonia.Dialogs.Login
 		private async Task SwitchFramesAsync(Bitmap[] gifFrames, int[] frameDelayMs)
 		{
 			int index = 0;
-			while(keepSwitching)
+			while (keepSwitching)
 			{
 				CaptchaImage = gifFrames[index];
 				await Task.Delay(frameDelayMs[index++]);

Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml

@@ -5,6 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="120"
 		MinWidth="300" MinHeight="120"
 		Width="300" Height="120"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.LoginCallbackDialog"
         Title="Audible Login" 
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml.cs

@@ -1,7 +1,5 @@
 using AudibleUtilities;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Dinah.Core;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,7 +11,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public Account Account { get; }
 		public string Password { get; set; }
 
-		public LoginCallbackDialog()
+		public LoginCallbackDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 

Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml

@@ -2,9 +2,9 @@
         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="350" d:DesignHeight="200"
-		MinWidth="350" MinHeight="200"
-		Width="350" Height="200"
+        mc:Ignorable="d" d:DesignWidth="360" d:DesignHeight="200"
+		MinWidth="370" MinHeight="200"
+		Width="370" Height="200"
 		WindowStartupLocation="CenterOwner"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog"
@@ -35,7 +35,7 @@
 			Grid.Row="2"
 			Grid.Column="0"
 			Margin="0,5,0,5"
-			ColumnDefinitions="Auto,*">
+			ColumnDefinitions="Auto,*,Auto">
 			
 			<TextBlock
 				Grid.Column="0"
@@ -46,6 +46,12 @@
 				Grid.Column="1"
 				PasswordChar="*"
 				Text="{Binding Password, Mode=TwoWay}" />
+			<Button
+				Margin="5,0"
+				Grid.Column="2"
+				VerticalAlignment="Stretch"
+				Content="Submit"
+				Command="{Binding SaveAndCloseAsync}" />
 		</Grid>
 
 		<StackPanel
@@ -54,7 +60,7 @@
 
 			<controls:LinkLabel
 				Tapped="ExternalLoginLink_Tapped"
-				Text="Or click here to log in with your browser." />
+				Text="Trouble logging in? Click here to log in with your browser." />
 			
 			<TextBlock
 				TextWrapping="Wrap"

Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs

@@ -1,8 +1,6 @@
 using AudibleApi;
 using AudibleUtilities;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -14,7 +12,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string Password { get; set; }
 		public LoginMethod LoginMethod { get; private set; }
 
-		public LoginChoiceEagerDialog()
+		public LoginChoiceEagerDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 
@@ -26,7 +24,7 @@ namespace LibationAvalonia.Dialogs.Login
 				DataContext = this;
 			}
 		}
-		public LoginChoiceEagerDialog(Account account):this()
+		public LoginChoiceEagerDialog(Account account) : this()
 		{
 			Account = account;
 			DataContext = this;
@@ -34,7 +32,7 @@ namespace LibationAvalonia.Dialogs.Login
 
 		protected override async Task SaveAndCloseAsync()
 		{
-			if (string.IsNullOrWhiteSpace(Password))
+			if (LoginMethod is LoginMethod.Api && string.IsNullOrWhiteSpace(Password))
 			{
 				await MessageBox.Show(this, "Please enter your password");
 				return;

Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml.cs

@@ -1,7 +1,6 @@
 using AudibleUtilities;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Dinah.Core;
 using System;
 using System.Linq;
@@ -15,7 +14,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string ExternalLoginUrl { get; }
 		public string ResponseUrl { get; set; }
 
-		public LoginExternalDialog()
+		public LoginExternalDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 
@@ -28,7 +27,7 @@ namespace LibationAvalonia.Dialogs.Login
 				DataContext = this;
 			}
 		}
-		public LoginExternalDialog(Account account, string loginUrl):this()
+		public LoginExternalDialog(Account account, string loginUrl) : this()
 		{
 			Account = account;
 			ExternalLoginUrl = loginUrl;

Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml

@@ -4,7 +4,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="200"
 		MinWidth="400" MinHeight="200"
-		MaxWidth="400" MaxHeight="200"
+		MaxWidth="400" MaxHeight="400"
+		Width="400" Height="200"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.MfaDialog"
         Title="Two-Step Verification"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml.cs

@@ -1,11 +1,10 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using System.Threading.Tasks;
+using Avalonia.Data;
 using ReactiveUI;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Data;
+using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs.Login
 {
@@ -15,7 +14,7 @@ namespace LibationAvalonia.Dialogs.Login
 		public string SelectedValue { get; private set; }
 		private RbValues Values { get; } = new();
 
-		public MfaDialog()
+		public MfaDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 

Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml

@@ -0,0 +1,13 @@
+<Window 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"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        x:Class="LibationAvalonia.Dialogs.Login.WebLoginDialog"
+		Width="500" Height="800"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico"
+        Title="Audible Login">
+	<controls:NativeWebView Name="webView" />
+</Window>

Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml.cs

@@ -0,0 +1,54 @@
+using Avalonia.Controls;
+using Dinah.Core;
+using System;
+
+namespace LibationAvalonia.Dialogs.Login
+{
+	public partial class WebLoginDialog : Window
+	{
+		public string ResponseUrl { get; private set; }
+		private readonly string accountID;
+
+		public WebLoginDialog()
+		{
+			InitializeComponent();
+			webView.NavigationStarted += WebView_NavigationStarted;
+			webView.DOMContentLoaded += WebView_NavigationCompleted;
+		}
+
+		public WebLoginDialog(string accountID, string loginUrl) : this()
+		{
+			this.accountID = ArgumentValidator.EnsureNotNullOrWhiteSpace(accountID, nameof(accountID));
+			webView.Source = new Uri(ArgumentValidator.EnsureNotNullOrWhiteSpace(loginUrl, nameof(loginUrl)));
+		}
+		
+		private void WebView_NavigationStarted(object sender, LibationFileManager.WebViewNavigationEventArgs e)
+		{
+			if (e.Request?.AbsolutePath.Contains("/ap/maplanding") is true)
+			{
+				ResponseUrl = e.Request.ToString();
+				Close(DialogResult.OK);
+			}
+		}
+
+		private async void WebView_NavigationCompleted(object sender, EventArgs e)
+		{
+			await webView.InvokeScriptAsync(getScript(accountID));
+		}
+
+		private static string getScript(string accountID) => $$"""
+			(function() {
+				var inputs = document.getElementsByTagName('input');
+				for (index = 0; index < inputs.length; ++index) {
+					if (inputs[index].name.includes('email')) {
+						inputs[index].value = '{{accountID}}';
+					}
+					if (inputs[index].name.includes('password')) {
+						inputs[index].focus();
+					}
+				}
+			})()
+			""";
+		
+	}
+}

Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml

@@ -5,6 +5,8 @@
         mc:Ignorable="d" d:DesignWidth="200" d:DesignHeight="200"
 		MinWidth="200" MinHeight="200"
 		MaxWidth="200" MaxHeight="200"
+		Width="200" Height="200"
+		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login._2faCodeDialog"
         Title="2FA Code"
 		Icon="/Assets/libation.ico">

Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs.Login
@@ -10,9 +9,9 @@ namespace LibationAvalonia.Dialogs.Login
 		public string Prompt { get; } = "For added security, please enter the One Time Password (OTP) generated by your Authenticator App";
 
 
-		public _2faCodeDialog()
+		public _2faCodeDialog() : base(saveAndRestorePosition: false)
 		{
-			AvaloniaXamlLoader.Load(this);
+			InitializeComponent();
 			_2FABox = this.FindControl<TextBox>(nameof(_2FABox));
 		}
 

Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Dinah.Core;
 using FileManager;
 using System;

Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml

@@ -40,7 +40,7 @@
 				<Button Grid.Column="1" IsVisible="{Binding HasButton2}" MinWidth="75" MinHeight="28" Name="Button2" Click="Button2_Click" Margin="5">
 					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button2Text}"/>
 				</Button>
-				<Button Grid.Column="2" IsVisible="{Binding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Content="Cancel" Margin="5">
+				<Button Grid.Column="2" IsVisible="{Binding HasButton3}" MinWidth="75" MinHeight="28" Name="Button3" Click="Button3_Click" Margin="5">
 					<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Button3Text}"/>
 				</Button>
 			</StackPanel>

Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml.cs

@@ -1,6 +1,3 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using LibationAvalonia.ViewModels.Dialogs;
 
 namespace LibationAvalonia.Dialogs
@@ -12,7 +9,7 @@ namespace LibationAvalonia.Dialogs
 		{
 			InitializeComponent();
 		}
-		public MessageBoxWindow(bool saveAndRestorePosition):base(saveAndRestorePosition)
+		public MessageBoxWindow(bool saveAndRestorePosition) : base(saveAndRestorePosition)
 		{
 			InitializeComponent();
 		}

Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml

@@ -2,15 +2,15 @@
         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="500" d:DesignHeight="185"
+        mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="200"
         x:Class="LibationAvalonia.Dialogs.ScanAccountsDialog"
 		MinWidth="500" MinHeight="160"
-		MaxWidth="500" MaxHeight="185"
+		Width="500" Height="200"
         Title="Which Accounts?"
 		WindowStartupLocation="CenterOwner"
 		Icon="/Assets/libation.ico">
 
-	<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,Auto,Auto">
+	<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,*,Auto">
 		
 		<Grid.Styles>
 			<Style Selector="Button:focus">
@@ -23,20 +23,19 @@
 			Grid.Row="0"
 			Grid.Column="0"
 			Grid.ColumnSpan="2"
-			Margin="10,10,10,0"
+			Margin="10"
 			Text="Check the accounts to scan and import.&#xa;To change default selections, go to: Settings > Accounts"/>
 
 		<ScrollViewer
 			Grid.Row="1"
 			Grid.Column="0"
 			Grid.ColumnSpan="2"
+			Margin="10,0"
+			VerticalAlignment="Stretch"
 			HorizontalScrollBarVisibility="Disabled"
-			VerticalScrollBarVisibility="Auto"
-			Margin="10"
-			MinHeight="90"
-			MaxHeight="90">
+			VerticalScrollBarVisibility="Auto">
 
-			<ListBox Items="{Binding Accounts}">
+			<ListBox ItemsSource="{Binding Accounts}">
 				<ListBox.ItemTemplate>
 					<DataTemplate>
 
@@ -62,21 +61,19 @@
 		<Button
 			Grid.Row="2"
 			Grid.Column="0"
-			Padding="20,0,20,0"
-			Margin="10,0,10,10"
-			Height="25"
+			Padding="20,5"
+			Margin="10"
 			Content="Edit Accounts"
-			Click="EditAccountsButton_Clicked"/>
+			Command="{Binding EditAccountsAsync}"/>
 		
 		<Button
 			Grid.Row="2"
 			Grid.Column="1"
-			Padding="30,0,30,0"
-			Margin="10,0,10,10"
+			Padding="30,5"
+			Margin="10"
 			HorizontalAlignment="Right"
-			Height="25"
 			Content="Import"
 			Name="ImportButton"
-			Click="ImportButton_Clicked"/>
+			Command="{Binding SaveAndClose}"/>
 	</Grid>
 </Window>

Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml.cs

@@ -1,8 +1,6 @@
 using AudibleUtilities;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,7 +26,7 @@ namespace LibationAvalonia.Dialogs
 			InitializeComponent();
 
 			this.HideMinMaxBtns();
-			this.Opened += ScanAccountsDialog_Opened;
+			ControlToFocusOnShow = this.FindControl<Button>(nameof(ImportButton));
 
 			LoadAccounts();
 		}
@@ -49,12 +47,7 @@ namespace LibationAvalonia.Dialogs
 			DataContext = this;
 		}
 
-		private void ScanAccountsDialog_Opened(object sender, System.EventArgs e)
-		{
-			this.FindControl<Button>(nameof(ImportButton)).Focus();
-		}
-
-		public async void EditAccountsButton_Clicked(object sender, RoutedEventArgs e)
+		public async Task EditAccountsAsync()
 		{
 			if (await new AccountsDialog().ShowDialog<DialogResult>(this) == DialogResult.OK)
 			{
@@ -70,7 +63,5 @@ namespace LibationAvalonia.Dialogs
 
 			base.SaveAndClose();
 		}
-
-		public void ImportButton_Clicked(object sender, RoutedEventArgs e) => SaveAndClose();
 	}
 }

Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml

@@ -5,6 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="950" d:DesignHeight="650"
 		MinWidth="950" MinHeight="650"
 		MaxWidth="950" MaxHeight="650"
+		Width="950" Height="650"
         x:Class="LibationAvalonia.Dialogs.SearchSyntaxDialog"
         Title="Filter Options"
 		WindowStartupLocation="CenterOwner"

Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml.cs

@@ -1,5 +1,3 @@
-using Avalonia.Markup.Xaml;
-
 namespace LibationAvalonia.Dialogs
 {
 	public partial class SearchSyntaxDialog : DialogWindow

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml

@@ -3,9 +3,13 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="750"
-		MinWidth="900" MinHeight="700"
+		MinWidth="900" MinHeight="750"
+		Width="900" Height="750"
         x:Class="LibationAvalonia.Dialogs.SettingsDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        xmlns:settings="clr-namespace:LibationAvalonia.Controls.Settings"
+        xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Settings"
+		x:DataType="vm:SettingsVM"
         Title="Edit Settings"
 		Icon="/Assets/libation.ico">
 
@@ -18,793 +22,63 @@
 			Height="30"
 			Padding="30,3,30,3"
 			Content="Save"
+			Name="saveBtn"
 			Click="SaveButton_Clicked" />
 
-		<TabControl  Grid.Column="0">
+		<TabControl Name="tabControl" Grid.Column="0">
 			<TabControl.Styles>
-				<Style Selector="ItemsPresenter#PART_ItemsPresenter">
-					<Setter Property="Height" Value="28"/>
+				<Style Selector="TabControl /template/ ItemsPresenter#PART_ItemsPresenter">
+					<Setter Property="Height" Value="30"/>
+				</Style>
+				<Style Selector="TabControl /template/ ContentPresenter#PART_SelectedContentHost">
+					<Setter Property="BorderBrush" Value="{DynamicResource SystemBaseLowColor}" />
+					<Setter Property="BorderThickness" Value="1" />
 				</Style>
 				<Style Selector="TabItem">
-					<Setter Property="MinHeight" Value="40"/>
-					<Setter Property="Height" Value="40"/>
+					<Setter Property="MinHeight" Value="45"/>
+					<Setter Property="Height" Value="45"/>
 					<Setter Property="Padding" Value="8,2,8,10"/>
-				</Style>
-				<Style Selector="TabItem#Header TextBlock">
-					<Setter Property="MinHeight" Value="5"/>
+					<Style Selector="^ > TextBlock" >
+						<Setter Property="FontSize" Value="14" />
+						<Setter Property="VerticalAlignment" Value="Center" />
+					</Style>
 				</Style>
 			</TabControl.Styles>
 
-
 			<TabItem>
 
 				<TabItem.Header>
-
-					<TextBlock
-						FontSize="14"
-						VerticalAlignment="Center"
-						Text="Important Settings"/>
-
+					<TextBlock Text="Important Settings"/>
 				</TabItem.Header>
 
-				<Border
-					Grid.Column="0"
-					Grid.Row="0"
-					BorderThickness="2"
-					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-
-					<Grid RowDefinitions="Auto,Auto,*">
-
-						<controls:GroupBox
-							Grid.Row="0"
-							Margin="5"
-							BorderWidth="1"
-							Label="Books Location">
-
-							<StackPanel>
-								<TextBlock
-									Margin="5"
-									Text="{Binding ImportantSettings.BooksText}" />
-
-								<controls:DirectoryOrCustomSelectControl Margin="0,10,0,10"
-									SubDirectory="Books"
-									Directory="{Binding ImportantSettings.BooksDirectory, Mode=TwoWay}"
-									KnownDirectories="{Binding ImportantSettings.KnownDirectories}" />
-
-								<CheckBox IsChecked="{Binding ImportantSettings.SavePodcastsToParentFolder, Mode=TwoWay}">
-									<TextBlock Text="{Binding ImportantSettings.SavePodcastsToParentFolderText}" />
-								</CheckBox>
-
-							</StackPanel>
-
-						</controls:GroupBox>
-
-						<StackPanel
-							Grid.Row="1" Margin="5"
-							Orientation="Horizontal">
-
-							<TextBlock
-								Margin="0,0,10,0"
-								VerticalAlignment="Center"
-								Text="Logging level" />
-
-							<controls:WheelComboBox
-								Width="150"
-								Height="25"
-								HorizontalContentAlignment="Stretch"
-								SelectedItem="{Binding ImportantSettings.LoggingLevel, Mode=TwoWay}"
-								Items="{Binding ImportantSettings.LoggingLevels}" />
-
-							<Button
-								Margin="50,0,0,0"
-								Padding="20,3,20,3"
-								Content="Open Log Folder"
-								Click="OpenLogFolderButton_Click" />
-
-						</StackPanel>
-						<!--
-						<CheckBox
-							Grid.Row="2"
-							Margin="5"
-							VerticalAlignment="Bottom"
-							IsChecked="{Binding ImportantSettings.BetaOptIn, Mode=TwoWay}">
-
-							<TextBlock Text="{Binding ImportantSettings.BetaOptInText}" />
-
-						</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>
-
-
-			<TabItem>
-
-				<TabItem.Header>
-
-					<TextBlock
-						FontSize="14"
-						VerticalAlignment="Center"
-						Text="Import Library"/>
-
-				</TabItem.Header>
-
-				<Border
-					Grid.Column="0"
-					Grid.Row="0"
-					BorderThickness="2"
-					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-
-					<StackPanel Margin="5">
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.AutoScan, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.AutoScanText}" />
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.ShowImportedStats, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.ShowImportedStatsText}" />
-
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.ImportEpisodes, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.ImportEpisodesText}" />
-
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.DownloadEpisodes, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.DownloadEpisodesText}" />
-
-						</CheckBox>
-
-						<CheckBox
-							Margin="0,0,0,10"
-							IsChecked="{Binding ImportSettings.AutoDownloadEpisodes, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding ImportSettings.AutoDownloadEpisodesText}" />
-
-						</CheckBox>
-					</StackPanel>
-				</Border>
+				<settings:Important DataContext="{CompiledBinding ImportantSettings}" />
 			</TabItem>
 
 			<TabItem>
 
 				<TabItem.Header>
-
-					<TextBlock
-						FontSize="14"
-						VerticalAlignment="Center"
-						Text="Download/Decrypt"/>
-
+					<TextBlock Text="Import Library"/>
 				</TabItem.Header>
 
-				<Border
-					Grid.Column="0"
-					Grid.Row="0"
-					BorderThickness="2"
-					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
-
-					<Grid RowDefinitions="Auto,Auto,Auto,*">
-						<controls:GroupBox
-							Grid.Row="0"
-							Margin="5"
-							BorderWidth="1"
-							Label="{Binding DownloadDecryptSettings.BadBookGroupboxText}">
-
-							<Grid
-								ColumnDefinitions="*,*"
-								RowDefinitions="Auto,Auto">
-
-								<RadioButton
-									Grid.Column="0"
-									Grid.Row="0"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookAsk, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookAskText}" />
-
-								</RadioButton>
-
-								<RadioButton
-									Grid.Column="1"
-									Grid.Row="0"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookAbort, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookAbortText}" />
-
-								</RadioButton>
-
-								<RadioButton
-									Grid.Column="0"
-									Grid.Row="1"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookRetry, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookRetryText}" />
-
-								</RadioButton>
-
-								<RadioButton
-									Grid.Column="1"
-									Grid.Row="1"
-									Margin="0,5,0,5"
-									IsChecked="{Binding DownloadDecryptSettings.BadBookIgnore, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="{Binding DownloadDecryptSettings.BadBookIgnoreText}" />
-
-								</RadioButton>
-							</Grid>
-						</controls:GroupBox>
-
-						<controls:GroupBox
-							Margin="5"
-							Grid.Row="1"
-							BorderWidth="1"
-							Label="Custom File Naming">
-
-							<Grid
-								RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
-								ColumnDefinitions="*,Auto">
-
-								<TextBlock
-									Grid.Row="0"
-									Grid.Column="0"
-									Margin="0,5,0,0"
-									Text="{Binding DownloadDecryptSettings.FolderTemplateText}" />
-
-								<TextBox
-									Grid.Row="1"
-									Grid.Column="0"
-									Margin="0,5,10,10"
-									FontSize="14"
-									IsReadOnly="True"
-									Text="{Binding DownloadDecryptSettings.FolderTemplate}" />
-
-								<Button
-									Grid.Row="1"
-									Grid.Column="1"
-									Content="Edit"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditFolderTemplateButton_Click" />
-
-								<TextBlock
-									Grid.Row="2"
-									Grid.Column="0"
-									Text="{Binding DownloadDecryptSettings.FileTemplateText}" />
-
-								<TextBox
-									Grid.Row="3"
-									Grid.Column="0"
-									Margin="0,5,10,10"
-									FontSize="14"
-									IsReadOnly="True"
-									Text="{Binding DownloadDecryptSettings.FileTemplate}" />
-
-								<Button
-									Grid.Row="3"
-									Grid.Column="1"
-									Content="Edit"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditFileTemplateButton_Click" />
-
-								<TextBlock
-									Grid.Row="4"
-									Grid.Column="0"
-									Text="{Binding DownloadDecryptSettings.ChapterFileTemplateText}" />
-
-								<TextBox
-									Grid.Row="5"
-									Grid.Column="0"
-									Margin="0,5,10,10"
-									FontSize="14"
-									IsReadOnly="True"
-									Text="{Binding DownloadDecryptSettings.ChapterFileTemplate}" />
-
-								<Button
-									Grid.Row="5"
-									Grid.Column="1"
-									Content="Edit"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditChapterFileTemplateButton_Click" />
-
-								<Button
-									Grid.Row="6"
-									Grid.Column="0"
-									Content="{Binding DownloadDecryptSettings.EditCharReplacementText}"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditCharReplacementButton_Click" />
-
-							</Grid>
-						</controls:GroupBox>
-						<controls:GroupBox
-							Grid.Row="2"
-							Margin="5"
-							BorderWidth="1"
-							Label="Temporary Files Location">
-
-							<StackPanel
-								Margin="5" >
-
-								<TextBlock
-									Margin="0,0,0,10"
-									Text="{Binding DownloadDecryptSettings.InProgressDescriptionText}" />
-
-								<controls:DirectoryOrCustomSelectControl
-									Directory="{Binding DownloadDecryptSettings.InProgressDirectory, Mode=TwoWay}"
-									KnownDirectories="{Binding DownloadDecryptSettings.KnownDirectories}" />
-
-
-							</StackPanel>
-						</controls:GroupBox>
-
-						<CheckBox
-							Grid.Row="3"
-							Margin="5"
-							VerticalAlignment="Top"
-							IsVisible="{Binding !IsLinux}"
-							IsChecked="{Binding DownloadDecryptSettings.UseCoverAsFolderIcon, Mode=TwoWay}">
-
-							<TextBlock
-								TextWrapping="Wrap"
-								Text="{Binding DownloadDecryptSettings.UseCoverAsFolderIconText}" />
-
-						</CheckBox>
-
-					</Grid>
-				</Border>
+				<settings:Import DataContext="{CompiledBinding ImportSettings}" />
 			</TabItem>
 
 			<TabItem>
 
 				<TabItem.Header>
-
-					<TextBlock
-						FontSize="14"
-						VerticalAlignment="Center"
-						Text="Audio File Settings"/>
-
+					<TextBlock Text="Download/Decrypt"/>
 				</TabItem.Header>
 
-				<Border
-					Grid.Column="0"
-					Grid.Row="0"
-					BorderThickness="2"
-					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
+				<settings:DownloadDecrypt DataContext="{CompiledBinding DownloadDecryptSettings}" />
+			</TabItem>
 
-					<Grid
-						RowDefinitions="*,Auto"
-						ColumnDefinitions="*,*">
+			<TabItem>
 
-						<StackPanel
-							Margin="5"
-							Grid.Row="0"
-							Grid.Column="0">
+				<TabItem.Header>
+					<TextBlock Text="Audio File Settings"/>
+				</TabItem.Header>
 
-							<CheckBox
-								Margin="0,0,0,5"
-								IsChecked="{Binding AudioSettings.CreateCueSheet, Mode=TwoWay}">
-
-								<TextBlock
-									TextWrapping="Wrap"
-									Text="{Binding AudioSettings.CreateCueSheetText}" />
-
-							</CheckBox>
-
-							<CheckBox
-								Margin="0,0,0,5"
-								IsChecked="{Binding AudioSettings.DownloadCoverArt, Mode=TwoWay}">
-
-								<TextBlock
-									TextWrapping="Wrap"
-									Text="{Binding AudioSettings.DownloadCoverArtText}" />
-
-							</CheckBox>
-
-							<StackPanel Orientation="Horizontal">
-								
-								<CheckBox
-									Margin="0,0,0,5"
-									IsChecked="{Binding AudioSettings.DownloadClipsBookmarks, Mode=TwoWay}">
-
-									<TextBlock
-										TextWrapping="Wrap"
-										Text="Download Clips, Notes and Bookmarks as" />
-
-								</CheckBox>
-								
-								<controls:WheelComboBox
-									Margin="5,0,0,0"
-									IsEnabled="{Binding AudioSettings.DownloadClipsBookmarks}"
-									Items="{Binding AudioSettings.ClipBookmarkFormats}"
-									SelectedItem="{Binding AudioSettings.ClipBookmarkFormat}"/>
-							
-							</StackPanel>
-
-							<CheckBox
-								Margin="0,0,0,5"
-								IsChecked="{Binding AudioSettings.RetainAaxFile, Mode=TwoWay}">
-
-								<TextBlock
-									TextWrapping="Wrap"
-									Text="{Binding AudioSettings.RetainAaxFileText}" />
-
-							</CheckBox>
-
-							<CheckBox
-								Margin="0,0,0,5"
-								IsChecked="{Binding AudioSettings.MergeOpeningAndEndCredits, Mode=TwoWay}">
-
-								<TextBlock
-									TextWrapping="Wrap"
-									Text="{Binding AudioSettings.MergeOpeningEndCreditsText}" />
-
-							</CheckBox>
-
-							<CheckBox
-								Margin="0,0,0,5"
-								IsChecked="{Binding AudioSettings.AllowLibationFixup, Mode=TwoWay}">
-
-								<TextBlock
-									TextWrapping="Wrap"
-									Text="{Binding AudioSettings.AllowLibationFixupText}" />
-							</CheckBox>
-
-							<controls:GroupBox
-								BorderWidth="1"
-								Label="Audiobook Fix-ups"
-								IsEnabled="{Binding AudioSettings.AllowLibationFixup}">
-
-								<StackPanel Orientation="Vertical">
-
-									<CheckBox
-										Margin="0,0,0,5"
-										IsChecked="{Binding AudioSettings.SplitFilesByChapter, Mode=TwoWay}">
-
-										<TextBlock
-											TextWrapping="Wrap"
-											Text="{Binding AudioSettings.SplitFilesByChapterText}" />
-
-									</CheckBox>
-
-									<CheckBox
-										Margin="0,0,0,5"
-										IsChecked="{Binding AudioSettings.StripAudibleBrandAudio, Mode=TwoWay}">
-
-										<TextBlock
-											TextWrapping="Wrap"
-											Text="{Binding AudioSettings.StripAudibleBrandingText}" />
-
-									</CheckBox>
-
-									<CheckBox
-										Margin="0,0,0,5"
-										IsChecked="{Binding AudioSettings.StripUnabridged, Mode=TwoWay}">
-
-										<TextBlock
-											TextWrapping="Wrap"
-											Text="{Binding AudioSettings.StripUnabridgedText}" />
-
-									</CheckBox>
-
-									<RadioButton
-										Margin="0,5,0,5"
-										IsChecked="{Binding !AudioSettings.DecryptToLossy, Mode=TwoWay}">
-
-										<StackPanel >
-
-											<TextBlock
-												TextWrapping="Wrap"
-												Text="Download my books in the original audio format (Lossless)" />
-											<CheckBox
-												Margin="0,0,0,5"
-												IsEnabled="{Binding !AudioSettings.DecryptToLossy}"
-												IsChecked="{Binding AudioSettings.MoveMoovToBeginning, Mode=TwoWay}">
-
-												<TextBlock
-													TextWrapping="Wrap"
-													Text="{Binding AudioSettings.MoveMoovToBeginningText}" />
-
-											</CheckBox>
-
-										</StackPanel>
-									</RadioButton>
-
-									<RadioButton
-										Margin="0,5,0,5"
-										IsChecked="{Binding AudioSettings.DecryptToLossy, Mode=TwoWay}">
-
-										<TextBlock
-											TextWrapping="Wrap"
-											Text="Download my books as .MP3 files (transcode if necessary)" />
-
-									</RadioButton>
-								</StackPanel>
-							</controls:GroupBox>
-						</StackPanel>
-
-						<StackPanel
-							Grid.Row="0"
-							Grid.Column="1">
-
-							<controls:GroupBox
-								BorderWidth="1"
-								Label="Mp3 Encoding Options">
-
-								<StackPanel Orientation="Vertical">
-
-									<Grid
-										Margin="5,5,5,0"
-										ColumnDefinitions="Auto,*">
-
-										<controls:GroupBox
-											BorderWidth="1"
-											Grid.Column="0"
-											Label="Target">
-
-											<StackPanel Orientation="Horizontal">
-
-												<RadioButton
-													Margin="10"
-													Content="Bitrate"
-													IsChecked="{Binding AudioSettings.LameTargetBitrate, Mode=TwoWay}"/>
-
-												<RadioButton
-													Margin="10"
-													Content="Quality"
-													IsChecked="{Binding !AudioSettings.LameTargetBitrate, Mode=TwoWay}"/>
-
-											</StackPanel>
-										</controls:GroupBox>
-
-										<CheckBox
-											HorizontalAlignment="Right"
-											Grid.Column="1"
-											IsChecked="{Binding AudioSettings.LameDownsampleMono, Mode=TwoWay}">
-
-											<TextBlock
-												TextWrapping="Wrap"
-												Text="Downsample to mono? (Recommended)" />
-
-										</CheckBox>
-									</Grid>
-
-									<Grid Margin="5,5,5,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto">
-
-										<TextBlock Margin="0,0,0,5" Text="Max audio sample rate:" />
-										<controls:WheelComboBox
-											Grid.Row="1"
-											HorizontalAlignment="Stretch"
-											Items="{Binding AudioSettings.SampleRates}"
-											SelectedItem="{Binding AudioSettings.SelectedSampleRate, Mode=TwoWay}"/>
-										
-										<TextBlock Margin="0,0,0,5" Grid.Column="2" Text="Encoder Quality:" />
-										
-										<controls:WheelComboBox
-											Grid.Column="2"
-											Grid.Row="1"
-											HorizontalAlignment="Stretch"
-											Items="{Binding AudioSettings.EncoderQualities}"
-											SelectedItem="{Binding AudioSettings.SelectedEncoderQuality, Mode=TwoWay}"/>
-									</Grid>
-
-									<controls:GroupBox
-										Margin="5,5,5,0"
-										BorderWidth="1"
-										Label="Bitrate"
-										IsEnabled="{Binding AudioSettings.LameTargetBitrate}" >
-
-										<StackPanel>
-
-											<Grid ColumnDefinitions="*,25,Auto">
-
-												<Slider
-													Grid.Column="0"
-													IsEnabled="{Binding !AudioSettings.LameMatchSource}"
-													Value="{Binding AudioSettings.LameBitrate, Mode=TwoWay}"
-													Minimum="16"
-													Maximum="320"
-													IsSnapToTickEnabled="True" TickFrequency="16"
-													Ticks="16,32,48,64,80,96,112,128,144,160,176,192,208,224,240,256,272,288,304,320"
-													TickPlacement="Outside">
-
-													<Slider.Styles>
-														<Style Selector="Slider /template/ Thumb">
-															<Setter Property="ToolTip.Tip" Value="{Binding $parent[Slider].Value, Mode=OneWay, StringFormat='\{0:f0\} Kbps'}" />
-															<Setter Property="ToolTip.Placement" Value="Top" />
-															<Setter Property="ToolTip.VerticalOffset" Value="-10" />
-															<Setter Property="ToolTip.HorizontalOffset" Value="-30" />
-														</Style>
-													</Slider.Styles>
-												</Slider>
-
-												<TextBlock
-													Grid.Column="1"
-													HorizontalAlignment="Right"
-													Text="{Binding AudioSettings.LameBitrate}" />
-
-												<TextBlock
-													Grid.Column="2"
-													Text=" Kbps" />
-
-											</Grid>
-
-											<Grid ColumnDefinitions="*,*">
-
-												<CheckBox
-													Grid.Column="0"
-													IsChecked="{Binding AudioSettings.LameConstantBitrate, Mode=TwoWay}">
-
-													<TextBlock
-														TextWrapping="Wrap"
-														Text="Restrict Encoder to Constant Bitrate?" />
-
-												</CheckBox>
-
-												<CheckBox
-													Grid.Column="1"
-													HorizontalAlignment="Right"
-													IsChecked="{Binding AudioSettings.LameMatchSource, Mode=TwoWay}">
-
-													<TextBlock
-														TextWrapping="Wrap"
-														Text="Match Source Bitrate?" />
-
-												</CheckBox>
-											</Grid>
-										</StackPanel>
-									</controls:GroupBox>
-
-									<controls:GroupBox
-										Margin="5,5,5,0"
-										BorderWidth="1"
-										Label="Quality"
-										IsEnabled="{Binding !AudioSettings.LameTargetBitrate}">
-
-										<Grid
-											ColumnDefinitions="*,*,25"
-											RowDefinitions="*,Auto">
-
-											<Slider
-												Grid.Column="0"
-												Grid.ColumnSpan="2"
-												Value="{Binding AudioSettings.LameVBRQuality, Mode=TwoWay}"
-												Minimum="0"
-												Maximum="9"
-												IsSnapToTickEnabled="True" TickFrequency="1"
-												Ticks="0,1,2,3,4,5,6,7,8,9"
-												TickPlacement="Outside">
-												<Slider.Styles>
-													<Style Selector="Slider /template/ Thumb">
-														<Setter Property="ToolTip.Tip" Value="{Binding $parent[Slider].Value, Mode=OneWay, StringFormat='V\{0:f0\}'}" />
-														<Setter Property="ToolTip.Placement" Value="Top" />
-														<Setter Property="ToolTip.VerticalOffset" Value="-10" />
-														<Setter Property="ToolTip.HorizontalOffset" Value="-30" />
-													</Style>
-												</Slider.Styles>
-											</Slider>
-
-											<StackPanel
-												Grid.Column="2"
-												HorizontalAlignment="Right"
-												Orientation="Horizontal">
-
-												<TextBlock Text="V" />
-												<TextBlock Text="{Binding AudioSettings.LameVBRQuality}" />
-
-											</StackPanel>
-
-											<TextBlock
-												Grid.Column="0"
-												Grid.Row="1"
-												Margin="10,0,0,0"
-												Text="Higher" />
-
-											<TextBlock
-												Grid.Column="1"
-												Grid.Row="1"
-												Margin="0,0,10,0"
-												HorizontalAlignment="Right"
-												Text="Lower" />
-
-										</Grid>
-									</controls:GroupBox>
-
-									<TextBlock
-										Margin="5,5,5,5"
-										Text="Using L.A.M.E encoding engine"
-										FontStyle="Italic" />
-
-								</StackPanel>
-							</controls:GroupBox>
-						</StackPanel>
-
-						<controls:GroupBox
-							Grid.Row="1"
-							Grid.ColumnSpan="2"
-							Margin="5"
-							BorderWidth="1" IsEnabled="{Binding AudioSettings.SplitFilesByChapter}"
-							Label="{Binding AudioSettings.ChapterTitleTemplateText}">
-
-							<Grid ColumnDefinitions="*,Auto">
-
-								<TextBox
-									Grid.Column="0"
-									Margin="0,10,10,10"
-									FontSize="14"
-									IsReadOnly="True"
-									Text="{Binding AudioSettings.ChapterTitleTemplate}" />
-
-								<Button
-									Grid.Column="1"
-									Content="Edit"
-									Height="30"
-									Padding="30,3,30,3"
-									Click="EditChapterTitleTemplateButton_Click" />
-							</Grid>
-						</controls:GroupBox>
-					</Grid>
-				</Border>
+				<settings:Audio DataContext="{CompiledBinding AudioSettings}" />
 			</TabItem>
 		</TabControl>
 	</Grid>

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml.cs

@@ -1,20 +1,13 @@
 using Avalonia.Controls;
+using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
-using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using ReactiveUI;
-using Dinah.Core;
-using System.Linq;
-using FileManager;
-using Avalonia.Collections;
-using LibationUiBase;
 
 namespace LibationAvalonia.Dialogs
 {
 	public partial class SettingsDialog : DialogWindow
 	{
-		private SettingsPages settingsDisp;
+		private SettingsVM settingsDisp;
 
 		private readonly Configuration config = Configuration.Instance;
 		public SettingsDialog()
@@ -28,8 +21,17 @@ namespace LibationAvalonia.Dialogs
 
 		protected override async Task SaveAndCloseAsync()
 		{
-			if (!await settingsDisp.SaveSettingsAsync(config))
+			#region validation
+
+			if (string.IsNullOrWhiteSpace(settingsDisp.ImportantSettings.BooksDirectory))
+			{
+				await MessageBox.Show(this.GetParentWindow(), "Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
+			}
+
+			#endregion
+
+			settingsDisp.SaveSettings(config);
 
 			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
 			await base.SaveAndCloseAsync();
@@ -37,494 +39,5 @@ namespace LibationAvalonia.Dialogs
 
 		public async void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 			=> await SaveAndCloseAsync();
-
-		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			Go.To.Folder(((LongPath)Configuration.Instance.LibationFiles).ShortPathName);
-		}
-
-		public async void EditFolderTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var newTemplate = await editTemplate(TemplateEditor<Templates.FolderTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.FolderTemplate));
-			if (newTemplate is not null)
-				settingsDisp.DownloadDecryptSettings.FolderTemplate = newTemplate;
-		}
-
-		public async void EditFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{			
-			var newTemplate = await editTemplate(TemplateEditor<Templates.FileTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.FileTemplate));
-			if (newTemplate is not null)
-				settingsDisp.DownloadDecryptSettings.FileTemplate = newTemplate;
-		}
-
-		public async void EditChapterFileTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			
-			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterFileTemplate>.CreateFilenameEditor(config.Books, settingsDisp.DownloadDecryptSettings.ChapterFileTemplate));
-			if (newTemplate is not null)
-				settingsDisp.DownloadDecryptSettings.ChapterFileTemplate = newTemplate;
-		}
-
-		public async void EditCharReplacementButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var form = new EditReplacementChars(config);
-			await form.ShowDialog<DialogResult>(this);
-		}
-
-		public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			var newTemplate = await editTemplate(TemplateEditor<Templates.ChapterTitleTemplate>.CreateNameEditor(settingsDisp.AudioSettings.ChapterTitleTemplate));
-			if (newTemplate is not null)
-				settingsDisp.AudioSettings.ChapterTitleTemplate = newTemplate;
-		}
-
-		private async Task<string> editTemplate(ITemplateEditor template)
-		{
-			var form = new EditTemplateDialog(template);
-			if (await form.ShowDialog<DialogResult>(this) == DialogResult.OK)
-				return template.EditingTemplate.TemplateText;
-			else return null;
-		}
-	}
-
-	internal interface ISettingsDisplay
-	{
-		void LoadSettings(Configuration config);
-		Task<bool> SaveSettingsAsync(Configuration config);
-	}
-
-	public class SettingsPages : ISettingsDisplay
-	{
-		public SettingsPages(Configuration config)
-		{
-			LoadSettings(config);
-		}
-
-		public bool IsLinux => Configuration.IsLinux;
-		public bool IsWindows => Configuration.IsWindows;
-		public ImportantSettings ImportantSettings { get; private set; }
-		public ImportSettings ImportSettings { get; private set; }
-		public DownloadDecryptSettings DownloadDecryptSettings { get; private set; }
-		public AudioSettings AudioSettings { get; private set; }
-
-		public void LoadSettings(Configuration config)
-		{
-			ImportantSettings = new(config);
-			ImportSettings = new(config);
-			DownloadDecryptSettings = new(config);
-			AudioSettings = new(config);
-		}
-
-		public async Task<bool> SaveSettingsAsync(Configuration config)
-		{
-			var result = await ImportantSettings.SaveSettingsAsync(config);
-			result &= await ImportSettings.SaveSettingsAsync(config);
-			result &= await DownloadDecryptSettings.SaveSettingsAsync(config);
-			result &= await AudioSettings.SaveSettingsAsync(config);
-
-			return result;
-		}
-	}
-
-	public class ImportantSettings : ViewModels.ViewModelBase, ISettingsDisplay
-	{
-		public ImportantSettings(Configuration config)
-		{
-			LoadSettings(config);
-		}
-
-		public void LoadSettings(Configuration config)
-		{
-			BooksDirectory = config.Books.PathWithoutPrefix;
-			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)
-		{
-			#region validation
-
-			if (string.IsNullOrWhiteSpace(BooksDirectory))
-			{
-				await MessageBox.Show("Cannot set Books Location to blank", "Location is blank", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return false;
-			}
-
-			#endregion
-
-			LongPath lonNewBooks = BooksDirectory;
-			if (!System.IO.Directory.Exists(lonNewBooks))
-				System.IO.Directory.CreateDirectory(lonNewBooks);
-			config.Books = BooksDirectory;
-			config.SavePodcastsToParentFolder = SavePodcastsToParentFolder;
-			config.LogLevel = LoggingLevel;
-			config.BetaOptIn = BetaOptIn;
-			Configuration.Instance.SetString(ThemeVariant, nameof(ThemeVariant));
-
-			return true;
-		}
-
-
-		public List<Configuration.KnownDirectories> KnownDirectories { get; } = new()
-		{
-			Configuration.KnownDirectories.UserProfile,
-			Configuration.KnownDirectories.AppDir,
-			Configuration.KnownDirectories.MyDocs
-		};
-
-		public string BooksText { get; } = Configuration.GetDescription(nameof(Configuration.Books));
-		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
-	{
-		public ImportSettings(Configuration config)
-		{
-			LoadSettings(config);
-		}
-
-		public void LoadSettings(Configuration config)
-		{
-			AutoScan = config.AutoScan;
-			ShowImportedStats = config.ShowImportedStats;
-			ImportEpisodes = config.ImportEpisodes;
-			DownloadEpisodes = config.DownloadEpisodes;
-			AutoDownloadEpisodes = config.AutoDownloadEpisodes;
-		}
-
-		public Task<bool> SaveSettingsAsync(Configuration config)
-		{
-			config.AutoScan = AutoScan;
-			config.ShowImportedStats = ShowImportedStats;
-			config.ImportEpisodes = ImportEpisodes;
-			config.DownloadEpisodes = DownloadEpisodes;
-			config.AutoDownloadEpisodes = AutoDownloadEpisodes;
-			return Task.FromResult(true);
-		}
-
-		public string AutoScanText { get; } = Configuration.GetDescription(nameof(Configuration.AutoScan));
-		public string ShowImportedStatsText { get; } = Configuration.GetDescription(nameof(Configuration.ShowImportedStats));
-		public string ImportEpisodesText { get; } = Configuration.GetDescription(nameof(Configuration.ImportEpisodes));
-		public string DownloadEpisodesText { get; } = Configuration.GetDescription(nameof(Configuration.DownloadEpisodes));
-		public string AutoDownloadEpisodesText { get; } = Configuration.GetDescription(nameof(Configuration.AutoDownloadEpisodes));
-
-		public bool AutoScan { get; set; }
-		public bool ShowImportedStats { get; set; }
-		public bool ImportEpisodes { get; set; }
-		public bool DownloadEpisodes { get; set; }
-		public bool AutoDownloadEpisodes { get; set; }
-	}
-	
-	public class DownloadDecryptSettings : ViewModels.ViewModelBase, ISettingsDisplay
-	{
-		private bool _badBookAsk;
-		private bool _badBookAbort;
-		private bool _badBookRetry;
-		private bool _badBookIgnore;
-
-		private string _folderTemplate;
-		private string _fileTemplate;
-		private string _chapterFileTemplate;
-
-		public DownloadDecryptSettings(Configuration config)
-		{
-			LoadSettings(config);
-		}
-
-		public List<Configuration.KnownDirectories> KnownDirectories { get; } = new()
-		{
-				Configuration.KnownDirectories.WinTemp,
-				Configuration.KnownDirectories.UserProfile,
-				Configuration.KnownDirectories.AppDir,
-				Configuration.KnownDirectories.MyDocs,
-				Configuration.KnownDirectories.LibationFiles
-		};
-
-		public string InProgressDirectory { get; set; }
-		public void LoadSettings(Configuration config)
-		{
-			BadBookAsk = config.BadBook is Configuration.BadBookAction.Ask;
-			BadBookAbort = config.BadBook is Configuration.BadBookAction.Abort;
-			BadBookRetry = config.BadBook is Configuration.BadBookAction.Retry;
-			BadBookIgnore = config.BadBook is Configuration.BadBookAction.Ignore;
-			FolderTemplate = config.FolderTemplate;
-			FileTemplate = config.FileTemplate;
-			ChapterFileTemplate = config.ChapterFileTemplate;
-			InProgressDirectory = config.InProgress;
-			UseCoverAsFolderIcon = config.UseCoverAsFolderIcon;
-		}
-
-		public Task<bool> SaveSettingsAsync(Configuration config)
-		{
-			config.BadBook
-				= BadBookAbort ? Configuration.BadBookAction.Abort
-				: BadBookRetry ? Configuration.BadBookAction.Retry
-				: BadBookIgnore ? Configuration.BadBookAction.Ignore
-				: Configuration.BadBookAction.Ask;
-
-			config.FolderTemplate = FolderTemplate;
-			config.FileTemplate = FileTemplate;
-			config.ChapterFileTemplate = ChapterFileTemplate;
-			config.InProgress = InProgressDirectory;
-
-			config.UseCoverAsFolderIcon = UseCoverAsFolderIcon;
-
-			return Task.FromResult(true);
-		}
-
-		public string UseCoverAsFolderIconText { get; } = Configuration.GetDescription(nameof(Configuration.UseCoverAsFolderIcon));
-		public string BadBookGroupboxText { get; } = Configuration.GetDescription(nameof(Configuration.BadBook));
-		public string BadBookAskText { get; } = Configuration.BadBookAction.Ask.GetDescription();
-		public string BadBookAbortText { get; } = Configuration.BadBookAction.Abort.GetDescription();
-		public string BadBookRetryText { get; } = Configuration.BadBookAction.Retry.GetDescription();
-		public string BadBookIgnoreText { get; } = Configuration.BadBookAction.Ignore.GetDescription();
-		public string FolderTemplateText { get; } = Configuration.GetDescription(nameof(Configuration.FolderTemplate));
-		public string FileTemplateText { get; } = Configuration.GetDescription(nameof(Configuration.FileTemplate));
-		public string ChapterFileTemplateText { get; } = Configuration.GetDescription(nameof(Configuration.ChapterFileTemplate));
-		public string EditCharReplacementText { get; } = Configuration.GetDescription(nameof(Configuration.ReplacementCharacters));
-		public string InProgressDescriptionText { get; } = Configuration.GetDescription(nameof(Configuration.InProgress));
-
-		public string FolderTemplate { get => _folderTemplate; set { this.RaiseAndSetIfChanged(ref _folderTemplate, value); } }
-		public string FileTemplate { get => _fileTemplate; set { this.RaiseAndSetIfChanged(ref _fileTemplate, value); } }
-		public string ChapterFileTemplate { get => _chapterFileTemplate; set { this.RaiseAndSetIfChanged(ref _chapterFileTemplate, value); } }
-		public bool UseCoverAsFolderIcon { get; set; }
-
-		public bool BadBookAsk
-		{
-			get => _badBookAsk;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _badBookAsk, value);
-				if (value)
-				{
-					BadBookAbort = false;
-					BadBookRetry = false;
-					BadBookIgnore = false;
-				}
-			}
-		}
-		public bool BadBookAbort
-		{
-			get => _badBookAbort;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _badBookAbort, value);
-				if (value)
-				{
-					BadBookAsk = false;
-					BadBookRetry = false;
-					BadBookIgnore = false;
-				}
-			}
-		}
-		public bool BadBookRetry		
-		{
-			get => _badBookRetry;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _badBookRetry, value);
-				if (value)
-				{
-					BadBookAsk = false;
-					BadBookAbort = false;
-					BadBookIgnore = false;
-				}
-			}
-		}
-		public bool BadBookIgnore
-		{
-			get => _badBookIgnore;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _badBookIgnore, value);
-				if (value)
-				{
-					BadBookAsk = false;
-					BadBookAbort = false;
-					BadBookRetry = false;
-				}
-			}
-		}
-	}
-
-	public class AudioSettings : ViewModels.ViewModelBase, ISettingsDisplay
-	{
-
-		private bool _downloadClipsBookmarks;
-		private bool _decryptToLossy;
-		private bool _splitFilesByChapter;
-		private bool _allowLibationFixup;
-		private bool _lameTargetBitrate;
-		private bool _lameMatchSource;
-		private int _lameBitrate;
-		private int _lameVBRQuality;
-		private string _chapterTitleTemplate;
-		public SampleRateSelection SelectedSampleRate { get; set; }
-		public NAudio.Lame.EncoderQuality SelectedEncoderQuality { get; set; }
-
-		public AvaloniaList<SampleRateSelection> SampleRates { get; }
-			= new(
-				new []
-				{
-					AAXClean.SampleRate.Hz_44100,
-					AAXClean.SampleRate.Hz_32000,
-					AAXClean.SampleRate.Hz_24000,
-					AAXClean.SampleRate.Hz_22050,
-					AAXClean.SampleRate.Hz_16000,
-					AAXClean.SampleRate.Hz_12000,
-				}
-				.Select(s => new SampleRateSelection(s)));
-
-		public AvaloniaList<NAudio.Lame.EncoderQuality> EncoderQualities { get; }
-		= new(
-			new[]
-			{
-				NAudio.Lame.EncoderQuality.High,
-				NAudio.Lame.EncoderQuality.Standard,
-				NAudio.Lame.EncoderQuality.Fast,
-			});
-
-
-		public AudioSettings(Configuration config)
-		{
-			LoadSettings(config);
-		}
-		public void LoadSettings(Configuration config)
-		{
-			CreateCueSheet = config.CreateCueSheet;
-			AllowLibationFixup = config.AllowLibationFixup;
-			DownloadCoverArt = config.DownloadCoverArt;
-			RetainAaxFile = config.RetainAaxFile;
-			DownloadClipsBookmarks = config.DownloadClipsBookmarks;
-			ClipBookmarkFormat = config.ClipsBookmarksFileFormat;
-			SplitFilesByChapter = config.SplitFilesByChapter;
-			MergeOpeningAndEndCredits = config.MergeOpeningAndEndCredits;
-			StripAudibleBrandAudio = config.StripAudibleBrandAudio;
-			StripUnabridged = config.StripUnabridged;
-			ChapterTitleTemplate = config.ChapterTitleTemplate;
-			DecryptToLossy = config.DecryptToLossy;
-			MoveMoovToBeginning = config.MoveMoovToBeginning;
-			LameTargetBitrate = config.LameTargetBitrate;
-			LameDownsampleMono = config.LameDownsampleMono;
-			LameConstantBitrate = config.LameConstantBitrate;
-			LameMatchSource = config.LameMatchSourceBR;
-			LameBitrate = config.LameBitrate;
-			LameVBRQuality = config.LameVBRQuality;
-
-			SelectedSampleRate = SampleRates.FirstOrDefault(s => s.SampleRate == config.MaxSampleRate);
-			SelectedEncoderQuality = config.LameEncoderQuality;
-		}
-
-		public Task<bool> SaveSettingsAsync(Configuration config)
-		{
-			config.CreateCueSheet = CreateCueSheet;
-			config.AllowLibationFixup = AllowLibationFixup;
-			config.DownloadCoverArt = DownloadCoverArt;
-			config.RetainAaxFile = RetainAaxFile;
-			config.DownloadClipsBookmarks = DownloadClipsBookmarks;
-			config.ClipsBookmarksFileFormat = ClipBookmarkFormat;
-			config.SplitFilesByChapter = SplitFilesByChapter;
-			config.MergeOpeningAndEndCredits = MergeOpeningAndEndCredits;
-			config.StripAudibleBrandAudio = StripAudibleBrandAudio;
-			config.StripUnabridged = StripUnabridged;
-			config.ChapterTitleTemplate = ChapterTitleTemplate;
-			config.DecryptToLossy = DecryptToLossy;
-			config.MoveMoovToBeginning = MoveMoovToBeginning;
-			config.LameTargetBitrate = LameTargetBitrate;
-			config.LameDownsampleMono = LameDownsampleMono;
-			config.LameConstantBitrate = LameConstantBitrate;
-			config.LameMatchSourceBR = LameMatchSource;
-			config.LameBitrate = LameBitrate;
-			config.LameVBRQuality = LameVBRQuality;
-
-			config.LameEncoderQuality = SelectedEncoderQuality;
-			config.MaxSampleRate = SelectedSampleRate?.SampleRate ?? config.MaxSampleRate;
-
-			return Task.FromResult(true);
-		}
-
-		public AvaloniaList<Configuration.ClipBookmarkFormat> ClipBookmarkFormats { get; } = new(Enum<Configuration.ClipBookmarkFormat>.GetValues());
-		public string CreateCueSheetText { get; } = Configuration.GetDescription(nameof(Configuration.CreateCueSheet));
-		public string AllowLibationFixupText { get; } = Configuration.GetDescription(nameof(Configuration.AllowLibationFixup));
-		public string DownloadCoverArtText { get; } = Configuration.GetDescription(nameof(Configuration.DownloadCoverArt));
-		public string RetainAaxFileText { get; } = Configuration.GetDescription(nameof(Configuration.RetainAaxFile));
-		public string SplitFilesByChapterText { get; } = Configuration.GetDescription(nameof(Configuration.SplitFilesByChapter));
-		public string MergeOpeningEndCreditsText { get; } = Configuration.GetDescription(nameof(Configuration.MergeOpeningAndEndCredits));
-		public string StripAudibleBrandingText { get; } = Configuration.GetDescription(nameof(Configuration.StripAudibleBrandAudio));
-		public string StripUnabridgedText { get; } = Configuration.GetDescription(nameof(Configuration.StripUnabridged));
-		public string ChapterTitleTemplateText { get; } = Configuration.GetDescription(nameof(Configuration.ChapterTitleTemplate));
-		public string MoveMoovToBeginningText { get; } = Configuration.GetDescription(nameof(Configuration.MoveMoovToBeginning));
-
-		public bool CreateCueSheet { get; set; }
-		public bool DownloadCoverArt { get; set; }
-		public bool RetainAaxFile { get; set; }
-		public bool DownloadClipsBookmarks { get => _downloadClipsBookmarks; set => this.RaiseAndSetIfChanged(ref _downloadClipsBookmarks, value); }
-		public Configuration.ClipBookmarkFormat ClipBookmarkFormat { get; set; }
-		public bool MergeOpeningAndEndCredits { get; set; }
-		public bool StripAudibleBrandAudio { get; set; }
-		public bool StripUnabridged { get; set; }
-		public bool DecryptToLossy { get => _decryptToLossy; set => this.RaiseAndSetIfChanged(ref _decryptToLossy, value); }
-		public bool MoveMoovToBeginning { get; set; }
-
-		public bool LameDownsampleMono { get; set; } = Design.IsDesignMode;
-		public bool LameConstantBitrate { get; set; } = Design.IsDesignMode;
-
-		public bool SplitFilesByChapter { get => _splitFilesByChapter; set { this.RaiseAndSetIfChanged(ref _splitFilesByChapter, value); } }
-		public bool LameTargetBitrate { get => _lameTargetBitrate; set { this.RaiseAndSetIfChanged(ref _lameTargetBitrate, value); } }
-		public bool LameMatchSource { get => _lameMatchSource; set { this.RaiseAndSetIfChanged(ref _lameMatchSource, value); } }
-		public int LameBitrate { get => _lameBitrate; set { this.RaiseAndSetIfChanged(ref _lameBitrate, value); } }
-		public int LameVBRQuality { get => _lameVBRQuality; set { this.RaiseAndSetIfChanged(ref _lameVBRQuality, value); } }
-
-
-		public string ChapterTitleTemplate { get => _chapterTitleTemplate; set { this.RaiseAndSetIfChanged(ref _chapterTitleTemplate, value); } }
-
-
-		public bool AllowLibationFixup
-		{
-			get => _allowLibationFixup;
-			set
-			{
-				this.RaiseAndSetIfChanged(ref _allowLibationFixup, value);
-				if (!_allowLibationFixup)
-				{
-					SplitFilesByChapter = false;
-					StripAudibleBrandAudio = false;
-					StripUnabridged = false;
-					DecryptToLossy = false;
-					this.RaisePropertyChanged(nameof(SplitFilesByChapter));
-					this.RaisePropertyChanged(nameof(StripAudibleBrandAudio));
-					this.RaisePropertyChanged(nameof(StripUnabridged));
-					this.RaisePropertyChanged(nameof(DecryptToLossy));
-				}
-			}
-		}
 	}
 }