incr ver

HangoverAvalonia and other fixes

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve Libation
+title: ''
+labels: bug
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Platform**
+
+[e.g. Windows 10, Windows 11, Mac, Linux (State distribution)]
+
+**Log Files**
+Attach your Libation log file here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.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
@@ -370,3 +370,4 @@ FodyWeavers.xsd
 
 /__TODO.txt
 /DataLayer/LibationContext.db
+*/bin-Avalonia

.releaseindex.json

@@ -0,0 +1,6 @@
+{
+   "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip",
+   "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip",
+   "LinuxAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay",
+   "MacOSAvalonia":  "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay"
+}

README.md

@@ -14,6 +14,7 @@
 - [Getting started](Documentation/GettingStarted.md)
     - [Download Libation](Documentation/GettingStarted.md#download-libation-1)
     - [Installation](Documentation/GettingStarted.md#installation)
+    - [Installation on Ubuntu](Source/LibationAvalonia/README.md)
     - [Create Accounts](Documentation/GettingStarted.md#create-accounts)
     - [Import your library](Documentation/GettingStarted.md#import-your-library)
     - [Download your books -- DRM-free!](Documentation/GettingStarted.md#download-your-books----drm-free)

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -1,14 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AAXClean.Codecs" Version="0.2.10" />
-  </ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
 
-  <ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="AAXClean.Codecs" Version="0.2.12" />
+	</ItemGroup>
+
+	<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

@@ -155,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)
 		{

Source/AaxDecrypter/AaxcDownloadSingleConverter.cs

@@ -78,13 +78,10 @@ namespace AaxDecrypter
 			OnFileCreated(OutputFileName);
 
 			AaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
-			var decryptionResult
-				= DownloadOptions.OutputFormat == OutputFormat.M4b
-				? await AaxFile.ConvertToMp4aAsync(outputFile, DownloadOptions.ChapterInfo, DownloadOptions.TrimOutputToChapterLength)
-				: await AaxFile.ConvertToMp3Async(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);
 
@@ -94,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/IDownloadOptions.cs

@@ -14,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/AppScaffolding/.msbump

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

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,22 +1,21 @@
-<?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.1.2.1</Version>
+    <TargetFramework>net6.0</TargetFramework>
+    <Version>8.3.4.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" />
+    <PackageReference Include="Octokit" Version="1.0.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

@@ -14,8 +14,32 @@ using Serilog;
 
 namespace AppScaffolding
 {
+	public enum ReleaseIdentifier
+	{
+		None,
+		WindowsClassic,
+		WindowsAvalonia,
+		LinuxAvalonia,
+		MacOSAvalonia
+	}
+
 	public static class LibationScaffolding
 	{
+		public static readonly bool IsWindows;
+		public static readonly bool IsLinux;
+		public static readonly bool IsMacOs;
+		static LibationScaffolding()
+		{
+			IsWindows = OperatingSystem.IsWindows();
+			IsLinux = OperatingSystem.IsLinux();
+			IsMacOs = OperatingSystem.IsMacOS();
+		}
+
+		public static ReleaseIdentifier ReleaseIdentifier { get; private set; }
+
+		public static void SetReleaseIdentifier(ReleaseIdentifier releaseID)
+			=> ReleaseIdentifier = releaseID;
+
 		// AppScaffolding
 		private static Assembly _executingAssembly;
 		private static Assembly ExecutingAssembly
@@ -66,6 +90,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;
 
@@ -88,20 +115,20 @@ namespace AppScaffolding
 				config.DecryptToLossy = false;
 
 			if (!config.Exists(nameof(config.LameTargetBitrate)))
-				config.LameTargetBitrate = false;			
-			
+				config.LameTargetBitrate = false;
+
 			if (!config.Exists(nameof(config.LameDownsampleMono)))
 				config.LameDownsampleMono = true;
-			
+
 			if (!config.Exists(nameof(config.LameBitrate)))
 				config.LameBitrate = 64;
-			
+
 			if (!config.Exists(nameof(config.LameConstantBitrate)))
 				config.LameConstantBitrate = false;
-			
+
 			if (!config.Exists(nameof(config.LameMatchSourceBR)))
 				config.LameMatchSourceBR = true;
-			
+
 			if (!config.Exists(nameof(config.LameVBRQuality)))
 				config.LameVBRQuality = 2;
 
@@ -272,12 +299,20 @@ namespace AppScaffolding
 			if (System.Diagnostics.Debugger.IsAttached)
 				mode += " (Debugger attached)";
 
+			string OS
+				= IsLinux ? "Linux"
+				: IsMacOs ? "MacOS"
+				: IsWindows ? "Windows"
+				: "UNKNOWN_OS";
+
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 			Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
+				ReleaseIdentifier = ReleaseIdentifier,
+				OS = OS,
 				Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
 				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
@@ -286,6 +321,7 @@ namespace AppScaffolding
 				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
 				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
 
+				config.BetaOptIn,
 				config.LibationFiles,
 				AudibleFileStorage.BooksDirectory,
 
@@ -308,8 +344,9 @@ namespace AppScaffolding
 		public static UpgradeProperties GetLatestRelease()
 		{
 			// timed out
-			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
-			if (latest is null)
+			(var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
+
+			if (latest is null || zip is null)
 				return null;
 
 			var latestVersionString = latest.TagName.Trim('v');
@@ -321,7 +358,7 @@ namespace AppScaffolding
 				return null;
 
 			// we have an update
-			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
+
 			var zipUrl = zip?.BrowserDownloadUrl;
 
 			Log.Logger.Information("Update available: {@DebugInfo}", new
@@ -333,11 +370,11 @@ namespace AppScaffolding
 
 			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
 		}
-		private static Octokit.Release getLatestRelease(TimeSpan timeout)
+		private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
 		{
 			try
 			{
-				var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
+				var task = getLatestRelease();
 				if (task.Wait(timeout))
 					return task.Result;
 
@@ -347,16 +384,26 @@ namespace AppScaffolding
 			{
 				Log.Logger.Error(aggEx, "Checking for new version too often");
 			}
-			return null;
+			return (null, null);
 		}
-		private static Octokit.Release getLatestRelease()
+		private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
 		{
-			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
+			var ownerAccount = "rmcrackan";
+			var repoName = "Libation";
+
+			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(repoName));
+
+			//Download the release index
+			var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json");
+			var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts));
+			var regexPattern = releaseIndex.Value<string>(ReleaseIdentifier.ToString());
 
 			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
-			var latest = releases.First(r => !r.Draft && !r.Prerelease);
-			return latest;
+			var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName);
+
+			var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+			var latestRelease = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));
+			return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
 		}
 	}
 
@@ -411,9 +458,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
 			{

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,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="CsvHelper" Version="28.0.1" />
     <PackageReference Include="NPOI" Version="2.5.6" />
   </ItemGroup>
 
@@ -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/LibraryExporter.cs

@@ -100,6 +100,9 @@ namespace ApplicationServices
 
 		[Name("Content Type")]
 		public string ContentType { get; set; }
+
+        [Name("Audio Format")]
+		public string AudioFormat { get; set; }
 	}
 	public static class LibToDtos
 	{
@@ -132,7 +135,8 @@ namespace ApplicationServices
 				MyLibationTags = a.Book.UserDefinedItem.Tags,
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
-				ContentType = a.Book.ContentType.ToString()
+				ContentType = a.Book.ContentType.ToString(),
+				AudioFormat = a.Book.AudioFormat.ToString()
 			}).ToList();
 	}
 	public static class LibraryExporter
@@ -176,33 +180,34 @@ namespace ApplicationServices
 			var row = sheet.CreateRow(rowIndex);
 
 			var columns = new[] {
-				nameof (ExportDto.Account),
-				nameof (ExportDto.DateAdded),
-				nameof (ExportDto.AudibleProductId),
-				nameof (ExportDto.Locale),
-				nameof (ExportDto.Title),
-				nameof (ExportDto.AuthorNames),
-				nameof (ExportDto.NarratorNames),
-				nameof (ExportDto.LengthInMinutes),
-				nameof (ExportDto.Description),
-				nameof (ExportDto.Publisher),
-				nameof (ExportDto.HasPdf),
-				nameof (ExportDto.SeriesNames),
-				nameof (ExportDto.SeriesOrder),
-				nameof (ExportDto.CommunityRatingOverall),
-				nameof (ExportDto.CommunityRatingPerformance),
-				nameof (ExportDto.CommunityRatingStory),
-				nameof (ExportDto.PictureId),
-				nameof (ExportDto.IsAbridged),
-				nameof (ExportDto.DatePublished),
-				nameof (ExportDto.CategoriesNames),
-				nameof (ExportDto.MyRatingOverall),
-				nameof (ExportDto.MyRatingPerformance),
-				nameof (ExportDto.MyRatingStory),
-				nameof (ExportDto.MyLibationTags),
-				nameof (ExportDto.BookStatus),
-				nameof (ExportDto.PdfStatus),
-				nameof (ExportDto.ContentType)
+				nameof(ExportDto.Account),
+				nameof(ExportDto.DateAdded),
+				nameof(ExportDto.AudibleProductId),
+				nameof(ExportDto.Locale),
+				nameof(ExportDto.Title),
+				nameof(ExportDto.AuthorNames),
+				nameof(ExportDto.NarratorNames),
+				nameof(ExportDto.LengthInMinutes),
+				nameof(ExportDto.Description),
+				nameof(ExportDto.Publisher),
+				nameof(ExportDto.HasPdf),
+				nameof(ExportDto.SeriesNames),
+				nameof(ExportDto.SeriesOrder),
+				nameof(ExportDto.CommunityRatingOverall),
+				nameof(ExportDto.CommunityRatingPerformance),
+				nameof(ExportDto.CommunityRatingStory),
+				nameof(ExportDto.PictureId),
+				nameof(ExportDto.IsAbridged),
+				nameof(ExportDto.DatePublished),
+				nameof(ExportDto.CategoriesNames),
+				nameof(ExportDto.MyRatingOverall),
+				nameof(ExportDto.MyRatingPerformance),
+				nameof(ExportDto.MyRatingStory),
+				nameof(ExportDto.MyLibationTags),
+				nameof(ExportDto.BookStatus),
+				nameof(ExportDto.PdfStatus),
+				nameof(ExportDto.ContentType),
+				nameof(ExportDto.AudioFormat)
 			};
 			var col = 0;
 			foreach (var c in columns)
@@ -268,6 +273,7 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
+				row.CreateCell(col++).SetCellValue(dto.AudioFormat);
 
 				rowIndex++;
 			}

