Merge pull request #313 from Mbucari/master

Fixed hidden items being duplicated on library scan

.gitignore

@@ -184,7 +184,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+#*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to

Documentation/Advanced.md

@@ -27,7 +27,7 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
 
 ### Linux and Mac
 
-Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592))
+Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592), [Linux and WINE](https://github.com/rmcrackan/Libation/issues/28#issuecomment-1161111014))
 
 ### Settings
 

README.md

@@ -66,4 +66,4 @@
 
 Disclaimer: I've made every good-faith effort to include nothing insecure, malicious, anti-privacy, or destructive. That said: use at your own risk.
 
-I made this for myself and I want to share it with the great programming and audible/audiobook communiites which have been so generous with their time and help.
+I made this for myself and I want to share it with the great programming and audible/audiobook communities which have been so generous with their time and help.

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -5,10 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AAXClean.Codecs" Version="0.2.9" />
+    <PackageReference Include="AAXClean.Codecs" Version="0.2.10" />
   </ItemGroup>
 
-  <ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+
+	<ItemGroup>
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -34,27 +34,12 @@ namespace AaxDecrypter
 
 			//Finishing configuring lame encoder.
 			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
-			{
-				double bitrateMultiple = 1;
+				MpegUtil.ConfigureLameOptions(
+					AaxFile,
+					DownloadOptions.LameConfig,
+					DownloadOptions.Downsample,
+					DownloadOptions.MatchSourceBitrate);
 
-				if (AaxFile.AudioChannels == 2)
-				{
-					if (DownloadOptions.Downsample)
-						bitrateMultiple = 0.5;
-					else
-						DownloadOptions.LameConfig.Mode = NAudio.Lame.MPEGMode.Stereo;
-				}
-
-				if (DownloadOptions.MatchSourceBitrate)
-				{
-					int kbps = (int)(AaxFile.AverageBitrate * bitrateMultiple / 1024);
-
-					if (DownloadOptions.LameConfig.VBR is null)
-						DownloadOptions.LameConfig.BitRate = kbps;
-					else if (DownloadOptions.LameConfig.VBR == NAudio.Lame.VBRMode.ABR)
-						DownloadOptions.LameConfig.ABRRateKbps = kbps;
-				}
-			}
 
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
 			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -2,31 +2,65 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
-using Dinah.Core;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadMultiConverter : AaxcDownloadConvertBase
 	{
-		protected override StepSequence Steps { get; }
 		private static TimeSpan minChapterLength { get; } = TimeSpan.FromSeconds(3);
 		private List<string> multiPartFilePaths { get; } = new List<string>();
 
 		public AaxcDownloadMultiConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
-				["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-				["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsMultipleFilesPerChapter,
-				["Step 3: Cleanup"] = Step_Cleanup,
-			};
+		public override async Task<bool> RunAsync()
+		{
+			try
+			{
+				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+
+				//Step 1
+				Serilog.Log.Information("Begin Get Aaxc Metadata");
+				if (await Task.Run(Step_GetMetadata))
+					Serilog.Log.Information("Completed Get Aaxc Metadata");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Get Aaxc Metadata");
+					return false;
+				}
+
+				//Step 2
+				Serilog.Log.Information("Begin Download Decrypted Audiobook");
+				if (await Step_DownloadAudiobookAsMultipleFilesPerChapter())
+					Serilog.Log.Information("Completed Download Decrypted Audiobook");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Download Decrypted Audiobook");
+					return false;
+				}
+
+				//Step 3
+				Serilog.Log.Information("Begin Cleanup");
+				if (await Task.Run(Step_Cleanup))
+					Serilog.Log.Information("Completed Cleanup");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Cleanup");
+					return false;
+				}
+
+				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return true;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return false;
+			}
 		}
 
 		/*
@@ -53,7 +87,7 @@ The book will be split into the following files:
 
 That naming may not be desirable for everyone, but it's an easy change to instead use the last of the combined chapter's title in the file name.
 		 */
-		private bool Step_DownloadAudiobookAsMultipleFilesPerChapter()
+		private async Task<bool> Step_DownloadAudiobookAsMultipleFilesPerChapter()
 		{
 			var zeroProgress = Step_DownloadAudiobook_Start();
 
@@ -86,9 +120,9 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
 			if (DownloadOptions.OutputFormat == OutputFormat.M4b)
-				result = ConvertToMultiMp4a(splitChapters);
+				result = await ConvertToMultiMp4a(splitChapters);
 			else
-				result = ConvertToMultiMp3(splitChapters);
+				result = await ConvertToMultiMp3(splitChapters);
 			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
 			Step_DownloadAudiobook_End(zeroProgress);
@@ -96,10 +130,10 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 			return result == ConversionResult.NoErrorsDetected;
 		}
 
-		private ConversionResult ConvertToMultiMp4a(ChapterInfo splitChapters)
+		private Task<ConversionResult> ConvertToMultiMp4a(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp4a
+			return AaxFile.ConvertToMultiMp4aAsync
 				(
 					splitChapters,
 					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
@@ -107,10 +141,10 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 				);
 		}
 
-		private ConversionResult ConvertToMultiMp3(ChapterInfo splitChapters)
+		private Task<ConversionResult> ConvertToMultiMp3(ChapterInfo splitChapters)
 		{
 			var chapterCount = 0;
-			return AaxFile.ConvertToMultiMp3
+			return AaxFile.ConvertToMultiMp3Async
 				(
 					splitChapters,
 					newSplitCallback => Callback(++chapterCount, splitChapters, newSplitCallback),
@@ -121,7 +155,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 
 
 		private void Callback(int currentChapter, ChapterInfo splitChapters, NewMP3SplitCallback newSplitCallback)
-			=> Callback(currentChapter, splitChapters, newSplitCallback);
+			=> Callback(currentChapter, splitChapters, newSplitCallback as NewSplitCallback);
 
 		private void Callback(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
 		{
@@ -141,7 +175,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 		private FileStream createOutputFileStream(MultiConvertFileProperties multiConvertFileProperties)
 		{
 			var fileName = DownloadOptions.GetMultipartFileName(multiConvertFileProperties);
-			fileName = FileUtility.GetValidFilename(fileName);
+			fileName = FileUtility.GetValidFilename(fileName, DownloadOptions.ReplacementCharacters);
 
 			multiPartFilePaths.Add(fileName);
 

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -1,31 +1,74 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using AAXClean;
 using AAXClean.Codecs;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
 {
 	public class AaxcDownloadSingleConverter : AaxcDownloadConvertBase
 	{
-		protected override StepSequence Steps { get; }
-
 		public AaxcDownloadSingleConverter(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
-			: base(outFileName, cacheDirectory, dlOptions)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download and Convert Aaxc To " + DownloadOptions.OutputFormat,
+			: base(outFileName, cacheDirectory, dlOptions) { }
 
-				["Step 1: Get Aaxc Metadata"] = Step_GetMetadata,
-				["Step 2: Download Decrypted Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-				["Step 3: Create Cue"] = Step_CreateCue,
-				["Step 4: Cleanup"] = Step_Cleanup,
-			};
+		public override async Task<bool> RunAsync()
+		{
+			try
+			{
+				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+
+				//Step 1
+				Serilog.Log.Information("Begin Step 1: Get Aaxc Metadata");
+				if (await Task.Run(Step_GetMetadata))
+					Serilog.Log.Information("Completed Step 1: Get Aaxc Metadata");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 1: Get Aaxc Metadata");
+					return false;
+				}
+
+				//Step 2
+				Serilog.Log.Information("Begin Step 2: Download Decrypted Audiobook");
+				if (await Step_DownloadAudiobookAsSingleFile())
+					Serilog.Log.Information("Completed Step 2: Download Decrypted Audiobook");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 2: Download Decrypted Audiobook");
+					return false;
+				}
+
+				//Step 3
+				Serilog.Log.Information("Begin Step 3: Create Cue");
+				if (await Task.Run(Step_CreateCue))
+					Serilog.Log.Information("Completed Step 3: Create Cue");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 3: Create Cue");
+					return false;
+				}
+
+				//Step 4
+				Serilog.Log.Information("Begin Step 4: Cleanup");
+				if (await Task.Run(Step_Cleanup))
+					Serilog.Log.Information("Completed Step 4: Cleanup");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 4: Cleanup");
+					return false;
+				}
+
+				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return true;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return false;
+			}
 		}
 
-		private bool Step_DownloadAudiobookAsSingleFile()
+		private async Task<bool> Step_DownloadAudiobookAsSingleFile()
 		{
 			var zeroProgress = Step_DownloadAudiobook_Start();
 
@@ -35,13 +78,10 @@ namespace AaxDecrypter
 			OnFileCreated(OutputFileName);
 
 			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-			var decryptionResult
-				= DownloadOptions.OutputFormat == OutputFormat.M4b
-				? AaxFile.ConvertToMp4a(outputFile, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength)
-				: AaxFile.ConvertToMp3(outputFile, DownloadOptions.LameConfig, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength);
-			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
-			DownloadOptions.ChapterInfo = AaxFile.Chapters;
+			ConversionResult decryptionResult = await decryptAsync(outputFile);
+
+			AaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
 			Step_DownloadAudiobook_End(zeroProgress);
 
@@ -51,5 +91,23 @@ namespace AaxDecrypter
 
 			return success;
 		}
+
+		private Task<ConversionResult> decryptAsync(Stream outputFile)
+			=> DownloadOptions.OutputFormat == OutputFormat.Mp3 ? 
+			AaxFile.ConvertToMp3Async
+			(
+				outputFile,
+				DownloadOptions.LameConfig,
+				DownloadOptions.ChapterInfo,
+				DownloadOptions.TrimOutputToChapterLength
+			)
+			: DownloadOptions.FixupFile ?
+				AaxFile.ConvertToMp4aAsync
+				(
+					outputFile,
+					DownloadOptions.ChapterInfo,
+					DownloadOptions.TrimOutputToChapterLength
+				)
+				: AaxFile.ConvertToMp4aAsync(outputFile);
 	}
 }

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.Threading.Tasks;
 using Dinah.Core;
 using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
@@ -31,7 +30,6 @@ namespace AaxDecrypter
 		// Don't give the property a 'set'. This should have to be an obvious choice; not accidental
 		protected void SetOutputFileName(string newOutputFileName) => OutputFileName = newOutputFileName;
 
-		protected abstract StepSequence Steps { get; }
 		private NetworkFileStreamPersister nfsPersister;
 
 		private string jsonDownloadState { get; }
@@ -64,15 +62,7 @@ namespace AaxDecrypter
 				OnRetrievedCoverArt(coverArt);
 		}
 
-		public bool Run()
-		{
-			var (IsSuccess, _) = Steps.Run();
-
-			if (!IsSuccess)
-				Serilog.Log.Logger.Error("Conversion failed");
-
-			return IsSuccess;
-		}
+		public abstract Task<bool> RunAsync();
 
 		protected void OnRetrievedTitle(string title)
 			=> RetrievedTitle?.Invoke(this, title);
@@ -103,7 +93,7 @@ namespace AaxDecrypter
 			try
 			{
 				var path = Path.ChangeExtension(OutputFileName, ".cue");
-				path = FileUtility.GetValidFilename(path);
+				path = FileUtility.GetValidFilename(path, DownloadOptions.ReplacementCharacters);
 				File.WriteAllText(path, Cue.CreateContents(Path.GetFileName(OutputFileName), DownloadOptions.ChapterInfo));
 				OnFileCreated(path);
 			}

Source/AaxDecrypter/IDownloadOptions.cs

@@ -4,6 +4,7 @@ namespace AaxDecrypter
 {
     public interface IDownloadOptions
 	{
+        FileManager.ReplacementCharacters ReplacementCharacters { get; }
         string DownloadUrl { get; }
         string UserAgent { get; }
         string AudibleKey { get; }
@@ -13,10 +14,11 @@ namespace AaxDecrypter
         bool RetainEncryptedFile { get; }
         bool StripUnabridged { get; }
         bool CreateCueSheet { get; }
-        ChapterInfo ChapterInfo { get; set; }
-        NAudio.Lame.LameConfig LameConfig { get; set; }
-        bool Downsample { get; set; }
-        bool MatchSourceBitrate { get; set; }
+        ChapterInfo ChapterInfo { get; }
+        bool FixupFile { get; }
+        NAudio.Lame.LameConfig LameConfig { get; }
+        bool Downsample { get; }
+        bool MatchSourceBitrate { get; }
         string GetMultipartFileName(MultiConvertFileProperties props);
         string GetMultipartTitleName(MultiConvertFileProperties props);
     }    

Source/AaxDecrypter/MpegUtil.cs

@@ -0,0 +1,33 @@
+using AAXClean;
+using NAudio.Lame;
+using System;
+using System.Linq;
+
+namespace AaxDecrypter
+{
+	public static class MpegUtil
+	{
+		public static void ConfigureLameOptions(Mp4File mp4File, LameConfig lameConfig, bool downsample, bool matchSourceBitrate)
+		{
+			double bitrateMultiple = 1;
+
+			if (mp4File.AudioChannels == 2)
+			{
+				if (downsample)
+					bitrateMultiple = 0.5;
+				else
+					lameConfig.Mode = MPEGMode.Stereo;
+			}
+
+			if (matchSourceBitrate)
+			{
+				int kbps = (int)(mp4File.AverageBitrate * bitrateMultiple / 1024);
+
+				if (lameConfig.VBR is null)
+					lameConfig.BitRate = kbps;
+				else if (lameConfig.VBR == VBRMode.ABR)
+					lameConfig.ABRRateKbps = kbps;
+			}
+		}
+	}
+}

Source/AaxDecrypter/MultiConvertFileProperties.cs

@@ -11,15 +11,5 @@ namespace AaxDecrypter
         public int PartsTotal { get; set; }
         public string Title { get; set; }
 
-        public static string DefaultMultipartFilename(MultiConvertFileProperties multiConvertFileProperties)
-        {
-            var template = Path.ChangeExtension(multiConvertFileProperties.OutputFileName, null) + " - <ch# 0> - <title>" + Path.GetExtension(multiConvertFileProperties.OutputFileName);
-
-            var fileNamingTemplate = new FileNamingTemplate(template) { IllegalCharacterReplacements = " " };
-            fileNamingTemplate.AddParameterReplacement("ch# 0", FileUtility.GetSequenceFormatted(multiConvertFileProperties.PartsPosition, multiConvertFileProperties.PartsTotal));
-            fileNamingTemplate.AddParameterReplacement("title", multiConvertFileProperties.Title ?? "");
-
-            return fileNamingTemplate.GetFilePath();
-        }
     }
 }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -145,7 +145,14 @@ namespace AaxDecrypter
 		private void Update()
 		{
 			RequestHeaders = HttpRequest.Headers;
-			Updated?.Invoke(this, EventArgs.Empty);
+			try
+			{
+				Updated?.Invoke(this, EventArgs.Empty);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "An error was encountered while saving the download progress to JSON");
+			}
 		}
 
 		/// <summary>
@@ -211,7 +218,7 @@ namespace AaxDecrypter
 		}
 
 		/// <summary>
-		/// Downlod <see cref="Uri"/> to <see cref="SaveFilePath"/>.
+		/// Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.
 		/// </summary>
 		private void DownloadFile()
 		{
@@ -245,9 +252,6 @@ namespace AaxDecrypter
 				WritePosition = downloadPosition;
 				Update();
 
-				downloadedPiece.Set();
-				downloadEnded.Set();
-
 				if (!IsCancelled && WritePosition < ContentLength)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
@@ -257,7 +261,11 @@ namespace AaxDecrypter
 			catch (Exception ex)
 			{
 				Serilog.Log.Error(ex, "An error was encountered while downloading {Uri}", Uri);
-				IsCancelled = true;
+			}
+			finally
+			{
+				downloadedPiece.Set();
+				downloadEnded.Set();
 			}
 		}
 
@@ -401,7 +409,7 @@ namespace AaxDecrypter
 		{
 			if (!hasBegunDownloading)
 				BeginDownloading();
-
+			
 			var toRead = Math.Min(count, Length - Position);
 			WaitToPosition(Position + toRead);
 			return _readFile.Read(buffer, offset, count);
@@ -426,14 +434,20 @@ namespace AaxDecrypter
 		/// <param name="requiredPosition">The minimum required flished data length in <see cref="SaveFilePath"/>.</param>
 		private void WaitToPosition(long requiredPosition)
 		{
-			while (requiredPosition > WritePosition && !IsCancelled && hasBegunDownloading && !downloadedPiece.WaitOne(1000)) ;
+			while (WritePosition < requiredPosition
+				&& hasBegunDownloading
+				&& !IsCancelled
+				&& !downloadEnded.WaitOne(0))
+			{
+				downloadedPiece.WaitOne(100);
+			}
 		}
 
 		public override void Close()
 		{
 			IsCancelled = true;
 
-			while (downloadEnded is not null && !downloadEnded.WaitOne(1000)) ;
+			while (downloadEnded is not null && !downloadEnded.WaitOne(100)) ;
 
 			_readFile.Close();
 			_writeFile.Close();

Source/AaxDecrypter/UnencryptedAudiobookDownloader.cs

@@ -2,29 +2,63 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Dinah.Core.Net.Http;
-using Dinah.Core.StepRunner;
 using FileManager;
 
 namespace AaxDecrypter
 {
 	public class UnencryptedAudiobookDownloader : AudiobookDownloadBase
 	{
-		protected override StepSequence Steps { get; }
 
 		public UnencryptedAudiobookDownloader(string outFileName, string cacheDirectory, IDownloadOptions dlLic)
-			: base(outFileName, cacheDirectory, dlLic)
-		{
-			Steps = new StepSequence
-			{
-				Name = "Download Mp3 Audiobook",
+			: base(outFileName, cacheDirectory, dlLic) { }
 
-				["Step 1: Get Mp3 Metadata"] = Step_GetMetadata,
-				["Step 2: Download Audiobook"] = Step_DownloadAudiobookAsSingleFile,
-				["Step 3: Create Cue"] = Step_CreateCue,
-				["Step 4: Cleanup"] = Step_Cleanup,
-			};
+		public override async Task<bool> RunAsync()
+		{
+			try
+			{
+				Serilog.Log.Information("Begin download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+
+				//Step 1
+				Serilog.Log.Information("Begin Step 1: Get Mp3 Metadata");
+				if (await Task.Run(Step_GetMetadata))
+					Serilog.Log.Information("Completed Step 1: Get Mp3 Metadata");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 1: Get Mp3 Metadata");
+					return false;
+				}
+
+				//Step 2
+				Serilog.Log.Information("Begin Step 2: Download Audiobook");
+				if (await Task.Run(Step_DownloadAudiobookAsSingleFile))
+					Serilog.Log.Information("Completed Step 2: Download Audiobook");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 2: Download Audiobook");
+					return false;
+				}
+
+				//Step 3
+				Serilog.Log.Information("Begin Step 3: Cleanup");
+				if (await Task.Run(Step_Cleanup))
+					Serilog.Log.Information("Completed Step 3: Cleanup");
+				else
+				{
+					Serilog.Log.Information("Failed to Complete Step 3: Cleanup");
+					return false;
+				}
+
+				Serilog.Log.Information("Completed download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return true;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error encountered in download and convert Aaxc To {format}", DownloadOptions.OutputFormat);
+				return false;
+			}
 		}
 
+
 		public override Task CancelAsync()
 		{
 			IsCanceled = true;
@@ -67,8 +101,8 @@ namespace AaxDecrypter
 			}
 
 			CloseInputFileStream();
-
-			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName);
+			
+			var realOutputFileName = FileUtility.SaferMoveToValidPath(InputFileStream.SaveFilePath, OutputFileName, DownloadOptions.ReplacementCharacters);
 			SetOutputFileName(realOutputFileName);
 			OnFileCreated(realOutputFileName);
 

Source/AppScaffolding/.msbump

@@ -1,4 +0,0 @@
-{
-  "//": "https://github.com/BalassaMarton/MSBump",
-  BumpRevision: true
-}

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,22 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>8.0.3.1</Version>
+    <Version>8.2.0.1</Version>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="MSBump" Version="2.3.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Octokit" Version="0.51.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
-
-</Project>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+</Project>

Source/AppScaffolding/LibationScaffolding.cs

@@ -66,6 +66,9 @@ namespace AppScaffolding
 		{
 			config.InProgress ??= Configuration.WinTemp;
 
+			if (!config.Exists(nameof(config.BetaOptIn)))
+				config.BetaOptIn = false;
+
 			if (!config.Exists(nameof(config.AllowLibationFixup)))
 				config.AllowLibationFixup = true;
 
@@ -117,6 +120,9 @@ namespace AppScaffolding
 			if (!config.Exists(nameof(config.DownloadEpisodes)))
 				config.DownloadEpisodes = true;
 
+			if (!config.Exists(nameof(config.ReplacementCharacters)))
+				config.ReplacementCharacters = FileManager.ReplacementCharacters.Default;
+
 			if (!config.Exists(nameof(config.FolderTemplate)))
 				config.FolderTemplate = Templates.Folder.DefaultTemplate;
 
@@ -408,9 +414,9 @@ namespace AppScaffolding
 
 		public static void migrate_from_7_10_1(Configuration config)
 		{
-			var lastNigrationThres = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
+			var lastMigrationThrew = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
 
-			if (lastNigrationThres) return;
+			if (lastMigrationThrew) return;
 
 			try
 			{
@@ -470,7 +476,7 @@ namespace AppScaffolding
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, "An error occured while running database migrations in {0}", nameof(migrate_from_7_10_1));
+				Serilog.Log.Logger.Error(ex, "An error occurred while running database migrations in {0}", nameof(migrate_from_7_10_1));
 				config.SetObject($"{nameof(migrate_from_7_10_1)}_ThrewError", true);
 			}
 		}

Source/AppScaffolding/UNSAFE_MigrationHelper.cs

@@ -25,7 +25,7 @@ namespace AppScaffolding
 			: value;
 
 		#region appsettings.json
-		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
+		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), "appsettings.json");
 
 		public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON);
 

Source/ApplicationServices/ApplicationServices.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0-windows</TargetFramework>
@@ -14,4 +14,12 @@
     <ProjectReference Include="..\LibationSearchEngine\LibationSearchEngine.csproj" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
 </Project>

Source/ApplicationServices/LibraryCommands.cs

@@ -134,7 +134,7 @@ namespace ApplicationServices
 				if (newParents >= 0)
 				{
 					//If any episodes are still orphaned, their series have been
-					//removed from the catalog and wel'll never be able to find them.
+					//removed from the catalog and we'll never be able to find them.
 
 					//only do this if findAndAddMissingParents returned >= 0. If it
 					//returned < 0, an error happened and there's still a chance that
@@ -251,7 +251,7 @@ namespace ApplicationServices
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, "An error occured while trying to remove orphaned episodes from the database");
+				Serilog.Log.Logger.Error(ex, "An error occurred while trying to remove orphaned episodes from the database");
 			}
 		}
 
@@ -274,7 +274,7 @@ namespace ApplicationServices
 					.DistinctBy(s => s.Series.AudibleSeriesId)
 					.ToList();
 
-				// The Catalog endpointdoes not require authentication.
+				// The Catalog endpoint does not require authentication.
 				var api = new ApiUnauthenticated(accounts[0].Locale);
 
 				var seriesParents = orphanedSeries.Select(o => o.Series.AudibleSeriesId).ToList();
@@ -308,7 +308,7 @@ namespace ApplicationServices
 			}
 			catch (Exception ex)
 			{
-				Serilog.Log.Logger.Error(ex, "An error occured while trying to scan for orphaned episode parents.");
+				Serilog.Log.Logger.Error(ex, "An error occurred while trying to scan for orphaned episode parents.");
 				return -1;
 			}
 		}
@@ -321,7 +321,7 @@ namespace ApplicationServices
 			}
 			catch (Microsoft.EntityFrameworkCore.DbUpdateException ex)
 			{
-				// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culpret is the "WithExceptionDetails" serilog extension
+				// DbUpdateException exceptions can wreck serilog. Condense it until we can find a better solution. I suspect the culprit is the "WithExceptionDetails" serilog extension
 
 				static string format(Exception ex) => $"\r\nMessage: {ex.Message}\r\nStack Trace:\r\n{ex.StackTrace}";
 

Source/AudibleUtilities/ApiExtended.cs

@@ -145,7 +145,7 @@ namespace AudibleUtilities
 
 			Serilog.Log.Logger.Debug("Library scan complete. Found {count} books and series. Waiting on {getChildEpisodesTasksCount} series episode scans to complete.", count, getChildEpisodesTasks.Count);
 
-			//await and add all episides from all parents
+			//await and add all episodes from all parents
 			foreach (var epList in await Task.WhenAll(getChildEpisodesTasks))
 				items.AddRange(epList);
 
@@ -162,10 +162,19 @@ namespace AudibleUtilities
 				if (exceptions is not null && exceptions.Any())
 					throw new AggregateException(exceptions);
 			}
-
 			return items;
 		}
 
+		private static List<IValidator> getValidators()
+		{
+			var type = typeof(IValidator);
+			var types = AppDomain.CurrentDomain.GetAssemblies()
+				.SelectMany(s => s.GetTypes())
+				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
+
+			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
+		}
+
 		#region episodes and podcasts
 
 		private async Task<List<Item>> getChildEpisodesAsync(SemaphoreSlim concurrencySemaphore, Item parent)
@@ -197,7 +206,8 @@ namespace AudibleUtilities
 					if (numSeriesParents != 1)
 					{
 						//There should only ever be 1 top-level parent per episode. If not, log
-						//and throw so we can figure out what to do about those special cases.
+						//so we can figure out what to do about those special cases, and don't
+						//import the episode.
 						JsonSerializerSettings Settings = new()
 						{
 							MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
@@ -207,9 +217,8 @@ namespace AudibleUtilities
 								new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
 							},
 						};
-						var ex = new ApplicationException($"Found {numSeriesParents} parents for {parent.Asin}");
-						Serilog.Log.Logger.Error(ex, $"Episode Product:\r\n{JsonConvert.SerializeObject(parent, Formatting.None, Settings)}");
-						throw ex;
+						Serilog.Log.Logger.Error($"Found {numSeriesParents} parents for {parent.Asin}\r\nEpisode Product:\r\n{JsonConvert.SerializeObject(parent, Formatting.None, Settings)}");
+						return new List<Item>();
 					}
 
 					var realParent = seriesParents.Single(p => p.IsSeriesParent);
@@ -329,15 +338,5 @@ namespace AudibleUtilities
 			return results;
 		}
 		#endregion
-
-		private static List<IValidator> getValidators()
-		{
-			var type = typeof(IValidator);
-			var types = AppDomain.CurrentDomain.GetAssemblies()
-				.SelectMany(s => s.GetTypes())
-				.Where(p => type.IsAssignableFrom(p) && !p.IsInterface);
-
-			return types.Select(t => Activator.CreateInstance(t) as IValidator).ToList();
-		}
 	}
 }

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -5,11 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.0.0.1" />
+    <PackageReference Include="AudibleApi" Version="4.3.1.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
   </ItemGroup>
+	
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
 </Project>

Source/DataLayer/Configurations/BookConfig.cs

@@ -12,11 +12,13 @@ namespace DataLayer.Configurations
 
             entity.OwnsOne(b => b.Rating);
 
