incr ver

Fixes and Improvements

.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

@@ -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/.config/dotnet-tools.json

@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "frogvall.dotnetbumpversion": {
-      "version": "3.0.1",
-      "commands": [
-        "bump-version"
-      ]
-    }
-  }
-}

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -1,13 +1,9 @@
 <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>
@@ -16,6 +12,9 @@
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="AAXClean.Codecs" Version="0.2.12" />
+	</ItemGroup>
 
 	<ItemGroup>
     <ProjectReference Include="..\FileManager\FileManager.csproj" />

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Version>8.1.7.1</Version>
+    <TargetFramework>net6.0</TargetFramework>
+    <Version>8.3.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <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>
+
+	<PropertyGroup>
+		<DefineConstants Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' ">$(DefineConstants);WINDOWS</DefineConstants>
+		<DefineConstants Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' ">$(DefineConstants);LINUX</DefineConstants>
+		<DefineConstants Condition=" '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' ">$(DefineConstants);MACOS</DefineConstants>
+	</PropertyGroup>
+	
+  <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,23 @@ using Serilog;
 
 namespace AppScaffolding
 {
+
+	public enum ReleaseIdentifier
+	{
+		None,
+		WindowsClassic,
+		WindowsAvalonia,
+		LinuxAvalonia,
+		MacOSAvalonia
+	}
+
 	public static class LibationScaffolding
 	{
+		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 +81,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 +106,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 +290,23 @@ namespace AppScaffolding
 			if (System.Diagnostics.Debugger.IsAttached)
 				mode += " (Debugger attached)";
 
+#if MACOS
+			var os = "MacOS";
+#elif LINUX
+			var os = "Linux";
+#else
+			var os = "Windows";
+#endif
+
+
 			// 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 +315,7 @@ namespace AppScaffolding
 				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
 				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
 
+				config.BetaOptIn,
 				config.LibationFiles,
 				AudibleFileStorage.BooksDirectory,
 
@@ -308,8 +338,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 +352,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 +364,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 +378,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 +452,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/ApplicationServices/ApplicationServices.csproj

@@ -1,11 +1,11 @@
 <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>
 

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>();

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="4.3.1.1" />
+    <PackageReference Include="AudibleApi" Version="4.6.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -11,12 +11,12 @@
   
   <ItemGroup>
     <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
+    <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>

Source/DataLayer/EfClasses/AudioFormat.cs

@@ -17,7 +17,6 @@ namespace DataLayer
 
     public class AudioFormat : IComparable<AudioFormat>, IComparable
     {
-
         internal int AudioFormatID { get; private set; }
         public int Bitrate { get; private init; }
         public int SampleRate { get; private init; }

Source/DtoImporterService/DtoImporterService.csproj

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

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>

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

@@ -14,7 +14,7 @@ namespace FileManager
 		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})";
 
@@ -168,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)
 		{
@@ -246,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,6 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>hangover.ico</ApplicationIcon>
     <ImplicitUsings>enable</ImplicitUsings>
+	<IsPublishable>true</IsPublishable>
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -54,4 +55,11 @@
     </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

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
+	  <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>

Source/Libation.sln

@@ -66,6 +66,8 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -144,6 +146,10 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -167,6 +173,7 @@ 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}
 	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,236 @@
+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 readonly bool IsWindows;
+		public static readonly bool IsLinux;
+		public static readonly bool IsMacOs;
+		static App()
+		{
+			IsWindows = OperatingSystem.IsWindows();
+			IsLinux = OperatingSystem.IsLinux();
+			IsMacOs = OperatingSystem.IsMacOS();
+		}
+
+		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)
+			=> IsWindows ? Go.To.File(path)
+			: GoToFolder(path is null ? string.Empty : Path.GetDirectoryName(path));
+
+		public static bool GoToFolder(string path)
+		{
+			if (IsWindows)
+				return Go.To.Folder(path);
+			else if (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.IsReturningUser) ||
+					!await RunInstall(setupDialog))
+				{
+					await CancelInstallation();
+					return;
+				}
+
+
+				// most migrations go in here
+				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(setupDialog.Config);
+
+				await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+
+#if !DEBUG
+				//AutoUpdater.NET only works for WinForms or WPF application projects.
+				//checkForUpdate();
+#endif
+				// logging is init'd here
+				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(setupDialog.Config);
+
+			}
+			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;
+			}
+
+			LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+			AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+			ShowMainWindow(desktop);
+		}
+
+		private static async Task<bool> RunInstall(SetupDialog setupDialog)
+		{
+			var config = setupDialog.Config;
+
+			if (setupDialog.IsNewUser)
+			{
+				config.SetLibationFiles(Configuration.UserProfile);
+			}
+			else if (setupDialog.IsReturningUser)
+			{
+
+				var libationFilesDialog = new LibationFilesDialog();
+
+				if (await libationFilesDialog.ShowDialog<DialogResult>(setupDialog) != DialogResult.OK)
+					return false;
+
+				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+				if (config.LibationSettingsAreValid)
+					return true;
+
+				// 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)
+					return false;
+			}
+
+			// INIT DEFAULT SETTINGS
+			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
+			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
+
+			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
+			return await new SettingsDialog().ShowDialog<DialogResult>(setupDialog) == DialogResult.OK
+				&& config.LibationSettingsAreValid;
+		}
+
+		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>

Source/LibationAvalonia/AvaloniaUtils.cs

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

Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml

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

Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs

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

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml

