incr ver

incl HangoverAvalonia in sln
Merge pull request #338 from Mbucari/master
2026-01-02 19:08:39 -05:00 · 2022-08-01 09:49:45 -04:00 · 2022-08-01 07:46:44 -04:00 · 2022-08-01 07:36:25 -04:00 · 2022-07-31 22:37:42 -06:00 · 2022-07-31 22:24:28 -06:00
228 changed files with 12824 additions and 616 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.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.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.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.
--- a/.gitignore
+++ b/.gitignore
@@ -370,3 +370,4 @@ FodyWeavers.xsd

 /__TODO.txt
 /DataLayer/LibationContext.db
+*/bin-Avalonia
--- a/.releaseindex.json
+++ b/.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"
+}
--- a/README.md
+++ b/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)
--- a/Source/.config/dotnet-tools.json
+++ b/Source/.config/dotnet-tools.json
@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "frogvall.dotnetbumpversion": {
-      "version": "3.0.1",
-      "commands": [
-        "bump-version"
-      ]
-    }
-  }
-}
--- a/Source/AaxDecrypter/AaxDecrypter.csproj
+++ b/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" />
--- a/Source/AppScaffolding/AppScaffolding.csproj
+++ b/Source/AppScaffolding/AppScaffolding.csproj
@@ -1,14 +1,21 @@
 <?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.4.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 Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
 </Project>
--- a/Source/AppScaffolding/LibationScaffolding.cs
+++ b/Source/AppScaffolding/LibationScaffolding.cs
@@ -14,8 +14,32 @@ using Serilog;

 namespace AppScaffolding
 {
+	public enum ReleaseIdentifier
+	{
+		None,
+		WindowsClassic,
+		WindowsAvalonia,
+		LinuxAvalonia,
+		MacOSAvalonia
+	}
+
 	public static class LibationScaffolding
 	{
+		public static readonly bool IsWindows;
+		public static readonly bool IsLinux;
+		public static readonly bool IsMacOs;
+		static LibationScaffolding()
+		{
+			IsWindows = OperatingSystem.IsWindows();
+			IsLinux = OperatingSystem.IsLinux();
+			IsMacOs = OperatingSystem.IsMacOS();
+		}
+
+		public static ReleaseIdentifier ReleaseIdentifier { get; private set; }
+
+		public static void SetReleaseIdentifier(ReleaseIdentifier releaseID)
+			=> ReleaseIdentifier = releaseID;
+
 		// AppScaffolding
 		private static Assembly _executingAssembly;
 		private static Assembly ExecutingAssembly
@@ -66,6 +90,9 @@ namespace AppScaffolding
 		{
 			config.InProgress ??= Configuration.WinTemp;

+			if (!config.Exists(nameof(config.BetaOptIn)))
+				config.BetaOptIn = false;
+
 			if (!config.Exists(nameof(config.AllowLibationFixup)))
 				config.AllowLibationFixup = true;

@@ -88,20 +115,20 @@ namespace AppScaffolding
 				config.DecryptToLossy = false;

 			if (!config.Exists(nameof(config.LameTargetBitrate)))
-				config.LameTargetBitrate = false;			
-			
+				config.LameTargetBitrate = false;
+
 			if (!config.Exists(nameof(config.LameDownsampleMono)))
 				config.LameDownsampleMono = true;
-			
+
 			if (!config.Exists(nameof(config.LameBitrate)))
 				config.LameBitrate = 64;
-			
+
 			if (!config.Exists(nameof(config.LameConstantBitrate)))
 				config.LameConstantBitrate = false;
-			
+
 			if (!config.Exists(nameof(config.LameMatchSourceBR)))
 				config.LameMatchSourceBR = true;
-			
+
 			if (!config.Exists(nameof(config.LameVBRQuality)))
 				config.LameVBRQuality = 2;

@@ -272,12 +299,20 @@ namespace AppScaffolding
 			if (System.Diagnostics.Debugger.IsAttached)
 				mode += " (Debugger attached)";

+			string OS
+				= IsLinux ? "Linux"
+				: IsMacOs ? "MacOS"
+				: IsWindows ? "Windows"
+				: "UNKNOWN_OS";
+
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
 			Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
+				ReleaseIdentifier = ReleaseIdentifier,
+				OS = OS,
 				Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
 				LogLevel_Debug_Enabled = Log.Logger.IsDebugEnabled(),
@@ -286,6 +321,7 @@ namespace AppScaffolding
 				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
 				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),

+				config.BetaOptIn,
 				config.LibationFiles,
 				AudibleFileStorage.BooksDirectory,

@@ -308,8 +344,9 @@ namespace AppScaffolding
 		public static UpgradeProperties GetLatestRelease()
 		{
 			// timed out
-			var latest = getLatestRelease(TimeSpan.FromSeconds(10));
-			if (latest is null)
+			(var latest, var zip) = getLatestRelease(TimeSpan.FromSeconds(10));
+
+			if (latest is null || zip is null)
 				return null;

 			var latestVersionString = latest.TagName.Trim('v');
@@ -321,7 +358,7 @@ namespace AppScaffolding
 				return null;

 			// we have an update
-			var zip = latest.Assets.FirstOrDefault(a => a.BrowserDownloadUrl.EndsWith(".zip"));
+
 			var zipUrl = zip?.BrowserDownloadUrl;

 			Log.Logger.Information("Update available: {@DebugInfo}", new
@@ -333,11 +370,11 @@ namespace AppScaffolding

 			return new(zipUrl, latest.HtmlUrl, zip.Name, latestRelease);
 		}
-		private static Octokit.Release getLatestRelease(TimeSpan timeout)
+		private static (Octokit.Release, Octokit.ReleaseAsset) getLatestRelease(TimeSpan timeout)
 		{
 			try
 			{
-				var task = System.Threading.Tasks.Task.Run(() => getLatestRelease());
+				var task = getLatestRelease();
 				if (task.Wait(timeout))
 					return task.Result;

@@ -347,16 +384,26 @@ namespace AppScaffolding
 			{
 				Log.Logger.Error(aggEx, "Checking for new version too often");
 			}
-			return null;
+			return (null, null);
 		}
-		private static Octokit.Release getLatestRelease()
+		private static async System.Threading.Tasks.Task<(Octokit.Release, Octokit.ReleaseAsset)> getLatestRelease()
 		{
-			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation"));
+			var ownerAccount = "rmcrackan";
+			var repoName = "Libation";
+
+			var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(repoName));
+
+			//Download the release index
+			var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json");
+			var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts));
+			var regexPattern = releaseIndex.Value<string>(ReleaseIdentifier.ToString());

 			// https://octokitnet.readthedocs.io/en/latest/releases/
-			var releases = gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation").GetAwaiter().GetResult();
-			var latest = releases.First(r => !r.Draft && !r.Prerelease);
-			return latest;
+			var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName);
+
+			var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+			var latestRelease = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));
+			return (latestRelease, latestRelease?.Assets?.FirstOrDefault(a => regex.IsMatch(a.Name)));
 		}
 	}