+            entity.Property(nameof(Book._audioFormat));
             //
             // CRUCIAL: ignore unmapped collections, even get-only
             //
             entity.Ignore(nameof(Book.Authors));
             entity.Ignore(nameof(Book.Narrators));
+            entity.Ignore(nameof(Book.AudioFormat));
 			//// these don't seem to matter
 			//entity.Ignore(nameof(Book.AuthorNames));
 			//entity.Ignore(nameof(Book.NarratorNames));

Source/DataLayer/DataLayer.csproj

@@ -6,13 +6,11 @@
 
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <ApplicationIcon />
     <OutputType>Library</OutputType>
-    <StartupObject />
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.0.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -23,8 +21,16 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  
-  <ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
     <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
   </ItemGroup>
   

Source/DataLayer/EfClasses/AudioFormat.cs

@@ -0,0 +1,62 @@
+using System;
+
+namespace DataLayer
+{
+    internal enum AudioFormatEnum : long
+    {
+        //Defining the enum this way ensures that when comparing:
+        //LC_128_44100_stereo > LC_64_44100_stereo > LC_64_22050_stereo > LC_64_22050_stereo
+        //This matches how audible interprets these codecs when specifying quality using AudibleApi.DownloadQuality
+        //I've never seen mono formats.
+        Unknown = 0,
+        LC_32_22050_stereo = (32L << 18) | (22050 << 2) | 2,
+        LC_64_22050_stereo = (64L << 18) | (22050 << 2) | 2,
+        LC_64_44100_stereo = (64L << 18) | (44100 << 2) | 2,
+        LC_128_44100_stereo = (128L << 18) | (44100 << 2) | 2,
+    }
+
+    public class AudioFormat : IComparable<AudioFormat>, IComparable
+    {
+
+        internal int AudioFormatID { get; private set; }
+        public int Bitrate { get; private init; }
+        public int SampleRate { get; private init; }
+        public int Channels { get; private init; }
+        public bool IsValid => Bitrate != 0 && SampleRate != 0 && Channels != 0;
+
+        public static AudioFormat FromString(string formatStr)
+        {
+            if (Enum.TryParse(formatStr, ignoreCase: true, out AudioFormatEnum enumVal))
+                return FromEnum(enumVal);
+            return FromEnum(AudioFormatEnum.Unknown);
+        }
+
+        internal static AudioFormat FromEnum(AudioFormatEnum enumVal)
+        {
+            var val = (long)enumVal;
+
+            return new()
+            {
+                Bitrate = (int)(val >> 18),
+                SampleRate = (int)(val >> 2) & ushort.MaxValue,
+                Channels = (int)(val & 3)
+            };
+        }
+        internal AudioFormatEnum ToEnum()
+        {
+            var val = (AudioFormatEnum)(((long)Bitrate << 18) | ((long)SampleRate << 2) | (long)Channels);
+
+            return Enum.IsDefined(val) ?
+                val : AudioFormatEnum.Unknown;
+        }
+
+        public override string ToString()
+            => IsValid ?
+            $"{Bitrate} Kbps, {SampleRate / 1000d:F1} kHz, {(Channels == 2 ? "Stereo" : Channels)}" :
+            "Unknown";
+
+        public int CompareTo(AudioFormat other) => ToEnum().CompareTo(other.ToEnum());
+
+        public int CompareTo(object obj) => CompareTo(obj as AudioFormat);
+    }
+}

Source/DataLayer/EfClasses/Book.cs

@@ -25,6 +25,7 @@ namespace DataLayer
         Parent = 4,
     }
 
+
     public class Book
     {
         // implementation detail. set by db only. only used by data layer
@@ -38,6 +39,10 @@ namespace DataLayer
         public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
+        internal AudioFormatEnum _audioFormat;
+
+        public AudioFormat AudioFormat { get => AudioFormat.FromEnum(_audioFormat); set => _audioFormat = value.ToEnum(); }
+
         // mutable
         public string PictureId { get; set; }
         public string PictureLarge { get; set; }

Source/DataLayer/Migrations/20220624214932_AddAudioFormat.Designer.cs

@@ -0,0 +1,397 @@
+// <auto-generated />
+using System;
+using DataLayer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    [DbContext(typeof(LibationContext))]
+    [Migration("20220624214932_AddAudioFormat")]
+    partial class AddAudioFormat
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.6");
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Property<int>("BookId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("DatePublished")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAbridged")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LengthInMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Locale")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PictureLarge")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId");
+
+                    b.HasIndex("AudibleProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("Books");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContributorId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("BookId", "ContributorId", "Role");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("ContributorId");
+
+                    b.ToTable("BookContributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.Property<int>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleCategoryId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentCategoryCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("AudibleCategoryId");
+
+                    b.HasIndex("ParentCategoryCategoryId");
+
+                    b.ToTable("Categories");
+
+                    b.HasData(
+                        new
+                        {
+                            CategoryId = -1,
+                            AudibleCategoryId = "",
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Property<int>("ContributorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleContributorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ContributorId");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Contributors");
+
+                    b.HasData(
+                        new
+                        {
+                            ContributorId = -1,
+                            Name = ""
+                        });
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Account")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateAdded")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("BookId");
+
+                    b.ToTable("LibraryBooks");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AudibleSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId");
+
+                    b.HasIndex("AudibleSeriesId");
+
+                    b.ToTable("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.Property<int>("SeriesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BookId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Order")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SeriesId", "BookId");
+
+                    b.HasIndex("BookId");
+
+                    b.HasIndex("SeriesId");
+
+                    b.ToTable("SeriesBook");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.HasOne("DataLayer.Category", "Category")
+                        .WithMany()
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("DataLayer.Rating", "Rating", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<float>("OverallRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("PerformanceRating")
+                                .HasColumnType("REAL");
+
+                            b1.Property<float>("StoryRating")
+                                .HasColumnType("REAL");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("Books");
+
+                            b1.WithOwner()
+                                .HasForeignKey("BookId");
+                        });
+
+                    b.OwnsMany("DataLayer.Supplement", "Supplements", b1 =>
+                        {
+                            b1.Property<int>("SupplementId")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Url")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("SupplementId");
+
+                            b1.HasIndex("BookId");
+
+                            b1.ToTable("Supplement");
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.Navigation("Book");
+                        });
+
+                    b.OwnsOne("DataLayer.UserDefinedItem", "UserDefinedItem", b1 =>
+                        {
+                            b1.Property<int>("BookId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int>("BookStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("PdfStatus")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<string>("Tags")
+                                .HasColumnType("TEXT");
+
+                            b1.HasKey("BookId");
+
+                            b1.ToTable("UserDefinedItem", (string)null);
+
+                            b1.WithOwner("Book")
+                                .HasForeignKey("BookId");
+
+                            b1.OwnsOne("DataLayer.Rating", "Rating", b2 =>
+                                {
+                                    b2.Property<int>("UserDefinedItemBookId")
+                                        .HasColumnType("INTEGER");
+
+                                    b2.Property<float>("OverallRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("PerformanceRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.Property<float>("StoryRating")
+                                        .HasColumnType("REAL");
+
+                                    b2.HasKey("UserDefinedItemBookId");
+
+                                    b2.ToTable("UserDefinedItem");
+
+                                    b2.WithOwner()
+                                        .HasForeignKey("UserDefinedItemBookId");
+                                });
+
+                            b1.Navigation("Book");
+
+                            b1.Navigation("Rating");
+                        });
+
+                    b.Navigation("Category");
+
+                    b.Navigation("Rating");
+
+                    b.Navigation("Supplements");
+
+                    b.Navigation("UserDefinedItem");
+                });
+
+            modelBuilder.Entity("DataLayer.BookContributor", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("ContributorsLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Contributor", "Contributor")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("ContributorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Contributor");
+                });
+
+            modelBuilder.Entity("DataLayer.Category", b =>
+                {
+                    b.HasOne("DataLayer.Category", "ParentCategory")
+                        .WithMany()
+                        .HasForeignKey("ParentCategoryCategoryId");
+
+                    b.Navigation("ParentCategory");
+                });
+
+            modelBuilder.Entity("DataLayer.LibraryBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithOne()
+                        .HasForeignKey("DataLayer.LibraryBook", "BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+                });
+
+            modelBuilder.Entity("DataLayer.SeriesBook", b =>
+                {
+                    b.HasOne("DataLayer.Book", "Book")
+                        .WithMany("SeriesLink")
+                        .HasForeignKey("BookId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("DataLayer.Series", "Series")
+                        .WithMany("BooksLink")
+                        .HasForeignKey("SeriesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Book");
+
+                    b.Navigation("Series");
+                });
+
+            modelBuilder.Entity("DataLayer.Book", b =>
+                {
+                    b.Navigation("ContributorsLink");
+
+                    b.Navigation("SeriesLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Contributor", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+
+            modelBuilder.Entity("DataLayer.Series", b =>
+                {
+                    b.Navigation("BooksLink");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Source/DataLayer/Migrations/20220624214932_AddAudioFormat.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    public partial class AddAudioFormat : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<long>(
+                name: "_audioFormat",
+                table: "Books",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0L);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "_audioFormat",
+                table: "Books");
+        }
+    }
+}

Source/DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.4");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.6");
 
             modelBuilder.Entity("DataLayer.Book", b =>
                 {
@@ -56,6 +56,9 @@ namespace DataLayer.Migrations
                     b.Property<string>("Title")
                         .HasColumnType("TEXT");
 
+                    b.Property<long>("_audioFormat")
+                        .HasColumnType("INTEGER");
+
                     b.HasKey("BookId");
 
                     b.HasIndex("AudibleProductId");

Source/DataLayer/QueryObjects/LibraryBookQueries.cs

@@ -88,5 +88,13 @@ namespace DataLayer
                         s.Series.AudibleSeriesId == parent.Book.AudibleProductId
                         ) == true
                     ).ToList();
+
+        public static IEnumerable<LibraryBook> UnLiberated(this IEnumerable<LibraryBook> bookList)
+            => bookList
+                .Where(
+                    lb =>
+                        lb.Book.UserDefinedItem.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
+                        || lb.Book.UserDefinedItem.PdfStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload
+                    );
     }
 }

Source/DtoImporterService/BookImporter.cs

@@ -101,7 +101,8 @@ namespace DtoImporterService
 			// absence of categories is also possible
 
 			// CATEGORY HACK: only use the 1st 2 categories
-			// (real impl: var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";)
+			// after we support full arbitrary-depth category trees and multiple categories per book, the real impl will be something like this
+			//   var lastCategory = item.Categories.LastOrDefault()?.CategoryId ?? "";
 			var lastCategory
 				= item.Categories.Length == 0 ? ""
 				: item.Categories.Length == 1 ? item.Categories[0].CategoryId
@@ -161,6 +162,9 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
+			var codec = item.AvailableCodecs?.Max(f => AudioFormat.FromString(f.EnhancedCodec)) ?? new AudioFormat();
+			book.AudioFormat = codec;
+
 			// set/update book-specific info which may have changed
 			if (item.PictureId is not null)
 				book.PictureId = item.PictureId;

Source/DtoImporterService/ContributorImporter.cs

@@ -91,7 +91,7 @@ namespace DtoImporterService
 			return hash.Count;
 		}
 
-        private Contributor addContributor(string name, string id = null)
+		private Contributor addContributor(string name, string id = null)
 		{
 			try
 			{
@@ -108,6 +108,6 @@ namespace DtoImporterService
 				Serilog.Log.Logger.Error(ex, "Error adding contributor. {@DebugInfo}", new { name, id });
 				throw;
 			}
-        }
-    }
+		}
+	}
 }

Source/DtoImporterService/DtoImporterService.csproj

@@ -4,6 +4,14 @@
     <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />

Source/DtoImporterService/ImporterBase.cs

@@ -55,7 +55,7 @@ namespace DtoImporterService
 		protected ItemsImporterBase(LibationContext context) : base(context) { }
 
 		protected abstract IValidator Validator { get; }
-        public sealed override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems)
+		public sealed override IEnumerable<Exception> Validate(IEnumerable<ImportItem> importItems)
 			=> Validator.Validate(importItems.Select(i => i.DtoItem));
 	}
 }

Source/DtoImporterService/LibraryBookImporter.cs

@@ -49,7 +49,7 @@ namespace DtoImporterService
 			// just use the first
 			var hash = newItems.ToDictionarySafe(dto => dto.DtoItem.ProductId);
 			foreach (var kvp in hash)
-            {
+			{
 				var newItem = kvp.Value;
 
 				var libraryBook = new LibraryBook(

Source/FileLiberator/ConvertToMp3.cs

@@ -43,7 +43,7 @@ namespace FileLiberator
 					var proposedMp3Path = Mp3FileName(m4bPath);
 					if (File.Exists(proposedMp3Path) || !File.Exists(m4bPath)) continue;
 
-					m4bBook = new Mp4File(m4bPath, FileAccess.Read);
+					m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
 					m4bBook.ConversionProgressUpdate += M4bBook_ConversionProgressUpdate;
 
 					fileSize = m4bBook.InputStream.Length;
@@ -53,9 +53,18 @@ namespace FileLiberator
 					OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
 					OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
+					var config = Configuration.Instance;
+					var lameConfig = GetLameOptions(config);
+
+					//Finishing configuring lame encoder.
+					AaxDecrypter.MpegUtil.ConfigureLameOptions(
+						m4bBook,
+						lameConfig,
+						config.LameDownsampleMono,
+						config.LameMatchSourceBR);
+
 					using var mp3File = File.OpenWrite(Path.GetTempFileName());
-					var lameConfig = GetLameOptions(Configuration.Instance);
-					var result = await Task.Run(() => m4bBook.ConvertToMp3(mp3File, lameConfig));
+					var result = await m4bBook.ConvertToMp3Async(mp3File, lameConfig);
 					m4bBook.InputStream.Close();
 					mp3File.Close();
 
@@ -70,7 +79,7 @@ namespace FileLiberator
 						return new StatusHandler { "Cancelled" };
 					}
 
-					var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path);
+					var realMp3Path = FileUtility.SaferMoveToValidPath(mp3File.Name, proposedMp3Path, Configuration.Instance.ReplacementCharacters);
 					OnFileCreated(libraryBook, realMp3Path);
 				}
 				return new StatusHandler();

Source/FileLiberator/DownloadDecryptBook.cs

@@ -130,7 +130,7 @@ namespace FileLiberator
 			abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
 
 			// REAL WORK DONE HERE
-			var success = await Task.Run(abDownloader.Run);
+			var success = await abDownloader.RunAsync();
 
 			return success;
 		}
@@ -146,50 +146,174 @@ namespace FileLiberator
 			var outputFormat = !encrypted || (config.AllowLibationFixup && config.DecryptToLossy) ?
 					 OutputFormat.Mp3 : OutputFormat.M4b;
 
+			long chapterStartMs = config.StripAudibleBrandAudio ?
+				contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
+
 			var dlOptions = new DownloadOptions
 				 (
 					libraryBook,
 					contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl,
 					Resources.USER_AGENT
 				 )
-				{
-					AudibleKey = contentLic?.Voucher?.Key,
-					AudibleIV = contentLic?.Voucher?.Iv,
-					OutputFormat = outputFormat,
-					TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
-					RetainEncryptedFile = config.RetainAaxFile && encrypted,
-					StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
-					Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
-					MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
-					CreateCueSheet = config.CreateCueSheet,
-					LameConfig = GetLameOptions(config)
-				};
-
-			if (config.AllowLibationFixup || outputFormat == OutputFormat.Mp3)
 			{
-				long startMs = dlOptions.TrimOutputToChapterLength ?
-					contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs : 0;
+				AudibleKey = contentLic?.Voucher?.Key,
+				AudibleIV = contentLic?.Voucher?.Iv,
+				OutputFormat = outputFormat,
+				TrimOutputToChapterLength = config.AllowLibationFixup && config.StripAudibleBrandAudio,
+				RetainEncryptedFile = config.RetainAaxFile && encrypted,
+				StripUnabridged = config.AllowLibationFixup && config.StripUnabridged,
+				Downsample = config.AllowLibationFixup && config.LameDownsampleMono,
+				MatchSourceBitrate = config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate,
+				CreateCueSheet = config.CreateCueSheet,
+				LameConfig = GetLameOptions(config),
+				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+				FixupFile = config.AllowLibationFixup
+			};
 
-				dlOptions.ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(startMs));
+			var chapters = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
 
-				for (int i = 0; i < contentLic.ContentMetadata.ChapterInfo.Chapters.Length; i++)
-				{
-					var chapter = contentLic.ContentMetadata.ChapterInfo.Chapters[i];
-					long chapLenMs = chapter.LengthMs;
+			if (config.MergeOpeningAndEndCredits)
+				combineCredits(chapters);
 
-					if (i == 0)
-						chapLenMs -= startMs;
+			for (int i = 0; i < chapters.Count; i++)
+			{
+				var chapter = chapters[i];
+				long chapLenMs = chapter.LengthMs;
 
-					if (config.StripAudibleBrandAudio && i == contentLic.ContentMetadata.ChapterInfo.Chapters.Length - 1)
-						chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+				if (i == 0)
+					chapLenMs -= chapterStartMs;
 
-					dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
-				}
+				if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
+					chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+
+				dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
 			}
 
 			return dlOptions;
 		}
 
+		/*
+
+		Flatten Audible's new hierarchical chapters, combining children into parents.
+
+		Audible may deliver chapters like this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:12	Book 1
+		00:12 - 00:14	|	Part 1
+		00:14 - 01:40	|	|	Chapter 1
+		01:40 - 03:20	|	|	Chapter 2
+		03:20 - 03:22	|	Part 2
+		03:22 - 05:00	|	|	Chapter 3
+		05:00 - 06:40	|	|	Chapter 4
+		06:40 - 06:42	Book 2
+		06:42 - 06:44	|	Part 3
+		06:44 - 08:20	|	|	Chapter 5
+		08:20 - 10:00	|	|	Chapter 6
+		10:00 - 10:02	|	Part 4
+		10:02 - 11:40	|	|	Chapter 7
+		11:40 - 13:20	|	|	Chapter 8
+		13:20 - 13:30	End Credits
+
+		And flattenChapters will combine them into this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 01:40	Book 1: Part 1: Chapter 1
+		01:40 - 03:20	Book 1: Part 1: Chapter 2
+		03:20 - 05:00	Book 1: Part 2: Chapter 3
+		05:00 - 06:40	Book 1: Part 2: Chapter 4
+		06:40 - 08:20	Book 2: Part 3: Chapter 5
+		08:20 - 10:00	Book 2: Part 3: Chapter 6
+		10:00 - 11:40	Book 2: Part 4: Chapter 7
+		11:40 - 13:20	Book 2: Part 4: Chapter 8
+		13:20 - 13:40	End Credits
+
+		However, if one of the parent chapters is longer than 10000 milliseconds, it's kept as its own
+		chapter. A duration longer than a few seconds implies that the chapter contains more than just
+		the narrator saying the chapter title, so it should probably be preserved as a separate chapter.
+		Using the example above, if "Book 1" was 15 seconds long and "Part 3" was 20 seconds long:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:25	Book 1
+		00:25 - 00:27	|	Part 1
+		00:27 - 01:40	|	|	Chapter 1
+		01:40 - 03:20	|	|	Chapter 2
+		03:20 - 03:22	|	Part 2
+		03:22 - 05:00	|	|	Chapter 3
+		05:00 - 06:40	|	|	Chapter 4
+		06:40 - 06:42	Book 2
+		06:42 - 07:02	|	Part 3
+		07:02 - 08:20	|	|	Chapter 5
+		08:20 - 10:00	|	|	Chapter 6
+		10:00 - 10:02	|	Part 4
+		10:02 - 11:40	|	|	Chapter 7
+		11:40 - 13:20	|	|	Chapter 8
+		13:20 - 13:30	End Credits
+
+		then flattenChapters will combine them into this:
+
+		00:00 - 00:10	Opening Credits
+		00:10 - 00:25	Book 1
+		00:25 - 01:40	Book 1: Part 1: Chapter 1
+		01:40 - 03:20	Book 1: Part 1: Chapter 2
+		03:20 - 05:00	Book 1: Part 2: Chapter 3
+		05:00 - 06:40	Book 1: Part 2: Chapter 4
+		06:40 - 07:02	Book 2: Part 3
+		07:02 - 08:20	Book 2: Part 3: Chapter 5
+		08:20 - 10:00	Book 2: Part 3: Chapter 6
+		10:00 - 11:40	Book 2: Part 4: Chapter 7
+		11:40 - 13:20	Book 2: Part 4: Chapter 8
+		13:20 - 13:40	End Credits
+
+		*/
+
+		public static List<AudibleApi.Common.Chapter> flattenChapters(IList<AudibleApi.Common.Chapter> chapters, string titleConcat = ": ")
+		{
+			List<AudibleApi.Common.Chapter> chaps = new();
+
+			foreach (var c in chapters)
+			{
+				if (c.Chapters is not null)
+				{
+					if (c.LengthMs < 10000)
+					{
+						c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
+						c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
+						c.Chapters[0].LengthMs += c.LengthMs;
+					}
+					else
+						chaps.Add(c);
+
+					var children = flattenChapters(c.Chapters);
+
+					foreach (var child in children)
+						child.Title = $"{c.Title}{titleConcat}{child.Title}";
+
+					chaps.AddRange(children);
+					c.Chapters = null;
+				}
+				else
+					chaps.Add(c);
+			}
+			return chaps;
+		}
+
+		public static void combineCredits(IList<AudibleApi.Common.Chapter> chapters)
+		{
+			if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
+			{
+				chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
+				chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
+				chapters[1].LengthMs += chapters[0].LengthMs;
+				chapters.RemoveAt(0);
+			}
+			if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
+			{
+				chapters[^2].LengthMs += chapters[^1].LengthMs;
+				chapters.Remove(chapters[^1]);
+			}
+		}		
+
 		private static void downloadValidation(LibraryBook libraryBook)
 		{
 			string errorString(string field)
@@ -237,10 +361,10 @@ namespace FileLiberator
 			{
 				var entry = entries[i];
 
-				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)));
+				var realDest = FileUtility.SaferMoveToValidPath(entry.Path, Path.Combine(destinationDir, Path.GetFileName(entry.Path)), Configuration.Instance.ReplacementCharacters);
 				FilePathCache.Insert(libraryBook.Book.AudibleProductId, realDest);
 
-				// propogate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
+				// propagate corrected path. Must update cache with corrected path. Also want updated path for cue file (after this for-loop)
 				entries[i] = entry with { Path = realDest };
 			}
 

Source/FileLiberator/DownloadOptions.cs

@@ -3,6 +3,7 @@ using AAXClean;
 using Dinah.Core;
 using DataLayer;
 using LibationFileManager;
+using FileManager;
 
 namespace FileLiberator
 {
@@ -19,10 +20,12 @@ namespace FileLiberator
         public bool RetainEncryptedFile { get; init; }
         public bool StripUnabridged { get; init; }
         public bool CreateCueSheet { get; init; }
-        public ChapterInfo ChapterInfo { get; set; }
-        public NAudio.Lame.LameConfig LameConfig { get; set; }
-        public bool Downsample { get; set; }
-        public bool MatchSourceBitrate { get; set; }
+        public ChapterInfo ChapterInfo { get; init; }
+        public bool FixupFile { get; init; }
+        public NAudio.Lame.LameConfig LameConfig { get; init; }
+        public bool Downsample { get; init; }
+        public bool MatchSourceBitrate { get; init; }
+        public ReplacementCharacters ReplacementCharacters => Configuration.Instance.ReplacementCharacters;
 
         public string GetMultipartFileName(MultiConvertFileProperties props)
             => Templates.ChapterFile.GetFilename(LibraryBookDto, props);

Source/FileLiberator/FileLiberator.csproj

@@ -11,4 +11,13 @@
     <ProjectReference Include="..\AudibleUtilities\AudibleUtilities.csproj" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+
 </Project>

Source/FileManager/BackgroundFileSystem.cs

@@ -79,8 +79,13 @@ namespace FileManager
             //Stop raising events
             fileSystemWatcher?.Dispose();
 
-            //Calling CompleteAdding() will cause background scanner to terminate.
-            directoryChangesEvents?.CompleteAdding();
+            try
+            {
+                //Calling CompleteAdding() will cause background scanner to terminate.
+                directoryChangesEvents?.CompleteAdding();
+            }
+            // if directoryChangesEvents is non-null and isDisposed, this exception is thrown. there's no other way to check >:(
+            catch (ObjectDisposedException) { }
 
             //Wait for background scanner to terminate before reinitializing.
             backgroundScanner?.Wait();

Source/FileManager/FileManager.csproj

@@ -1,12 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="4.4.0.1" />
+    <PackageReference Include="Dinah.Core" Version="4.4.1.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
 </Project>

Source/FileManager/FileNamingTemplate.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 
@@ -11,24 +12,52 @@ namespace FileManager
 		/// <param name="template">Proposed file name with optional html-styled template tags.</param>
 		public FileNamingTemplate(string template) : base(template) { }
 
-		/// <summary>Optional step 2: Replace all illegal characters with this. Default=<see cref="string.Empty"/></summary>
-		public string IllegalCharacterReplacements { get; set; }
-
 		/// <summary>Generate a valid path for this file or directory</summary>
-		public LongPath GetFilePath(bool returnFirstExisting = false)
+		public LongPath GetFilePath(ReplacementCharacters replacements, bool returnFirstExisting = false)
 		{
-			int lastSlash = Template.LastIndexOf('\\');
+			string fileName = 
+				Template.EndsWith(Path.DirectorySeparatorChar) || Template.EndsWith(Path.AltDirectorySeparatorChar) ?
+					FileUtility.RemoveLastCharacter(Template) : 
+					Template;
 
-			var directoryName = lastSlash >= 0 ? Template[..(lastSlash + 1)] : string.Empty;
-			var filename = lastSlash >= 0 ? Template[(lastSlash + 1)..] : Template;
+			List<string> pathParts = new();
 
+			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value, replacements));
+
+			while (!string.IsNullOrEmpty(fileName))
+			{
+				var file = Path.GetFileName(fileName);
+
+				if (Path.IsPathRooted(Template) && file == string.Empty)
+				{
+					pathParts.Add(fileName);
+					break;
+				}
+				else
+				{
+					pathParts.Add(file);
+					fileName = Path.GetDirectoryName(fileName);
+				}
+			}
+
+			pathParts.Reverse();
+			var fileNamePart = pathParts[^1];
+			pathParts.Remove(fileNamePart);
+
+			LongPath directory = Path.Join(pathParts.Select(p => replaceFileName(p, paramReplacements, LongPath.MaxFilenameLength)).ToArray());
+
+			//If file already exists, GetValidFilename will append " (n)" to the filename.
+			//This could cause the filename length to exceed MaxFilenameLength, so reduce
+			//allowable filename length by 5 chars, allowing for up to 99 duplicates.
+			return FileUtility.GetValidFilename(Path.Join(directory, replaceFileName(fileNamePart, paramReplacements, LongPath.MaxFilenameLength - 5)), replacements, returnFirstExisting);
+		}
+
+		private string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
+		{
 			List<StringBuilder> filenameParts = new();
-
-			var paramReplacements = ParameterReplacements.ToDictionary(r => $"<{formatKey(r.Key)}>", r => formatValue(r.Value));
-
 			//Build the filename in parts, replacing replacement parameters with
 			//their values, and storing the parts in a list.
-			while(!string.IsNullOrEmpty(filename))
+			while (!string.IsNullOrEmpty(filename))
 			{
 				int openIndex = filename.IndexOf('<');
 				int closeIndex = filename.IndexOf('>');
@@ -59,30 +88,24 @@ namespace FileManager
 
 			//Remove 1 character from the end of the longest filename part until
 			//the total filename is less than max filename length
-			while(filenameParts.Sum(p => p.Length) > LongPath.MaxFilenameLength)
+			while (filenameParts.Sum(p => p.Length) > maxFilenameLength)
 			{
 				int maxLength = filenameParts.Max(p => p.Length);
 				var maxEntry = filenameParts.First(p => p.Length == maxLength);
 
 				maxEntry.Remove(maxLength - 1, 1);
 			}
-
-			filename = string.Join("", filenameParts);
-
-			return FileUtility.GetValidFilename(directoryName + filename, IllegalCharacterReplacements, returnFirstExisting);
+			return string.Join("", filenameParts);
 		}
 
-		private string formatValue(object value)
+		private string formatValue(object value, ReplacementCharacters replacements)
 		{
 			if (value is null)
 				return "";
 
 			// Other illegal characters will be taken care of later. Must take care of slashes now so params can't introduce new folders.
 			// Esp important for file templates.
-			return value
-				.ToString()
-				.Replace($"{System.IO.Path.DirectorySeparatorChar}", IllegalCharacterReplacements)
-				.Replace($"{System.IO.Path.AltDirectorySeparatorChar}", IllegalCharacterReplacements);
+			return replacements.ReplaceInvalidFilenameChars(value.ToString());
 		}
 	}
 }