Source/AudibleUtilities/ApiExtended.cs

@@ -152,6 +152,11 @@ namespace AudibleUtilities
 			Serilog.Log.Logger.Debug("Completed library scan.");
 
 #if DEBUG
+			//// this will not work for multi accounts
+			//var library_json = "library.json";
+			//library_json = System.IO.Path.GetFullPath(library_json);
+			//if (System.IO.File.Exists(library_json))
+			//    items = AudibleApi.Common.Converter.FromJson<List<Item>>(System.IO.File.ReadAllText(library_json));
 			//System.IO.File.WriteAllText(library_json, AudibleApi.Common.Converter.ToJson(items));
 #endif
 			var validators = new List<IValidator>();
@@ -162,10 +167,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 +211,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 +222,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 +343,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

@@ -1,15 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.2.2.1" />
+    <PackageReference Include="AudibleApi" Version="4.6.0.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

@@ -1,32 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <ApplicationIcon />
     <OutputType>Library</OutputType>
-    <StartupObject />
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
+    <PackageReference Include="Dinah.Core" Version="4.4.1.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </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>
   
   <ItemGroup>
     <None Update="migrate.json">

Source/DataLayer/EfClasses/AudioFormat.cs

@@ -0,0 +1,61 @@
+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/EfClasses/Series.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dinah.Core;
-using Microsoft.EntityFrameworkCore;
 
 namespace DataLayer
 {

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -30,10 +30,6 @@ namespace DataLayer
 		{
 			ArgumentValidator.EnsureNotNull(book, nameof(book));
             Book = book;
-
-			// import previously saved tags
-			ArgumentValidator.EnsureNotNullOrWhiteSpace(book.AudibleProductId, nameof(book.AudibleProductId));
-			Tags = LibationFileManager.TagsPersistence.GetTags(book.AudibleProductId);
 		}
 
         #region Tags

Source/DataLayer/LibationContext.cs

@@ -1,10 +1,9 @@
 using DataLayer.Configurations;
-using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
 namespace DataLayer
 {
-    public class LibationContext : InterceptableDbContext
+    public class LibationContext : DbContext
     {
         // IMPORTANT: USING DbSet<>
         // ========================
@@ -35,14 +34,6 @@ namespace DataLayer
         // see DesignTimeDbContextFactoryBase for info about ctors and connection strings/OnConfiguring()
         internal LibationContext(DbContextOptions options) : base(options) { }
 
-        // called on each instantiation
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            AddInterceptor(new TagPersistenceInterceptor());
-
-            base.OnConfiguring(optionsBuilder);
-        }
-
         // typically only called once per execution; NOT once per instantiation
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

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/DataLayer/TagPersistenceInterceptor.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core.Collections.Generic;
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    internal class TagPersistenceInterceptor : IDbInterceptor
-    {
-        public void Executed(DbContext context) { }
-
-        public void Executing(DbContext context)
-		{
-			var tagsCollection
-				= context
-				.ChangeTracker
-				.Entries()
-				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
-				.Select(e => e.Entity as UserDefinedItem)
-				.Where(udi => udi is not null)
-				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
-				.Select(t => (t.Book.AudibleProductId, t.Tags))
-				.ToList();
-
-			LibationFileManager.TagsPersistence.Save(tagsCollection);
-		}
-	}
-}

Source/DtoImporterService/BookImporter.cs

@@ -162,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

@@ -1,7 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -53,8 +53,17 @@ 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 m4bBook.ConvertToMp3Async(mp3File, lameConfig);
 					m4bBook.InputStream.Close();
 					mp3File.Close();

Source/FileLiberator/DownloadDecryptBook.cs

@@ -146,53 +146,128 @@ 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)
-				};
-
-			var chapters = getChapters(contentLic.ContentMetadata.ChapterInfo.Chapters).OrderBy(c => c.StartOffsetMs).ToList();
-
-			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 < chapters.Count; i++)
-				{
-					var chapter = 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 == chapters.Count - 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;
 		}
 