@@ -411,9 +458,9 @@ namespace AppScaffolding

 		public static void migrate_from_7_10_1(Configuration config)
 		{
-			var lastNigrationThres = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");
+			var lastMigrationThrew = config.GetNonString<bool>($"{nameof(migrate_from_7_10_1)}_ThrewError");

-			if (lastNigrationThres) return;
+			if (lastMigrationThrew) return;

 			try
 			{
--- a/Source/ApplicationServices/ApplicationServices.csproj
+++ b/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>

--- a/Source/ApplicationServices/LibraryExporter.cs
+++ b/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++;
 			}
--- a/Source/AudibleUtilities/ApiExtended.cs
+++ b/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>();
--- a/Source/AudibleUtilities/AudibleUtilities.csproj
+++ b/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>
--- a/Source/DataLayer/DataLayer.csproj
+++ b/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>
@@ -10,13 +10,14 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="4.1.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
+    <PackageReference Include="Dinah.Core" Version="4.4.1.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="5.0.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -29,10 +30,6 @@
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
-
-	<ItemGroup>
-    <ProjectReference Include="..\LibationFileManager\LibationFileManager.csproj" />
-  </ItemGroup>
  
  <ItemGroup>
    <None Update="migrate.json">
--- a/Source/DataLayer/EfClasses/AudioFormat.cs
+++ b/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; }
--- a/Source/DataLayer/EfClasses/Series.cs
+++ b/Source/DataLayer/EfClasses/Series.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Dinah.Core;
-using Microsoft.EntityFrameworkCore;

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

        #region Tags
--- a/Source/DataLayer/LibationContext.cs
+++ b/Source/DataLayer/LibationContext.cs
@@ -1,10 +1,9 @@
 using DataLayer.Configurations;
-using Dinah.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;

 namespace DataLayer
 {
-    public class LibationContext : InterceptableDbContext
+    public class LibationContext : DbContext
    {
        // IMPORTANT: USING DbSet<>
        // ========================
@@ -35,14 +34,6 @@ namespace DataLayer
        // see DesignTimeDbContextFactoryBase for info about ctors and connection strings/OnConfiguring()
        internal LibationContext(DbContextOptions options) : base(options) { }

-        // called on each instantiation
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            AddInterceptor(new TagPersistenceInterceptor());
-
-            base.OnConfiguring(optionsBuilder);
-        }
-
        // typically only called once per execution; NOT once per instantiation
        protected override void OnModelCreating(ModelBuilder modelBuilder)
        {
--- a/Source/DataLayer/TagPersistenceInterceptor.cs
+++ b/Source/DataLayer/TagPersistenceInterceptor.cs
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Dinah.Core.Collections.Generic;
-using Dinah.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-
-namespace DataLayer
-{
-    internal class TagPersistenceInterceptor : IDbInterceptor
-    {
-        public void Executed(DbContext context) { }
-
-        public void Executing(DbContext context)
-		{
-			var tagsCollection
-				= context
-				.ChangeTracker
-				.Entries()
-				.Where(e => e.State.In(EntityState.Modified, EntityState.Added))
-				.Select(e => e.Entity as UserDefinedItem)
-				.Where(udi => udi is not null)
-				// do NOT filter out entires with blank tags. blank is the valid way to show the absence of tags
-				.Select(t => (t.Book.AudibleProductId, t.Tags))
-				.ToList();
-
-			LibationFileManager.TagsPersistence.Save(tagsCollection);
-		}
-	}
-}
--- a/Source/DtoImporterService/DtoImporterService.csproj
+++ b/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'">
--- a/Source/FileLiberator/FileLiberator.csproj
+++ b/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>
--- a/Source/FileLiberator/UtilityExtensions.cs
+++ b/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,
 		};
 	}
 }
--- a/Source/FileManager/LongPath.cs
+++ b/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);
+
 	}
 }
--- a/Source/FileManager/ReplacementCharacters.cs
+++ b/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;
--- a/Source/Hangover/Hangover.csproj
+++ b/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>
--- a/Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Source/LibationCli/Properties/PublishProfiles/FolderProfile.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>
--- a/Source/HangoverAvalonia/App.axaml
+++ b/Source/HangoverAvalonia/App.axaml
@@ -0,0 +1,12 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:HangoverAvalonia"
+             x:Class="HangoverAvalonia.App">
+    <Application.DataTemplates>
+        <local:ViewLocator/>
+    </Application.DataTemplates>
+
+    <Application.Styles>
+        <FluentTheme Mode="Light"/>
+    </Application.Styles>
+</Application>
--- a/Source/HangoverAvalonia/App.axaml.cs
+++ b/Source/HangoverAvalonia/App.axaml.cs
@@ -0,0 +1,29 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using HangoverAvalonia.ViewModels;
+using HangoverAvalonia.Views;
+
+namespace HangoverAvalonia
+{
+	public partial class App : Application
+	{
+		public override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				desktop.MainWindow = new MainWindow
+				{
+					DataContext = new MainWindowViewModel(),
+				};
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+	}
+}
--- a/Source/HangoverAvalonia/Assets/hangover.ico
+++ b/Source/HangoverAvalonia/Assets/hangover.ico
--- a/Source/HangoverAvalonia/HangoverAvalonia.csproj
+++ b/Source/HangoverAvalonia/HangoverAvalonia.csproj
@@ -0,0 +1,77 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net6.0</TargetFramework>
+		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
+		<TrimMode>copyused</TrimMode>
+		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+		<IsPublishable>true</IsPublishable>
+		<AssemblyName>Hangover</AssemblyName>
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+		<StartupObject />
+		<IsPublishable>true</IsPublishable>
+
+		<PublishReadyToRun>true</PublishReadyToRun>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+
+		<ApplicationIcon>hangover.ico</ApplicationIcon>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<OutputPath>..\bin\Avalonia\Debug</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\bin\Avalonia\Release</OutputPath>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<AvaloniaResource Include="Assets\**" />
+		<AvaloniaXaml Remove="Models\**" />
+		<Compile Remove="Models\**" />
+		<EmbeddedResource Remove="Models\**" />
+		<None Remove="Models\**" />
+		<None Remove=".gitignore" />
+		<None Remove="Assets\hangover.ico" />
+		<None Remove="hangover.ico" />
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<AvaloniaResource Include="hangover.ico" />
+	</ItemGroup>
+	<ItemGroup>
+		<!--This helps with theme dll-s trimming.
+	If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
+	https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
+		<TrimmableAssembly Include="Avalonia.Themes.Fluent" />
+		<TrimmableAssembly Include="Avalonia.Themes.Default" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Avalonia" Version="0.10.17" />
+		<PackageReference Include="Avalonia.Desktop" Version="0.10.17" />
+		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.17" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.17" />
+		<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
+		<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
+		<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
+	</ItemGroup>
+
+
+	<Target Name="SpicNSpan" AfterTargets="Clean">
+		<!-- Remove obj folder -->
+		<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+		<!-- Remove bin folder -->
+		<RemoveDir Directories="$(BaseOutputPath)" />
+	</Target>
+
+</Project>
--- a/Source/HangoverAvalonia/Program.cs
+++ b/Source/HangoverAvalonia/Program.cs
@@ -0,0 +1,24 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.ReactiveUI;
+using System;
+
+namespace HangoverAvalonia
+{
+	internal class Program
+	{
+		// Initialization code. Don't use any Avalonia, third-party APIs or any
+		// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+		// yet and stuff might break.
+		[STAThread]
+		public static void Main(string[] args) => BuildAvaloniaApp()
+			.StartWithClassicDesktopLifetime(args);
+
+		// Avalonia configuration, don't remove; also used by visual designer.
+		public static AppBuilder BuildAvaloniaApp()
+			=> AppBuilder.Configure<App>()
+				.UsePlatformDetect()
+				.LogToTrace()
+				.UseReactiveUI();
+	}
+}
--- a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml
+++ b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+	<PropertyGroup>
+		<Configuration>Release</Configuration>
+		<Platform>Any CPU</Platform>
+		<PublishDir>..\bin\Release\linux-chardonnay</PublishDir>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<TargetFramework>net6.0</TargetFramework>
+		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>false</PublishSingleFile>
+		<PublishTrimmed>false</PublishTrimmed>
+	</PropertyGroup>
+</Project>
--- a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
+++ b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Release\macos-chardonnay</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+	  <SelfContained>true</SelfContained>
+	  <PublishSingleFile>false</PublishSingleFile>
+	  <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+</Project>
--- a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
+++ b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -5,12 +5,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
  <PropertyGroup>
    <Configuration>Release</Configuration>