Source/FileManager/FileUtility.cs

@@ -46,12 +46,12 @@ namespace FileManager
 		/// <br/>- ensure uniqueness
 		/// <br/>- enforce max file length
 		/// </summary>
-		public static LongPath GetValidFilename(LongPath path, string illegalCharacterReplacements = "", bool returnFirstExisting = false)
+		public static LongPath GetValidFilename(LongPath path, ReplacementCharacters replacements, bool returnFirstExisting = false)
 		{
 			ArgumentValidator.EnsureNotNull(path, nameof(path));
 
 			// remove invalid chars
-			path = GetSafePath(path, illegalCharacterReplacements);
+			path = GetSafePath(path, replacements);
 
 			// ensure uniqueness and check lengths
 			var dir = Path.GetDirectoryName(path);
@@ -77,36 +77,19 @@ namespace FileManager
 			return fullfilename;
 		}
 
-		// GetInvalidFileNameChars contains everything in GetInvalidPathChars plus ':', '*', '?', '\\', '/'
-
-		/// <summary>Use with file name, not full path. Valid path charaters which are invalid file name characters will be replaced: ':', '\\', '/'</summary>
-		public static string GetSafeFileName(string str, string illegalCharacterReplacements = "")
-			=> string.Join(illegalCharacterReplacements ?? "", str.Split(Path.GetInvalidFileNameChars()));
-
-		/// <summary>Use with full path, not file name. Valid path charaters which are invalid file name characters will be retained: '\\', '/'</summary>
-		public static LongPath GetSafePath(LongPath path, string illegalCharacterReplacements = "")
+		/// <summary>Use with full path, not file name. Valid path characters which are invalid file name characters will be retained: '\\', '/'</summary>
+		public static LongPath GetSafePath(LongPath path, ReplacementCharacters replacements)
 		{
 			ArgumentValidator.EnsureNotNull(path, nameof(path));
 
 			var pathNoPrefix = path.PathWithoutPrefix;
 
-			pathNoPrefix = replaceColons(pathNoPrefix, "꞉");
-			pathNoPrefix = replaceIllegalWithUnicodeAnalog(pathNoPrefix);
-			pathNoPrefix = replaceInvalidChars(pathNoPrefix, illegalCharacterReplacements);
+			pathNoPrefix = replacements.ReplaceInvalidPathChars(pathNoPrefix);
 			pathNoPrefix = removeDoubleSlashes(pathNoPrefix);
 
 			return pathNoPrefix;
 		}
 
-		private static char[] invalidChars { get; } = Path.GetInvalidPathChars().Union(new[] {
-				'*', '?',
-				// these are weird. If you run Path.GetInvalidPathChars() in Visual Studio's "C# Interactive", then these characters are included.
-				// In live code, Path.GetInvalidPathChars() does not include them
-				'"', '<', '>'
-			}).ToArray();
-		private static string replaceInvalidChars(string path, string illegalCharacterReplacements)
-			=> string.Join(illegalCharacterReplacements ?? "", path.Split(invalidChars));
-
 		private static string removeDoubleSlashes(string path)
 		{
 			if (path.Length < 2)
@@ -122,60 +105,6 @@ namespace FileManager
 			return path[0] + remainder;
 		}
 
-		private static string replaceIllegalWithUnicodeAnalog(string path)
-		{
-			char[] replaced = path.ToCharArray();
-
-			char GetQuote(int position)
-			{
-				if (
-					position == 0
-					|| (position > 0
-						&& position < replaced.Length
-						&& !char.IsLetter(replaced[position - 1])
-						&& !char.IsNumber(replaced[position - 1])
-						)
-					) return '“';
-				else if (
-						position == replaced.Length - 1
-						|| (position >= 0
-							&& position < replaced.Length - 1
-							&& !char.IsLetter(replaced[position + 1])
-							&& !char.IsNumber(replaced[position + 1])
-							)
-						) return '”';
-				else return '＂';
-			}
-
-			for (int i = 0; i < replaced.Length; i++)
-			{
-				replaced[i] = replaced[i] switch
-				{
-					'?' => '？',
-					'*' => '✱',
-					'<' => '＜',
-					'>' => '＞',
-					'"' => GetQuote(i),
-					_ => replaced[i]
-				};
-			}
-			return new string(replaced);
-		}
-
-		private static string replaceColons(string path, string illegalCharacterReplacements)
-		{
-			// replace all colons except within the first 2 chars
-			var builder = new System.Text.StringBuilder();
-			for (var i = 0; i < path.Length; i++)
-			{
-				var c = path[i];
-				if (i >= 2 && c == ':')
-					builder.Append(illegalCharacterReplacements);
-				else
-					builder.Append(c);
-			}
-			return builder.ToString();
-		}
 		private static string removeInvalidWhitespace_pattern { get; } = $@"[\s\.]*\{Path.DirectorySeparatorChar}\s*";
 		private static Regex removeInvalidWhitespace_regex { get; } = new(removeInvalidWhitespace_pattern, RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace);
 
@@ -191,7 +120,7 @@ namespace FileManager
 			// regex is easier by ending with separator
 			fullfilename += Path.DirectorySeparatorChar;
 			fullfilename = removeInvalidWhitespace_regex.Replace(fullfilename, Path.DirectorySeparatorChar.ToString());
-			// take seperator back off
+			// take separator back off
 			fullfilename = RemoveLastCharacter(fullfilename);
 
 			fullfilename = removeDoubleSlashes(fullfilename);
@@ -206,9 +135,9 @@ namespace FileManager
 		/// <br/>- Perform <see cref="SaferMove"/>
 		/// <br/>- Return valid path
 		/// </summary>
-		public static string SaferMoveToValidPath(LongPath source, LongPath destination)
+		public static string SaferMoveToValidPath(LongPath source, LongPath destination, ReplacementCharacters replacements)
 		{
-			destination = GetValidFilename(destination);
+			destination = GetValidFilename(destination, replacements);
 			SaferMove(source, destination);
 			return destination;
 		}

Source/FileManager/LongPath.cs

@@ -16,7 +16,6 @@ namespace FileManager
 
 		private const int MAX_PATH = 260;
 		private const string LONG_PATH_PREFIX = "\\\\?\\";
-		private static readonly StringBuilder longPathBuffer = new(MaxPathLength);
 
 		public string Path { get; init; }
 		public override string ToString() => Path;
@@ -71,18 +70,24 @@ namespace FileManager
 				//
 				//	"Based on the above settings, 8dot3 name creation is [enabled/disabled] on c:"
 				//
-				//To enable short names on all volumes on the system, run the following command
+				//To enable short names on a volume on the system, run the following command
 				//from an elevated command prompt:
 				//
 				//	fsutil 8dot3name set c: 0
 				//
+				//or for all volumes on the system:
+				//
+				//	fsutil 8dot3name set 0
+				//
 				//Note that after enabling 8dot3 names on a volume, they will only be available
 				//for newly-created entries in ther file system. Existing entries made while
 				//8dot3 names were disabled will not be reachable by short paths.
 
 				if (Path is null) return null;
-				GetShortPathName(Path, longPathBuffer, MaxPathLength);
-				return longPathBuffer.ToString();
+
+				StringBuilder shortPathBuffer = new(MaxPathLength);
+				GetShortPathName(Path, shortPathBuffer, MaxPathLength);
+				return shortPathBuffer.ToString();
 			}
 		}
 
@@ -92,6 +97,8 @@ namespace FileManager
 			get
 			{
 				if (Path is null) return null;
+
+				StringBuilder longPathBuffer = new(MaxPathLength);
 				GetLongPathName(Path, longPathBuffer, MaxPathLength);
 				return longPathBuffer.ToString();
 			}

Source/FileManager/ReplacementCharacters.cs

@@ -0,0 +1,276 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace FileManager
+{
+	public class Replacement : ICloneable
+	{
+		public const int FIXED_COUNT = 6;
+
+		internal const char QUOTE_MARK = '"';
+		[JsonIgnore] public bool Mandatory { get; internal set; }
+		[JsonProperty] public char CharacterToReplace { get; private set; }
+		[JsonProperty] public string ReplacementString { get; private set; }
+		[JsonProperty] public string Description { get; private set; }
+		public override string ToString() => $"{CharacterToReplace} → {ReplacementString} ({Description})";
+
+		public Replacement(char charToReplace, string replacementString, string description)
+		{
+			CharacterToReplace = charToReplace;
+			ReplacementString = replacementString;
+			Description = description;
+		}
+		private Replacement(char charToReplace, string replacementString, string description, bool mandatory)
+			: this(charToReplace, replacementString, description)
+		{
+			Mandatory = mandatory;
+		}
+
+		public object Clone() => new Replacement(CharacterToReplace, ReplacementString, Description, Mandatory);
+
+		public void Update(char charToReplace, string replacementString, string description)
+		{
+			ReplacementString = replacementString;
+
+			if (!Mandatory)
+			{
+				CharacterToReplace = charToReplace;
+				Description = description;
+			}
+		}
+
+		public static Replacement OtherInvalid(string replacement) => new(default, replacement, "All other invalid characters", true);
+		public static Replacement FilenameForwardSlash(string replacement) => new('/', replacement, "Forward Slash (Filename Only)", true);
+		public static Replacement FilenameBackSlash(string replacement) => new('\\', replacement, "Back Slash (Filename Only)", true);
+		public static Replacement OpenQuote(string replacement) => new('"', replacement, "Open Quote", true);
+		public static Replacement CloseQuote(string replacement) => new('"', replacement, "Close Quote", true);
+		public static Replacement OtherQuote(string replacement) => new('"', replacement, "Other Quote", true);
+		public static Replacement Colon(string replacement) => new(':', replacement, "Colon");
+		public static Replacement Asterisk(string replacement) => new('*', replacement, "Asterisk");
+		public static Replacement QuestionMark(string replacement) => new('?', replacement, "Question Mark");
+		public static Replacement OpenAngleBracket(string replacement) => new('<', replacement, "Open Angle Bracket");
+		public static Replacement CloseAngleBracket(string replacement) => new('>', replacement, "Close Angle Bracket");
+		public static Replacement Pipe(string replacement) => new('|', replacement, "Vertical Line");
+
+	}
+
+	[JsonConverter(typeof(ReplacementCharactersConverter))]
+	public class ReplacementCharacters
+	{
+		public static readonly ReplacementCharacters Default = new()
+		{
+			Replacements = new List<Replacement>()
+			{
+				Replacement.OtherInvalid("_"),
+				Replacement.FilenameForwardSlash("∕"),
+				Replacement.FilenameBackSlash(""),
+				Replacement.OpenQuote("“"),
+				Replacement.CloseQuote("”"),
+				Replacement.OtherQuote("＂"),
+				Replacement.OpenAngleBracket("＜"),
+				Replacement.CloseAngleBracket("＞"),
+				Replacement.Colon("꞉"),
+				Replacement.Asterisk("✱"),
+				Replacement.QuestionMark("？"),
+				Replacement.Pipe("⏐"),
+			}
+		};
+
+		public static readonly ReplacementCharacters LoFiDefault = new()
+		{
+			Replacements = new List<Replacement>()
+			{
+				Replacement.OtherInvalid("_"),
+				Replacement.FilenameForwardSlash("_"),
+				Replacement.FilenameBackSlash("_"),
+				Replacement.OpenQuote("'"),
+				Replacement.CloseQuote("'"),
+				Replacement.OtherQuote("'"),
+				Replacement.OpenAngleBracket("{"),
+				Replacement.CloseAngleBracket("}"),
+				Replacement.Colon("-"),
+			}
+		};
+
+		public static readonly ReplacementCharacters Barebones = new()
+		{
+			Replacements = new List<Replacement>()
+			{
+				Replacement.OtherInvalid("_"),
+				Replacement.FilenameForwardSlash("_"),
+				Replacement.FilenameBackSlash("_"),
+				Replacement.OpenQuote("_"),
+				Replacement.CloseQuote("_"),
+				Replacement.OtherQuote("_"),
+			}
+		};
+
+		private static readonly char[] invalidChars = Path.GetInvalidPathChars().Union(new[] {
+				'*', '?', ':',
+				// these are weird. If you run Path.GetInvalidPathChars() in Visual Studio's "C# Interactive", then these characters are included.
+				// In live code, Path.GetInvalidPathChars() does not include them
+				'"', '<', '>'
+			}).ToArray();
+
+		public IReadOnlyList<Replacement> Replacements { get; init; }
+		private string DefaultReplacement => Replacements[0].ReplacementString;
+		private Replacement ForwardSlash => Replacements[1];
+		private Replacement BackSlash => Replacements[2];
+		private string OpenQuote => Replacements[3].ReplacementString;
+		private string CloseQuote => Replacements[4].ReplacementString;
+		private string OtherQuote => Replacements[5].ReplacementString;
+
+		private string GetFilenameCharReplacement(char toReplace, char preceding, char succeding)
+		{
+			if (toReplace == ForwardSlash.CharacterToReplace)
+				return ForwardSlash.ReplacementString;
+			else if (toReplace == BackSlash.CharacterToReplace)
+				return BackSlash.ReplacementString;
+			else return GetPathCharReplacement(toReplace, preceding, succeding);
+		}
+		private string GetPathCharReplacement(char toReplace, char preceding, char succeding)
+		{
+			if (toReplace == Replacement.QUOTE_MARK)
+			{
+				if (
+					preceding == default ||
+						(
+							!char.IsLetter(preceding) &&
+							!char.IsNumber(preceding) &&
+							(char.IsLetter(succeding) || char.IsNumber(succeding))
+						)
+					)
+					return OpenQuote;
+				else if (
+						succeding == default ||
+							(
+								!char.IsLetter(succeding) &&
+								!char.IsNumber(succeding) &&
+								(char.IsLetter(preceding) || char.IsNumber(preceding))
+							)
+						)
+					return CloseQuote;
+				else
+					return OtherQuote;
+			}
+
+			for (int i = Replacement.FIXED_COUNT; i < Replacements.Count; i++)
+			{
+				var r = Replacements[i];
+				if (r.CharacterToReplace == toReplace)
+					return r.ReplacementString;
+			}
+			return DefaultReplacement;
+		}
+
+
+		public static bool ContainsInvalid(string path)
+			=> path.Any(c => invalidChars.Contains(c));
+
+		public string ReplaceInvalidFilenameChars(string fileName)
+		{
+			if (string.IsNullOrEmpty(fileName)) return string.Empty;
+			var builder = new System.Text.StringBuilder();
+			for (var i = 0; i < fileName.Length; i++)
+			{
+				var c = fileName[i];
+
+				if (invalidChars.Contains(c) || c == ForwardSlash.CharacterToReplace || c == BackSlash.CharacterToReplace)
+				{
+					char preceding = i > 0 ? fileName[i - 1] : default;
+					char succeeding = i < fileName.Length - 1 ? fileName[i + 1] : default;
+					builder.Append(GetFilenameCharReplacement(c, preceding, succeeding));
+				}
+				else
+					builder.Append(c);
+
+			}
+			return builder.ToString();
+		}
+
+		public string ReplaceInvalidPathChars(string pathStr)
+		{
+			if (string.IsNullOrEmpty(pathStr)) return string.Empty;
+
+			// replace all colons except within the first 2 chars
+			var builder = new System.Text.StringBuilder();
+			for (var i = 0; i < pathStr.Length; i++)
+			{
+				var c = pathStr[i];
+
+				if (!invalidChars.Contains(c) || (c == ':' && i == 1 && Path.IsPathRooted(pathStr)))
+					builder.Append(c);
+				else
+				{
+					char preceding = i > 0 ? pathStr[i - 1] : default;
+					char succeeding = i < pathStr.Length - 1 ? pathStr[i + 1] : default;
+					builder.Append(GetPathCharReplacement(c, preceding, succeeding));
+				}
+
+			}
+			return builder.ToString();
+		}
+	}
+
+	#region JSON Converter
+	internal class ReplacementCharactersConverter : JsonConverter
+	{
+		public override bool CanConvert(Type objectType)
+			=> objectType == typeof(ReplacementCharacters);
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		{
+			var jObj = JObject.Load(reader);
+			var replaceArr = jObj[nameof(Replacement)];
+			IReadOnlyList<Replacement> dict = replaceArr
+				.ToObject<Replacement[]>().ToList();
+
+			//Ensure that the first 6 replacements are for the expected chars and that all replacement strings are valid.
+			//If not, reset to default.
+
+			var default0 = Replacement.OtherInvalid("");
+			var default1 = Replacement.FilenameForwardSlash("");
+			var default2 = Replacement.FilenameBackSlash("");
+			var default3 = Replacement.OpenQuote("");
+			var default4 = Replacement.CloseQuote("");
+			var default5 = Replacement.OtherQuote("");
+
+			if (dict.Count < Replacement.FIXED_COUNT ||
+				dict[0].CharacterToReplace != default0.CharacterToReplace || dict[0].Description != default0.Description ||
+				dict[1].CharacterToReplace != default1.CharacterToReplace || dict[1].Description != default1.Description ||
+				dict[2].CharacterToReplace != default2.CharacterToReplace || dict[2].Description != default2.Description ||
+				dict[3].CharacterToReplace != default3.CharacterToReplace || dict[3].Description != default3.Description ||
+				dict[4].CharacterToReplace != default4.CharacterToReplace || dict[4].Description != default4.Description ||
+				dict[5].CharacterToReplace != default5.CharacterToReplace || dict[5].Description != default5.Description ||
+				dict.Any(r => ReplacementCharacters.ContainsInvalid(r.ReplacementString))
+				)
+			{
+				dict = ReplacementCharacters.Default.Replacements;
+			}
+			//First FIXED_COUNT are mandatory
+			for (int i = 0; i < Replacement.FIXED_COUNT; i++)
+				dict[i].Mandatory = true;
+
+			return new ReplacementCharacters { Replacements = dict };
+		}
+
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+		{
+			ReplacementCharacters replacements = (ReplacementCharacters)value;
+
+			var propertyNames = replacements.Replacements
+				.Select(c => JObject.FromObject(c)).ToList();
+
+			var prop = new JProperty(nameof(Replacement), new JArray(propertyNames));
+
+			var obj = new JObject();
+			obj.AddFirst(prop);
+			obj.WriteTo(writer);
+		}
+	}
+	#endregion
+}

Source/Hangover/Hangover.csproj

@@ -6,13 +6,22 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>
-
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
   <!--
   When LibationWinForms and Hangover output to the same dir, Hangover must build before LibationWinForms
 
@@ -24,11 +33,13 @@
   edit debug and release output paths
   -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
+    <OutputPath>..\bin\Debug</OutputPath>
+	  <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
+    <OutputPath>..\bin\Release</OutputPath>
+	  <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,7 +48,7 @@
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
     <Compile Update="Form1.*.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>

Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+  </PropertyGroup>
+</Project>

Source/LibationCli/LibationCli.csproj

@@ -4,12 +4,21 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
-
-    <PublishTrimmed>true</PublishTrimmed>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <IsPublishable>True</IsPublishable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <!--
@@ -23,11 +32,13 @@
   edit debug and release output paths
   -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
+	  <OutputPath>..\bin\Debug</OutputPath>
+	  <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\LibationWinForms\bin\Release</OutputPath>
+	  <OutputPath>..\bin\Release</OutputPath>
+	  <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+  </PropertyGroup>
+</Project>

Source/LibationFileManager/Configuration.cs

@@ -74,6 +74,13 @@ namespace LibationFileManager
 
 		public bool Exists(string propertyName) => persistentDictionary.Exists(propertyName);       
 
+		[Description("Use the beta version of Libation\r\nNew and experimental features, but probably buggy.\r\n(requires restart to take effect)")]
+		public bool BetaOptIn
+		{
+			get => persistentDictionary.GetNonString<bool>(nameof(BetaOptIn));
+			set => persistentDictionary.SetNonString(nameof(BetaOptIn), value);
+		}
+
 		[Description("Location for book storage. Includes destination of newly liberated books")]
 		public string Books
 		{
@@ -117,6 +124,13 @@ namespace LibationFileManager
 			set => persistentDictionary.SetNonString(nameof(SplitFilesByChapter), value);
 		}
 
+		[Description("Merge Opening/End Credits into the following/preceding chapters")]
+		public bool MergeOpeningAndEndCredits
+		{
+			get => persistentDictionary.GetNonString<bool>(nameof(MergeOpeningAndEndCredits));
+			set => persistentDictionary.SetNonString(nameof(MergeOpeningAndEndCredits), value);
+		}
+
 		[Description("Strip \"(Unabridged)\" from audiobook metadata tags")]
 		public bool StripUnabridged
 		{
@@ -284,6 +298,13 @@ namespace LibationFileManager
 
 		#region templates: custom file naming
 
+		[Description("Edit how illegal filename characters are replaced")]
+		public ReplacementCharacters ReplacementCharacters
+		{
+			get => persistentDictionary.GetNonString<ReplacementCharacters>(nameof(ReplacementCharacters));
+			set => persistentDictionary.SetNonString(nameof(ReplacementCharacters), value);
+		}
+
 		[Description("How to format the folders in which files will be saved")]
 		public string FolderTemplate
 		{
@@ -430,7 +451,7 @@ namespace LibationFileManager
 		#endregion
 
 		#region LibationFiles
-		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "appsettings.json");
+		private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), "appsettings.json");
 		private const string LIBATION_FILES_KEY = "LibationFiles";
 
 		[Description("Location for storage of program-created files")]

Source/LibationFileManager/LibationFileManager.csproj

@@ -14,4 +14,12 @@
     <ProjectReference Include="..\FileManager\FileManager.csproj" />
   </ItemGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+	
 </Project>

Source/LibationFileManager/Templates.cs

@@ -54,10 +54,7 @@ namespace LibationFileManager
 			if (template is null)
 				return new[] { ERROR_NULL_IS_INVALID };
 
-			if (template.Contains(':')
-				|| template.Contains(Path.DirectorySeparatorChar)
-				|| template.Contains(Path.AltDirectorySeparatorChar)
-				)
+			if (ReplacementCharacters.ContainsInvalid(template.Replace("<","").Replace(">","")))
 				return new[] { ERROR_INVALID_FILE_NAME_CHAR };
 
 			return Valid;
@@ -106,7 +103,7 @@ namespace LibationFileManager
 			=> string.IsNullOrWhiteSpace(template)
 			? ""
 			: getFileNamingTemplate(libraryBookDto, template, null, null)
-			.GetFilePath().PathWithoutPrefix;
+			.GetFilePath(Configuration.Instance.ReplacementCharacters).PathWithoutPrefix;
 
 		private static Regex ifSeriesRegex { get; } = new Regex("<if series->(.*?)<-if series>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
@@ -126,7 +123,7 @@ namespace LibationFileManager
 			var t = template + FileUtility.GetStandardizedExtension(extension);
 			var fullfilename = dirFullPath == "" ? t : Path.Combine(dirFullPath, t);
 
-			var fileNamingTemplate = new FileNamingTemplate(fullfilename) { IllegalCharacterReplacements = "_" };
+			var fileNamingTemplate = new FileNamingTemplate(fullfilename);
 
 			var title = libraryBookDto.Title ?? "";
 			var titleShort = title.IndexOf(':') < 1 ? title : title.Substring(0, title.IndexOf(':'));
@@ -200,6 +197,10 @@ namespace LibationFileManager
 				if (template.Contains(':'))
 					return new[] { ERROR_FULL_PATH_IS_INVALID };
 
+				// must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
+				if (ReplacementCharacters.ContainsInvalid(template.Replace("<", "").Replace(">", "")))
+						return new[] { ERROR_INVALID_FILE_NAME_CHAR };
+
 				return Valid;
 			}
 			
@@ -210,7 +211,7 @@ namespace LibationFileManager
 			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
 			public string GetFilename(LibraryBookDto libraryBookDto, string baseDir = null)
 				=> getFileNamingTemplate(libraryBookDto, Configuration.Instance.FolderTemplate, baseDir ?? AudibleFileStorage.BooksDirectory, null)
-				.GetFilePath();
+				.GetFilePath(Configuration.Instance.ReplacementCharacters);
 			#endregion
 		}
 
@@ -233,7 +234,7 @@ namespace LibationFileManager
 			/// <summary>USES LIVE CONFIGURATION VALUES</summary>
 			public string GetFilename(LibraryBookDto libraryBookDto, string dirFullPath, string extension, bool returnFirstExisting = false)
 				=> getFileNamingTemplate(libraryBookDto, Configuration.Instance.FileTemplate, dirFullPath, extension)
-				.GetFilePath(returnFirstExisting);
+				.GetFilePath(Configuration.Instance.ReplacementCharacters, returnFirstExisting);
 			#endregion
 		}
 
@@ -268,8 +269,9 @@ namespace LibationFileManager
 			public string GetFilename(LibraryBookDto libraryBookDto, AaxDecrypter.MultiConvertFileProperties props)
 				=> GetPortionFilename(libraryBookDto, Configuration.Instance.ChapterFileTemplate, props, AudibleFileStorage.DecryptInProgressDirectory);
 
-			public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props, string fullDirPath)
+			public string GetPortionFilename(LibraryBookDto libraryBookDto, string template, AaxDecrypter.MultiConvertFileProperties props, string fullDirPath, ReplacementCharacters replacements = null)
 			{
+				replacements ??= Configuration.Instance.ReplacementCharacters;
 				var fileNamingTemplate = getFileNamingTemplate(libraryBookDto, template, fullDirPath, Path.GetExtension(props.OutputFileName));
 
 				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChCount, props.PartsTotal);