-		private List<AudibleApi.Common.Chapter> getChapters(IEnumerable<AudibleApi.Common.Chapter> chapters)
+		/*
+
+		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();
 
@@ -200,22 +275,22 @@ namespace FileLiberator
 			{
 				if (c.Chapters is not null)
 				{
-					var firstSub = new AudibleApi.Common.Chapter
+					if (c.LengthMs < 10000)
 					{
-						Title = $"{c.Title}: {c.Chapters[0].Title}",
-						StartOffsetMs = c.StartOffsetMs,
-						StartOffsetSec = c.StartOffsetSec,
-						LengthMs = c.LengthMs + c.Chapters[0].LengthMs
-					};
+						c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
+						c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
+						c.Chapters[0].LengthMs += c.LengthMs;
+					}
+					else
+						chaps.Add(c);
 
-					chaps.Add(firstSub);
-
-					var children = getChapters(c.Chapters[1..]);
+					var children = flattenChapters(c.Chapters);
 
 					foreach (var child in children)
-						child.Title = string.IsNullOrEmpty(c.Title) ? child.Title : $"{c.Title}: {child.Title}";
+						child.Title = $"{c.Title}{titleConcat}{child.Title}";
 
 					chaps.AddRange(children);
+					c.Chapters = null;
 				}
 				else
 					chaps.Add(c);
@@ -223,6 +298,22 @@ namespace FileLiberator
 			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)

Source/FileLiberator/DownloadOptions.cs

@@ -20,10 +20,11 @@ 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)

Source/FileLiberator/FileLiberator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -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/FileLiberator/UtilityExtensions.cs

@@ -37,7 +37,11 @@ namespace FileLiberator
 			Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
 
 			SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
-			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order
+			SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Order,
+
+			BitRate = libraryBook.Book.AudioFormat.Bitrate,
+			SampleRate = libraryBook.Book.AudioFormat.SampleRate,
+			Channels = libraryBook.Book.AudioFormat.Channels,
 		};
 	}
 }

Source/FileManager/FileManager.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -9,4 +9,12 @@
     <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

@@ -35,18 +35,24 @@ namespace FileManager
 				}
 				else
 				{
-					file = replaceFileName(file, paramReplacements);
-					fileName = Path.GetDirectoryName(fileName);
 					pathParts.Add(file);
+					fileName = Path.GetDirectoryName(fileName);
 				}
 			}
 
 			pathParts.Reverse();
+			var fileNamePart = pathParts[^1];
+			pathParts.Remove(fileNamePart);
 
-			return FileUtility.GetValidFilename(Path.Join(pathParts.ToArray()), replacements, returnFirstExisting);
+			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)
+		private string replaceFileName(string filename, Dictionary<string,string> paramReplacements, int maxFilenameLength)
 		{
 			List<StringBuilder> filenameParts = new();
 			//Build the filename in parts, replacing replacement parameters with
@@ -82,7 +88,7 @@ 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);

Source/FileManager/LongPath.cs

@@ -20,8 +20,13 @@ namespace FileManager
 		public string Path { get; init; }
 		public override string ToString() => Path;
 
+		private static readonly PlatformID PlatformID = Environment.OSVersion.Platform;
+
+	
 		public static implicit operator LongPath(string path)
 		{
+			if (PlatformID is PlatformID.Unix) return new LongPath { Path = path };
+
 			if (path is null) return null;
 
 			//File I/O functions in the Windows API convert "/" to "\" as part of converting
@@ -58,6 +63,8 @@ namespace FileManager
 		{
 			get
 			{
+				if (PlatformID is PlatformID.Unix) return Path;
+
 				//Short Path names are useful for navigating to the file in windows explorer,
 				//which will not recognize paths longer than MAX_PATH. Short path names are not
 				//always enabled on every volume. So to check if a volume enables short path
@@ -96,6 +103,7 @@ namespace FileManager
 		{
 			get
 			{
+				if (PlatformID is PlatformID.Unix) return Path;
 				if (Path is null) return null;
 
 				StringBuilder longPathBuffer = new(MaxPathLength);
@@ -106,15 +114,21 @@ namespace FileManager
 
 		[JsonIgnore]
 		public string PathWithoutPrefix
-			=> Path?.StartsWith(LONG_PATH_PREFIX) == true ?
-			Path.Remove(0, LONG_PATH_PREFIX.Length) :
-			Path;
-
+		{
+			get
+			{
+				if (PlatformID is PlatformID.Unix) return Path;
+				return
+					Path?.StartsWith(LONG_PATH_PREFIX) == true ? Path.Remove(0, LONG_PATH_PREFIX.Length)
+					:Path;
+			}
+		}
 
 		[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 		private static extern int GetShortPathName([MarshalAs(UnmanagedType.LPWStr)] string path, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder shortPath, int shortPathLength);
 
 		[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
 		private static extern int GetLongPathName([MarshalAs(UnmanagedType.LPWStr)] string lpszShortPath, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder lpszLongPath, int cchBuffer);
+
 	}
 }

Source/FileManager/ReplacementCharacters.cs

@@ -7,14 +7,14 @@ using System.Linq;
 
 namespace FileManager
 {
-	public class Replacement
+	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 ReplacementString { get; set; }
 		[JsonProperty] public string Description { get; private set; }
 		public override string ToString() => $"{CharacterToReplace} → {ReplacementString} ({Description})";
 
@@ -30,6 +30,8 @@ namespace FileManager
 			Mandatory = mandatory;
 		}
 
+		public object Clone() => new Replacement(CharacterToReplace, ReplacementString, Description, Mandatory);
+
 		public void Update(char charToReplace, string replacementString, string description)
 		{
 			ReplacementString = replacementString;
@@ -53,6 +55,7 @@ namespace FileManager
 		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))]
@@ -133,19 +136,21 @@ namespace FileManager
 		{
 			if (toReplace == Replacement.QUOTE_MARK)
 			{
-				if (preceding == default ||
-						(preceding != default
-						&& !char.IsLetter(preceding)
-						&& !char.IsNumber(preceding)
-						&& (char.IsLetter(succeding) || char.IsNumber(succeding))
+				if (
+					preceding == default ||
+						(
+							!char.IsLetter(preceding) &&
+							!char.IsNumber(preceding) &&
+							(char.IsLetter(succeding) || char.IsNumber(succeding))
 						)
 					)
 					return OpenQuote;
-				else if (succeding == default ||
-							(succeding != default
-							&& !char.IsLetter(succeding)
-							&& !char.IsNumber(succeding)
-							&& (char.IsLetter(preceding) || char.IsNumber(preceding))
+				else if (
+						succeding == default ||
+							(
+								!char.IsLetter(succeding) &&
+								!char.IsNumber(succeding) &&
+								(char.IsLetter(preceding) || char.IsNumber(preceding))
 							)
 						)
 					return CloseQuote;
@@ -163,8 +168,10 @@ namespace FileManager
 		}
 
 
-		public static bool ContainsInvalid(string path)
+		public static bool ContainsInvalidPathChar(string path)
 			=> path.Any(c => invalidChars.Contains(c));
+		public static bool ContainsInvalidFilenameChar(string path)
+			=> path.Any(c => invalidChars.Concat(new char[] { '\\', '/' }).Contains(c));
 
 		public string ReplaceInvalidFilenameChars(string fileName)
 		{
@@ -241,7 +248,7 @@ namespace FileManager
 				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.Any(r => ReplacementCharacters.ContainsInvalidPathChar(r.ReplacementString))
 				)
 			{
 				dict = ReplacementCharacters.Default.Replacements;

Source/Hangover/Hangover.csproj

@@ -6,13 +6,23 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>
-
+	<IsPublishable>true</IsPublishable>
     <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 +34,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,10 +49,17 @@
     <ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
     <Compile Update="Form1.*.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
   </ItemGroup>
 
+	<Target Name="SpicNSpan"  AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
 </Project>

Source/Hangover/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -0,0 +1,17 @@
+<?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>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+	  <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/HangoverAvalonia/App.axaml

@@ -0,0 +1,12 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:HangoverAvalonia"
+             x:Class="HangoverAvalonia.App">
+    <Application.DataTemplates>
+        <local:ViewLocator/>
+    </Application.DataTemplates>
+
+    <Application.Styles>
+        <FluentTheme Mode="Light"/>
+    </Application.Styles>
+</Application>

Source/HangoverAvalonia/App.axaml.cs

@@ -0,0 +1,29 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using HangoverAvalonia.ViewModels;
+using HangoverAvalonia.Views;
+
+namespace HangoverAvalonia
+{
+	public partial class App : Application
+	{
+		public override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				desktop.MainWindow = new MainWindow
+				{
+					DataContext = new MainWindowViewModel(),
+				};
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+	}
+}

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -0,0 +1,77 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
+		<TrimMode>copyused</TrimMode>
+		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+		<IsPublishable>true</IsPublishable>
+		<AssemblyName>Hangover</AssemblyName>
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+		<StartupObject />
+		<IsPublishable>true</IsPublishable>
+
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+
+		<ApplicationIcon>hangover.ico</ApplicationIcon>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<OutputPath>..\bin\Avalonia\Debug</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\bin\Avalonia\Release</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<AvaloniaResource Include="Assets\**" />
+		<AvaloniaXaml Remove="Models\**" />
+		<Compile Remove="Models\**" />
+		<EmbeddedResource Remove="Models\**" />
+		<None Remove="Models\**" />
+		<None Remove=".gitignore" />
+		<None Remove="Assets\hangover.ico" />
+		<None Remove="hangover.ico" />
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<AvaloniaResource Include="hangover.ico" />
+	</ItemGroup>
+	<ItemGroup>
+		<!--This helps with theme dll-s trimming.
+	If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
+	https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
+		<TrimmableAssembly Include="Avalonia.Themes.Fluent" />
+		<TrimmableAssembly Include="Avalonia.Themes.Default" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Avalonia" Version="0.10.17" />
+		<PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+		<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+	</ItemGroup>
+
+
+	<Target Name="SpicNSpan" AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
+</Project>

Source/HangoverAvalonia/Program.cs

@@ -0,0 +1,24 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.ReactiveUI;
+using System;
+
+namespace HangoverAvalonia
+{
+	internal class Program
+	{
+		// Initialization code. Don't use any Avalonia, third-party APIs or any
+		// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+		// yet and stuff might break.
+		[STAThread]
+		public static void Main(string[] args) => BuildAvaloniaApp()
+			.StartWithClassicDesktopLifetime(args);
+
+		// Avalonia configuration, don't remove; also used by visual designer.
+		public static AppBuilder BuildAvaloniaApp()
+			=> AppBuilder.Configure<App>()
+				.UsePlatformDetect()
+				.LogToTrace()
+				.UseReactiveUI();
+	}
+}

Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -0,0 +1,17 @@
+<?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\Release\linux-chardonnay</PublishDir>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<TargetFramework>net6.0</TargetFramework>
+		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>false</PublishSingleFile>
+		<PublishTrimmed>false</PublishTrimmed>
+	</PropertyGroup>
+</Project>

Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -0,0 +1,17 @@
+<?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\Release\macos-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+	  <SelfContained>true</SelfContained>
+	  <PublishSingleFile>false</PublishSingleFile>
+	  <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -0,0 +1,17 @@
+<?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\Release\win-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>

Source/HangoverAvalonia/ViewLocator.cs

@@ -0,0 +1,30 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using HangoverAvalonia.ViewModels;
+using System;
+
+namespace HangoverAvalonia
+{
+	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/HangoverAvalonia/ViewModels/MainWindowViewModel.cs

@@ -0,0 +1,150 @@
+using ApplicationServices;
+using AppScaffolding;
+using Microsoft.EntityFrameworkCore;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace HangoverAvalonia.ViewModels
+{
+	public class MainWindowViewModel : ViewModelBase
+    {
+        private string dbFile;
+        private string _databaseFileText;
+        private bool _databaseFound;
+        private string _sqlResults;
+        public string DatabaseFileText { get => _databaseFileText; set => this.RaiseAndSetIfChanged(ref _databaseFileText, value); }
+        public string SqlQuery { get; set; }
+        public bool DatabaseFound { get => _databaseFound; set => this.RaiseAndSetIfChanged(ref _databaseFound, value); }
+        public string SqlResults { get => _sqlResults; set => this.RaiseAndSetIfChanged(ref _sqlResults, value); }
+
+        public MainWindowViewModel()
+        {
+            dbFile = UNSAFE_MigrationHelper.DatabaseFile;
+            if (dbFile is null)
+            {
+                DatabaseFileText = $"Database file not found";
+                DatabaseFound = false;
+                return;
+            }
+
+            DatabaseFileText = $"Database file: {UNSAFE_MigrationHelper.DatabaseFile ?? "not found"}";
+
+            DatabaseFound = UNSAFE_MigrationHelper.DatabaseFile is not null;
+        }
+
+        public void ExecuteQuery()
+        {
+            ensureBackup();
+
+            SqlResults = string.Empty;
+
+            try
+            {
+                var sql = SqlQuery.Trim();
+
+                #region // explanation
+                // Routing statements to non-query is a convenience.
+                // I went down the rabbit hole of full parsing and it's more trouble than it's worth. The parsing is easy due to available libraries. The edge cases of what to do next got too complex for slight gains.
+                // It's also not useful to take the extra effort to separate non-queries which don't return a row count. Eg: alter table, drop table
+                // My half-assed solution here won't even catch simple mistakes like this -- and that's ok
+                //   -- line 1 is a comment
+                //   delete from foo
+                #endregion
+                var lower = sql.ToLower();
+                if (lower.StartsWith("update") || lower.StartsWith("insert") || lower.StartsWith("delete"))
+                    nonQuery(sql);
+                else
+                    query(sql);
+            }
+            catch (Exception ex)
+            {
+                SqlResults = $"{ex.Message}\r\n{ex.StackTrace}";
+            }
+            finally
+            {
+                deleteUnneededBackups();
+            }
+        }
+
+        private string dbBackup;
+        private DateTime dbFileLastModified;
+
+        private void ensureBackup()
+        {
+            if (dbBackup is not null)
+                return;
+
+            dbFileLastModified = File.GetLastWriteTimeUtc(dbFile);
+
+            dbBackup
+                = Path.ChangeExtension(dbFile, "").TrimEnd('.')
+                + $"_backup_{DateTime.UtcNow:O}".Replace(':', '-').Replace('.', '-')
+                + Path.GetExtension(dbFile);
+            File.Copy(dbFile, dbBackup);
+        }
+
+        private void deleteUnneededBackups()
+        {
+            var newLastModified = File.GetLastWriteTimeUtc(dbFile);
+            if (dbFileLastModified == newLastModified)
+            {
+                File.Delete(dbBackup);
+                dbBackup = null;
+            }
+        }
+
+        void query(string sql)
+        {
+            // ef doesn't support truly generic queries. have to drop down to ado.net
+            using var context = DbContexts.GetContext();
+            using var conn = context.Database.GetDbConnection();
+            conn.Open();
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = sql;
+
+            var reader = cmd.ExecuteReader();
+            var results = 0;
+            var builder = new StringBuilder();
+            var lines = 0;
+            while (reader.Read())
+            {
+                results++;
+
+                for (var i = 0; i < reader.FieldCount; i++)
+                    builder.Append(reader.GetValue(i) + "\t");
+                builder.AppendLine();
+
+                lines++;
+                if (lines % 10 == 0)
+                {
+                    SqlResults += builder.ToString();
+                    builder.Clear();
+                }
+            }
+
+            SqlResults += builder.ToString();
+            builder.Clear();
+
+            if (results == 0)
+                SqlResults = "[no results]";
+            else
+            {
+                SqlResults += $"\r\n{results} result";
+                if (results != 1) SqlResults += "s";
+            }
+        }
+
+        void nonQuery(string sql)
+        {
+            using var context = DbContexts.GetContext();
+            var results = context.Database.ExecuteSqlRaw(sql);
+
+            SqlResults += $"{results} record";
+            if (results != 1) SqlResults += "s";
+            SqlResults += " affected";
+        }
+    }
+}

Source/HangoverAvalonia/ViewModels/ViewModelBase.cs

@@ -0,0 +1,11 @@
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace HangoverAvalonia.ViewModels
+{
+	public class ViewModelBase : ReactiveObject
+	{
+	}
+}

Source/HangoverAvalonia/Views/MainWindow.axaml

@@ -0,0 +1,75 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:HangoverAvalonia.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
+		Width="800" Height="500"
+        x:Class="HangoverAvalonia.Views.MainWindow"
+        Icon="/Assets/hangover.ico "
+        Title="Hangover: Libation debug and recovery tool">
+
+	<Design.DataContext>
+		<vm:MainWindowViewModel/>
+	</Design.DataContext>
+	
+	<TabControl Grid.Row="0">
+		<TabControl.Styles>
+			<Style Selector="ItemsPresenter#PART_ItemsPresenter">
+				<Setter Property="Height" Value="18"/>
+			</Style>
+			<Style Selector="TabItem">
+				<Setter Property="MinHeight" Value="30"/>
+				<Setter Property="Height" Value="30"/>
+				<Setter Property="Padding" Value="8,2,8,0"/>
+			</Style>
+			<Style Selector="TabItem#Header TextBlock">
+				<Setter Property="MinHeight" Value="5"/>
+			</Style>
+		</TabControl.Styles>
+		
+		<!-- Database Tab -->
+		<TabItem>
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Database</TextBlock>
+			</TabItem.Header>
+
+			<Grid RowDefinitions="Auto,Auto,*,Auto,2*">
+				
+				<TextBlock
+					Margin="0,10,0,5"
+					Grid.Row="0"
+					Text="{Binding DatabaseFileText}" />
+				
+				<TextBlock
+					Margin="0,5,0,5"
+					Grid.Row="1"
+					Text="SQL (database command)" />
+				
+				<TextBox
+					Margin="0,5,0,5"
+					Grid.Row="2" Text="{Binding SqlQuery, Mode=OneWayToSource}" />
+				
+				<Button
+					Grid.Row="3"
+					Padding="20,5,20,5"
+					Content="Execute"
+					IsEnabled="{Binding DatabaseFound}"
+					Click="Execute_Click" />
+				
+				<TextBox
+					Margin="0,5,0,10"
+					IsReadOnly="True"
+					Grid.Row="4"
+					Text="{Binding SqlResults}" />
+			</Grid>
+			
+		</TabItem>
+		<!-- Command Line Interface Tab -->
+		<TabItem>
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Command Line Interface</TextBlock>
+			</TabItem.Header>			
+		</TabItem>
+	</TabControl>
+</Window>

Source/HangoverAvalonia/Views/MainWindow.axaml.cs

@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using HangoverAvalonia.ViewModels;
+
+namespace HangoverAvalonia.Views
+{
+	public partial class MainWindow : Window
+	{
+		MainWindowViewModel _viewModel => DataContext as MainWindowViewModel;
+		public MainWindow()
+		{
+			InitializeComponent();
+		}
+
+		public void Execute_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			_viewModel.ExecuteQuery();
+		}
+	}
+}

Source/Libation.sln

@@ -66,6 +66,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangover", "Hangover\Hangover.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationAvalonia", "LibationAvalonia\LibationAvalonia.csproj", "{F612D06F-3134-4B9B-95CD-EB3FC798AE60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverAvalonia", "HangoverAvalonia\HangoverAvalonia.csproj", "{8A7B01D3-9830-44FD-91A1-D8D010996BEB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -144,6 +148,14 @@ Global
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -167,6 +179,8 @@ Global
 		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}

Source/LibationAvalonia/App.axaml

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

Source/LibationAvalonia/App.axaml.cs

@@ -0,0 +1,265 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using LibationFileManager;
+using LibationAvalonia.Views;
+using System;
+using Avalonia.Platform;
+using LibationAvalonia.Dialogs;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.IO;
+using ApplicationServices;
+using Dinah.Core;
+
+namespace LibationAvalonia
+{
+	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 static IAssetLoader AssetLoader { get; private set; }
+
+		public static readonly Uri AssetUriBase = new("avares://Libation/Assets/");
+		public static Stream OpenAsset(string assetRelativePath)
+			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
+
+
+		public static bool GoToFile(string path)
+			=> AppScaffolding.LibationScaffolding.IsWindows ? Go.To.File(path)
+			: GoToFolder(path is null ? string.Empty : Path.GetDirectoryName(path));
+
+		public static bool GoToFolder(string path)
+		{
+			if (AppScaffolding.LibationScaffolding.IsWindows)
+				return Go.To.Folder(path);
+			else if (AppScaffolding.LibationScaffolding.IsLinux)
+			{
+				var startInfo = new System.Diagnostics.ProcessStartInfo()
+				{
+					FileName = "/bin/xdg-open",
+					Arguments = path is null ? string.Empty : $"\"{path}\"",
+					UseShellExecute = false, //Import in Linux environments
+					CreateNoWindow = false,
+					RedirectStandardOutput = true,
+					RedirectStandardError = true
+				};
+				System.Diagnostics.Process.Start(startInfo);
+				return true;
+			}
+			//Don't know how to do this for mac yet
+			else return true;
+		}
+
+		public override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+			AssetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+		}
+
+		public static Task<List<DataLayer.LibraryBook>> LibraryTask;
+		public static bool SetupRequired;
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			LoadStyles();
+
+			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
+			var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI);
+
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				if (SetupRequired)
+				{
+					var config = Configuration.Instance;
+
+					var defaultLibationFilesDir = Configuration.UserProfile;
+
+					// check for existing settings in default location
+					var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
+					if (Configuration.SettingsFileIsValid(defaultSettingsFile))
+						config.SetLibationFiles(defaultLibationFilesDir);
+
+					if (config.LibationSettingsAreValid)
+					{
+						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+						ShowMainWindow(desktop);
+					}
+					else
+					{
+						var setupDialog = new SetupDialog { Config = config };
+						setupDialog.Closing += Setup_Closing;
+						desktop.MainWindow = setupDialog;
+					}
+				}
+				else
+					ShowMainWindow(desktop);
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+
+		private async void Setup_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			var setupDialog = sender as SetupDialog;
+			var desktop = ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+
+			try
+			{
+				// all returns should be preceded by either:
+				// - if config.LibationSettingsAreValid
+				// - error message, Exit()
+				if (setupDialog.IsNewUser)
+				{
+					setupDialog.Config.SetLibationFiles(Configuration.UserProfile);
+					ShowSettingsWindow(desktop, setupDialog.Config, OnSettingsCompleted);
+				}
+				else if (setupDialog.IsReturningUser)
+				{
+					ShowLibationFilesDialog(desktop, setupDialog.Config, OnLibationFilesCompleted);
+				}
+				else
+				{
+					await CancelInstallation();
+					return;
+				}
+
+			}
+			catch (Exception ex)
+			{
+				var title = "Fatal error, pre-logging";
+				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
+				try
+				{
+					await MessageBox.ShowAdminAlert(null, body, title, ex);
+				}
+				catch
+				{
+					await MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+				return;
+			}
+		}
+
+		private async Task RunMigrationsAsync(Configuration config)
+		{
+			// most migrations go in here
+			AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
+
+			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+
+			// logging is init'd here
+			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+		}
+
+		private void ShowSettingsWindow(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, SettingsDialog, Configuration> OnClose)
+		{
+			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
+
+			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
+
+			var settingsDialog = new SettingsDialog();
+			desktop.MainWindow = settingsDialog;
+			settingsDialog.RestoreSizeAndLocation(Configuration.Instance);
+			settingsDialog.Show();
+
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			{
+				settingsDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, settingsDialog, config);
+			}
+			settingsDialog.Closing += WindowClosing;
+		}
+
+		private async void OnSettingsCompleted(IClassicDesktopStyleApplicationLifetime desktop, SettingsDialog settingsDialog, Configuration config)
+		{
+			if (config.LibationSettingsAreValid)
+			{
+				await RunMigrationsAsync(config);
+				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+				ShowMainWindow(desktop);
+			}
+			else
+				await CancelInstallation();
+
+			settingsDialog.Close();
+		}
+
+
+		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)
+		{
+			var libationFilesDialog = new LibationFilesDialog();
+			desktop.MainWindow = libationFilesDialog;
+			libationFilesDialog.Show();
+
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			{
+				libationFilesDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, libationFilesDialog, config);
+			}
+			libationFilesDialog.Closing += WindowClosing;
+		}
+
+		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
+		{
+			config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+			if (config.LibationSettingsAreValid)
+			{
+				await RunMigrationsAsync(config);
+
+				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+				ShowMainWindow(desktop);
+			}
+			else
+			{
+				// path did not result in valid settings
+				var continueResult = await MessageBox.Show(
+					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
+					"New install?",
+					MessageBoxButtons.YesNo,
+					MessageBoxIcon.Question);
+
+				if (continueResult == DialogResult.Yes)
+					ShowSettingsWindow(desktop, config, OnSettingsCompleted);
+				else
+					await CancelInstallation();
+
+			}
+			libationFilesDialog.Close();
+		}
+
+		static async Task CancelInstallation()
+		{
+			await MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			Environment.Exit(0);
+		}
+
+		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
+		{
+			var mainWindow = new MainWindow();
+			desktop.MainWindow = mainWindow;
+			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
+			mainWindow.OnLoad();
+			mainWindow.OnLibraryLoaded(LibraryTask.GetAwaiter().GetResult());
+			mainWindow.Show();
+		}
+
+		private static void LoadStyles()
+		{
+			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookFailedBrush");
+			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCompletedBrush");
+			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCancelledBrush");
+			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
+			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
+		}
+	}
+}

Source/LibationAvalonia/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/LibationAvalonia/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>