-    <Platform>x64</Platform>
-    <PublishDir>..\bin\publish\</PublishDir>
+    <Platform>Any CPU</Platform>
+    <PublishDir>..\bin\Release\win-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
  </PropertyGroup>
 </Project>
--- a/Source/HangoverAvalonia/ViewLocator.cs
+++ b/Source/HangoverAvalonia/ViewLocator.cs
@@ -0,0 +1,30 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using HangoverAvalonia.ViewModels;
+using System;
+
+namespace HangoverAvalonia
+{
+	public class ViewLocator : IDataTemplate
+	{
+		public IControl Build(object data)
+		{
+			var name = data.GetType().FullName!.Replace("ViewModel", "View");
+			var type = Type.GetType(name);
+
+			if (type != null)
+			{
+				return (Control)Activator.CreateInstance(type)!;
+			}
+			else
+			{
+				return new TextBlock { Text = "Not Found: " + name };
+			}
+		}
+
+		public bool Match(object data)
+		{
+			return data is ViewModelBase;
+		}
+	}
+}
--- a/Source/HangoverAvalonia/ViewModels/MainWindowViewModel.cs
+++ b/Source/HangoverAvalonia/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,150 @@
+using ApplicationServices;
+using AppScaffolding;
+using Microsoft.EntityFrameworkCore;
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace HangoverAvalonia.ViewModels
+{
+	public class MainWindowViewModel : ViewModelBase
+    {
+        private string dbFile;
+        private string _databaseFileText;
+        private bool _databaseFound;
+        private string _sqlResults;
+        public string DatabaseFileText { get => _databaseFileText; set => this.RaiseAndSetIfChanged(ref _databaseFileText, value); }
+        public string SqlQuery { get; set; }
+        public bool DatabaseFound { get => _databaseFound; set => this.RaiseAndSetIfChanged(ref _databaseFound, value); }
+        public string SqlResults { get => _sqlResults; set => this.RaiseAndSetIfChanged(ref _sqlResults, value); }
+
+        public MainWindowViewModel()
+        {
+            dbFile = UNSAFE_MigrationHelper.DatabaseFile;
+            if (dbFile is null)
+            {
+                DatabaseFileText = $"Database file not found";
+                DatabaseFound = false;
+                return;
+            }
+
+            DatabaseFileText = $"Database file: {UNSAFE_MigrationHelper.DatabaseFile ?? "not found"}";
+
+            DatabaseFound = UNSAFE_MigrationHelper.DatabaseFile is not null;
+        }
+
+        public void ExecuteQuery()
+        {
+            ensureBackup();
+
+            SqlResults = string.Empty;
+
+            try
+            {
+                var sql = SqlQuery.Trim();
+
+                #region // explanation
+                // Routing statements to non-query is a convenience.
+                // I went down the rabbit hole of full parsing and it's more trouble than it's worth. The parsing is easy due to available libraries. The edge cases of what to do next got too complex for slight gains.
+                // It's also not useful to take the extra effort to separate non-queries which don't return a row count. Eg: alter table, drop table
+                // My half-assed solution here won't even catch simple mistakes like this -- and that's ok
+                //   -- line 1 is a comment
+                //   delete from foo
+                #endregion
+                var lower = sql.ToLower();
+                if (lower.StartsWith("update") || lower.StartsWith("insert") || lower.StartsWith("delete"))
+                    nonQuery(sql);
+                else
+                    query(sql);
+            }
+            catch (Exception ex)
+            {
+                SqlResults = $"{ex.Message}\r\n{ex.StackTrace}";
+            }
+            finally
+            {
+                deleteUnneededBackups();
+            }
+        }
+
+        private string dbBackup;
+        private DateTime dbFileLastModified;
+
+        private void ensureBackup()
+        {
+            if (dbBackup is not null)
+                return;
+
+            dbFileLastModified = File.GetLastWriteTimeUtc(dbFile);
+
+            dbBackup
+                = Path.ChangeExtension(dbFile, "").TrimEnd('.')
+                + $"_backup_{DateTime.UtcNow:O}".Replace(':', '-').Replace('.', '-')
+                + Path.GetExtension(dbFile);
+            File.Copy(dbFile, dbBackup);
+        }
+
+        private void deleteUnneededBackups()
+        {
+            var newLastModified = File.GetLastWriteTimeUtc(dbFile);
+            if (dbFileLastModified == newLastModified)
+            {
+                File.Delete(dbBackup);
+                dbBackup = null;
+            }
+        }
+
+        void query(string sql)
+        {
+            // ef doesn't support truly generic queries. have to drop down to ado.net
+            using var context = DbContexts.GetContext();
+            using var conn = context.Database.GetDbConnection();
+            conn.Open();
+            using var cmd = conn.CreateCommand();
+            cmd.CommandText = sql;
+
+            var reader = cmd.ExecuteReader();
+            var results = 0;
+            var builder = new StringBuilder();
+            var lines = 0;
+            while (reader.Read())
+            {
+                results++;
+
+                for (var i = 0; i < reader.FieldCount; i++)
+                    builder.Append(reader.GetValue(i) + "\t");
+                builder.AppendLine();
+
+                lines++;
+                if (lines % 10 == 0)
+                {
+                    SqlResults += builder.ToString();
+                    builder.Clear();
+                }
+            }
+
+            SqlResults += builder.ToString();
+            builder.Clear();
+
+            if (results == 0)
+                SqlResults = "[no results]";
+            else
+            {
+                SqlResults += $"\r\n{results} result";
+                if (results != 1) SqlResults += "s";
+            }
+        }
+
+        void nonQuery(string sql)
+        {
+            using var context = DbContexts.GetContext();
+            var results = context.Database.ExecuteSqlRaw(sql);
+
+            SqlResults += $"{results} record";
+            if (results != 1) SqlResults += "s";
+            SqlResults += " affected";
+        }
+    }
+}
--- a/Source/HangoverAvalonia/ViewModels/ViewModelBase.cs
+++ b/Source/HangoverAvalonia/ViewModels/ViewModelBase.cs
@@ -0,0 +1,11 @@
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace HangoverAvalonia.ViewModels
+{
+	public class ViewModelBase : ReactiveObject
+	{
+	}
+}
--- a/Source/HangoverAvalonia/Views/MainWindow.axaml
+++ b/Source/HangoverAvalonia/Views/MainWindow.axaml
@@ -0,0 +1,75 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:HangoverAvalonia.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
+		Width="800" Height="500"
+        x:Class="HangoverAvalonia.Views.MainWindow"
+        Icon="/Assets/hangover.ico "
+        Title="Hangover: Libation debug and recovery tool">
+
+	<Design.DataContext>
+		<vm:MainWindowViewModel/>
+	</Design.DataContext>
+	
+	<TabControl Grid.Row="0">
+		<TabControl.Styles>
+			<Style Selector="ItemsPresenter#PART_ItemsPresenter">
+				<Setter Property="Height" Value="18"/>
+			</Style>
+			<Style Selector="TabItem">
+				<Setter Property="MinHeight" Value="30"/>
+				<Setter Property="Height" Value="30"/>
+				<Setter Property="Padding" Value="8,2,8,0"/>
+			</Style>
+			<Style Selector="TabItem#Header TextBlock">
+				<Setter Property="MinHeight" Value="5"/>
+			</Style>
+		</TabControl.Styles>
+		
+		<!-- Database Tab -->
+		<TabItem>
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Database</TextBlock>
+			</TabItem.Header>
+
+			<Grid RowDefinitions="Auto,Auto,*,Auto,2*">
+				
+				<TextBlock
+					Margin="0,10,0,5"
+					Grid.Row="0"
+					Text="{Binding DatabaseFileText}" />
+				
+				<TextBlock
+					Margin="0,5,0,5"
+					Grid.Row="1"
+					Text="SQL (database command)" />
+				
+				<TextBox
+					Margin="0,5,0,5"
+					Grid.Row="2" Text="{Binding SqlQuery, Mode=OneWayToSource}" />
+				
+				<Button
+					Grid.Row="3"
+					Padding="20,5,20,5"
+					Content="Execute"
+					IsEnabled="{Binding DatabaseFound}"
+					Click="Execute_Click" />
+				
+				<TextBox
+					Margin="0,5,0,10"
+					IsReadOnly="True"
+					Grid.Row="4"
+					Text="{Binding SqlResults}" />
+			</Grid>
+			
+		</TabItem>
+		<!-- Command Line Interface Tab -->
+		<TabItem>
+			<TabItem.Header>
+				<TextBlock FontSize="14" VerticalAlignment="Center">Command Line Interface</TextBlock>
+			</TabItem.Header>			
+		</TabItem>
+	</TabControl>
+</Window>
--- a/Source/HangoverAvalonia/Views/MainWindow.axaml.cs
+++ b/Source/HangoverAvalonia/Views/MainWindow.axaml.cs
@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using HangoverAvalonia.ViewModels;
+
+namespace HangoverAvalonia.Views
+{
+	public partial class MainWindow : Window
+	{
+		MainWindowViewModel _viewModel => DataContext as MainWindowViewModel;
+		public MainWindow()
+		{
+			InitializeComponent();
+		}
+
+		public void Execute_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			_viewModel.ExecuteQuery();
+		}
+	}
+}
--- a/Source/HangoverAvalonia/hangover.ico
+++ b/Source/HangoverAvalonia/hangover.ico
--- a/Source/Libation.sln
+++ b/Source/Libation.sln
@@ -66,6 +66,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationFileManager.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hangover", "Hangover\Hangover.csproj", "{40C67036-C1A7-4FDF-AA83-8EC902E257F3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationAvalonia", "LibationAvalonia\LibationAvalonia.csproj", "{F612D06F-3134-4B9B-95CD-EB3FC798AE60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HangoverAvalonia", "HangoverAvalonia\HangoverAvalonia.csproj", "{8A7B01D3-9830-44FD-91A1-D8D010996BEB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -144,6 +148,14 @@ Global
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -167,6 +179,8 @@ Global
 		{F2E04270-4551-41C4-99FF-E7125BED708C} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{EB781571-8548-477E-82AD-FB9FAB548D2F} = {67E66E82-5532-4440-AFB3-9FB1DF9DEF53}
 		{40C67036-C1A7-4FDF-AA83-8EC902E257F3} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{F612D06F-3134-4B9B-95CD-EB3FC798AE60} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
+		{8A7B01D3-9830-44FD-91A1-D8D010996BEB} = {8679CAC8-9164-4007-BDD2-F004810EDA14}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {615E00ED-BAEF-4E8E-A92A-9B82D87942A9}
--- a/Source/LibationAvalonia/App.axaml
+++ b/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>
--- a/Source/LibationAvalonia/App.axaml.cs
+++ b/Source/LibationAvalonia/App.axaml.cs
@@ -0,0 +1,265 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using LibationFileManager;
+using LibationAvalonia.Views;
+using System;
+using Avalonia.Platform;
+using LibationAvalonia.Dialogs;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.IO;
+using ApplicationServices;
+using Dinah.Core;
+
+namespace LibationAvalonia
+{
+	public class App : Application
+	{
+		public static IBrush ProcessQueueBookFailedBrush { get; private set; }
+		public static IBrush ProcessQueueBookCompletedBrush { get; private set; }
+		public static IBrush ProcessQueueBookCancelledBrush { get; private set; }
+		public static IBrush ProcessQueueBookDefaultBrush { get; private set; }
+		public static IBrush SeriesEntryGridBackgroundBrush { get; private set; }
+
+		public static IAssetLoader AssetLoader { get; private set; }
+
+		public static readonly Uri AssetUriBase = new("avares://Libation/Assets/");
+		public static Stream OpenAsset(string assetRelativePath)
+			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
+
+
+		public static bool GoToFile(string path)
+			=> AppScaffolding.LibationScaffolding.IsWindows ? Go.To.File(path)
+			: GoToFolder(path is null ? string.Empty : Path.GetDirectoryName(path));
+
+		public static bool GoToFolder(string path)
+		{
+			if (AppScaffolding.LibationScaffolding.IsWindows)
+				return Go.To.Folder(path);
+			else if (AppScaffolding.LibationScaffolding.IsLinux)
+			{
+				var startInfo = new System.Diagnostics.ProcessStartInfo()
+				{
+					FileName = "/bin/xdg-open",
+					Arguments = path is null ? string.Empty : $"\"{path}\"",
+					UseShellExecute = false, //Import in Linux environments
+					CreateNoWindow = false,
+					RedirectStandardOutput = true,
+					RedirectStandardError = true
+				};
+				System.Diagnostics.Process.Start(startInfo);
+				return true;
+			}
+			//Don't know how to do this for mac yet
+			else return true;
+		}
+
+		public override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+			AssetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>();
+		}
+
+		public static Task<List<DataLayer.LibraryBook>> LibraryTask;
+		public static bool SetupRequired;
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			LoadStyles();
+
+			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
+			var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI);
+
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				if (SetupRequired)
+				{
+					var config = Configuration.Instance;
+
+					var defaultLibationFilesDir = Configuration.UserProfile;
+
+					// check for existing settings in default location
+					var defaultSettingsFile = Path.Combine(defaultLibationFilesDir, "Settings.json");
+					if (Configuration.SettingsFileIsValid(defaultSettingsFile))
+						config.SetLibationFiles(defaultLibationFilesDir);
+
+					if (config.LibationSettingsAreValid)
+					{
+						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+						ShowMainWindow(desktop);
+					}
+					else
+					{
+						var setupDialog = new SetupDialog { Config = config };
+						setupDialog.Closing += Setup_Closing;
+						desktop.MainWindow = setupDialog;
+					}
+				}
+				else
+					ShowMainWindow(desktop);
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+
+		private async void Setup_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			var setupDialog = sender as SetupDialog;
+			var desktop = ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+
+			try
+			{
+				// all returns should be preceded by either:
+				// - if config.LibationSettingsAreValid
+				// - error message, Exit()
+				if (setupDialog.IsNewUser)
+				{
+					setupDialog.Config.SetLibationFiles(Configuration.UserProfile);
+					ShowSettingsWindow(desktop, setupDialog.Config, OnSettingsCompleted);
+				}
+				else if (setupDialog.IsReturningUser)
+				{
+					ShowLibationFilesDialog(desktop, setupDialog.Config, OnLibationFilesCompleted);
+				}
+				else
+				{
+					await CancelInstallation();
+					return;
+				}
+
+			}
+			catch (Exception ex)
+			{
+				var title = "Fatal error, pre-logging";
+				var body = "An unrecoverable error occurred. Since this error happened before logging could be initialized, this error can not be written to the log file.";
+				try
+				{
+					await MessageBox.ShowAdminAlert(null, body, title, ex);
+				}
+				catch
+				{
+					await MessageBox.Show($"{body}\r\n\r\n{ex.Message}\r\n\r\n{ex.StackTrace}", title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+				return;
+			}
+		}
+
+		private async Task RunMigrationsAsync(Configuration config)
+		{
+			// most migrations go in here
+			AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
+
+			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+
+			// logging is init'd here
+			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+		}
+
+		private void ShowSettingsWindow(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, SettingsDialog, Configuration> OnClose)
+		{
+			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
+
+			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
+
+			var settingsDialog = new SettingsDialog();
+			desktop.MainWindow = settingsDialog;
+			settingsDialog.RestoreSizeAndLocation(Configuration.Instance);
+			settingsDialog.Show();
+
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			{
+				settingsDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, settingsDialog, config);
+			}
+			settingsDialog.Closing += WindowClosing;
+		}
+
+		private async void OnSettingsCompleted(IClassicDesktopStyleApplicationLifetime desktop, SettingsDialog settingsDialog, Configuration config)
+		{
+			if (config.LibationSettingsAreValid)
+			{
+				await RunMigrationsAsync(config);
+				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+				ShowMainWindow(desktop);
+			}
+			else
+				await CancelInstallation();
+
+			settingsDialog.Close();
+		}
+
+
+		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)
+		{
+			var libationFilesDialog = new LibationFilesDialog();
+			desktop.MainWindow = libationFilesDialog;
+			libationFilesDialog.Show();
+
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			{
+				libationFilesDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, libationFilesDialog, config);
+			}
+			libationFilesDialog.Closing += WindowClosing;
+		}
+
+		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
+		{
+			config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+			if (config.LibationSettingsAreValid)
+			{
+				await RunMigrationsAsync(config);
+
+				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+				ShowMainWindow(desktop);
+			}
+			else
+			{
+				// path did not result in valid settings
+				var continueResult = await MessageBox.Show(
+					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
+					"New install?",
+					MessageBoxButtons.YesNo,
+					MessageBoxIcon.Question);
+
+				if (continueResult == DialogResult.Yes)
+					ShowSettingsWindow(desktop, config, OnSettingsCompleted);
+				else
+					await CancelInstallation();
+
+			}
+			libationFilesDialog.Close();
+		}
+
+		static async Task CancelInstallation()
+		{
+			await MessageBox.Show("Initial set up cancelled.", "Cancelled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+			Environment.Exit(0);
+		}
+
+		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
+		{
+			var mainWindow = new MainWindow();
+			desktop.MainWindow = mainWindow;
+			mainWindow.RestoreSizeAndLocation(Configuration.Instance);
+			mainWindow.OnLoad();
+			mainWindow.OnLibraryLoaded(LibraryTask.GetAwaiter().GetResult());
+			mainWindow.Show();
+		}
+
+		private static void LoadStyles()
+		{
+			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookFailedBrush");
+			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCompletedBrush");
+			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookCancelledBrush");
+			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources("ProcessQueueBookDefaultBrush");
+			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources("SeriesEntryGridBackgroundBrush");
+		}
+	}
+}
--- a/Source/LibationAvalonia/Assets/1x1.png
+++ b/Source/LibationAvalonia/Assets/1x1.png
--- a/Source/LibationAvalonia/Assets/DataGridTheme.xaml
+++ b/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>
--- a/Source/LibationAvalonia/Assets/LibationStyles.xaml
+++ b/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>
--- a/Source/LibationAvalonia/Assets/MBIcons/Asterisk.png
+++ b/Source/LibationAvalonia/Assets/MBIcons/Asterisk.png
--- a/Source/LibationAvalonia/Assets/MBIcons/Exclamation.png
+++ b/Source/LibationAvalonia/Assets/MBIcons/Exclamation.png
--- a/Source/LibationAvalonia/Assets/MBIcons/Question.png
+++ b/Source/LibationAvalonia/Assets/MBIcons/Question.png
--- a/Source/LibationAvalonia/Assets/MBIcons/error.png
+++ b/Source/LibationAvalonia/Assets/MBIcons/error.png
--- a/Source/LibationAvalonia/Assets/SEGOEUI.TTF
+++ b/Source/LibationAvalonia/Assets/SEGOEUI.TTF
--- a/Source/LibationAvalonia/Assets/WINGDING.TTF
+++ b/Source/LibationAvalonia/Assets/WINGDING.TTF
--- a/Source/LibationAvalonia/Assets/cancel.png
+++ b/Source/LibationAvalonia/Assets/cancel.png
--- a/Source/LibationAvalonia/Assets/completed.png
+++ b/Source/LibationAvalonia/Assets/completed.png
--- a/Source/LibationAvalonia/Assets/down.png
+++ b/Source/LibationAvalonia/Assets/down.png
--- a/Source/LibationAvalonia/Assets/download-arrow.png
+++ b/Source/LibationAvalonia/Assets/download-arrow.png
--- a/Source/LibationAvalonia/Assets/edit-tags-25x25.png
+++ b/Source/LibationAvalonia/Assets/edit-tags-25x25.png
--- a/Source/LibationAvalonia/Assets/edit-tags-50x50.png
+++ b/Source/LibationAvalonia/Assets/edit-tags-50x50.png
--- a/Source/LibationAvalonia/Assets/edit_25x25.png
+++ b/Source/LibationAvalonia/Assets/edit_25x25.png
--- a/Source/LibationAvalonia/Assets/edit_64x64.png
+++ b/Source/LibationAvalonia/Assets/edit_64x64.png
--- a/Source/LibationAvalonia/Assets/error.png
+++ b/Source/LibationAvalonia/Assets/error.png
--- a/Source/LibationAvalonia/Assets/errored.png
+++ b/Source/LibationAvalonia/Assets/errored.png
--- a/Source/LibationAvalonia/Assets/first.png
+++ b/Source/LibationAvalonia/Assets/first.png
--- a/Source/LibationAvalonia/Assets/glass-with-glow_16.png
+++ b/Source/LibationAvalonia/Assets/glass-with-glow_16.png
--- a/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_300x300.jpg
+++ b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_300x300.jpg
--- a/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_500x500.jpg
+++ b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_500x500.jpg
--- a/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_80x80.jpg
+++ b/Source/LibationAvalonia/Assets/img-coverart-prod-unavailable_80x80.jpg
--- a/Source/LibationAvalonia/Assets/import_16x16.png
+++ b/Source/LibationAvalonia/Assets/import_16x16.png
--- a/Source/LibationAvalonia/Assets/last.png
+++ b/Source/LibationAvalonia/Assets/last.png
--- a/Source/LibationAvalonia/Assets/libation.ico
+++ b/Source/LibationAvalonia/Assets/libation.ico
--- a/Source/LibationAvalonia/Assets/liberate_green.png
+++ b/Source/LibationAvalonia/Assets/liberate_green.png
--- a/Source/LibationAvalonia/Assets/liberate_green_pdf_no.png
+++ b/Source/LibationAvalonia/Assets/liberate_green_pdf_no.png
--- a/Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png
+++ b/Source/LibationAvalonia/Assets/liberate_green_pdf_yes.png
--- a/Source/LibationAvalonia/Assets/liberate_red.png
+++ b/Source/LibationAvalonia/Assets/liberate_red.png
--- a/Source/LibationAvalonia/Assets/liberate_red_pdf_no.png
+++ b/Source/LibationAvalonia/Assets/liberate_red_pdf_no.png
--- a/Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png
+++ b/Source/LibationAvalonia/Assets/liberate_red_pdf_yes.png
--- a/Source/LibationAvalonia/Assets/liberate_yellow.png
+++ b/Source/LibationAvalonia/Assets/liberate_yellow.png
--- a/Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png
+++ b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_no.png
--- a/Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png
+++ b/Source/LibationAvalonia/Assets/liberate_yellow_pdf_yes.png
--- a/Source/LibationAvalonia/Assets/minus.png
+++ b/Source/LibationAvalonia/Assets/minus.png
--- a/Source/LibationAvalonia/Assets/plus.png
+++ b/Source/LibationAvalonia/Assets/plus.png
--- a/Source/LibationAvalonia/Assets/queued.png
+++ b/Source/LibationAvalonia/Assets/queued.png
--- a/Source/LibationAvalonia/Assets/up.png
+++ b/Source/LibationAvalonia/Assets/up.png
--- a/Source/LibationAvalonia/AvaloniaUtils.cs
+++ b/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;
+		}
+	}
+}
--- a/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml
+++ b/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 >
--- a/Source/LibationAvalonia/Controls/DataGridCheckBoxColumnExt.axaml.cs
+++ b/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;
+		}
+	}
+}
--- a/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml
+++ b/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>
--- a/Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs
+++ b/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);
+		}
+	}
+}
--- a/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml
+++ b/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>
--- a/Source/LibationAvalonia/Controls/DirectorySelectControl.axaml.cs
+++ b/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);
+		}
+	}
+}
--- a/Source/LibationAvalonia/Controls/GroupBox.axaml
+++ b/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>
--- a/Source/LibationAvalonia/Controls/GroupBox.axaml.cs
+++ b/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);
+		}
+	}
+}
--- a/Source/LibationAvalonia/Controls/LinkLabel.axaml
+++ b/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>
--- a/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs
+++ b/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);
+		}
+	}
+}
--- a/Source/LibationAvalonia/Controls/WheelComboBox.axaml
+++ b/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>
--- a/Source/LibationAvalonia/Controls/WheelComboBox.axaml.cs
+++ b/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);
+		}
+	}
+}
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
+++ b/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>
--- a/Source/LibationAvalonia/Dialogs/AccountsDialog.axaml.cs
+++ b/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);
+			}
+		}
+	}
+}
--- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
+++ b/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>
--- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs
+++ b/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);
+					}
+				}
+			}
+		}
+	}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Robert McRackan	553a936e7e	incr ver	2022-08-01 09:49:45 -04:00
Robert McRackan	635764625e	incl HangoverAvalonia in sln	2022-08-01 07:46:44 -04:00
rmcrackan	f5599f7c57	Merge pull request #338 from Mbucari/master HangoverAvalonia and other fixes	2022-08-01 07:36:25 -04:00
Mbucari	dc6aaf2dd6	Updated instructions for Standalone Build (no dotnet runtime required)	2022-07-31 22:37:42 -06:00
Michael Bucari-Tovo	f1ba2b4ae8	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-31 22:24:28 -06:00
Michael Bucari-Tovo	742310b8d6	Fix install workflow	2022-07-31 22:24:17 -06:00
Mbucari	073787173d	Merge branch 'rmcrackan:master' into master	2022-07-31 21:59:46 -06:00
Michael Bucari-Tovo	66679ace2f	Add HangoverAvalonia	2022-07-31 20:33:56 -06:00
Robert McRackan	3982537d46	Tags no longer saved outside of database	2022-07-31 21:58:53 -04:00
Robert McRackan	7cf4c63d79	OSX-specific bug fix for search engine	2022-07-31 14:24:24 -04:00
Robert McRackan	7c4575cf66	incr ver	2022-07-30 22:39:41 -04:00
rmcrackan	f4749d703f	Merge pull request #337 from Mbucari/master Fixes and Improvements	2022-07-30 22:24:37 -04:00
Michael Bucari-Tovo	f2f562619b	Updated dependencies	2022-07-30 20:09:17 -06:00
Robert McRackan	16c019a9c6	update dependencies	2022-07-30 21:54:10 -04:00
Robert McRackan	644dcbdd4d	updated dependency	2022-07-30 21:40:31 -04:00
Michael Bucari-Tovo	6b112f5248	Delete obj and bin folders on clean	2022-07-30 18:03:33 -06:00
Michael Bucari-Tovo	0bfa609058	Libation Runs on MacOS	2022-07-30 16:09:31 -06:00
Michael Bucari-Tovo	8020ded642	Add platform preprocessor definitions	2022-07-30 13:42:11 -06:00
Michael Bucari-Tovo	c4cd6b16fc	Add macOS ID	2022-07-30 11:04:01 -06:00
Michael Bucari-Tovo	310012fd17	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-30 11:03:19 -06:00
Michael Bucari-Tovo	06163db6ff	Merge Conflict	2022-07-30 11:03:17 -06:00
Michael Bucari-Tovo	7689eed711	Add macOS identifier	2022-07-30 10:58:53 -06:00
Mbucari	d396d697d7	Fix typos	2022-07-30 10:33:04 -06:00
Michael Bucari-Tovo	27ed11d904	More universal updating	2022-07-30 09:49:11 -06:00
Michael Bucari-Tovo	9e7670b918	Fix Subdirectory being added to custom directory selection	2022-07-30 09:48:57 -06:00
Michael Bucari-Tovo	31e97defd1	Add ReleaseIdentifier to logging	2022-07-30 09:48:27 -06:00
Mbucari	1a447627c7	Merge branch 'rmcrackan:master' into master	2022-07-28 20:04:36 -06:00
Robert McRackan	962b386d07	Bug fix: update checking code	2022-07-28 21:35:59 -04:00
Michael Bucari-Tovo	d69ff24c2d	Modularize update process	2022-07-28 17:18:43 -06:00
Michael Bucari-Tovo	070ed1d373	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-28 17:06:18 -06:00
Michael Bucari-Tovo	47729bf7b0	fix release getter	2022-07-28 17:06:12 -06:00
Robert McRackan	ed0ce2976b	Bug fix #329 : Chardonnay-beta freezes after a scan	2022-07-28 13:26:16 -04:00
rmcrackan	2224f46ed5	Merge pull request #331 from Mbucari/master Fix MessageBox hang	2022-07-28 13:22:03 -04:00
Michael Bucari-Tovo	433974323c	Remove unnecessary extensions	2022-07-28 11:17:29 -06:00
Michael Bucari-Tovo	7525d318c0	Crean up helper methods	2022-07-28 11:03:22 -06:00
Michael Bucari-Tovo	92327dcc0d	Add synchronous thread extensions	2022-07-28 10:40:39 -06:00
Michael Bucari-Tovo	aeaf234edd	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-28 10:13:28 -06:00
Michael Bucari-Tovo	a99b644917	Fix thread hang issue#329	2022-07-28 10:12:43 -06:00
Mbucari	d79a55e5c9	Merge branch 'rmcrackan:master' into master	2022-07-28 09:43:20 -06:00
Mbucari	16b0feeb82	Create feature request template	2022-07-28 09:43:11 -06:00
Mbucari	7b3a25e45a	Create bug report template	2022-07-28 09:42:33 -06:00
Robert McRackan	8effdcb92d	add macos publish options. standardize publish profiles	2022-07-28 10:43:00 -04:00
Robert McRackan	b12bef81bd	These stupid unused language packs are 40% of our disk usage. And the SatelliteResourceLanguages bug still isn't fixed	2022-07-28 09:36:12 -04:00
Robert McRackan	f04a5e0168	tweaks to getLatestRelease	2022-07-27 16:36:18 -04:00
rmcrackan	e093729707	Merge pull request #325 from Mbucari/master Add app update to Avalonia Build	2022-07-27 15:49:41 -04:00
Michael Bucari-Tovo	369151ada2	Revert timeout time	2022-07-27 09:55:09 -06:00
Michael Bucari-Tovo	1f685ae8a0	Add release index download	2022-07-27 09:49:58 -06:00
Mbucari	bbe91099cb	Update .releaseindex.json	2022-07-27 09:45:29 -06:00
Mbucari	92015ba4c2	Add files via upload	2022-07-27 09:27:57 -06:00
Mbucari	3bcacabadc	Delete appcasttest.xml	2022-07-27 01:03:24 -06:00
Mbucari	f5736d9151	Merge branch 'rmcrackan:master' into master	2022-07-27 00:46:04 -06:00
Michael Bucari-Tovo	59015f438e	Add auto app update to windows avalonia	2022-07-27 00:36:13 -06:00
Michael Bucari-Tovo	3af47ab395	Add update name pattern matching	2022-07-27 00:35:55 -06:00
Michael Bucari-Tovo	308619b01a	Fix bug if MessageBox called from worker thread	2022-07-27 00:30:35 -06:00
Robert McRackan	4efce57488	gitignore bin-Avalonia	2022-07-26 22:15:23 -04:00
Robert McRackan	c8ee950f7d	Linux beta	2022-07-26 21:14:43 -04:00
Mbucari	0bba0f9256	Add files via upload	2022-07-26 12:53:49 -06:00
rmcrackan	05bdff5123	Merge pull request #321 from Mbucari/master Linux Beta	2022-07-26 08:16:55 -04:00
Mbucari	e58e6cfb9f	Update README.md	2022-07-25 19:51:35 -06:00
Mbucari	b052871004	Update README.md	2022-07-25 19:48:01 -06:00
Mbucari	d738f4f35f	Update README.md	2022-07-25 17:33:59 -06:00
Michael Bucari-Tovo	7286aee9dd	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-25 17:22:29 -06:00
Michael Bucari-Tovo	ca455978a5	Update for Linux	2022-07-25 17:22:17 -06:00
Mbucari	9c38bea5b7	Update README.md	2022-07-25 17:21:35 -06:00
Michael Bucari-Tovo	fbec1bc569	Linux pub	2022-07-25 14:45:39 -06:00
Michael Bucari-Tovo	6dd885f0b2	Wrap save and restore in tyy/catch blocks	2022-07-25 08:19:46 -06:00
Mbucari	ab38eb5571	Update README.md	2022-07-25 00:05:46 -06:00
Michael Bucari-Tovo	0e4b9ab396	Build standalone	2022-07-25 00:04:52 -06:00
Michael Bucari-Tovo	7dfedbc73b	Remove beta checkbox	2022-07-24 16:51:38 -06:00
Michael Bucari-Tovo	625ae1d63c	Removed Avalonia from LibationWinForms	2022-07-24 16:42:38 -06:00
Michael Bucari-Tovo	71098ef02f	Publish Profiles	2022-07-24 16:33:45 -06:00
Mbucari	d63a6de543	Update README.md	2022-07-24 16:33:19 -06:00
Mbucari	2a71a85306	Update README.md	2022-07-24 16:19:03 -06:00
Michael Bucari-Tovo	6de3a8a2bf	Linux instructions	2022-07-24 16:14:34 -06:00
Michael Bucari-Tovo	3fc1da66de	Linux compat	2022-07-24 14:46:27 -06:00
Michael Bucari-Tovo	683c221ca8	Linux compatability	2022-07-24 14:18:26 -06:00
Michael Bucari-Tovo	fe6cfc899b	Add Avalonia setup	2022-07-24 13:04:19 -06:00
Michael Bucari-Tovo	ffd947eb2e	A	2022-07-23 21:04:27 -06:00
Michael Bucari-Tovo	8dd59cb08a	Refactor	2022-07-23 20:54:02 -06:00
Michael Bucari-Tovo	1e4c489983	Libation Runs on Linux!	2022-07-23 18:07:04 -06:00
Michael Bucari-Tovo	17b0da358f	Add LinkLabel control	2022-07-22 20:11:13 -06:00
Michael Bucari-Tovo	6aa0a1f8b9	Remove references to winforms	2022-07-22 19:28:31 -06:00
Michael Bucari-Tovo	ab731a63af	Tweak MessageBox	2022-07-22 19:20:47 -06:00
Michael Bucari-Tovo	07d2c656fc	Add description text	2022-07-22 18:33:49 -06:00
Michael Bucari-Tovo	9ecb32c3d2	Added login dialogs	2022-07-22 18:25:47 -06:00
Michael Bucari-Tovo	503e1e143e	Separate invalid char check for folders and files. Files can't have slashes.	2022-07-22 18:11:39 -06:00
Mbucari	e34ce67a2c	Merge branch 'rmcrackan:master' into master	2022-07-22 12:39:09 -06:00
Robert McRackan	a0fd0a3de6	Book details dialog. On open, tags should be first focus	2022-07-22 11:15:04 -04:00
Robert McRackan	7f3cbc454f	Bug fix #319 : in some cases mp3 chapter metadata was incorrect	2022-07-21 22:29:12 -04:00
Mbucari	30eb117fa1	Merge branch 'rmcrackan:master' into master	2022-07-21 10:05:12 -06:00
Robert McRackan	63877160aa	New feature #170 : book details, added link to audible's page for that book	2022-07-21 09:02:42 -04:00
Robert McRackan	77e61479cf	New feature #284 : Add bitrate, sample rate, and channels to template options and to exports	2022-07-21 08:37:04 -04:00
Michael Bucari-Tovo	ca71283108	Revert	2022-07-20 20:10:07 -06:00
Michael Bucari-Tovo	285563af5e	Revert	2022-07-20 20:08:53 -06:00
Michael Bucari-Tovo	62cbad0d8f	Commit works in progress	2022-07-20 19:41:56 -06:00
Michael Bucari-Tovo	2cb2479d63	Added EditTemplateDialog and LibationFilesDialog	2022-07-20 13:35:30 -06:00
Mbucari	e7c5b1d8dc	Merge branch 'rmcrackan:master' into master	2022-07-19 14:27:11 -06:00
Robert McRackan	7f086aeaac	Bug fix #318 : Audible changed their API, likely in conjunction with shutting down the Windows App. DownloadQuality.Extreme and DownloadQuality.Low now throw errors	2022-07-19 15:02:31 -04:00
Robert McRackan	78186d4973	update dependencies	2022-07-19 09:32:26 -04:00
Robert McRackan	4d84174ba6	AudibleApi: Make exceptions more flexible so that less logic is needed inside catch	2022-07-19 08:19:03 -04:00
Robert McRackan	579536f65a	Revert: project publish => sln publish	2022-07-19 07:43:34 -04:00
Michael Bucari-Tovo	a4ff739684	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-18 23:01:20 -06:00
Michael Bucari-Tovo	9e06c70319	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-18 23:00:55 -06:00
Michael Bucari-Tovo	0c98ce000b	Added SettingsDialog	2022-07-18 23:00:40 -06:00
Robert McRackan	230b23dc80	on startup, log BetaOptIn	2022-07-18 22:15:11 -04:00
Robert McRackan	d55b8eeeba	Turn 'self contained' back on	2022-07-18 20:56:09 -04:00
rmcrackan	decf75411f	Merge pull request #313 from Mbucari/master Fixed hidden items being duplicated on library scan	2022-07-18 15:08:04 -04:00
Mbucari	c69f14dac5	Merge branch 'rmcrackan:master' into master	2022-07-18 12:37:13 -06:00
Michael Bucari-Tovo	10359aa5e8	Fixed hidden items being duplicated on library scan	2022-07-18 12:36:53 -06:00
Robert McRackan	72e030faaf	Include beta feature: cross-platform UI	2022-07-18 14:26:19 -04:00
rmcrackan	b21055d0ea	Merge pull request #312 from Mbucari/master Avalonia Beta release	2022-07-18 14:15:15 -04:00
Michael Bucari-Tovo	720fd64c97	Fixed visible books count not updating	2022-07-18 10:07:13 -06:00
Michael Bucari-Tovo	e9a331292a	Remove Commit method	2022-07-17 01:26:18 -06:00
Michael Bucari-Tovo	51fee4ae24	Remain classes and fix adding row to EditTagsDialog	2022-07-17 00:59:26 -06:00
Michael Bucari-Tovo	4cfe72a63b	Add WheelComboBox	2022-07-17 00:44:32 -06:00
Michael Bucari-Tovo	6a8476c976	Undo change	2022-07-17 00:07:04 -06:00
Michael Bucari-Tovo	8bb17d09c3	Added beta opt-in setting	2022-07-16 23:57:12 -06:00
Michael Bucari-Tovo	ad6b86fcb4	Added DescriptionDisplayDialog and ImageDisplayDialog	2022-07-16 23:27:56 -06:00
Michael Bucari-Tovo	1578be2520	Added MessageBoxAlertAdmin	2022-07-16 22:04:00 -06:00
Michael Bucari-Tovo	82d8d954ef	Added EditQuickFilters dialog	2022-07-16 21:24:07 -06:00
Michael Bucari-Tovo	eff9c2b35d	Added AccountsDialog	2022-07-16 20:47:53 -06:00
Michael Bucari-Tovo	ccdd1dc9f3	Added BookDetailsDialog, LiberatedStatusBatchDialog, ScanAccountsDialog, SearchSyntaxDialog and TagsBatchDialog	2022-07-16 17:47:54 -06:00
Michael Bucari-Tovo	952173d450	Added book details dialog	2022-07-16 15:06:37 -06:00
Michael Bucari-Tovo	35f677a0fa	Added gridlines	2022-07-15 20:57:22 -06:00
Michael Bucari-Tovo	51d0645699	Add stasrt time testing	2022-07-15 17:05:13 -06:00
Michael Bucari-Tovo	0189a197a8	Refactoring	2022-07-15 16:36:58 -06:00
Michael Bucari-Tovo	1ce5fedc8c	Refactor ProductDisplay	2022-07-15 15:58:21 -06:00
Michael Bucari-Tovo	d336848ed0	Change how large cover image viewer loads images	2022-07-15 15:42:34 -06:00
Michael Bucari-Tovo	8cd6219bd9	Performance improvements and better mvvp pattern following	2022-07-15 15:16:27 -06:00
Michael Bucari-Tovo	c2a2e51bde	Improve re-display function	2022-07-15 13:09:19 -06:00
Michael Bucari-Tovo	d62821cd60	Refactor	2022-07-15 01:06:55 -06:00
Michael Bucari-Tovo	180d591b0a	Make Form1 MVVM	2022-07-15 00:23:22 -06:00
Michael Bucari-Tovo	7b7e1d8574	Further sorting and remove books refinements	2022-07-14 21:14:40 -06:00
Michael Bucari-Tovo	efd6156fa8	Fix STAThread error	2022-07-14 18:25:28 -06:00
Michael Bucari-Tovo	428ea5e864	Improve AvaloniaUI startup times	2022-07-14 17:57:46 -06:00
Michael Bucari-Tovo	2b6d1201b6	Add save and restore form size	2022-07-14 15:41:30 -06:00
Michael Bucari-Tovo	de3524d688	refine message box.	2022-07-14 13:26:36 -06:00
Michael Bucari-Tovo	61a529e62b	MessageBox revision and more async loading	2022-07-14 12:51:50 -06:00
Michael Bucari-Tovo	a5d225dc44	Minor refactor	2022-07-14 02:46:45 -06:00
Michael Bucari-Tovo	7b28a274a8	Startup speedup	2022-07-14 02:35:38 -06:00
Michael Bucari-Tovo	26508e6a8a	Speed up start time	2022-07-14 02:18:26 -06:00
Michael Bucari-Tovo	c8d91032c0	Refactor	2022-07-14 01:07:07 -06:00
Michael Bucari-Tovo	7a8e910697	Add Avalonia MessageBox	2022-07-14 00:50:50 -06:00
Michael Bucari-Tovo	31d6fc8197	Refactor	2022-07-13 19:03:52 -06:00
Michael Bucari-Tovo	e23e267d17	Add column customizations	2022-07-13 18:47:43 -06:00
Michael Bucari-Tovo	c727286d22	Move ProcessQueue biz logic into viewmodel	2022-07-13 17:06:18 -06:00
Michael Bucari-Tovo	3a61c32881	Fix sorting and refactor	2022-07-13 16:07:05 -06:00
Michael Bucari-Tovo	e33fd6ea1b	Default invisible	2022-07-13 02:23:55 -06:00
Michael Bucari-Tovo	aa8e3ac09b	More sorting hacking	2022-07-13 02:21:05 -06:00
Michael Bucari-Tovo	eb49dcfc54	Incremental prgress.	2022-07-13 01:14:05 -06:00
Michael Bucari-Tovo	6182b2bcee	Improve styles and fix sotring of podcasts when they are collapsed.	2022-07-12 22:01:11 -06:00
Michael Bucari-Tovo	6e091230cf	Use ReactiveUI. Sort of fix remove book checkbox column.	2022-07-12 18:56:25 -06:00
Michael Bucari-Tovo	5f45d28b9f	Refinements	2022-07-12 00:18:56 -06:00
Michael Bucari-Tovo	f8e9c16bc1	Change some defaults	2022-07-11 21:57:41 -06:00
Michael Bucari-Tovo	a66b7a6eab	Add queue log and improve display styles	2022-07-11 21:43:20 -06:00
Michael Bucari-Tovo	3b42b52ff4	Improve sorting	2022-07-11 19:07:20 -06:00
Michael Bucari-Tovo	df5293ce1e	Fix bug caused by moving column before frozen "Remove" column	2022-07-11 12:58:20 -06:00
Michael Bucari-Tovo	664ff6aabd	Merge branch 'master' of https://github.com/Mbucari/Libation	2022-07-11 00:13:41 -06:00
Michael Bucari-Tovo	0de62ce010	Port Form1 to Avalonia	2022-07-11 00:13:32 -06:00
Robert McRackan	9eafbacad9	Add Audible ID to BookDetailsDialog	2022-07-08 23:04:05 -04:00
Robert McRackan	058eb31110	trivial change to test local github account settings	2022-07-08 21:43:10 -04:00
Robert McRackan	29de8f5706	trivial change to test github settings	2022-07-08 21:42:17 -04:00
Robert McRackan	ef869dbe09	new publish settings moved to Libation's settings in GitHubReleaser old sizes zipped 70.5 MB unzipped 164 MB new sizes zipped 22.5 MB unzipped 52.4 MB	2022-07-08 14:59:31 -04:00
Robert McRackan	9f8b320493	no longer needed	2022-07-07 21:43:51 -04:00
Robert McRackan	ef72e04be3	Oops! I only meant to get rid of the bump, not the embedded. Reverting	2022-07-07 16:47:08 -04:00