@@ -277,7 +279,7 @@ namespace LibationFileManager
 				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChNumber0, FileUtility.GetSequenceFormatted(props.PartsPosition, props.PartsTotal));
 				fileNamingTemplate.AddParameterReplacement(TemplateTags.ChTitle, props.Title ?? "");
 
-				return fileNamingTemplate.GetFilePath().PathWithoutPrefix;
+				return fileNamingTemplate.GetFilePath(replacements).PathWithoutPrefix;
 			}
 			#endregion
 		}

Source/LibationSearchEngine/LibationSearchEngine.csproj

@@ -15,5 +15,14 @@
   <ItemGroup>
     <ProjectReference Include="..\DataLayer\DataLayer.csproj" />
   </ItemGroup>
+	
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
 
 </Project>

Source/LibationWinForms/AvaloniaUI/App.axaml

@@ -0,0 +1,17 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:LibationWinForms.AvaloniaUI"
+			 x:Class="LibationWinForms.AvaloniaUI.App">
+	
+	<Application.DataTemplates>
+		<local:ViewLocator/>
+	</Application.DataTemplates>
+	
+    <Application.Styles>
+        <FluentTheme Mode="Light"/>
+		<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+		<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+		<StyleInclude Source="/AvaloniaUI/Assets/DataGridTheme.xaml"/>
+		<StyleInclude Source="/AvaloniaUI/Assets/LibationStyles.xaml"/>
+	</Application.Styles>
+</Application>

Source/LibationWinForms/AvaloniaUI/App.axaml.cs

@@ -0,0 +1,47 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using LibationFileManager;
+using LibationWinForms.AvaloniaUI.Views;
+
+namespace LibationWinForms.AvaloniaUI
+{
+	public class App : Application
+	{
+		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 override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			LoadStyles();
+
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				var mainWindow = new MainWindow();
+				desktop.MainWindow = mainWindow;
+				mainWindow.RestoreSizeAndLocation(Configuration.Instance);
+				mainWindow.OnLoad();
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+
+		private void LoadStyles()
+		{
+			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookFailedBrush");
+			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCompletedBrush");
+			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCancelledBrush");
+			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
+			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/Assets/DataGridTheme.xaml

@@ -0,0 +1,658 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <Styles.Resources>
+    <x:Double x:Key="ListAccentLowOpacity">0.6</x:Double>
+    <x:Double x:Key="ListAccentMediumOpacity">0.8</x:Double>
+    <Thickness x:Key="DataGridTextColumnCellTextBlockMargin">12,0,12,0</Thickness>
+
+    <StreamGeometry x:Key="DataGridSortIconDescendingPath">M1875 1011l-787 787v-1798h-128v1798l-787 -787l-90 90l941 941l941 -941z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconClosedPath">M515 93l930 931l-930 931l90 90l1022 -1021l-1022 -1021z</StreamGeometry>
+    <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M1939 1581l90 -90l-1005 -1005l-1005 1005l90 90l915 -915z</StreamGeometry>
+
+    <SolidColorBrush x:Key="DataGridColumnHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderDraggedBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackgroundBrush" Color="{DynamicResource SystemChromeMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderPressedBackgroundBrush" Color="{DynamicResource SystemListMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderForegroundBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
+
+    <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
+    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+    <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
+    <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
+    <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+
+    <SolidColorBrush x:Key="DataGridRowHeaderForegroundBrush" Color="{DynamicResource SystemBaseMediumColor}" />
+    <SolidColorBrush x:Key="DataGridRowHeaderBackgroundBrush" Color="{DynamicResource SystemAltHighColor}" />
+
+    <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
+    <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
+    <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+
+    <SolidColorBrush x:Key="DataGridGridLinesBrush"
+                     Opacity="0.4"
+                     Color="{DynamicResource SystemBaseMediumLowColor}" />
+    <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />
+    <SolidColorBrush x:Key="DataGridDetailsPresenterBackgroundBrush" Color="{DynamicResource SystemChromeMediumLowColor}" />
+    <StaticResource x:Key="DataGridFillerColumnGridLinesBrush" ResourceKey="SystemControlTransparentBrush" />
+  </Styles.Resources>
+
+  <Style Selector="DataGridCell">
+    <Setter Property="Background" Value="{DynamicResource DataGridCellBackgroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="MinHeight" Value="32" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="CellBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid x:Name="PART_CellRoot" ColumnDefinitions="*,Auto">
+
+            <Rectangle x:Name="CurrencyVisual"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                       StrokeThickness="1" />
+            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
+              <Rectangle HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                         StrokeThickness="2" />
+              <Rectangle Margin="2"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         StrokeThickness="1" />
+				
+            </Grid>
+
+            <ContentPresenter Margin="{TemplateBinding Padding}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"/>
+
+            <Rectangle x:Name="InvalidVisualElement"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCellInvalidBrush}"
+                       StrokeThickness="1" />
+
+            <Rectangle Name="PART_RightGridLine"
+                       Grid.Column="1"
+                       Width="1"
+                       VerticalAlignment="Stretch"
+                       Fill="{DynamicResource DataGridFillerColumnGridLinesBrush}" />
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridCell > TextBlock#CellTextBlock">
+    <Setter Property="Margin" Value="{DynamicResource DataGridTextColumnCellTextBlockMargin}" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+  </Style>
+  
+  <Style Selector="DataGridCell /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridCell /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridCell:current /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGrid:focus DataGridCell:current /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGridCell /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridCell:invalid /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGridCell > TextBox DataValidationErrors">
+    <Setter Property="Template" Value="{DynamicResource TooltipDataValidationContentTemplate}" />
+    <Setter Property="ErrorTemplate" Value="{DynamicResource TooltipDataValidationErrorTemplate}" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader">
+    <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="Padding" Value="6,0,0,0" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="HeaderBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
+
+            <Grid Grid.Column="0" Margin="{TemplateBinding Padding}"
+                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ColumnDefinitions="*,12">
+ 
+              <ContentPresenter Grid.Column="0"			  
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+					Content="{TemplateBinding Content}"
+					ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+              <Path Name="SortIcon"
+                    Grid.Column="1"
+                    Height="12"
+                    Width="8"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Fill="{TemplateBinding Foreground}"
+                    Stretch="Uniform"
+                    Margin="0,0,4,0"
+					Data="F1 M -5.215,6.099L 5.215,6.099L 0,0L -5.215,6.099 Z "/>
+            </Grid>
+
+            <Rectangle Name="VerticalSeparator"
+                       Grid.Column="1"
+                       Width="1"
+                       VerticalAlignment="Stretch"
+                       Fill="{TemplateBinding SeparatorBrush}"
+                       IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+            <Grid x:Name="FocusVisual" IsHitTestVisible="False">
+              <Rectangle x:Name="FocusVisualPrimary"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                         StrokeThickness="2" />
+              <Rectangle x:Name="FocusVisualSecondary"
+                         Margin="2"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Fill="Transparent"
+                         IsHitTestVisible="False"
+                         Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                         StrokeThickness="1" />
+            </Grid>
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridColumnHeader /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridColumnHeader:focus-visible /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:pointerover /template/ Grid#PART_ColumnHeaderRoot">
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridColumnHeader:pressed /template/ Grid#PART_ColumnHeaderRoot">
+    <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:dragIndicator">
+    <Setter Property="Opacity" Value="0.5" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader /template/ Path#SortIcon">
+    <Setter Property="IsVisible" Value="False" />
+	<Setter Property="RenderTransform">
+      <Setter.Value>
+        <ScaleTransform ScaleX="0.9" ScaleY="0.9" />
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:sortascending /template/ Path#SortIcon">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <Style Selector="DataGridColumnHeader:sortdescending /template/ Path#SortIcon">
+    <Setter Property="IsVisible" Value="True" />
+    <Setter Property="RenderTransform">
+      <Setter.Value>
+        <ScaleTransform ScaleX="0.9" ScaleY="-0.9" />
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRow">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="RowBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <DataGridFrozenGrid Name="PART_Root"
+                              ColumnDefinitions="Auto,*"
+                              RowDefinitions="*,Auto,Auto">
+
+            <Rectangle Name="BackgroundRectangle"
+                       Grid.RowSpan="2"
+                       Grid.ColumnSpan="2" />
+            <Rectangle x:Name="InvalidVisualElement"
+                       Grid.ColumnSpan="2"
+                       Fill="{DynamicResource DataGridRowInvalidBrush}" />
+
+            <DataGridRowHeader Name="PART_RowHeader"
+                               Grid.RowSpan="3"
+                               DataGridFrozenGrid.IsFrozen="True" />
+            <DataGridCellsPresenter Name="PART_CellsPresenter"
+                                    Grid.Column="1"
+                                    DataGridFrozenGrid.IsFrozen="True" />
+            <DataGridDetailsPresenter Name="PART_DetailsPresenter"
+                                      Grid.Row="1"
+                                      Grid.Column="1"
+                                      Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
+            <Rectangle Name="PART_BottomGridLine"
+                       Grid.Row="2"
+                       Grid.Column="1"
+                       Height="1"
+                       HorizontalAlignment="Stretch" />
+
+          </DataGridFrozenGrid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRow">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].RowBackground}" />
+  </Style>
+  <Style Selector="DataGridRow:nth-child(even)">
+    <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
+  </Style>
+
+  <Style Selector="DataGridRow /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+  <Style Selector="DataGridRow:invalid /template/ Rectangle#InvalidVisualElement">
+    <Setter Property="Opacity" Value="0.4" />
+  </Style>
+  <Style Selector="DataGridRow:invalid /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+
+  <Style Selector="DataGridRow /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+  </Style>
+  <Style Selector="DataGridRow:selected /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:selected:pointerover /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:selected:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:selected:pointerover:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+  </Style>
+
+  <Style Selector="DataGridRowHeader">
+    <Setter Property="Foreground" Value="{DynamicResource DataGridRowHeaderForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridRowHeaderBackgroundBrush}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="AreSeparatorsVisible" Value="False" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid x:Name="PART_Root"
+              RowDefinitions="*,*,Auto"
+              ColumnDefinitions="Auto,*">
+          <Border Grid.RowSpan="3"
+                  Grid.ColumnSpan="2"
+                  BorderBrush="{TemplateBinding SeparatorBrush}"
+                  BorderThickness="0,0,1,0">
+            <Grid Background="{TemplateBinding Background}">
+              <Rectangle x:Name="RowInvalidVisualElement"
+                         Fill="{DynamicResource DataGridRowInvalidBrush}"
+                         Stretch="Fill" />
+              <Rectangle x:Name="BackgroundRectangle"
+                         Stretch="Fill" />
+            </Grid>
+          </Border>
+          <Rectangle x:Name="HorizontalSeparator"
+                     Grid.Row="2"
+                     Grid.ColumnSpan="2"
+                     Height="1"
+                     Margin="1,0,1,0"
+                     HorizontalAlignment="Stretch"
+                     Fill="{TemplateBinding SeparatorBrush}"
+                     IsVisible="{TemplateBinding AreSeparatorsVisible}" />
+
+          <ContentPresenter Grid.RowSpan="2"
+                            Grid.Column="1"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Content}" />
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRowHeader /template/ Rectangle#RowInvalidVisualElement">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#RowInvalidVisualElement">
+    <Setter Property="Opacity" Value="0.4" />
+  </Style>
+  <Style Selector="DataGridRowHeader:invalid /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Opacity" Value="0" />
+  </Style>
+
+  <Style Selector="DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover DataGridRowHeader /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowHoveredBackgroundColor}" />
+  </Style>
+  <Style Selector="DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredUnfocusedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedBackgroundOpacity}" />
+  </Style>
+  <Style Selector="DataGridRow:pointerover DataGridRowHeader:selected:focus /template/ Rectangle#BackgroundRectangle">
+    <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundBrush}" />
+    <Setter Property="Opacity" Value="{DynamicResource DataGridRowSelectedHoveredBackgroundOpacity}" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Foreground" Value="{DynamicResource DataGridRowGroupHeaderForegroundBrush}" />
+    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackgroundBrush}" />
+    <Setter Property="FontSize" Value="15" />
+    <Setter Property="MinHeight" Value="32" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <DataGridFrozenGrid Name="PART_Root"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            ColumnDefinitions="Auto,Auto,Auto,Auto,*"
+                            RowDefinitions="*,Auto">
+
+          <Rectangle Name="IndentSpacer"
+                     Grid.Column="1" />
+          <ToggleButton Name="ExpanderButton"
+                        Grid.Column="2"
+                        Width="12"
+                        Height="12"
+                        Margin="12,0,0,0"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Focusable="False"
+                        Foreground="{TemplateBinding Foreground}" />
+
+          <StackPanel Grid.Column="3"
+                      Orientation="Horizontal"
+                      VerticalAlignment="Center"
+                      Margin="12,0,0,0">
+            <TextBlock Name="PropertyNameElement"
+                       Margin="4,0,0,0"
+                       IsVisible="{TemplateBinding IsPropertyNameVisible}"
+                       Foreground="{TemplateBinding Foreground}" />
+            <TextBlock Margin="4,0,0,0"
+                       Text="{Binding Key}"
+                       Foreground="{TemplateBinding Foreground}" />
+            <TextBlock Name="ItemCountElement"
+                       Margin="4,0,0,0"
+                       IsVisible="{TemplateBinding IsItemCountVisible}"
+                       Foreground="{TemplateBinding Foreground}" />
+          </StackPanel>
+
+          <Rectangle x:Name="CurrencyVisual"
+                     Grid.ColumnSpan="5"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     Fill="Transparent"
+                     IsHitTestVisible="False"
+                     Stroke="{DynamicResource DataGridCurrencyVisualPrimaryBrush}"
+                     StrokeThickness="1" />
+          <Grid x:Name="FocusVisual"
+                Grid.ColumnSpan="5"
+                IsHitTestVisible="False">
+            <Rectangle HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
+                       StrokeThickness="2" />
+            <Rectangle Margin="2"
+                       HorizontalAlignment="Stretch"
+                       VerticalAlignment="Stretch"
+                       Fill="Transparent"
+                       IsHitTestVisible="False"
+                       Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
+                       StrokeThickness="1" />
+          </Grid>
+
+          <DataGridRowHeader Name="PART_RowHeader"
+                             Grid.RowSpan="2"
+                             DataGridFrozenGrid.IsFrozen="True" />
+
+          <Rectangle x:Name="PART_BottomGridLine"
+                     Grid.Row="1"
+                     Grid.ColumnSpan="5"
+                     Height="1" />
+        </DataGridFrozenGrid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Grid.Column="0"
+                Width="12"
+                Height="12"
+                Background="Transparent"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center">
+          <Path Fill="{TemplateBinding Foreground}"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Stretch="Uniform" />
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton /template/ Path">
+    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconOpenedPath}" />
+    <Setter Property="Stretch" Value="Uniform" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ ToggleButton#ExpanderButton:checked /template/ Path">
+    <Setter Property="Data" Value="{StaticResource DataGridRowGroupHeaderIconClosedPath}" />
+    <Setter Property="Stretch" Value="UniformToFill" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ DataGridFrozenGrid#PART_Root">
+    <Setter Property="Background" Value="{Binding $parent[DataGridRowGroupHeader].Background}" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader:pointerover /template/ DataGridFrozenGrid#PART_Root">
+    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderHoveredBackgroundBrush}" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader:pressed /template/ DataGridFrozenGrid#PART_Root">
+    <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderPressedBackgroundBrush}" />
+  </Style>
+
+  <Style Selector="DataGridRowGroupHeader /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGridRowGroupHeader:current /template/ Rectangle#CurrencyVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+  <Style Selector="DataGrid:focus DataGridRowGroupHeader:current /template/ Grid#FocusVisual">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+  <Style Selector="DataGrid">
+    <Setter Property="RowBackground" Value="Transparent" />
+    <Setter Property="AlternatingRowBackground" Value="Transparent" />
+    <Setter Property="HeadersVisibility" Value="Column" />
+    <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="SelectionMode" Value="Extended" />
+    <Setter Property="GridLinesVisibility" Value="None" />
+    <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
+    <Setter Property="DropLocationIndicatorTemplate">
+      <Template>
+        <Rectangle Fill="{DynamicResource DataGridDropLocationIndicatorBackground}"
+                   Width="2" />
+      </Template>
+    </Setter>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border x:Name="DataGridBorder"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                CornerRadius="{TemplateBinding CornerRadius}">
+          <Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="Auto,*,Auto,Auto">
+            <Grid.Resources>
+              <ControlTemplate x:Key="TopLeftHeaderTemplate"
+                               TargetType="DataGridColumnHeader">
+                <Grid x:Name="TopLeftHeaderRoot"
+                      RowDefinitions="*,*,Auto">
+                  <Border Grid.RowSpan="2"
+                          BorderThickness="0,0,1,0"
+                          BorderBrush="{DynamicResource DataGridGridLinesBrush}" />
+                  <Rectangle Grid.RowSpan="2"
+                             VerticalAlignment="Bottom"
+                             StrokeThickness="1"
+                             Height="1"
+                             Fill="{DynamicResource DataGridGridLinesBrush}" />
+                </Grid>
+              </ControlTemplate>
+              <ControlTemplate x:Key="TopRightHeaderTemplate"
+                               TargetType="DataGridColumnHeader">
+                <Grid x:Name="RootElement" />
+              </ControlTemplate>
+            </Grid.Resources>
+
+            <DataGridColumnHeader Name="PART_TopLeftCornerHeader"
+                                  Template="{StaticResource TopLeftHeaderTemplate}" />
+            <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
+                                            Grid.Column="1"
+                                            Grid.ColumnSpan="2" />
+            <!--<DataGridColumnHeader Name="PART_TopRightCornerHeader"
+                                  Grid.Column="2"
+                                  Template="{StaticResource TopRightHeaderTemplate}" />-->
+            <Rectangle Name="PART_ColumnHeadersAndRowsSeparator"
+                       Grid.ColumnSpan="3"
+                       VerticalAlignment="Bottom"
+                       Height="1"
+                       Fill="{DynamicResource DataGridGridLinesBrush}" />
+
+            <DataGridRowsPresenter Name="PART_RowsPresenter"
+                                   Grid.Row="1"
+                                   Grid.RowSpan="2"
+                                   Grid.ColumnSpan="3">
+              <DataGridRowsPresenter.GestureRecognizers>
+                <ScrollGestureRecognizer CanHorizontallyScroll="True" CanVerticallyScroll="True" />
+              </DataGridRowsPresenter.GestureRecognizers>
+            </DataGridRowsPresenter>
+            <Rectangle Name="PART_BottomRightCorner"
+                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                       Grid.Column="2"
+                       Grid.Row="2" />
+            <!--<Rectangle Name="BottomLeftCorner"
+                       Fill="{DynamicResource DataGridScrollBarsSeparatorBackground}"
+                       Grid.Row="2"
+                       Grid.ColumnSpan="2" />-->
+            <ScrollBar Name="PART_VerticalScrollbar"
+                       Orientation="Vertical"
+                       Grid.Column="2"
+                       Grid.Row="1"
+                       Width="{DynamicResource ScrollBarSize}" />
+
+            <Grid Grid.Column="1"
+                  Grid.Row="2"
+                  ColumnDefinitions="Auto,*">
+              <Rectangle Name="PART_FrozenColumnScrollBarSpacer" />
+              <ScrollBar Name="PART_HorizontalScrollbar"
+                         Grid.Column="1"
+                         Orientation="Horizontal"
+                         Height="{DynamicResource ScrollBarSize}" />
+            </Grid>
+            <Border x:Name="PART_DisabledVisualElement"
+                    Grid.ColumnSpan="3"
+                    Grid.RowSpan="4"
+                    IsHitTestVisible="False"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    CornerRadius="2"
+                    Background="{DynamicResource DataGridDisabledVisualElementBackground}"
+                    IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+
+  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeader#PART_TopLeftCornerHeader">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGrid:empty-columns /template/ DataGridColumnHeadersPresenter#PART_ColumnHeadersPresenter">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+  <Style Selector="DataGrid:empty-columns /template/ Rectangle#PART_ColumnHeadersAndRowsSeparator">
+    <Setter Property="IsVisible" Value="False" />
+  </Style>
+</Styles>

Source/LibationWinForms/AvaloniaUI/Assets/LibationStyles.xaml

@@ -0,0 +1,12 @@
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<Styles.Resources>
+		<Color x:Key="SeriesEntryGridBackgroundColor">#FFE6FFE6</Color>
+
+		<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush"  Color="{StaticResource SeriesEntryGridBackgroundColor}" />
+		<SolidColorBrush x:Key="ProcessQueueBookFailedBrush" Color="LightCoral" />
+		<SolidColorBrush x:Key="ProcessQueueBookCompletedBrush" Color="PaleGreen" />
+		<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
+		<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="{StaticResource SystemAltHighColor}" />
+		<SolidColorBrush x:Key="ProcessQueueBookBorderBrush" Color="Gray" />
+	</Styles.Resources>
+</Styles>

Source/LibationWinForms/AvaloniaUI/AvaloniaUtils.cs