@@ -0,0 +1,33 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="LibationAvalonia.Controls.DirectoryOrCustomSelectControl">
+	<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
+	<controls:DirectorySelectControl
+		Grid.Column="1"
+		Grid.Row="0"
+		Name="directorySelectControl"
+		SubDirectory="{Binding $parent.SubDirectory}"
+		KnownDirectories="{Binding $parent.KnownDirectories}" />
+
+		<RadioButton
+			Grid.Column="0"
+			Grid.Row="0"
+			Name="knownDirRadio"
+			IsChecked="{Binding KnownChecked, Mode=TwoWay}" />
+
+		<RadioButton
+			Grid.Column="0"
+			Grid.Row="1"
+			Name="customDirRadio"
+			IsChecked="{Binding CustomChecked, Mode=TwoWay}" />
+
+		<Grid Grid.Column="1" Grid.Row="1" ColumnDefinitions="*,Auto">
+			<TextBox IsEnabled="{Binding CustomChecked}" Name="customDirTbox" Grid.Column="0" IsReadOnly="True" Text="{Binding CustomDir, Mode=TwoWay}" />
+			<Button Name="customDirBrowseBtn" Grid.Column="1" Content="..." Margin="5,0,0,0" Padding="10,0,10,0" VerticalAlignment="Stretch" />
+		</Grid>
+	</Grid>
+</UserControl>

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -0,0 +1,179 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Dinah.Core;
+using LibationFileManager;
+using System.Collections.Generic;
+using ReactiveUI;
+
+namespace LibationAvalonia.Controls
+{
+	public partial class DirectoryOrCustomSelectControl : UserControl
+	{
+		public static readonly StyledProperty<List<Configuration.KnownDirectories>> KnownDirectoriesProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, List<Configuration.KnownDirectories>>(nameof(KnownDirectories), DirectorySelectControl.DefaultKnownDirectories);
+
+		public static readonly StyledProperty<string> SubDirectoryProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, string>(nameof(SubDirectory));
+
+
+		public static readonly StyledProperty<string> DirectoryProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, string>(nameof(Directory));
+
+		public List<Configuration.KnownDirectories> KnownDirectories
+		{
+			get => GetValue(KnownDirectoriesProperty);
+			set => SetValue(KnownDirectoriesProperty, value);
+		}
+
+		public string Directory
+		{
+			get => GetValue(DirectoryProperty);
+			set => SetValue(DirectoryProperty, value);
+		}
+
+		public string SubDirectory
+		{
+			get => GetValue(SubDirectoryProperty);
+			set => SetValue(SubDirectoryProperty, value);
+		}
+		CustomState customStates = new();
+
+		public DirectoryOrCustomSelectControl()
+		{
+			InitializeComponent();
+
+			customDirBrowseBtn = this.Find<Button>(nameof(customDirBrowseBtn));
+			directorySelectControl = this.Find<DirectorySelectControl>(nameof(directorySelectControl));
+
+			this.Find<TextBox>(nameof(customDirTbox)).DataContext = customStates;
+			this.Find<RadioButton>(nameof(knownDirRadio)).DataContext = customStates;
+			this.Find<RadioButton>(nameof(customDirRadio)).DataContext = customStates;
+
+			customStates.PropertyChanged += CheckStates_PropertyChanged;
+			customDirBrowseBtn.Click += CustomDirBrowseBtn_Click;
+			PropertyChanged += DirectoryOrCustomSelectControl_PropertyChanged;
+			directorySelectControl.PropertyChanged += DirectorySelectControl_PropertyChanged;
+		}
+
+		private class CustomState: ViewModels.ViewModelBase
+		{
+			private string _customDir;
+			private bool _knownChecked;
+			private bool _customChecked;
+			public string CustomDir { get=> _customDir; set => this.RaiseAndSetIfChanged(ref _customDir, value); }
+			public bool KnownChecked
+			{
+				get => _knownChecked;
+				set
+				{
+					this.RaiseAndSetIfChanged(ref _knownChecked, value);
+					if (value)
+						CustomChecked = false;
+					else if (!CustomChecked)
+						CustomChecked = true;
+				}
+			}
+			public bool CustomChecked
+			{
+				get => _customChecked;
+				set
+				{
+					this.RaiseAndSetIfChanged(ref _customChecked, value);
+					if (value)
+						KnownChecked = false;
+					else if (!KnownChecked)
+						KnownChecked = true;
+				}
+			}
+		}
+
+		private async void CustomDirBrowseBtn_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			OpenFolderDialog ofd = new();
+			customStates.CustomDir = await ofd.ShowAsync(VisualRoot as Window);
+		}
+
+		private void CheckStates_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName != nameof(CustomState.CustomDir))
+			{
+				directorySelectControl.IsEnabled = !customStates.CustomChecked;
+				customDirBrowseBtn.IsEnabled = customStates.CustomChecked;
+			}
+
+			setDirectory();
+		}
+
+
+		private void DirectorySelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+		{
+			if (e.Property.Name == nameof(DirectorySelectControl.SelectedDirectory))
+			{
+				setDirectory();
+			}
+		}
+
+		private void setDirectory()
+		{
+			var selectedDir
+				= customStates.CustomChecked ? customStates.CustomDir
+					: directorySelectControl.SelectedDirectory is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute
+					: Configuration.GetKnownDirectoryPath(directorySelectControl.SelectedDirectory);
+			selectedDir ??= string.Empty;
+
+			Directory = customStates.CustomChecked ? selectedDir : System.IO.Path.Combine(selectedDir, SubDirectory);
+		}
+
+
+		private void DirectoryOrCustomSelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+		{
+			if (e.Property.Name == nameof(Directory) && e.OldValue is null)
+			{
+				var directory = Directory?.Trim() ?? "";
+
+				var noSubDir = RemoveSubDirectoryFromPath(directory);
+				var known = Configuration.GetKnownDirectory(noSubDir);
+
+				if (known == Configuration.KnownDirectories.None && noSubDir == Configuration.AppDir_Absolute)
+					known = Configuration.KnownDirectories.AppDir;				
+
+				if (known is Configuration.KnownDirectories.None)
+				{
+					customStates.CustomChecked = true;
+					customStates.CustomDir = directory;
+				}
+				else
+				{
+					customStates.KnownChecked = true;
+					directorySelectControl.SelectedDirectory = known;
+				}
+			}
+			else if (e.Property.Name == nameof(KnownDirectories))
+				directorySelectControl.KnownDirectories = KnownDirectories;
+			else if (e.Property.Name == nameof(SubDirectory))
+				directorySelectControl.SubDirectory = SubDirectory;
+		}
+
+		private string RemoveSubDirectoryFromPath(string path)
+		{
+			if (string.IsNullOrWhiteSpace(SubDirectory))
+				return path;
+
+			path = path?.Trim() ?? "";
+			if (string.IsNullOrWhiteSpace(path))
+				return path;
+
+			var bottomDir = System.IO.Path.GetFileName(path);
+			if (SubDirectory.EqualsInsensitive(bottomDir))
+				return System.IO.Path.GetDirectoryName(path);
+
+			return path;
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

Source/LibationAvalonia/Controls/DirectorySelectControl.axaml

@@ -0,0 +1,38 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="LibationAvalonia.Controls.DirectorySelectControl">
+	
+	<UserControl.Resources>
+		<controls:KnownDirectoryConverter x:Key="KnownDirectoryConverter" />
+	</UserControl.Resources>
+
+
+	<StackPanel Orientation="Vertical">
+		<StackPanel.Styles>
+			<Style Selector="ItemsPresenter#PART_ItemsPresenter">
+				<Setter Property="Height" Value="NaN"/>
+			</Style>
+		</StackPanel.Styles>
+		<controls:WheelComboBox
+					HorizontalContentAlignment = "Stretch"
+					HorizontalAlignment = "Stretch"
+					MinHeight="{Binding #displayPathTbox.MinHeight}"
+					SelectedItem="{Binding $parent[1].SelectedDirectory, Mode=TwoWay}"
+					Items="{Binding $parent[1].KnownDirectories}">
+			<ComboBox.ItemTemplate>
+				<DataTemplate>
+
+					<TextBlock
+						Text="{Binding, Converter={StaticResource KnownDirectoryConverter}}" />
+
+				</DataTemplate>
+			</ComboBox.ItemTemplate>
+		</controls:WheelComboBox>
+		<TextBox Margin="0,10,0,10" IsReadOnly="True" Name="displayPathTbox" />
+	</StackPanel>
+	
+</UserControl>

Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs

@@ -0,0 +1,99 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Dinah.Core;
+using LibationFileManager;
+using System.Collections.Generic;
+using Avalonia.Data.Converters;
+using System;
+using System.Globalization;
+using Avalonia.Data;
+using System.IO;
+using System.Reactive.Subjects;
+
+namespace LibationAvalonia.Controls
+{
+	public class KnownDirectoryConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is Configuration.KnownDirectories dir)
+				return dir.GetDescription();
+			return new BindingNotification(new InvalidCastException(), BindingErrorType.Error);
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return new BindingNotification(new InvalidCastException(), BindingErrorType.Error);
+		}
+	}
+
+	public partial class DirectorySelectControl : UserControl
+	{
+		public static List<Configuration.KnownDirectories> DefaultKnownDirectories { get; }
+			= new()
+			{
+				Configuration.KnownDirectories.WinTemp,
+				Configuration.KnownDirectories.UserProfile,
+				Configuration.KnownDirectories.AppDir,
+				Configuration.KnownDirectories.MyDocs,
+				Configuration.KnownDirectories.LibationFiles
+			};
+
+		public static readonly StyledProperty<Configuration.KnownDirectories> SelectedDirectoryProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, Configuration.KnownDirectories>(nameof(SelectedDirectory));
+
+		public static readonly StyledProperty<List<Configuration.KnownDirectories>> KnownDirectoriesProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, List<Configuration.KnownDirectories>>(nameof(KnownDirectories), DefaultKnownDirectories);
+
+		public static readonly StyledProperty<string> SubDirectoryProperty =
+		AvaloniaProperty.Register<DirectorySelectControl, string>(nameof(SubDirectory));
+
+		public DirectorySelectControl()
+		{
+			InitializeComponent();
+
+			displayPathTbox = this.Get<TextBox>(nameof(displayPathTbox));
+			displayPathTbox.Bind(TextBox.TextProperty, TextboxPath);
+			PropertyChanged += DirectorySelectControl_PropertyChanged;
+		}
+
+		private Subject<string> TextboxPath = new Subject<string>();
+
+		private void DirectorySelectControl_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
+		{
+			if (e.Property.Name == nameof(SelectedDirectory))
+			{
+				TextboxPath.OnNext(
+					Path.Combine(
+						SelectedDirectory is Configuration.KnownDirectories.None ? string.Empty
+						: SelectedDirectory is Configuration.KnownDirectories.AppDir ? Configuration.AppDir_Absolute
+						: Configuration.GetKnownDirectoryPath(SelectedDirectory)
+						, SubDirectory ?? string.Empty));
+			}
+		}
+
+		public List<Configuration.KnownDirectories> KnownDirectories
+		{
+			get => GetValue(KnownDirectoriesProperty);
+			set => SetValue(KnownDirectoriesProperty, value);
+		}
+
+		public Configuration.KnownDirectories SelectedDirectory
+		{
+			get => GetValue(SelectedDirectoryProperty);
+			set => SetValue(SelectedDirectoryProperty, value);
+		}
+
+		public string SubDirectory
+		{
+			get => GetValue(SubDirectoryProperty);
+			set => SetValue(SubDirectoryProperty, value);
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

Source/LibationAvalonia/Controls/GroupBox.axaml

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

Source/LibationAvalonia/Controls/GroupBox.axaml.cs

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

Source/LibationAvalonia/Controls/LinkLabel.axaml

@@ -0,0 +1,13 @@
+<TextBlock xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="LibationAvalonia.Controls.LinkLabel">
+	<TextBlock.Styles>
+		<Style Selector="TextBlock">
+			<Setter Property="Foreground" Value="Blue"/>
+			<Setter Property="TextDecorations" Value="Underline"/>
+		</Style>
+	</TextBlock.Styles>
+</TextBlock>

Source/LibationAvalonia/Controls/LinkLabel.axaml.cs

@@ -0,0 +1,34 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+using System;
+
+namespace LibationAvalonia.Controls
+{
+	public partial class LinkLabel : TextBlock, IStyleable
+	{
+		Type IStyleable.StyleKey => typeof(TextBlock);
+		private static readonly Cursor HandCursor = new Cursor(StandardCursorType.Hand);
+		public LinkLabel()
+		{
+			InitializeComponent();
+		}
+		protected override void OnPointerEnter(PointerEventArgs e)
+		{
+			this.Cursor = HandCursor;
+			base.OnPointerEnter(e);
+		}
+		protected override void OnPointerLeave(PointerEventArgs e)
+		{
+			this.Cursor = Cursor.Default;
+			base.OnPointerLeave(e);
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

Source/LibationAvalonia/Controls/WheelComboBox.axaml

@@ -0,0 +1,9 @@
+<ComboBox xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="LibationAvalonia.Controls.WheelComboBox">
+	<ComboBox.Styles>
+		<Style Selector="ItemsPresenter#PART_ItemsPresenter">
+			<Setter Property="Height" Value="NaN"/>
+		</Style>
+	</ComboBox.Styles>
+</ComboBox>

Source/LibationAvalonia/Controls/WheelComboBox.axaml.cs

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

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml

@@ -0,0 +1,120 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        Width="800" Height="450"
+        x:Class="LibationAvalonia.Dialogs.AccountsDialog"
+        Title="Audible Accounts"
+		Icon="/Assets/libation.ico">
+	<Grid RowDefinitions="*,Auto">
+
+		<Grid.Styles>
+			<Style Selector="Button:focus">
+				<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
+				<Setter Property="BorderThickness" Value="2" />
+			</Style>
+		</Grid.Styles>
+
+		<DataGrid
+			Grid.Row="0"
+			CanUserReorderColumns="False"
+			CanUserResizeColumns="False"
+			CanUserSortColumns="False"
+			AutoGenerateColumns="False"
+			IsReadOnly="False"
+			Items="{Binding Accounts}"
+			GridLinesVisibility="All">
+
+			<DataGrid.Columns>
+
+				<DataGridTemplateColumn Header="Delete">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+
+							<Button
+								Width="60"
+								Height="30"
+								Content="X"
+								IsEnabled="{Binding !IsDefault}"
+								Click="DeleteButton_Clicked" />
+
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
+
+				<DataGridTemplateColumn Header="Export">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+
+							<Button
+								Width="60"
+								Height="30"
+								Content="Export"
+								IsEnabled="{Binding !IsDefault}"
+								ToolTip.Tip="Export account authorization to audible-cli"
+								Click="ExportButton_Clicked" />
+
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
+
+				<DataGridCheckBoxColumn
+					Binding="{Binding LibraryScan, Mode=TwoWay}"
+					Header="Include in&#xa;library scan?"/>
+
+				<DataGridTextColumn
+					Width="2*"
+					Binding="{Binding AccountId, Mode=TwoWay}"
+					Header="Autible&#xa;email/login"/>
+
+				<DataGridTemplateColumn Width="Auto" Header="Locale">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<ComboBox
+							  MinHeight="30"
+							  HorizontalContentAlignment = "Stretch"
+							  HorizontalAlignment = "Stretch"
+							  SelectedItem="{Binding SelectedLocale, Mode=TwoWay}"
+							  Items="{Binding Locales}">
+
+								<ComboBox.ItemTemplate>
+									<DataTemplate>
+										<TextBlock ZIndex="2"
+											FontSize="12"
+											Text="{Binding Name}" />
+
+									</DataTemplate>
+								</ComboBox.ItemTemplate>
+							</ComboBox>
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
+
+				<DataGridTextColumn
+					Width="3*"
+					Binding="{Binding AccountName, Mode=TwoWay}"
+					Header="Account Nickname&#xa;(optional)"/>
+
+			</DataGrid.Columns>
+		</DataGrid>
+		<Grid
+			Grid.Row="1"
+			Margin="10"
+			ColumnDefinitions="*,Auto" >
+
+			<Button
+				Grid.Column="0"
+				Height="30"
+				Content="Import from audible-cli"
+				Click="ImportButton_Clicked" />
+
+			<Button
+				Grid.Column="1"
+				Height="30"
+				Padding="30,3,30,3"
+				Content="Save"
+				Click="SaveButton_Clicked" />
+		</Grid>
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs

@@ -0,0 +1,297 @@
+using AudibleUtilities;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using ReactiveUI;
+using AudibleApi;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class AccountsDialog : DialogWindow
+	{
+		public ObservableCollection<AccountDto> Accounts { get; } = new();
+		public class AccountDto : ViewModels.ViewModelBase
+		{
+			private string _accountId;
+			private Locale _selectedLocale;
+			public IReadOnlyList<Locale> Locales => AccountsDialog.Locales;
+			public bool LibraryScan { get; set; } = true;
+			public string AccountId
+			{
+				get => _accountId;
+				set
+				{
+					this.RaiseAndSetIfChanged(ref _accountId, value);
+					this.RaisePropertyChanged(nameof(IsDefault));
+				} 
+			}
+			public Locale SelectedLocale
+			{
+				get => _selectedLocale;
+				set
+				{
+					this.RaiseAndSetIfChanged(ref _selectedLocale, value);
+					this.RaisePropertyChanged(nameof(IsDefault));
+				}
+			}
+			public string AccountName { get; set; }
+			public bool IsDefault => string.IsNullOrEmpty(AccountId) && SelectedLocale is null;
+		}
+
+		private static string GetAudibleCliAppDataPath()
+			=> Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Audible");
+
+		private static IReadOnlyList<Locale> Locales => Localization.Locales.OrderBy(l => l.Name).ToList();
+		public AccountsDialog()
+		{
+			InitializeComponent();
+
+			// WARNING: accounts persister will write ANY EDIT to object immediately to file
+			// here: copy strings and dispose of persister
+			// only persist in 'save' step
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var accounts = persister.AccountsSettings.Accounts;
+			if (accounts.Any())
+			{
+				foreach (var account in accounts)
+					AddAccountToGrid(account);
+			}
+
+			DataContext = this;
+			addBlankAccount();
+		}
+		private void addBlankAccount()
+		{
+
+			var newBlank = new AccountDto();
+			newBlank.PropertyChanged += AccountDto_PropertyChanged;
+			Accounts.Insert(Accounts.Count, newBlank);
+		}
+
+		private void AddAccountToGrid(Account account)
+		{
+			AccountDto accountDto = new()
+			{
+				LibraryScan = account.LibraryScan,
+				AccountId = account.AccountId,
+				SelectedLocale = Locales.Single(l => l.Name == account.Locale.Name),
+				AccountName = account.AccountName,
+			};
+			accountDto.PropertyChanged += AccountDto_PropertyChanged;
+
+			//ObservableCollection doesn't fire CollectionChanged on Add, so use Insert instead
+			Accounts.Insert(Accounts.Count, accountDto);
+		}
+
+		private void AccountDto_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (Accounts.Any(a => a.IsDefault))
+				return;
+
+			addBlankAccount();
+		}
+
+		public void DeleteButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (e.Source is Button expBtn && expBtn.DataContext is AccountDto acc)
+			{
+				var index = Accounts.IndexOf(acc);
+				if (index < 0) return;
+
+				acc.PropertyChanged -= AccountDto_PropertyChanged;
+				Accounts.Remove(acc);
+			}
+		}
+
+		public async void ImportButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+
+			OpenFileDialog ofd = new();
+			ofd.Filters.Add(new() { Name = "JSON File", Extensions = new() { "json" } });
+			ofd.Directory = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+			ofd.AllowMultiple = false;
+
+			string audibleAppDataDir = GetAudibleCliAppDataPath();
+
+			if (Directory.Exists(audibleAppDataDir))
+				ofd.Directory = audibleAppDataDir;
+
+			var filePath = await ofd.ShowAsync(this);
+
+			if (filePath is null || filePath.Length == 0) return;
+
+			try
+			{
+				var jsonText = File.ReadAllText(filePath[0]);
+				var mkbAuth = Mkb79Auth.FromJson(jsonText);
+				var account = await mkbAuth.ToAccountAsync();
+
+				// without transaction, accounts persister will write ANY EDIT immediately to file
+				using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+				if (persister.AccountsSettings.Accounts.Any(a => a.AccountId == account.AccountId && a.IdentityTokens.Locale.Name == account.Locale.Name))
+				{
+					await MessageBox.Show(this, $"An account with that account id and country already exists.\r\n\r\nAccount ID: {account.AccountId}\r\nCountry: {account.Locale.Name}", "Cannot Add Duplicate Account");
+					return;
+				}
+
+				persister.AccountsSettings.Add(account);
+
+				AddAccountToGrid(account);
+			}
+			catch (Exception ex)
+			{
+				await MessageBox.ShowAdminAlert(
+						this,
+						$"An error occurred while importing an account from:\r\n{filePath[0]}\r\n\r\nIs the file encrypted?",
+						"Error Importing Account",
+						ex);
+			}
+		}
+
+		public void ExportButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (e.Source is Button expBtn && expBtn.DataContext is AccountDto acc)
+				Export(acc);
+		}
+
+		protected override async Task SaveAndCloseAsync()
+		{
+			try
+			{
+				if (!await inputIsValid())
+					return;
+
+				// without transaction, accounts persister will write ANY EDIT immediately to file
+				using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+				persister.BeginTransation();
+				persist(persister.AccountsSettings);
+				persister.CommitTransation();
+
+				base.SaveAndClose();
+			}
+			catch (Exception ex)
+			{
+				await MessageBox.ShowAdminAlert(this, "Error attempting to save accounts", "Error saving accounts", ex);
+			}
+		}
+
+		public async void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> await SaveAndCloseAsync();
+
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		private void persist(AccountsSettings accountsSettings)
+		{
+			var existingAccounts = accountsSettings.Accounts;
+
+			// editing account id is a special case. an account is defined by its account id, therefore this is really a different account. the user won't care about this distinction though.
+			// these will be caught below by normal means and re-created minus the convenience of persisting identity tokens
+
+			// delete
+			for (var i = existingAccounts.Count - 1; i >= 0; i--)
+			{
+				var existing = existingAccounts[i];
+				if (!Accounts.Any(dto =>
+					dto.AccountId?.ToLower().Trim() == existing.AccountId.ToLower()
+					&& dto.SelectedLocale?.Name == existing.Locale?.Name))
+				{
+					accountsSettings.Delete(existing);
+				}
+			}
+
+			// upsert each. validation occurs through Account and AccountsSettings
+			foreach (var dto in Accounts)
+			{
+				var acct = accountsSettings.Upsert(dto.AccountId, dto.SelectedLocale?.Name);
+				acct.LibraryScan = dto.LibraryScan;
+				acct.AccountName
+					= string.IsNullOrWhiteSpace(dto.AccountName)
+					? $"{dto.AccountId} - {dto.SelectedLocale?.Name}"
+					: dto.AccountName.Trim();
+			}
+		}
+		private async Task<bool> inputIsValid()
+		{
+			foreach (var dto in Accounts.ToList())
+			{
+				if (dto.IsDefault)
+				{
+					Accounts.Remove(dto);
+					continue;
+				}
+
+				if (string.IsNullOrWhiteSpace(dto.AccountId))
+				{
+					await MessageBox.Show(this, "Account id cannot be blank. Please enter an account id for all accounts.", "Blank account", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return false;
+				}
+
+				if (string.IsNullOrWhiteSpace(dto.SelectedLocale?.Name))
+				{
+					await MessageBox.Show(this, "Please select a locale (i.e.: country or region) for all accounts.", "Blank region", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		private async void Export(AccountDto acc)
+		{
+			// without transaction, accounts persister will write ANY EDIT immediately to file
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+			var account = persister.AccountsSettings.Accounts.FirstOrDefault(a => a.AccountId == acc.AccountId && a.Locale.Name == acc.SelectedLocale?.Name);
+
+			if (account is null)
+				return;
+
+			if (account.IdentityTokens?.IsValid != true)
+			{
+				await MessageBox.Show(this, "This account hasn't been authenticated yet. First scan your library to log into your account, then try exporting again.", "Account Not Authenticated");
+				return;
+			}
+
+			SaveFileDialog sfd = new();
+			sfd.Filters.Add(new() { Name = "JSON File", Extensions = new() { "json" } });
+
+			string audibleAppDataDir = GetAudibleCliAppDataPath();
+
+			if (Directory.Exists(audibleAppDataDir))
+				sfd.Directory = audibleAppDataDir;
+
+			string fileName = await sfd.ShowAsync(this);
+			if (fileName is null)
+				return;
+
+			try
+			{
+				var mkbAuth = Mkb79Auth.FromAccount(account);
+				var jsonText = mkbAuth.ToJson();
+
+				File.WriteAllText(fileName, jsonText);
+
+				await MessageBox.Show(this, $"Successfully exported {account.AccountName} to\r\n\r\n{fileName}", "Success!");
+			}
+			catch (Exception ex)
+			{
+				await MessageBox.ShowAdminAlert(
+					this,
+					$"An error occurred while exporting account:\r\n{account.AccountName}",
+					"Error Exporting Account",
+					ex);
+			}
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml

@@ -0,0 +1,148 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="550" d:DesignHeight="450"
+		MinWidth="550" MinHeight="450"
+		Width="650" Height="500"
+        x:Class="LibationAvalonia.Dialogs.BookDetailsDialog"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        Title="Book Details" Name="BookDetails"
+		Icon="/Assets/libation.ico">
+
+	<Grid RowDefinitions="*,Auto,Auto,40">
+		<Grid.Styles>
+			<Style Selector="Button:focus">
+				<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
+				<Setter Property="BorderThickness" Value="2" />
+			</Style>
+		</Grid.Styles>
+		<Grid ColumnDefinitions="Auto,*" RowDefinitions="*,Auto" Margin="10,10,10,0">
+			<Panel VerticalAlignment="Top" Margin="5" Background="LightGray" Width="80" Height="80" >
+				<Image Grid.Column="0" Width="80" Height="80" Source="{Binding Cover}" />
+			</Panel>
+
+			<Panel Grid.Column="0" Grid.Row="1">
+
+				<controls:LinkLabel
+					Margin="10"
+					TextWrapping="Wrap"
+					TextAlignment="Center"
+					Tapped="GoToAudible_Tapped"
+					Text="Open in&#xa;Audible&#xa;(Browser)" />
+			</Panel>
+			
+			<TextBox
+				Grid.Column="1"
+				Grid.Row="0"
+				Grid.RowSpan="2"
+				TextWrapping="Wrap"
+				Margin="5"
+				FontSize="12"
+				Text="{Binding DetailsText}" />
+		</Grid>
+		
+		<controls:GroupBox
+			Label="Edit Tags"
+			Grid.Row="1"
+			BorderWidth="1"
+			Margin="10,0,10,0">
+			
+			<StackPanel Orientation="Vertical">
+				<TextBlock FontSize="12" VerticalAlignment="Top">
+					Tags are separated by a space. Each tag can contain letters, numbers, and underscores
+				</TextBlock>
+
+				<TextBox Margin="0,5,0,5"
+					MinHeight="25"
+					FontSize="12" Name="tagsTbox"
+					Text="{Binding Tags, Mode=TwoWay}"/>
+			</StackPanel>
+		</controls:GroupBox>
+		
+		<controls:GroupBox
+			Label="Liberated status: Whether the book/pdf has been downloaded"
+			Grid.Row="2"
+			BorderWidth="1"
+			Margin="10,10,10,10">
+			
+			<StackPanel Orientation="Vertical">
+				
+				<TextBlock
+					FontSize="12"
+					VerticalAlignment="Top"
+					Margin="10,10,0,0"
+					Text="To download again next time: change to Not Downloaded&#xA;To not download: change to Downloaded" />
+
+				<Grid Margin="0,10,0,5" ColumnDefinitions="Auto,Auto,50,Auto,Auto,*">
+					
+					<TextBlock
+						Grid.Column="0"
+						Margin="0,0,10,0"
+						VerticalAlignment="Center"
+						Text="Book" />
+					
+					<TextBlock
+						Grid.Column="3"
+						Margin="0,0,10,0"
+						VerticalAlignment="Center"
+						Text="PDF" />
+
+					<controls:WheelComboBox
+						Grid.Column="1"
+						Width="150"
+						MinHeight="25"
+						Height="25"
+						VerticalAlignment="Center"
+						SelectedItem="{Binding BookLiberatedSelectedItem, Mode=TwoWay}"
+						Items="{Binding BookLiberatedItems}">
+						
+						<ComboBox.ItemTemplate>
+							<DataTemplate>
+								
+								<TextBlock
+									FontSize="12"
+									Text="{Binding Text}" />
+								
+							</DataTemplate>
+						</ComboBox.ItemTemplate>
+						
+					</controls:WheelComboBox>
+					
+					<controls:WheelComboBox
+						IsEnabled="{Binding HasPDF}"
+						Grid.Column="4"
+						MinHeight="25"
+						Height="25"
+						Width="150"
+						VerticalAlignment="Center"
+						SelectedItem="{Binding PdfLiberatedSelectedItem, Mode=TwoWay}"						
+						Items="{Binding PdfLiberatedItems}">
+						
+						<ComboBox.ItemTemplate>
+							<DataTemplate>
+								
+								<TextBlock
+									FontSize="12"
+									Text="{Binding Text}" />
+								
+							</DataTemplate>
+						</ComboBox.ItemTemplate>
+						
+					</controls:WheelComboBox>
+					
+				</Grid>				
+			</StackPanel>			
+		</controls:GroupBox>
+
+		<Grid Grid.Row="3" ColumnDefinitions="*,Auto" Margin="10,0,10,10">
+			
+			<Button
+				Grid.Column="1"
+				Content="Save"
+				Padding="30,3,30,3"
+				Click="SaveButton_Clicked" />
+		</Grid>
+		
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs

@@ -0,0 +1,170 @@
+using ApplicationServices;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media.Imaging;
+using DataLayer;
+using Dinah.Core;
+using LibationFileManager;
+using LibationAvalonia.ViewModels;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class BookDetailsDialog : DialogWindow
+	{
+		private LibraryBook _libraryBook;
+		private BookDetailsDialogViewModel _viewModel;
+		public LibraryBook LibraryBook
+		{
+			get => _libraryBook;
+			set
+			{
+				_libraryBook = value;
+				Title = _libraryBook.Book.Title;
+				DataContext = _viewModel = new BookDetailsDialogViewModel(_libraryBook);
+			}
+		}
+
+		public string NewTags => _viewModel.Tags;
+		public LiberatedStatus BookLiberatedStatus => _viewModel.BookLiberatedSelectedItem.Status;
+		public LiberatedStatus? PdfLiberatedStatus => _viewModel.PdfLiberatedSelectedItem?.Status;
+
+		public BookDetailsDialog()
+		{
+			InitializeComponent();
+			ControlToFocusOnShow = this.Find<TextBox>(nameof(tagsTbox));
+
+			if (Design.IsDesignMode)
+			{
+				using var context = DbContexts.GetContext();
+				LibraryBook = context.GetLibraryBook_Flat_NoTracking("B017V4IM1G");
+			}
+		}
+		public BookDetailsDialog(LibraryBook libraryBook) :this()
+		{
+			LibraryBook = libraryBook;
+		}
+
+		protected override void SaveAndClose()
+		{
+			SaveButton_Clicked(null, null);
+			base.SaveAndClose();
+		}
+
+		public void GoToAudible_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			var locale = AudibleApi.Localization.Get(_libraryBook.Book.Locale);
+			var link = $"https://www.audible.{locale.TopDomain}/pd/{_libraryBook.Book.AudibleProductId}";
+			Go.To.Url(link);
+		}
+
+		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			LibraryBook.Book.UpdateBook(NewTags, bookStatus: BookLiberatedStatus, pdfStatus: PdfLiberatedStatus);
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		private class BookDetailsDialogViewModel : ViewModelBase
+		{
+			public class liberatedComboBoxItem
+			{
+				public LiberatedStatus Status { get; set; }
+				public string Text { get; set; }
+				public override string ToString() => Text;
+			}
+
+			public Bitmap Cover { get; set; }
+			public string DetailsText { get; set; }
+			public string Tags { get; set; }
+
+			public bool HasPDF => PdfLiberatedItems?.Count > 0;
+
+			private liberatedComboBoxItem _bookLiberatedSelectedItem;
+			public ObservableCollection<liberatedComboBoxItem> BookLiberatedItems { get; } = new();
+			public List<liberatedComboBoxItem> PdfLiberatedItems { get; } = new();
+			public liberatedComboBoxItem PdfLiberatedSelectedItem { get; set; }
+
+			public liberatedComboBoxItem BookLiberatedSelectedItem
+			{
+				get => _bookLiberatedSelectedItem;
+				set
+				{
+					_bookLiberatedSelectedItem = value;
+					if (value?.Status is not LiberatedStatus.Error)
+					{
+						BookLiberatedItems.Remove(BookLiberatedItems.SingleOrDefault(s => s.Status == LiberatedStatus.Error));
+					}
+				}
+			}
+
+			public BookDetailsDialogViewModel(LibraryBook libraryBook)
+			{
+				//init tags
+				Tags = libraryBook.Book.UserDefinedItem.Tags;
+
+				//init cover image
+				var picture = PictureStorage.GetPictureSynchronously(new PictureDefinition(libraryBook.Book.PictureId, PictureSize._80x80));
+				using var ms = new System.IO.MemoryStream(picture);
+				Cover = new Bitmap(ms);
+
+				//init book details
+				DetailsText = @$"
+Title: {libraryBook.Book.Title}
+Author(s): {libraryBook.Book.AuthorNames()}
+Narrator(s): {libraryBook.Book.NarratorNames()}
+Length: {(libraryBook.Book.LengthInMinutes == 0 ? "" : $"{libraryBook.Book.LengthInMinutes / 60} hr {libraryBook.Book.LengthInMinutes % 60} min")}
+Audio Bitrate: {libraryBook.Book.AudioFormat}
+Category: {string.Join(" > ", libraryBook.Book.CategoriesNames())}
+Purchase Date: {libraryBook.DateAdded.ToString("d")}
+Audible ID: {libraryBook.Book.AudibleProductId}
+".Trim();
+
+				var seriesNames = libraryBook.Book.SeriesNames();
+				if (!string.IsNullOrWhiteSpace(seriesNames))
+					DetailsText += $"\r\nSeries: {seriesNames}";
+
+				var bookRating = libraryBook.Book.Rating?.ToStarString();
+				if (!string.IsNullOrWhiteSpace(bookRating))
+					DetailsText += $"\r\nBook Rating:\r\n{bookRating}";
+
+				var myRating = libraryBook.Book.UserDefinedItem.Rating?.ToStarString();
+				if (!string.IsNullOrWhiteSpace(myRating))
+					DetailsText += $"\r\nMy Rating:\r\n{myRating}";
+
+
+				//init book status
+				{
+					var status = libraryBook.Book.UserDefinedItem.BookStatus;
+
+					BookLiberatedItems.Add(new() { Status = LiberatedStatus.Liberated, Text = "Downloaded" });
+					BookLiberatedItems.Add(new() { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" });
+
+					if (status == LiberatedStatus.Error)
+						BookLiberatedItems.Add(new() { Status = LiberatedStatus.Error, Text = "Error" });
+
+					BookLiberatedSelectedItem = BookLiberatedItems.SingleOrDefault(s => s.Status == status);
+				}
+
+				//init pdf status
+				{
+					var status = libraryBook.Book.UserDefinedItem.PdfStatus;
+
+					if (status is not null)
+					{
+						PdfLiberatedItems.Add(new() { Status = LiberatedStatus.Liberated, Text = "Downloaded" });
+						PdfLiberatedItems.Add(new() { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" });
+
+						PdfLiberatedSelectedItem = PdfLiberatedItems.SingleOrDefault(s => s.Status == status);
+					}
+				}
+			}
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml

@@ -0,0 +1,19 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="540" d:DesignHeight="140"
+        x:Class="LibationAvalonia.Dialogs.DescriptionDisplayDialog"
+		SystemDecorations="None"
+        Title="DescriptionDisplay">	
+		
+	<TextBox
+		Text="{Binding DescriptionText}"
+		IsReadOnly="True"
+		MinWidth="540"
+		TextWrapping="Wrap"
+		Name="DescriptionTextBox"
+		CaretBrush="{StaticResource SystemControlTransparentBrush}"
+		LostFocus="DescriptionTextBox_LostFocus" />
+	
+</Window>

Source/LibationAvalonia/Dialogs/DescriptionDisplayDialog.axaml.cs

@@ -0,0 +1,62 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class DescriptionDisplayDialog : Window
+	{
+		public Point SpawnLocation { get; set; }
+		public string DescriptionText { get; init; }
+		public DescriptionDisplayDialog()
+		{
+			InitializeComponent();
+#if DEBUG
+			this.AttachDevTools();
+#endif
+			DescriptionTextBox = this.FindControl<TextBox>(nameof(DescriptionTextBox));
+			this.Activated += DescriptionDisplay_Activated;
+			Opened += DescriptionDisplay_Opened;
+		}
+
+		private void DescriptionDisplay_Opened(object sender, EventArgs e)
+		{
+			DescriptionTextBox.Focus();
+		}
+
+		private void DescriptionDisplay_Activated(object sender, EventArgs e)
+		{
+			DataContext = this;
+			var workingHeight = this.Screens.Primary.WorkingArea.Height;
+			DescriptionTextBox.Measure(new Size(DescriptionTextBox.MinWidth, workingHeight * 0.8));
+
+			this.Width = DescriptionTextBox.DesiredSize.Width;
+			this.Height = DescriptionTextBox.DesiredSize.Height;
+			this.MinWidth = this.Width;
+			this.MaxWidth = this.Width;
+			this.MinHeight = this.Height;
+			this.MaxHeight = this.Height;
+
+			DescriptionTextBox.Width = this.Width;
+			DescriptionTextBox.Height = this.Height;
+			DescriptionTextBox.MinWidth = this.Width;
+			DescriptionTextBox.MaxWidth = this.Width;
+			DescriptionTextBox.MinHeight = this.Height;
+			DescriptionTextBox.MaxHeight = this.Height;
+
+			this.Position = new PixelPoint((int)SpawnLocation.X, (int)Math.Min(SpawnLocation.Y, (double)workingHeight - DescriptionTextBox.DesiredSize.Height));
+		}
+
+		private void DescriptionTextBox_LostFocus(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			Close();
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+	}
+}

Source/LibationAvalonia/Dialogs/DialogWindow.cs

@@ -0,0 +1,61 @@
+using Avalonia;
+using Avalonia.Controls;
+using LibationFileManager;
+using System;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs
+{
+	public abstract class DialogWindow : Window
+	{
+		public bool SaveAndRestorePosition { get; set; } = true;
+		public Control ControlToFocusOnShow { get; set; }
+		public DialogWindow()
+		{
+			this.HideMinMaxBtns();
+			this.KeyDown += DialogWindow_KeyDown;
+			this.Initialized += DialogWindow_Initialized;
+			this.Opened += DialogWindow_Opened;
+			this.Closing += DialogWindow_Closing;
+
+#if DEBUG
+			this.AttachDevTools();
+#endif
+		}
+		public DialogWindow(bool saveAndRestorePosition) : this()
+		{
+			SaveAndRestorePosition = saveAndRestorePosition;
+		}
+
+		private void DialogWindow_Initialized(object sender, EventArgs e)
+		{
+			this.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+			if (SaveAndRestorePosition)
+				this.RestoreSizeAndLocation(Configuration.Instance);
+		}
+
+		private void DialogWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			if (SaveAndRestorePosition)
+				this.SaveSizeAndLocation(Configuration.Instance);
+		}
+
+		private void DialogWindow_Opened(object sender, EventArgs e)
+		{
+			ControlToFocusOnShow?.Focus();
+		}
+
+		protected virtual void SaveAndClose() => Close(DialogResult.OK);
+		protected virtual Task SaveAndCloseAsync() => Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(SaveAndClose);
+		protected virtual void CancelAndClose() => Close(DialogResult.Cancel);
+		protected virtual Task CancelAndCloseAsync() => Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(CancelAndClose);
+
+		private async void DialogWindow_KeyDown(object sender, Avalonia.Input.KeyEventArgs e)
+		{
+			if (e.Key == Avalonia.Input.Key.Escape)
+				await CancelAndCloseAsync();
+			else if (e.Key == Avalonia.Input.Key.Return)
+				await SaveAndCloseAsync();
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml

@@ -0,0 +1,103 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="350"
+        Width="800" Height="450"
+        x:Class="LibationAvalonia.Dialogs.EditQuickFilters"
+        Title="Audible Accounts"
+		Icon="/Assets/libation.ico">
+	<Grid RowDefinitions="*,Auto">
+
+		<Grid.Styles>
+			<Style Selector="Button:focus">
+				<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
+				<Setter Property="BorderThickness" Value="2" />
+			</Style>
+		</Grid.Styles>
+
+		<DataGrid
+			Grid.Row="0"
+			CanUserReorderColumns="False"
+			CanUserResizeColumns="False"
+			CanUserSortColumns="False"
+			AutoGenerateColumns="False"
+			IsReadOnly="False"
+			Items="{Binding Filters}"
+			GridLinesVisibility="All">
+
+			<DataGrid.Columns>
+
+				<DataGridTemplateColumn Header="Delete">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+
+							<Button
+								Width="55"
+								Height="30"
+								Content="X"
+								IsEnabled="{Binding !IsDefault}"
+								Click="DeleteButton_Clicked" />
+
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>				
+
+				<DataGridTextColumn
+					Width="*"
+					IsReadOnly="False"
+					Binding="{Binding FilterString, Mode=TwoWay}"
+					Header="Filter"/>
+
+
+				<DataGridTemplateColumn Header="Move&#xa;Up">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+
+							<Button
+								Width="50"
+								Height="30"
+								Content="▲"
+								IsEnabled="{Binding !IsDefault}"
+								ToolTip.Tip="Export account authorization to audible-cli"
+								Click="MoveUpButton_Clicked" />
+
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
+
+
+
+				<DataGridTemplateColumn Header="Move&#xa;Down">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+
+							<Button
+								Width="50"
+								Height="30"
+								Content="▼"
+								IsEnabled="{Binding !IsDefault}"
+								ToolTip.Tip="Export account authorization to audible-cli"
+								Click="MoveDownButton_Clicked" />
+
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
+
+
+			</DataGrid.Columns>
+		</DataGrid>
+		<Grid
+			Grid.Row="1"
+			Margin="10"
+			ColumnDefinitions="*,Auto" >
+
+			<Button
+				Grid.Column="1"
+				Height="30"
+				Padding="30,3,30,3"
+				Content="Save"
+				Click="SaveButton_Clicked" />
+		</Grid>
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs

@@ -0,0 +1,109 @@
+using AudibleUtilities;
+using Avalonia.Controls;
+using LibationFileManager;
+using System.Collections.ObjectModel;
+using System.Linq;
+using ReactiveUI;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class EditQuickFilters : DialogWindow
+	{
+		public ObservableCollection<Filter> Filters { get; } = new();
+
+		public class Filter : ViewModels.ViewModelBase
+		{
+			private string _filterString;
+			public string FilterString
+			{
+				get => _filterString;
+				set
+				{
+					IsDefault = string.IsNullOrEmpty(value);
+					this.RaiseAndSetIfChanged(ref _filterString, value);
+					this.RaisePropertyChanged(nameof(IsDefault));
+				}
+			}
+			public bool IsDefault { get; private set; } = true;
+		}
+		public EditQuickFilters()
+		{
+			InitializeComponent();
+
+			// WARNING: accounts persister will write ANY EDIT to object immediately to file
+			// here: copy strings and dispose of persister
+			// only persist in 'save' step
+			using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+			var accounts = persister.AccountsSettings.Accounts;
+			if (!accounts.Any())
+				return;
+
+			ControlToFocusOnShow = this.FindControl<Button>(nameof(SaveButton_Clicked));
+
+			var allFilters = QuickFilters.Filters.Select(f => new Filter { FilterString = f }).ToList();
+			allFilters.Add(new Filter());
+
+			foreach (var f in allFilters)
+				f.PropertyChanged += Filter_PropertyChanged;
+
+			Filters = new(allFilters);
+			DataContext = this;
+		}
+
+		private void Filter_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (Filters.Any(f => f.IsDefault))
+				return;
+			var newBlank = new Filter();
+			newBlank.PropertyChanged += Filter_PropertyChanged;
+			Filters.Insert(Filters.Count, newBlank);
+		}
+
+		protected override void SaveAndClose()
+		{
+			QuickFilters.ReplaceAll(Filters.Where(f => !f.IsDefault).Select(f => f.FilterString));
+			base.SaveAndClose();
+		}
+
+		public void DeleteButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (e.Source is Button btn && btn.DataContext is Filter filter)
+			{
+				var index = Filters.IndexOf(filter);
+				if (index < 0) return;
+
+				filter.PropertyChanged -= Filter_PropertyChanged;
+				Filters.Remove(filter);
+			}
+		}
+
+		public void MoveUpButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (e.Source is Button btn && btn.DataContext is Filter filter)
+			{
+				var index = Filters.IndexOf(filter);
+				if (index < 1) return;
+
+				Filters.Remove(filter);
+				Filters.Insert(index - 1, filter);
+			}
+		}
+
+		public void MoveDownButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (e.Source is Button btn && btn.DataContext is Filter filter)
+			{
+				var index = Filters.IndexOf(filter);
+				if (index >= Filters.Count - 2) return;
+
+				Filters.Remove(filter);
+				Filters.Insert(index + 1, filter);
+			}
+		}
+
+		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			SaveAndClose();
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml

@@ -0,0 +1,61 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="LibationAvalonia.Dialogs.EditReplacementChars"
+        Title="EditReplacementChars">
+
+	<DataGrid
+		GridLinesVisibility="All"
+		AutoGenerateColumns="False"
+		Items="{Binding replacements}">
+		
+		<DataGrid.Columns>
+			
+			<DataGridTemplateColumn Width="Auto" Header="Char to&#xa;Replace">
+				<DataGridTemplateColumn.CellTemplate>
+					<DataTemplate>
+						<TextPresenter
+							Height="18"
+							Margin="10,0,10,0"
+							VerticalAlignment="Center"
+							FontFamily="SEGOEUI_Local"
+							Text="{Binding Replacement.CharacterToReplace}" />
+					</DataTemplate>
+				</DataGridTemplateColumn.CellTemplate>
+			</DataGridTemplateColumn>
+			
+			<DataGridTemplateColumn IsReadOnly="False" Width="Auto" Header="Replacement Text">
+				<DataGridTemplateColumn.CellTemplate>
+					<DataTemplate>
+						<Grid RowDefinitions="*" ColumnDefinitions="*">
+
+							<TextBox
+								Grid.Column="0"
+								Grid.Row="0"
+								VerticalAlignment="Stretch"
+								HorizontalAlignment="Stretch"
+								FontSize="14"
+								FontFamily="SEGOEUI_Local"
+								Foreground="{StaticResource SystemControlTransparentBrush}"
+								SelectionBrush="{StaticResource SystemControlTransparentBrush}"
+								BorderBrush="{StaticResource SystemControlTransparentBrush}"
+								Text="{Binding ReplacementText, Mode=TwoWay}" />
+							<TextBlock
+								Grid.Column="0"
+								Grid.Row="0"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Stretch"
+								FontSize="14"
+								FontFamily="SEGOEUI_Local"
+								Text="{Binding ReplacementText}" />
+						</Grid>
+					</DataTemplate>
+				</DataGridTemplateColumn.CellTemplate>
+			</DataGridTemplateColumn>
+			
+		</DataGrid.Columns>
+	</DataGrid>
+	
+</Window>

Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml.cs

@@ -0,0 +1,54 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using FileManager;
+using LibationFileManager;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using ReactiveUI;
+using System.Linq;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class EditReplacementChars : DialogWindow
+	{
+		Configuration config = Configuration.Instance;
+		public ObservableCollection<ReplacementsExt> replacements { get; }
+		public EditReplacementChars()
+		{
+			InitializeComponent();
+
+			if (Design.IsDesignMode)
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+
+			replacements = new(config.ReplacementCharacters.Replacements.Select(r => new ReplacementsExt { Replacement = r }));
+			DataContext = this;
+		}
+
+
+		public class ReplacementsExt : ViewModels.ViewModelBase
+		{
+			public Replacement Replacement { get; init; }
+			public string ReplacementText
+			{
+				get => Replacement.ReplacementString;
+				set
+				{
+					Replacement.ReplacementString = value;
+					this.RaisePropertyChanged(nameof(ReplacementText));
+				}
+			}
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+
+		private void LoadTable(IReadOnlyList<Replacement> replacements)
+		{
+			
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml

@@ -0,0 +1,121 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="LibationAvalonia.Dialogs.EditTemplateDialog"
+		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
+		Icon="/Assets/libation.ico"
+        Title="EditTemplateDialog">
+
+	<Window.Resources>
+		<dialogs:BracketEscapeConverter x:Key="BracketEscapeConverter" />
+	</Window.Resources>
+
+
+	<Grid RowDefinitions="Auto,*,Auto">
+		<Grid
+			Grid.Row="0"
+			RowDefinitions="Auto,Auto"
+			ColumnDefinitions="*,Auto" Margin="5">
+
+			<TextBlock
+				Grid.Column="0"
+				Grid.Row="0"
+				Text="{Binding Description}" />
+
+			<TextBox
+				Grid.Column="0"
+				Grid.Row="1"
+				Text="{Binding workingTemplateText, Mode=TwoWay}" />
+
+			<Button
+				Grid.Column="1"
+				Grid.Row="1"
+				Margin="10,0,0,0"
+				VerticalAlignment="Stretch"
+				Padding="20,3,20,3"
+				Content="Reset to Default"
+				Click="ResetButton_Click" />
+		</Grid>
+		<Grid Grid.Row="1" ColumnDefinitions="Auto,*">
+
+			<Border
+					Grid.Row="0"
+					Grid.Column="0"
+					Margin="5"
+					BorderThickness="1"
+					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
+
+				<DataGrid
+					GridLinesVisibility="All"
+					AutoGenerateColumns="False"
+					Items="{Binding ListItems}" >
+
+					<DataGrid.Columns>
+
+						<DataGridTemplateColumn Width="Auto" Header="Tag">
+							<DataGridTemplateColumn.CellTemplate>
+								<DataTemplate>
+									<TextPresenter Height="18" Margin="10,0,10,0" VerticalAlignment="Center" Text="{Binding TagName, Converter={StaticResource BracketEscapeConverter}}" />
+								</DataTemplate>
+							</DataGridTemplateColumn.CellTemplate>
+						</DataGridTemplateColumn>
+
+						<DataGridTemplateColumn Width="Auto" Header="Description">
+							<DataGridTemplateColumn.CellTemplate>
+								<DataTemplate>
+									<TextPresenter
+										Height="18"
+										Margin="10,0,10,0"
+										VerticalAlignment="Center" Text="{Binding Description}" />
+								</DataTemplate>
+							</DataGridTemplateColumn.CellTemplate>
+						</DataGridTemplateColumn>
+
+					</DataGrid.Columns>
+				</DataGrid>
+
+			</Border>
+
+
+			<Grid
+			Grid.Column="1"
+			Margin="5"
+			RowDefinitions="Auto,*,80" HorizontalAlignment="Stretch">
+
+				<TextBlock
+					Margin="5,5,5,10"
+					Text="Example:"/>
+				
+				<Border
+					Grid.Row="1"
+					Margin="5"
+					BorderThickness="1"
+					BorderBrush="{DynamicResource DataGridGridLinesBrush}">
+					
+					<WrapPanel
+						Grid.Row="1"
+						Name="wrapPanel"
+						Orientation="Horizontal" />
+
+				</Border>
+
+				<TextBlock
+					Grid.Row="2"
+					Margin="5"
+					Foreground="Firebrick"
+					Text="{Binding WarningText}" />
+
+			</Grid>
+
+		</Grid>
+		<Button
+			Grid.Row="2"
+			Margin="5"
+			Padding="30,5,30,5"
+			HorizontalAlignment="Right"
+			Content="Save"
+			Click="SaveButton_Click" />
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs

@@ -0,0 +1,247 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Media.TextFormatting;
+using Dinah.Core;
+using LibationFileManager;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using ReactiveUI;
+
+namespace LibationAvalonia.Dialogs
+{
+	class BracketEscapeConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is string str && str[0] != '<' && str[^1] != '>')
+				return $"<{str}>";
+			return new BindingNotification(new InvalidCastException(), BindingErrorType.Error);
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is string str && str[0] == '<' && str[^1] == '>')
+				return str[1..^2];
+			return new BindingNotification(new InvalidCastException(), BindingErrorType.Error);
+		}
+	}
+	public partial class EditTemplateDialog : DialogWindow
+	{
+		// final value. post-validity check
+		public string TemplateText { get; private set; }
+
+		private EditTemplateViewModel _viewModel;
+
+		public EditTemplateDialog()
+		{
+			InitializeComponent();
+			_viewModel = new(Configuration.Instance, this.Find<WrapPanel>(nameof(wrapPanel)));
+		}
+
+		public EditTemplateDialog(Templates template, string inputTemplateText) : this()
+		{
+			_viewModel.template = ArgumentValidator.EnsureNotNull(template, nameof(template));
+			Title = $"Edit {_viewModel.template.Name}";
+			_viewModel.Description = _viewModel.template.Description;
+			_viewModel.resetTextBox(inputTemplateText);
+
+			_viewModel.ListItems = _viewModel.template.GetTemplateTags();
+
+			DataContext = _viewModel;
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+		protected override async Task SaveAndCloseAsync()
+		{
+			if (!await _viewModel.Validate())
+				return;
+
+			TemplateText = _viewModel.workingTemplateText;
+			await base.SaveAndCloseAsync();
+		}
+
+		public async void SaveButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> await SaveAndCloseAsync();
+
+		public void ResetButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> _viewModel.resetTextBox(_viewModel.template.DefaultTemplate);
+
+		private class EditTemplateViewModel : ViewModels.ViewModelBase
+		{
+			WrapPanel WrapPanel;
+			public Configuration config { get; }
+			public EditTemplateViewModel(Configuration configuration, WrapPanel panel)
+			{
+				config = configuration;
+				WrapPanel = panel;
+			}
+			// hold the work-in-progress value. not guaranteed to be valid
+			private string _workingTemplateText;
+			public string workingTemplateText
+			{
+				get => _workingTemplateText;
+				set
+				{
+					_workingTemplateText = template.Sanitize(value);
+					templateTb_TextChanged();
+
+				}
+			}
+			private string _warningText;
+			public string WarningText
+			{
+				get => _warningText;
+				set
+				{
+					this.RaiseAndSetIfChanged(ref _warningText, value);
+				}
+			}
+
+			public Templates template { get; set; }
+			public string Description { get; set; }
+
+			public IEnumerable<TemplateTags> ListItems { get; set; }
+
+			public void resetTextBox(string value) => workingTemplateText = value;
+
+			public async Task<bool> Validate()
+			{
+				if (template.IsValid(workingTemplateText))
+					return true;
+				var errors = template
+					.GetErrors(workingTemplateText)
+					.Select(err => $"- {err}")
+					.Aggregate((a, b) => $"{a}\r\n{b}");
+				await MessageBox.Show($"This template text is not valid. Errors:\r\n{errors}", "Invalid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return false;
+			}
+
+			private void templateTb_TextChanged()
+			{
+				var isChapterTitle = template == Templates.ChapterTitle;
+				var isFolder = template == Templates.Folder;
+
+				var libraryBookDto = new LibraryBookDto
+				{
+					Account = "my account",
+					AudibleProductId = "123456789",
+					Title = "A Study in Scarlet: A Sherlock Holmes Novel",
+					Locale = "us",
+					Authors = new List<string> { "Arthur Conan Doyle", "Stephen Fry - introductions" },
+					Narrators = new List<string> { "Stephen Fry" },
+					SeriesName = "Sherlock Holmes",
+					SeriesNumber = "1"
+				};
+				var chapterName = "A Flight for Life";
+				var chapterNumber = 4;
+				var chaptersTotal = 10;
+
+				var partFileProperties = new AaxDecrypter.MultiConvertFileProperties()
+				{
+					OutputFileName = "",
+					PartsPosition = chapterNumber,
+					PartsTotal = chaptersTotal,
+					Title = chapterName
+				};
+
+				var books = config.Books;
+				var folder = Templates.Folder.GetPortionFilename(
+					libraryBookDto,
+					isFolder ? workingTemplateText : config.FolderTemplate);
+
+				var file
+					= template == Templates.ChapterFile
+					? Templates.ChapterFile.GetPortionFilename(
+						libraryBookDto,
+						workingTemplateText,
+						partFileProperties,
+						"")
+					: Templates.File.GetPortionFilename(
+						libraryBookDto,
+						isFolder ? config.FileTemplate : workingTemplateText);
+				var ext = config.DecryptToLossy ? "mp3" : "m4b";
+
+				var chapterTitle = Templates.ChapterTitle.GetPortionTitle(libraryBookDto, workingTemplateText, partFileProperties);
+
+				const char ZERO_WIDTH_SPACE = '\u200B';
+				var sing = $"{Path.DirectorySeparatorChar}";
+
+				// result: can wrap long paths. eg:
+				// |-- LINE WRAP BOUNDARIES --|
+				// \books\author with a very     <= normal line break on space between words
+				// long name\narrator narrator   
+				// \title                        <= line break on the zero-with space we added before slashes
+				string slashWrap(string val) => val.Replace(sing, $"{ZERO_WIDTH_SPACE}{sing}");
+
+				WarningText
+					= !template.HasWarnings(workingTemplateText)
+					? ""
+					: "Warning:\r\n" +
+						template
+						.GetWarnings(workingTemplateText)
+						.Select(err => $"- {err}")
+						.Aggregate((a, b) => $"{a}\r\n{b}");
+
+				var list = new List<TextCharacters>();
+
+				var bold = new Typeface(Typeface.Default.FontFamily, FontStyle.Normal, FontWeight.Bold);
+				var normal = new Typeface(Typeface.Default.FontFamily, FontStyle.Normal, FontWeight.Normal);
+
+				var stringList = new List<(string, FontWeight)>();
+
+				if (isChapterTitle)
+				{
+					stringList.Add((chapterTitle, FontWeight.Bold));
+				}
+				else
+				{
+
+					stringList.Add((slashWrap(books), FontWeight.Normal));
+					stringList.Add((sing, FontWeight.Normal));
+
+					stringList.Add((slashWrap(folder), isFolder ? FontWeight.Bold : FontWeight.Normal));
+
+					stringList.Add((sing, FontWeight.Normal));
+
+					stringList.Add((file, !isFolder ? FontWeight.Bold : FontWeight.Normal));
+
+					stringList.Add(($".{ext}", FontWeight.Normal));
+				}
+
+				WrapPanel.Children.Clear();
+
+				//Avalonia doesn't yet support anything like rich text, so add a new textblock for every word/style
+				foreach (var item in stringList)
+				{
+					var wordsSplit = item.Item1.Split(' ');
+
+					for(int i = 0; i < wordsSplit.Length; i++)
+					{
+						var tb = new TextBlock
+						{
+							VerticalAlignment = Avalonia.Layout.VerticalAlignment.Bottom,
+							TextWrapping = TextWrapping.Wrap,
+							Text = wordsSplit[i] + (i == wordsSplit.Length - 1 ? "" : " "),
+							FontWeight = item.Item2
+						};
+
+						WrapPanel.Children.Add(tb);
+					}
+				}
+
+			}
+		}
+
+	}
+}

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml

@@ -0,0 +1,21 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="500"		
+        x:Class="LibationAvalonia.Dialogs.ImageDisplayDialog"
+		MinWidth="500" MinHeight="500"
+        Title="Cover"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico">
+
+	<Image Stretch="Uniform" Source="{Binding CoverImage}">
+		<Image.ContextMenu>
+			<ContextMenu>
+				<MenuItem
+					Click="SaveImage_Clicked"
+					Header="Save Picture to File"/>
+			</ContextMenu>
+		</Image.ContextMenu>
+	</Image>
+</Window>

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml.cs

@@ -0,0 +1,87 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+using System;
+using System.ComponentModel;
+using System.IO;
+using ReactiveUI;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class ImageDisplayDialog : DialogWindow, INotifyPropertyChanged
+	{
+		public string PictureFileName { get; set; }
+		public string BookSaveDirectory { get; set; }
+
+		private byte[] _coverBytes;
+		public byte[] CoverBytes
+		{
+			get => _coverBytes;
+			set
+			{
+				_coverBytes = value;
+				var ms = new MemoryStream(_coverBytes);
+				ms.Position = 0;
+				_bitmapHolder.CoverImage = new Bitmap(ms);
+			}
+		}
+
+
+		private readonly BitmapHolder _bitmapHolder = new BitmapHolder();
+
+
+		public ImageDisplayDialog()
+		{
+			InitializeComponent();
+			DataContext = _bitmapHolder;
+		}
+
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public async void SaveImage_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+
+			SaveFileDialog saveFileDialog = new();
+			saveFileDialog.Filters.Add(new FileDialogFilter { Name = "Jpeg", Extensions = new System.Collections.Generic.List<string>() { "jpg" } });
+			saveFileDialog.InitialFileName = PictureFileName;
+			saveFileDialog.Directory
+				= !App.IsWindows ? null
+				: Directory.Exists(BookSaveDirectory) ? BookSaveDirectory
+				: Path.GetDirectoryName(BookSaveDirectory);
+
+			var fileName = await saveFileDialog.ShowAsync(this);
+
+			if (fileName is null)
+				return;
+
+			try
+			{
+				File.WriteAllBytes(fileName, CoverBytes);
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, $"Failed to save picture to {fileName}");
+				await MessageBox.Show(this, $"An error was encountered while trying to save the picture\r\n\r\n{ex.Message}", "Failed to save picture", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
+			}
+		}
+
+		public class BitmapHolder : ViewModels.ViewModelBase
+		{
+			private Bitmap _coverImage;
+			public Bitmap CoverImage
+			{
+				get => _coverImage;
+				set
+				{
+					this.RaiseAndSetIfChanged(ref _coverImage, value);
+				}
+			}
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml

@@ -0,0 +1,31 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="165"
+		MinHeight="165" MaxHeight="165"
+		MinWidth="800" MaxWidth="800"
+        x:Class="LibationAvalonia.Dialogs.LibationFilesDialog"
+        xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        Title="Book Details"
+		Icon="/Assets/libation.ico">
+	
+	<Grid
+		RowDefinitions="Auto,Auto">
+
+		<controls:DirectoryOrCustomSelectControl
+			Grid.Row="0"
+			Margin="5"
+			Directory="{Binding Directory, Mode=TwoWay}"
+			SubDirectory=""
+			KnownDirectories="{Binding KnownDirectories}" />
+		
+		<Button
+			Grid.Row="1"
+			HorizontalAlignment="Right"
+			Margin="5"
+			Padding="30,3,30,3"
+			Content="Save"
+			Click="SaveButton_Click" />
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs

@@ -0,0 +1,55 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using LibationFileManager;
+using LibationAvalonia.Controls;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class LibationFilesDialog : Window
+	{
+		private class DirSelectOptions
+		{
+			public List<Configuration.KnownDirectories> KnownDirectories { get; } = new()
+			{
+				Configuration.KnownDirectories.UserProfile,
+				Configuration.KnownDirectories.AppDir,
+				Configuration.KnownDirectories.MyDocs
+			};
+			
+			public string Directory { get; set; } = Configuration.GetKnownDirectoryPath(Configuration.KnownDirectories.UserProfile);
+		}
+		private DirSelectOptions dirSelectOptions;
+		public string SelectedDirectory => dirSelectOptions.Directory;
+		public LibationFilesDialog()
+		{
+			InitializeComponent();
+
+#if DEBUG
+			this.AttachDevTools();
+#endif
+			DataContext = dirSelectOptions = new();
+		}
+
+		public async void SaveButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+
+			var libationDir = dirSelectOptions.Directory;
+
+			if (!System.IO.Directory.Exists(libationDir))
+			{
+				await MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationDir, "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error, saveAndRestorePosition: false);
+				return;
+			}
+
+			Close(DialogResult.OK);
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml

@@ -0,0 +1,61 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="120"
+		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+        x:Class="LibationAvalonia.Dialogs.LiberatedStatusBatchDialog"
+        Title="Liberated status: Whether the book has been downloaded"
+		MinWidth="400" MinHeight="120"
+		MaxWidth="400" MaxHeight="120"
+		WindowStartupLocation="CenterOwner"
+		Icon="/Assets/libation.ico">
+
+	<Grid RowDefinitions="Auto,Auto,Auto">
+
+		<TextBlock
+			Grid.Row="0"
+			Margin="10,10,10,0"
+			Text="To download again next time: change to Not Downloaded&#xa;To not download: change to Downloaded"/>
+		
+		<StackPanel
+			Margin="10"
+			Grid.Row="1"
+			Orientation="Horizontal">
+
+			<TextBlock
+				Grid.Column="0"
+				Margin="0,0,10,0"
+				VerticalAlignment="Center"
+				Text="Book" />
+
+			<controls:WheelComboBox
+				Width="130"
+				MinHeight="25"
+				Height="25"
+				VerticalAlignment="Center"
+				SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+				Items="{Binding BookStatuses}">
+
+				<ComboBox.ItemTemplate>
+					<DataTemplate>
+
+						<TextBlock
+							FontSize="12"
+							Text="{Binding Text}" />
+
+					</DataTemplate>
+				</ComboBox.ItemTemplate>
+			</controls:WheelComboBox>
+		</StackPanel>
+		
+		<Button
+			Grid.Row="2"
+			Padding="30,0,30,0"
+			Margin="10,0,10,10"
+			HorizontalAlignment="Right"
+			Height="25"
+			Content="Save"
+			Click="SaveButton_Clicked"/>
+	</Grid>
+</Window>

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchDialog.axaml.cs

@@ -0,0 +1,51 @@
+using Avalonia.Markup.Xaml;
+using DataLayer;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace LibationAvalonia.Dialogs
+{
+	public partial class LiberatedStatusBatchDialog : DialogWindow
+	{
+		private class liberatedComboBoxItem
+		{
+			public LiberatedStatus Status { get; set; }
+			public string Text { get; set; }
+			public override string ToString() => Text;
+		}
+
+		public LiberatedStatus BookLiberatedStatus { get; private set; }
+
+		private liberatedComboBoxItem _selectedStatus;
+		public object SelectedItem
+		{
+			get => _selectedStatus;
+			set
+			{
+				_selectedStatus = value as liberatedComboBoxItem;
+
+				BookLiberatedStatus = _selectedStatus.Status;
+			}
+		}
+
+		public IList BookStatuses { get; } = new List<liberatedComboBoxItem>
+		{
+			new liberatedComboBoxItem { Status = LiberatedStatus.Liberated, Text = "Downloaded" },
+			new liberatedComboBoxItem { Status = LiberatedStatus.NotLiberated, Text = "Not Downloaded" },
+		};
+
+		public LiberatedStatusBatchDialog()
+		{
+			InitializeComponent();
+			SelectedItem = BookStatuses[0] as liberatedComboBoxItem;
+			DataContext = this;
+		}
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public void SaveButton_Clicked(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> SaveAndClose();
+	}
+}

Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml

@@ -0,0 +1,33 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="240" d:DesignHeight="120"
+		MinWidth="240" MinHeight="120"
+		MaxWidth="240" MaxHeight="120"
+        x:Class="LibationAvalonia.Dialogs.Login.ApprovalNeededDialog"
+        Title="Approval Alert Detected"
+		Icon="/Assets/libation.ico">
+
+	<Grid RowDefinitions="Auto,Auto,*">
+
+		<TextBlock
+			Grid.Row="0"
+			Margin="10"
+			TextWrapping="Wrap"
+			Text="Amazon is sending you an email."/>
+		
+		<TextBlock
+			Grid.Row="1" Margin="10,0,10,0"
+			TextWrapping="Wrap"
+			Text="Please press this button after you've approved the notification."/>
+		
+		<Button
+			Grid.Row="2" 
+			Margin="10"
+			VerticalAlignment="Bottom"
+			Padding="30,3,30,3"
+			Content="Approve"
+			Click="Approve_Click" />
+	</Grid>
+</Window>

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

@@ -0,0 +1,30 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs.Login
+{
+	public partial class ApprovalNeededDialog : DialogWindow
+	{
+		public ApprovalNeededDialog()
+		{
+			InitializeComponent();
+		}
+
+		private void InitializeComponent()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		protected override Task SaveAndCloseAsync()
+		{
+			Serilog.Log.Logger.Information("Approve button clicked");
+
+			return base.SaveAndCloseAsync();
+		}
+
+		public async void Approve_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+			=> await SaveAndCloseAsync();
+	}
+}

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginBase.cs

@@ -0,0 +1,22 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using System;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Dialogs.Login
+{
+	public abstract class AvaloniaLoginBase
+	{
+
+		/// <returns>True if ShowDialog's DialogResult == OK</returns>
+		protected static async Task<bool> ShowDialog(DialogWindow dialog)
+		{
+			if (Application.Current.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+				return false;
+
+			var result = await dialog.ShowDialog<DialogResult>(desktop.MainWindow);
+			Serilog.Log.Logger.Debug("{@DebugInfo}", new { DialogResult = result });
+			return result == DialogResult.OK;
+		}
+	}
+}