@@ -0,0 +1,17 @@
+using Avalonia.Media;
+using System;
+
+namespace LibationWinForms.AvaloniaUI
+{
+	internal static class AvaloniaUtils
+	{
+		public static IBrush GetBrushFromResources(string name)
+			=> GetBrushFromResources(name, Brushes.Transparent);
+		public static IBrush GetBrushFromResources(string name, IBrush defaultBrush)
+		{
+			if (App.Current.Styles.TryGetResource(name, out var value) && value is IBrush brush)
+				return brush;
+			return defaultBrush;
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml

@@ -0,0 +1,5 @@
+<DataGridCheckBoxColumn xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="LibationWinForms.AvaloniaUI.Controls.DataGridCheckBoxColumnExt">
+
+</DataGridCheckBoxColumn >

Source/LibationWinForms/AvaloniaUI/Controls/DataGridCheckBoxColumnExt.axaml.cs

@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using LibationWinForms.AvaloniaUI.ViewModels;
+using System;
+
+namespace LibationWinForms.AvaloniaUI.Controls
+{
+	public partial class DataGridCheckBoxColumnExt : DataGridCheckBoxColumn
+	{
+		protected override IControl GenerateEditingElementDirect(DataGridCell cell, object dataItem)
+		{
+			//Only SeriesEntry types have three-state checks, individual LibraryEntry books are binary.
+			var ele = base.GenerateEditingElementDirect(cell, dataItem) as CheckBox;
+			ele.IsThreeState = dataItem is SeriesEntry;
+			return ele;
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/Controls/DirectorySelectControl.axaml

@@ -0,0 +1,53 @@
+<TemplatedControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:controls="clr-namespace:LibationWinForms.AvaloniaUI.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="LibationWinForms.AvaloniaUI.Controls.DirectorySelectControl">
+
+	<Design.DataContext>
+	</Design.DataContext>
+
+
+	<TemplatedControl.Styles>
+		<Style Selector="controls|DirectorySelectControl Border">
+			<Setter Property="BorderBrush" Value="DarkGray" />
+		</Style>
+		<Style Selector="controls|DirectorySelectControl">
+			<Setter Property="Template">
+				<ControlTemplate>
+					
+
+					<StackPanel Orientation="Vertical">
+						<StackPanel.Styles>
+							<Style Selector="ItemsPresenter#PART_ItemsPresenter">
+								<Setter Property="Height" Value="NaN"/>
+							</Style>
+						</StackPanel.Styles>
+						<ComboBox
+									HorizontalContentAlignment = "Stretch"
+									HorizontalAlignment = "Stretch"
+									VerticalAlignment="Stretch"
+									VerticalContentAlignment="Stretch"
+									SelectedItem="{Binding SelectedComboBoxItem, Mode=TwoWay}"
+									Items="{Binding ComboBoxItems}">
+							<ComboBox.ItemTemplate>
+								<DataTemplate>
+
+									<TextBlock
+										FontSize="12"
+										Text="{Binding Description}" />
+
+								</DataTemplate>
+							</ComboBox.ItemTemplate>
+						</ComboBox>
+						<TextBox Margin="0,10,0,10" Text="{Binding SelectedComboBoxItem.UiDisplayPath}" />
+					</StackPanel>
+					
+				</ControlTemplate>
+			</Setter>
+		</Style>
+	</TemplatedControl.Styles>
+	
+</TemplatedControl>

Source/LibationWinForms/AvaloniaUI/Controls/DirectorySelectControl.axaml.cs

@@ -0,0 +1,146 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Dinah.Core;
+using LibationFileManager;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using ReactiveUI;
+using Avalonia.Controls.Primitives;
+using System.Collections;
+using Avalonia.Data.Converters;
+using System;
+using System.Globalization;
+using Avalonia.Data;
+
+namespace LibationWinForms.AvaloniaUI.Controls
+{
+	public class TextCaseConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is Configuration.KnownDirectories dir)
+			{
+
+			}
+			return new BindingNotification(new InvalidCastException(), BindingErrorType.Error);
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+	public partial class DirectorySelectControl : TemplatedControl
+	{
+		private static readonly List<Configuration.KnownDirectories> defaultList = new List<Configuration.KnownDirectories>()
+		{
+					Configuration.KnownDirectories.WinTemp,
+					Configuration.KnownDirectories.UserProfile,
+					Configuration.KnownDirectories.AppDir,
+					Configuration.KnownDirectories.MyDocs,
+					Configuration.KnownDirectories.LibationFiles
+			};
+	public static readonly StyledProperty<Configuration.KnownDirectories?> SelectedirectoryProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, Configuration.KnownDirectories?>(nameof(Selectedirectory), defaultList[0]);
+
+		public static readonly StyledProperty<List<Configuration.KnownDirectories>> KnownDirectoriesProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, List<Configuration.KnownDirectories>>(nameof(KnownDirectories), defaultList);
+
+		public static readonly StyledProperty<string?> SubdirectoryProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, string?>(nameof(Subdirectory), "subdir");
+
+		DirectorySelectViewModel DirectorySelect { get; } = new();
+		public DirectorySelectControl()
+		{
+			InitializeComponent();
+		}
+
+		protected override void OnInitialized()
+		{
+			DirectorySelect.Directories.Clear();
+
+			int insertIndex = 0;
+			foreach (var kd in KnownDirectories.Distinct())
+				DirectorySelect.Directories.Insert(insertIndex++, new(this, kd));
+
+			DataContext = DirectorySelect;
+			base.OnInitialized();
+		}
+
+		public List<Configuration.KnownDirectories> KnownDirectories
+		{
+			get { return GetValue(KnownDirectoriesProperty); }
+			set 
+			{
+				SetValue(KnownDirectoriesProperty, value);
+				//SetDirectoryItems(KnownDirectories);
+			}
+		}
+
+
+		public Configuration.KnownDirectories? Selectedirectory
+		{
+			get { return GetValue(SelectedirectoryProperty); }
+			set 
+			{
+				SetValue(SelectedirectoryProperty, value);
+
+				if (value is null or Configuration.KnownDirectories.None)
+					return;
+
+				// set default
+				var item = DirectorySelect.Directories.SingleOrDefault(item => item.Value == value.Value);
+				if (item is null)
+					return;
+
+				DirectorySelect.SelectedDirectory = item;
+			}
+		}
+
+
+		public string? Subdirectory
+		{
+			get { return GetValue(SubdirectoryProperty); }
+			set 
+			{
+				SetValue(SubdirectoryProperty, value);
+			}
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+
+	public class DirectorySelectViewModel : ViewModels.ViewModelBase
+	{
+		public class DirectoryComboBoxItem
+		{
+			private readonly DirectorySelectControl _parentControl;
+			public string Description { get; }
+			public Configuration.KnownDirectories Value { get; }
+
+			public string FullPath => AddSubDirectoryToPath(Configuration.GetKnownDirectoryPath(Value));
+
+			/// <summary>Displaying relative paths is confusing. UI should display absolute equivalent</summary>
+			public string UiDisplayPath => Value == Configuration.KnownDirectories.AppDir ? AddSubDirectoryToPath(Configuration.AppDir_Absolute) : FullPath;
+
+			public DirectoryComboBoxItem(DirectorySelectControl parentControl, Configuration.KnownDirectories knownDirectory)
+			{
+				_parentControl = parentControl;
+				Value = knownDirectory;
+				Description = Value.GetDescription();
+			}
+
+			internal string AddSubDirectoryToPath(string path) => string.IsNullOrWhiteSpace(_parentControl.Subdirectory) ? path : System.IO.Path.Combine(path, _parentControl.Subdirectory);
+
+			public override string ToString() => Description;
+		}
+		public ObservableCollection<DirectoryComboBoxItem> Directories { get; } = new(new());
+		private DirectoryComboBoxItem _selectedDirectory;
+		public DirectoryComboBoxItem SelectedDirectory { get => _selectedDirectory; set => this.RaiseAndSetIfChanged(ref _selectedDirectory, value); }
+	}
+}

Source/LibationWinForms/AvaloniaUI/Controls/GroupBox.axaml

@@ -0,0 +1,55 @@
+<ContentControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:controls="clr-namespace:LibationWinForms.AvaloniaUI.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="LibationWinForms.AvaloniaUI.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="Template">
+				<ControlTemplate>
+					<Grid ColumnDefinitions="Auto,*,Auto" RowDefinitions="7,10,*,Auto">
+
+						<Grid
+							ZIndex="1"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1" Margin="8,0,0,0"
+							ColumnDefinitions="Auto,*"
+							VerticalAlignment="Top">
+							<TextBlock
+								Padding="4,0,4,0"
+								Background="{StaticResource SystemAltHighColor}"
+								Text="{TemplateBinding Label}"
+								/>
+						</Grid>
+
+						<ContentPresenter
+							Margin="8,0,8,5"
+							Grid.Row="2"
+							Grid.Column="1"
+							Content="{TemplateBinding Content}"/>
+
+						<Border
+							BorderBrush="DarkGray"
+							BorderThickness="{TemplateBinding BorderWidth}"
+							CornerRadius="3"
+							Grid.Column="0"
+							Grid.ColumnSpan="3"
+							Grid.Row="1"
+							Grid.RowSpan="3"/>
+					
+					</Grid>
+				</ControlTemplate>
+			</Setter>
+		</Style>
+	</ContentControl.Styles>
+</ContentControl>

Source/LibationWinForms/AvaloniaUI/Controls/GroupBox.axaml.cs

@@ -0,0 +1,38 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace LibationWinForms.AvaloniaUI.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
+		{
+			get { return GetValue(LabelProperty); }
+			set { SetValue(LabelProperty, value); }
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/Controls/WheelComboBox.axaml

@@ -0,0 +1,5 @@
+<ComboBox xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="LibationWinForms.AvaloniaUI.Controls.WheelComboBox">
+
+</ComboBox>

Source/LibationWinForms/AvaloniaUI/Controls/WheelComboBox.axaml.cs

@@ -0,0 +1,35 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+using System;
+using System.Collections;
+using System.Linq;
+
+namespace LibationWinForms.AvaloniaUI.Controls
+{
+	public partial class WheelComboBox : ComboBox, IStyleable
+	{
+		Type IStyleable.StyleKey => typeof(ComboBox);
+		public WheelComboBox()
+		{
+			InitializeComponent();
+		}
+		protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+		{
+			var dir = Math.Sign(e.Delta.Y);
+			if (dir == 1 && SelectedIndex > 0)
+				SelectedIndex--;
+			else if (dir == -1 && SelectedIndex < ItemCount - 1)
+				SelectedIndex++;
+
+			base.OnPointerWheelChanged(e);
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/FormSaveExtension2.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using LibationFileManager;
+
+namespace LibationWinForms.AvaloniaUI
+{
+	public static class FormSaveExtension2
+	{
+		static readonly WindowIcon WindowIcon;
+		static FormSaveExtension2()
+		{
+			if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+				WindowIcon = desktop.MainWindow.Icon;
+			else
+				WindowIcon = null;
+		}
+
+		public static void SetLibationIcon(this Window form)
+		{
+			form.Icon = WindowIcon;
+		}
+
+		public static void RestoreSizeAndLocation(this Window form, Configuration config)
+		{
+			if (Design.IsDesignMode) return;
+
+			FormSizeAndPosition savedState = config.GetNonString<FormSizeAndPosition>(form.GetType().Name);
+
+			if (savedState is null)
+				return;
+
+			// too small -- something must have gone wrong. use defaults
+			if (savedState.Width < form.MinWidth || savedState.Height < form.MinHeight)
+			{
+				savedState.Width = (int)form.Width;
+				savedState.Height = (int)form.Height;
+			}
+
+			// Fit to the current screen size in case the screen resolution changed since the size was last persisted
+			if (savedState.Width > form.Screens.Primary.WorkingArea.Width)
+				savedState.Width = form.Screens.Primary.WorkingArea.Width;
+			if (savedState.Height > form.Screens.Primary.WorkingArea.Height)
+				savedState.Height = form.Screens.Primary.WorkingArea.Height;
+
+			var rect = new PixelRect(savedState.X, savedState.Y, savedState.Width, savedState.Height);
+
+			form.Width = savedState.Width;
+			form.Height = savedState.Height;
+
+			// is proposed rect on a screen?
+			if (form.Screens.All.Any(screen => screen.WorkingArea.Contains(rect)))
+			{
+				form.WindowStartupLocation = WindowStartupLocation.Manual;
+				form.Position = new PixelPoint(savedState.X, savedState.Y);
+			}
+			else
+			{
+				form.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+			}
+
+			// FINAL: for Maximized: start normal state, set size and location, THEN set max state
+			form.WindowState = savedState.IsMaximized ? WindowState.Maximized : WindowState.Normal;
+		}
+		public static void SaveSizeAndLocation(this Window form, Configuration config)
+		{
+			if (Design.IsDesignMode) return;
+
+			var saveState = new FormSizeAndPosition();
+
+			saveState.IsMaximized = form.WindowState == WindowState.Maximized;
+
+			// restore normal state to get real window size.
+			if (form.WindowState != WindowState.Normal)
+			{
+				form.WindowState = WindowState.Normal;
+			}
+
+			saveState.X = form.Position.X;
+			saveState.Y = form.Position.Y;
+
+			saveState.Width = (int)form.Bounds.Size.Width;
+			saveState.Height = (int)form.Bounds.Size.Height;
+
+			config.SetObject(form.GetType().Name, saveState);
+		}
+
+		class FormSizeAndPosition
+		{
+			public int X;
+			public int Y;
+			public int Height;
+			public int Width;
+			public bool IsMaximized;
+		}
+
+
+		public static void HideMinMaxBtns(this Window form)
+		{
+
+			if (Design.IsDesignMode)
+				return;
+#if WINDOWS7_0_OR_GREATER
+			var handle = form.PlatformImpl.Handle.Handle;
+			var currentStyle = GetWindowLong(handle, GWL_STYLE);
+
+			SetWindowLong(handle, GWL_STYLE, currentStyle & ~WS_MAXIMIZEBOX & ~WS_MINIMIZEBOX);
+#endif
+		}
+
+#if WINDOWS7_0_OR_GREATER
+		const long WS_MINIMIZEBOX = 0x00020000L;
+		const long WS_MAXIMIZEBOX = 0x10000L;
+		const int GWL_STYLE = -16;
+		[System.Runtime.InteropServices.DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+		static extern long GetWindowLong(IntPtr hWnd, int nIndex);
+		[System.Runtime.InteropServices.DllImport("user32.dll")]
+		static extern int SetWindowLong(IntPtr hWnd, int nIndex, long dwNewLong);
+#endif
+	}
+}

Source/LibationWinForms/AvaloniaUI/MessageBox.cs

@@ -0,0 +1,327 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using DataLayer;
+using LibationWinForms.AvaloniaUI.ViewModels.Dialogs;
+using LibationWinForms.AvaloniaUI.Views.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace LibationWinForms.AvaloniaUI
+{
+	public enum DialogResult
+	{
+		None = 0,
+		OK = 1,
+		Cancel = 2,
+		Abort = 3,
+		Retry = 4,
+		Ignore = 5,
+		Yes = 6,
+		No = 7,
+		TryAgain = 10,
+		Continue = 11
+	}
+
+
+	public enum MessageBoxIcon
+	{
+		None = 0,
+		Error = 16,
+		Hand = 16,
+		Stop = 16,
+		Question = 32,
+		Exclamation = 48,
+		Warning = 48,
+		Asterisk = 64,
+		Information = 64
+	}
+	public enum MessageBoxButtons
+	{
+		OK,
+		OKCancel,
+		AbortRetryIgnore,
+		YesNoCancel,
+		YesNo,
+		RetryCancel,
+		CancelTryContinue
+	}
+
+	public enum MessageBoxDefaultButton
+	{
+		Button1,
+		Button2 = 256,
+		Button3 = 512,
+	}
+
+	public class MessageBox
+	{
+
+		/// <summary>Displays a message box with the specified text, caption, buttons, icon, and default button.</summary>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="buttons">One of the <see cref="T:System.Windows.Forms.MessageBoxButtons" /> values that specifies which buttons to display in the message box.</param>
+		/// <param name="icon">One of the <see cref="T:System.Windows.Forms.MessageBoxIcon" /> values that specifies which icon to display in the message box.</param>
+		/// <param name="defaultButton">One of the <see cref="T:System.Windows.Forms.MessageBoxDefaultButton" /> values that specifies the default button for the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		/// <exception cref="T:System.ComponentModel.InvalidEnumArgumentException">
+		///   <paramref name="buttons" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxButtons" />.  
+		/// -or-  
+		/// <paramref name="icon" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxIcon" />.  
+		/// -or-  
+		/// <paramref name="defaultButton" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxDefaultButton" />.</exception>
+		/// <exception cref="T:System.InvalidOperationException">An attempt was made to display the <see cref="T:System.Windows.Forms.MessageBox" /> in a process that is not running in User Interactive mode. This is specified by the <see cref="P:System.Windows.Forms.SystemInformation.UserInteractive" /> property.</exception>
+		public static async Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+		{
+			return await ShowCore(null, text, caption, buttons, icon, defaultButton);
+		}
+
+
+		/// <summary>Displays a message box with specified text, caption, buttons, and icon.</summary>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="buttons">One of the <see cref="T:System.Windows.Forms.MessageBoxButtons" /> values that specifies which buttons to display in the message box.</param>
+		/// <param name="icon">One of the <see cref="T:System.Windows.Forms.MessageBoxIcon" /> values that specifies which icon to display in the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		/// <exception cref="T:System.ComponentModel.InvalidEnumArgumentException">The <paramref name="buttons" /> parameter specified is not a member of <see cref="T:System.Windows.Forms.MessageBoxButtons" />.  
+		///  -or-  
+		///  The <paramref name="icon" /> parameter specified is not a member of <see cref="T:System.Windows.Forms.MessageBoxIcon" />.</exception>
+		/// <exception cref="T:System.InvalidOperationException">An attempt was made to display the <see cref="T:System.Windows.Forms.MessageBox" /> in a process that is not running in User Interactive mode. This is specified by the <see cref="P:System.Windows.Forms.SystemInformation.UserInteractive" /> property.</exception>
+		public static async Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+		{
+			return await ShowCore(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
+		}
+
+
+		/// <summary>Displays a message box with specified text, caption, and buttons.</summary>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="buttons">One of the <see cref="T:System.Windows.Forms.MessageBoxButtons" /> values that specifies which buttons to display in the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		/// <exception cref="T:System.ComponentModel.InvalidEnumArgumentException">The <paramref name="buttons" /> parameter specified is not a member of <see cref="T:System.Windows.Forms.MessageBoxButtons" />.</exception>
+		/// <exception cref="T:System.InvalidOperationException">An attempt was made to display the <see cref="T:System.Windows.Forms.MessageBox" /> in a process that is not running in User Interactive mode. This is specified by the <see cref="P:System.Windows.Forms.SystemInformation.UserInteractive" /> property.</exception>
+		public static async Task<DialogResult> Show(string text, string caption, MessageBoxButtons buttons)
+		{
+			return await ShowCore(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+		}
+
+
+		/// <summary>Displays a message box with specified text and caption.</summary>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		public static async Task<DialogResult> Show(string text, string caption)
+		{
+			return await ShowCore(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+		}
+
+		/// <summary>Displays a message box with specified text.</summary>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		public static async Task<DialogResult> Show(string text)
+		{
+			return await ShowCore(null, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+		}
+
+
+		/// <summary>Displays a message box in front of the specified object and with the specified text, caption, buttons, icon, default button, and options.</summary>
+		/// <param name="owner">An implementation of <see cref="T:System.Windows.Forms.IWin32Window" /> that will own the modal dialog box.</param>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="buttons">One of the <see cref="T:System.Windows.Forms.MessageBoxButtons" /> values that specifies which buttons to display in the message box.</param>
+		/// <param name="icon">One of the <see cref="T:System.Windows.Forms.MessageBoxIcon" /> values that specifies which icon to display in the message box.</param>
+		/// <param name="defaultButton">One of the <see cref="T:System.Windows.Forms.MessageBoxDefaultButton" /> values the specifies the default button for the message box.</param>
+		/// <param name="options">One of the <see cref="T:System.Windows.Forms.MessageBoxOptions" /> values that specifies which display and association options will be used for the message box. You may pass in 0 if you wish to use the defaults.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		/// <exception cref="T:System.ComponentModel.InvalidEnumArgumentException">
+		///   <paramref name="buttons" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxButtons" />.  
+		/// -or-  
+		/// <paramref name="icon" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxIcon" />.  
+		/// -or-  
+		/// <paramref name="defaultButton" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxDefaultButton" />.</exception>
+		/// <exception cref="T:System.InvalidOperationException">An attempt was made to display the <see cref="T:System.Windows.Forms.MessageBox" /> in a process that is not running in User Interactive mode. This is specified by the <see cref="P:System.Windows.Forms.SystemInformation.UserInteractive" /> property.</exception>
+		/// <exception cref="T:System.ArgumentException">		
+		/// -or-  
+		/// <paramref name="buttons" /> specified an invalid combination of <see cref="T:System.Windows.Forms.MessageBoxButtons" />.</exception>
+		public static async Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+		{
+			return await ShowCore(owner, text, caption, buttons, icon, defaultButton);
+		}
+
+
+		/// <summary>Displays a message box in front of the specified object and with the specified text, caption, buttons, and icon.</summary>
+		/// <param name="owner">An implementation of <see cref="T:System.Windows.Forms.IWin32Window" /> that will own the modal dialog box.</param>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="buttons">One of the <see cref="T:System.Windows.Forms.MessageBoxButtons" /> values that specifies which buttons to display in the message box.</param>
+		/// <param name="icon">One of the <see cref="T:System.Windows.Forms.MessageBoxIcon" /> values that specifies which icon to display in the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		/// <exception cref="T:System.ComponentModel.InvalidEnumArgumentException">
+		///   <paramref name="buttons" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxButtons" />.  
+		/// -or-  
+		/// <paramref name="icon" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxIcon" />.</exception>
+		/// <exception cref="T:System.InvalidOperationException">An attempt was made to display the <see cref="T:System.Windows.Forms.MessageBox" /> in a process that is not running in User Interactive mode. This is specified by the <see cref="P:System.Windows.Forms.SystemInformation.UserInteractive" /> property.</exception>
+		public static async Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+		{
+			return await ShowCore(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1);
+		}
+
+		/// <summary>Displays a message box in front of the specified object and with the specified text, caption, and buttons.</summary>
+		/// <param name="owner">An implementation of <see cref="T:System.Windows.Forms.IWin32Window" /> that will own the modal dialog box.</param>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="buttons">One of the <see cref="T:System.Windows.Forms.MessageBoxButtons" /> values that specifies which buttons to display in the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		/// <exception cref="T:System.ComponentModel.InvalidEnumArgumentException">
+		///   <paramref name="buttons" /> is not a member of <see cref="T:System.Windows.Forms.MessageBoxButtons" />.</exception>
+		/// <exception cref="T:System.InvalidOperationException">An attempt was made to display the <see cref="T:System.Windows.Forms.MessageBox" /> in a process that is not running in User Interactive mode. This is specified by the <see cref="P:System.Windows.Forms.SystemInformation.UserInteractive" /> property.</exception>
+		public static async Task<DialogResult> Show(Window owner, string text, string caption, MessageBoxButtons buttons)
+		{
+			return await ShowCore(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+		}
+
+		/// <summary>Displays a message box in front of the specified object and with the specified text and caption.</summary>
+		/// <param name="owner">An implementation of <see cref="T:System.Windows.Forms.IWin32Window" /> that will own the modal dialog box.</param>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		public static async Task<DialogResult> Show(Window owner, string text, string caption)
+		{
+			return await ShowCore(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+		}
+
+		/// <summary>Displays a message box in front of the specified object and with the specified text.</summary>
+		/// <param name="owner">An implementation of <see cref="T:System.Windows.Forms.IWin32Window" /> that will own the modal dialog box.</param>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <returns>One of the <see cref="T:System.Windows.Forms.DialogResult" /> values.</returns>
+		public static async Task<DialogResult> Show(Window owner, string text)
+		{
+			return await ShowCore(owner, text, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
+		}
+
+		public static async Task<DialogResult> ShowConfirmationDialog(Window owner, IEnumerable<LibraryBook> libraryBooks, string format, string title, MessageBoxDefaultButton defaultButton = MessageBoxDefaultButton.Button1)
+		{
+			if (libraryBooks is null || !libraryBooks.Any())
+				return DialogResult.Cancel;
+
+			var count = libraryBooks.Count();
+
+			string thisThese = count > 1 ? "these" : "this";
+			string bookBooks = count > 1 ? "books" : "book";
+			string titlesAgg = libraryBooks.AggregateTitles();
+
+			var message
+				= string.Format(format, $"{thisThese} {count} {bookBooks}")
+				+ $"\r\n\r\n{titlesAgg}";
+
+			return await ShowCore(owner, 
+				message,
+				title,
+				MessageBoxButtons.YesNo,
+				MessageBoxIcon.Question,
+				defaultButton);
+		}
+
+		/// <summary>
+		/// Logs error. Displays a message box dialog with specified text and caption.
+		/// </summary>
+		/// <param name="synchronizeInvoke">Form calling this method.</param>
+		/// <param name="text">The text to display in the message box.</param>
+		/// <param name="caption">The text to display in the title bar of the message box.</param>
+		/// <param name="exception">Exception to log.</param>
+		public static async Task ShowAdminAlert(Window owner, string text, string caption, Exception exception)
+		{
+			// for development and debugging, show me what broke!
+			if (System.Diagnostics.Debugger.IsAttached)
+				throw exception;
+
+			try
+			{
+				Serilog.Log.Logger.Error(exception, "Alert admin error: {@DebugText}", new { text, caption });
+			}
+			catch { }
+
+			var form = new MessageBoxAlertAdminDialog(text, caption, exception);
+
+			await DisplayWindow(form, owner);
+		}
+
+
+		private static async Task<DialogResult> ShowCore(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+		{
+			if (Avalonia.Threading.Dispatcher.UIThread.CheckAccess())
+				return await ShowCore2(owner, message, caption, buttons, icon, defaultButton);
+			else
+				return await Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => ShowCore2(owner, message, caption, buttons, icon, defaultButton));
+		}
+		private static async Task<DialogResult> ShowCore2(Window owner, string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+		{
+			var dialog = new MessageBoxWindow();
+
+			dialog.HideMinMaxBtns();
+
+			var vm = new MessageBoxViewModel(message, caption, buttons, icon, defaultButton);
+			dialog.DataContext = vm;
+			dialog.ControlToFocusOnShow = dialog.FindControl<Control>(defaultButton.ToString());
+			dialog.CanResize = false;
+			dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+			var tbx = dialog.FindControl<TextBlock>("messageTextBlock");
+
+			tbx.MinWidth = vm.TextBlockMinWidth;
+			tbx.Text = message;
+
+			var thisScreen = (owner ?? dialog).Screens.ScreenFromVisual(owner ?? dialog);
+
+			var maxSize = new Size(0.20 * thisScreen.Bounds.Width, 0.9 * thisScreen.Bounds.Height - 55);
+
+			var desiredMax = new Size(maxSize.Width, maxSize.Height);
+
+			tbx.Measure(desiredMax);
+
+			tbx.Height = tbx.DesiredSize.Height;
+			tbx.Width = tbx.DesiredSize.Width;
+			dialog.MinHeight = vm.FormHeightFromTboxHeight((int)tbx.DesiredSize.Height);
+			dialog.MinWidth = vm.FormWidthFromTboxWidth((int)tbx.DesiredSize.Width);
+			dialog.MaxHeight = dialog.MinHeight;
+			dialog.MaxWidth = dialog.MinWidth;
+			dialog.Height = dialog.MinHeight;
+			dialog.Width = dialog.MinWidth;
+
+			return await DisplayWindow(dialog, owner);
+		}
+		private static async Task<DialogResult> DisplayWindow(Window toDisplay, Window owner)
+		{
+			if (owner is null)
+			{
+				if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+				{
+					return await toDisplay.ShowDialog<DialogResult>(desktop.MainWindow);
+				}
+				else
+				{
+					var window = new Window
+					{
+						IsVisible = false,
+						Height = 1,
+						Width = 1,
+						SystemDecorations = SystemDecorations.None,
+						ShowInTaskbar = false
+					};
+
+					window.Show();
+					var result = await toDisplay.ShowDialog<DialogResult>(window);
+					window.Close();
+					return result;
+				}
+
+			}
+			else
+			{
+				return await toDisplay.ShowDialog<DialogResult>(owner);
+			}
+		}
+
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewLocator.cs

@@ -0,0 +1,30 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using LibationWinForms.AvaloniaUI.ViewModels;
+using System;
+
+namespace LibationWinForms.AvaloniaUI
+{
+	public class ViewLocator : IDataTemplate
+	{
+		public IControl Build(object data)
+		{
+			var name = data.GetType().FullName!.Replace("ViewModel", "View");
+			var type = Type.GetType(name);
+
+			if (type != null)
+			{
+				return (Control)Activator.CreateInstance(type)!;
+			}
+			else
+			{
+				return new TextBlock { Text = "Not Found: " + name };
+			}
+		}
+
+		public bool Match(object data)
+		{
+			return data is ViewModelBase;
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/BookTags.cs

@@ -0,0 +1,9 @@
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public class BookTags
+	{
+		private string _tags;
+		public string Tags { get => _tags; init { _tags = value; HasTags = !string.IsNullOrEmpty(_tags); } }
+		public bool HasTags { get; init; }
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/Dialogs/MessageBoxViewModel.cs

@@ -0,0 +1,84 @@
+using System;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels.Dialogs
+{
+	public class MessageBoxViewModel
+	{
+		private string _message;
+		public string Message { get { return _message; } set { _message = value; } }
+		public string Caption { get; } = "Message Box";
+		private MessageBoxButtons _button;
+		private MessageBoxIcon _icon;
+		private MessageBoxDefaultButton _defaultButton;
+
+		public MessageBoxDefaultButton DefaultButton => _defaultButton;
+		public MessageBoxButtons Buttons => _button;
+
+		public bool IsAsterisk => _icon == MessageBoxIcon.Asterisk;
+		public bool IsError => _icon == MessageBoxIcon.Error;
+		public bool IsQuestion => _icon == MessageBoxIcon.Question;
+		public bool IsExclamation => _icon == MessageBoxIcon.Exclamation;
+
+		public bool HasButton3 => !string.IsNullOrEmpty(Button3Text);
+		public bool HasButton2 => !string.IsNullOrEmpty(Button2Text);
+
+		public int WindowHeight { get;private set; }
+		public int WindowWidth { get;private set; }
+
+		public string Button1Text => _button switch
+		{
+			MessageBoxButtons.OK => "OK",
+			MessageBoxButtons.OKCancel => "OK",
+			MessageBoxButtons.AbortRetryIgnore => "Abort",
+			MessageBoxButtons.YesNoCancel => "Yes",
+			MessageBoxButtons.YesNo => "Yes",
+			MessageBoxButtons.RetryCancel => "Retry",
+			MessageBoxButtons.CancelTryContinue => "Cancel",
+			_ => string.Empty,
+		};
+
+		public string Button2Text => _button switch
+		{
+			MessageBoxButtons.OKCancel => "Cancel",
+			MessageBoxButtons.AbortRetryIgnore => "Retry",
+			MessageBoxButtons.YesNoCancel => "No",
+			MessageBoxButtons.YesNo => "No",
+			MessageBoxButtons.RetryCancel => "Cancel",
+			MessageBoxButtons.CancelTryContinue => "Try",
+			_ => string.Empty,
+		};
+		
+		public string Button3Text => _button switch
+		{
+			MessageBoxButtons.AbortRetryIgnore => "Ignore",
+			MessageBoxButtons.YesNoCancel => "Cancel",
+			MessageBoxButtons.CancelTryContinue => "Continue",
+			_ => string.Empty,
+		};
+
+		public int TextBlockMinWidth { get; }
+
+		public double FormHeightFromTboxHeight(double tboxHeight) => tboxHeight + 65;
+		public double FormWidthFromTboxWidth(double tboxWidth)
+		{
+			int iconWidth = _icon is MessageBoxIcon.None ? 0 : 42;
+			return tboxWidth + 30 + iconWidth;
+		}
+
+		public MessageBoxViewModel() { }
+		public MessageBoxViewModel(string message, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultBtn)
+		{
+
+			Message = message;
+			Caption = caption;
+			_button = buttons;
+			_icon = icon;
+			_defaultButton = defaultBtn;
+
+			int numBtns = HasButton3 ? 3 : HasButton2 ? 2 : 1;
+			int iconWidth = icon is MessageBoxIcon.None ? 0 : 42;
+			int formMinWidth = Math.Max(85 * numBtns + 10, 71 + iconWidth + 20);
+			TextBlockMinWidth = formMinWidth - 30 - iconWidth;
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/GridEntry.cs

@@ -0,0 +1,169 @@
+using Avalonia.Media;
+using DataLayer;
+using Dinah.Core;
+using Dinah.Core.DataBinding;
+using Dinah.Core.Drawing;
+using LibationFileManager;
+using LibationWinForms.GridView;
+using ReactiveUI;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Linq;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public enum RemoveStatus
+	{
+		NotRemoved,
+		Removed,
+		SomeRemoved
+	}
+	/// <summary>The View Model base for the DataGridView</summary>
+	public abstract class GridEntry : ViewModelBase
+	{
+		[Browsable(false)] public string AudibleProductId => Book.AudibleProductId;
+		[Browsable(false)] public LibraryBook LibraryBook { get; protected set; }
+		[Browsable(false)] public float SeriesIndex { get; protected set; }
+		[Browsable(false)] public string LongDescription { get; protected set; }
+		[Browsable(false)] public abstract DateTime DateAdded { get; }
+		[Browsable(false)] public int ListIndex { get; set; }
+		[Browsable(false)] protected Book Book => LibraryBook.Book;
+
+		#region Model properties exposed to the view
+
+		private Avalonia.Media.Imaging.Bitmap _cover;
+		public Avalonia.Media.Imaging.Bitmap Cover { get => _cover; protected set { this.RaiseAndSetIfChanged(ref _cover, value); } }
+		public string PurchaseDate { get; protected set; }
+		public string Series { get; protected set; }
+		public string Title { get; protected set; }
+		public string Length { get; protected set; }
+		public string Authors { get; protected set; }
+		public string Narrators { get; protected set; }
+		public string Category { get; protected set; }
+		public string Misc { get; protected set; }
+		public string Description { get; protected set; }
+		public string ProductRating { get; protected set; }
+		public string MyRating { get; protected set; }
+
+		protected bool? _remove = false;
+		public abstract bool? Remove { get; set; }
+		public abstract LiberateButtonStatus Liberate { get; }
+		public abstract BookTags BookTags { get; }
+		public abstract bool IsSeries { get; }
+		public abstract bool IsEpisode { get; }
+		public abstract bool IsBook { get; }
+		public IBrush BackgroundBrush => IsEpisode ? App.SeriesEntryGridBackgroundBrush : null;
+
+		#endregion
+
+		#region Sorting
+
+		public GridEntry() => _memberValues = CreateMemberValueDictionary();
+
+		// These methods are implementation of Dinah.Core.DataBinding.IMemberComparable
+		// Used by GridEntryBindingList for all sorting
+		public virtual object GetMemberValue(string memberName) => _memberValues[memberName]();
+		public IComparer GetMemberComparer(Type memberType) => _memberTypeComparers[memberType];
+		protected abstract Dictionary<string, Func<object>> CreateMemberValueDictionary();
+		private Dictionary<string, Func<object>> _memberValues { get; set; }
+
+		// Instantiate comparers for every exposed member object type.
+		private static readonly Dictionary<Type, IComparer> _memberTypeComparers = new()
+		{
+			{ typeof(RemoveStatus), new ObjectComparer<RemoveStatus>() },
+			{ typeof(string), new ObjectComparer<string>() },
+			{ typeof(int), new ObjectComparer<int>() },
+			{ typeof(float), new ObjectComparer<float>() },
+			{ typeof(bool), new ObjectComparer<bool>() },
+			{ typeof(DateTime), new ObjectComparer<DateTime>() },
+			{ typeof(LiberateButtonStatus), new ObjectComparer<LiberateButtonStatus>() },
+		};
+
+		#endregion
+
+		#region Cover Art
+
+		protected void LoadCover()
+		{
+			// Get cover art. If it's default, subscribe to PictureCached
+			(bool isDefault, byte[] picture) = PictureStorage.GetPicture(new PictureDefinition(Book.PictureId, PictureSize._80x80));
+
+			if (isDefault)
+				PictureStorage.PictureCached += PictureStorage_PictureCached;
+
+			// Mutable property. Set the field so PropertyChanged isn't fired.
+			using var ms = new System.IO.MemoryStream(picture);
+			_cover = new Avalonia.Media.Imaging.Bitmap(ms);
+		}
+
+		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
+		{
+			if (e.Definition.PictureId == Book.PictureId)
+			{
+				using var ms = new System.IO.MemoryStream(e.Picture);
+				Cover = new Avalonia.Media.Imaging.Bitmap(ms);
+				PictureStorage.PictureCached -= PictureStorage_PictureCached;
+			}
+		}
+
+		#endregion
+
+		#region Static library display functions		
+
+		/// <summary>This information should not change during <see cref="GridEntry"/> lifetime, so call only once.</summary>
+		protected static string GetDescriptionDisplay(Book book)
+		{
+			var doc = new HtmlAgilityPack.HtmlDocument();
+			doc.LoadHtml(book?.Description?.Replace("</p> ", "\r\n\r\n</p>") ?? "");
+			return doc.DocumentNode.InnerText.Trim();
+		}
+
+		protected static string TrimTextToWord(string text, int maxLength)
+		{
+			return
+				text.Length <= maxLength ?
+				text :
+				text.Substring(0, maxLength - 3) + "...";
+		}
+
+
+		/// <summary>
+		/// This information should not change during <see cref="GridEntry"/> lifetime, so call only once.
+		/// Maximum of 5 text rows will fit in 80-pixel row height.
+		/// </summary>
+		protected static string GetMiscDisplay(LibraryBook libraryBook)
+		{
+			var details = new List<string>();
+
+			var locale = libraryBook.Book.Locale.DefaultIfNullOrWhiteSpace("[unknown]");
+			var acct = libraryBook.Account.DefaultIfNullOrWhiteSpace("[unknown]");
+
+			details.Add($"Account: {locale} - {acct}");
+
+			if (libraryBook.Book.HasPdf())
+				details.Add("Has PDF");
+			if (libraryBook.Book.IsAbridged)
+				details.Add("Abridged");
+			if (libraryBook.Book.DatePublished.HasValue)
+				details.Add($"Date pub'd: {libraryBook.Book.DatePublished.Value:MM/dd/yyyy}");
+			// this goes last since it's most likely to have a line-break
+			if (!string.IsNullOrWhiteSpace(libraryBook.Book.Publisher))
+				details.Add($"Pub: {libraryBook.Book.Publisher.Trim()}");
+
+			if (!details.Any())
+				return "[details not imported]";
+
+			return string.Join("\r\n", details);
+		}
+
+		#endregion
+
+		~GridEntry()
+		{
+			PictureStorage.PictureCached -= PictureStorage_PictureCached;
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/GridEntryCollection.cs

@@ -0,0 +1,177 @@
+using ApplicationServices;
+using LibationSearchEngine;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	/*
+	 * Allows filtering of the underlying ObservableCollection<GridEntry>
+	 * 
+	 * When filtering is applied, the filtered-out items are removed
+	 * from the base list and added to the private FilterRemoved list.
+	 * When filtering is removed, items in the FilterRemoved list are
+	 * added back to the base list.
+	 * 
+	 * Items are added and removed to/from the ObservableCollection's
+	 * internal list instead of the ObservableCollection itself to
+	 * avoid ObservableCollection firing CollectionChanged for every
+	 * item. Editing the list this way improve's display performance,
+	 * but requires ResetCollection() to be called after all changes
+	 * have been made.
+	 */
+	public class GridEntryCollection : ObservableCollection<GridEntry>
+	{
+		public GridEntryCollection(IEnumerable<GridEntry> enumeration)
+			: base(new List<GridEntry>(enumeration)) { }
+		public GridEntryCollection(List<GridEntry> list)
+			: base(list) { }
+
+		public List<GridEntry> InternalList => Items as List<GridEntry>;
+		/// <returns>All items in the list, including those filtered out.</returns>
+		public List<GridEntry> AllItems() => Items.Concat(FilterRemoved).ToList();
+
+		/// <summary>When true, itms will not be checked filtered by search criteria on item changed<summary>
+		public bool SuspendFilteringOnUpdate { get; set; }
+		public string Filter { get => FilterString; set => ApplyFilter(value); }
+
+		/// <summary> Items that were removed from the base list due to filtering </summary>
+		private readonly List<GridEntry> FilterRemoved = new();
+		private string FilterString;
+		private SearchResultSet SearchResults;
+
+		#region Items Management
+
+		/// <summary>
+		/// Removes all items from the collection, both visible and hidden, adds new items to the visible collection.
+		/// </summary>
+		public void ReplaceList(IEnumerable<GridEntry> newItems)
+		{
+			Items.Clear();
+			FilterRemoved.Clear();
+			((List<GridEntry>)Items).AddRange(newItems);
+			ResetCollection();
+		}
+		public void ResetCollection()
+			=> OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+
+		#endregion
+
+		#region Filtering
+
+
+		private void ApplyFilter(string filterString)
+		{
+			if (filterString != FilterString)
+				RemoveFilter();
+
+			FilterString = filterString;
+			SearchResults = SearchEngineCommands.Search(filterString);
+
+			var booksFilteredIn = Items.BookEntries().Join(SearchResults.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => (GridEntry)lbe);
+
+			//Find all series containing children that match the search criteria
+			var seriesFilteredIn = Items.SeriesEntries().Where(s => s.Children.Join(SearchResults.Docs, lbe => lbe.AudibleProductId, d => d.ProductId, (lbe, d) => lbe).Any());
+
+			var filteredOut = Items.Except(booksFilteredIn.Concat(seriesFilteredIn)).ToList();
+
+			foreach (var item in filteredOut)
+			{
+				FilterRemoved.Add(item);
+				Items.Remove(item);
+			}
+			ResetCollection();
+		}
+
+		public void RemoveFilter()
+		{
+			if (FilterString is null) return;
+
+			int visibleCount = Items.Count;
+
+			foreach (var item in FilterRemoved.ToList())
+			{
+				if (item is SeriesEntry || item is LibraryBookEntry lbe && (lbe.Parent is null || lbe.Parent.Liberate.Expanded))
+				{
+
+					FilterRemoved.Remove(item);
+					Items.Insert(visibleCount++, item);
+				}
+			}
+
+			FilterString = null;
+			SearchResults = null;
+			ResetCollection();
+		}
+
+		#endregion
+
+		#region Expand/Collapse
+
+		public void CollapseAll()
+		{
+			foreach (var series in Items.SeriesEntries().ToList())
+				CollapseItem(series);
+		}
+
+		public void ExpandAll()
+		{
+			foreach (var series in Items.SeriesEntries().ToList())
+				ExpandItem(series);
+		}
+
+		public void CollapseItem(SeriesEntry sEntry)
+		{
+			foreach (var episode in Items.BookEntries().Where(b => b.Parent == sEntry).OrderByDescending(lbe => lbe.SeriesIndex).ToList())
+			{
+				/*
+				 * Bypass ObservationCollection's InsertItem method so that CollectionChanged isn't
+				 * fired. When adding or removing many items at once, Avalonia's CollectionChanged
+				 * event handler causes serious performance problems. And unfotrunately, Avalonia
+				 * doesn't respect the NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList? changedItems)
+				 * overload that would fire only once for all changed items.
+				 * 
+				 * Doing this requires resetting the list so the view knows it needs to rebuild its display.
+				 */
+
+				FilterRemoved.Add(episode);
+				Items.Remove(episode);
+			}
+
+			sEntry.Liberate.Expanded = false;
+			ResetCollection();
+		}
+
+		public void ExpandItem(SeriesEntry sEntry)
+		{
+			var sindex = Items.IndexOf(sEntry);
+
+			foreach (var episode in FilterRemoved.BookEntries().Where(b => b.Parent == sEntry).OrderByDescending(lbe => lbe.SeriesIndex).ToList())
+			{
+				if (SearchResults is null || SearchResults.Docs.Any(d => d.ProductId == episode.AudibleProductId))
+				{
+					/*
+					 * Bypass ObservationCollection's InsertItem method so that CollectionChanged isn't
+					 * fired. When adding or removing many items at once, Avalonia's CollectionChanged
+					 * event handler causes serious performance problems. And unfotrunately, Avalonia
+					 * doesn't respect the NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList? changedItems)
+					 * overload that would fire only once for all changed items.
+					 * 
+					 * Doing this requires resetting the list so the view knows it needs to rebuild its display.
+					 */
+
+					FilterRemoved.Remove(episode);
+					Items.Insert(++sindex, episode);
+				}
+			}
+
+			sEntry.Liberate.Expanded = true;
+			ResetCollection();
+		}
+
+		#endregion
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/LiberateButtonStatus.cs

@@ -0,0 +1,123 @@
+using Avalonia.Media.Imaging;
+using DataLayer;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public class LiberateButtonStatus : ViewModelBase, IComparable
+	{
+		public LiberateButtonStatus(bool isSeries)
+		{
+			IsSeries = isSeries;
+		}
+		public LiberatedStatus BookStatus { get; set; }
+		public LiberatedStatus? PdfStatus { get; set; }
+
+		private bool _expanded;
+		public bool Expanded
+		{
+			get => _expanded;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _expanded, value);
+				this.RaisePropertyChanged(nameof(Image));
+				this.RaisePropertyChanged(nameof(ToolTip));
+			}
+		}
+		private bool IsSeries { get; }
+		public Bitmap Image => GetLiberateIcon();
+		public string ToolTip => GetTooltip();
+
+		static Dictionary<string, Bitmap> iconCache = new();
+
+		/// <summary> Defines the Liberate column's sorting behavior </summary>
+		public int CompareTo(object obj)
+		{
+			if (obj is not LiberateButtonStatus second) return -1;
+
+			if (IsSeries && !second.IsSeries) return -1;
+			else if (!IsSeries && second.IsSeries) return 1;
+			else if (IsSeries && second.IsSeries) return 0;
+			else if (BookStatus == LiberatedStatus.Liberated && second.BookStatus != LiberatedStatus.Liberated) return -1;
+			else if (BookStatus != LiberatedStatus.Liberated && second.BookStatus == LiberatedStatus.Liberated) return 1;
+			else return BookStatus.CompareTo(second.BookStatus);
+		}
+
+		private Bitmap GetLiberateIcon()
+		{
+			if (IsSeries)
+				return Expanded ? GetFromResources("minus") : GetFromResources("plus");
+
+			if (BookStatus == LiberatedStatus.Error)
+				return GetFromResources("error");
+
+			string image_lib = BookStatus switch
+			{
+				LiberatedStatus.Liberated => "green",
+				LiberatedStatus.PartialDownload => "yellow",
+				LiberatedStatus.NotLiberated => "red",
+				_ => throw new Exception("Unexpected liberation state")
+			};
+
+			string image_pdf = PdfStatus switch
+			{
+				LiberatedStatus.Liberated => "_pdf_yes",
+				LiberatedStatus.NotLiberated => "_pdf_no",
+				LiberatedStatus.Error => "_pdf_no",
+				null => "",
+				_ => throw new Exception("Unexpected PDF state")
+			};
+
+			return GetFromResources($"liberate_{image_lib}{image_pdf}");
+		}
+		private string GetTooltip()
+		{
+			if (IsSeries)
+				return Expanded ? "Click to Collpase" : "Click to Expand";
+
+			if (BookStatus == LiberatedStatus.Error)
+				return "Book downloaded ERROR";
+
+			string libState = BookStatus switch
+			{
+				LiberatedStatus.Liberated => "Liberated",
+				LiberatedStatus.PartialDownload => "File has been at least\r\npartially downloaded",
+				LiberatedStatus.NotLiberated => "Book NOT downloaded",
+				_ => throw new Exception("Unexpected liberation state")
+			};
+
+			string pdfState = PdfStatus switch
+			{
+				LiberatedStatus.Liberated => "\r\nPDF downloaded",
+				LiberatedStatus.NotLiberated => "\r\nPDF NOT downloaded",
+				LiberatedStatus.Error => "\r\nPDF downloaded ERROR",
+				null => "",
+				_ => throw new Exception("Unexpected PDF state")
+			};
+
+
+			var mouseoverText = libState + pdfState;
+
+			if (BookStatus == LiberatedStatus.NotLiberated ||
+				BookStatus == LiberatedStatus.PartialDownload ||
+				PdfStatus == LiberatedStatus.NotLiberated)
+				mouseoverText += "\r\nClick to complete";
+
+			return mouseoverText;
+		}
+
+		private static Bitmap GetFromResources(string rescName)
+		{
+			if (iconCache.ContainsKey(rescName)) return iconCache[rescName];
+
+			var memoryStream = new System.IO.MemoryStream();
+
+			((System.Drawing.Bitmap)Properties.Resources.ResourceManager.GetObject(rescName)).Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png);
+			memoryStream.Position = 0;
+			iconCache[rescName] = new Bitmap(memoryStream);
+			return iconCache[rescName];
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/LibraryBookEntry.cs

@@ -0,0 +1,147 @@
+using ApplicationServices;
+using DataLayer;
+using Dinah.Core;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	/// <summary>The View Model for a LibraryBook that is ContentType.Product or ContentType.Episode</summary>
+	public class LibraryBookEntry : GridEntry
+	{
+		[Browsable(false)] public override DateTime DateAdded => LibraryBook.DateAdded;
+		[Browsable(false)] public SeriesEntry Parent { get; init; }
+
+		#region Model properties exposed to the view
+
+		private DateTime lastStatusUpdate = default;
+		private LiberatedStatus _bookStatus;
+		private LiberatedStatus? _pdfStatus;
+
+		public override bool? Remove
+		{
+			get => _remove;
+			set
+			{
+				_remove = value ?? false;
+
+				Parent?.ChildRemoveUpdate();
+				this.RaisePropertyChanged(nameof(Remove));
+			}
+		}
+
+		public override LiberateButtonStatus Liberate
+		{
+			get
+			{
+				//Cache these statuses for faster sorting.
+				if ((DateTime.Now - lastStatusUpdate).TotalSeconds > 2)
+				{
+					_bookStatus = LibraryCommands.Liberated_Status(LibraryBook.Book);
+					_pdfStatus = LibraryCommands.Pdf_Status(LibraryBook.Book);
+					lastStatusUpdate = DateTime.Now;
+				}
+				return new LiberateButtonStatus(IsSeries) { BookStatus = _bookStatus, PdfStatus = _pdfStatus };
+			}
+		}
+
+		public override BookTags BookTags => new() { Tags = string.Join("\r\n", Book.UserDefinedItem.TagsEnumerated) };
+
+		public override bool IsSeries => false;
+		public override bool IsEpisode => Parent is not null;
+		public override bool IsBook => Parent is null;
+
+		#endregion
+
+		public LibraryBookEntry(LibraryBook libraryBook)
+		{
+			LibraryBook = libraryBook;
+			LoadCover();
+
+			Title = Book.Title;
+			Series = Book.SeriesNames();
+			Length = Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min";
+			MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+			PurchaseDate = libraryBook.DateAdded.ToString("d");
+			ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+			Authors = Book.AuthorNames();
+			Narrators = Book.NarratorNames();
+			Category = string.Join(" > ", Book.CategoriesNames());
+			Misc = GetMiscDisplay(libraryBook);
+			LongDescription = GetDescriptionDisplay(Book);
+			Description = TrimTextToWord(LongDescription, 62);
+			SeriesIndex = Book.SeriesLink.FirstOrDefault()?.Index ?? 0;
+
+			UserDefinedItem.ItemChanged += UserDefinedItem_ItemChanged;
+		}
+
+		#region detect changes to the model, update the view.
+
+		/// <summary>
+		/// This event handler receives notifications from the model that it has changed.
+		/// Notify the view that it's changed.
+		/// </summary>
+		private void UserDefinedItem_ItemChanged(object sender, string itemName)
+		{
+			var udi = sender as UserDefinedItem;
+
+			if (udi.Book.AudibleProductId != Book.AudibleProductId)
+				return;
+
+			// UDI changed, possibly in a different context/view. Update this viewmodel. Call NotifyPropertyChanged to notify view.
+			// - This method responds to tons of incidental changes. Do not persist to db from here. Committing to db must be a volitional action by the caller, not incidental. Otherwise batch changes would be impossible; we would only have slow one-offs
+			// - Don't restrict notifying view to 'only if property changed'. This same book instance can get passed to a different view, then changed there. When the chain of events makes its way back here, the property is unchanged (because it's the same instance), but this view is out of sync. NotifyPropertyChanged will then update this view.
+			switch (itemName)
+			{
+				case nameof(udi.Tags):
+					Book.UserDefinedItem.Tags = udi.Tags; 
+					this.RaisePropertyChanged(nameof(BookTags));
+					break;
+				case nameof(udi.BookStatus):
+					Book.UserDefinedItem.BookStatus = udi.BookStatus;
+					_bookStatus = udi.BookStatus;
+					this.RaisePropertyChanged(nameof(Liberate));
+					break;
+				case nameof(udi.PdfStatus):
+					Book.UserDefinedItem.PdfStatus = udi.PdfStatus;
+					_pdfStatus = udi.PdfStatus;
+					this.RaisePropertyChanged(nameof(Liberate));
+					break;
+			}
+		}
+
+		#endregion
+
+		#region Data Sorting
+
+		/// <summary>Create getters for all member object values by name </summary>
+		protected override Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
+		{
+			{ nameof(Remove), () => Remove.HasValue ? Remove.Value ? RemoveStatus.Removed : RemoveStatus.NotRemoved : RemoveStatus.SomeRemoved },
+			{ nameof(Title), () => Book.TitleSortable() },
+			{ nameof(Series), () => Book.SeriesSortable() },
+			{ nameof(Length), () => Book.LengthInMinutes },
+			{ nameof(MyRating), () => Book.UserDefinedItem.Rating.FirstScore() },
+			{ nameof(PurchaseDate), () => LibraryBook.DateAdded },
+			{ nameof(ProductRating), () => Book.Rating.FirstScore() },
+			{ nameof(Authors), () => Authors },
+			{ nameof(Narrators), () => Narrators },
+			{ nameof(Description), () => Description },
+			{ nameof(Category), () => Category },
+			{ nameof(Misc), () => Misc },
+			{ nameof(BookTags), () => BookTags?.Tags ?? string.Empty },
+			{ nameof(Liberate), () => Liberate },
+			{ nameof(DateAdded), () => DateAdded },
+		};
+
+		#endregion
+
+		~LibraryBookEntry()
+		{
+			UserDefinedItem.ItemChanged -= UserDefinedItem_ItemChanged;
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/MainWindowViewModel.cs

@@ -0,0 +1,239 @@
+using ApplicationServices;
+using Dinah.Core;
+using LibationFileManager;
+using ReactiveUI;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public class MainWindowViewModel : ViewModelBase
+	{
+		private string _filterString;
+		private string _removeBooksButtonText = "Remove # Books from Libation";
+		private bool _removeBooksButtonEnabled = true;
+		private bool _autoScanChecked = true;
+		private bool _firstFilterIsDefault = true;
+		private bool _removeButtonsVisible = true;
+		private int _numAccountsScanning = 2;
+		private int _accountsCount = 0;
+		private bool _queueOpen = true;
+		private int _visibleCount = 1;
+		private LibraryCommands.LibraryStats _libraryStats;
+		private int _visibleNotLiberated = 1;
+
+		/// <summary> The Process Queue's viewmodel </summary>
+		public ProcessQueueViewModel ProcessQueue { get; } = new ProcessQueueViewModel();
+		public ProductsDisplayViewModel ProductsDisplay { get; } = new ProductsDisplayViewModel();
+
+
+		/// <summary> Library filterting query </summary>
+		public string FilterString { get => _filterString; set => this.RaiseAndSetIfChanged(ref _filterString, value); }
+
+
+		/// <summary> Display text for the "Remove # Books from Libation" button </summary>
+		public string RemoveBooksButtonText { get => _removeBooksButtonText; set => this.RaiseAndSetIfChanged(ref _removeBooksButtonText, value); }
+
+
+		/// <summary> Indicates if the "Remove # Books from Libation" button is enabled </summary>
+		public bool RemoveBooksButtonEnabled { get => _removeBooksButtonEnabled; set { this.RaiseAndSetIfChanged(ref _removeBooksButtonEnabled, value); } }
+
+
+		/// <summary> Auto scanning accounts is enables </summary>
+		public bool AutoScanChecked 
+		{ 
+			get => _autoScanChecked; 
+			set 
+			{ 
+				if (value != _autoScanChecked)
+					Configuration.Instance.AutoScan = value;
+				this.RaiseAndSetIfChanged(ref _autoScanChecked, value);
+			} 
+		}
+
+
+		/// <summary> Indicates if the first quick filter is the default filter </summary>
+		public bool FirstFilterIsDefault
+		{ 
+			get => _firstFilterIsDefault; 
+			set 
+			{ 
+				if (value != _firstFilterIsDefault)
+					QuickFilters.UseDefault = value;
+				this.RaiseAndSetIfChanged(ref _firstFilterIsDefault, value);
+			}
+		}
+
+
+		/// <summary> Indicates if the "Remove # Books from Libation" and "Done Removing" buttons should be visible </summary>
+		public bool RemoveButtonsVisible
+		{
+			get => _removeButtonsVisible;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _removeButtonsVisible, value);
+				this.RaisePropertyChanged(nameof(RemoveMenuItemsEnabled));
+			}
+		}
+
+
+
+
+		/// <summary> The number of accounts currently being scanned </summary>
+		public int NumAccountsScanning
+		{
+			get => _numAccountsScanning;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _numAccountsScanning, value);
+				this.RaisePropertyChanged(nameof(ActivelyScanning));
+				this.RaisePropertyChanged(nameof(RemoveMenuItemsEnabled));
+				this.RaisePropertyChanged(nameof(ScanningText));
+			}
+		}
+
+		/// <summary> Indicates if Libation is currently scanning account(s) </summary>
+		public bool ActivelyScanning => _numAccountsScanning > 0;
+		/// <summary> Indicates if the "Remove Books" menu items are enabled</summary>
+		public bool RemoveMenuItemsEnabled => !RemoveButtonsVisible && !ActivelyScanning;
+		/// <summary> The library scanning status text </summary>
+		public string ScanningText => _numAccountsScanning == 1 ? "Scanning..." : $"Scanning {_numAccountsScanning} accounts...";
+
+
+
+		/// <summary> The number of accounts added to Libation </summary>
+		public int AccountsCount
+		{
+			get => _accountsCount;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _accountsCount, value);
+				this.RaisePropertyChanged(nameof(ZeroAccounts));
+				this.RaisePropertyChanged(nameof(AnyAccounts));
+				this.RaisePropertyChanged(nameof(OneAccount));
+				this.RaisePropertyChanged(nameof(MultipleAccounts));
+			}
+		}
+
+		/// <summary> There are no Audible accounts </summary>
+		public bool ZeroAccounts => _accountsCount == 0;
+		/// <summary> There is at least one Audible account </summary>
+		public bool AnyAccounts => _accountsCount > 0;
+		/// <summary> There is exactly one Audible account </summary>
+		public bool OneAccount => _accountsCount == 1;
+		/// <summary> There are more than 1 Audible accounts </summary>
+		public bool MultipleAccounts => _accountsCount > 1;
+
+
+
+		/// <summary> The Process Queue panel is open </summary>
+		public bool QueueOpen
+		{
+			get => _queueOpen;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _queueOpen, value);
+				QueueHideButtonText = _queueOpen? "❱❱❱" : "❰❰❰";
+				this.RaisePropertyChanged(nameof(QueueHideButtonText));
+			}
+		}
+
+		/// <summary> The Process Queue's Expand/Collapse button display text </summary>
+		public string QueueHideButtonText { get; private set; }
+
+
+
+		/// <summary> The number of books visible in the Product Display </summary>
+		public int VisibleCount
+		{
+			get => _visibleCount;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _visibleCount, value);
+				this.RaisePropertyChanged(nameof(VisibleCountText));
+				this.RaisePropertyChanged(nameof(VisibleCountMenuItemText));
+			}
+		}
+
+		/// <summary> The Bottom-right visible book count status text </summary>
+		public string VisibleCountText => $"Visible: {VisibleCount}";
+		/// <summary> The Visible Books menu item header text </summary>
+		public string VisibleCountMenuItemText => $"_Visible Books {VisibleCount}";
+
+
+
+		/// <summary> The user's library statistics </summary>
+		public LibraryCommands.LibraryStats LibraryStats
+		{
+			get => _libraryStats;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _libraryStats, value);
+
+				var backupsCountText
+					= !LibraryStats.HasBookResults ? "No books. Begin by importing your library"
+					: !LibraryStats.HasPendingBooks ? $"All {"book".PluralizeWithCount(LibraryStats.booksFullyBackedUp)} backed up"
+					: $"BACKUPS: No progress: {LibraryStats.booksNoProgress}  In process: {LibraryStats.booksDownloadedOnly}  Fully backed up: {LibraryStats.booksFullyBackedUp} {(LibraryStats.booksError > 0 ? $"  Errors : {LibraryStats.booksError}" : "")}";
+
+				var pdfCountText
+					= !LibraryStats.HasPdfResults ? ""
+					: LibraryStats.pdfsNotDownloaded == 0 ? $"  |  All {LibraryStats.pdfsDownloaded} PDFs downloaded"
+					: $"  |  PDFs: NOT d/l'ed: {LibraryStats.pdfsNotDownloaded} Downloaded: {LibraryStats.pdfsDownloaded}";
+
+				StatusCountText = backupsCountText + pdfCountText;
+
+				BookBackupsToolStripText
+					= LibraryStats.HasPendingBooks
+					? $"Begin _Book and PDF Backups: {LibraryStats.PendingBooks} remaining"
+					: "All books have been liberated";
+
+				PdfBackupsToolStripText
+					= LibraryStats.pdfsNotDownloaded > 0
+					? $"Begin _PDF Only Backups: {LibraryStats.pdfsNotDownloaded} remaining"
+					: "All PDFs have been downloaded";
+
+				this.RaisePropertyChanged(nameof(StatusCountText));
+				this.RaisePropertyChanged(nameof(BookBackupsToolStripText));
+				this.RaisePropertyChanged(nameof(PdfBackupsToolStripText));
+			}
+		}
+
+		/// <summary> Bottom-left library statistics display text </summary>
+		public string StatusCountText { get; private set; } = "[Calculating backed up book quantities]  |  [Calculating backed up PDFs]";
+		/// <summary> The "Begin Book and PDF Backup" menu item header text </summary>
+		public string BookBackupsToolStripText { get; private set; } = "Begin _Book and PDF Backups: 0";
+		/// <summary> The "Begin PDF Only Backup" menu item header text </summary>
+		public string PdfBackupsToolStripText { get; private set; } = "Begin _PDF Only Backups: 0";
+
+
+
+		/// <summary> The number of books visible in the Products Display that have not yet been liberated </summary>
+		public int VisibleNotLiberated
+		{
+			get => _visibleNotLiberated;
+			set
+			{
+				this.RaiseAndSetIfChanged(ref _visibleNotLiberated, value);
+
+				LiberateVisibleToolStripText
+					= AnyVisibleNotLiberated
+					? $"Liberate _Visible Books: {VisibleNotLiberated}"
+					: "All visible books are liberated";
+
+				LiberateVisibleToolStripText_2
+					= AnyVisibleNotLiberated
+					? $"_Liberate: {VisibleNotLiberated}"
+					: "All visible books are liberated";
+
+				this.RaisePropertyChanged(nameof(AnyVisibleNotLiberated));
+				this.RaisePropertyChanged(nameof(LiberateVisibleToolStripText));
+				this.RaisePropertyChanged(nameof(LiberateVisibleToolStripText_2));
+			}
+		}
+
+		/// <summary> Indicates if any of the books visible in the Products Display haven't been liberated </summary>
+		public bool AnyVisibleNotLiberated => VisibleNotLiberated > 0;
+		/// <summary> The "Liberate Visible Books" menu item header text (submenu item of the "Liberate Menu" menu item) </summary>
+		public string LiberateVisibleToolStripText { get; private set; } = "Liberate _Visible Books: 0";
+		/// <summary> The "Liberate" menu item header text (submenu item of the "Visible Books" menu item) </summary>
+		public string LiberateVisibleToolStripText_2 { get; private set; } = "_Liberate: 0";
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessBookViewModel.cs

@@ -0,0 +1,382 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ApplicationServices;
+using Avalonia.Media;
+using Avalonia.Media.Imaging;
+using DataLayer;
+using Dinah.Core;
+using FileLiberator;
+using LibationFileManager;
+using ReactiveUI;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public enum ProcessBookResult
+	{
+		None,
+		Success,
+		Cancelled,
+		ValidationFail,
+		FailedRetry,
+		FailedSkip,
+		FailedAbort
+	}
+
+	public enum ProcessBookStatus
+	{
+		Queued,
+		Cancelled,
+		Working,
+		Completed,
+		Failed
+	}
+
+	/// <summary>
+	/// This is the viewmodel for queued processables
+	/// </summary>
+	public class ProcessBookViewModel : ViewModelBase
+	{
+		public event EventHandler Completed;
+
+		public LibraryBook LibraryBook { get; private set; }
+
+		private ProcessBookResult _result = ProcessBookResult.None;
+		private ProcessBookStatus _status = ProcessBookStatus.Queued;
+		private string _narrator;
+		private string _author;
+		private string _title;
+		private int _progress;
+		private string _eta;
+		private Bitmap _cover;
+
+		#region Properties exposed to the view
+		public ProcessBookResult Result { get => _result; set { this.RaiseAndSetIfChanged(ref _result, value); this.RaisePropertyChanged(nameof(StatusText)); } }
+		public ProcessBookStatus Status { get => _status; set { this.RaiseAndSetIfChanged(ref _status, value); this.RaisePropertyChanged(nameof(BackgroundColor)); this.RaisePropertyChanged(nameof(IsFinished)); this.RaisePropertyChanged(nameof(IsDownloading)); this.RaisePropertyChanged(nameof(Queued)); } }
+		public string Narrator { get => _narrator; set { this.RaiseAndSetIfChanged(ref _narrator, value); } }
+		public string Author { get => _author; set { this.RaiseAndSetIfChanged(ref _author, value); } }
+		public string Title { get => _title; set { this.RaiseAndSetIfChanged(ref _title, value); } }
+		public int Progress { get => _progress; private set { this.RaiseAndSetIfChanged(ref _progress, value); } }
+		public string ETA { get => _eta; private set { this.RaiseAndSetIfChanged(ref _eta, value); } }
+		public Bitmap Cover { get => _cover; private set { this.RaiseAndSetIfChanged(ref _cover, value); } }
+		public bool IsFinished => Status is not ProcessBookStatus.Queued and not ProcessBookStatus.Working;
+		public bool IsDownloading => Status is ProcessBookStatus.Working;
+		public bool Queued => Status is ProcessBookStatus.Queued;
+
+		public IBrush BackgroundColor => Status switch
+		{
+			ProcessBookStatus.Cancelled => App.ProcessQueueBookCancelledBrush,
+			ProcessBookStatus.Completed => App.ProcessQueueBookCompletedBrush,
+			ProcessBookStatus.Failed => App.ProcessQueueBookFailedBrush,
+			_ => App.ProcessQueueBookDefaultBrush,
+		};
+		public string StatusText => Result switch
+		{
+			ProcessBookResult.Success => "Finished",
+			ProcessBookResult.Cancelled => "Cancelled",
+			ProcessBookResult.ValidationFail => "Validion fail",
+			ProcessBookResult.FailedRetry => "Error, will retry later",
+			ProcessBookResult.FailedSkip => "Error, Skippping",
+			ProcessBookResult.FailedAbort => "Error, Abort",
+			_ => Status.ToString(),
+		};
+
+		#endregion
+
+		private TimeSpan TimeRemaining { set { ETA = $"ETA: {value:mm\\:ss}"; } }
+		private Processable CurrentProcessable => _currentProcessable ??= Processes.Dequeue().Invoke();
+		private Processable NextProcessable() => _currentProcessable = null;
+		private Processable _currentProcessable;
+		private readonly Queue<Func<Processable>> Processes = new();
+		private readonly ProcessQueue.LogMe Logger;
+
+		public ProcessBookViewModel(LibraryBook libraryBook, ProcessQueue.LogMe logme)
+		{
+			LibraryBook = libraryBook;
+			Logger = logme;
+
+			_title = LibraryBook.Book.Title;
+			_author = LibraryBook.Book.AuthorNames();
+			_narrator = LibraryBook.Book.NarratorNames();
+
+			(bool isDefault, byte[] picture) = PictureStorage.GetPicture(new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._80x80));
+
+			if (isDefault)
+				PictureStorage.PictureCached += PictureStorage_PictureCached;
+
+			// Mutable property. Set the field so PropertyChanged isn't fired.
+			using var ms = new System.IO.MemoryStream(picture);
+			_cover = new Bitmap(ms);
+		}
+
+		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
+		{
+			if (e.Definition.PictureId == LibraryBook.Book.PictureId)
+			{
+				using var ms = new System.IO.MemoryStream(e.Picture);
+				Cover = new Bitmap(ms);
+				PictureStorage.PictureCached -= PictureStorage_PictureCached;
+			}
+		}
+
+		public async Task<ProcessBookResult> ProcessOneAsync()
+		{
+			string procName = CurrentProcessable.Name;
+			try
+			{
+				LinkProcessable(CurrentProcessable);
+
+				var statusHandler = await CurrentProcessable.ProcessSingleAsync(LibraryBook, validate: true);
+
+				if (statusHandler.IsSuccess)
+					return Result = ProcessBookResult.Success;
+				else if (statusHandler.Errors.Contains("Cancelled"))
+				{
+					Logger.Info($"{procName}:  Process was cancelled {LibraryBook.Book}");
+					return Result = ProcessBookResult.Cancelled;
+				}
+				else if (statusHandler.Errors.Contains("Validation failed"))
+				{
+					Logger.Info($"{procName}:  Validation failed {LibraryBook.Book}");
+					return Result = ProcessBookResult.ValidationFail;
+				}
+
+				foreach (var errorMessage in statusHandler.Errors)
+					Logger.Error($"{procName}:  {errorMessage}");
+			}
+			catch (Exception ex)
+			{
+				Logger.Error(ex, procName);
+			}
+			finally
+			{
+				if (Result == ProcessBookResult.None)
+					Result = await showRetry(LibraryBook);
+
+				Status = Result switch
+				{
+					ProcessBookResult.Success => ProcessBookStatus.Completed,
+					ProcessBookResult.Cancelled => ProcessBookStatus.Cancelled,
+					_ => ProcessBookStatus.Failed,
+				};
+			}
+
+			return Result;
+		}
+
+		public async Task CancelAsync()
+		{
+			try
+			{
+				if (CurrentProcessable is AudioDecodable audioDecodable)
+					await audioDecodable.CancelAsync();
+			}
+			catch (Exception ex)
+			{
+				Logger.Error(ex, $"{CurrentProcessable.Name}:  Error while cancelling");
+			}
+		}
+
+		public void AddDownloadPdf() => AddProcessable<DownloadPdf>();
+		public void AddDownloadDecryptBook() => AddProcessable<DownloadDecryptBook>();
+		public void AddConvertToMp3() => AddProcessable<ConvertToMp3>();
+
+		private void AddProcessable<T>() where T : Processable, new()
+		{
+			Processes.Enqueue(() => new T());
+		}
+
+		public override string ToString() => LibraryBook.ToString();
+
+		#region Subscribers and Unsubscribers
+
+		private void LinkProcessable(Processable processable)
+		{
+			processable.Begin += Processable_Begin;
+			processable.Completed += Processable_Completed;
+			processable.StreamingProgressChanged += Streamable_StreamingProgressChanged;
+			processable.StreamingTimeRemaining += Streamable_StreamingTimeRemaining;
+
+			if (processable is AudioDecodable audioDecodable)
+			{
+				audioDecodable.RequestCoverArt += AudioDecodable_RequestCoverArt;
+				audioDecodable.TitleDiscovered += AudioDecodable_TitleDiscovered;
+				audioDecodable.AuthorsDiscovered += AudioDecodable_AuthorsDiscovered;
+				audioDecodable.NarratorsDiscovered += AudioDecodable_NarratorsDiscovered;
+				audioDecodable.CoverImageDiscovered += AudioDecodable_CoverImageDiscovered;
+			}
+		}
+
+		private void UnlinkProcessable(Processable processable)
+		{
+			processable.Begin -= Processable_Begin;
+			processable.Completed -= Processable_Completed;
+			processable.StreamingProgressChanged -= Streamable_StreamingProgressChanged;
+			processable.StreamingTimeRemaining -= Streamable_StreamingTimeRemaining;
+
+			if (processable is AudioDecodable audioDecodable)
+			{
+				audioDecodable.RequestCoverArt -= AudioDecodable_RequestCoverArt;
+				audioDecodable.TitleDiscovered -= AudioDecodable_TitleDiscovered;
+				audioDecodable.AuthorsDiscovered -= AudioDecodable_AuthorsDiscovered;
+				audioDecodable.NarratorsDiscovered -= AudioDecodable_NarratorsDiscovered;
+				audioDecodable.CoverImageDiscovered -= AudioDecodable_CoverImageDiscovered;
+			}
+		}
+
+		#endregion
+
+		#region AudioDecodable event handlers
+
+		private void AudioDecodable_TitleDiscovered(object sender, string title) => Title = title;
+
+		private void AudioDecodable_AuthorsDiscovered(object sender, string authors) => Author = authors;
+
+		private void AudioDecodable_NarratorsDiscovered(object sender, string narrators) => Narrator = narrators;
+
+
+		private byte[] AudioDecodable_RequestCoverArt(object sender, EventArgs e)
+		{
+			byte[] coverData = PictureStorage
+				.GetPictureSynchronously(
+				new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._500x500));
+
+			AudioDecodable_CoverImageDiscovered(this, coverData);
+			return coverData;
+		}
+
+		private void AudioDecodable_CoverImageDiscovered(object sender, byte[] coverArt)
+		{
+			using var ms = new System.IO.MemoryStream(coverArt);
+			Cover = new Avalonia.Media.Imaging.Bitmap(ms);
+		}
+
+		#endregion
+
+		#region Streamable event handlers
+		private void Streamable_StreamingTimeRemaining(object sender, TimeSpan timeRemaining) => TimeRemaining = timeRemaining;
+
+
+		private void Streamable_StreamingProgressChanged(object sender, Dinah.Core.Net.Http.DownloadProgress downloadProgress)
+		{
+			if (!downloadProgress.ProgressPercentage.HasValue)
+				return;
+
+			if (downloadProgress.ProgressPercentage == 0)
+				TimeRemaining = TimeSpan.Zero;
+			else
+				Progress = (int)downloadProgress.ProgressPercentage;
+		}
+
+		#endregion
+
+		#region Processable event handlers
+
+		private void Processable_Begin(object sender, LibraryBook libraryBook)
+		{
+			Status = ProcessBookStatus.Working;
+
+			Logger.Info($"{Environment.NewLine}{((Processable)sender).Name} Step, Begin: {libraryBook.Book}");
+
+			Title = libraryBook.Book.Title;
+			Author = libraryBook.Book.AuthorNames();
+			Narrator = libraryBook.Book.NarratorNames();
+		}
+
+		private async void Processable_Completed(object sender, LibraryBook libraryBook)
+		{
+			Logger.Info($"{((Processable)sender).Name} Step, Completed: {libraryBook.Book}");
+			UnlinkProcessable((Processable)sender);
+
+			if (Processes.Count > 0)
+			{
+				NextProcessable();
+				LinkProcessable(CurrentProcessable);
+				var result = await CurrentProcessable.ProcessSingleAsync(libraryBook, validate: true);
+
+				if (result.HasErrors)
+				{
+					foreach (var errorMessage in result.Errors.Where(e => e != "Validation failed"))
+						Logger.Error(errorMessage);
+
+					Completed?.Invoke(this, EventArgs.Empty);
+				}
+			}
+			else
+			{
+				Completed?.Invoke(this, EventArgs.Empty);
+			}
+		}
+
+		#endregion
+
+		#region Failure Handler
+
+		private async Task<ProcessBookResult> showRetry(LibraryBook libraryBook)
+		{
+			Logger.Error("ERROR. All books have not been processed. Most recent book: processing failed");
+
+			DialogResult? dialogResult = Configuration.Instance.BadBook switch
+			{
+				Configuration.BadBookAction.Abort => DialogResult.Abort,
+				Configuration.BadBookAction.Retry => DialogResult.Retry,
+				Configuration.BadBookAction.Ignore => DialogResult.Ignore,
+				Configuration.BadBookAction.Ask => null,
+				_ => null
+			};
+
+			string details;
+			try
+			{
+				static string trunc(string str)
+					=> string.IsNullOrWhiteSpace(str) ? "[empty]"
+					: (str.Length > 50) ? $"{str.Truncate(47)}..."
+					: str;
+
+				details =
+$@"  Title: {libraryBook.Book.Title}
+  ID: {libraryBook.Book.AudibleProductId}
+  Author: {trunc(libraryBook.Book.AuthorNames())}
+  Narr: {trunc(libraryBook.Book.NarratorNames())}";
+			}
+			catch
+			{
+				details = "[Error retrieving details]";
+			}
+
+			// if null then ask user
+			dialogResult ??= await MessageBox.Show(string.Format(SkipDialogText + "\r\n\r\nSee Settings to avoid this box in the future.", details), "Skip importing this book?", SkipDialogButtons, MessageBoxIcon.Question, SkipDialogDefaultButton);
+
+			if (dialogResult == DialogResult.Abort)
+				return ProcessBookResult.FailedAbort;
+
+			if (dialogResult == SkipResult)
+			{
+				libraryBook.Book.UpdateBookStatus(LiberatedStatus.Error);
+
+				Logger.Info($"Error. Skip: [{libraryBook.Book.AudibleProductId}] {libraryBook.Book.Title}");
+
+				return ProcessBookResult.FailedSkip;
+			}
+
+			return ProcessBookResult.FailedRetry;
+		}
+
+		private string SkipDialogText => @"
+An error occurred while trying to process this book.
+{0}
+
+- ABORT: Stop processing books.
+
+- RETRY: retry this book later. Just skip it for now. Continue processing books. (Will try this book again later.)
+
+- IGNORE: Permanently ignore this book. Continue processing books. (Will not try this book again later.)
+".Trim();
+		private MessageBoxButtons SkipDialogButtons => MessageBoxButtons.AbortRetryIgnore;
+		private MessageBoxDefaultButton SkipDialogDefaultButton => MessageBoxDefaultButton.Button1;
+		private DialogResult SkipResult => DialogResult.Ignore;
+	}
+
+	#endregion
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/ProcessQueueViewModel.cs

@@ -0,0 +1,213 @@
+using ApplicationServices;
+using Avalonia.Controls;
+using Avalonia.Threading;
+using DataLayer;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public class ProcessQueueViewModel : ViewModelBase, ProcessQueue.ILogForm
+	{
+		public ObservableCollection<LogEntry> LogEntries { get; } = new();
+		public TrackedQueue<ProcessBookViewModel> Items { get; } = new();
+
+		private TrackedQueue<ProcessBookViewModel> Queue => Items;
+		public ProcessBookViewModel SelectedItem { get; set; }
+		public Task QueueRunner { get; private set; }
+		public bool Running => !QueueRunner?.IsCompleted ?? false;
+
+		private readonly ProcessQueue.LogMe Logger;
+
+		public ProcessQueueViewModel()
+		{
+			Queue.QueuededCountChanged += Queue_QueuededCountChanged;
+			Queue.CompletedCountChanged += Queue_CompletedCountChanged;
+			Logger = ProcessQueue.LogMe.RegisterForm(this);
+		}
+
+		private int _completedCount;
+		private int _errorCount;
+		private int _queuedCount;
+		private string _runningTime;
+		private bool _progressBarVisible;
+
+		public int CompletedCount { get => _completedCount; private set { this.RaiseAndSetIfChanged(ref _completedCount, value); this.RaisePropertyChanged(nameof(AnyCompleted)); } }
+		public int QueuedCount { get => _queuedCount; private set { this.RaiseAndSetIfChanged(ref _queuedCount, value); this.RaisePropertyChanged(nameof(AnyQueued)); } }
+		public int ErrorCount { get => _errorCount; private set { this.RaiseAndSetIfChanged(ref _errorCount, value); this.RaisePropertyChanged(nameof(AnyErrors)); } }
+		public string RunningTime { get => _runningTime; set { this.RaiseAndSetIfChanged(ref _runningTime, value); } }
+		public bool ProgressBarVisible { get => _progressBarVisible; set { this.RaiseAndSetIfChanged(ref _progressBarVisible, value); } }
+		public bool AnyCompleted => CompletedCount > 0;
+		public bool AnyQueued => QueuedCount > 0;
+		public bool AnyErrors => ErrorCount > 0;
+		public double Progress => 100d * Queue.Completed.Count / Queue.Count;
+
+		private void Queue_CompletedCountChanged(object sender, int e)
+		{
+			int errCount = Queue.Completed.Count(p => p.Result is ProcessBookResult.FailedAbort or ProcessBookResult.FailedSkip or ProcessBookResult.FailedRetry or ProcessBookResult.ValidationFail);
+			int completeCount = Queue.Completed.Count(p => p.Result is ProcessBookResult.Success);
+
+			ErrorCount = errCount;
+			CompletedCount = completeCount;
+			this.RaisePropertyChanged(nameof(Progress));
+		}
+		private void Queue_QueuededCountChanged(object sender, int cueCount)
+		{
+			QueuedCount = cueCount;
+			this.RaisePropertyChanged(nameof(Progress));
+		}
+
+		public void WriteLine(string text)
+		{
+			Dispatcher.UIThread.Post(() =>
+				LogEntries.Add(new()
+				{
+					LogDate = DateTime.Now,
+					LogMessage = text.Trim()
+				}));
+		}
+
+
+		#region Add Books to Queue
+
+		private bool isBookInQueue(LibraryBook libraryBook)
+			=> Queue.Any(b => b?.LibraryBook?.Book?.AudibleProductId == libraryBook.Book.AudibleProductId);
+
+		public void AddDownloadPdf(LibraryBook libraryBook)
+			=> AddDownloadPdf(new List<LibraryBook>() { libraryBook });
+
+		public void AddDownloadDecrypt(LibraryBook libraryBook)
+			=> AddDownloadDecrypt(new List<LibraryBook>() { libraryBook });
+
+		public void AddConvertMp3(LibraryBook libraryBook)
+			=> AddConvertMp3(new List<LibraryBook>() { libraryBook });
+
+		public void AddDownloadPdf(IEnumerable<LibraryBook> entries)
+		{
+			List<ProcessBookViewModel> procs = new();
+			foreach (var entry in entries)
+			{
+				if (isBookInQueue(entry))
+					continue;
+
+				ProcessBookViewModel pbook = new(entry, Logger);
+				pbook.AddDownloadPdf();
+				procs.Add(pbook);
+			}
+
+			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
+			AddToQueue(procs);
+		}
+
+		public void AddDownloadDecrypt(IEnumerable<LibraryBook> entries)
+		{
+			List<ProcessBookViewModel> procs = new();
+			foreach (var entry in entries)
+			{
+				if (isBookInQueue(entry))
+					continue;
+
+				ProcessBookViewModel pbook = new(entry, Logger);
+				pbook.AddDownloadDecryptBook();
+				pbook.AddDownloadPdf();
+				procs.Add(pbook);
+			}
+
+			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
+			AddToQueue(procs);
+		}
+
+		public void AddConvertMp3(IEnumerable<LibraryBook> entries)
+		{
+			List<ProcessBookViewModel> procs = new();
+			foreach (var entry in entries)
+			{
+				if (isBookInQueue(entry))
+					continue;
+
+				ProcessBookViewModel pbook = new(entry, Logger);
+				pbook.AddConvertToMp3();
+				procs.Add(pbook);
+			}
+
+			Serilog.Log.Logger.Information("Queueing {count} books", procs.Count);
+			AddToQueue(procs);
+		}
+
+		public void AddToQueue(IEnumerable<ProcessBookViewModel> pbook)
+		{
+			Dispatcher.UIThread.Post(() =>
+			{
+				Queue.Enqueue(pbook);
+				if (!Running)
+					QueueRunner = QueueLoop();
+			});
+		}
+
+		#endregion
+
+		DateTime StartingTime;
+		private async Task QueueLoop()
+		{
+			try
+			{
+				Serilog.Log.Logger.Information("Begin processing queue");
+
+				RunningTime = string.Empty;
+				ProgressBarVisible = true;
+				StartingTime = DateTime.Now;
+
+				using var counterTimer = new System.Threading.Timer(CounterTimer_Tick, null, 0, 500);
+
+				while (Queue.MoveNext())
+				{
+					var nextBook = Queue.Current;
+
+					Serilog.Log.Logger.Information("Begin processing queued item. {item_LibraryBook}", nextBook?.LibraryBook);
+
+					var result = await nextBook.ProcessOneAsync();
+
+					Serilog.Log.Logger.Information("Completed processing queued item: {item_LibraryBook}\r\nResult: {result}", nextBook?.LibraryBook, result);
+
+					if (result == ProcessBookResult.ValidationFail)
+						Queue.ClearCurrent();
+					else if (result == ProcessBookResult.FailedAbort)
+						Queue.ClearQueue();
+					else if (result == ProcessBookResult.FailedSkip)
+						nextBook.LibraryBook.Book.UpdateBookStatus(DataLayer.LiberatedStatus.Error);
+				}
+				Serilog.Log.Logger.Information("Completed processing queue");
+
+				Queue_CompletedCountChanged(this, 0);
+				ProgressBarVisible = false;
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "An error was encountered while processing queued items");
+			}
+		}
+
+		private void CounterTimer_Tick(object? state)
+		{
+			string timeToStr(TimeSpan time)
+			{
+				string minsSecs = $"{time:mm\\:ss}";
+				if (time.TotalHours >= 1)
+					return $"{time.TotalHours:F0}:{minsSecs}";
+				return minsSecs;
+			}
+			RunningTime = timeToStr(DateTime.Now - StartingTime);
+		}
+	}
+
+	public class LogEntry
+	{
+		public DateTime LogDate { get; init; }
+		public string LogDateString => LogDate.ToShortTimeString();
+		public string LogMessage { get; init; }
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/ProductsDisplayViewModel.cs

@@ -0,0 +1,338 @@
+using Avalonia.Controls;
+using DataLayer;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using ReactiveUI;
+using System.Reflection;
+using System.Collections;
+using Avalonia.Threading;
+using ApplicationServices;
+using AudibleUtilities;
+using LibationWinForms.AvaloniaUI.Views;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public class ProductsDisplayViewModel : ViewModelBase
+	{
+		/// <summary>Number of visible rows has changed</summary>
+		public event EventHandler<int> VisibleCountChanged;
+		public event EventHandler<int> RemovableCountChanged;
+		public event EventHandler InitialLoaded;
+
+		private DataGridColumn _currentSortColumn;
+		private DataGrid productsDataGrid;
+
+		private GridEntryCollection _gridEntries;
+		private bool _removeColumnVisivle;
+		public GridEntryCollection GridEntries { get => _gridEntries; private set => this.RaiseAndSetIfChanged(ref _gridEntries, value); }
+		public bool RemoveColumnVisivle { get => _removeColumnVisivle; private set => this.RaiseAndSetIfChanged(ref _removeColumnVisivle, value); }
+
+		public List<LibraryBook> GetVisibleBookEntries()
+			=> GridEntries.InternalList
+			.BookEntries()
+			.Select(lbe => lbe.LibraryBook)
+			.ToList();
+		public IEnumerable<LibraryBookEntry> GetAllBookEntries()
+			=> GridEntries
+			.AllItems()
+			.BookEntries();
+		public ProductsDisplayViewModel() { }
+		public ProductsDisplayViewModel(List<GridEntry> items)
+		{
+			GridEntries = new GridEntryCollection(items);
+		}
+
+		#region Display Functions
+
+		/// <summary>
+		/// Call once on load so we can modify access a private member with reflection
+		/// </summary>
+		public void RegisterCollectionChanged(ProductsDisplay productsDisplay = null)
+		{
+			productsDataGrid ??= productsDisplay?.productsGrid;
+
+			if (GridEntries is null)
+				return;
+
+			//Avalonia displays items in the DataConncetion from an internal copy of
+			//the bound list, not the actual bound list. So we need to reflect to get
+			//the current display order and set each GridEntry.ListIndex correctly.
+			var DataConnection_PI = typeof(DataGrid).GetProperty("DataConnection", BindingFlags.NonPublic | BindingFlags.Instance);
+			var DataSource_PI = DataConnection_PI.PropertyType.GetProperty("DataSource", BindingFlags.Public | BindingFlags.Instance);
+
+			GridEntries.CollectionChanged += (s, e) =>
+			{
+				if (s != GridEntries) return;
+
+				var displayListGE = ((IEnumerable)DataSource_PI.GetValue(DataConnection_PI.GetValue(productsDataGrid))).Cast<GridEntry>();
+				int index = 0;
+				foreach (var di in displayListGE)
+				{
+					di.ListIndex = index++;
+				}
+			};
+		}
+
+		/// <summary>
+		/// Only call once per lifetime
+		/// </summary>
+		public void InitialDisplay(List<LibraryBook> dbBooks)
+		{
+			try
+			{
+				GridEntries = new GridEntryCollection(CreateGridEntries(dbBooks));
+				GridEntries.CollapseAll();
+
+				InitialLoaded?.Invoke(this, EventArgs.Empty);
+				VisibleCountChanged?.Invoke(this, GridEntries.BookEntries().Count());
+
+				RegisterCollectionChanged();
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error displaying library in {0}", nameof(ProductsDisplayViewModel));
+			}
+		}
+
+		/// <summary>
+		/// Call when there's been a change to the library
+		/// </summary>
+		public async Task DisplayBooks(List<LibraryBook> dbBooks)
+		{
+			try
+			{
+				//List is already displayed. Replace all items with new ones, refilter, and re-sort
+				string existingFilter = GridEntries?.Filter;
+				var newEntries = CreateGridEntries(dbBooks);
+
+				var existingSeriesEntries = GridEntries.AllItems().SeriesEntries().ToList();
+
+				await Dispatcher.UIThread.InvokeAsync(() =>
+				{
+					GridEntries.ReplaceList(newEntries);
+
+					//We're replacing the list, so preserve usere's existing collapse/expand
+					//state. When resetting a list, default state is open.
+					foreach (var series in existingSeriesEntries)
+					{
+						var sEntry = GridEntries.InternalList.FirstOrDefault(ge => ge.AudibleProductId == series.AudibleProductId);
+						if (sEntry is SeriesEntry se && !series.Liberate.Expanded)
+							GridEntries.CollapseItem(se);
+					}
+
+					GridEntries.Filter = existingFilter;
+					ReSort();
+					VisibleCountChanged?.Invoke(this, GridEntries.BookEntries().Count());
+				});
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Error displaying library in {0}", nameof(ProductsDisplayViewModel));
+			}
+		}
+
+		private static IEnumerable<GridEntry> CreateGridEntries(IEnumerable<LibraryBook> dbBooks)
+		{
+			var geList = dbBooks
+				.Where(lb => lb.Book.IsProduct())
+				.Select(b => new LibraryBookEntry(b))
+				.Cast<GridEntry>()
+				.ToList();
+
+			var episodes = dbBooks.Where(lb => lb.Book.IsEpisodeChild());
+
+			var seriesBooks = dbBooks.Where(lb => lb.Book.IsEpisodeParent()).ToList();
+
+			foreach (var parent in seriesBooks)
+			{
+				var seriesEpisodes = episodes.FindChildren(parent);
+
+				if (!seriesEpisodes.Any()) continue;
+
+				var seriesEntry = new SeriesEntry(parent, seriesEpisodes);
+
+				geList.Add(seriesEntry);
+				geList.AddRange(seriesEntry.Children);
+			}
+			return geList.OrderByDescending(e => e.DateAdded);
+		}
+
+		public void ToggleSeriesExpanded(SeriesEntry seriesEntry)
+		{
+			if (seriesEntry.Liberate.Expanded)
+				GridEntries.CollapseItem(seriesEntry);
+			else
+				GridEntries.ExpandItem(seriesEntry);
+
+			VisibleCountChanged?.Invoke(this, GridEntries.BookEntries().Count());
+		}
+
+		#endregion
+
+		#region Filtering
+		public async Task Filter(string searchString)
+		{
+			await Dispatcher.UIThread.InvokeAsync(() =>
+			{
+				int visibleCount = GridEntries.Count;
+
+				if (string.IsNullOrEmpty(searchString))
+					GridEntries.RemoveFilter();
+				else
+					GridEntries.Filter = searchString;
+
+				if (visibleCount != GridEntries.Count)
+					VisibleCountChanged?.Invoke(this, GridEntries.BookEntries().Count());
+
+				//Re-sort after filtering
+				ReSort();
+			});
+		}
+
+		#endregion
+
+		#region Sorting
+
+		public void Sort(DataGridColumn sortColumn)
+		{
+			//Force the comparer to get the current sort order. We can't
+			//retrieve it from inside this event handler because Avalonia
+			//doesn't set the property until after this event.
+			var comparer = sortColumn.CustomSortComparer as RowComparer;
+			comparer.SortDirection = null;
+
+			_currentSortColumn = sortColumn;
+		}
+
+		//Must be invoked on UI thread
+		private void ReSort()
+		{
+			if (_currentSortColumn is null)
+			{
+				//Sort ascending and reverse. That's how the comparer is designed to work to be compatible with Avalonia.
+				var defaultComparer = new RowComparer(ListSortDirection.Descending, nameof(GridEntry.DateAdded));
+				GridEntries.InternalList.Sort(defaultComparer);
+				GridEntries.InternalList.Reverse();
+				GridEntries.ResetCollection();
+			}
+			else
+			{
+				_currentSortColumn.Sort(((RowComparer)_currentSortColumn.CustomSortComparer).SortDirection ?? ListSortDirection.Ascending);
+			}
+		}
+
+		#endregion
+
+		#region Scan and Remove Books
+
+		public void DoneRemovingBooks()
+		{
+			foreach (var item in GridEntries.AllItems())
+				item.PropertyChanged -= Item_PropertyChanged;
+			RemoveColumnVisivle = false;
+		}
+
+		public async Task RemoveCheckedBooksAsync()
+		{
+			var selectedBooks = GetAllBookEntries().Where(lbe => lbe.Remove == true).ToList();
+
+			if (selectedBooks.Count == 0)
+				return;
+
+			var libraryBooks = selectedBooks.Select(rge => rge.LibraryBook).ToList();
+			var result = await MessageBox.ShowConfirmationDialog(
+				null,
+				libraryBooks,
+				$"Are you sure you want to remove {selectedBooks.Count} books from Libation's library?",
+				"Remove books from Libation?");
+
+			if (result != DialogResult.Yes)
+				return;
+
+			foreach (var book in selectedBooks)
+				book.PropertyChanged -= Item_PropertyChanged;
+
+			var idsToRemove = libraryBooks.Select(lb => lb.Book.AudibleProductId).ToList();
+			GridEntries.CollectionChanged += BindingList_CollectionChanged;
+
+			//The RemoveBooksAsync will fire LibrarySizeChanged, which calls ProductsDisplay2.Display(),
+			//so there's no need to remove books from the grid display here.
+			var removeLibraryBooks = await LibraryCommands.RemoveBooksAsync(idsToRemove);
+
+			foreach (var b in GetAllBookEntries())
+				b.Remove = false;
+
+			RemovableCountChanged?.Invoke(this, 0);
+		}
+
+		void BindingList_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+		{
+			if (e.Action != System.Collections.Specialized.NotifyCollectionChangedAction.Reset)
+				return;
+
+			//After ProductsDisplay2.Display() re-creates the list,
+			//re-subscribe to all items' PropertyChanged events.
+
+			foreach (var b in GetAllBookEntries())
+				b.PropertyChanged += Item_PropertyChanged;
+
+			GridEntries.CollectionChanged -= BindingList_CollectionChanged;
+		}
+
+		public async Task ScanAndRemoveBooksAsync(params Account[] accounts)
+		{
+			foreach (var item in GridEntries.AllItems())
+			{
+				item.Remove = false;
+				item.PropertyChanged += Item_PropertyChanged;
+			}
+
+			RemoveColumnVisivle = true;
+			RemovableCountChanged?.Invoke(this, 0);
+
+			try
+			{
+				if (accounts is null || accounts.Length == 0)
+					return;
+
+				var allBooks = GetAllBookEntries();
+
+				foreach (var b in allBooks)
+					b.Remove = false;
+
+				var lib = allBooks
+					.Select(lbe => lbe.LibraryBook)
+					.Where(lb => !lb.Book.HasLiberated());
+
+				var removedBooks = await LibraryCommands.FindInactiveBooks(Login.WinformLoginChoiceEager.ApiExtendedFunc, lib, accounts);
+
+				var removable = allBooks.Where(lbe => removedBooks.Any(rb => rb.Book.AudibleProductId == lbe.AudibleProductId)).ToList();
+
+				foreach (var r in removable)
+					r.Remove = true;
+			}
+			catch (Exception ex)
+			{
+				await MessageBox.ShowAdminAlert(
+					null,
+					"Error scanning library. You may still manually select books to remove from Libation's library.",
+					"Error scanning library",
+					ex);
+			}
+		}
+
+		private void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == nameof(GridEntry.Remove) && sender is LibraryBookEntry lbEntry)
+			{
+				int removeCount = GetAllBookEntries().Count(lbe => lbe.Remove is true);
+				RemovableCountChanged?.Invoke(this, removeCount);
+			}
+		}
+
+		#endregion
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/QueryExtensions.cs

@@ -0,0 +1,44 @@
+using DataLayer;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+#nullable enable
+	internal static class QueryExtensions
+	{
+		public static IEnumerable<LibraryBookEntry> BookEntries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.OfType<LibraryBookEntry>();
+
+		public static IEnumerable<SeriesEntry> SeriesEntries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.OfType<SeriesEntry>();
+
+		public static T? FindByAsin<T>(this IEnumerable<T> gridEntries, string audibleProductID) where T : GridEntry
+			=> gridEntries.FirstOrDefault(i => i.AudibleProductId == audibleProductID);
+
+		public static IEnumerable<SeriesEntry> EmptySeries(this IEnumerable<GridEntry> gridEntries)
+			=> gridEntries.SeriesEntries().Where(i => i.Children.Count == 0);
+
+		public static SeriesEntry? FindSeriesParent(this IEnumerable<GridEntry> gridEntries, LibraryBook seriesEpisode)
+		{
+			if (seriesEpisode.Book.SeriesLink is null) return null;
+
+			try
+			{
+				//Parent books will always have exactly 1 SeriesBook due to how
+				//they are imported in ApiExtended.getChildEpisodesAsync()
+				return gridEntries.SeriesEntries().FirstOrDefault(
+					lb =>
+					seriesEpisode.Book.SeriesLink.Any(
+						s => s.Series.AudibleSeriesId == lb.LibraryBook.Book.SeriesLink.Single().Series.AudibleSeriesId));
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Error(ex, "Query error in {0}", nameof(FindSeriesParent));
+				return null;
+			}
+		}
+	}
+#nullable disable
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/RowComparer.cs

@@ -0,0 +1,111 @@
+using Avalonia.Controls;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	/// <summary>
+	/// This compare class ensures that all top-level grid entries (standalone books or series parents)
+	/// are sorted by PropertyName while all episodes remain immediately beneath their parents and remain
+	/// sorted by series index, ascending. Stable sorting is achieved by comparing the GridEntry.ListIndex
+	/// properties when 2 items compare equal.
+	/// </summary>
+	internal class RowComparer : IComparer, IComparer<GridEntry>
+	{
+		private static readonly PropertyInfo HeaderCellPi = typeof(DataGridColumn).GetProperty("HeaderCell", BindingFlags.NonPublic | BindingFlags.Instance);
+		private static readonly PropertyInfo CurrentSortingStatePi = typeof(DataGridColumnHeader).GetProperty("CurrentSortingState", BindingFlags.NonPublic | BindingFlags.Instance);
+
+		public DataGridColumn Column { get; init; }
+		public string PropertyName { get; private set; }
+		public ListSortDirection? SortDirection { get; set; }
+
+		public RowComparer(DataGridColumn column)
+		{
+			Column = column;
+			PropertyName = Column.SortMemberPath;
+		}
+		public RowComparer(ListSortDirection direction, string propertyName)
+		{
+			SortDirection = direction;
+			PropertyName = propertyName;
+		}
+
+		public int Compare(object x, object y)
+		{
+			if (x is null && y is not null) return -1;
+			if (x is not null && y is null) return 1;
+			if (x is null && y is null) return 0;
+
+			var geA = (GridEntry)x;
+			var geB = (GridEntry)y;
+
+			SortDirection ??= GetSortOrder();
+
+			SeriesEntry parentA = null;
+			SeriesEntry parentB = null;
+
+			if (geA is LibraryBookEntry lbA && lbA.Parent is SeriesEntry seA)
+				parentA = seA;
+			if (geB is LibraryBookEntry lbB && lbB.Parent is SeriesEntry seB)
+				parentB = seB;
+
+			//both a and b are top-level grid entries
+			if (parentA is null && parentB is null)
+				return InternalCompare(geA, geB);
+
+			//a is top-level, b is a child
+			if (parentA is null && parentB is not null)
+			{
+				// b is a child of a, parent is always first
+				if (parentB == geA)
+					return SortDirection is ListSortDirection.Ascending ? -1 : 1;
+				else
+					return InternalCompare(geA, parentB);
+			}
+
+			//a is a child, b is a top-level
+			if (parentA is not null && parentB is null)
+			{
+				// a is a child of b, parent is always first
+				if (parentA == geB)
+					return SortDirection is ListSortDirection.Ascending ? 1 : -1;
+				else
+					return InternalCompare(parentA, geB);
+			}
+
+			//both are children of the same series, always present in order of series index, ascending
+			if (parentA == parentB)
+				return geA.SeriesIndex.CompareTo(geB.SeriesIndex) * (SortDirection is ListSortDirection.Ascending ? 1 : -1);
+
+			//a and b are children of different series.
+			return InternalCompare(parentA, parentB);
+		}
+
+		//Avalonia doesn't expose the column's CurrentSortingState, so we must get it through reflection
+		private ListSortDirection? GetSortOrder()
+			=> CurrentSortingStatePi.GetValue(HeaderCellPi.GetValue(Column)) as ListSortDirection?;
+
+		private int InternalCompare(GridEntry x, GridEntry y)
+		{
+			var val1 = x.GetMemberValue(PropertyName);
+			var val2 = y.GetMemberValue(PropertyName);
+
+			var compareResult = x.GetMemberComparer(val1.GetType()).Compare(val1, val2);
+
+			//If items compare equal, compare them by their positions in the the list.
+			//This is how you achieve a stable sort.
+			if (compareResult == 0)
+				return x.ListIndex.CompareTo(y.ListIndex);
+			else
+				return compareResult;
+		}
+
+		public int Compare(GridEntry x, GridEntry y)
+		{
+			return Compare((object)x, y);
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/SeriesEntry.cs

@@ -0,0 +1,110 @@
+using Avalonia.Media;
+using DataLayer;
+using Dinah.Core;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	/// <summary>The View Model for a LibraryBook that is ContentType.Parent</summary>
+	public class SeriesEntry : GridEntry
+	{
+		[Browsable(false)] public List<LibraryBookEntry> Children { get; }
+		[Browsable(false)] public override DateTime DateAdded => Children.Max(c => c.DateAdded);
+
+		private bool suspendCounting = false;
+		public void ChildRemoveUpdate()
+		{
+			if (suspendCounting) return;
+
+			var removeCount = Children.Count(c => c.Remove == true);
+
+			_remove = removeCount == 0 ? false : (removeCount == Children.Count ? true : null);
+			this.RaisePropertyChanged(nameof(Remove));
+		}
+
+		#region Model properties exposed to the view
+		public override bool? Remove
+		{
+			get => _remove;
+			set
+			{
+				_remove = value ?? false;
+
+				suspendCounting = true;
+
+				foreach (var item in Children)
+					item.Remove = value;
+
+				suspendCounting = false;
+				this.RaisePropertyChanged(nameof(Remove));
+			}
+		}
+
+		public override LiberateButtonStatus Liberate { get; }
+		public override BookTags BookTags { get; } = new();
+
+		public override bool IsSeries => true;
+		public override bool IsEpisode => false;
+		public override bool IsBook => false;
+
+		#endregion
+
+		public SeriesEntry(LibraryBook parent, IEnumerable<LibraryBook> children)
+		{
+			Liberate = new LiberateButtonStatus(IsSeries) { Expanded = true };
+			SeriesIndex = -1;
+			LibraryBook = parent;
+
+			LoadCover();
+
+			Children = children
+				.Select(c => new LibraryBookEntry(c) { Parent = this })
+				.OrderBy(c => c.SeriesIndex)
+				.ToList();
+
+			Title = Book.Title;
+			Series = Book.SeriesNames();
+			MyRating = Book.UserDefinedItem.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+			ProductRating = Book.Rating?.ToStarString()?.DefaultIfNullOrWhiteSpace("");
+			Authors = Book.AuthorNames();
+			Narrators = Book.NarratorNames();
+			Category = string.Join(" > ", Book.CategoriesNames());
+			Misc = GetMiscDisplay(LibraryBook);
+			LongDescription = GetDescriptionDisplay(Book);
+			Description = TrimTextToWord(LongDescription, 62);
+
+			PurchaseDate = Children.Min(c => c.LibraryBook.DateAdded).ToString("d");
+			int bookLenMins = Children.Sum(c => c.LibraryBook.Book.LengthInMinutes);
+			Length = bookLenMins == 0 ? "" : $"{bookLenMins / 60} hr {bookLenMins % 60} min";
+		}
+
+
+		#region Data Sorting
+
+		/// <summary>Create getters for all member object values by name</summary>
+		protected override Dictionary<string, Func<object>> CreateMemberValueDictionary() => new()
+		{
+			{ nameof(Remove), () => Remove.HasValue ? Remove.Value ? RemoveStatus.Removed : RemoveStatus.NotRemoved : RemoveStatus.SomeRemoved },
+			{ nameof(Title), () => Book.TitleSortable() },
+			{ nameof(Series), () => Book.SeriesSortable() },
+			{ nameof(Length), () => Children.Sum(c => c.LibraryBook.Book.LengthInMinutes) },
+			{ nameof(MyRating), () => Book.UserDefinedItem.Rating.FirstScore() },
+			{ nameof(PurchaseDate), () => Children.Min(c => c.LibraryBook.DateAdded) },
+			{ nameof(ProductRating), () => Book.Rating.FirstScore() },
+			{ nameof(Authors), () => Authors },
+			{ nameof(Narrators), () => Narrators },
+			{ nameof(Description), () => Description },
+			{ nameof(Category), () => Category },
+			{ nameof(Misc), () => Misc },
+			{ nameof(BookTags), () => BookTags?.Tags ?? string.Empty },
+			{ nameof(Liberate), () => Liberate },
+			{ nameof(DateAdded), () => DateAdded },
+		};
+
+		#endregion
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/TrackedQueue[T].cs

@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public enum QueuePosition
+	{
+		Fisrt,
+		OneUp,
+		OneDown,
+		Last,
+	}
+
+	/*
+	 * This data structure is like lifting a metal chain one link at a time.
+	 * Each time you grab and lift a new link (MoveNext call):
+	 * 
+	 *   1) you're holding a new link in your hand (Current)
+	 *   2) the remaining chain to be lifted shortens by 1 link (Queued)
+	 *   3) the pile of chain at your feet grows by 1 link (Completed)
+	 *   
+	 * The index is the link position from the first link you lifted to the
+	 * last one in the chain.
+	 * 
+	 * 
+	 * For this to work with Avalonia's ItemsRepeater, it must be an ObservableCollection
+	 * (not merely a Collection with INotifyCollectionChanged, INotifyPropertyChanged). 
+	 * So TrackedQueue maintains 2 copies of the list. The primary copy of the list is
+	 * split into Completed, Current and Queued and is used by ProcessQueue to keep track
+	 * of what's what. The secondary copy is a concatenation of primary's three sources
+	 * and is stored in ObservableCollection.Items.  When the primary list changes, the
+	 * secondary list is cleared and reset to match the primary. 
+	 */
+	public class TrackedQueue<T> : ObservableCollection<T> where T : class
+	{
+		public event EventHandler<int> CompletedCountChanged;
+		public event EventHandler<int> QueuededCountChanged;
+
+		public T Current { get; private set; }
+
+		public IReadOnlyList<T> Queued => _queued;
+		public IReadOnlyList<T> Completed => _completed;
+
+		private readonly List<T> _queued = new();
+		private readonly List<T> _completed = new();
+		private readonly object lockObject = new();
+
+		public bool RemoveQueued(T item)
+		{
+			bool itemsRemoved;
+			int queuedCount;
+
+			lock (lockObject)
+			{
+				itemsRemoved = _queued.Remove(item);
+				queuedCount = _queued.Count;
+			}
+
+			if (itemsRemoved)
+			{
+				QueuededCountChanged?.Invoke(this, queuedCount);
+				RebuildSecondary();
+			}
+			return itemsRemoved;
+		}
+
+		public void ClearCurrent()
+		{
+			lock(lockObject)
+				Current = null;
+			RebuildSecondary();
+		}
+		
+		public bool RemoveCompleted(T item)
+		{
+			bool itemsRemoved;
+			int completedCount;
+
+			lock (lockObject)
+			{
+				itemsRemoved = _completed.Remove(item);
+				completedCount = _completed.Count;
+			}
+
+			if (itemsRemoved)
+			{
+				CompletedCountChanged?.Invoke(this, completedCount);
+				RebuildSecondary();
+			}
+			return itemsRemoved;
+		}
+
+		public void ClearQueue()
+		{
+			lock (lockObject)
+				_queued.Clear();
+			QueuededCountChanged?.Invoke(this, 0);
+			RebuildSecondary();
+		}
+
+		public void ClearCompleted()
+		{
+			lock (lockObject)
+				_completed.Clear();
+			CompletedCountChanged?.Invoke(this, 0);
+			RebuildSecondary();
+		}
+
+		public bool Any(Func<T, bool> predicate)
+		{
+			lock (lockObject)
+			{
+				return (Current != null && predicate(Current)) || _completed.Any(predicate) || _queued.Any(predicate);
+			}
+		}
+
+		public void MoveQueuePosition(T item, QueuePosition requestedPosition)
+		{
+			lock (lockObject)
+			{
+				if (_queued.Count == 0 || !_queued.Contains(item)) return;
+
+				if ((requestedPosition == QueuePosition.Fisrt || requestedPosition == QueuePosition.OneUp) && _queued[0] == item)
+					return;
+				if ((requestedPosition == QueuePosition.Last || requestedPosition == QueuePosition.OneDown) && _queued[^1] == item)
+					return;
+
+				int queueIndex = _queued.IndexOf(item);
+
+				if (requestedPosition == QueuePosition.OneUp)
+				{
+					_queued.RemoveAt(queueIndex);
+					_queued.Insert(queueIndex - 1, item);
+				}
+				else if (requestedPosition == QueuePosition.OneDown)
+				{
+					_queued.RemoveAt(queueIndex);
+					_queued.Insert(queueIndex + 1, item);
+				}
+				else if (requestedPosition == QueuePosition.Fisrt)
+				{
+					_queued.RemoveAt(queueIndex);
+					_queued.Insert(0, item);
+				}
+				else
+				{
+					_queued.RemoveAt(queueIndex);
+					_queued.Insert(_queued.Count, item);
+				}
+			}
+			RebuildSecondary();
+		}
+
+		public bool MoveNext()
+		{
+			int completedCount = 0, queuedCount = 0;
+			bool completedChanged = false;
+			try
+			{
+				lock (lockObject)
+				{
+					if (Current != null)
+					{
+						_completed.Add(Current);
+						completedCount = _completed.Count;
+						completedChanged = true;
+					}
+					if (_queued.Count == 0)
+					{
+						Current = null;
+						return false;
+					}
+					Current = _queued[0];
+					_queued.RemoveAt(0);
+
+					queuedCount = _queued.Count;
+					return true;
+				}
+			}
+			finally
+			{
+				if (completedChanged)
+					CompletedCountChanged?.Invoke(this, completedCount);
+				QueuededCountChanged?.Invoke(this, queuedCount);
+				RebuildSecondary();
+			}
+		}
+
+		public bool TryPeek(out T item)
+		{
+			lock (lockObject)
+			{
+				if (_queued.Count == 0)
+				{
+					item = null;
+					return false;
+				}
+				item = _queued[0];
+				return true;
+			}
+		}
+
+		public T Peek()
+		{
+			lock (lockObject)
+			{
+				if (_queued.Count == 0) throw new InvalidOperationException("Queue empty");
+				return _queued.Count > 0 ? _queued[0] : default;
+			}
+		}
+
+		public void Enqueue(IEnumerable<T> item)
+		{
+			int queueCount;
+			lock (lockObject)
+			{
+				_queued.AddRange(item);
+				queueCount = _queued.Count;
+			}
+			foreach (var i in item)
+				base.Add(i);
+			QueuededCountChanged?.Invoke(this, queueCount);
+		}
+
+		private void RebuildSecondary()
+		{
+			base.ClearItems();
+			foreach (var item in GetAllItems())
+				base.Add(item);
+		}
+
+		public IEnumerable<T> GetAllItems()
+		{
+			if (Current is null) return Completed.Concat(Queued);
+			return Completed.Concat(new List<T> { Current }).Concat(Queued);
+		}
+	}
+}

Source/LibationWinForms/AvaloniaUI/ViewModels/ViewModelBase.cs

@@ -0,0 +1,13 @@
+using Avalonia.Controls;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LibationWinForms.AvaloniaUI.ViewModels
+{
+	public class ViewModelBase : ReactiveObject
+	{
+
+	}
+}